diff --git a/.github/pyright-config.json b/.github/pyright-config.json
index 64a46d80cc..fba044da06 100644
--- a/.github/pyright-config.json
+++ b/.github/pyright-config.json
@@ -2,11 +2,15 @@
   "include": [
     "../BizHawkClient.py",
     "../Patch.py",
+    "../rule_builder/cached_world.py",
+    "../rule_builder/options.py",
+    "../rule_builder/rules.py",
     "../test/param.py",
     "../test/general/test_groups.py",
     "../test/general/test_helpers.py",
     "../test/general/test_memory.py",
     "../test/general/test_names.py",
+    "../test/general/test_rule_builder.py",
     "../test/multiworld/__init__.py",
     "../test/multiworld/test_multiworlds.py",
     "../test/netutils/__init__.py",
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f7b9ef2f0..772a6c0be3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,5 @@
-# This workflow will build a release-like distribution when manually dispatched
+# This workflow will build a release-like distribution when manually dispatched:
+# a Windows x64 7zip, a Windows x64 Installer, a Linux AppImage and a Linux binary .tar.gz.
 
 name: Build
 
@@ -24,10 +25,10 @@ env:
   # NOTE: since appimage/appimagetool and appimage/type2-runtime does not have tags anymore,
   #       we check the sha256 and require manual intervention if it was updated.
   APPIMAGE_FORK: 'PopTracker'
-  APPIMAGETOOL_VERSION: 'r-2025-10-19'
-  APPIMAGETOOL_X86_64_HASH: '9493a6b253a01f84acb9c624c38810ecfa11d99daa829b952b0bff43113080f9'
-  APPIMAGE_RUNTIME_VERSION: 'r-2025-08-11'
-  APPIMAGE_RUNTIME_X86_64_HASH: 'e70ffa9b69b211574d0917adc482dd66f25a0083427b5945783965d55b0b0a8b'
+  APPIMAGETOOL_VERSION: 'r-2025-11-18'
+  APPIMAGETOOL_X86_64_HASH: '4577a452b30af2337123fbb383aea154b618e51ad5448c3b62085cbbbfbfd9a2'
+  APPIMAGE_RUNTIME_VERSION: 'r-2025-11-07'
+  APPIMAGE_RUNTIME_X86_64_HASH: '27ddd3f78e483fc5f7856e413d7c17092917f8c35bfe3318a0d378aa9435ad17'
 
 permissions:  # permissions required for attestation
   id-token: 'write'
@@ -50,7 +51,7 @@ jobs:
         run: |
           Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
           Expand-Archive -Path enemizer.zip -DestinationPath EnemizerCLI -Force
-          choco install innosetup --version=6.2.2 --allow-downgrade
+          choco install innosetup --version=6.7.0 --allow-downgrade
       - name: Build
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cf9ce08faf..0061dd15b0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,7 @@ on:
       - "!.github/workflows/**"
       - ".github/workflows/docker.yml"
     branches:
-      - "*"
+      - "main"
     tags:
       - "v?[0-9]+.[0-9]+.[0-9]*"
   workflow_dispatch:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7a4be9cdf..7f81e57507 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ env:
   # NOTE: since appimage/appimagetool and appimage/type2-runtime does not have tags anymore,
   #       we check the sha256 and require manual intervention if it was updated.
   APPIMAGE_FORK: 'PopTracker'
-  APPIMAGETOOL_VERSION: 'r-2025-10-19'
-  APPIMAGETOOL_X86_64_HASH: '9493a6b253a01f84acb9c624c38810ecfa11d99daa829b952b0bff43113080f9'
-  APPIMAGE_RUNTIME_VERSION: 'r-2025-08-11'
-  APPIMAGE_RUNTIME_X86_64_HASH: 'e70ffa9b69b211574d0917adc482dd66f25a0083427b5945783965d55b0b0a8b'
+  APPIMAGETOOL_VERSION: 'r-2025-11-18'
+  APPIMAGETOOL_X86_64_HASH: '4577a452b30af2337123fbb383aea154b618e51ad5448c3b62085cbbbfbfd9a2'
+  APPIMAGE_RUNTIME_VERSION: 'r-2025-11-07'
+  APPIMAGE_RUNTIME_X86_64_HASH: '27ddd3f78e483fc5f7856e413d7c17092917f8c35bfe3318a0d378aa9435ad17'
 
 permissions:  # permissions required for attestation
   id-token: 'write'
diff --git a/.gitignore b/.gitignore
index 3bb4e68c99..8f9ed6df14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ EnemizerCLI/
 /SNI/
 /sni-*/
 /appimagetool*
+/VC_redist.x64.exe
 /host.yaml
 /options.yaml
 /config.yaml
@@ -63,7 +64,10 @@ Output Logs/
 /installdelete.iss
 /data/user.kv
 /datapackage
+/datapackage_export.json
 /custom_worlds
+# stubgen output
+/out/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/.run/Build APWorld.run.xml b/.run/Build APWorlds.run.xml
similarity index 78%
rename from .run/Build APWorld.run.xml
rename to .run/Build APWorlds.run.xml
index db6a305e7b..cf85521e72 100644
--- a/.run/Build APWorld.run.xml	
+++ b/.run/Build APWorlds.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build APWorld" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="Build APWorlds" type="PythonConfigurationType" factoryName="Python">
     <module name="Archipelago" />
     <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
@@ -12,8 +12,8 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <option name="SCRIPT_NAME" value="$ContentRoot$/Launcher.py" />
-    <option name="PARAMETERS" value="\&quot;Build APWorlds\&quot;" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Launcher.py" />
+    <option name="PARAMETERS" value="&quot;Build APWorlds&quot;" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/BaseClasses.py b/BaseClasses.py
index ee2f73ca51..69b900212c 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -8,10 +8,10 @@ import secrets
 import warnings
 from argparse import Namespace
 from collections import Counter, deque, defaultdict
-from collections.abc import Collection, MutableSequence
+from collections.abc import Callable, Collection, Iterable, Iterator, Mapping, MutableSequence, Set
 from enum import IntEnum, IntFlag
-from typing import (AbstractSet, Any, Callable, ClassVar, Dict, Iterable, Iterator, List, Literal, Mapping, NamedTuple,
-                    Optional, Protocol, Set, Tuple, Union, TYPE_CHECKING, Literal, overload)
+from typing import (AbstractSet, Any, ClassVar, Dict, List, Literal, NamedTuple,
+                    Optional, Protocol, Tuple, Union, TYPE_CHECKING, overload)
 import dataclasses
 
 from typing_extensions import NotRequired, TypedDict
@@ -22,6 +22,7 @@ import Utils
 
 if TYPE_CHECKING:
     from entrance_rando import ERPlacementState
+    from rule_builder.rules import Rule
     from worlds import AutoWorld
 
 
@@ -85,7 +86,7 @@ class MultiWorld():
     local_items: Dict[int, Options.LocalItems]
     non_local_items: Dict[int, Options.NonLocalItems]
     progression_balancing: Dict[int, Options.ProgressionBalancing]
-    completion_condition: Dict[int, Callable[[CollectionState], bool]]
+    completion_condition: Dict[int, CollectionRule]
     indirect_connections: Dict[Region, Set[Entrance]]
     exclude_locations: Dict[int, Options.ExcludeLocations]
     priority_locations: Dict[int, Options.PriorityLocations]
@@ -726,6 +727,7 @@ class CollectionState():
     advancements: Set[Location]
     path: Dict[Union[Region, Entrance], PathValue]
     locations_checked: Set[Location]
+    """Internal cache for Advancement Locations already checked by this CollectionState. Not for use in logic."""
     stale: Dict[int, bool]
     allow_partial_entrances: bool
     additional_init_functions: List[Callable[[CollectionState, MultiWorld], None]] = []
@@ -766,7 +768,7 @@ class CollectionState():
         else:
             self._update_reachable_regions_auto_indirect_conditions(player, queue)
 
-    def _update_reachable_regions_explicit_indirect_conditions(self, player: int, queue: deque):
+    def _update_reachable_regions_explicit_indirect_conditions(self, player: int, queue: deque[Entrance]):
         reachable_regions = self.reachable_regions[player]
         blocked_connections = self.blocked_connections[player]
         # run BFS on all connections, and keep track of those blocked by missing items
@@ -784,13 +786,16 @@ class CollectionState():
                 blocked_connections.update(new_region.exits)
                 queue.extend(new_region.exits)
                 self.path[new_region] = (new_region.name, self.path.get(connection, None))
+                self.multiworld.worlds[player].reached_region(self, new_region)
 
                 # Retry connections if the new region can unblock them
-                for new_entrance in self.multiworld.indirect_connections.get(new_region, set()):
-                    if new_entrance in blocked_connections and new_entrance not in queue:
-                        queue.append(new_entrance)
+                entrances = self.multiworld.indirect_connections.get(new_region)
+                if entrances is not None:
+                    relevant_entrances = entrances.intersection(blocked_connections)
+                    relevant_entrances.difference_update(queue)
+                    queue.extend(relevant_entrances)
 
-    def _update_reachable_regions_auto_indirect_conditions(self, player: int, queue: deque):
+    def _update_reachable_regions_auto_indirect_conditions(self, player: int, queue: deque[Entrance]):
         reachable_regions = self.reachable_regions[player]
         blocked_connections = self.blocked_connections[player]
         new_connection: bool = True
@@ -812,6 +817,7 @@ class CollectionState():
                     queue.extend(new_region.exits)
                     self.path[new_region] = (new_region.name, self.path.get(connection, None))
                     new_connection = True
+                    self.multiworld.worlds[player].reached_region(self, new_region)
             # sweep for indirect connections, mostly Entrance.can_reach(unrelated_Region)
             queue.extend(blocked_connections)
 
@@ -1169,13 +1175,17 @@ class CollectionState():
             self.prog_items[player][item] = count
 
 
+CollectionRule = Callable[[CollectionState], bool]
+DEFAULT_COLLECTION_RULE: CollectionRule = staticmethod(lambda state: True)
+
+
 class EntranceType(IntEnum):
     ONE_WAY = 1
     TWO_WAY = 2
 
 
 class Entrance:
-    access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True)
+    access_rule: CollectionRule = DEFAULT_COLLECTION_RULE
     hide_path: bool = False
     player: int
     name: str
@@ -1362,7 +1372,7 @@ class Region:
         self,
         location_name: str,
         item_name: str | None = None,
-        rule: Callable[[CollectionState], bool] | None = None,
+        rule: CollectionRule | Rule[Any] | None = None,
         location_type: type[Location] | None = None,
         item_type: type[Item] | None = None,
         show_in_spoiler: bool = True,
@@ -1390,7 +1400,7 @@ class Region:
         event_location = location_type(self.player, location_name, None, self)
         event_location.show_in_spoiler = show_in_spoiler
         if rule is not None:
-            event_location.access_rule = rule
+            self.multiworld.worlds[self.player].set_rule(event_location, rule)
 
         event_item = item_type(item_name, ItemClassification.progression, None, self.player)
 
@@ -1401,7 +1411,7 @@ class Region:
         return event_item
 
     def connect(self, connecting_region: Region, name: Optional[str] = None,
-                rule: Optional[Callable[[CollectionState], bool]] = None) -> Entrance:
+                rule: Optional[CollectionRule | Rule[Any]] = None) -> Entrance:
         """
         Connects this Region to another Region, placing the provided rule on the connection.
 
@@ -1409,8 +1419,8 @@ class Region:
         :param name: name of the connection being created
         :param rule: callable to determine access of this connection to go from self to the exiting_region"""
         exit_ = self.create_exit(name if name else f"{self.name} -> {connecting_region.name}")
-        if rule:
-            exit_.access_rule = rule
+        if rule is not None:
+            self.multiworld.worlds[self.player].set_rule(exit_, rule)
         exit_.connect(connecting_region)
         return exit_
 
@@ -1435,7 +1445,7 @@ class Region:
         return entrance
 
     def add_exits(self, exits: Iterable[str] | Mapping[str, str | None],
-                  rules: Mapping[str, Callable[[CollectionState], bool]] | None = None) -> List[Entrance]:
+                  rules: Mapping[str, CollectionRule | Rule[Any]] | None = None) -> List[Entrance]:
         """
         Connects current region to regions in exit dictionary. Passed region names must exist first.
 
@@ -1474,7 +1484,7 @@ class Location:
     show_in_spoiler: bool = True
     progress_type: LocationProgressType = LocationProgressType.DEFAULT
     always_allow: Callable[[CollectionState, Item], bool] = staticmethod(lambda state, item: False)
-    access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True)
+    access_rule: CollectionRule = DEFAULT_COLLECTION_RULE
     item_rule: Callable[[Item], bool] = staticmethod(lambda item: True)
     item: Optional[Item] = None
 
@@ -1551,7 +1561,7 @@ class ItemClassification(IntFlag):
     skip_balancing = 0b01000
     """ should technically never occur on its own
     Item that is logically relevant, but progression balancing should not touch.
-    
+
     Possible reasons for why an item should not be pulled ahead by progression balancing:
     1. This item is quite insignificant, so pulling it earlier doesn't help (currency/etc.)
     2. It is important for the player experience that this item is evenly distributed in the seed (e.g. goal items) """
@@ -1559,13 +1569,13 @@ class ItemClassification(IntFlag):
     deprioritized = 0b10000
     """ Should technically never occur on its own.
     Will not be considered for priority locations,
-    unless Priority Locations Fill runs out of regular progression items before filling all priority locations. 
-    
+    unless Priority Locations Fill runs out of regular progression items before filling all priority locations.
+
     Should be used for items that would feel bad for the player to find on a priority location.
     Usually, these are items that are plentiful or insignificant. """
 
     progression_deprioritized_skip_balancing = 0b11001
-    """ Since a common case of both skip_balancing and deprioritized is "insignificant progression", 
+    """ Since a common case of both skip_balancing and deprioritized is "insignificant progression",
     these items often want both flags. """
 
     progression_skip_balancing = 0b01001  # only progression gets balanced
@@ -1721,9 +1731,10 @@ class Spoiler:
                 logging.debug('The following items could not be reached: %s', ['%s (Player %d) at %s (Player %d)' % (
                     location.item.name, location.item.player, location.name, location.player) for location in
                                                                                sphere_candidates])
-                if any([multiworld.worlds[location.item.player].options.accessibility != 'minimal' for location in sphere_candidates]):
-                    raise RuntimeError(f'Not all progression items reachable ({sphere_candidates}). '
-                                       f'Something went terribly wrong here.')
+                if not multiworld.has_beaten_game(state):
+                    raise RuntimeError("During playthrough generation, the game was determined to be unbeatable. "
+                                       "Something went terribly wrong here. "
+                                       f"Unreachable progression items: {sphere_candidates}")
                 else:
                     self.unreachables = sphere_candidates
                     break
diff --git a/CommonClient.py b/CommonClient.py
old mode 100644
new mode 100755
index 41cc08d1d0..3f98a4eff1
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -24,7 +24,7 @@ if __name__ == "__main__":
 from MultiServer import CommandProcessor, mark_raw
 from NetUtils import (Endpoint, decode, NetworkItem, encode, JSONtoTextParser, ClientStatus, Permission, NetworkSlot,
                       RawJSONtoTextParser, add_json_text, add_json_location, add_json_item, JSONTypes, HintStatus, SlotType)
-from Utils import Version, stream_input, async_start
+from Utils import gui_enabled, Version, stream_input, async_start
 from worlds import network_data_package, AutoWorldRegister
 import os
 import ssl
@@ -35,9 +35,6 @@ if typing.TYPE_CHECKING:
 
 logger = logging.getLogger("Client")
 
-# without terminal, we have to use gui mode
-gui_enabled = not sys.stdout or "--nogui" not in sys.argv
-
 
 @Utils.cache_argsless
 def get_ssl_context():
@@ -65,6 +62,8 @@ class ClientCommandProcessor(CommandProcessor):
 
     def _cmd_exit(self) -> bool:
         """Close connections and client"""
+        if self.ctx.ui:
+            self.ctx.ui.stop()
         self.ctx.exit_event.set()
         return True
 
@@ -323,7 +322,7 @@ class CommonContext:
     hint_cost: int | None
     """Current Hint Cost per Hint from the server"""
     hint_points: int | None
-    """Current avaliable Hint Points from the server"""
+    """Current available Hint Points from the server"""
     player_names: dict[int, str]
     """Current lookup of slot number to player display name from server (includes aliases)"""
 
@@ -572,6 +571,10 @@ class CommonContext:
         return print_json_packet.get("type", "") == "ItemSend" \
             and not self.slot_concerns_self(print_json_packet["receiving"]) \
             and not self.slot_concerns_self(print_json_packet["item"].player)
+    
+    def is_connection_change(self, print_json_packet: dict) -> bool:
+        """Helper function for filtering out connection changes."""
+        return print_json_packet.get("type", "") in ["Join","Part"]
 
     def on_print(self, args: dict):
         logger.info(args["text"])
@@ -770,7 +773,7 @@ class CommonContext:
         if len(parts) == 1:
             parts = title.split(', ', 1)
         if len(parts) > 1:
-            text = parts[1] + '\n\n' + text
+            text = f"{parts[1]}\n\n{text}" if text else parts[1]
             title = parts[0]
         # display error
         self._messagebox = MessageBox(title, text, error=True)
@@ -893,6 +896,8 @@ async def server_loop(ctx: CommonContext, address: typing.Optional[str] = None)
                                    "May not be running Archipelago on that address or port.")
     except websockets.InvalidURI:
         ctx.handle_connection_loss("Failed to connect to the multiworld server (invalid URI)")
+    except asyncio.TimeoutError:
+        ctx.handle_connection_loss("Failed to connect to the multiworld server. Connection timed out.")
     except OSError:
         ctx.handle_connection_loss("Failed to connect to the multiworld server")
     except Exception:
diff --git a/Fill.py b/Fill.py
index 48ed7253d9..7bd5756627 100644
--- a/Fill.py
+++ b/Fill.py
@@ -280,6 +280,7 @@ def remaining_fill(multiworld: MultiWorld,
         item_to_place = itempool.pop()
         spot_to_fill: typing.Optional[Location] = None
 
+        # going through locations in the same order as the provided `locations` argument
         for i, location in enumerate(locations):
             if location_can_fill_item(location, item_to_place):
                 # popping by index is faster than removing by content,
diff --git a/Generate.py b/Generate.py
index 2b27cb222b..b510640170 100644
--- a/Generate.py
+++ b/Generate.py
@@ -23,7 +23,7 @@ from BaseClasses import seeddigits, get_seed, PlandoOptions
 from Utils import parse_yamls, version_tuple, __version__, tuplize_version
 
 
-def mystery_argparse(argv: list[str] | None = None):
+def mystery_argparse(argv: list[str] | None = None) -> argparse.Namespace:
     from settings import get_settings
     settings = get_settings()
     defaults = settings.generator
@@ -68,7 +68,7 @@ def mystery_argparse(argv: list[str] | None = None):
         args.weights_file_path = os.path.join(args.player_files_path, args.weights_file_path)
     if not os.path.isabs(args.meta_file_path):
         args.meta_file_path = os.path.join(args.player_files_path, args.meta_file_path)
-    args.plando: PlandoOptions = PlandoOptions.from_option_string(args.plando)
+    args.plando = PlandoOptions.from_option_string(args.plando)
 
     return args
 
@@ -119,9 +119,9 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
     else:
         meta_weights = None
 
-
-    player_id = 1
-    player_files = {}
+    player_id: int = 1
+    player_files: dict[int, str] = {}
+    player_errors: list[str] = []
     for file in os.scandir(args.player_files_path):
         fname = file.name
         if file.is_file() and not fname.startswith(".") and not fname.lower().endswith(".ini") and \
@@ -135,9 +135,13 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
                     else:
                         weights_for_file.append(yaml)
                 weights_cache[fname] = tuple(weights_for_file)
-                        
+
             except Exception as e:
-                raise ValueError(f"File {fname} is invalid. Please fix your yaml.") from e
+                logging.exception(f"Exception reading weights in file {fname}")
+                player_errors.append(
+                    f"{len(player_errors) + 1}. "
+                    f"File {fname} is invalid. Please fix your yaml.\n{Utils.get_all_causes(e)}"
+                )
 
     # sort dict for consistent results across platforms:
     weights_cache = {key: value for key, value in sorted(weights_cache.items(), key=lambda k: k[0].casefold())}
@@ -152,6 +156,10 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
     args.multi = max(player_id - 1, args.multi)
 
     if args.multi == 0:
+        if player_errors:
+            errors = "\n\n".join(player_errors)
+            raise ValueError(f"Encountered {len(player_errors)} error(s) in player files. "
+                             f"See logs for full tracebacks.\n\n{errors}")
         raise ValueError(
             "No individual player files found and number of players is 0. "
             "Provide individual player files or specify the number of players via host.yaml or --multi."
@@ -161,6 +169,10 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
                  f"{seed_name} Seed {seed} with plando: {args.plando}")
 
     if not weights_cache:
+        if player_errors:
+            errors = "\n\n".join(player_errors)
+            raise ValueError(f"Encountered {len(player_errors)} error(s) in player files. "
+                             f"See logs for full tracebacks.\n\n{errors}")
         raise Exception(f"No weights found. "
                         f"Provide a general weights file ({args.weights_file_path}) or individual player files. "
                         f"A mix is also permitted.")
@@ -171,10 +183,6 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
     args.sprite_pool = dict.fromkeys(range(1, args.multi+1), None)
     args.name = {}
 
-    settings_cache: dict[str, tuple[argparse.Namespace, ...]] = \
-        {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.sameoptions else None)
-         for fname, yamls in weights_cache.items()}
-
     if meta_weights:
         for category_name, category_dict in meta_weights.items():
             for key in category_dict:
@@ -197,47 +205,85 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
                             else:
                                 yaml[category_name][key] = option
 
-    player_path_cache = {}
+    settings_cache: dict[str, tuple[argparse.Namespace, ...] | None] = {fname: None for fname in weights_cache}
+    if args.sameoptions:
+        for fname, yamls in weights_cache.items():
+            try:
+                settings_cache[fname] = tuple(roll_settings(yaml, args.plando) for yaml in yamls)
+            except Exception as e:
+                logging.exception(f"Exception reading settings in file {fname}")
+                player_errors.append(
+                    f"{len(player_errors) + 1}. "
+                    f"File {fname} is invalid. Please fix your yaml.\n{Utils.get_all_causes(e)}"
+                )
+        # Exit early here to avoid throwing the same errors again later
+        if player_errors:
+            errors = "\n\n".join(player_errors)
+            raise ValueError(f"Encountered {len(player_errors)} error(s) in player files. "
+                             f"See logs for full tracebacks.\n\n{errors}")
+
+    player_path_cache: dict[int, str] = {}
     for player in range(1, args.multi + 1):
         player_path_cache[player] = player_files.get(player, args.weights_file_path)
-    name_counter = Counter()
+    name_counter: Counter[str] = Counter()
     args.player_options = {}
 
     player = 1
     while player <= args.multi:
         path = player_path_cache[player]
-        if path:
+        if not path:
+            player_errors.append(f'No weights specified for player {player}')
+            player += 1
+            continue
+
+        for doc_index, yaml in enumerate(weights_cache[path]):
+            name = yaml.get("name")
             try:
-                settings: tuple[argparse.Namespace, ...] = settings_cache[path] if settings_cache[path] else \
-                    tuple(roll_settings(yaml, args.plando) for yaml in weights_cache[path])
-                for settingsObject in settings:
-                    for k, v in vars(settingsObject).items():
-                        if v is not None:
-                            try:
-                                getattr(args, k)[player] = v
-                            except AttributeError:
-                                setattr(args, k, {player: v})
-                            except Exception as e:
-                                raise Exception(f"Error setting {k} to {v} for player {player}") from e
+                # Use the cached settings object if it exists, otherwise roll settings within the try-catch
+                # Invariant: settings_cache[path] and weights_cache[path] have the same length
+                cached = settings_cache[path]
+                settings_object: argparse.Namespace = (cached[doc_index] if cached else roll_settings(yaml, args.plando))
 
-                    # name was not specified
-                    if player not in args.name:
-                        if path == args.weights_file_path:
-                            # weights file, so we need to make the name unique
-                            args.name[player] = f"Player{player}"
-                        else:
-                            # use the filename
-                            args.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
-                    args.name[player] = handle_name(args.name[player], player, name_counter)
+                for k, v in vars(settings_object).items():
+                    if v is not None:
+                        try:
+                            getattr(args, k)[player] = v
+                        except AttributeError:
+                            setattr(args, k, {player: v})
+                        except Exception as e:
+                            raise Exception(f"Error setting {k} to {v} for player {player}") from e
+
+                # name was not specified
+                if player not in args.name:
+                    if path == args.weights_file_path:
+                        # weights file, so we need to make the name unique
+                        args.name[player] = f"Player{player}"
+                    else:
+                        # use the filename
+                        args.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
+                args.name[player] = handle_name(args.name[player], player, name_counter)
 
-                    player += 1
             except Exception as e:
-                raise ValueError(f"File {path} is invalid. Please fix your yaml.") from e
-        else:
-            raise RuntimeError(f'No weights specified for player {player}')
+                logging.exception(f"Exception reading settings in file {path} document #{doc_index + 1} "
+                                  f"(name: {args.name.get(player, name)})")
+                player_errors.append(
+                    f"{len(player_errors) + 1}. "
+                    f"File {path} document #{doc_index + 1} (name: {args.name.get(player, name)}) is invalid. "
+                    f"Please fix your yaml.\n{Utils.get_all_causes(e)}")
+
+            # increment for each yaml document in the file
+            player += 1
 
     if len(set(name.lower() for name in args.name.values())) != len(args.name):
-        raise Exception(f"Names have to be unique. Names: {Counter(name.lower() for name in args.name.values())}")
+        player_errors.append(
+            f"{len(player_errors) + 1}. "
+            f"Names have to be unique. Names: {Counter(name.lower() for name in args.name.values())}"
+        )
+
+    if player_errors:
+        errors = "\n\n".join(player_errors)
+        raise ValueError(f"Encountered {len(player_errors)} error(s) in player files. "
+                         f"See logs for full tracebacks.\n\n{errors}")
 
     return args, seed
 
@@ -316,7 +362,7 @@ class SafeFormatter(string.Formatter):
             return kwargs.get(key, "{" + key + "}")
 
 
-def handle_name(name: str, player: int, name_counter: Counter):
+def handle_name(name: str, player: int, name_counter: Counter[str]):
     name_counter[name.lower()] += 1
     number = name_counter[name.lower()]
     new_name = "%".join([x.replace("%number%", "{number}").replace("%player%", "{player}") for x in name.split("%%")])
@@ -347,7 +393,9 @@ def update_weights(weights: dict, new_weights: dict, update_type: str, name: str
             elif isinstance(new_value, list):
                 cleaned_value.extend(new_value)
             elif isinstance(new_value, dict):
-                cleaned_value = dict(Counter(cleaned_value) + Counter(new_value))
+                counter_value = Counter(cleaned_value)
+                counter_value.update(new_value)
+                cleaned_value = dict(counter_value)
             else:
                 raise Exception(f"Cannot apply merge to non-dict, set, or list type {option_name},"
                                 f" received {type(new_value).__name__}.")
@@ -361,13 +409,18 @@ def update_weights(weights: dict, new_weights: dict, update_type: str, name: str
                 for element in new_value:
                     cleaned_value.remove(element)
             elif isinstance(new_value, dict):
-                cleaned_value = dict(Counter(cleaned_value) - Counter(new_value))
+                counter_value = Counter(cleaned_value)
+                counter_value.subtract(new_value)
+                cleaned_value = dict(counter_value)
             else:
                 raise Exception(f"Cannot apply remove to non-dict, set, or list type {option_name},"
                                 f" received {type(new_value).__name__}.")
             cleaned_weights[option_name] = cleaned_value
         else:
-            cleaned_weights[option_name] = new_weights[option]
+            # Options starting with + and - may modify values in-place, and new_weights may be shared by multiple slots
+            # using the same .yaml, so ensure that the new value is a copy.
+            cleaned_value = copy.deepcopy(new_weights[option])
+            cleaned_weights[option_name] = cleaned_value
     new_options = set(cleaned_weights) - set(weights)
     weights.update(cleaned_weights)
     if new_options:
@@ -447,7 +500,7 @@ def roll_triggers(weights: dict, triggers: list, valid_keys: set) -> dict:
     return weights
 
 
-def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str, option: type(Options.Option), plando_options: PlandoOptions):
+def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str, option: type[Options.Option], plando_options: PlandoOptions):
     try:
         if option_key in game_weights:
             if not option.supports_weighting:
diff --git a/Launcher.py b/Launcher.py
index adc3cb96ef..cffd96b85d 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -31,6 +31,10 @@ import settings
 import Utils
 from Utils import (init_logging, is_frozen, is_linux, is_macos, is_windows, local_path, messagebox, open_filename,
                    user_path)
+
+if __name__ == "__main__":
+    init_logging('Launcher')
+
 from worlds.LauncherComponents import Component, components, icon_paths, SuffixIdentifier, Type
 
 
@@ -75,12 +79,17 @@ def open_patch():
             launch([*exe, file], component.cli)
 
 
-def generate_yamls():
+def generate_yamls(*args):
     from Options import generate_yaml_templates
 
+    parser = argparse.ArgumentParser(description="Generate Template Options", usage="[-h] [--skip_open_folder]")
+    parser.add_argument("--skip_open_folder", action="store_true")
+    args = parser.parse_args(args)
+
     target = Utils.user_path("Players", "Templates")
     generate_yaml_templates(target, False)
-    open_folder(target)
+    if not args.skip_open_folder:
+        open_folder(target)
 
 
 def browse_files():
@@ -213,12 +222,17 @@ def launch(exe, in_terminal=False):
 
 def create_shortcut(button: Any, component: Component) -> None:
     from pyshortcuts import make_shortcut
-    script = sys.argv[0]
-    wkdir = Utils.local_path()
+    env = os.environ
+    if "APPIMAGE" in env:
+        script = env["ARGV0"]
+        wkdir = None # defaults to ~ on Linux
+    else:
+        script = sys.argv[0]
+        wkdir = Utils.local_path()
 
     script = f"{script} \"{component.display_name}\""
     make_shortcut(script, name=f"Archipelago {component.display_name}", icon=local_path("data", "icon.ico"),
-                  startmenu=False, terminal=False, working_dir=wkdir)
+                  startmenu=False, terminal=False, working_dir=wkdir, noexe=Utils.is_frozen())
     button.menu.dismiss()
 
 
@@ -483,7 +497,6 @@ def main(args: argparse.Namespace | dict | None = None):
 
 
 if __name__ == '__main__':
-    init_logging('Launcher')
     multiprocessing.freeze_support()
     multiprocessing.set_start_method("spawn")  # if launched process uses kivy, fork won't work
     parser = argparse.ArgumentParser(
diff --git a/Main.py b/Main.py
index 892baa8d4f..924def653b 100644
--- a/Main.py
+++ b/Main.py
@@ -207,6 +207,9 @@ def main(args, seed=None, baked_server_options: dict[str, object] | None = None)
     else:
         logger.info("Progression balancing skipped.")
 
+    AutoWorld.call_all(multiworld, "finalize_multiworld")
+    AutoWorld.call_all(multiworld, "pre_output")
+
     # we're about to output using multithreading, so we're removing the global random state to prevent accidental use
     multiworld.random.passthrough = False
 
@@ -326,7 +329,7 @@ def main(args, seed=None, baked_server_options: dict[str, object] | None = None)
                     if current_sphere:
                         spheres.append(dict(current_sphere))
 
-                multidata: NetUtils.MultiData | bytes = {
+                multidata: NetUtils.MultiData = {
                     "slot_data": slot_data,
                     "slot_info": slot_info,
                     "connect_names": {name: (0, player) for player, name in multiworld.player_name.items()},
@@ -350,11 +353,11 @@ def main(args, seed=None, baked_server_options: dict[str, object] | None = None)
                 for key in ("slot_data", "er_hint_data"):
                     multidata[key] = convert_to_base_types(multidata[key])
 
-                multidata = zlib.compress(restricted_dumps(multidata), 9)
+                serialized_multidata = zlib.compress(restricted_dumps(multidata), 9)
 
                 with open(os.path.join(temp_dir, f'{outfilebase}.archipelago'), 'wb') as f:
                     f.write(bytes([3]))  # version of format
-                    f.write(multidata)
+                    f.write(serialized_multidata)
 
             output_file_futures.append(pool.submit(write_multidata))
             if not check_accessibility_task.result():
diff --git a/ModuleUpdate.py b/ModuleUpdate.py
index db42f8e5ab..a8bf3993b3 100644
--- a/ModuleUpdate.py
+++ b/ModuleUpdate.py
@@ -5,15 +5,16 @@ import multiprocessing
 import warnings
 
 
-if sys.platform in ("win32", "darwin") and sys.version_info < (3, 11, 9):
+if sys.platform in ("win32", "darwin") and not (3, 11, 9) <= sys.version_info < (3, 14, 0):
     # Official micro version updates. This should match the number in docs/running from source.md.
-    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. Official 3.11.9+ is supported.")
+    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. "
+                       "Official 3.11.9 through 3.13.x is supported.")
 elif sys.platform in ("win32", "darwin") and sys.version_info < (3, 11, 13):
     # There are known security issues, but no easy way to install fixed versions on Windows for testing.
     warnings.warn(f"Python Version {sys.version_info} has security issues. Don't use in production.")
-elif sys.version_info < (3, 11, 0):
+elif not (3, 11, 0) <= sys.version_info < (3, 14, 0):
     # Other platforms may get security backports instead of micro updates, so the number is unreliable.
-    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. 3.11.0+ is supported.")
+    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. 3.11.0 through 3.13.x is supported.")
 
 # don't run update if environment is frozen/compiled or if not the parent process (skip in subprocess)
 _skip_update = bool(
diff --git a/MultiServer.py b/MultiServer.py
index 1de44caddc..ed14b6506f 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -21,6 +21,7 @@ import time
 import typing
 import weakref
 import zlib
+from signal import SIGINT, SIGTERM, signal
 
 import ModuleUpdate
 
@@ -69,6 +70,12 @@ def remove_from_list(container, value):
 
 
 def pop_from_container(container, value):
+    if isinstance(container, list) and isinstance(value, int) and len(container) <= value:
+        return container
+
+    if isinstance(container, dict) and value not in container:
+        return container
+
     try:
         container.pop(value)
     except ValueError:
@@ -490,10 +497,11 @@ class Context:
 
         self.read_data = {}
         # there might be a better place to put this.
-        self.read_data["race_mode"] = lambda: decoded_obj.get("race_mode", 0)
+        race_mode = decoded_obj.get("race_mode", 0)
+        self.read_data["race_mode"] = lambda: race_mode
         mdata_ver = decoded_obj["minimum_versions"]["server"]
         if mdata_ver > version_tuple:
-            raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver},"
+            raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver}, "
                                f"however this server is of version {version_tuple}")
         self.generator_version = Version(*decoded_obj["version"])
         clients_ver = decoded_obj["minimum_versions"].get("clients", {})
@@ -911,12 +919,6 @@ async def server(websocket: "ServerConnection", path: str = "/", ctx: Context =
 
 
 async def on_client_connected(ctx: Context, client: Client):
-    players = []
-    for team, clients in ctx.clients.items():
-        for slot, connected_clients in clients.items():
-            if connected_clients:
-                name = ctx.player_names[team, slot]
-                players.append(NetworkPlayer(team, slot, ctx.name_aliases.get((team, slot), name), name))
     games = {ctx.games[x] for x in range(1, len(ctx.games) + 1)}
     games.add("Archipelago")
     await ctx.send_msgs(client, [{
@@ -1301,6 +1303,13 @@ class CommandMeta(type):
             commands.update(base.commands)
         commands.update({command_name[5:]: method for command_name, method in attrs.items() if
                          command_name.startswith("_cmd_")})
+        for command_name, method in commands.items():
+            # wrap async def functions so they run on default asyncio loop
+            if inspect.iscoroutinefunction(method):
+                def _wrapper(self, *args, _method=method, **kwargs):
+                    return async_start(_method(self, *args, **kwargs))
+                functools.update_wrapper(_wrapper, method)
+                commands[command_name] = _wrapper
         return super(CommandMeta, cls).__new__(cls, name, bases, attrs)
 
 
@@ -1364,7 +1373,10 @@ class CommandProcessor(metaclass=CommandMeta):
                         argname += "=" + parameter.default
                 argtext += argname
                 argtext += " "
-            doctext = '\n    '.join(inspect.getdoc(method).split('\n'))
+            method_doc = inspect.getdoc(method)
+            if method_doc is None:
+                method_doc = "(missing help text)"
+            doctext = "\n    ".join(method_doc.split("\n"))
             s += f"{self.marker}{command} {argtext}\n    {doctext}\n"
         return s
 
@@ -2560,6 +2572,8 @@ async def console(ctx: Context):
             input_text = await queue.get()
             queue.task_done()
             ctx.commandprocessor(input_text)
+        except asyncio.exceptions.CancelledError:
+            ctx.logger.info("ConsoleTask cancelled")
         except:
             import traceback
             traceback.print_exc()
@@ -2726,6 +2740,26 @@ async def main(args: argparse.Namespace):
     console_task = asyncio.create_task(console(ctx))
     if ctx.auto_shutdown:
         ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, [console_task]))
+
+    def stop():
+        try:
+            for remove_signal in [SIGINT, SIGTERM]:
+                asyncio.get_event_loop().remove_signal_handler(remove_signal)
+        except NotImplementedError:
+            pass
+        ctx.commandprocessor._cmd_exit()
+
+    def shutdown(signum, frame):
+        stop()
+
+    try:
+        for sig in [SIGINT, SIGTERM]:
+            asyncio.get_event_loop().add_signal_handler(sig, stop)
+    except NotImplementedError:
+        # add_signal_handler is only implemented for UNIX platforms
+        for sig in [SIGINT, SIGTERM]:
+            signal(sig, shutdown)
+
     await ctx.exit_event.wait()
     console_task.cancel()
     if ctx.shutdown_task:
diff --git a/Options.py b/Options.py
index d4e42fc02d..57119ff66c 100644
--- a/Options.py
+++ b/Options.py
@@ -24,6 +24,39 @@ if typing.TYPE_CHECKING:
     import pathlib
 
 
+_RANDOM_OPTS = [
+        "random", "random-low", "random-middle", "random-high", 
+        "random-range-low-<min>-<max>", "random-range-middle-<min>-<max>",
+        "random-range-high-<min>-<max>", "random-range-<min>-<max>",
+]
+    
+    
+def triangular(lower: int, end: int, tri: float = 0.5) -> int:
+    """
+    Integer triangular distribution for `lower` inclusive to `end` inclusive.
+
+    Expects `lower <= end` and `0.0 <= tri <= 1.0`. The result of other inputs is undefined.
+    """
+    # Use the continuous range [lower, end + 1) to produce an integer result in [lower, end].
+    # random.triangular is actually [a, b] and not [a, b), so there is a very small chance of getting exactly b even
+    # when a != b, so ensure the result is never more than `end`.
+    return min(end, math.floor(random.triangular(0.0, 1.0, tri) * (end - lower + 1) + lower))
+  
+
+def random_weighted_range(text: str, range_start: int, range_end: int):
+    if text == "random-low":
+        return triangular(range_start, range_end, 0.0)
+    elif text == "random-high":
+        return triangular(range_start, range_end, 1.0)
+    elif text == "random-middle":
+        return triangular(range_start, range_end)
+    elif text == "random":
+        return random.randint(range_start, range_end)
+    else:
+            raise Exception(f"random text \"{text}\" did not resolve to a recognized pattern. "
+                            f"Acceptable values are: {', '.join(_RANDOM_OPTS)}.")
+
+        
 def roll_percentage(percentage: int | float) -> bool:
     """Roll a percentage chance.
     percentage is expected to be in range [0, 100]"""
@@ -417,10 +450,12 @@ class Toggle(NumericOption):
     def from_text(cls, text: str) -> Toggle:
         if text == "random":
             return cls(random.choice(list(cls.name_lookup)))
-        elif text.lower() in {"off", "0", "false", "none", "null", "no"}:
+        elif text.lower() in {"off", "0", "false", "none", "null", "no", "disabled"}:
             return cls(0)
-        else:
+        elif text.lower() in {"on", "1", "true", "yes", "enabled"}:
             return cls(1)
+        else:
+            raise OptionError(f"Option {cls.__name__} does not support a value of {text}")
 
     @classmethod
     def from_any(cls, data: typing.Any):
@@ -523,9 +558,9 @@ class Choice(NumericOption):
 
 class TextChoice(Choice):
     """Allows custom string input and offers choices. Choices will resolve to int and text will resolve to string"""
-    value: typing.Union[str, int]
+    value: str | int
 
-    def __init__(self, value: typing.Union[str, int]):
+    def __init__(self, value: str | int):
         assert isinstance(value, str) or isinstance(value, int), \
             f"'{value}' is not a valid option for '{self.__class__.__name__}'"
         self.value = value
@@ -546,7 +581,7 @@ class TextChoice(Choice):
         return cls(text)
 
     @classmethod
-    def get_option_name(cls, value: T) -> str:
+    def get_option_name(cls, value: str | int) -> str:
         if isinstance(value, str):
             return value
         return super().get_option_name(value)
@@ -713,33 +748,39 @@ class Range(NumericOption):
             # these are the conditions where "true" and "false" make sense
             if text == "true":
                 return cls.from_any(cls.default)
-            else:  # "false"
-                return cls(0)
-        return cls(int(text))
+            # "false"
+            return cls(0)
+
+        try:
+            num = int(text)
+        except ValueError:
+            # text is not a number
+            # Handle conditionally acceptable values here rather than in the f-string
+            default = ""
+            truefalse = ""
+            if hasattr(cls, "default"):
+                default = ", default"
+                if cls.range_start == 0 and cls.default != 0:
+                    truefalse = ", \"true\", \"false\""
+            raise Exception(f"Invalid range value {text!r}. Acceptable values are: "
+                            f"<int>{default}, high, low{truefalse}, "
+                            f"{', '.join(cls._RANDOM_OPTS)}.")
+
+        return cls(num)
+
 
     @classmethod
     def weighted_range(cls, text) -> Range:
-        if text == "random-low":
-            return cls(cls.triangular(cls.range_start, cls.range_end, 0.0))
-        elif text == "random-high":
-            return cls(cls.triangular(cls.range_start, cls.range_end, 1.0))
-        elif text == "random-middle":
-            return cls(cls.triangular(cls.range_start, cls.range_end))
-        elif text.startswith("random-range-"):
+        if text.startswith("random-range-"):
             return cls.custom_range(text)
-        elif text == "random":
-            return cls(random.randint(cls.range_start, cls.range_end))
         else:
-            raise Exception(f"random text \"{text}\" did not resolve to a recognized pattern. "
-                            f"Acceptable values are: random, random-high, random-middle, random-low, "
-                            f"random-range-low-<min>-<max>, random-range-middle-<min>-<max>, "
-                            f"random-range-high-<min>-<max>, or random-range-<min>-<max>.")
+            return cls(random_weighted_range(text, cls.range_start, cls.range_end))
 
     @classmethod
     def custom_range(cls, text) -> Range:
         textsplit = text.split("-")
         try:
-            random_range = [int(textsplit[len(textsplit) - 2]), int(textsplit[len(textsplit) - 1])]
+            random_range = [int(textsplit[-2]), int(textsplit[-1])]
         except ValueError:
             raise ValueError(f"Invalid random range {text} for option {cls.__name__}")
         random_range.sort()
@@ -747,14 +788,9 @@ class Range(NumericOption):
             raise Exception(
                 f"{random_range[0]}-{random_range[1]} is outside allowed range "
                 f"{cls.range_start}-{cls.range_end} for option {cls.__name__}")
-        if text.startswith("random-range-low"):
-            return cls(cls.triangular(random_range[0], random_range[1], 0.0))
-        elif text.startswith("random-range-middle"):
-            return cls(cls.triangular(random_range[0], random_range[1]))
-        elif text.startswith("random-range-high"):
-            return cls(cls.triangular(random_range[0], random_range[1], 1.0))
-        else:
-            return cls(random.randint(random_range[0], random_range[1]))
+        if textsplit[2] in ("low", "middle", "high"):
+            return cls(random_weighted_range(f"{textsplit[0]}-{textsplit[2]}", *random_range))
+        return cls(random_weighted_range("random", *random_range))
 
     @classmethod
     def from_any(cls, data: typing.Any) -> Range:
@@ -769,18 +805,6 @@ class Range(NumericOption):
     def __str__(self) -> str:
         return str(self.value)
 
-    @staticmethod
-    def triangular(lower: int, end: int, tri: float = 0.5) -> int:
-        """
-        Integer triangular distribution for `lower` inclusive to `end` inclusive.
-
-        Expects `lower <= end` and `0.0 <= tri <= 1.0`. The result of other inputs is undefined.
-        """
-        # Use the continuous range [lower, end + 1) to produce an integer result in [lower, end].
-        # random.triangular is actually [a, b] and not [a, b), so there is a very small chance of getting exactly b even
-        # when a != b, so ensure the result is never more than `end`.
-        return min(end, math.floor(random.triangular(0.0, 1.0, tri) * (end - lower + 1) + lower))
-
 
 class NamedRange(Range):
     special_range_names: typing.Dict[str, int] = {}
@@ -870,7 +894,7 @@ class VerifyKeys(metaclass=FreezeValidKeys):
     def __iter__(self) -> typing.Iterator[typing.Any]:
         return self.value.__iter__()
 
-    
+
 class OptionDict(Option[typing.Dict[str, typing.Any]], VerifyKeys, typing.Mapping[str, typing.Any]):
     default = {}
     supports_weighting = False
@@ -885,7 +909,8 @@ class OptionDict(Option[typing.Dict[str, typing.Any]], VerifyKeys, typing.Mappin
         else:
             raise NotImplementedError(f"Cannot Convert from non-dictionary, got {type(data)}")
 
-    def get_option_name(self, value):
+    @classmethod
+    def get_option_name(cls, value):
         return ", ".join(f"{key}: {v}" for key, v in value.items())
 
     def __getitem__(self, item: str) -> typing.Any:
@@ -965,7 +990,8 @@ class OptionList(Option[typing.List[typing.Any]], VerifyKeys):
             return cls(data)
         return cls.from_text(str(data))
 
-    def get_option_name(self, value):
+    @classmethod
+    def get_option_name(cls, value):
         return ", ".join(map(str, value))
 
     def __contains__(self, item):
@@ -975,13 +1001,19 @@ class OptionList(Option[typing.List[typing.Any]], VerifyKeys):
 class OptionSet(Option[typing.Set[str]], VerifyKeys):
     default = frozenset()
     supports_weighting = False
+    random_str: str | None
 
-    def __init__(self, value: typing.Iterable[str]):
+    def __init__(self, value: typing.Iterable[str], random_str: str | None = None):
         self.value = set(deepcopy(value))
+        self.random_str = random_str
         super(OptionSet, self).__init__()
 
     @classmethod
     def from_text(cls, text: str):
+        check_text = text.lower().split(",")
+        if ((cls.valid_keys or cls.verify_item_name or cls.verify_location_name)
+                and len(check_text) == 1 and check_text[0].startswith("random")):
+            return cls((), check_text[0])
         return cls([option.strip() for option in text.split(",")])
 
     @classmethod
@@ -990,7 +1022,37 @@ class OptionSet(Option[typing.Set[str]], VerifyKeys):
             return cls(data)
         return cls.from_text(str(data))
 
-    def get_option_name(self, value):
+    def verify(self, world: typing.Type[World], player_name: str, plando_options: PlandoOptions) -> None:
+        if self.random_str and not self.value:
+            choice_list = sorted(self.valid_keys)
+            if self.verify_item_name:
+                choice_list.extend(sorted(world.item_names))
+            if self.verify_location_name:
+                choice_list.extend(sorted(world.location_names))
+            if self.random_str.startswith("random-range-"):
+                textsplit = self.random_str.split("-")
+                try:
+                    random_range = [int(textsplit[-2]), int(textsplit[-1])]
+                except ValueError:
+                    raise ValueError(f"Invalid random range {self.random_str} for option {self.__class__.__name__} "
+                                     f"for player {player_name}")
+                random_range.sort()
+                if random_range[0] < 0 or random_range[1] > len(choice_list):
+                    raise Exception(
+                        f"{random_range[0]}-{random_range[1]} is outside allowed range "
+                        f"0-{len(choice_list)} for option {self.__class__.__name__} for player {player_name}")
+                if textsplit[2] in ("low", "middle", "high"):
+                    choice_count = random_weighted_range(f"{textsplit[0]}-{textsplit[2]}",
+                                                         random_range[0], random_range[1])
+                else:
+                    choice_count = random_weighted_range("random", random_range[0], random_range[1])
+            else:
+                choice_count = random_weighted_range(self.random_str, 0, len(choice_list))
+            self.value = set(random.sample(choice_list, k=choice_count))
+        super(Option, self).verify(world, player_name, plando_options)
+
+    @classmethod
+    def get_option_name(cls, value):
         return ", ".join(sorted(value))
 
     def __contains__(self, item):
@@ -1018,6 +1080,8 @@ class PlandoTexts(Option[typing.List[PlandoText]], VerifyKeys):
     supports_weighting = False
     display_name = "Plando Texts"
 
+    visibility = Visibility.template | Visibility.complex_ui | Visibility.spoiler
+
     def __init__(self, value: typing.Iterable[PlandoText]) -> None:
         self.value = list(deepcopy(value))
         super().__init__()
@@ -1144,6 +1208,8 @@ class PlandoConnections(Option[typing.List[PlandoConnection]], metaclass=Connect
     entrances: typing.ClassVar[typing.AbstractSet[str]]
     exits: typing.ClassVar[typing.AbstractSet[str]]
 
+    visibility = Visibility.template | Visibility.complex_ui | Visibility.spoiler
+
     duplicate_exits: bool = False
     """Whether or not exits should be allowed to be duplicate."""
 
@@ -1435,6 +1501,7 @@ class DeathLink(Toggle):
 class ItemLinks(OptionList):
     """Share part of your item pool with other players."""
     display_name = "Item Links"
+    visibility = Visibility.template | Visibility.complex_ui | Visibility.spoiler
     rich_text_doc = True
     default = []
     schema = Schema([
@@ -1519,6 +1586,7 @@ class PlandoItems(Option[typing.List[PlandoItem]]):
     default = ()
     supports_weighting = False
     display_name = "Plando Items"
+    visibility = Visibility.template | Visibility.spoiler
 
     def __init__(self, value: typing.Iterable[PlandoItem]) -> None:
         self.value = list(deepcopy(value))
@@ -1629,7 +1697,7 @@ class PlandoItems(Option[typing.List[PlandoItem]]):
     def __len__(self) -> int:
         return len(self.value)
 
-        
+
 class Removed(FreeText):
     """This Option has been Removed."""
     rich_text_doc = True
@@ -1715,8 +1783,10 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
     from Utils import local_path, __version__
 
     full_path: str
+    preset_folder = os.path.join(target_folder, "Presets")
 
     os.makedirs(target_folder, exist_ok=True)
+    os.makedirs(preset_folder, exist_ok=True)
 
     # clean out old
     for file in os.listdir(target_folder):
@@ -1724,18 +1794,30 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
         if os.path.isfile(full_path) and full_path.endswith(".yaml"):
             os.unlink(full_path)
 
-    def dictify_range(option: Range):
-        data = {option.default: 50}
-        for sub_option in ["random", "random-low", "random-high"]:
-            if sub_option != option.default:
-                data[sub_option] = 0
+    for file in os.listdir(preset_folder):
+        full_path = os.path.join(preset_folder, file)
+        if os.path.isfile(full_path) and full_path.endswith(".yaml"):
+            os.unlink(full_path)
 
-        notes = {}
+    def dictify_range(option: Range, option_val: int | str):
+        data = {option_val: 50}
+        for sub_option in ["random", "random-low", "random-high",
+                           f"random-range-{option.range_start}-{option.range_end}"]:
+            if sub_option != option_val:
+                data[sub_option] = 0
+        notes = {
+            "random-low": "random value weighted towards lower values",
+            "random-high": "random value weighted towards higher values",
+            f"random-range-{option.range_start}-{option.range_end}": f"random value between "
+                                                                     f"{option.range_start} and {option.range_end}"
+        }
         for name, number in getattr(option, "special_range_names", {}).items():
             notes[name] = f"equivalent to {number}"
             if number in data:
                 data[name] = data[number]
                 del data[number]
+            elif name in data:
+                pass
             else:
                 data[name] = 0
 
@@ -1751,20 +1833,27 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
 
     for game_name, world in AutoWorldRegister.world_types.items():
         if not world.hidden or generate_hidden:
+            presets = world.web.options_presets.copy()
+            presets.update({"": {}})
+
             option_groups = get_option_groups(world)
-
-            res = template.render(
-                option_groups=option_groups,
-                __version__=__version__,
-                game=game_name,
-                world_version=world.world_version.as_simple_string(),
-                yaml_dump=yaml_dump_scalar,
-                dictify_range=dictify_range,
-                cleandoc=cleandoc,
-            )
-
-            with open(os.path.join(target_folder, get_file_safe_name(game_name) + ".yaml"), "w", encoding="utf-8-sig") as f:
-                f.write(res)
+            for name, preset in presets.items():
+                res = template.render(
+                    option_groups=option_groups,
+                    __version__=__version__,
+                    game=game_name, 
+                    world_version=world.world_version.as_simple_string(),
+                    yaml_dump=yaml_dump_scalar,
+                    dictify_range=dictify_range,
+                    cleandoc=cleandoc,
+                    preset_name=name,
+                    preset=preset,
+                )
+                preset_name = f" - {name}" if name else ""
+                with open(os.path.join(preset_folder if name else target_folder,
+                                       get_file_safe_name(game_name + preset_name) + ".yaml"),
+                          "w", encoding="utf-8-sig") as f:
+                    f.write(res)
 
 
 def dump_player_options(multiworld: MultiWorld) -> None:
diff --git a/OptionsCreator.py b/OptionsCreator.py
new file mode 100644
index 0000000000..94ca8ba7ac
--- /dev/null
+++ b/OptionsCreator.py
@@ -0,0 +1,708 @@
+if __name__ == "__main__":
+    import ModuleUpdate
+
+    ModuleUpdate.update()
+
+
+from kvui import (ThemedApp, ScrollBox, MainLayout, ContainerLayout, dp, Widget, MDBoxLayout, TooltipLabel, MDLabel,
+                  ToggleButton, MarkupDropdown, ResizableTextField)
+from kivy.clock import Clock
+from kivy.uix.behaviors.button import ButtonBehavior
+from kivymd.uix.behaviors import RotateBehavior
+from kivymd.uix.anchorlayout import MDAnchorLayout
+from kivymd.uix.expansionpanel import MDExpansionPanel, MDExpansionPanelContent, MDExpansionPanelHeader
+from kivymd.uix.list import MDListItem, MDListItemTrailingIcon, MDListItemSupportingText
+from kivymd.uix.slider import MDSlider
+from kivymd.uix.snackbar import MDSnackbar, MDSnackbarText
+from kivymd.uix.menu import MDDropdownMenu
+from kivymd.uix.button import MDButton, MDButtonText, MDIconButton
+from kivymd.uix.dialog import MDDialog
+from kivy.core.text.markup import MarkupLabel
+from kivy.utils import escape_markup
+from kivy.lang.builder import Builder
+from kivy.properties import ObjectProperty
+from textwrap import dedent
+from copy import deepcopy
+import Utils
+import typing
+import webbrowser
+import re
+from urllib.parse import urlparse
+from worlds.AutoWorld import AutoWorldRegister, World
+from Options import (Option, Toggle, TextChoice, Choice, FreeText, NamedRange, Range, OptionSet, OptionList,
+                     OptionCounter, Visibility)
+
+
+def validate_url(x):
+    try:
+        result = urlparse(x)
+        return all([result.scheme, result.netloc])
+    except AttributeError:
+        return False
+
+
+def filter_tooltip(tooltip):
+    if tooltip is None:
+        tooltip = "No tooltip available."
+    tooltip = dedent(tooltip).strip().replace("\n", "<br>").replace("&", "&amp;") \
+        .replace("[", "&bl;").replace("]", "&br;")
+    tooltip = re.sub(r"\*\*(.+?)\*\*", r"[b]\g<1>[/b]", tooltip)
+    tooltip = re.sub(r"\*(.+?)\*", r"[i]\g<1>[/i]", tooltip)
+    return escape_markup(tooltip)
+
+
+def option_can_be_randomized(option: typing.Type[Option]):
+    # most options can be randomized, so we should just check for those that cannot
+    if not option.supports_weighting:
+        return False
+    elif issubclass(option, FreeText) and not issubclass(option, TextChoice):
+        return False
+    return True
+
+
+def check_random(value: typing.Any):
+    if not isinstance(value, str):
+        return value  # cannot be random if evaluated
+    if value.startswith("random-"):
+        return "random"
+    return value
+
+
+class TrailingPressedIconButton(ButtonBehavior, RotateBehavior, MDListItemTrailingIcon):
+    pass
+
+
+class WorldButton(ToggleButton):
+    world_cls: typing.Type[World]
+
+
+class VisualRange(MDBoxLayout):
+    option: typing.Type[Range]
+    name: str
+    tag: MDLabel = ObjectProperty(None)
+    slider: MDSlider = ObjectProperty(None)
+
+    def __init__(self, *args, option: typing.Type[Range], name: str, **kwargs):
+        self.option = option
+        self.name = name
+        super().__init__(*args, **kwargs)
+
+        def update_points(*update_args):
+            pass
+
+        self.slider._update_points = update_points
+
+
+class VisualChoice(MDButton):
+    option: typing.Type[Choice]
+    name: str
+    text: MDButtonText = ObjectProperty(None)
+
+    def __init__(self, *args, option: typing.Type[Choice], name: str, **kwargs):
+        self.option = option
+        self.name = name
+        super().__init__(*args, **kwargs)
+
+
+class VisualNamedRange(MDBoxLayout):
+    option: typing.Type[NamedRange]
+    name: str
+    range: VisualRange = ObjectProperty(None)
+    choice: MDButton = ObjectProperty(None)
+
+    def __init__(self, *args, option: typing.Type[NamedRange], name: str, range_widget: VisualRange, **kwargs):
+        self.option = option
+        self.name = name
+        super().__init__(*args, **kwargs)
+        self.range = range_widget
+        self.add_widget(self.range)
+
+
+class VisualFreeText(ResizableTextField):
+    option: typing.Type[FreeText] | typing.Type[TextChoice]
+    name: str
+
+    def __init__(self, *args, option: typing.Type[FreeText] | typing.Type[TextChoice], name: str, **kwargs):
+        self.option = option
+        self.name = name
+        super().__init__(*args, **kwargs)
+
+
+class VisualTextChoice(MDBoxLayout):
+    option: typing.Type[TextChoice]
+    name: str
+    choice: VisualChoice = ObjectProperty(None)
+    text: VisualFreeText = ObjectProperty(None)
+
+    def __init__(self, *args, option: typing.Type[TextChoice], name: str, choice: VisualChoice,
+                 text: VisualFreeText, **kwargs):
+        self.option = option
+        self.name = name
+        super(MDBoxLayout, self).__init__(*args, **kwargs)
+        self.choice = choice
+        self.text = text
+        self.add_widget(self.choice)
+        self.add_widget(self.text)
+
+
+class VisualToggle(MDBoxLayout):
+    button: MDIconButton = ObjectProperty(None)
+    option: typing.Type[Toggle]
+    name: str
+
+    def __init__(self, *args, option: typing.Type[Toggle], name: str, **kwargs):
+        self.option = option
+        self.name = name
+        super().__init__(*args, **kwargs)
+
+
+class CounterItemValue(ResizableTextField):
+    pat = re.compile('[^0-9]')
+
+    def insert_text(self, substring, from_undo=False):
+        return super().insert_text(re.sub(self.pat, "", substring), from_undo=from_undo)
+
+
+class VisualListSetCounter(MDDialog):
+    button: MDIconButton = ObjectProperty(None)
+    option: typing.Type[OptionSet] | typing.Type[OptionList] | typing.Type[OptionCounter]
+    scrollbox: ScrollBox = ObjectProperty(None)
+    add: MDIconButton = ObjectProperty(None)
+    save: MDButton = ObjectProperty(None)
+    input: ResizableTextField = ObjectProperty(None)
+    dropdown: MDDropdownMenu
+    valid_keys: typing.Iterable[str]
+
+    def __init__(self, *args, option: typing.Type[OptionSet] | typing.Type[OptionList],
+                 name: str, valid_keys: typing.Iterable[str], **kwargs):
+        self.option = option
+        self.name = name
+        self.valid_keys = valid_keys
+        super().__init__(*args, **kwargs)
+        self.dropdown = MarkupDropdown(caller=self.input, border_margin=dp(2),
+                                       width=self.input.width, position="bottom")
+        self.input.bind(text=self.on_text)
+        self.input.bind(on_text_validate=self.validate_add)
+
+    def validate_add(self, instance):
+        if self.valid_keys:
+            if self.input.text not in self.valid_keys:
+                MDSnackbar(MDSnackbarText(text="Item must be a valid key for this option."), y=dp(24),
+                           pos_hint={"center_x": 0.5}, size_hint_x=0.5).open()
+                return
+
+        if not issubclass(self.option, OptionList):
+            if any(self.input.text == child.text.text for child in self.scrollbox.layout.children):
+                MDSnackbar(MDSnackbarText(text="This value is already in the set."), y=dp(24),
+                           pos_hint={"center_x": 0.5}, size_hint_x=0.5).open()
+                return
+
+        self.add_set_item(self.input.text)
+        self.input.set_text(self.input, "")
+
+    def remove_item(self, button: MDIconButton):
+        list_item = button.parent
+        self.scrollbox.layout.remove_widget(list_item)
+
+    def add_set_item(self, key: str, value: int | None = None):
+        text = MDListItemSupportingText(text=key, id="value")
+        if issubclass(self.option, OptionCounter):
+            value_txt = CounterItemValue(text=str(value) if value else "1")
+            item = MDListItem(text,
+                              value_txt,
+                              MDIconButton(icon="minus", on_release=self.remove_item), focus_behavior=False)
+            item.value = value_txt
+        else:
+            item = MDListItem(text, MDIconButton(icon="minus", on_release=self.remove_item), focus_behavior=False)
+        item.text = text
+        self.scrollbox.layout.add_widget(item)
+
+    def on_text(self, instance, value):
+        if not self.valid_keys:
+            return
+        if len(value) >= 3:
+            self.dropdown.items.clear()
+
+            def on_press(txt):
+                split_text = MarkupLabel(text=txt, markup=True).markup
+                self.input.set_text(self.input, "".join(text_frag for text_frag in split_text
+                                                        if not text_frag.startswith("[")))
+                self.input.focus = True
+                self.dropdown.dismiss()
+
+            lowered = value.lower()
+            for item_name in self.valid_keys:
+                try:
+                    index = item_name.lower().index(lowered)
+                except ValueError:
+                    pass  # substring not found
+                else:
+                    text = escape_markup(item_name)
+                    text = text[:index] + "[b]" + text[index:index + len(value)] + "[/b]" + text[index + len(value):]
+                    self.dropdown.items.append({
+                        "text": text,
+                        "on_release": lambda txt=text: on_press(txt),
+                        "markup": True
+                    })
+            if not self.dropdown.parent:
+                self.dropdown.open()
+        else:
+            self.dropdown.dismiss()
+
+
+class OptionsCreator(ThemedApp):
+    base_title: str = "Archipelago Options Creator"
+    container: ContainerLayout
+    main_layout: MainLayout
+    scrollbox: ScrollBox
+    main_panel: MainLayout
+    player_options: MainLayout
+    option_layout: MainLayout
+    name_input: ResizableTextField
+    game_label: MDLabel
+    current_game: str
+    options: typing.Dict[str, typing.Any]
+
+    def __init__(self):
+        self.title = self.base_title + " " + Utils.__version__
+        self.icon = r"data/icon.png"
+        self.current_game = ""
+        self.options = {}
+        super().__init__()
+
+    @staticmethod
+    def show_result_snack(text: str) -> None:
+        MDSnackbar(MDSnackbarText(text=text), y=dp(24), pos_hint={"center_x": 0.5}, size_hint_x=0.5).open()
+
+    def on_export_result(self, text: str | None) -> None:
+        self.container.disabled = False
+        if text is not None:
+            Clock.schedule_once(lambda _: self.show_result_snack(text), 0)
+
+    def export_options_background(self, options: dict[str, typing.Any]) -> None:
+        try:
+            file_name = Utils.save_filename("Export Options File As...", [("YAML", [".yaml"])],
+                                            Utils.get_file_safe_name(f"{self.name_input.text}.yaml"))
+        except Exception:
+            self.on_export_result("Could not open dialog. Already open?")
+            raise
+
+        if not file_name:
+            self.on_export_result(None)  # No file selected. No need to show a message for this.
+            return
+
+        try:
+            with open(file_name, 'w') as f:
+                f.write(Utils.dump(options, sort_keys=False))
+                f.close()
+                self.on_export_result("File saved successfully.")
+        except Exception:
+            self.on_export_result("Could not save file.")
+            raise
+
+    def export_options(self, button: Widget) -> None:
+        if 0 < len(self.name_input.text) < 17 and self.current_game:
+            import threading
+            options = {
+                "name": self.name_input.text,
+                "description": f"YAML generated by Archipelago {Utils.__version__}.",
+                "game": self.current_game,
+                self.current_game: {k: check_random(v) for k, v in self.options.items()}
+            }
+            threading.Thread(target=self.export_options_background, args=(options,), daemon=True).start()
+            self.container.disabled = True
+        elif not self.name_input.text:
+            self.show_result_snack("Name must not be empty.")
+        elif not self.current_game:
+            self.show_result_snack("You must select a game to play.")
+        else:
+            self.show_result_snack("Name cannot be longer than 16 characters.")
+
+    def create_range(self, option: typing.Type[Range], name: str, bind=True):
+        def update_text(range_box: VisualRange):
+            self.options[name] = int(range_box.slider.value)
+            range_box.tag.text = str(int(range_box.slider.value))
+            return
+
+        box = VisualRange(option=option, name=name)
+        if bind:
+            box.slider.bind(value=lambda _, _1: update_text(box))
+        self.options[name] = option.default
+        return box
+
+    def create_named_range(self, option: typing.Type[NamedRange], name: str):
+        def set_to_custom(range_box: VisualNamedRange):
+            range_box.range.tag.text = str(int(range_box.range.slider.value))
+            if range_box.range.slider.value in option.special_range_names.values():
+                value = next(key for key, val in option.special_range_names.items()
+                             if val == range_box.range.slider.value)
+                self.options[name] = value
+                set_button_text(box.choice, value.title())
+            else:
+                self.options[name] = int(range_box.range.slider.value)
+                set_button_text(range_box.choice, "Custom")
+
+        def set_button_text(button: MDButton, text: str):
+            button.text.text = text
+
+        def set_value(text: str, range_box: VisualNamedRange):
+            range_box.range.slider.value = min(max(option.special_range_names[text.lower()], option.range_start),
+                                               option.range_end)
+            range_box.range.tag.text = str(option.special_range_names[text.lower()])
+            set_button_text(range_box.choice, text)
+            self.options[name] = text.lower()
+            range_box.range.slider.dropdown.dismiss()
+
+        def open_dropdown(button):
+            # for some reason this fixes an issue causing some to not open
+            box.range.slider.dropdown.open()
+
+        box = VisualNamedRange(option=option, name=name, range_widget=self.create_range(option, name, bind=False))
+        default: int | str = option.default
+        if default in option.special_range_names:
+            # value can get mismatched in this case
+            box.range.slider.value = min(max(option.special_range_names[default], option.range_start),
+                                               option.range_end)
+            box.range.tag.text = str(int(box.range.slider.value))
+        elif default in option.special_range_names.values():
+            # better visual
+            default = next(key for key, val in option.special_range_names.items() if val == option.default)
+            set_button_text(box.choice, default.title())
+        box.range.slider.bind(value=lambda _, _2: set_to_custom(box))
+        items = [
+            {
+                "text": choice.title(),
+                "on_release": lambda text=choice.title(): set_value(text, box)
+            }
+            for choice in option.special_range_names
+        ]
+        box.range.slider.dropdown = MDDropdownMenu(caller=box.choice, items=items)
+        box.choice.bind(on_release=open_dropdown)
+        self.options[name] = default
+        return box
+
+    def create_free_text(self, option: typing.Type[FreeText] | typing.Type[TextChoice], name: str):
+        text = VisualFreeText(option=option, name=name)
+
+        def set_value(instance):
+            self.options[name] = instance.text
+
+        text.bind(on_text_validate=set_value)
+        return text
+
+    def create_choice(self, option: typing.Type[Choice], name: str):
+        def set_button_text(button: VisualChoice, text: str):
+            button.text.text = text
+
+        def set_value(text, value):
+            set_button_text(main_button, text)
+            self.options[name] = value
+            dropdown.dismiss()
+
+        def open_dropdown(button):
+            # for some reason this fixes an issue causing some to not open
+            dropdown.open()
+
+        default_string = isinstance(option.default, str)
+        main_button = VisualChoice(option=option, name=name)
+        main_button.bind(on_release=open_dropdown)
+
+        items = [
+            {
+                "text": option.get_option_name(choice),
+                "on_release": lambda val=choice: set_value(option.get_option_name(val), option.name_lookup[val])
+            }
+            for choice in option.name_lookup
+        ]
+        dropdown = MDDropdownMenu(caller=main_button, items=items)
+        self.options[name] = option.name_lookup[option.default] if not default_string else option.default
+        return main_button
+
+    def create_text_choice(self, option: typing.Type[TextChoice], name: str):
+        def set_button_text(button: MDButton, text: str):
+            for child in button.children:
+                if isinstance(child, MDButtonText):
+                    child.text = text
+
+        box = VisualTextChoice(option=option, name=name, choice=self.create_choice(option, name),
+                               text=self.create_free_text(option, name))
+
+        def set_value(instance):
+            set_button_text(box.choice, "Custom")
+            self.options[name] = instance.text
+
+        box.text.bind(on_text_validate=set_value)
+        return box
+
+    def create_toggle(self, option: typing.Type[Toggle], name: str) -> Widget:
+        def set_value(instance: MDIconButton):
+            if instance.icon == "checkbox-outline":
+                instance.icon = "checkbox-blank-outline"
+            else:
+                instance.icon = "checkbox-outline"
+            self.options[name] = bool(not self.options[name])
+
+        self.options[name] = bool(option.default)
+        checkbox = VisualToggle(option=option, name=name)
+        checkbox.button.bind(on_release=set_value)
+
+        return checkbox
+
+    def create_popup(self, option: typing.Type[OptionList] | typing.Type[OptionSet] | typing.Type[OptionCounter],
+                     name: str, world: typing.Type[World]):
+
+        valid_keys = sorted(option.valid_keys)
+        if option.verify_item_name:
+            valid_keys += list(world.item_name_to_id.keys())
+            if option.convert_name_groups:
+                valid_keys += list(world.item_name_groups.keys())
+        if option.verify_location_name:
+            valid_keys += list(world.location_name_to_id.keys())
+            if option.convert_name_groups:
+                valid_keys += list(world.location_name_groups.keys())
+
+        if not issubclass(option, OptionCounter):
+            def apply_changes(button):
+                self.options[name].clear()
+                for list_item in dialog.scrollbox.layout.children:
+                    self.options[name].append(getattr(list_item.text, "text"))
+                dialog.dismiss()
+        else:
+            def apply_changes(button):
+                self.options[name].clear()
+                for list_item in dialog.scrollbox.layout.children:
+                    self.options[name][getattr(list_item.text, "text")] = int(getattr(list_item.value, "text"))
+                dialog.dismiss()
+
+        dialog = VisualListSetCounter(option=option, name=name, valid_keys=valid_keys)
+        dialog.ids.container.spacing = dp(30)
+        dialog.scrollbox.layout.theme_bg_color = "Custom"
+        dialog.scrollbox.layout.md_bg_color = self.theme_cls.surfaceContainerLowColor
+        dialog.scrollbox.layout.spacing = dp(5)
+        dialog.scrollbox.layout.padding = [0, dp(5), 0, 0]
+
+        if issubclass(option, OptionCounter):
+            for value in sorted(self.options[name]):
+                dialog.add_set_item(value, self.options[name].get(value, None))
+        else:
+            for value in sorted(self.options[name]):
+                dialog.add_set_item(value)
+
+        dialog.save.bind(on_release=apply_changes)
+        dialog.open()
+
+    def create_option_set_list_counter(self, option: typing.Type[OptionList] | typing.Type[OptionSet] |
+                                       typing.Type[OptionCounter], name: str, world: typing.Type[World]):
+        main_button = MDButton(MDButtonText(text="Edit"), on_release=lambda x: self.create_popup(option, name, world))
+
+        if name not in self.options:
+            # convert from non-mutable to mutable
+            # We use list syntax even for sets, set behavior is enforced through GUI
+            if issubclass(option, OptionCounter):
+                self.options[name] = deepcopy(option.default)
+            else:
+                self.options[name] = sorted(option.default)
+
+        return main_button
+
+    def create_option(self, option: typing.Type[Option], name: str, world: typing.Type[World]) -> Widget:
+        option_base = MDBoxLayout(orientation="vertical", size_hint_y=None, padding=[0, 0, dp(5), dp(5)])
+
+        tooltip = filter_tooltip(option.__doc__)
+        option_label = TooltipLabel(text=f"[ref=0|{tooltip}]{getattr(option, 'display_name', name)}")
+        label_box = MDBoxLayout(orientation="horizontal")
+        label_anchor = MDAnchorLayout(anchor_x="right", anchor_y="center")
+        label_anchor.add_widget(option_label)
+        label_box.add_widget(label_anchor)
+
+        option_base.add_widget(label_box)
+        if issubclass(option, NamedRange):
+            option_base.add_widget(self.create_named_range(option, name))
+        elif issubclass(option, Range):
+            option_base.add_widget(self.create_range(option, name))
+        elif issubclass(option, Toggle):
+            option_base.add_widget(self.create_toggle(option, name))
+        elif issubclass(option, TextChoice):
+            option_base.add_widget(self.create_text_choice(option, name))
+        elif issubclass(option, Choice):
+            option_base.add_widget(self.create_choice(option, name))
+        elif issubclass(option, FreeText):
+            option_base.add_widget(self.create_free_text(option, name))
+        elif any(issubclass(option, cls) for cls in (OptionSet, OptionList, OptionCounter)):
+            option_base.add_widget(self.create_option_set_list_counter(option, name, world))
+        else:
+            option_base.add_widget(MDLabel(text="This option isn't supported by the option creator.\n"
+                                                "Please edit your yaml manually to set this option."))
+
+        if option_can_be_randomized(option):
+            def randomize_option(instance: Widget, value: str):
+                value = value == "down"
+                if value:
+                    self.options[name] = "random-" + str(self.options[name])
+                else:
+                    self.options[name] = self.options[name].replace("random-", "")
+                    if self.options[name].isnumeric():
+                        self.options[name] = int(self.options[name])
+                    elif self.options[name] in ("True", "False"):
+                        self.options[name] = self.options[name] == "True"
+
+                base_object = instance.parent.parent
+                label_object = instance.parent
+                for child in base_object.children:
+                    if child is not label_object:
+                        child.disabled = value
+
+            default_random = option.default == "random"
+            random_toggle = ToggleButton(MDButtonText(text="Random?"), size_hint_x=None, width=dp(100),
+                                         state="down" if default_random else "normal")
+            random_toggle.bind(state=randomize_option)
+            label_box.add_widget(random_toggle)
+            if default_random:
+                randomize_option(random_toggle, "down")
+
+        return option_base
+
+    def create_options_panel(self, world_button: WorldButton):
+        self.option_layout.clear_widgets()
+        self.options.clear()
+        cls: typing.Type[World] = world_button.world_cls
+
+        self.current_game = cls.game
+        if not cls.web.options_page:
+            self.current_game = "None"
+            return
+        elif isinstance(cls.web.options_page, str):
+            self.current_game = "None"
+            if validate_url(cls.web.options_page):
+                webbrowser.open(cls.web.options_page)
+                MDSnackbar(MDSnackbarText(text="Launching in default browser..."), y=dp(24), pos_hint={"center_x": 0.5},
+                           size_hint_x=0.5).open()
+                world_button.state = "normal"
+            else:
+                # attach onto archipelago.gg and see if we pass
+                new_url = "https://archipelago.gg/" + cls.web.options_page
+                if validate_url(new_url):
+                    webbrowser.open(new_url)
+                    MDSnackbar(MDSnackbarText(text="Launching in default browser..."), y=dp(24),
+                               pos_hint={"center_x": 0.5},
+                               size_hint_x=0.5).open()
+                else:
+                    MDSnackbar(MDSnackbarText(text="Invalid options page, please report to world developer."), y=dp(24),
+                               pos_hint={"center_x": 0.5},
+                               size_hint_x=0.5).open()
+                world_button.state = "normal"
+                # else just fall through
+        else:
+            expansion_box = ScrollBox()
+            expansion_box.layout.orientation = "vertical"
+            expansion_box.layout.spacing = dp(3)
+            expansion_box.scroll_type = ["bars"]
+            expansion_box.do_scroll_x = False
+            group_names = ["Game Options", *(group.name for group in cls.web.option_groups)]
+            groups = {name: [] for name in group_names}
+            for name, option in cls.options_dataclass.type_hints.items():
+                group = next((group.name for group in cls.web.option_groups if option in group.options), "Game Options")
+                groups[group].append((name, option))
+
+            for group, options in groups.items():
+                options = [(name, option) for name, option in options
+                           if name and option.visibility & Visibility.simple_ui]
+                if not options:
+                    continue  # Game Options can be empty if every other option is in another group
+                    # Can also have an option group of options that should not render on simple ui
+                group_item = MDExpansionPanel(size_hint_y=None)
+                group_header = MDExpansionPanelHeader(MDListItem(MDListItemSupportingText(text=group),
+                                                                 TrailingPressedIconButton(icon="chevron-right",
+                                                                                           on_release=lambda x,
+                                                                                           item=group_item:
+                                                                                           self.tap_expansion_chevron(
+                                                                                               item, x)),
+                                                                 md_bg_color=self.theme_cls.surfaceContainerLowestColor,
+                                                                 theme_bg_color="Custom",
+                                                                 on_release=lambda x, item=group_item:
+                                                                 self.tap_expansion_chevron(item, x)))
+                group_content = MDExpansionPanelContent(orientation="vertical", theme_bg_color="Custom",
+                                                        md_bg_color=self.theme_cls.surfaceContainerLowestColor,
+                                                        padding=[dp(12), dp(100), dp(12), 0],
+                                                        spacing=dp(3))
+                group_item.add_widget(group_header)
+                group_item.add_widget(group_content)
+                group_box = ScrollBox()
+                group_box.layout.orientation = "vertical"
+                group_box.layout.spacing = dp(3)
+                for name, option in options:
+                    group_content.add_widget(self.create_option(option, name, cls))
+                expansion_box.layout.add_widget(group_item)
+            self.option_layout.add_widget(expansion_box)
+        self.game_label.text = f"Game: {self.current_game}"
+
+    @staticmethod
+    def tap_expansion_chevron(panel: MDExpansionPanel, chevron: TrailingPressedIconButton | MDListItem):
+        if isinstance(chevron, MDListItem):
+            chevron = next((child for child in chevron.ids.trailing_container.children
+                            if isinstance(child, TrailingPressedIconButton)), None)
+        panel.open() if not panel.is_open else panel.close()
+        if chevron:
+            panel.set_chevron_down(
+                chevron
+            ) if not panel.is_open else panel.set_chevron_up(chevron)
+
+    def build(self):
+        self.set_colors()
+        self.options = {}
+        self.container = Builder.load_file(Utils.local_path("data/optionscreator.kv"))
+        self.root = self.container
+        self.main_layout = self.container.ids.main
+        self.scrollbox = self.container.ids.scrollbox
+
+        def world_button_action(world_btn: WorldButton):
+            if self.current_game != world_btn.world_cls.game:
+                old_button = next((button for button in self.scrollbox.layout.children
+                                   if button.world_cls.game == self.current_game), None)
+                if old_button:
+                    old_button.state = "normal"
+            else:
+                world_btn.state = "down"
+            self.create_options_panel(world_btn)
+
+        for world, cls in sorted(AutoWorldRegister.world_types.items(), key=lambda x: x[0]):
+            if cls.hidden:
+                continue
+            world_text = MDButtonText(text=world, size_hint_y=None, width=dp(150),
+                                      pos_hint={"x": 0.03, "center_y": 0.5})
+            world_text.text_size = (world_text.width, None)
+            world_text.bind(width=lambda *x, text=world_text: text.setter('text_size')(text, (text.width, None)),
+                            texture_size=lambda *x, text=world_text: text.setter("height")(text,
+                                                                                           world_text.texture_size[1]))
+            world_button = WorldButton(world_text, size_hint_x=None, width=dp(150), theme_width="Custom",
+                                       radius=(dp(5), dp(5), dp(5), dp(5)))
+            world_button.bind(on_release=world_button_action)
+            world_button.world_cls = cls
+            self.scrollbox.layout.add_widget(world_button)
+        self.main_panel = self.container.ids.player_layout
+        self.player_options = self.container.ids.player_options
+        self.game_label = self.container.ids.game
+        self.name_input = self.container.ids.player_name
+        self.option_layout = self.container.ids.options
+
+        def set_height(instance, value):
+            instance.height = value[1]
+
+        self.game_label.bind(texture_size=set_height)
+
+        # Uncomment to re-enable the Kivy console/live editor
+        # Ctrl-E to enable it, make sure numlock/capslock is disabled
+        # from kivy.modules.console import create_console
+        # from kivy.core.window import Window
+        # create_console(Window, self.container)
+
+        return self.container
+
+
+def launch():
+    OptionsCreator().run()
+
+
+if __name__ == "__main__":
+    Utils.init_logging("OptionsCreator")
+    launch()
diff --git a/README.md b/README.md
index fa87190565..7a0c663db0 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,10 @@ Currently, the following games are supported:
 * Paint
 * Celeste (Open World)
 * Choo-Choo Charles
+* APQuest
+* Satisfactory
+* EarthBound
+* Mega Man 3
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled
diff --git a/UndertaleClient.py b/UndertaleClient.py
index 1c522fac92..b0efce206a 100644
--- a/UndertaleClient.py
+++ b/UndertaleClient.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 import os
 import sys
+import time
 import asyncio
 import typing
 import bsdiff4
@@ -15,6 +16,9 @@ from CommonClient import CommonContext, server_loop, \
     gui_enabled, ClientCommandProcessor, logger, get_base_parser
 from Utils import async_start
 
+# Heartbeat for position sharing via bounces, in seconds
+UNDERTALE_STATUS_INTERVAL = 30.0
+UNDERTALE_ONLINE_TIMEOUT  = 60.0
 
 class UndertaleCommandProcessor(ClientCommandProcessor):
     def __init__(self, ctx):
@@ -109,6 +113,11 @@ class UndertaleContext(CommonContext):
         self.completed_routes = {"pacifist": 0, "genocide": 0, "neutral": 0}
         # self.save_game_folder: files go in this path to pass data between us and the actual game
         self.save_game_folder = os.path.expandvars(r"%localappdata%/UNDERTALE")
+        self.last_sent_position: typing.Optional[tuple] = None
+        self.last_room: typing.Optional[str] = None
+        self.last_status_write: float = 0.0
+        self.other_undertale_status: dict[int, dict] = {}
+
 
     def patch_game(self):
         with open(Utils.user_path("Undertale", "data.win"), "rb") as f:
@@ -219,6 +228,9 @@ async def process_undertale_cmd(ctx: UndertaleContext, cmd: str, args: dict):
         await ctx.send_msgs([{"cmd": "SetNotify", "keys": [str(ctx.slot)+" RoutesDone neutral",
                                                            str(ctx.slot)+" RoutesDone pacifist",
                                                            str(ctx.slot)+" RoutesDone genocide"]}])
+        if any(info.game == "Undertale" and slot != ctx.slot 
+               for slot, info in ctx.slot_info.items()):
+            ctx.set_notify("undertale_room_status")
         if args["slot_data"]["only_flakes"]:
             with open(os.path.join(ctx.save_game_folder, "GenoNoChest.flag"), "w") as f:
                 f.close()
@@ -263,6 +275,12 @@ async def process_undertale_cmd(ctx: UndertaleContext, cmd: str, args: dict):
         if str(ctx.slot)+" RoutesDone pacifist" in args["keys"]:
             if args["keys"][str(ctx.slot) + " RoutesDone pacifist"] is not None:
                 ctx.completed_routes["pacifist"] = args["keys"][str(ctx.slot)+" RoutesDone pacifist"]
+        if "undertale_room_status" in args["keys"] and args["keys"]["undertale_room_status"]:
+            status = args["keys"]["undertale_room_status"]
+            ctx.other_undertale_status = {
+                int(key): val for key, val in status.items()
+                if int(key) != ctx.slot
+            }
     elif cmd == "SetReply":
         if args["value"] is not None:
             if str(ctx.slot)+" RoutesDone pacifist" == args["key"]:
@@ -271,17 +289,19 @@ async def process_undertale_cmd(ctx: UndertaleContext, cmd: str, args: dict):
                 ctx.completed_routes["genocide"] = args["value"]
             elif str(ctx.slot)+" RoutesDone neutral" == args["key"]:
                 ctx.completed_routes["neutral"] = args["value"]
+        if args.get("key") == "undertale_room_status" and args.get("value"):
+            ctx.other_undertale_status = {
+                int(key): val for key, val in args["value"].items()
+                if int(key) != ctx.slot
+            }
     elif cmd == "ReceivedItems":
         start_index = args["index"]
 
         if start_index == 0:
             ctx.items_received = []
         elif start_index != len(ctx.items_received):
-            sync_msg = [{"cmd": "Sync"}]
-            if ctx.locations_checked:
-                sync_msg.append({"cmd": "LocationChecks",
-                                 "locations": list(ctx.locations_checked)})
-            await ctx.send_msgs(sync_msg)
+            await ctx.check_locations(ctx.locations_checked)
+            await ctx.send_msgs([{"cmd": "Sync"}])
         if start_index == len(ctx.items_received):
             counter = -1
             placedWeapon = 0
@@ -368,9 +388,8 @@ async def process_undertale_cmd(ctx: UndertaleContext, cmd: str, args: dict):
                 f.close()
 
     elif cmd == "Bounced":
-        tags = args.get("tags", [])
-        if "Online" in tags:
-            data = args.get("data", {})
+        data = args.get("data", {})
+        if "x" in data and "room" in data:
             if data["player"] != ctx.slot and data["player"] is not None:
                 filename = f"FRISK" + str(data["player"]) + ".playerspot"
                 with open(os.path.join(ctx.save_game_folder, filename), "w") as f:
@@ -381,21 +400,63 @@ async def process_undertale_cmd(ctx: UndertaleContext, cmd: str, args: dict):
 
 async def multi_watcher(ctx: UndertaleContext):
     while not ctx.exit_event.is_set():
-        path = ctx.save_game_folder
-        for root, dirs, files in os.walk(path):
-            for file in files:
-                if "spots.mine" in file and "Online" in ctx.tags:
-                    with open(os.path.join(root, file), "r") as mine:
-                        this_x = mine.readline()
-                        this_y = mine.readline()
-                        this_room = mine.readline()
-                        this_sprite = mine.readline()
-                        this_frame = mine.readline()
-                        mine.close()
-                    message = [{"cmd": "Bounce", "tags": ["Online"],
-                                "data": {"player": ctx.slot, "x": this_x, "y": this_y, "room": this_room,
-                                         "spr": this_sprite, "frm": this_frame}}]
-                    await ctx.send_msgs(message)
+        if "Online" in ctx.tags and any(
+                info.game == "Undertale" and slot != ctx.slot
+                for slot, info in ctx.slot_info.items()):
+            now = time.time()
+            path = ctx.save_game_folder
+            for root, dirs, files in os.walk(path):
+                for file in files:
+                    if "spots.mine" in file:
+                        with open(os.path.join(root, file), "r") as mine:
+                            this_x = mine.readline()
+                            this_y = mine.readline()
+                            this_room = mine.readline()
+                            this_sprite = mine.readline()
+                            this_frame = mine.readline()
+
+                        if this_room != ctx.last_room or \
+                                now - ctx.last_status_write >= UNDERTALE_STATUS_INTERVAL:
+                            ctx.last_room = this_room
+                            ctx.last_status_write = now
+                            await ctx.send_msgs([{
+                                "cmd": "Set",
+                                "key": "undertale_room_status",
+                                "default": {},
+                                "want_reply": False,
+                                "operations": [{"operation": "update",
+                                                "value": {str(ctx.slot): {"room": this_room,
+                                                                           "time": now}}}]
+                            }])
+
+                        # If player was visible but timed out (heartbeat) or left the room, remove them.
+                        for slot, entry in ctx.other_undertale_status.items():
+                            if entry.get("room") != this_room or \
+                                    now - entry.get("time", now) > UNDERTALE_ONLINE_TIMEOUT:
+                                playerspot = os.path.join(ctx.save_game_folder,
+                                                          f"FRISK{slot}.playerspot")
+                                if os.path.exists(playerspot):
+                                    os.remove(playerspot)
+
+                        current_position = (this_x, this_y, this_room, this_sprite, this_frame)
+                        if current_position == ctx.last_sent_position:
+                            continue
+
+                        # Empty status dict = no data yet → send to bootstrap.
+                        online_in_room = any(
+                            entry.get("room") == this_room and
+                            now - entry.get("time", now) <= UNDERTALE_ONLINE_TIMEOUT
+                            for entry in ctx.other_undertale_status.values()
+                        )
+                        if ctx.other_undertale_status and not online_in_room:
+                            continue
+
+                        message = [{"cmd": "Bounce", "games": ["Undertale"],
+                                    "data": {"player": ctx.slot, "x": this_x, "y": this_y,
+                                             "room": this_room, "spr": this_sprite,
+                                             "frm": this_frame}}]
+                        await ctx.send_msgs(message)
+                        ctx.last_sent_position = current_position
 
         await asyncio.sleep(0.1)
 
@@ -409,10 +470,9 @@ async def game_watcher(ctx: UndertaleContext):
                 for file in files:
                     if ".item" in file:
                         os.remove(os.path.join(root, file))
-            sync_msg = [{"cmd": "Sync"}]
-            if ctx.locations_checked:
-                sync_msg.append({"cmd": "LocationChecks", "locations": list(ctx.locations_checked)})
-            await ctx.send_msgs(sync_msg)
+            await ctx.check_locations(ctx.locations_checked)
+            await ctx.send_msgs([{"cmd": "Sync"}])
+
             ctx.syncing = False
         if ctx.got_deathlink:
             ctx.got_deathlink = False
@@ -447,7 +507,7 @@ async def game_watcher(ctx: UndertaleContext):
                         for l in lines:
                             sending = sending+[(int(l.rstrip('\n')))+12000]
                     finally:
-                        await ctx.send_msgs([{"cmd": "LocationChecks", "locations": sending}])
+                        await ctx.check_locations(sending)
                 if "victory" in file and str(ctx.route) in file:
                     victory = True
                 if ".playerspot" in file and "Online" not in ctx.tags:
diff --git a/Utils.py b/Utils.py
index e79e54182d..627235f249 100644
--- a/Utils.py
+++ b/Utils.py
@@ -18,10 +18,14 @@ import logging
 import warnings
 
 from argparse import Namespace
+from datetime import datetime, timezone
+
 from settings import Settings, get_settings
 from time import sleep
 from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union, TypeGuard
 from yaml import load, load_all, dump
+from pathspec import PathSpec, GitIgnoreSpec
+from typing_extensions import deprecated
 
 try:
     from yaml import CLoader as UnsafeLoader, CSafeLoader as SafeLoader, CDumper as Dumper
@@ -48,7 +52,7 @@ class Version(typing.NamedTuple):
         return ".".join(str(item) for item in self)
 
 
-__version__ = "0.6.4"
+__version__ = "0.6.7"
 version_tuple = tuplize_version(__version__)
 
 is_linux = sys.platform.startswith("linux")
@@ -314,12 +318,9 @@ def get_public_ipv6() -> str:
     return ip
 
 
-OptionsType = Settings  # TODO: remove when removing get_options
-
-
+@deprecated("Utils.get_options() is deprecated. Use the settings API instead.")
 def get_options() -> Settings:
-    # TODO: switch to Utils.deprecate after 0.4.4
-    warnings.warn("Utils.get_options() is deprecated. Use the settings API instead.", DeprecationWarning)
+    deprecate("Utils.get_options() is deprecated. Use the settings API instead.")
     return get_settings()
 
 
@@ -391,6 +392,14 @@ def store_data_package_for_checksum(game: str, data: typing.Dict[str, Any]) -> N
             logging.debug(f"Could not store data package: {e}")
 
 
+def read_apignore(filename: str | pathlib.Path) -> PathSpec | None:
+    try:
+        with open(filename) as ignore_file:
+            return GitIgnoreSpec.from_lines(ignore_file)
+    except FileNotFoundError:
+        return None
+
+
 def get_default_adjuster_settings(game_name: str) -> Namespace:
     import LttPAdjuster
     adjuster_settings = Namespace()
@@ -755,6 +764,11 @@ def _mp_open_filename(res: "multiprocessing.Queue[typing.Optional[str]]", *args:
     res.put(open_filename(*args))
 
 
+def _mp_save_filename(res: "multiprocessing.Queue[typing.Optional[str]]", *args: Any) -> None:
+    if is_kivy_running():
+        raise RuntimeError("kivy should not be running in multiprocess")
+    res.put(save_filename(*args))
+    
 def _run_for_stdout(*args: str):
     env = os.environ
     if "LD_LIBRARY_PATH" in env:
@@ -801,8 +815,62 @@ def open_filename(title: str, filetypes: typing.Iterable[typing.Tuple[str, typin
         except tkinter.TclError:
             return None  # GUI not available. None is the same as a user clicking "cancel"
         root.withdraw()
-        return tkinter.filedialog.askopenfilename(title=title, filetypes=((t[0], ' '.join(t[1])) for t in filetypes),
-                                                  initialfile=suggest or None)
+        try:
+            return tkinter.filedialog.askopenfilename(
+                title=title,
+                filetypes=((t[0], ' '.join(t[1])) for t in filetypes),
+                initialfile=suggest or None,
+            )
+        finally:
+            root.destroy()
+
+
+def save_filename(title: str, filetypes: typing.Iterable[typing.Tuple[str, typing.Iterable[str]]], suggest: str = "") \
+        -> typing.Optional[str]:
+    logging.info(f"Opening file save dialog for {title}.")
+
+    if is_linux:
+        # prefer native dialog
+        from shutil import which
+        kdialog = which("kdialog")
+        if kdialog:
+            k_filters = '|'.join((f'{text} (*{" *".join(ext)})' for (text, ext) in filetypes))
+            return _run_for_stdout(kdialog, f"--title={title}", "--getsavefilename", suggest or ".", k_filters)
+        zenity = which("zenity")
+        if zenity:
+            z_filters = (f'--file-filter={text} ({", ".join(ext)}) | *{" *".join(ext)}' for (text, ext) in filetypes)
+            selection = (f"--filename={suggest}",) if suggest else ()
+            return _run_for_stdout(zenity, f"--title={title}", "--file-selection", "--save", *z_filters, *selection)
+
+    # fall back to tk
+    try:
+        import tkinter
+        import tkinter.filedialog
+    except Exception as e:
+        logging.error('Could not load tkinter, which is likely not installed. '
+                      f'This attempt was made because save_filename was used for "{title}".')
+        raise e
+    else:
+        if is_macos and is_kivy_running():
+            # on macOS, mixing kivy and tk does not work, so spawn a new process
+            # FIXME: performance of this is pretty bad, and we should (also) look into alternatives
+            from multiprocessing import Process, Queue
+            res: "Queue[typing.Optional[str]]" = Queue()
+            Process(target=_mp_save_filename, args=(res, title, filetypes, suggest)).start()
+            return res.get()
+        try:
+            root = tkinter.Tk()
+        except tkinter.TclError:
+            return None  # GUI not available. None is the same as a user clicking "cancel"
+        root.withdraw()
+        try:
+            return tkinter.filedialog.asksaveasfilename(
+                title=title,
+                filetypes=((t[0], ' '.join(t[1])) for t in filetypes),
+                initialfile=suggest or None,
+            )
+        finally:
+            root.destroy()
 
 
 def _mp_open_directory(res: "multiprocessing.Queue[typing.Optional[str]]", *args: Any) -> None:
@@ -850,6 +918,13 @@ def open_directory(title: str, suggest: str = "") -> typing.Optional[str]:
 
 
 def messagebox(title: str, text: str, error: bool = False) -> None:
+    if not gui_enabled:
+        if error:
+            logging.error(f"{title}: {text}")
+        else:
+            logging.info(f"{title}: {text}")
+        return
+
     if is_kivy_running():
         from kvui import MessageBox
         MessageBox(title, text, error).open()
@@ -885,6 +960,9 @@ def messagebox(title: str, text: str, error: bool = False) -> None:
         root.update()
 
 
+gui_enabled = not sys.stdout or "--nogui" not in sys.argv
+"""Checks if the user wanted no GUI mode and has a terminal to use it with."""
+
 def title_sorted(data: typing.Iterable, key=None, ignore: typing.AbstractSet[str] = frozenset(("a", "the"))):
     """Sorts a sequence of text ignoring typical articles like "a" or "the" in the beginning."""
     def sorter(element: Union[str, Dict[str, Any]]) -> str:
@@ -929,6 +1007,7 @@ def async_start(co: Coroutine[None, None, typing.Any], name: Optional[str] = Non
 
 
 def deprecate(message: str, add_stacklevels: int = 0):
+    """also use typing_extensions.deprecated wherever you use this"""
     if __debug__:
         raise Exception(message)
     warnings.warn(message, stacklevel=2 + add_stacklevels)
@@ -993,6 +1072,7 @@ def _extend_freeze_support() -> None:
     multiprocessing.freeze_support = multiprocessing.spawn.freeze_support = _freeze_support if is_frozen() else _noop
 
 
+@deprecated("Use multiprocessing.freeze_support() instead")
 def freeze_support() -> None:
     """This now only calls multiprocessing.freeze_support since we are patching freeze_support on module load."""
     import multiprocessing
@@ -1004,9 +1084,18 @@ def freeze_support() -> None:
 _extend_freeze_support()
 
 
-def visualize_regions(root_region: Region, file_name: str, *,
-                      show_entrance_names: bool = False, show_locations: bool = True, show_other_regions: bool = True,
-                      linetype_ortho: bool = True, regions_to_highlight: set[Region] | None = None) -> None:
+def visualize_regions(
+        root_region: Region,
+        file_name: str,
+        *,
+        show_entrance_names: bool = False,
+        show_locations: bool = True,
+        show_other_regions: bool = True,
+        linetype_ortho: bool = True,
+        regions_to_highlight: set[Region] | None = None,
+        entrance_highlighting: dict[int, int] | None = None,
+        detail_other_regions: bool = False,
+        auto_assign_colors: bool = False) -> None:
     """Visualize the layout of a world as a PlantUML diagram.
 
     :param root_region: The region from which to start the diagram from. (Usually the "Menu" region of your world.)
@@ -1023,6 +1112,13 @@ def visualize_regions(root_region: Region, file_name: str, *,
     :param show_other_regions: (default True) If enabled, regions that can't be reached by traversing exits are shown.
     :param linetype_ortho: (default True) If enabled, orthogonal straight line parts will be used; otherwise polylines.
     :param regions_to_highlight: Regions that will be highlighted in green if they are reachable.
+    :param entrance_highlighting: a mapping from your world's entrance randomization groups to RGB values, used to color
+            your entrances
+    :param detail_other_regions: (default False) If enabled, will fully visualize regions that aren't reachable
+            from root_region.
+    :param auto_assign_colors: (default False) If enabled, will automatically assign random colors to entrances of the
+            same randomization group. Uses entrance_highlighting first, and only picks random colors for entrance groups
+            not found in the passed-in map
 
     Example usage in World code:
     from Utils import visualize_regions
@@ -1048,6 +1144,34 @@ def visualize_regions(root_region: Region, file_name: str, *,
     regions: typing.Deque[Region] = deque((root_region,))
     multiworld: MultiWorld = root_region.multiworld
 
+    colors_used: set[int] = set()
+    if entrance_highlighting:
+        for color in entrance_highlighting.values():
+            # filter the colors to their most-significant bits to avoid too similar colors
+            colors_used.add(color & 0xF0F0F0)
+    else:
+        # assign an empty dict to not crash later
+        # the parameter is optional for ease of use when you don't care about colors
+        entrance_highlighting = {}
+
+    def select_color(group: int) -> int:
+        # specifically spacing color indexes by three different prime numbers (3, 5, 7) for the RGB components to avoid
+        # obvious cyclical color patterns
+        COLOR_INDEX_SPACING: int = 0x357
+        new_color_index: int = (group * COLOR_INDEX_SPACING) % 0x1000
+        new_color = ((new_color_index & 0xF00) << 12) + \
+                    ((new_color_index & 0xF0) << 8) + \
+                    ((new_color_index & 0xF) << 4)
+        while new_color in colors_used:
+            # while this is technically unbounded, expected collisions are low. There are 4095 possible colors
+            # and worlds are unlikely to get to anywhere close to that many entrance groups
+            # intentionally not using multiworld.random to not affect output when debugging with this tool
+            new_color_index += COLOR_INDEX_SPACING
+            new_color = ((new_color_index & 0xF00) << 12) + \
+                        ((new_color_index & 0xF0) << 8) + \
+                        ((new_color_index & 0xF) << 4)
+        return new_color
+
     def fmt(obj: Union[Entrance, Item, Location, Region]) -> str:
         name = obj.name
         if isinstance(obj, Item):
@@ -1067,18 +1191,28 @@ def visualize_regions(root_region: Region, file_name: str, *,
 
     def visualize_exits(region: Region) -> None:
         for exit_ in region.exits:
+            color_code: str = ""
+            if exit_.randomization_group in entrance_highlighting:
+                color_code = f" #{entrance_highlighting[exit_.randomization_group]:0>6X}"
             if exit_.connected_region:
                 if show_entrance_names:
-                    uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\" : \"{fmt(exit_)}\"")
+                    uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\" : \"{fmt(exit_)}\"{color_code}")
                 else:
                     try:
-                        uml.remove(f"\"{fmt(exit_.connected_region)}\" --> \"{fmt(region)}\"")
-                        uml.append(f"\"{fmt(exit_.connected_region)}\" <--> \"{fmt(region)}\"")
+                        uml.remove(f"\"{fmt(exit_.connected_region)}\" --> \"{fmt(region)}\"{color_code}")
+                        uml.append(f"\"{fmt(exit_.connected_region)}\" <--> \"{fmt(region)}\"{color_code}")
                     except ValueError:
-                        uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\"")
+                        uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\"{color_code}")
             else:
-                uml.append(f"circle \"unconnected exit:\\n{fmt(exit_)}\"")
-                uml.append(f"\"{fmt(region)}\" --> \"unconnected exit:\\n{fmt(exit_)}\"")
+                uml.append(f"circle \"unconnected exit:\\n{fmt(exit_)}\" {color_code}")
+                uml.append(f"\"{fmt(region)}\" --> \"unconnected exit:\\n{fmt(exit_)}\"{color_code}")
+        for entrance in region.entrances:
+            color_code: str = ""
+            if entrance.randomization_group in entrance_highlighting:
+                color_code = f" #{entrance_highlighting[entrance.randomization_group]:0>6X}"
+            if not entrance.parent_region:
+                uml.append(f"circle \"unconnected entrance:\\n{fmt(entrance)}\"{color_code}")
+                uml.append(f"\"unconnected entrance:\\n{fmt(entrance)}\" --> \"{fmt(region)}\"{color_code}")
 
     def visualize_locations(region: Region) -> None:
         any_lock = any(location.locked for location in region.locations)
@@ -1099,9 +1233,27 @@ def visualize_regions(root_region: Region, file_name: str, *,
         if other_regions := [region for region in multiworld.get_regions(root_region.player) if region not in seen]:
             uml.append("package \"other regions\" <<Cloud>> {")
             for region in other_regions:
-                uml.append(f"class \"{fmt(region)}\"")
+                if detail_other_regions:
+                    visualize_region(region)
+                else:
+                    uml.append(f"class \"{fmt(region)}\"")
             uml.append("}")
 
+    if auto_assign_colors:
+        all_entrances: list[Entrance] = []
+        for region in multiworld.get_regions(root_region.player):
+            all_entrances.extend(region.entrances)
+            all_entrances.extend(region.exits)
+        all_groups: list[int] = sorted(set([entrance.randomization_group for entrance in all_entrances]))
+        for group in all_groups:
+            if group not in entrance_highlighting:
+                if len(colors_used) >= 0x1000:
+                    # on the off chance someone makes 4096 different entrance groups, don't cycle forever
+                    break
+                new_color: int = select_color(group)
+                entrance_highlighting[group] = new_color
+                colors_used.add(new_color)
+
     uml.append("@startuml")
     uml.append("hide circle")
     uml.append("hide empty members")
@@ -1112,7 +1264,7 @@ def visualize_regions(root_region: Region, file_name: str, *,
             seen.add(current_region)
             visualize_region(current_region)
             regions.extend(exit_.connected_region for exit_ in current_region.exits if exit_.connected_region)
-    if show_other_regions:
+    if show_other_regions or detail_other_regions:
         visualize_other_regions()
     uml.append("@enduml")
 
@@ -1141,6 +1293,15 @@ def is_iterable_except_str(obj: object) -> TypeGuard[typing.Iterable[typing.Any]
     return isinstance(obj, typing.Iterable)
 
 
+def utcnow() -> datetime:
+    """
+    Implementation of Python's datetime.utcnow() function for use after deprecation.
+    Needed for timezone-naive UTC datetimes stored in databases with PonyORM (upstream).
+    https://ponyorm.org/ponyorm-list/2014-August/000113.html
+    """
+    return datetime.now(timezone.utc).replace(tzinfo=None)
+
+
 class DaemonThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
     """
     ThreadPoolExecutor that uses daemonic threads that do not keep the program alive.
@@ -1176,3 +1337,35 @@ class DaemonThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
             t.start()
             self._threads.add(t)
             # NOTE: don't add to _threads_queues so we don't block on shutdown
+
+
+def get_full_typename(t: type) -> str:
+    """Returns the full qualified name of a type, including its module (if not builtins)."""
+    module = t.__module__
+    if module and module != "builtins":
+        return f"{module}.{t.__qualname__}"
+    return t.__qualname__
+
+
+def get_all_causes(ex: Exception) -> str:
+    """Return a string describing the recursive causes of this exception.
+
+    :param ex: The exception to be described.
+    :return A multiline string starting with the initial exception on the first line and each resulting exception
+            on subsequent lines with progressive indentation.
+
+            For example:
+
+            ```
+            Exception: Invalid value 'bad'.
+             Which caused: Options.OptionError: Error generating option
+              Which caused: ValueError: File bad.yaml is invalid.
+            ```
+    """
+    cause = ex
+    causes = [f"{get_full_typename(type(ex))}: {ex}"]
+    while cause := cause.__cause__:
+        causes.append(f"{get_full_typename(type(cause))}: {cause}")
+    top = causes[-1]
+    others = "".join(f"\n{' ' * (i + 1)}Which caused: {c}" for i, c in enumerate(reversed(causes[:-1])))
+    return f"{top}{others}"
diff --git a/WebHost.py b/WebHost.py
index db465be61b..41203ae1fc 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -20,7 +20,8 @@ if typing.TYPE_CHECKING:
 Utils.local_path.cached_path = os.path.dirname(__file__)
 settings.no_gui = True
 configpath = os.path.abspath("config.yaml")
-if not os.path.exists(configpath):  # fall back to config.yaml in home
+if not os.path.exists(configpath):
+    # fall back to config.yaml in user_path if config does not exist in cwd to match settings.py
     configpath = os.path.abspath(Utils.user_path('config.yaml'))
 
 
diff --git a/WebHostLib/README.md b/WebHostLib/README.md
index 52d4963aee..cc19be1fb9 100644
--- a/WebHostLib/README.md
+++ b/WebHostLib/README.md
@@ -1,46 +1,20 @@
 # WebHost
 
+## Asset License
+
+The image files used in the page design were specifically designed for archipelago.gg and are **not** covered by the top
+level LICENSE.
+See individual LICENSE files in `./static/static/**`.
+
+You are only allowed to use them for personal use, testing and development.
+If the site is reachable over the internet, have a robots.txt in place (see `ASSET_RIGHTS` in `config.yaml`)
+and do not promote it publicly. Alternatively replace or remove the assets.
+
 ## Contribution Guidelines
-**Thank you for your interest in contributing to the Archipelago website!**  
-Much of the content on the website is generated automatically, but there are some things
-that need a personal touch. For those things, we rely on contributions from both the core
-team and the community. The current primary maintainer of the website is Farrak Kilhn.
-He may be found on Discord as `Farrak Kilhn#0418`, or on GitHub as `LegendaryLinux`.
 
-### Small Changes
-Little changes like adding a button or a couple new select elements are perfectly fine.
-Tweaks to style specific to a PR's content are also probably not a problem. For example, if
-you build a new page which needs two side by side tables, and you need to write a CSS file
-specific to your page, that is perfectly reasonable.
+Pages should preferably be rendered on the server side with Jinja. Features should work with noscript if feasible.
+Design changes have to fit the overall design.
 
-### Content Additions
-Once you develop a new feature or add new content the website, make a pull request. It will
-be reviewed by the community and there will probably be some discussion around it. Depending
-on the size of the feature, and if new styles are required, there may be an additional step
-before the PR is accepted wherein Farrak works with the designer to implement styles.
+Introduction of JS dependencies should first be discussed on Discord or in a draft PR.
 
-### Restrictions on Style Changes
-A professional designer is paid to develop the styles and assets for the Archipelago website.
-In an effort to maintain a consistent look and feel, pull requests which *exclusively*
-change site styles are rejected. Please note this applies to code which changes the overall
-look and feel of the site, not to small tweaks to CSS for your custom page. The intention
-behind these restrictions is to maintain a curated feel for the design of the site. If
-any PR affects the overall feel of the site but includes additive changes, there will
-likely be a conversation about how to implement those changes without compromising the
-curated site style. It is therefore worth noting there are a couple files which, if
-changed in your pull request, will cause it to draw additional scrutiny.
-
-These closely guarded files are:
-- `globalStyles.css`
-- `islandFooter.css`
-- `landing.css`
-- `markdown.css`
-- `tooltip.css`
-
-### Site Themes
-There are several themes available for game pages. It is possible to request a new theme in
-the `#art-and-design` channel on Discord. Because themes are created by the designer, they
-are not free, and take some time to create. Farrak works closely with the designer to implement
-these themes, and pays for the assets out of pocket. Therefore, only a couple themes per year
-are added. If a proposed theme seems like a cool idea and the community likes it, there is a
-good chance it will become a reality.
+See also [docs/style.md](/docs/style.md) for the style guide.
diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index e4c2ab83c7..f1ac7ad558 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -11,6 +11,7 @@ from pony.flask import Pony
 from werkzeug.routing import BaseConverter
 
 from Utils import title_sorted, get_file_safe_name
+from .cli import CLI
 
 UPLOAD_FOLDER = os.path.relpath('uploads')
 LOGS_FOLDER = os.path.relpath('logs')
@@ -23,6 +24,17 @@ app.jinja_env.filters['any'] = any
 app.jinja_env.filters['all'] = all
 app.jinja_env.filters['get_file_safe_name'] = get_file_safe_name
 
+# overwrites of flask default config
+app.config["DEBUG"] = False
+app.config["PORT"] = 80
+app.config["UPLOAD_FOLDER"] = UPLOAD_FOLDER
+app.config["MAX_CONTENT_LENGTH"] = 64 * 1024 * 1024  # 64 megabyte limit
+# if you want to deploy, make sure you have a non-guessable secret key
+app.config["SECRET_KEY"] = bytes(socket.gethostname(), encoding="utf-8")
+app.config["SESSION_PERMANENT"] = True
+app.config["MAX_FORM_MEMORY_SIZE"] = 2 * 1024 * 1024  # 2 MB, needed for large option pages such as SC2
+
+# custom config
 app.config["SELFHOST"] = True  # application process is in charge of running the websites
 app.config["GENERATORS"] = 8  # maximum concurrent world gens
 app.config["HOSTERS"] = 8  # maximum concurrent room hosters
@@ -30,19 +42,14 @@ app.config["SELFLAUNCH"] = True  # application process is in charge of launching
 app.config["SELFLAUNCHCERT"] = None  # can point to a SSL Certificate to encrypt Room websocket connections
 app.config["SELFLAUNCHKEY"] = None  # can point to a SSL Certificate Key to encrypt Room websocket connections
 app.config["SELFGEN"] = True  # application process is in charge of scheduling Generations.
-app.config["DEBUG"] = False
-app.config["PORT"] = 80
-app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
-app.config['MAX_CONTENT_LENGTH'] = 64 * 1024 * 1024  # 64 megabyte limit
-# if you want to deploy, make sure you have a non-guessable secret key
-app.config["SECRET_KEY"] = bytes(socket.gethostname(), encoding="utf-8")
 # at what amount of worlds should scheduling be used, instead of rolling in the web-thread
 app.config["JOB_THRESHOLD"] = 1
 # after what time in seconds should generation be aborted, freeing the queue slot. Can be set to None to disable.
 app.config["JOB_TIME"] = 600
+# maximum time in seconds since last activity for a room to be hosted
+app.config["MAX_ROOM_TIMEOUT"] = 259200
 # memory limit for generator processes in bytes
 app.config["GENERATOR_MEMORY_LIMIT"] = 4294967296
-app.config['SESSION_PERMANENT'] = True
 
 # waitress uses one thread for I/O, these are for processing of views that then get sent
 # archipelago.gg uses gunicorn + nginx; ignoring this option
@@ -60,6 +67,7 @@ app.config["ASSET_RIGHTS"] = False
 
 cache = Cache()
 Compress(app)
+CLI(app)
 
 
 def to_python(value: str) -> uuid.UUID:
diff --git a/WebHostLib/api/__init__.py b/WebHostLib/api/__init__.py
index 54eb5c1de1..63914a06ba 100644
--- a/WebHostLib/api/__init__.py
+++ b/WebHostLib/api/__init__.py
@@ -2,10 +2,20 @@
 from typing import List, Tuple
 
 from flask import Blueprint
+from flask_cors import CORS
 
 from ..models import Seed, Slot
 
 api_endpoints = Blueprint('api', __name__, url_prefix="/api")
+cors = CORS(api_endpoints, resources={
+                r"/api/datapackage/*": {"origins": "*"},
+                r"/api/datapackage": {"origins": "*"},
+                r"/api/datapackage_checksum/*": {"origins": "*"},
+                r"/api/room_status/*": {"origins": "*"},
+                r"/api/tracker/*": {"origins": "*"},
+                r"/api/static_tracker/*": {"origins": "*"},
+                r"/api/slot_data_tracker/*": {"origins": "*"}
+            })
 
 
 def get_players(seed: Seed) -> List[Tuple[str, str]]:
diff --git a/WebHostLib/api/tracker.py b/WebHostLib/api/tracker.py
index 36692af426..1e6e02bee7 100644
--- a/WebHostLib/api/tracker.py
+++ b/WebHostLib/api/tracker.py
@@ -58,6 +58,12 @@ class PlayerLocationsTotal(TypedDict):
     total_locations: int
 
 
+class PlayerGame(TypedDict):
+    team: int
+    player: int
+    game: str
+
+
 @api_endpoints.route("/tracker/<suuid:tracker>")
 @cache.memoize(timeout=60)
 def tracker_data(tracker: UUID) -> dict[str, Any]:
@@ -80,7 +86,8 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
     """Slot aliases of all players."""
     for team, players in all_players.items():
         for player in players:
-            player_aliases.append({"team": team, "player": player, "alias": tracker_data.get_player_alias(team, player)})
+            player_aliases.append(
+                {"team": team, "player": player, "alias": tracker_data.get_player_alias(team, player)})
 
     player_items_received: list[PlayerItemsReceived] = []
     """Items received by each player."""
@@ -94,7 +101,8 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
     for team, players in all_players.items():
         for player in players:
             player_checks_done.append(
-                {"team": team, "player": player, "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
+                {"team": team, "player": player,
+                 "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
 
     total_checks_done: list[TeamTotalChecks] = [
         {"team": team, "checks_done": checks_done}
@@ -144,7 +152,8 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
     """The current client status for each player."""
     for team, players in all_players.items():
         for player in players:
-            player_status.append({"team": team, "player": player, "status": tracker_data.get_player_client_status(team, player)})
+            player_status.append(
+                {"team": team, "player": player, "status": tracker_data.get_player_client_status(team, player)})
 
     return {
         "aliases": player_aliases,
@@ -207,12 +216,20 @@ def static_tracker_data(tracker: UUID) -> dict[str, Any]:
             player_locations_total.append(
                 {"team": team, "player": player, "total_locations": len(tracker_data.get_player_locations(player))})
 
+    player_game: list[PlayerGame] = []
+    """The played game per player slot."""
+    for team, players in all_players.items():
+        for player in players:
+            player_game.append({"team": team, "player": player, "game": tracker_data.get_player_game(player)})
+
     return {
         "groups": groups,
         "datapackage": tracker_data._multidata["datapackage"],
         "player_locations_total": player_locations_total,
+        "player_game": player_game,
     }
 
+
 # It should be exceedingly rare that slot data is needed, so it's separated out.
 @api_endpoints.route("/slot_data_tracker/<suuid:tracker>")
 @cache.memoize(timeout=300)
diff --git a/WebHostLib/autolauncher.py b/WebHostLib/autolauncher.py
index 96ffbe9e95..1a61564500 100644
--- a/WebHostLib/autolauncher.py
+++ b/WebHostLib/autolauncher.py
@@ -4,14 +4,14 @@ import json
 import logging
 import multiprocessing
 import typing
-from datetime import timedelta, datetime
+from datetime import timedelta
 from threading import Event, Thread
 from typing import Any
 from uuid import UUID
 
-from pony.orm import db_session, select, commit, PrimaryKey
+from pony.orm import db_session, select, commit, PrimaryKey, desc
 
-from Utils import restricted_loads
+from Utils import restricted_loads, utcnow
 from .locker import Locker, AlreadyRunningException
 
 _stop_event = Event()
@@ -129,10 +129,11 @@ def autohost(config: dict):
                     with db_session:
                         rooms = select(
                             room for room in Room if
-                            room.last_activity >= datetime.utcnow() - timedelta(days=3))
+                            room.last_activity >= utcnow() - timedelta(
+                                seconds=config["MAX_ROOM_TIMEOUT"])).order_by(desc(Room.last_port))
                         for room in rooms:
                             # we have to filter twice, as the per-room timeout can't currently be PonyORM transpiled.
-                            if room.last_activity >= datetime.utcnow() - timedelta(seconds=room.timeout + 5):
+                            if room.last_activity >= utcnow() - timedelta(seconds=room.timeout + 5):
                                 hosters[room.id.int % len(hosters)].start_room(room.id)
 
         except AlreadyRunningException:
diff --git a/WebHostLib/cli/__init__.py b/WebHostLib/cli/__init__.py
new file mode 100644
index 0000000000..a210e1475c
--- /dev/null
+++ b/WebHostLib/cli/__init__.py
@@ -0,0 +1,8 @@
+from flask import Flask
+
+
+class CLI:
+    def __init__(self, app: Flask) -> None:
+        from .stats import stats_cli
+
+        app.cli.add_command(stats_cli)
diff --git a/WebHostLib/cli/stats.py b/WebHostLib/cli/stats.py
new file mode 100644
index 0000000000..85edfb4348
--- /dev/null
+++ b/WebHostLib/cli/stats.py
@@ -0,0 +1,36 @@
+import click
+from flask.cli import AppGroup
+from pony.orm import raw_sql
+
+from Utils import format_SI_prefix
+
+stats_cli = AppGroup("stats")
+
+
+@stats_cli.command("show")
+def show() -> None:
+    from pony.orm import db_session, select
+
+    from WebHostLib.models import GameDataPackage
+
+    total_games_package_count: int = 0
+    total_games_package_size: int
+    top_10_package_sizes: list[tuple[int, str]] = []
+
+    with db_session:
+        data_length = raw_sql("LENGTH(data)")
+        data_length_desc = raw_sql("LENGTH(data) DESC")
+        data_length_sum = raw_sql("SUM(LENGTH(data))")
+        total_games_package_count = GameDataPackage.select().count()
+        total_games_package_size = select(data_length_sum for _ in GameDataPackage).first()  # type: ignore
+        top_10_package_sizes = list(
+            select((data_length, dp.checksum) for dp in GameDataPackage)  # type: ignore
+            .order_by(lambda _, _2: data_length_desc)
+            .limit(10)
+        )
+
+    click.echo(f"Total number of games packages: {total_games_package_count}")
+    click.echo(f"Total size of games packages:   {format_SI_prefix(total_games_package_size, power=1024)}B")
+    click.echo(f"Top {len(top_10_package_sizes)} biggest games packages:")
+    for size, checksum in top_10_package_sizes:
+        click.echo(f"    {checksum}: {size:>8d}")
diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py
index 14ae291982..4257c6aff3 100644
--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -89,19 +89,24 @@ class WebHostContext(Context):
             setattr(self, key, value)
         self.non_hintable_names = collections.defaultdict(frozenset, self.non_hintable_names)
 
-    def listen_to_db_commands(self):
+    async def listen_to_db_commands(self):
         cmdprocessor = DBCommandProcessor(self)
 
         while not self.exit_event.is_set():
-            with db_session:
-                commands = select(command for command in Command if command.room.id == self.room_id)
-                if commands:
-                    for command in commands:
-                        self.main_loop.call_soon_threadsafe(cmdprocessor, command.commandtext)
-                        command.delete()
-                    commit()
-            del commands
-            time.sleep(5)
+            await self.main_loop.run_in_executor(None, self._process_db_commands, cmdprocessor)
+            try:
+                await asyncio.wait_for(self.exit_event.wait(), 5)
+            except asyncio.TimeoutError:
+                pass
+
+    def _process_db_commands(self, cmdprocessor):
+        with db_session:
+            commands = select(command for command in Command if command.room.id == self.room_id)
+            if commands:
+                for command in commands:
+                    self.main_loop.call_soon_threadsafe(cmdprocessor, command.commandtext)
+                    command.delete()
+                commit()
 
     @db_session
     def load(self, room_id: int):
@@ -156,9 +161,9 @@ class WebHostContext(Context):
             with db_session:
                 savegame_data = Room.get(id=self.room_id).multisave
                 if savegame_data:
-                    self.set_save(restricted_loads(Room.get(id=self.room_id).multisave))
+                    self.set_save(restricted_loads(savegame_data))
             self._start_async_saving(atexit_save=False)
-        threading.Thread(target=self.listen_to_db_commands, daemon=True).start()
+        asyncio.create_task(self.listen_to_db_commands())
 
     @db_session
     def _save(self, exit_save: bool = False) -> bool:
@@ -167,7 +172,7 @@ class WebHostContext(Context):
         room.multisave = pickle.dumps(self.get_save())
         # saving only occurs on activity, so we can "abuse" this information to mark this as last_activity
         if not exit_save:  # we don't want to count a shutdown as activity, which would restart the server again
-            room.last_activity = datetime.datetime.utcnow()
+            room.last_activity = Utils.utcnow()
         return True
 
     def get_save(self) -> dict:
@@ -229,6 +234,17 @@ def set_up_logging(room_id) -> logging.Logger:
     return logger
 
 
+def tear_down_logging(room_id):
+    """Close logging handling for a room."""
+    logger_name = f"RoomLogger {room_id}"
+    if logger_name in logging.Logger.manager.loggerDict:
+        logger = logging.getLogger(logger_name)
+        for handler in logger.handlers[:]:
+            logger.removeHandler(handler)
+            handler.close()
+        del logging.Logger.manager.loggerDict[logger_name]
+
+
 def run_server_process(name: str, ponyconfig: dict, static_server_data: dict,
                        cert_file: typing.Optional[str], cert_key_file: typing.Optional[str],
                        host: str, rooms_to_run: multiprocessing.Queue, rooms_shutting_down: multiprocessing.Queue):
@@ -325,7 +341,7 @@ def run_server_process(name: str, ponyconfig: dict, static_server_data: dict,
 
             except (KeyboardInterrupt, SystemExit):
                 if ctx.saving:
-                    ctx._save()
+                    ctx._save(True)
                     setattr(asyncio.current_task(), "save", None)
             except Exception as e:
                 with db_session:
@@ -336,19 +352,24 @@ def run_server_process(name: str, ponyconfig: dict, static_server_data: dict,
                 raise
             else:
                 if ctx.saving:
-                    ctx._save()
+                    ctx._save(True)
                     setattr(asyncio.current_task(), "save", None)
             finally:
                 try:
                     ctx.save_dirty = False  # make sure the saving thread does not write to DB after final wakeup
                     ctx.exit_event.set()  # make sure the saving thread stops at some point
                     # NOTE: async saving should probably be an async task and could be merged with shutdown_task
+
+                    if ctx.server and hasattr(ctx.server, "ws_server"):
+                        ctx.server.ws_server.close()
+                        await ctx.server.ws_server.wait_closed()
+
                     with db_session:
                         # ensure the Room does not spin up again on its own, minute of safety buffer
                         room = Room.get(id=room_id)
-                        room.last_activity = datetime.datetime.utcnow() - \
-                                             datetime.timedelta(minutes=1, seconds=room.timeout)
+                        room.last_activity = Utils.utcnow() - datetime.timedelta(minutes=1, seconds=room.timeout)
                     del room
+                    tear_down_logging(room_id)
                     logging.info(f"Shutting down room {room_id} on {name}.")
                 finally:
                     await asyncio.sleep(5)
diff --git a/WebHostLib/landing.py b/WebHostLib/landing.py
index 14e90cc28d..f1b8de21bf 100644
--- a/WebHostLib/landing.py
+++ b/WebHostLib/landing.py
@@ -1,8 +1,9 @@
-from datetime import timedelta, datetime
+from datetime import timedelta
 
 from flask import render_template
 from pony.orm import count
 
+from Utils import utcnow
 from WebHostLib import app, cache
 from .models import Room, Seed
 
@@ -10,6 +11,6 @@ from .models import Room, Seed
 @app.route('/', methods=['GET', 'POST'])
 @cache.cached(timeout=300)  # cache has to appear under app route for caching to work
 def landing():
-    rooms = count(room for room in Room if room.creation_time >= datetime.utcnow() - timedelta(days=7))
-    seeds = count(seed for seed in Seed if seed.creation_time >= datetime.utcnow() - timedelta(days=7))
+    rooms = count(room for room in Room if room.creation_time >= utcnow() - timedelta(days=7))
+    seeds = count(seed for seed in Seed if seed.creation_time >= utcnow() - timedelta(days=7))
     return render_template("landing.html", rooms=rooms, seeds=seeds)
diff --git a/WebHostLib/misc.py b/WebHostLib/misc.py
index 44e81a5983..8d04fe984e 100644
--- a/WebHostLib/misc.py
+++ b/WebHostLib/misc.py
@@ -1,5 +1,7 @@
 import datetime
 import os
+import warnings
+from enum import StrEnum
 from typing import Any, IO, Dict, Iterator, List, Tuple, Union
 
 import jinja2.exceptions
@@ -7,17 +9,32 @@ from flask import request, redirect, url_for, render_template, Response, session
 from pony.orm import count, commit, db_session
 from werkzeug.utils import secure_filename
 
+
 from worlds.AutoWorld import AutoWorldRegister, World
 from . import app, cache
 from .markdown import render_markdown
 from .models import Seed, Room, Command, UUID, uuid4
-from Utils import title_sorted
+from Utils import title_sorted, utcnow
 
+class WebWorldTheme(StrEnum):
+    DIRT = "dirt"
+    GRASS = "grass"
+    GRASS_FLOWERS = "grassFlowers"
+    ICE = "ice"
+    JUNGLE = "jungle"
+    OCEAN = "ocean"
+    PARTY_TIME = "partyTime"
+    STONE = "stone"
 
 def get_world_theme(game_name: str) -> str:
-    if game_name in AutoWorldRegister.world_types:
-        return AutoWorldRegister.world_types[game_name].web.theme
-    return 'grass'
+    if game_name not in AutoWorldRegister.world_types:
+        return "grass"
+    chosen_theme = AutoWorldRegister.world_types[game_name].web.theme
+    available_themes = [theme.value for theme in WebWorldTheme]
+    if chosen_theme not in available_themes:
+        warnings.warn(f"Theme '{chosen_theme}' for {game_name} not valid, switching to default 'grass' theme.")
+        return "grass"
+    return chosen_theme
 
 
 def get_visible_worlds() -> dict[str, type(World)]:
@@ -112,8 +129,13 @@ def tutorial_landing():
                 "authors": tutorial.authors,
                 "language": tutorial.language
             }
-    tutorials = {world_name: tutorials for world_name, tutorials in title_sorted(
-        tutorials.items(), key=lambda element: "\x00" if element[0] == "Archipelago" else worlds[element[0]].game)}
+
+    worlds = dict(
+        title_sorted(
+            worlds.items(), key=lambda element: "\x00" if element[0] == "Archipelago" else worlds[element[0]].game
+        )
+    )
+
     return render_template("tutorialLanding.html", worlds=worlds, tutorials=tutorials)
 
 
@@ -212,11 +234,12 @@ def host_room(room: UUID):
     if room is None:
         return abort(404)
 
-    now = datetime.datetime.utcnow()
+    now = utcnow()
     # indicate that the page should reload to get the assigned port
-    should_refresh = ((not room.last_port and now - room.creation_time < datetime.timedelta(seconds=3))
-                      or room.last_activity < now - datetime.timedelta(seconds=room.timeout))
-
+    should_refresh = (
+        (not room.last_port and now - room.creation_time < datetime.timedelta(seconds=3))
+        or room.last_activity < now - datetime.timedelta(seconds=room.timeout)
+    )
     if now - room.last_activity > datetime.timedelta(minutes=1):
         # we only set last_activity if needed, otherwise parallel access on /room will cause an internal server error
         # due to "pony.orm.core.OptimisticCheckError: Object Room was updated outside of current transaction"
diff --git a/WebHostLib/models.py b/WebHostLib/models.py
index 7fa54f26a0..9060bc0ca4 100644
--- a/WebHostLib/models.py
+++ b/WebHostLib/models.py
@@ -2,6 +2,8 @@ from datetime import datetime
 from uuid import UUID, uuid4
 from pony.orm import Database, PrimaryKey, Required, Set, Optional, buffer, LongStr
 
+from Utils import utcnow
+
 db = Database()
 
 STATE_QUEUED = 0
@@ -20,8 +22,8 @@ class Slot(db.Entity):
 
 class Room(db.Entity):
     id = PrimaryKey(UUID, default=uuid4)
-    last_activity = Required(datetime, default=lambda: datetime.utcnow(), index=True)
-    creation_time = Required(datetime, default=lambda: datetime.utcnow(), index=True)  # index used by landing page
+    last_activity: datetime = Required(datetime, default=lambda: utcnow(), index=True)
+    creation_time: datetime = Required(datetime, default=lambda: utcnow(), index=True)  # index used by landing page
     owner = Required(UUID, index=True)
     commands = Set('Command')
     seed = Required('Seed', index=True)
@@ -38,7 +40,7 @@ class Seed(db.Entity):
     rooms = Set(Room)
     multidata = Required(bytes, lazy=True)
     owner = Required(UUID, index=True)
-    creation_time = Required(datetime, default=lambda: datetime.utcnow(), index=True)  # index used by landing page
+    creation_time: datetime = Required(datetime, default=lambda: utcnow(), index=True)  # index used by landing page
     slots = Set(Slot)
     spoiler = Optional(LongStr, lazy=True)
     meta = Required(LongStr, default=lambda: "{\"race\": false}")  # additional meta information/tags
diff --git a/WebHostLib/options.py b/WebHostLib/options.py
index c2f1619f9f..e3d2745855 100644
--- a/WebHostLib/options.py
+++ b/WebHostLib/options.py
@@ -13,6 +13,7 @@ from Utils import local_path
 from worlds.AutoWorld import AutoWorldRegister
 from . import app, cache
 from .generate import get_meta
+from .misc import get_world_theme
 
 
 def create() -> None:
@@ -22,12 +23,6 @@ def create() -> None:
     Options.generate_yaml_templates(yaml_folder)
 
 
-def get_world_theme(game_name: str) -> str:
-    if game_name in AutoWorldRegister.world_types:
-        return AutoWorldRegister.world_types[game_name].web.theme
-    return 'grass'
-
-
 def render_options_page(template: str, world_name: str, is_complex: bool = False) -> Union[Response, str]:
     world = AutoWorldRegister.world_types[world_name]
     if world.hidden or world.web.options_page is False:
diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt
index c4267dc284..c9a923680a 100644
--- a/WebHostLib/requirements.txt
+++ b/WebHostLib/requirements.txt
@@ -6,6 +6,7 @@ waitress>=3.0.2
 Flask-Caching>=2.3.0
 Flask-Compress==1.18  # pkg_resources can't resolve the "backports.zstd" dependency of >1.18, breaking ModuleUpdate.py
 Flask-Limiter>=3.12
+Flask-Cors>=6.0.2
 bokeh>=3.6.3
 markupsafe>=3.0.2
 setproctitle>=1.3.5
diff --git a/WebHostLib/static/assets/faq/en.md b/WebHostLib/static/assets/faq/en.md
index 5887500656..5b42cc6fc6 100644
--- a/WebHostLib/static/assets/faq/en.md
+++ b/WebHostLib/static/assets/faq/en.md
@@ -23,7 +23,7 @@ players to rely upon each other to complete their game.
 While a multiworld game traditionally requires all players to be playing the same game, a multi-game multiworld allows
 players to randomize any of the supported games, and send items between them. This allows players of different
 games to interact with one another in a single multiplayer environment.  Archipelago supports multi-game multiworlds.
-Here is a list of our [Supported Games](https://archipelago.gg/games).
+Here is a list of our [Supported Games](/games).
 
 ## Can I generate a single-player game with Archipelago?
 
@@ -33,7 +33,7 @@ play, open the Settings Page, pick your settings, and click Generate Game.
 
 ## How do I get started?
 
-We have a [Getting Started](https://archipelago.gg/tutorial/Archipelago/setup/en) guide that will help you get the
+We have a [Getting Started](/tutorial/Archipelago/setup/en) guide that will help you get the
 software set up. You can use that guide to learn how to generate multiworlds. There are also basic instructions for
 including multiple games, and hosting multiworlds on the website for ease and convenience.
 
@@ -57,7 +57,7 @@ their multiworld.
 
 If a player must leave early, they can use Archipelago's release system. When a player releases their game, all items
 in that game belonging to other players are sent out automatically. This allows other players to continue to play
-uninterrupted. Here is a list of all of our [Server Commands](https://archipelago.gg/tutorial/Archipelago/commands/en).
+uninterrupted. Here is a list of all of our [Server Commands](/tutorial/Archipelago/commands/en).
 
 ## What happens if an item is placed somewhere it is impossible to get?
 
diff --git a/WebHostLib/static/styles/sc2Tracker.css b/WebHostLib/static/styles/sc2Tracker.css
index 3048213e43..28a4e7bc8a 100644
--- a/WebHostLib/static/styles/sc2Tracker.css
+++ b/WebHostLib/static/styles/sc2Tracker.css
@@ -241,12 +241,9 @@ input[type="checkbox"]{
 }
 
 /* Hidden items */
-.hidden-class:not(:has(img.acquired)){
+.hidden-class:not(:has(.f:not(.unacquired))), .hidden-item{
   display: none;
 }
-.hidden-item:not(.acquired){
-  display:none;
-}
 
 /* Keys */
 #keys ol, #keys ul{
diff --git a/WebHostLib/templates/playerOptions/macros.html b/WebHostLib/templates/playerOptions/macros.html
index a4cc3aa5ac..1df4ada7ea 100644
--- a/WebHostLib/templates/playerOptions/macros.html
+++ b/WebHostLib/templates/playerOptions/macros.html
@@ -55,6 +55,9 @@
     {{ OptionTitle(option_name, option) }}
     <div class="named-range-container">
         <select id="{{ option_name }}-select" name="{{ option_name }}" data-option-name="{{ option_name }}" {{ "disabled" if option.default == "random" }}>
+            {% if option.default not in option.special_range_names.values() %}
+                <option value="{{ option.default }}" selected>Default ({{ option.default }})</option>
+            {% endif %}
             {% for key, val in option.special_range_names.items() %}
                 {% if option.default == val %}
                     <option value="{{ val }}" selected>{{ key|replace("_", " ")|title }} ({{ val }})</option>
@@ -94,6 +97,9 @@
     <div class="text-choice-container">
         <div class="text-choice-wrapper">
             <select id="{{ option_name }}" name="{{ option_name }}" {{ "disabled" if option.default == "random" }}>
+            {% if option.default not in option.options.values()  %}
+                <option value="{{ option.default }}" selected>Default ({{ option.default }})</option>
+            {% endif %}
             {% for id, name in option.name_lookup.items()|sort %}
                 {% if name != "random" %}
                     {% if option.default == id %}
diff --git a/WebHostLib/templates/supportedGames.html b/WebHostLib/templates/supportedGames.html
index 759e748056..43028721b2 100644
--- a/WebHostLib/templates/supportedGames.html
+++ b/WebHostLib/templates/supportedGames.html
@@ -33,7 +33,9 @@
         <h1>Currently Supported Games</h1>
         <p>Below are the games that are currently included with the Archipelago software. To play a game that is not on
         this page, please refer to the <a href="/tutorial/Archipelago/setup/en#playing-with-custom-worlds">playing with
-        custom worlds</a> section of the setup guide.</p>
+                custom worlds</a> section of the setup guide and the
+            <a href="{{ url_for("tutorial", game="Archipelago", file="other_en") }}">other games and tools guide</a>
+            to find more.</p>
         <div class="js-only">
             <label for="game-search">Search for your game below!</label><br />
             <div class="page-controls">
diff --git a/WebHostLib/templates/tracker__Starcraft2.html b/WebHostLib/templates/tracker__Starcraft2.html
index 932f21505d..b7cc8a29c6 100644
--- a/WebHostLib/templates/tracker__Starcraft2.html
+++ b/WebHostLib/templates/tracker__Starcraft2.html
@@ -24,55 +24,55 @@
       <div id="section-filler" class="section-body">
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Additional Starting Minerals&#10;Increases the starting minerals for all missions." class=" icon-mineral-nobg-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Additional Starting Minerals&#10;Increases the starting minerals for all missions." class=" icon-mineral-nobg-png">
           </div>
           <span class="item-count">+{{minerals_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Additional Starting Vespene&#10;Increases the starting vespene for all missions." class=" icon-gas-terran-nobg-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Additional Starting Vespene&#10;Increases the starting vespene for all missions." class=" icon-gas-terran-nobg-png">
           </div>
           <span class="item-count">+{{vespene_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Additional Starting Supply&#10;Increases the starting supply for all missions." class=" icon-supply-protoss_nobg-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Additional Starting Supply&#10;Increases the starting supply for all missions." class=" icon-supply-protoss_nobg-png">
           </div>
           <span class="item-count">+{{supply_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Additional Maximum Supply&#10;Increases the maximum supply cap for all missions." class=" icon-health-nobg-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Additional Maximum Supply&#10;Increases the maximum supply cap for all missions." class=" icon-health-nobg-png">
           </div>
           <span class="item-count">+{{max_supply_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Decreased Maximum Supply&#10;Trap Item. Decreases the maximum supply cap for all missions." class=" ui_btn_generic_exclemation_red-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Decreased Maximum Supply&#10;Trap Item. Decreases the maximum supply cap for all missions." class=" ui_btn_generic_exclemation_red-png">
           </div>
           <span class="item-count">-{{reduced_supply_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Increased Building Construction Speed&#10;Increases building construction speed." class=" icon-time-protoss-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Increased Building Construction Speed&#10;Increases building construction speed." class=" icon-time-protoss-png">
           </div>
           <span class="item-count">{{construction_speed_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Increased Shield Regeneration&#10;Increases shield regeneration of all own units." class=" icon-shields-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Increased Shield Regeneration&#10;Increases shield regeneration of all own units." class=" icon-shields-png">
           </div>
           <span class="item-count">{{shield_regen_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Increased Upgrade Research Speed&#10;Increases weapon and armor research speed." class=" btn-upgrade-increasedupgraderesearchspeed-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Increased Upgrade Research Speed&#10;Increases weapon and armor research speed." class=" btn-upgrade-increasedupgraderesearchspeed-png">
           </div>
           <span class="item-count">{{upgrade_speed_count}}</span>
         </div>
         <div class="item-counter">
           <div class="f">
-            <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reduced Upgrade Research Cost&#10;Decreases weapon and armor upgrade research cost." class=" btn-upgrade-reducedupgraderesearchcost-png">
+            <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reduced Upgrade Research Cost&#10;Decreases weapon and armor upgrade research cost." class=" btn-upgrade-reducedupgraderesearchcost-png">
           </div>
           <span class="item-count">{{research_cost_count}}</span>
         </div>
@@ -116,133 +116,133 @@
         </div>
         <div id="class-marine" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1000] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Marine&#10;General-purpose infantry." class=" btn-unit-terran-marine-png"></div>
+            <div class="f {{'unacquired' if inventory[1000] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Marine&#10;General-purpose infantry." class=" btn-unit-terran-marine-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1209] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Combat Shield (Marine)&#10;Increases Marine life by 10." class=" btn-techupgrade-terran-combatshield-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1220] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Marine)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1221] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Magrail Munitions (Marine)&#10;Deals 20 damage to target unit. Autocast on attack with a cooldown." class=" btn-upgrade-terran-magrailmunitions-png"></div>
-            <div class="f {{'unacquired' if inventory[1222] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Marine)&#10;Increases Marine training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1209] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Combat Shield (Marine)&#10;Increases Marine life by 10." class=" btn-techupgrade-terran-combatshield-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1220] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Marine)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1221] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Magrail Munitions (Marine)&#10;Deals 20 damage to target unit. Autocast on attack with a cooldown." class=" btn-upgrade-terran-magrailmunitions-png"></div>
+            <div class="f {{'unacquired' if inventory[1222] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Marine)&#10;Increases Marine training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
             <div class="progressive lvl-{{[inventory[1208], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marine) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marine) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marine) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marine) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
             </div>
           </div>
         </div>
         <div id="class-medic" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1001] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Medic&#10;Support trooper. Heals nearby biological units." class=" btn-unit-terran-medic-png"></div>
+            <div class="f {{'unacquired' if inventory[1001] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Medic&#10;Support trooper. Heals nearby biological units." class=" btn-unit-terran-medic-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1233] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adaptive Medpacks (Medic)&#10;Allows Medics to heal mechanical and air units." class=" btn-adaptive-medpacks-png"></div>
-            <div class="f {{'unacquired' if inventory[1210] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Medic Facilities (Medic)&#10;Medics can be trained from a Barracks without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1234] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Nano Projector (Medic)&#10;Increases Medic heal range by 2." class=" talent-raynor-level03-firebatmedicrange-png"></div>
-            <div class="f {{'unacquired' if inventory[1224] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optical Flare (Medic)&#10;Medics gain the Optical Flare ability, &#10;which reduces vision range of target enemy unit. Disables detection." class=" btn-upgrade-protoss-fenix-dragoonsolariteflare-png"></div>
-            <div class="f {{'unacquired' if inventory[1225] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Medic)&#10;Reduces Medic cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1223] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Restoration (Medic)&#10;Medics gain the Restoration ability, &#10;which removes negative status effects from a target allied unit." class=" btn-ability-terran-restorationscbw-png"></div>
-            <div class="f {{'unacquired' if inventory[1211] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stabilizer Medpacks (Medic)&#10;Increases Medic heal speed. Reduces the amount of energy required for each heal." class=" btn-upgrade-raynor-stabilizermedpacks-png"></div>
+            <div class="f {{'unacquired' if inventory[1233] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adaptive Medpacks (Medic)&#10;Allows Medics to heal mechanical and air units." class=" btn-adaptive-medpacks-png"></div>
+            <div class="f {{'unacquired' if inventory[1210] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Medic Facilities (Medic)&#10;Medics can be trained from a Barracks without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1234] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Nano Projector (Medic)&#10;Increases Medic heal range by 2." class=" talent-raynor-level03-firebatmedicrange-png"></div>
+            <div class="f {{'unacquired' if inventory[1224] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optical Flare (Medic)&#10;Medics gain the Optical Flare ability, &#10;which reduces vision range of target enemy unit. Disables detection." class=" btn-upgrade-protoss-fenix-dragoonsolariteflare-png"></div>
+            <div class="f {{'unacquired' if inventory[1225] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Medic)&#10;Reduces Medic cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1223] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Restoration (Medic)&#10;Medics gain the Restoration ability, &#10;which removes negative status effects from a target allied unit." class=" btn-ability-terran-restorationscbw-png"></div>
+            <div class="f {{'unacquired' if inventory[1211] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stabilizer Medpacks (Medic)&#10;Increases Medic heal speed. Reduces the amount of energy required for each heal." class=" btn-upgrade-raynor-stabilizermedpacks-png"></div>
           </div>
         </div>
         <div id="class-firebat" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1002] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Firebat&#10;Specialized anti-infantry attacker." class=" btn-unit-terran-firebat-png"></div>
+            <div class="f {{'unacquired' if inventory[1002] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Firebat&#10;Specialized anti-infantry attacker." class=" btn-unit-terran-firebat-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1212] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Incinerator Gauntlets (Firebat)&#10;Increases Firebat's damage radius by 40%." class=" btn-upgrade-raynor-incineratorgauntlets-png"></div>
-            <div class="f {{'unacquired' if inventory[1235] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infernal Pre-Igniter (Firebat)&#10;Firebats do an additional 4 damage to Light Armor." class=" btn-upgrade-terran-infernalpreigniter-png"></div>
-            <div class="f {{'unacquired' if inventory[1213] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Juggernaut Plating (Firebat)&#10;Increases Firebat's armor by 2." class=" btn-upgrade-raynor-juggernautplating-png"></div>
-            <div class="f {{'unacquired' if inventory[1236] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kinetic Foam (Firebat)&#10;Increases Firebat life by 100." class=" btn-techupgrade-kinetic-foam-png"></div>
-            <div class="f {{'unacquired' if inventory[1237] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Nano Projectors (Firebat)&#10;Increases Firebat attack range by 2." class=" talent-raynor-level03-firebatmedicrange-png"></div>
+            <div class="f {{'unacquired' if inventory[1212] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Incinerator Gauntlets (Firebat)&#10;Increases Firebat's damage radius by 40%." class=" btn-upgrade-raynor-incineratorgauntlets-png"></div>
+            <div class="f {{'unacquired' if inventory[1235] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infernal Pre-Igniter (Firebat)&#10;Firebats do an additional 4 damage to Light Armor." class=" btn-upgrade-terran-infernalpreigniter-png"></div>
+            <div class="f {{'unacquired' if inventory[1213] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Juggernaut Plating (Firebat)&#10;Increases Firebat's armor by 2." class=" btn-upgrade-raynor-juggernautplating-png"></div>
+            <div class="f {{'unacquired' if inventory[1236] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kinetic Foam (Firebat)&#10;Increases Firebat life by 100." class=" btn-techupgrade-kinetic-foam-png"></div>
+            <div class="f {{'unacquired' if inventory[1237] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Nano Projectors (Firebat)&#10;Increases Firebat attack range by 2." class=" talent-raynor-level03-firebatmedicrange-png"></div>
             <div class="progressive lvl-{{[inventory[1226], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Firebat) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Firebat) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Firebat) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Firebat) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1227] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Firebat)&#10;Reduces Firebat cost by 50 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1227] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Firebat)&#10;Reduces Firebat cost by 50 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-marauder" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1003] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Marauder&#10;Heavy assault infantry." class=" btn-unit-terran-marauder-png"></div>
+            <div class="f {{'unacquired' if inventory[1003] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Marauder&#10;Heavy assault infantry." class=" btn-unit-terran-marauder-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1214] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concussive Shells (Marauder)&#10;Marauder attack temporarily slows all units in target area." class=" btn-ability-terran-punishergrenade-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1231] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Marauder)&#10;Marauders can be trained from a Barracks without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1238] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Juggernaut Plating (Marauder)&#10;Increases Marauder's armor by 2." class=" btn-juggernaut-plating-marauder-png"></div>
-            <div class="f {{'unacquired' if inventory[1215] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kinetic Foam (Marauder)&#10;Increases Marauder life by 25." class=" btn-techupgrade-kinetic-foam-png"></div>
-            <div class="f {{'unacquired' if inventory[1229] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Marauder)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1230] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Magrail Munitions (Marauder)&#10;Deals 20 damage to target unit. Autocast on attack with a cooldown." class=" btn-upgrade-terran-magrailmunitions-png"></div>
+            <div class="f {{'unacquired' if inventory[1214] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concussive Shells (Marauder)&#10;Marauder attack temporarily slows all units in target area." class=" btn-ability-terran-punishergrenade-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1231] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Marauder)&#10;Marauders can be trained from a Barracks without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1238] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Juggernaut Plating (Marauder)&#10;Increases Marauder's armor by 2." class=" btn-juggernaut-plating-marauder-png"></div>
+            <div class="f {{'unacquired' if inventory[1215] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kinetic Foam (Marauder)&#10;Increases Marauder life by 25." class=" btn-techupgrade-kinetic-foam-png"></div>
+            <div class="f {{'unacquired' if inventory[1229] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Marauder)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1230] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Magrail Munitions (Marauder)&#10;Deals 20 damage to target unit. Autocast on attack with a cooldown." class=" btn-upgrade-terran-magrailmunitions-png"></div>
             <div class="progressive lvl-{{[inventory[1228], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marauder) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marauder) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marauder) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Marauder) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
             </div>
           </div>
         </div>
         <div id="class-reaper" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1004] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reaper&#10;Raider. Capable of jumping up and down cliffs. Throws explosive mines." class=" btn-unit-terran-reaper-png"></div>
+            <div class="f {{'unacquired' if inventory[1004] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reaper&#10;Raider. Capable of jumping up and down cliffs. Throws explosive mines." class=" btn-unit-terran-reaper-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1252] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Cloaking Field (Reaper)&#10;Reapers are permanently cloaked." class=" btn-permacloak-reaper-png"></div>
-            <div class="f {{'unacquired' if inventory[1288] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ballistic Flightsuit (Reaper)&#10;Increases Reaper life by 10." class=" btn-upgrade-mengsk-engineeringbay-dominionarmorlevel2-png"></div>
-            <div class="f {{'unacquired' if inventory[1254] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Combat Drugs (Reaper)&#10;Reapers regenerate life while out of combat." class=" btn-upgrade-terran-reapercombatdrugs-png"></div>
-            <div class="f {{'unacquired' if inventory[1217] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="G-4 Clusterbomb (Reaper)&#10;Timed explosive that does heavy area damage." class=" btn-upgrade-terran-kd8chargeex3-png"></div>
-            <div class="f {{'unacquired' if inventory[1239] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jet Pack Overdrive (Reaper)&#10;Allows the Reaper to fly for 10 seconds.&#10;While flying, the Reaper can attack air units." class=" btn-ability-hornerhan-reaper-flightmode-png"></div>
-            <div class="f {{'unacquired' if inventory[1251] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Reaper)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1252] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Cloaking Field (Reaper)&#10;Reapers are permanently cloaked." class=" btn-permacloak-reaper-png"></div>
+            <div class="f {{'unacquired' if inventory[1288] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ballistic Flightsuit (Reaper)&#10;Increases Reaper life by 10." class=" btn-upgrade-mengsk-engineeringbay-dominionarmorlevel2-png"></div>
+            <div class="f {{'unacquired' if inventory[1254] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Combat Drugs (Reaper)&#10;Reapers regenerate life while out of combat." class=" btn-upgrade-terran-reapercombatdrugs-png"></div>
+            <div class="f {{'unacquired' if inventory[1217] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="G-4 Clusterbomb (Reaper)&#10;Timed explosive that does heavy area damage." class=" btn-upgrade-terran-kd8chargeex3-png"></div>
+            <div class="f {{'unacquired' if inventory[1239] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jet Pack Overdrive (Reaper)&#10;Allows the Reaper to fly for 10 seconds.&#10;While flying, the Reaper can attack air units." class=" btn-ability-hornerhan-reaper-flightmode-png"></div>
+            <div class="f {{'unacquired' if inventory[1251] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Reaper)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
             <div class="progressive lvl-{{[inventory[1250], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Reaper) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Reaper) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Reaper) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Reaper) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 10 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 30 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1287] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Reaper)&#10;Reduces Reaper cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1253] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spider Mines (Reaper)&#10;Allows Reapers to lay Spider Mines. 3 charges per Reaper." class=" btn-ability-terran-spidermine-png"></div>
-            <div class="f {{'unacquired' if inventory[1216] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="U-238 Rounds (Reaper)&#10;Increases Reaper pistol attack range by 1.&#10;Reaper pistols do additional 3 damage to Light Armor." class=" btn-techupgrade-terran-u238rounds-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1287] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Reaper)&#10;Reduces Reaper cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1253] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spider Mines (Reaper)&#10;Allows Reapers to lay Spider Mines. 3 charges per Reaper." class=" btn-ability-terran-spidermine-png"></div>
+            <div class="f {{'unacquired' if inventory[1216] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="U-238 Rounds (Reaper)&#10;Increases Reaper pistol attack range by 1.&#10;Reaper pistols do additional 3 damage to Light Armor." class=" btn-techupgrade-terran-u238rounds-color-png"></div>
           </div>
         </div>
         <div id="class-ghost" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1015] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ghost&#10;Infiltration unit. Can use Snipe and Cloak abilities. Can also call down Tactical Nukes." class=" btn-unit-terran-ghost-png"></div>
+            <div class="f {{'unacquired' if inventory[1015] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ghost&#10;Infiltration unit. Can use Snipe and Cloak abilities. Can also call down Tactical Nukes." class=" btn-unit-terran-ghost-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1767] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Ghost)&#10;Reduces Ghost cost by 100 minerals, 50 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
-            <div class="f {{'unacquired' if inventory[1321] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Crius Suit (Ghost)&#10;Cloak no longer requires energy to activate or maintain." class=" btn-permacloak-ghost-png"></div>
-            <div class="f {{'unacquired' if inventory[1358] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="EMP Rounds (Ghost)&#10;Spell. Does 100 damage to shields and drains all energy from units in the targeted area. &#10;Cloaked units hit by EMP are revealed for a short time." class=" btn-ability-terran-emp-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1359] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Lockdown (Ghost)&#10;Spell. Stuns a target mechanical unit for a long time." class=" btn-abilty-terran-lockdownscbw-png"></div>
-            <div class="f {{'unacquired' if inventory[1320] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ocular Implants (Ghost)&#10;Increases Ghost sight range by 3 and attack range by 2." class=" btn-techupgrade-terran-ocularimplants-png"></div>
-            <div class="f {{'unacquired' if inventory[1340] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Ghost)&#10;Reduces Ghost cost by 25 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1767] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Ghost)&#10;Reduces Ghost cost by 100 minerals, 50 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
+            <div class="f {{'unacquired' if inventory[1321] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Crius Suit (Ghost)&#10;Cloak no longer requires energy to activate or maintain." class=" btn-permacloak-ghost-png"></div>
+            <div class="f {{'unacquired' if inventory[1358] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="EMP Rounds (Ghost)&#10;Spell. Does 100 damage to shields and drains all energy from units in the targeted area. &#10;Cloaked units hit by EMP are revealed for a short time." class=" btn-ability-terran-emp-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1359] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Lockdown (Ghost)&#10;Spell. Stuns a target mechanical unit for a long time." class=" btn-abilty-terran-lockdownscbw-png"></div>
+            <div class="f {{'unacquired' if inventory[1320] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ocular Implants (Ghost)&#10;Increases Ghost sight range by 3 and attack range by 2." class=" btn-techupgrade-terran-ocularimplants-png"></div>
+            <div class="f {{'unacquired' if inventory[1340] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Ghost)&#10;Reduces Ghost cost by 25 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-spectre" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1016] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spectre&#10;Infiltration unit. Can use Ultrasonic Pulse, Psionic Lash, and Cloak. &#10;Can also call down Tactical Nukes." class=" btn-unit-terran-spectre-png"></div>
+            <div class="f {{'unacquired' if inventory[1016] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spectre&#10;Infiltration unit. Can use Ultrasonic Pulse, Psionic Lash, and Cloak. &#10;Can also call down Tactical Nukes." class=" btn-unit-terran-spectre-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1768] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Spectre)&#10;Reduces Spectre cost by 100 minerals, 50 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
-            <div class="f {{'unacquired' if inventory[1360] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Impaler Rounds (Spectre)&#10;Spectres do additional damage to armored targets." class=" btn-techupgrade-terran-impalerrounds-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1323] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Nyx-Class Cloaking Module (Spectre)&#10;Cloak no longer requires energy to activate or maintain." class=" btn-permacloak-spectre-png"></div>
-            <div class="f {{'unacquired' if inventory[1322] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Psionic Lash (Spectre)&#10;Spell. Deals 200 damage to a single target." class=" btn-techupgrade-terran-psioniclash-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1341] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Spectre)&#10;Reduces Spectre cost by 25 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1768] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Spectre)&#10;Reduces Spectre cost by 100 minerals, 50 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
+            <div class="f {{'unacquired' if inventory[1360] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Impaler Rounds (Spectre)&#10;Spectres do additional damage to armored targets." class=" btn-techupgrade-terran-impalerrounds-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1323] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Nyx-Class Cloaking Module (Spectre)&#10;Cloak no longer requires energy to activate or maintain." class=" btn-permacloak-spectre-png"></div>
+            <div class="f {{'unacquired' if inventory[1322] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Psionic Lash (Spectre)&#10;Spell. Deals 200 damage to a single target." class=" btn-techupgrade-terran-psioniclash-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1341] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Spectre)&#10;Reduces Spectre cost by 25 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-herc" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1022] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="HERC&#10;Front-line infantry. Can use Grapple." class=" btn-unit-terran-herc-png"></div>
+            <div class="f {{'unacquired' if inventory[1022] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="HERC&#10;Front-line infantry. Can use Grapple." class=" btn-unit-terran-herc-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1296] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Grapple Pull (HERC)&#10;Allows HERCs to use their grappling gun to pull a ground unit towards the HERC." class=" btn-ability-tychus-herc-heavyimpact-png"></div>
-            <div class="f {{'unacquired' if inventory[1285] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Juggernaut Plating (HERC)&#10;Increases HERC armor by 2." class=" btn-juggernaut-plating-herc-png"></div>
-            <div class="f {{'unacquired' if inventory[1286] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kinetic Foam (HERC)&#10;Increases HERC life by 50." class=" btn-techupgrade-kinetic-foam-png"></div>
-            <div class="f {{'unacquired' if inventory[1284] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (HERC)&#10;Reduces HERC cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1296] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Grapple Pull (HERC)&#10;Allows HERCs to use their grappling gun to pull a ground unit towards the HERC." class=" btn-ability-tychus-herc-heavyimpact-png"></div>
+            <div class="f {{'unacquired' if inventory[1285] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Juggernaut Plating (HERC)&#10;Increases HERC armor by 2." class=" btn-juggernaut-plating-herc-png"></div>
+            <div class="f {{'unacquired' if inventory[1286] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kinetic Foam (HERC)&#10;Increases HERC life by 50." class=" btn-techupgrade-kinetic-foam-png"></div>
+            <div class="f {{'unacquired' if inventory[1284] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (HERC)&#10;Reduces HERC cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-dominion-trooper" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1024] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dominion Trooper&#10;General-purpose infantry. Can be outfitted with weapons for different combat situations." class=" btn-unit-terran-troopermengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1024] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dominion Trooper&#10;General-purpose infantry. Can be outfitted with weapons for different combat situations." class=" btn-unit-terran-troopermengsk-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1760] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Alloys (Dominion Trooper)&#10;Trooper weapons cost 20 fewer gas and now last for 5 minutes when dropped on death." class=" btn-upgrade-mengsk-engineeringbay-dominionweaponslevel0-png"></div>
-            <div class="f {{'unacquired' if inventory[1757] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="B-2 High-Cal LMG (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, effective against all unit types." class=" btn-upgrade-mengsk-trooper-plasmarifle-png"></div>
-            <div class="f {{'unacquired' if inventory[1759] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="CPO-7 Salamander Flamethrower (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, especially effective against light ground units." class=" btn-upgrade-mengsk-trooper-flamethrower-png"></div>
-            <div class="f {{'unacquired' if inventory[1758] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hailstorm Launcher (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, especially effective against armored air units." class=" btn-upgrade-mengsk-trooper-missilelauncher-png"></div>
-            <div class="f {{'unacquired' if inventory[1761] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Dominion Trooper)&#10;Increases Dominion Trooper training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1760] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Alloys (Dominion Trooper)&#10;Trooper weapons cost 20 fewer gas and now last for 5 minutes when dropped on death." class=" btn-upgrade-mengsk-engineeringbay-dominionweaponslevel0-png"></div>
+            <div class="f {{'unacquired' if inventory[1757] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="B-2 High-Cal LMG (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, effective against all unit types." class=" btn-upgrade-mengsk-trooper-plasmarifle-png"></div>
+            <div class="f {{'unacquired' if inventory[1759] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="CPO-7 Salamander Flamethrower (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, especially effective against light ground units." class=" btn-upgrade-mengsk-trooper-flamethrower-png"></div>
+            <div class="f {{'unacquired' if inventory[1758] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hailstorm Launcher (Dominion Trooper)&#10;Allows the Troopers to arm with a more powerful weapon, especially effective against armored air units." class=" btn-upgrade-mengsk-trooper-missilelauncher-png"></div>
+            <div class="f {{'unacquired' if inventory[1761] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Dominion Trooper)&#10;Increases Dominion Trooper training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -250,155 +250,155 @@
         </div>
         <div id="class-hellion" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1005] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hellion&#10;Fast scout. Has a flame attack that damages all enemy units in its line of fire." class=" btn-unit-terran-hellion-png"></div>
+            <div class="f {{'unacquired' if inventory[1005] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hellion&#10;Fast scout. Has a flame attack that damages all enemy units in its line of fire." class=" btn-unit-terran-hellion-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1255] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hellbat (Hellion Morph)&#10;Allows Hellions to transform into Hellbats." class=" btn-unit-terran-hellionbattlemode-png"></div>
-            <div class="f {{'unacquired' if inventory[1240] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infernal Plating (Hellion)&#10;Increases Hellion and Hellbat armor by 2." class=" btn-upgrade-swann-hellarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1258] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jump Jets (Hellion)&#10;Increases movement speed in Hellion mode.&#10;In Hellbat mode, launches the Hellbat toward enemy ground units and briefly stuns them." class=" btn-upgrade-terran-jumpjets-png"></div>
-            <div class="f {{'unacquired' if inventory[1257] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Hellion)&#10;Increases Hellion training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1255] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hellbat (Hellion Morph)&#10;Allows Hellions to transform into Hellbats." class=" btn-unit-terran-hellionbattlemode-png"></div>
+            <div class="f {{'unacquired' if inventory[1240] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infernal Plating (Hellion)&#10;Increases Hellion and Hellbat armor by 2." class=" btn-upgrade-swann-hellarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1258] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jump Jets (Hellion)&#10;Increases movement speed in Hellion mode.&#10;In Hellbat mode, launches the Hellbat toward enemy ground units and briefly stuns them." class=" btn-upgrade-terran-jumpjets-png"></div>
+            <div class="f {{'unacquired' if inventory[1257] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Hellion)&#10;Increases Hellion training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
             <div class="progressive lvl-{{[inventory[1259], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Hellion) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Hellion) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Hellion) - Level 1&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-ability-terran-stimpack-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stimpack (Hellion) - Level 2&#10;Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for 20 life.&#10;Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for 60 life instead." class=" btn-upgrade-terran-superstimppack-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1256] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Smart Servos (Hellion)&#10;Transforms faster between modes. Hellions can attack while moving." class=" btn-upgrade-terran-transformationservos-png"></div>
-            <div class="f {{'unacquired' if inventory[1301] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Thermite Filaments (Hellion)&#10;Hellions do an additional 10 damage to Light Armor." class=" btn-upgrade-terran-infernalpreigniter-png"></div>
-            <div class="f {{'unacquired' if inventory[1300] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Twin-Linked Flamethrower (Hellion)&#10;Doubles the width of the Hellion's flame attack." class=" btn-upgrade-terran-twin-linkedflamethrower-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1256] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Smart Servos (Hellion)&#10;Transforms faster between modes. Hellions can attack while moving." class=" btn-upgrade-terran-transformationservos-png"></div>
+            <div class="f {{'unacquired' if inventory[1301] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Thermite Filaments (Hellion)&#10;Hellions do an additional 10 damage to Light Armor." class=" btn-upgrade-terran-infernalpreigniter-png"></div>
+            <div class="f {{'unacquired' if inventory[1300] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Twin-Linked Flamethrower (Hellion)&#10;Doubles the width of the Hellion's flame attack." class=" btn-upgrade-terran-twin-linkedflamethrower-color-png"></div>
           </div>
         </div>
         <div id="class-vulture" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1006] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vulture&#10;Fast skirmish unit. Can use the Spider Mine ability." class=" btn-unit-terran-vulture-png"></div>
+            <div class="f {{'unacquired' if inventory[1006] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vulture&#10;Fast skirmish unit. Can use the Spider Mine ability." class=" btn-unit-terran-vulture-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1261] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Auto Launchers (Vulture)&#10;Allows Vultures to attack while moving." class=" vultureautolaunchers-png"></div>
-            <div class="f {{'unacquired' if inventory[1260] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ion Thrusters (Vulture)&#10;Increases Vulture movement speed." class=" btn-ability-terran-emergencythrusters-png"></div>
-            <div class="f {{'unacquired' if inventory[1241] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jerry-Rigged Patchup (Vulture)&#10;Vultures regenerate life." class=" btn-jerry-rigged-patchjob-png"></div>
+            <div class="f {{'unacquired' if inventory[1261] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Auto Launchers (Vulture)&#10;Allows Vultures to attack while moving." class=" vultureautolaunchers-png"></div>
+            <div class="f {{'unacquired' if inventory[1260] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ion Thrusters (Vulture)&#10;Increases Vulture movement speed." class=" btn-ability-terran-emergencythrusters-png"></div>
+            <div class="f {{'unacquired' if inventory[1241] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jerry-Rigged Patchup (Vulture)&#10;Vultures regenerate life." class=" btn-jerry-rigged-patchjob-png"></div>
             <div class="progressive lvl-{{[inventory[1303], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Replenishable Magazine (Vulture) - Level 1&#10;Level 1: Allows Vultures to replace used Spider Mines. Costs 15 minerals.&#10;Level 2: Replacing used Spider Mines no longer costs minerals." class=" btn-upgrade-raynor-replenishablemagazine-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Replenishable Magazine (Vulture) - Level 2&#10;Level 1: Allows Vultures to replace used Spider Mines. Costs 15 minerals.&#10;Level 2: Replacing used Spider Mines no longer costs minerals." class=" btn-upgrade-terran-replenishablemagazinelvl2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Replenishable Magazine (Vulture) - Level 1&#10;Level 1: Allows Vultures to replace used Spider Mines. Costs 15 minerals.&#10;Level 2: Replacing used Spider Mines no longer costs minerals." class=" btn-upgrade-raynor-replenishablemagazine-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Replenishable Magazine (Vulture) - Level 2&#10;Level 1: Allows Vultures to replace used Spider Mines. Costs 15 minerals.&#10;Level 2: Replacing used Spider Mines no longer costs minerals." class=" btn-upgrade-terran-replenishablemagazinelvl2-png"></div>
             </div>
           </div>
         </div>
         <div id="class-goliath" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1007] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Goliath&#10;Heavy-fire support unit." class=" btn-unit-terran-goliath-png"></div>
+            <div class="f {{'unacquired' if inventory[1007] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Goliath&#10;Heavy-fire support unit." class=" btn-unit-terran-goliath-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1305] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ares-Class Targeting System (Goliath)&#10;Increases Goliath ground attack range by 1 and air by 3." class=" btn-upgrade-swann-aresclasstargetingsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1244] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Goliath)&#10;Goliaths can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1263] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jump Jets (Goliath)&#10;Allows Goliaths to jump up and down cliffs." class=" btn-ability-terran-goliath-jetpack-png"></div>
-            <div class="f {{'unacquired' if inventory[1304] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Multi-Lock Weapons System (Goliath)&#10;Goliaths can attack both ground and air targets simultaneously." class=" btn-upgrade-swann-multilockweaponsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1264] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Goliath)&#10;Increases Goliath training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
-            <div class="f {{'unacquired' if inventory[1243] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Goliath)&#10;Reduces Goliath cost by 50 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1242] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Hull (Goliath)&#10;Increases Goliath life by 25." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
+            <div class="f {{'unacquired' if inventory[1305] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ares-Class Targeting System (Goliath)&#10;Increases Goliath ground attack range by 1 and air by 3." class=" btn-upgrade-swann-aresclasstargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1244] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Goliath)&#10;Goliaths can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1263] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jump Jets (Goliath)&#10;Allows Goliaths to jump up and down cliffs." class=" btn-ability-terran-goliath-jetpack-png"></div>
+            <div class="f {{'unacquired' if inventory[1304] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Multi-Lock Weapons System (Goliath)&#10;Goliaths can attack both ground and air targets simultaneously." class=" btn-upgrade-swann-multilockweaponsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1264] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Goliath)&#10;Increases Goliath training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1243] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Goliath)&#10;Reduces Goliath cost by 50 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1242] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Hull (Goliath)&#10;Increases Goliath life by 25." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
           </div>
         </div>
         <div id="class-diamondback" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1008] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Diamondback&#10;Fast, high-damage hovertank. Rail Gun can fire while the Diamondback is moving." class=" btn-unit-terran-cobra-png"></div>
+            <div class="f {{'unacquired' if inventory[1008] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Diamondback&#10;Fast, high-damage hovertank. Rail Gun can fire while the Diamondback is moving." class=" btn-unit-terran-cobra-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1266] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Burst Capacitors (Diamondback)&#10;While not attacking, the Diamondback charges its weapon. &#10;The next attack does 10 additional damage." class=" btn-ability-terran-electricfield-png"></div>
-            <div class="f {{'unacquired' if inventory[1265] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hyperfluxor (Diamondback)&#10;Increases Diamondback attack speed." class=" btn-upgrade-mengsk-engineeringbay-orbitaldrop-png"></div>
-            <div class="f {{'unacquired' if inventory[1281] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Maglev Propulsion (Diamondback)&#10;Increases Diamondback movement speed." class=" btn-upgrade-terran-nova-specialordance-png"></div>
+            <div class="f {{'unacquired' if inventory[1266] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Burst Capacitors (Diamondback)&#10;While not attacking, the Diamondback charges its weapon. &#10;The next attack does 10 additional damage." class=" btn-ability-terran-electricfield-png"></div>
+            <div class="f {{'unacquired' if inventory[1265] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hyperfluxor (Diamondback)&#10;Increases Diamondback attack speed." class=" btn-upgrade-mengsk-engineeringbay-orbitaldrop-png"></div>
+            <div class="f {{'unacquired' if inventory[1281] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Maglev Propulsion (Diamondback)&#10;Increases Diamondback movement speed." class=" btn-upgrade-terran-nova-specialordance-png"></div>
             <div class="progressive lvl-{{[inventory[1306], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Tri-Lithium Power Cell (Diamondback) - Level 1&#10;Level 1: Tri-Lithium Power Cell: Increases Diamondback attack range by 1.&#10;Level 2: Tungsten Spikes: Increases Diamondback attack range by 3." class=" btn-upgrade-terran-trilithium-power-cell-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Tri-Lithium Power Cell (Diamondback) - Level 2&#10;Level 1: Tri-Lithium Power Cell: Increases Diamondback attack range by 1.&#10;Level 2: Tungsten Spikes: Increases Diamondback attack range by 3." class=" btn-upgrade-terran-tungsten-spikes-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Tri-Lithium Power Cell (Diamondback) - Level 1&#10;Level 1: Tri-Lithium Power Cell: Increases Diamondback attack range by 1.&#10;Level 2: Tungsten Spikes: Increases Diamondback attack range by 3." class=" btn-upgrade-terran-trilithium-power-cell-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Tri-Lithium Power Cell (Diamondback) - Level 2&#10;Level 1: Tri-Lithium Power Cell: Increases Diamondback attack range by 1.&#10;Level 2: Tungsten Spikes: Increases Diamondback attack range by 3." class=" btn-upgrade-terran-tungsten-spikes-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1267] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Diamondback)&#10;Reduces Diamondback cost by 50 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1307] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Hull (Diamondback)&#10;Increases Diamondback life by 50." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
+            <div class="f {{'unacquired' if inventory[1267] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Diamondback)&#10;Reduces Diamondback cost by 50 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1307] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Hull (Diamondback)&#10;Increases Diamondback life by 50." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
           </div>
         </div>
         <div id="class-siege-tank" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1009] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Siege Tank&#10;Heavy tank. Long-range artillery in Siege Mode." class=" btn-unit-terran-siegetank-png"></div>
+            <div class="f {{'unacquired' if inventory[1009] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Siege Tank&#10;Heavy tank. Long-range artillery in Siege Mode." class=" btn-unit-terran-siegetank-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1273] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Siege Tech (Siege Tank)&#10;Siege Tanks gain +3 armor in Siege Mode." class=" btn-upgrade-raynor-improvedsiegemode-png"></div>
-            <div class="f {{'unacquired' if inventory[1290] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="All-Terrain Treads (Siege Tank)&#10;Increases movement speed of Siege Tanks in Tank Mode." class=" btn-all-terrain-treads-png"></div>
-            <div class="f {{'unacquired' if inventory[1271] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Graduating Range (Siege Tank)&#10;Increases the Siege Tank's attack range by 1 every 3 seconds while in Siege Mode, &#10;up to a maximum of 5 additional range." class=" btn-upgrade-terran-nova-siegetankrange-png"></div>
-            <div class="f {{'unacquired' if inventory[1274] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Siege Tank)&#10;Siege Tanks can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1268] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jump Jets (Siege Tank)&#10;Repositions Siege Tank to a target location. &#10;Can be used in either mode and to jump up and down cliffs. " class=" btn-upgrade-terran-jumpjets-png"></div>
-            <div class="f {{'unacquired' if inventory[1272] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Siege Tank)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1308] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Maelstrom Rounds (Siege Tank)&#10;Siege Tanks do an additional 40 damage to the primary target in Siege Mode." class=" btn-upgrade-raynor-maelstromrounds-png"></div>
+            <div class="f {{'unacquired' if inventory[1273] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Siege Tech (Siege Tank)&#10;Siege Tanks gain +3 armor in Siege Mode." class=" btn-upgrade-raynor-improvedsiegemode-png"></div>
+            <div class="f {{'unacquired' if inventory[1290] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="All-Terrain Treads (Siege Tank)&#10;Increases movement speed of Siege Tanks in Tank Mode." class=" btn-all-terrain-treads-png"></div>
+            <div class="f {{'unacquired' if inventory[1271] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Graduating Range (Siege Tank)&#10;Increases the Siege Tank's attack range by 1 every 3 seconds while in Siege Mode, &#10;up to a maximum of 5 additional range." class=" btn-upgrade-terran-nova-siegetankrange-png"></div>
+            <div class="f {{'unacquired' if inventory[1274] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Siege Tank)&#10;Siege Tanks can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1268] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jump Jets (Siege Tank)&#10;Repositions Siege Tank to a target location. &#10;Can be used in either mode and to jump up and down cliffs. " class=" btn-upgrade-terran-jumpjets-png"></div>
+            <div class="f {{'unacquired' if inventory[1272] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Siege Tank)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1308] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Maelstrom Rounds (Siege Tank)&#10;Siege Tanks do an additional 40 damage to the primary target in Siege Mode." class=" btn-upgrade-raynor-maelstromrounds-png"></div>
             <div class="progressive lvl-{{[inventory[1289], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Transport Hook (Siege Tank) - Level 1&#10;Level 1: Allows Siege Tanks to be transported in Siege Mode.&#10;Level 2: Siege Tanks in Siege Mode can attack air units while transported by a Medivac." class=" btn-ability-tychus-medivac-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Transport Hook (Siege Tank) - Level 2&#10;Level 1: Allows Siege Tanks to be transported in Siege Mode.&#10;Level 2: Siege Tanks in Siege Mode can attack air units while transported by a Medivac." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Transport Hook (Siege Tank) - Level 1&#10;Level 1: Allows Siege Tanks to be transported in Siege Mode.&#10;Level 2: Siege Tanks in Siege Mode can attack air units while transported by a Medivac." class=" btn-ability-tychus-medivac-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Transport Hook (Siege Tank) - Level 2&#10;Level 1: Allows Siege Tanks to be transported in Siege Mode.&#10;Level 2: Siege Tanks in Siege Mode can attack air units while transported by a Medivac." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1246] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Siege Tank)&#10;Reduces Siege Tank cost by 25 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1309] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Blast (Siege Tank)&#10;Reduces splash damage to friendly targets while in Siege Mode by 75%." class=" btn-techupgrade-terran-shapedblast-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1245] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Hull (Siege Tank)&#10;Increases Siege Tank life by 25." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
-            <div class="f {{'unacquired' if inventory[1270] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Smart Servos (Siege Tank)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
-            <div class="f {{'unacquired' if inventory[1269] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spider Mines (Siege Tank)&#10;Allows Siege Tanks to lay Spider Mines. &#10;Lays 3 Spider Mines at once. 3 charges." class=" btn-upgrade-siegetank-spidermines-png"></div>
+            <div class="f {{'unacquired' if inventory[1246] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Siege Tank)&#10;Reduces Siege Tank cost by 25 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1309] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Blast (Siege Tank)&#10;Reduces splash damage to friendly targets while in Siege Mode by 75%." class=" btn-techupgrade-terran-shapedblast-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1245] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Hull (Siege Tank)&#10;Increases Siege Tank life by 25." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
+            <div class="f {{'unacquired' if inventory[1270] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Smart Servos (Siege Tank)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
+            <div class="f {{'unacquired' if inventory[1269] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spider Mines (Siege Tank)&#10;Allows Siege Tanks to lay Spider Mines. &#10;Lays 3 Spider Mines at once. 3 charges." class=" btn-upgrade-siegetank-spidermines-png"></div>
           </div>
         </div>
         <div id="class-thor" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1017] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Thor&#10;Heavy assault mech." class=" btn-unit-terran-thor-png"></div>
+            <div class="f {{'unacquired' if inventory[1017] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Thor&#10;Heavy assault mech." class=" btn-unit-terran-thor-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1324] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="330mm Barrage Cannon (Thor)&#10;Improves 250mm Strike Cannons ability to deal area damage and stun units in a small area.&#10;Can be also freely aimed on ground." class=" btn-ability-thor-330mm-png"></div>
-            <div class="f {{'unacquired' if inventory[1342] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Button With a Skull on It (Thor)&#10;Allows Thors to launch nukes." class=" btn-ability-terran-nuclearstrike-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1344] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Large Scale Field Construction (Thor)&#10;Allows Thors to be built by SCVs like a structure." class=" btn-tips-armory-png"></div>
-            <div class="f {{'unacquired' if inventory[1343] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Thor)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1324] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="330mm Barrage Cannon (Thor)&#10;Improves 250mm Strike Cannons ability to deal area damage and stun units in a small area.&#10;Can be also freely aimed on ground." class=" btn-ability-thor-330mm-png"></div>
+            <div class="f {{'unacquired' if inventory[1342] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Button With a Skull on It (Thor)&#10;Allows Thors to launch nukes." class=" btn-ability-terran-nuclearstrike-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1344] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Large Scale Field Construction (Thor)&#10;Allows Thors to be built by SCVs like a structure." class=" btn-tips-armory-png"></div>
+            <div class="f {{'unacquired' if inventory[1343] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Thor)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
             <div class="progressive lvl-{{[inventory[1361], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive High Impact Payload (Thor) - Level 1&#10;Level 1: Allows Thors to transform in order to use an alternative air attack.&#10;Level 2: Increases transformation speed between modes." class=" btn-unit-terran-thorsiegemode-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive High Impact Payload (Thor) - Level 2&#10;Level 1: Allows Thors to transform in order to use an alternative air attack.&#10;Level 2: Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive High Impact Payload (Thor) - Level 1&#10;Level 1: Allows Thors to transform in order to use an alternative air attack.&#10;Level 2: Increases transformation speed between modes." class=" btn-unit-terran-thorsiegemode-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive High Impact Payload (Thor) - Level 2&#10;Level 1: Allows Thors to transform in order to use an alternative air attack.&#10;Level 2: Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1325], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Immortality Protocol (Thor) - Level 1&#10;Level 1: Allows destroyed Thors to be reconstructed on the field. Costs Vespene Gas.&#10;Level 2: Thors are automatically reconstructed after falling for free." class=" btn-techupgrade-terran-immortalityprotocol-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Immortality Protocol (Thor) - Level 2&#10;Level 1: Allows destroyed Thors to be reconstructed on the field. Costs Vespene Gas.&#10;Level 2: Thors are automatically reconstructed after falling for free." class=" talent-swann-level12-immortalityprotocol-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Immortality Protocol (Thor) - Level 1&#10;Level 1: Allows destroyed Thors to be reconstructed on the field. Costs Vespene Gas.&#10;Level 2: Thors are automatically reconstructed after falling for free." class=" btn-techupgrade-terran-immortalityprotocol-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Immortality Protocol (Thor) - Level 2&#10;Level 1: Allows destroyed Thors to be reconstructed on the field. Costs Vespene Gas.&#10;Level 2: Thors are automatically reconstructed after falling for free." class=" talent-swann-level12-immortalityprotocol-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1293] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Reload (Thor)&#10;Increases Thor's ground attack speed." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
+            <div class="f {{'unacquired' if inventory[1293] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Reload (Thor)&#10;Increases Thor's ground attack speed." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
           </div>
         </div>
         <div id="class-predator" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1614] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Predator&#10;Anti-infantry specialist that deals area damage with each attack." class=" btn-unit-terran-predator-png"></div>
+            <div class="f {{'unacquired' if inventory[1614] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Predator&#10;Anti-infantry specialist that deals area damage with each attack." class=" btn-unit-terran-predator-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1753] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adaptive Defenses (Predator)&#10;Predators gain a shield that halves incoming ranged and splash damage while active." class=" btn-ability-stetmann-banelingmanashield-png"></div>
-            <div class="f {{'unacquired' if inventory[1248] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concussive Charge (Predator)&#10;Allows Predators to intercept enemy ground units, and applies an AoE slow on arrival." class=" predatorcharge-png"></div>
-            <div class="f {{'unacquired' if inventory[1247] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phase Cloak (Predator)&#10;Allows Predators to briefly cloak. Predators ignore unit collision while cloaked." class=" btn-phase-cloak-png"></div>
-            <div class="f {{'unacquired' if inventory[1275] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Predator)&#10;Reduces Predator cost by 75 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1392] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vespene Synthesis (Predator)&#10;Gives 1 free Vespene per target hit with Lightning Field." class=" predatorvespene-png"></div>
+            <div class="f {{'unacquired' if inventory[1753] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adaptive Defenses (Predator)&#10;Predators gain a shield that halves incoming ranged and splash damage while active." class=" btn-ability-stetmann-banelingmanashield-png"></div>
+            <div class="f {{'unacquired' if inventory[1248] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concussive Charge (Predator)&#10;Allows Predators to intercept enemy ground units, and applies an AoE slow on arrival." class=" predatorcharge-png"></div>
+            <div class="f {{'unacquired' if inventory[1247] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phase Cloak (Predator)&#10;Allows Predators to briefly cloak. Predators ignore unit collision while cloaked." class=" btn-phase-cloak-png"></div>
+            <div class="f {{'unacquired' if inventory[1275] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Predator)&#10;Reduces Predator cost by 75 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1392] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vespene Synthesis (Predator)&#10;Gives 1 free Vespene per target hit with Lightning Field." class=" predatorvespene-png"></div>
           </div>
         </div>
         <div id="class-widow-mine" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1020] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Widow Mine&#10;Robotic mine. Launches missiles at nearby enemy units while burrowed. &#10;Attacks deal splash damage in a small area around the target. &#10;Widow Mine is revealed when Sentinel Missile is on cooldown." class=" btn-unit-terran-widowmine-png"></div>
+            <div class="f {{'unacquired' if inventory[1020] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Widow Mine&#10;Robotic mine. Launches missiles at nearby enemy units while burrowed. &#10;Attacks deal splash damage in a small area around the target. &#10;Widow Mine is revealed when Sentinel Missile is on cooldown." class=" btn-unit-terran-widowmine-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1377] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Black Market Launchers (Widow Mine)&#10;Increases Widow Mine Sentinel Missile range." class=" btn-ability-hornerhan-widowmine-attackrange-png"></div>
-            <div class="f {{'unacquired' if inventory[1329] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concealment (Widow Mine)&#10;Burrowed Widow Mines are no longer revealed when the Sentinel Missile is on cooldown." class=" btn-ability-terran-widowminehidden-png"></div>
-            <div class="f {{'unacquired' if inventory[1763] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Demolition Payload (Widow Mine)&#10;Allows Widow Mines to attack and damage structures." class=" btn-ability-terran-ignorearmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1328] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Drilling Claws (Widow Mine)&#10;Allows Widow Mines to burrow and unburrow faster." class=" btn-upgrade-terran-researchdrillingclaws-png"></div>
-            <div class="f {{'unacquired' if inventory[1378] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Executioner Missiles (Widow Mine)&#10;Reduces Sentinel Missile cooldown.&#10;When killed, Widow Mines will launch several missiles at random enemy targets." class=" btn-ability-hornerhan-widowmine-deathblossom-png"></div>
-            <div class="f {{'unacquired' if inventory[1295] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Widow Mine)&#10;Reduces Widow Mine cost by 25 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1377] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Black Market Launchers (Widow Mine)&#10;Increases Widow Mine Sentinel Missile range." class=" btn-ability-hornerhan-widowmine-attackrange-png"></div>
+            <div class="f {{'unacquired' if inventory[1329] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concealment (Widow Mine)&#10;Burrowed Widow Mines are no longer revealed when the Sentinel Missile is on cooldown." class=" btn-ability-terran-widowminehidden-png"></div>
+            <div class="f {{'unacquired' if inventory[1763] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Demolition Payload (Widow Mine)&#10;Allows Widow Mines to attack and damage structures." class=" btn-ability-terran-ignorearmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1328] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Drilling Claws (Widow Mine)&#10;Allows Widow Mines to burrow and unburrow faster." class=" btn-upgrade-terran-researchdrillingclaws-png"></div>
+            <div class="f {{'unacquired' if inventory[1378] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Executioner Missiles (Widow Mine)&#10;Reduces Sentinel Missile cooldown.&#10;When killed, Widow Mines will launch several missiles at random enemy targets." class=" btn-ability-hornerhan-widowmine-deathblossom-png"></div>
+            <div class="f {{'unacquired' if inventory[1295] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Widow Mine)&#10;Reduces Widow Mine cost by 25 gas and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-cyclone" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1021] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cyclone&#10;Mobile assault vehicle. Can use Lock On to quickly fire while moving." class=" btn-unit-terran-cyclone-png"></div>
+            <div class="f {{'unacquired' if inventory[1021] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cyclone&#10;Mobile assault vehicle. Can use Lock On to quickly fire while moving." class=" btn-unit-terran-cyclone-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1383] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Cyclone)&#10;Cyclones can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1218] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mag-Field Accelerators (Cyclone)&#10;Increases Cyclone Lock-On damage." class=" btn-upgrade-terran-magfieldaccelerator-png"></div>
-            <div class="f {{'unacquired' if inventory[1219] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mag-Field Launchers (Cyclone)&#10;Increases Cyclone attack range by 2." class=" btn-upgrade-terran-cyclonerangeupgrade-png"></div>
-            <div class="f {{'unacquired' if inventory[1373] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Fire Launchers (Cyclone)&#10;The first 12 shots of Lock On are fired more quickly." class=" btn-upgrade-raynor-ripwavemissiles-png"></div>
-            <div class="f {{'unacquired' if inventory[1349] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Cyclone)&#10;Reduces Cyclone cost by 25 minerals, 50 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1372] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Targeting Optics (Cyclone)&#10;Increases Cyclone Lock On casting range and the range while Locked On." class=" btn-upgrade-swann-targetingoptics-png"></div>
+            <div class="f {{'unacquired' if inventory[1383] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Cyclone)&#10;Cyclones can be trained from a Factory without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1218] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mag-Field Accelerators (Cyclone)&#10;Increases Cyclone Lock-On damage." class=" btn-upgrade-terran-magfieldaccelerator-png"></div>
+            <div class="f {{'unacquired' if inventory[1219] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mag-Field Launchers (Cyclone)&#10;Increases Cyclone attack range by 2." class=" btn-upgrade-terran-cyclonerangeupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[1373] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Fire Launchers (Cyclone)&#10;The first 12 shots of Lock On are fired more quickly." class=" btn-upgrade-raynor-ripwavemissiles-png"></div>
+            <div class="f {{'unacquired' if inventory[1349] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Cyclone)&#10;Reduces Cyclone cost by 25 minerals, 50 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1372] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Targeting Optics (Cyclone)&#10;Increases Cyclone Lock On casting range and the range while Locked On." class=" btn-upgrade-swann-targetingoptics-png"></div>
           </div>
         </div>
         <div id="class-warhound" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1023] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Warhound&#10;Anti-vehicle mech. Haywire missiles do bonus damage to mechanical units." class=" btn-unit-terran-warhound-png"></div>
+            <div class="f {{'unacquired' if inventory[1023] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Warhound&#10;Anti-vehicle mech. Haywire missiles do bonus damage to mechanical units." class=" btn-unit-terran-warhound-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1283] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Axiom Plating (Warhound)&#10;Increases Warhound armor by 2." class=" btn-research-zerg-fortifiedbunker-png"></div>
-            <div class="f {{'unacquired' if inventory[1766] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Deploy Turret (Warhound)&#10;Each Warhound can deploy a single-use Auto-Turret." class=" btn-building-terran-autoturret-png"></div>
-            <div class="f {{'unacquired' if inventory[1282] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Warhound)&#10;Reduces Warhound cost by 75 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1283] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Axiom Plating (Warhound)&#10;Increases Warhound armor by 2." class=" btn-research-zerg-fortifiedbunker-png"></div>
+            <div class="f {{'unacquired' if inventory[1766] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Deploy Turret (Warhound)&#10;Each Warhound can deploy a single-use Auto-Turret." class=" btn-building-terran-autoturret-png"></div>
+            <div class="f {{'unacquired' if inventory[1282] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Warhound)&#10;Reduces Warhound cost by 75 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -406,156 +406,156 @@
         </div>
         <div id="class-medivac" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1010] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Medivac&#10;Air transport. Heals nearby biological units." class=" btn-unit-terran-medivac-png"></div>
+            <div class="f {{'unacquired' if inventory[1010] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Medivac&#10;Air transport. Heals nearby biological units." class=" btn-unit-terran-medivac-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1330] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Cloaking Field (Medivac)&#10;Medivacs are permanently cloaked." class=" btn-permacloak-medivac-png"></div>
-            <div class="f {{'unacquired' if inventory[1311] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Healing AI (Medivac)&#10;Medivacs can heal two targets at once." class=" btn-ability-mengsk-medivac-doublehealbeam-png"></div>
-            <div class="f {{'unacquired' if inventory[1277] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Afterburners (Medivac)&#10;Ability. Temporarily increases the Medivac's movement speed by 70%." class=" btn-upgrade-terran-medivacemergencythrusters-png"></div>
-            <div class="f {{'unacquired' if inventory[1276] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Expanded Hull (Medivac)&#10;Increases Medivac cargo space by 4." class=" btn-upgrade-mengsk-engineeringbay-neosteelfortifiedarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1310] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Deployment Tube (Medivac)&#10;Medivacs deploy loaded troops almost instantly." class=" btn-techupgrade-terran-rapiddeployment-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1291] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Reignition Systems (Medivac)&#10;Slightly increases Medivac movement speed.&#10;Reduces Medivac's Afterburners ability cooldown." class=" btn-upgrade-terran-highcapacityfueltanks-png"></div>
-            <div class="f {{'unacquired' if inventory[1755] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Medivac)&#10;Reduces Medivac cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1249] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scatter Veil (Medivac)&#10;Medivacs get 100 shields." class=" btn-scatter-veil-png"></div>
+            <div class="f {{'unacquired' if inventory[1330] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Cloaking Field (Medivac)&#10;Medivacs are permanently cloaked." class=" btn-permacloak-medivac-png"></div>
+            <div class="f {{'unacquired' if inventory[1311] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Healing AI (Medivac)&#10;Medivacs can heal two targets at once." class=" btn-ability-mengsk-medivac-doublehealbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[1277] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Afterburners (Medivac)&#10;Ability. Temporarily increases the Medivac's movement speed by 70%." class=" btn-upgrade-terran-medivacemergencythrusters-png"></div>
+            <div class="f {{'unacquired' if inventory[1276] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Expanded Hull (Medivac)&#10;Increases Medivac cargo space by 4." class=" btn-upgrade-mengsk-engineeringbay-neosteelfortifiedarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1310] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Deployment Tube (Medivac)&#10;Medivacs deploy loaded troops almost instantly." class=" btn-techupgrade-terran-rapiddeployment-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1291] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Reignition Systems (Medivac)&#10;Slightly increases Medivac movement speed.&#10;Reduces Medivac's Afterburners ability cooldown." class=" btn-upgrade-terran-highcapacityfueltanks-png"></div>
+            <div class="f {{'unacquired' if inventory[1755] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Medivac)&#10;Reduces Medivac cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1249] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scatter Veil (Medivac)&#10;Medivacs get 100 shields." class=" btn-scatter-veil-png"></div>
           </div>
         </div>
         <div id="class-wraith" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1011] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Wraith&#10;Highly mobile flying unit. Excellent at surgical strikes." class=" btn-unit-terran-wraith-png"></div>
+            <div class="f {{'unacquired' if inventory[1011] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Wraith&#10;Highly mobile flying unit. Excellent at surgical strikes." class=" btn-unit-terran-wraith-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1278] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Laser Technology (Wraith)&#10;Burst Lasers do more damage and can hit both ground and air targets.&#10;Replaces Gemini Missiles weapon." class=" btn-upgrade-swann-improvedburstlaser-png"></div>
-            <div class="f {{'unacquired' if inventory[1313] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Displacement Field (Wraith)&#10;Wraiths evade 20% of incoming attacks while cloaked." class=" btn-upgrade-swann-displacementfield-png"></div>
-            <div class="f {{'unacquired' if inventory[1332] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Wraith)&#10;Wraiths can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1278] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Laser Technology (Wraith)&#10;Burst Lasers do more damage and can hit both ground and air targets.&#10;Replaces Gemini Missiles weapon." class=" btn-upgrade-swann-improvedburstlaser-png"></div>
+            <div class="f {{'unacquired' if inventory[1313] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Displacement Field (Wraith)&#10;Wraiths evade 20% of incoming attacks while cloaked." class=" btn-upgrade-swann-displacementfield-png"></div>
+            <div class="f {{'unacquired' if inventory[1332] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Wraith)&#10;Wraiths can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
             <div class="progressive lvl-{{[inventory[1312], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Tomahawk Power Cells (Wraith) - Level 1&#10;Level 1: Tomahawk Power Cells: Increases Wraith starting energy by 100.&#10;Level 2: Unregistered Cloaking Module: Wraiths do not require energy to cloak and remain cloaked." class=" btn-techupgrade-terran-tomahawkpowercell-color-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Tomahawk Power Cells (Wraith) - Level 2&#10;Level 1: Tomahawk Power Cells: Increases Wraith starting energy by 100.&#10;Level 2: Unregistered Cloaking Module: Wraiths do not require energy to cloak and remain cloaked." class=" btn-permacloak-wraith-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Tomahawk Power Cells (Wraith) - Level 1&#10;Level 1: Tomahawk Power Cells: Increases Wraith starting energy by 100.&#10;Level 2: Unregistered Cloaking Module: Wraiths do not require energy to cloak and remain cloaked." class=" btn-techupgrade-terran-tomahawkpowercell-color-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Tomahawk Power Cells (Wraith) - Level 2&#10;Level 1: Tomahawk Power Cells: Increases Wraith starting energy by 100.&#10;Level 2: Unregistered Cloaking Module: Wraiths do not require energy to cloak and remain cloaked." class=" btn-permacloak-wraith-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1333] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Wraith)&#10;Reduces Wraith cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1331] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Trigger Override (Wraith)&#10;Wraith attack speed increases by 10% with each attack, up to a maximum of 100%." class=" btn-ability-hornerhan-wraith-attackspeed-png"></div>
+            <div class="f {{'unacquired' if inventory[1333] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Wraith)&#10;Reduces Wraith cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1331] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Trigger Override (Wraith)&#10;Wraith attack speed increases by 10% with each attack, up to a maximum of 100%." class=" btn-ability-hornerhan-wraith-attackspeed-png"></div>
           </div>
         </div>
         <div id="class-viking" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1012] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Viking&#10;Durable support flyer. Loaded with strong anti-capital air missiles. &#10;Can switch into Assault Mode to attack ground units." class=" btn-unit-terran-vikingfighter-png"></div>
+            <div class="f {{'unacquired' if inventory[1012] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Viking&#10;Durable support flyer. Loaded with strong anti-capital air missiles. &#10;Can switch into Assault Mode to attack ground units." class=" btn-unit-terran-vikingfighter-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1754] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Aesir Turbines (Viking)&#10;Increases Viking movement speed by 55%." class=" btn-ability-mengsk-viking-speed-png"></div>
-            <div class="f {{'unacquired' if inventory[1280] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anti-Mechanical Munition (Viking)&#10;Increases Viking damage to mechanical units while in Assault Mode." class=" btn-ability-terran-ignorearmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1315] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phobos-Class Weapons System (Viking)&#10;Increases Viking attack range by 1 in Assault mode and 2 in Fighter mode." class=" btn-upgrade-raynor-phobosclassweaponssystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1314] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ripwave Missiles (Viking)&#10;Vikings do area damage while in Fighter Mode." class=" btn-upgrade-raynor-ripwavemissiles-png"></div>
-            <div class="f {{'unacquired' if inventory[1334] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shredder Rounds (Viking)&#10;Attacks in Assault mode do line splash damage." class=" btn-ability-hornerhan-viking-piercingattacks-png"></div>
-            <div class="f {{'unacquired' if inventory[1279] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Smart Servos (Viking)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
-            <div class="f {{'unacquired' if inventory[1335] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="W.I.L.D. Missiles (Viking)&#10;Launches 5 rockets at the target unit. Each rocket does 25 (40 vs armored) damage." class=" btn-ability-hornerhan-viking-missileupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[1754] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Aesir Turbines (Viking)&#10;Increases Viking movement speed by 55%." class=" btn-ability-mengsk-viking-speed-png"></div>
+            <div class="f {{'unacquired' if inventory[1280] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anti-Mechanical Munition (Viking)&#10;Increases Viking damage to mechanical units while in Assault Mode." class=" btn-ability-terran-ignorearmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1315] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phobos-Class Weapons System (Viking)&#10;Increases Viking attack range by 1 in Assault mode and 2 in Fighter mode." class=" btn-upgrade-raynor-phobosclassweaponssystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1314] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ripwave Missiles (Viking)&#10;Vikings do area damage while in Fighter Mode." class=" btn-upgrade-raynor-ripwavemissiles-png"></div>
+            <div class="f {{'unacquired' if inventory[1334] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shredder Rounds (Viking)&#10;Attacks in Assault mode do line splash damage." class=" btn-ability-hornerhan-viking-piercingattacks-png"></div>
+            <div class="f {{'unacquired' if inventory[1279] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Smart Servos (Viking)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
+            <div class="f {{'unacquired' if inventory[1335] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="W.I.L.D. Missiles (Viking)&#10;Launches 5 rockets at the target unit. Each rocket does 25 (40 vs armored) damage." class=" btn-ability-hornerhan-viking-missileupgrade-png"></div>
           </div>
         </div>
         <div id="class-banshee" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1013] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Banshee&#10;Tactical-strike aircraft." class=" btn-unit-terran-banshee-png"></div>
+            <div class="f {{'unacquired' if inventory[1013] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Banshee&#10;Tactical-strike aircraft." class=" btn-unit-terran-banshee-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1337] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Targeting Optics (Banshee)&#10;Increases Banshee attack range by 2 while cloaked." class=" btn-ability-terran-detectionconedebuff-png"></div>
-            <div class="f {{'unacquired' if inventory[1338] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Distortion Blasters (Banshee)&#10;Increases Banshee attack damage by 25% while cloaked." class=" btn-techupgrade-terran-cloakdistortionfield-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1350] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hyperflight Rotors (Banshee)&#10;Increases Banshee movement speed." class=" btn-upgrade-terran-hyperflightrotors-png"></div>
-            <div class="f {{'unacquired' if inventory[1352] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Banshee)&#10;Banshees can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1351] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Banshee)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1337] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Targeting Optics (Banshee)&#10;Increases Banshee attack range by 2 while cloaked." class=" btn-ability-terran-detectionconedebuff-png"></div>
+            <div class="f {{'unacquired' if inventory[1338] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Distortion Blasters (Banshee)&#10;Increases Banshee attack damage by 25% while cloaked." class=" btn-techupgrade-terran-cloakdistortionfield-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1350] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hyperflight Rotors (Banshee)&#10;Increases Banshee movement speed." class=" btn-upgrade-terran-hyperflightrotors-png"></div>
+            <div class="f {{'unacquired' if inventory[1352] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Banshee)&#10;Banshees can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1351] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Banshee)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
             <div class="progressive lvl-{{[inventory[1316], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Cross-Spectrum Dampeners (Banshee) - Level 1&#10;Level 1: Banshees can remain cloaked twice as long.&#10;Level 2: Banshees do not require energy to cloak and remain cloaked." class=" btn-banshee-cross-spectrum-dampeners-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Cross-Spectrum Dampeners (Banshee) - Level 2&#10;Level 1: Banshees can remain cloaked twice as long.&#10;Level 2: Banshees do not require energy to cloak and remain cloaked." class=" btn-permacloak-banshee-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Cross-Spectrum Dampeners (Banshee) - Level 1&#10;Level 1: Banshees can remain cloaked twice as long.&#10;Level 2: Banshees do not require energy to cloak and remain cloaked." class=" btn-banshee-cross-spectrum-dampeners-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Cross-Spectrum Dampeners (Banshee) - Level 2&#10;Level 1: Banshees can remain cloaked twice as long.&#10;Level 2: Banshees do not require energy to cloak and remain cloaked." class=" btn-permacloak-banshee-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1339] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rocket Barrage (Banshee)&#10;Banshees gain the Rocket Barrage ability, &#10;which deals 75 damage to enemy ground units in the target area." class=" btn-upgrade-terran-nova-bansheemissilestrik-png"></div>
-            <div class="f {{'unacquired' if inventory[1336] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Hull (Banshee)&#10;Increases Banshee life by 100." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
-            <div class="f {{'unacquired' if inventory[1317] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shockwave Missile Battery (Banshee)&#10;Banshees do area damage in a straight line." class=" btn-upgrade-raynor-shockwavemissilebattery-png"></div>
+            <div class="f {{'unacquired' if inventory[1339] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rocket Barrage (Banshee)&#10;Banshees gain the Rocket Barrage ability, &#10;which deals 75 damage to enemy ground units in the target area." class=" btn-upgrade-terran-nova-bansheemissilestrik-png"></div>
+            <div class="f {{'unacquired' if inventory[1336] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Hull (Banshee)&#10;Increases Banshee life by 100." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
+            <div class="f {{'unacquired' if inventory[1317] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shockwave Missile Battery (Banshee)&#10;Banshees do area damage in a straight line." class=" btn-upgrade-raynor-shockwavemissilebattery-png"></div>
           </div>
         </div>
         <div id="class-liberator" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1018] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Liberator&#10;Artillery fighter. Loaded with missiles that deal area damage to enemy air targets. &#10;Can switch into Defender Mode to provide siege support." class=" btn-unit-terran-liberator-png"></div>
+            <div class="f {{'unacquired' if inventory[1018] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Liberator&#10;Artillery fighter. Loaded with missiles that deal area damage to enemy air targets. &#10;Can switch into Defender Mode to provide siege support." class=" btn-unit-terran-liberator-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1326] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Ballistics (Liberator)&#10;Increases Liberator range by 3 in Defender Mode." class=" btn-upgrade-terran-advanceballistics-png"></div>
-            <div class="f {{'unacquired' if inventory[1374] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cloak (Liberator)&#10;Allows Liberators to use the Cloak ability." class=" btn-ability-terran-cloak-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1294] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Guerilla Missiles (Liberator)&#10;Liberators in Fighter Mode apply an attack and movement debuff to enemies they attack." class=" btn-upgrade-terran-nova-hellfiremissiles-png"></div>
-            <div class="f {{'unacquired' if inventory[1375] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Laser Targeting System (Liberator)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
-            <div class="f {{'unacquired' if inventory[1376] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Liberator)&#10;Increases Liberator training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
-            <div class="f {{'unacquired' if inventory[1327] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Raid Artillery (Liberator)&#10;Allows Liberators to attack structures while in Defender Mode." class=" btn-upgrade-terran-nova-terrandefendermodestructureattack-png"></div>
-            <div class="f {{'unacquired' if inventory[1385] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Liberator)&#10;Reduces Liberator cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1384] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Smart Servos (Liberator)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
-            <div class="f {{'unacquired' if inventory[1751] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="UED Missile Technology (Liberator)&#10;Increases Liberator attack range in Fighter mode by 4." class=" btn-ued-rocketry-technology-png"></div>
+            <div class="f {{'unacquired' if inventory[1326] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Ballistics (Liberator)&#10;Increases Liberator range by 3 in Defender Mode." class=" btn-upgrade-terran-advanceballistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1374] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cloak (Liberator)&#10;Allows Liberators to use the Cloak ability." class=" btn-ability-terran-cloak-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1294] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Guerilla Missiles (Liberator)&#10;Liberators in Fighter Mode apply an attack and movement debuff to enemies they attack." class=" btn-upgrade-terran-nova-hellfiremissiles-png"></div>
+            <div class="f {{'unacquired' if inventory[1375] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Laser Targeting System (Liberator)&#10;Increases vision by 2 and weapon range by 1." class=" btn-upgrade-terran-lazertargetingsystem-png"></div>
+            <div class="f {{'unacquired' if inventory[1376] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Liberator)&#10;Increases Liberator training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1327] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Raid Artillery (Liberator)&#10;Allows Liberators to attack structures while in Defender Mode." class=" btn-upgrade-terran-nova-terrandefendermodestructureattack-png"></div>
+            <div class="f {{'unacquired' if inventory[1385] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Liberator)&#10;Reduces Liberator cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1384] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Smart Servos (Liberator)&#10;Increases transformation speed between modes." class=" btn-upgrade-terran-transformationservos-png"></div>
+            <div class="f {{'unacquired' if inventory[1751] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="UED Missile Technology (Liberator)&#10;Increases Liberator attack range in Fighter mode by 4." class=" btn-ued-rocketry-technology-png"></div>
           </div>
         </div>
         <div id="class-valkyrie" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1019] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Valkyrie&#10;Advanced anti-aircraft fighter. &#10;Able to use cluster missiles that deal area damage to air targets." class=" btn-unit-terran-valkyriescbw-png"></div>
+            <div class="f {{'unacquired' if inventory[1019] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Valkyrie&#10;Advanced anti-aircraft fighter. &#10;Able to use cluster missiles that deal area damage to air targets." class=" btn-unit-terran-valkyriescbw-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1382] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Afterburners (Valkyrie)&#10;Ability. Temporarily increases the Valkyries's movement speed by 70%." class=" btn-afterburners-valkyrie-png"></div>
-            <div class="f {{'unacquired' if inventory[1379] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enhanced Cluster Launchers (Valkyrie)&#10;Valkyries fire 2 additional rockets each volley." class=" btn-ability-stetmann-corruptormissilebarrage-png"></div>
-            <div class="f {{'unacquired' if inventory[1381] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Flechette Missiles (Valkyrie)&#10;Equips Valkyries with Air-to-Surface missiles to attack ground units." class=" btn-ability-hornerhan-viking-missileupgrade-png"></div>
-            <div class="f {{'unacquired' if inventory[1390] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Launching Vector Compensator (Valkyrie)&#10;Allows Valkyries to shoot air while moving." class=" btn-launch-vector-compensator-png"></div>
-            <div class="f {{'unacquired' if inventory[1391] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Valkyrie)&#10;Reduces Valkyrie cost by 100 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1380] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shaped Hull (Valkyrie)&#10;Increases Valkyrie life by 50." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
+            <div class="f {{'unacquired' if inventory[1382] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Afterburners (Valkyrie)&#10;Ability. Temporarily increases the Valkyries's movement speed by 70%." class=" btn-afterburners-valkyrie-png"></div>
+            <div class="f {{'unacquired' if inventory[1379] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enhanced Cluster Launchers (Valkyrie)&#10;Valkyries fire 2 additional rockets each volley." class=" btn-ability-stetmann-corruptormissilebarrage-png"></div>
+            <div class="f {{'unacquired' if inventory[1381] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Flechette Missiles (Valkyrie)&#10;Equips Valkyries with Air-to-Surface missiles to attack ground units." class=" btn-ability-hornerhan-viking-missileupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[1390] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Launching Vector Compensator (Valkyrie)&#10;Allows Valkyries to shoot air while moving." class=" btn-launch-vector-compensator-png"></div>
+            <div class="f {{'unacquired' if inventory[1391] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Valkyrie)&#10;Reduces Valkyrie cost by 100 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1380] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shaped Hull (Valkyrie)&#10;Increases Valkyrie life by 50." class=" btn-techupgrade-terran-shapedhull-colored-png"></div>
           </div>
         </div>
         <div id="class-raven" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1606] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Raven&#10;Aerial Caster unit." class=" btn-unit-terran-raven-png"></div>
+            <div class="f {{'unacquired' if inventory[1606] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Raven&#10;Aerial Caster unit." class=" btn-unit-terran-raven-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1368] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anti-Armor Missile (Raven)&#10;Spell. Decreases target and nearby enemy units armor by 2." class=" btn-ability-terran-shreddermissile-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1363] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bio Mechanical Repair Drone (Raven)&#10;Spell. Deploys a drone that can heal biological or mechanical units." class=" btn-unit-biomechanicaldrone-png"></div>
-            <div class="f {{'unacquired' if inventory[1346] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Durable Materials (Raven)&#10;Extends timed life duration of Raven's summoned objects." class=" btn-upgrade-terran-durablematerials-png"></div>
-            <div class="f {{'unacquired' if inventory[1366] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hunter-Seeker Weapon (Raven)&#10;Allows Ravens to attack with a Hunter-Seeker weapon." class=" btn-hunter-seeker-weapon-png"></div>
-            <div class="f {{'unacquired' if inventory[1367] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Interference Matrix (Raven)&#10;Spell. Target enemy Mechanical or Psionic unit can't attack or use abilities for a short duration." class=" btn-upgrade-terran-interferencematrix-png"></div>
-            <div class="f {{'unacquired' if inventory[1369] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Raven)&#10;Ravens can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1365] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Railgun Turret (Raven)&#10;Spell. Allows Ravens to deploy an advanced Auto-Turret, that can attack enemy ground units in a straight line." class=" btn-unit-terran-autoturretblackops-png"></div>
-            <div class="f {{'unacquired' if inventory[1345] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Raven)&#10;Reduces Raven cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1364] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spider Mines (Raven)&#10;Spell. Deploys 3 Spider Mines to a target location." class=" btn-upgrade-siegetank-spidermines-png"></div>
+            <div class="f {{'unacquired' if inventory[1368] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anti-Armor Missile (Raven)&#10;Spell. Decreases target and nearby enemy units armor by 2." class=" btn-ability-terran-shreddermissile-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1363] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bio Mechanical Repair Drone (Raven)&#10;Spell. Deploys a drone that can heal biological or mechanical units." class=" btn-unit-biomechanicaldrone-png"></div>
+            <div class="f {{'unacquired' if inventory[1346] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Durable Materials (Raven)&#10;Extends timed life duration of Raven's summoned objects." class=" btn-upgrade-terran-durablematerials-png"></div>
+            <div class="f {{'unacquired' if inventory[1366] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hunter-Seeker Weapon (Raven)&#10;Allows Ravens to attack with a Hunter-Seeker weapon." class=" btn-hunter-seeker-weapon-png"></div>
+            <div class="f {{'unacquired' if inventory[1367] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Interference Matrix (Raven)&#10;Spell. Target enemy Mechanical or Psionic unit can't attack or use abilities for a short duration." class=" btn-upgrade-terran-interferencematrix-png"></div>
+            <div class="f {{'unacquired' if inventory[1369] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Raven)&#10;Ravens can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1365] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Railgun Turret (Raven)&#10;Spell. Allows Ravens to deploy an advanced Auto-Turret, that can attack enemy ground units in a straight line." class=" btn-unit-terran-autoturretblackops-png"></div>
+            <div class="f {{'unacquired' if inventory[1345] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Raven)&#10;Reduces Raven cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1364] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spider Mines (Raven)&#10;Spell. Deploys 3 Spider Mines to a target location." class=" btn-upgrade-siegetank-spidermines-png"></div>
           </div>
         </div>
         <div id="class-science-vessel" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1607] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Science Vessel&#10;Aerial Caster unit. Can repair mechanical units." class=" btn-unit-terran-sciencevessel-png"></div>
+            <div class="f {{'unacquired' if inventory[1607] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Science Vessel&#10;Aerial Caster unit. Can repair mechanical units." class=" btn-unit-terran-sciencevessel-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1371] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Defensive Matrix (Science Vessel)&#10;Spell. Provides a target unit with a defensive barrier that can absorb up to 250 damage." class=" btn-upgrade-swann-defensivematrix-png"></div>
-            <div class="f {{'unacquired' if inventory[1370] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="EMP Shockwave (Science Vessel)&#10;Spell. Depletes all energy and shields of all units in a target area." class=" btn-ability-mengsk-ghost-staticempblast-png"></div>
-            <div class="f {{'unacquired' if inventory[1347] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Improved Nano-Repair (Science Vessel)&#10;Nano-Repair no longer requires energy to use." class=" btn-upgrade-swann-improvednanorepair-png"></div>
-            <div class="f {{'unacquired' if inventory[1348] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Magellan Computation Systems (Science Vessel)&#10;Science Vessel can use Nano-Repair at two targets at once." class=" btn-magellan-computation-systems-png"></div>
-            <div class="f {{'unacquired' if inventory[1750] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tactical Jump (Science Vessel)&#10;Allows Science Vessels to warp to a target location anywhere on the map." class=" btn-ability-hornerhan-fleethyperjump-png"></div>
+            <div class="f {{'unacquired' if inventory[1371] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Defensive Matrix (Science Vessel)&#10;Spell. Provides a target unit with a defensive barrier that can absorb up to 250 damage." class=" btn-upgrade-swann-defensivematrix-png"></div>
+            <div class="f {{'unacquired' if inventory[1370] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="EMP Shockwave (Science Vessel)&#10;Spell. Depletes all energy and shields of all units in a target area." class=" btn-ability-mengsk-ghost-staticempblast-png"></div>
+            <div class="f {{'unacquired' if inventory[1347] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Improved Nano-Repair (Science Vessel)&#10;Nano-Repair no longer requires energy to use." class=" btn-upgrade-swann-improvednanorepair-png"></div>
+            <div class="f {{'unacquired' if inventory[1348] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Magellan Computation Systems (Science Vessel)&#10;Science Vessel can use Nano-Repair at two targets at once." class=" btn-magellan-computation-systems-png"></div>
+            <div class="f {{'unacquired' if inventory[1750] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tactical Jump (Science Vessel)&#10;Allows Science Vessels to warp to a target location anywhere on the map." class=" btn-ability-hornerhan-fleethyperjump-png"></div>
           </div>
         </div>
         <div id="class-hercules" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1615] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hercules&#10;Massive transport ship." class=" btn-unit-terran-hercules-png"></div>
+            <div class="f {{'unacquired' if inventory[1615] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hercules&#10;Massive transport ship." class=" btn-unit-terran-hercules-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1386] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Fusion Module (Hercules)&#10;Hercules can be trained from a Starport without having a Fusion Core." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1387] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tactical Jump (Hercules)&#10;Allows Hercules to warp to a target location anywhere on the map." class=" btn-ability-terran-hercules-tacticaljump-png"></div>
+            <div class="f {{'unacquired' if inventory[1386] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Fusion Module (Hercules)&#10;Hercules can be trained from a Starport without having a Fusion Core." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1387] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tactical Jump (Hercules)&#10;Allows Hercules to warp to a target location anywhere on the map." class=" btn-ability-terran-hercules-tacticaljump-png"></div>
           </div>
         </div>
         <div id="class-battlecruiser" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1014] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Battlecruiser&#10;Powerful warship." class=" btn-unit-terran-battlecruiser-png"></div>
+            <div class="f {{'unacquired' if inventory[1014] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Battlecruiser&#10;Powerful warship." class=" btn-unit-terran-battlecruiser-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1355] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="ATX Laser Battery (Battlecruiser)&#10;Battlecruisers can attack while moving, &#10;do the same damage to both ground and air targets, and fire faster." class=" btn-atx-batteries-png"></div>
-            <div class="f {{'unacquired' if inventory[1393] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Behemoth Plating (Battlecruiser)&#10;Increases Battlecruiser armor by 2." class=" btn-research-zerg-fortifiedbunker-png"></div>
-            <div class="f {{'unacquired' if inventory[1292] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Behemoth Reactor (Battlecruiser)&#10;All Battlecruiser spells require 25 less energy to cast." class=" btn-upgrade-terran-behemothreactor-png"></div>
-            <div class="f {{'unacquired' if inventory[1354] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cloak (Battlecruiser)&#10;Allows Battlecruisers to use the Cloak ability." class=" btn-ability-terran-cloak-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1752] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Field-Assist Target System (Battlecruiser)&#10;Battlecruisers increase the attack range of nearby friendly ground units by 1." class=" btn-ability-mengsk-battlecruiser-decksights-png"></div>
-            <div class="f {{'unacquired' if inventory[1357] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Internal Tech Module (Battlecruiser)&#10;Battlecruisers can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
-            <div class="f {{'unacquired' if inventory[1394] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Moirai Impulse Drive (Battlecruiser)&#10;Increases Battlecruiser movement speed." class=" btn-moirai-impulse-drive-png"></div>
-            <div class="f {{'unacquired' if inventory[1356] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Logistics (Battlecruiser)&#10;Increases Battlecruiser training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
+            <div class="f {{'unacquired' if inventory[1355] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="ATX Laser Battery (Battlecruiser)&#10;Battlecruisers can attack while moving, &#10;do the same damage to both ground and air targets, and fire faster." class=" btn-atx-batteries-png"></div>
+            <div class="f {{'unacquired' if inventory[1393] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Behemoth Plating (Battlecruiser)&#10;Increases Battlecruiser armor by 2." class=" btn-research-zerg-fortifiedbunker-png"></div>
+            <div class="f {{'unacquired' if inventory[1292] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Behemoth Reactor (Battlecruiser)&#10;All Battlecruiser spells require 25 less energy to cast." class=" btn-upgrade-terran-behemothreactor-png"></div>
+            <div class="f {{'unacquired' if inventory[1354] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cloak (Battlecruiser)&#10;Allows Battlecruisers to use the Cloak ability." class=" btn-ability-terran-cloak-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1752] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Field-Assist Target System (Battlecruiser)&#10;Battlecruisers increase the attack range of nearby friendly ground units by 1." class=" btn-ability-mengsk-battlecruiser-decksights-png"></div>
+            <div class="f {{'unacquired' if inventory[1357] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Internal Tech Module (Battlecruiser)&#10;Battlecruisers can be trained from a Starport without an attached Tech Lab." class=" btn-upgrade-terran-internalizedtechmodule-png"></div>
+            <div class="f {{'unacquired' if inventory[1394] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Moirai Impulse Drive (Battlecruiser)&#10;Increases Battlecruiser movement speed." class=" btn-moirai-impulse-drive-png"></div>
+            <div class="f {{'unacquired' if inventory[1356] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Logistics (Battlecruiser)&#10;Increases Battlecruiser training speed." class=" btn-upgrade-terran-optimizedlogistics-png"></div>
             <div class="progressive lvl-{{[inventory[1319], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Defensive Matrix (Battlecruiser) - Level 1&#10;Level 1: Spell. For 20 seconds the Battlecruiser gains a shield that can absorb up to 200 damage.&#10;Level 2: Passive. Battlecruiser gets 200 shields. Can spend energy to fully recharge shields." class=" btn-upgrade-swann-defensivematrix-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Defensive Matrix (Battlecruiser) - Level 2&#10;Level 1: Spell. For 20 seconds the Battlecruiser gains a shield that can absorb up to 200 damage.&#10;Level 2: Passive. Battlecruiser gets 200 shields. Can spend energy to fully recharge shields." class=" btn-advanced-defensive-matrix-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Defensive Matrix (Battlecruiser) - Level 1&#10;Level 1: Spell. For 20 seconds the Battlecruiser gains a shield that can absorb up to 200 damage.&#10;Level 2: Passive. Battlecruiser gets 200 shields. Can spend energy to fully recharge shields." class=" btn-upgrade-swann-defensivematrix-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Defensive Matrix (Battlecruiser) - Level 2&#10;Level 1: Spell. For 20 seconds the Battlecruiser gains a shield that can absorb up to 200 damage.&#10;Level 2: Passive. Battlecruiser gets 200 shields. Can spend energy to fully recharge shields." class=" btn-advanced-defensive-matrix-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1318], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Missile Pods (Battlecruiser) - Level 1&#10;        Battlecruisers gain the Missile Pods ability, &#10;which deals damage to air units in a target area.&#10;        Level 1: Deals 40 damage (+50 vs light).&#10;        Level 2: Deals 110 damage and costs -50 less energy.&#10;    " class=" btn-techupgrade-terran-missilepods-color-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Missile Pods (Battlecruiser) - Level 2&#10;        Battlecruisers gain the Missile Pods ability, &#10;which deals damage to air units in a target area.&#10;        Level 1: Deals 40 damage (+50 vs light).&#10;        Level 2: Deals 110 damage and costs -50 less energy.&#10;    " class=" btn-upgrade-terran-nova-bansheemissilestrik-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Missile Pods (Battlecruiser) - Level 1&#10;        Battlecruisers gain the Missile Pods ability, &#10;which deals damage to air units in a target area.&#10;        Level 1: Deals 40 damage (+50 vs light).&#10;        Level 2: Deals 110 damage and costs -50 less energy.&#10;    " class=" btn-techupgrade-terran-missilepods-color-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Missile Pods (Battlecruiser) - Level 2&#10;        Battlecruisers gain the Missile Pods ability, &#10;which deals damage to air units in a target area.&#10;        Level 1: Deals 40 damage (+50 vs light).&#10;        Level 2: Deals 110 damage and costs -50 less energy.&#10;    " class=" btn-upgrade-terran-nova-bansheemissilestrik-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1353] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tactical Jump (Battlecruiser)&#10;Allows Battlecruisers to warp to a target location anywhere on the map." class=" btn-ability-terran-warpjump-png"></div>
+            <div class="f {{'unacquired' if inventory[1353] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tactical Jump (Battlecruiser)&#10;Allows Battlecruisers to warp to a target location anywhere on the map." class=" btn-ability-terran-warpjump-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -563,74 +563,74 @@
         </div>
         <div id="class-bunker" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1400] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bunker&#10;Defensive structure. Able to load infantry units, giving them +1 range to their attacks." class=" btn-building-terran-bunker-png"></div>
+            <div class="f {{'unacquired' if inventory[1400] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bunker&#10;Defensive structure. Able to load infantry units, giving them +1 range to their attacks." class=" btn-building-terran-bunker-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1611] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fortified Bunker (Bunker)&#10;Bunkers have more life." class=" btn-building-terran-bunkerneosteel-png"></div>
-            <div class="f {{'unacquired' if inventory[1201] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Neosteel Bunker (Bunker)&#10;Increases the number of Bunker slots by 2." class=" btn-upgrade-terran-neosteelframe-png"></div>
-            <div class="f {{'unacquired' if inventory[1200] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Projectile Accelerator (Bunker)&#10;Increases range of all units in the Bunker by 1." class=" btn-upgrade-zerg-stukov-bunkerresearchbundle_05-png"></div>
-            <div class="f {{'unacquired' if inventory[1610] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shrike Turret (Bunker)&#10;Adds an automated turret to Bunkers." class=" btn-upgrade-swann-improvedturretattackspeed-png"></div>
+            <div class="f {{'unacquired' if inventory[1611] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fortified Bunker (Bunker)&#10;Bunkers have more life." class=" btn-building-terran-bunkerneosteel-png"></div>
+            <div class="f {{'unacquired' if inventory[1201] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Neosteel Bunker (Bunker)&#10;Increases the number of Bunker slots by 2." class=" btn-upgrade-terran-neosteelframe-png"></div>
+            <div class="f {{'unacquired' if inventory[1200] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Projectile Accelerator (Bunker)&#10;Increases range of all units in the Bunker by 1." class=" btn-upgrade-zerg-stukov-bunkerresearchbundle_05-png"></div>
+            <div class="f {{'unacquired' if inventory[1610] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shrike Turret (Bunker)&#10;Adds an automated turret to Bunkers." class=" btn-upgrade-swann-improvedturretattackspeed-png"></div>
           </div>
         </div>
         <div id="class-missile-turret" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1401] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Missile Turret&#10;Anti-air defensive structure." class=" btn-building-terran-missileturret-png"></div>
+            <div class="f {{'unacquired' if inventory[1401] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Missile Turret&#10;Anti-air defensive structure." class=" btn-building-terran-missileturret-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1203] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hellstorm Batteries (Missile Turret)&#10;The Missile Turret unleashes an additional flurry of missiles with each attack." class=" btn-techupgrade-terran-hellstormbatteries-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1399] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Missile Turret)&#10;Reduces Missile Turret cost by 25 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[1202] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Titanium Housing (Missile Turret)&#10;Increases Missile Turret life by 75." class=" btn-techupgrade-terran-titaniumhousing-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1203] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hellstorm Batteries (Missile Turret)&#10;The Missile Turret unleashes an additional flurry of missiles with each attack." class=" btn-techupgrade-terran-hellstormbatteries-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1399] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Missile Turret)&#10;Reduces Missile Turret cost by 25 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1202] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Titanium Housing (Missile Turret)&#10;Increases Missile Turret life by 75." class=" btn-techupgrade-terran-titaniumhousing-color-png"></div>
           </div>
         </div>
         <div id="class-sensor-tower" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1402] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sensor Tower&#10;Reveals locations of enemy units at long range." class=" btn-building-terran-sensordome-png"></div>
+            <div class="f {{'unacquired' if inventory[1402] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sensor Tower&#10;Reveals locations of enemy units at long range." class=" btn-building-terran-sensordome-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1764] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Assistive Targeting (Sensor Tower)&#10;Sensor Towers increase the attack range of defensive buildings in their direct sight range." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
-            <div class="f {{'unacquired' if inventory[1765] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Multispectrum Doppler (Sensor Tower)&#10;Sensor Towers gain +10 sight range and +5 radar range." class=" btn-tips-laserdrillantiair-png"></div>
+            <div class="f {{'unacquired' if inventory[1764] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Assistive Targeting (Sensor Tower)&#10;Sensor Towers increase the attack range of defensive buildings in their direct sight range." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
+            <div class="f {{'unacquired' if inventory[1765] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Multispectrum Doppler (Sensor Tower)&#10;Sensor Towers gain +10 sight range and +5 radar range." class=" btn-tips-laserdrillantiair-png"></div>
           </div>
         </div>
         <div id="class-devastator-turret" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1403] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Devastator Turret&#10;Defensive structure. Deals increased damage to armored targets. Attacks ground units." class=" btn-tips-flamingbetty-png"></div>
+            <div class="f {{'unacquired' if inventory[1403] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Devastator Turret&#10;Defensive structure. Deals increased damage to armored targets. Attacks ground units." class=" btn-tips-flamingbetty-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1397] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anti-Armor Munitions (Devastator Turret)&#10;Increases Devastator Turret damage to armored targets by 10." class=" btn-ability-terran-ignorearmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1396] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concussive Grenades (Devastator Turret)&#10;Devastator Turrets slow enemies they hit. Does not stack with Marauder Concussive Shells." class=" btn-ability-terran-punishergrenade-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1398] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Devastator Turret)&#10;Reduces Devastator Turret cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[1397] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anti-Armor Munitions (Devastator Turret)&#10;Increases Devastator Turret damage to armored targets by 10." class=" btn-ability-terran-ignorearmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1396] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concussive Grenades (Devastator Turret)&#10;Devastator Turrets slow enemies they hit. Does not stack with Marauder Concussive Shells." class=" btn-ability-terran-punishergrenade-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1398] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Devastator Turret)&#10;Reduces Devastator Turret cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-planetary-fortress" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1612] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Planetary Fortress&#10;Allows Command Centers to upgrade into a defensive structure with a turret and additional armor.&#10;Planetary Fortresses cannot Lift Off, or cast Orbital Command spells." class=" btn-building-terran-planetaryfortress-png"></div>
+            <div class="f {{'unacquired' if inventory[1612] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Planetary Fortress&#10;Allows Command Centers to upgrade into a defensive structure with a turret and additional armor.&#10;Planetary Fortresses cannot Lift Off, or cast Orbital Command spells." class=" btn-building-terran-planetaryfortress-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1389] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ibiks Tracking Scanners (Planetary Fortress)&#10;Planetary Fortress can attack air units." class=" btn-ability-terran-detectionconedebuff-png"></div>
-            <div class="f {{'unacquired' if inventory[1395] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Orbital Module (Planetary Fortress)&#10;Allows Planetary Fortresses to use Scanner Sweep, MULE, and Extra Supplies if those abilities are owned." class=" btn-orbital-fortress-png"></div>
+            <div class="f {{'unacquired' if inventory[1389] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ibiks Tracking Scanners (Planetary Fortress)&#10;Planetary Fortress can attack air units." class=" btn-ability-terran-detectionconedebuff-png"></div>
+            <div class="f {{'unacquired' if inventory[1395] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Orbital Module (Planetary Fortress)&#10;Allows Planetary Fortresses to use Scanner Sweep, MULE, and Extra Supplies if those abilities are owned." class=" btn-orbital-fortress-png"></div>
             <div class="progressive lvl-{{[inventory[1388], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Augmented Thrusters (Planetary Fortress) - Level 1&#10;Level 1: Lift Off - Planetary Fortress can lift off.&#10;Level 2: Armament Stabilizers - Planetary Fortress can attack while lifted off." class=" btn-ability-terran-liftoff-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Augmented Thrusters (Planetary Fortress) - Level 2&#10;Level 1: Lift Off - Planetary Fortress can lift off.&#10;Level 2: Armament Stabilizers - Planetary Fortress can attack while lifted off." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Augmented Thrusters (Planetary Fortress) - Level 1&#10;Level 1: Lift Off - Planetary Fortress can lift off.&#10;Level 2: Armament Stabilizers - Planetary Fortress can attack while lifted off." class=" btn-ability-terran-liftoff-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Augmented Thrusters (Planetary Fortress) - Level 2&#10;Level 1: Lift Off - Planetary Fortress can lift off.&#10;Level 2: Armament Stabilizers - Planetary Fortress can attack while lifted off." class=" btn-ability-mengsk-siegetank-flyingtankarmament-png"></div>
             </div>
           </div>
         </div>
         <div id="class-perdition-turret" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1613] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Perdition Turret&#10;Automated defensive turret. Burrows down while no enemies are nearby." class=" btn-unit-terran-perditionturret-png"></div>
+            <div class="f {{'unacquired' if inventory[1613] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Perdition Turret&#10;Automated defensive turret. Burrows down while no enemies are nearby." class=" btn-unit-terran-perditionturret-png"></div>
           </div>
         </div>
         <div id="class-hive-mind-emulator" class="item-class ss-4">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1618] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hive Mind Emulator&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Zerg units." class=" btn-building-terran-hivemindemulator-png"></div>
-            <div class="f {{'unacquired' if inventory[1631] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Argus Amplifier (Hive Mind Emulator)&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Protoss units." class=" btn-argus-talisman-png"></div>
-            <div class="f {{'unacquired' if inventory[1632] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Psi Indoctrinator (Hive Mind Emulator)&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Terran units." class=" btn-upgrade-psi-indoctrinator-png"></div>
+            <div class="f {{'unacquired' if inventory[1618] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hive Mind Emulator&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Zerg units." class=" btn-building-terran-hivemindemulator-png"></div>
+            <div class="f {{'unacquired' if inventory[1631] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Argus Amplifier (Hive Mind Emulator)&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Protoss units." class=" btn-argus-talisman-png"></div>
+            <div class="f {{'unacquired' if inventory[1632] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Psi Indoctrinator (Hive Mind Emulator)&#10;Unlocks the Hive Mind Emulator defensive structure, and allows it to permanently Mind Control Terran units." class=" btn-upgrade-psi-indoctrinator-png"></div>
           </div>
         </div>
         <div id="class-psi-disrupter" class="item-class ss-4">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1619] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Psi Disrupter&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Zerg units." class=" btn-building-terran-sigmaprojector-png"></div>
-            <div class="f {{'unacquired' if inventory[1629] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sonic Disrupter (Psi Disrupter)&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Terran units." class=" btn-ability-protoss-mindblast-png"></div>
-            <div class="f {{'unacquired' if inventory[1630] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Psi Screen (Psi Disrupter)&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Protoss units." class=" btn-progression-protoss-fenix-1-zealotsuit-png"></div>
+            <div class="f {{'unacquired' if inventory[1619] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Psi Disrupter&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Zerg units." class=" btn-building-terran-sigmaprojector-png"></div>
+            <div class="f {{'unacquired' if inventory[1629] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sonic Disrupter (Psi Disrupter)&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Terran units." class=" btn-ability-protoss-mindblast-png"></div>
+            <div class="f {{'unacquired' if inventory[1630] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Psi Screen (Psi Disrupter)&#10;Unlocks the Psi Disrupter defensive structure, and allows it to slow the attack and movement speeds of all nearby Protoss units." class=" btn-progression-protoss-fenix-1-zealotsuit-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -638,94 +638,94 @@
         </div>
         <div id="class-terran-mercenary" class="item-class ss-5">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1500] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="War Pigs&#10;Mercenary Marines." class=" btn-unit-terran-marinemercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[1501] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Devil Dogs&#10;Mercenary Firebats." class=" btn-unit-terran-firebatmercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[1502] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hammer Securities&#10;Mercenary Marauders." class=" btn-unit-terran-maraudermercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[1503] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spartan Company&#10;Mercenary Goliaths." class=" btn-unit-terran-goliathmercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[1504] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Siege Breakers&#10;Mercenary Siege Tanks." class=" btn-unit-terran-siegetankmercenary-tank-png"></div>
-            <div class="f {{'unacquired' if inventory[1505] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hel's Angels&#10;Mercenary Vikings." class=" btn-unit-terran-vikingmercenary-fighter-png"></div>
-            <div class="f {{'unacquired' if inventory[1506] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dusk Wings&#10;Mercenary Banshees." class=" btn-unit-terran-bansheemercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[1507] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jackson's Revenge&#10;Mercenary Battlecruiser." class=" btn-unit-terran-battlecruiserloki-png"></div>
-            <div class="f {{'unacquired' if inventory[1508] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Skibi's Angels&#10;Mercenary Medics." class=" btn-unit-terran-medicelite-png"></div>
-            <div class="f {{'unacquired' if inventory[1509] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Death Heads&#10;Mercenary Reapers." class=" btn-unit-terran-deathhead-png"></div>
-            <div class="f {{'unacquired' if inventory[1510] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Winged Nightmares&#10;Mercenary Wraiths." class=" btn-unit-collection-wraith-junker-png"></div>
-            <div class="f {{'unacquired' if inventory[1511] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Midnight Riders&#10;Mercenary Liberators." class=" btn-unit-terran-liberatorblackops-png"></div>
-            <div class="f {{'unacquired' if inventory[1512] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Brynhilds&#10;Mercenary Valkyries." class=" btn-unit-collection-vikingfighter-covertops-png"></div>
-            <div class="f {{'unacquired' if inventory[1513] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jotun&#10;Mercenary Thor." class=" btn-unit-terran-merc-thor-png"></div>
+            <div class="f {{'unacquired' if inventory[1500] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="War Pigs&#10;Mercenary Marines." class=" btn-unit-terran-marinemercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[1501] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Devil Dogs&#10;Mercenary Firebats." class=" btn-unit-terran-firebatmercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[1502] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hammer Securities&#10;Mercenary Marauders." class=" btn-unit-terran-maraudermercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[1503] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spartan Company&#10;Mercenary Goliaths." class=" btn-unit-terran-goliathmercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[1504] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Siege Breakers&#10;Mercenary Siege Tanks." class=" btn-unit-terran-siegetankmercenary-tank-png"></div>
+            <div class="f {{'unacquired' if inventory[1505] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hel's Angels&#10;Mercenary Vikings." class=" btn-unit-terran-vikingmercenary-fighter-png"></div>
+            <div class="f {{'unacquired' if inventory[1506] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dusk Wings&#10;Mercenary Banshees." class=" btn-unit-terran-bansheemercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[1507] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jackson's Revenge&#10;Mercenary Battlecruiser." class=" btn-unit-terran-battlecruiserloki-png"></div>
+            <div class="f {{'unacquired' if inventory[1508] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Skibi's Angels&#10;Mercenary Medics." class=" btn-unit-terran-medicelite-png"></div>
+            <div class="f {{'unacquired' if inventory[1509] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Death Heads&#10;Mercenary Reapers." class=" btn-unit-terran-deathhead-png"></div>
+            <div class="f {{'unacquired' if inventory[1510] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Winged Nightmares&#10;Mercenary Wraiths." class=" btn-unit-collection-wraith-junker-png"></div>
+            <div class="f {{'unacquired' if inventory[1511] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Midnight Riders&#10;Mercenary Liberators." class=" btn-unit-terran-liberatorblackops-png"></div>
+            <div class="f {{'unacquired' if inventory[1512] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Brynhilds&#10;Mercenary Valkyries." class=" btn-unit-collection-vikingfighter-covertops-png"></div>
+            <div class="f {{'unacquired' if inventory[1513] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jotun&#10;Mercenary Thor." class=" btn-unit-terran-merc-thor-png"></div>
           </div>
         </div>
         <div id="class-terran-mercenary-upgrade" class="item-class ss-5">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1623] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rogue Forces (Terran)&#10;Terran Mercenary calldowns are no longer limited by charges." class=" btn-rogue-forces-png"></div>
-            <div class="f {{'unacquired' if inventory[1627] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Reinforcement (Terran)&#10;Reduces cooldowns of all Terran Mercenary calldowns by 60s." class=" btn-progression-hornerhan-6-mirabuildtime-png"></div>
-            <div class="f {{'unacquired' if inventory[1633] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Signal Beacon (Terran)&#10;Terran Mercenary Calldowns are instantly deployed on rally point." class=" talent-raynor-level08-orbitaldroppods-png"></div>
+            <div class="f {{'unacquired' if inventory[1623] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rogue Forces (Terran)&#10;Terran Mercenary calldowns are no longer limited by charges." class=" btn-rogue-forces-png"></div>
+            <div class="f {{'unacquired' if inventory[1627] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Reinforcement (Terran)&#10;Reduces cooldowns of all Terran Mercenary calldowns by 60s." class=" btn-progression-hornerhan-6-mirabuildtime-png"></div>
+            <div class="f {{'unacquired' if inventory[1633] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Signal Beacon (Terran)&#10;Terran Mercenary Calldowns are instantly deployed on rally point." class=" talent-raynor-level08-orbitaldroppods-png"></div>
             <div class="progressive lvl-{{[inventory[1626], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fast Delivery (Terran) - Level 1&#10;At level 1, you can request one Mercenary unit immediately at the start of a mission. Level 2 allows you to calldown 3 Mercenary units immediately." class=" talent-tychus-level07-firstdiscount-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fast Delivery (Terran) - Level 2&#10;At level 1, you can request one Mercenary unit immediately at the start of a mission. Level 2 allows you to calldown 3 Mercenary units immediately." class=" talent-tychus-level02-additionaloutlaw-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fast Delivery (Terran) - Level 1&#10;At level 1, you can request one Mercenary unit immediately at the start of a mission. Level 2 allows you to calldown 3 Mercenary units immediately." class=" talent-tychus-level07-firstdiscount-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fast Delivery (Terran) - Level 2&#10;At level 1, you can request one Mercenary unit immediately at the start of a mission. Level 2 allows you to calldown 3 Mercenary units immediately." class=" talent-tychus-level02-additionaloutlaw-png"></div>
             </div>
           </div>
         </div>
         <div id="class-son-of-korhal" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1056] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Son of Korhal&#10;Royal Guard general-purpose infantry." class=" btn-unit-terran-marine-mengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1056] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Son of Korhal&#10;Royal Guard general-purpose infantry." class=" btn-unit-terran-marine-mengsk-png"></div>
           </div>
         </div>
         <div id="class-field-response-theta" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1058] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Field Response Theta&#10;Royal Guard support trooper. Heals nearby biological units." class=" btn-unit-terran-medic-mengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1058] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Field Response Theta&#10;Royal Guard support trooper. Heals nearby biological units." class=" btn-unit-terran-medic-mengsk-png"></div>
           </div>
         </div>
         <div id="class-aegis-guard" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1054] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Aegis Guard&#10;Royal Guard heavy assault infantry." class=" btn-unit-terran-maraudermengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1054] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Aegis Guard&#10;Royal Guard heavy assault infantry." class=" btn-unit-terran-maraudermengsk-png"></div>
           </div>
         </div>
         <div id="class-emperors-shadow" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1055] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Emperor's Shadow&#10;Royal Guard specialist. Can use Pyrokinetic Immolation and EMP Blast abilities. Can call down Tactical missiles." class=" btn-unit-terran-ghostmengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1055] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Emperor's Shadow&#10;Royal Guard specialist. Can use Pyrokinetic Immolation and EMP Blast abilities. Can call down Tactical missiles." class=" btn-unit-terran-ghostmengsk-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1756] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sovereign Tactical Missiles (Emperor's Shadow)&#10;Tactical Missile Strikes no longer need to be channeled." class=" btn-upgrade-mengsk-ghostacademy-guidedtacticalstrike-png"></div>
+            <div class="f {{'unacquired' if inventory[1756] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sovereign Tactical Missiles (Emperor's Shadow)&#10;Tactical Missile Strikes no longer need to be channeled." class=" btn-upgrade-mengsk-ghostacademy-guidedtacticalstrike-png"></div>
           </div>
         </div>
         <div id="class-bulwark-company" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1057] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bulwark Company&#10;Royal Guard heavy-fire support unit." class=" btn-unit-terran-goliath-mengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1057] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bulwark Company&#10;Royal Guard heavy-fire support unit." class=" btn-unit-terran-goliath-mengsk-png"></div>
           </div>
         </div>
         <div id="class-shock-division" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1052] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shock Division&#10;Royal Guard heavy tank. Long-range artillery in Siege Mode." class=" btn-unit-terran-siegetankmengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1052] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shock Division&#10;Royal Guard heavy tank. Long-range artillery in Siege Mode." class=" btn-unit-terran-siegetankmengsk-png"></div>
           </div>
         </div>
         <div id="class-blackhammer" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1053] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blackhammer&#10;Royal Guard heavy assault mech." class=" btn-unit-terran-thormengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1053] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blackhammer&#10;Royal Guard heavy assault mech." class=" btn-unit-terran-thormengsk-png"></div>
           </div>
         </div>
         <div id="class-night-hawk" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1060] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Night Hawk&#10;Royal Guard highly mobile flying unit. Excellent at surgical strikes." class=" btn-unit-terran-wraith-mengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1060] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Night Hawk&#10;Royal Guard highly mobile flying unit. Excellent at surgical strikes." class=" btn-unit-terran-wraith-mengsk-png"></div>
           </div>
         </div>
         <div id="class-night-wolf" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1061] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Night Wolf&#10;Royal Guard tactical-strike aircraft." class=" btn-unit-terran-banshee-mengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1061] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Night Wolf&#10;Royal Guard tactical-strike aircraft." class=" btn-unit-terran-banshee-mengsk-png"></div>
           </div>
         </div>
         <div id="class-emperors-guardian" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1059] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Emperor's Guardian&#10;Royal Guard artillery fighter. Loaded with missiles that deal area damage to enemy air targets. &#10;Can switch into Defender Mode to provide siege support." class=" btn-royalliberator-png"></div>
+            <div class="f {{'unacquired' if inventory[1059] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Emperor's Guardian&#10;Royal Guard artillery fighter. Loaded with missiles that deal area damage to enemy air targets. &#10;Can switch into Defender Mode to provide siege support." class=" btn-royalliberator-png"></div>
           </div>
         </div>
         <div id="class-sky-fury" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1051] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sky Fury&#10;Durable Royal Guard support flyer. Loaded with strong anti-capital air missiles. &#10;Can switch into Assault Mode to attack ground units." class=" btn-unit-terran-vikingmengskfighter-png"></div>
+            <div class="f {{'unacquired' if inventory[1051] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sky Fury&#10;Durable Royal Guard support flyer. Loaded with strong anti-capital air missiles. &#10;Can switch into Assault Mode to attack ground units." class=" btn-unit-terran-vikingmengskfighter-png"></div>
           </div>
         </div>
         <div id="class-pride-of-augustgrad" class="item-class ss-5 hidden-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1050] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pride of Augustgrad&#10;Powerful Royal Guard warship." class=" btn-unit-terran-battlecruisermengsk-png"></div>
+            <div class="f {{'unacquired' if inventory[1050] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pride of Augustgrad&#10;Powerful Royal Guard warship." class=" btn-unit-terran-battlecruisermengsk-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -734,96 +734,96 @@
         <div id="class-terran-wa" class="item-class ss-6">
           <div class="item-class-header">
             <div class="progressive lvl-{{[inventory[1100], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 1&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 2&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 3&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 4&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 5&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 1&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 2&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 3&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 4&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Weapon - Level 5&#10;Increases damage of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryweaponslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1102], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 1&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 2&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 3&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 4&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 5&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 1&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 2&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 3&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 4&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Infantry Armor - Level 5&#10;Increases armor of Terran infantry.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-infantryarmorlevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1103], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 1&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 2&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 3&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 4&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 5&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 1&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 2&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 3&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 4&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Weapon - Level 5&#10;Increases damage of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleweaponslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1104], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 1&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 2&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 3&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 4&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 5&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 1&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 2&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 3&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 4&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Vehicle Armor - Level 5&#10;Increases armor of Terran vehicles.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-vehicleplatinglevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1105], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 1&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 2&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 3&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 4&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 5&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 1&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 2&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 3&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 4&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Weapon - Level 5&#10;Increases damage of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipweaponslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[1106], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 1&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 2&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 3&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 4&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 5&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 1&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 2&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 3&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 4&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Terran Ship Armor - Level 5&#10;Increases armor of Terran starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-terran-shipplatinglevel5-png"></div>
             </div>
           </div>
         </div>
         <div id="class-scv" class="item-class ss-6">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1204] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Construction (SCV)&#10;Multiple SCVs can construct a structure, reducing its construction time." class=" btn-advanced-construction-png"></div>
-            <div class="f {{'unacquired' if inventory[1205] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dual-Fusion Welders (SCV)&#10;SCVs repair twice as fast." class=" btn-upgrade-swann-scvdoublerepair-png"></div>
-            <div class="f {{'unacquired' if inventory[1232] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hostile Environment Adaptation (SCV)&#10;Increases SCV life by 15 and attack speed slightly." class=" btn-hostile-environment-adaptation-png"></div>
-            <div class="f {{'unacquired' if inventory[1762] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Construction Jump Jets (SCV)&#10;Allows SCVs to jump up and down cliffs." class=" btn-scv-cliffjump-png"></div>
+            <div class="f {{'unacquired' if inventory[1204] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Construction (SCV)&#10;Multiple SCVs can construct a structure, reducing its construction time." class=" btn-advanced-construction-png"></div>
+            <div class="f {{'unacquired' if inventory[1205] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dual-Fusion Welders (SCV)&#10;SCVs repair twice as fast." class=" btn-upgrade-swann-scvdoublerepair-png"></div>
+            <div class="f {{'unacquired' if inventory[1232] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hostile Environment Adaptation (SCV)&#10;Increases SCV life by 15 and attack speed slightly." class=" btn-hostile-environment-adaptation-png"></div>
+            <div class="f {{'unacquired' if inventory[1762] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Construction Jump Jets (SCV)&#10;Allows SCVs to jump up and down cliffs." class=" btn-scv-cliffjump-png"></div>
           </div>
         </div>
         <div id="class-spider-mine" class="item-class ss-6">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1262] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="High Explosive Munition (Spider Mine)&#10;Increases Spider mine damage." class=" btn-high-explosive-munition-png"></div>
-            <div class="f {{'unacquired' if inventory[1302] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cerberus Mine (Spider Mine)&#10;Increases trigger and blast radius of Spider Mines." class=" btn-upgrade-raynor-cerberusmines-png"></div>
+            <div class="f {{'unacquired' if inventory[1262] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="High Explosive Munition (Spider Mine)&#10;Increases Spider mine damage." class=" btn-high-explosive-munition-png"></div>
+            <div class="f {{'unacquired' if inventory[1302] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cerberus Mine (Spider Mine)&#10;Increases trigger and blast radius of Spider Mines." class=" btn-upgrade-raynor-cerberusmines-png"></div>
           </div>
         </div>
         <div id="class-command-center" class="item-class ss-6">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[1297] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scanner Sweep (Command Center)&#10;Temporarily reveals an area of the map, detecting cloaked and burrowed units." class=" btn-ability-terran-scannersweep-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1298] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="MULE (Command Center)&#10;Summons a unit that gathers minerals more quickly than regular SCVs. Has timed life." class=" btn-unit-terran-mule-png"></div>
-            <div class="f {{'unacquired' if inventory[1299] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Extra Supplies (Command Center)&#10;Drops additional supplies, permanently increasing the supply output of the target Supply Depot by 8." class=" btn-ability-terran-calldownextrasupplies-color-png"></div>
-            <div class="f {{'unacquired' if inventory[1605] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Command Center Reactor (Command Center)&#10;Command Centers can train two SCVs at once." class=" btn-research-terran-commandcenterreactor-png"></div>
+            <div class="f {{'unacquired' if inventory[1297] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scanner Sweep (Command Center)&#10;Temporarily reveals an area of the map, detecting cloaked and burrowed units." class=" btn-ability-terran-scannersweep-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1298] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="MULE (Command Center)&#10;Summons a unit that gathers minerals more quickly than regular SCVs. Has timed life." class=" btn-unit-terran-mule-png"></div>
+            <div class="f {{'unacquired' if inventory[1299] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Extra Supplies (Command Center)&#10;Drops additional supplies, permanently increasing the supply output of the target Supply Depot by 8." class=" btn-ability-terran-calldownextrasupplies-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1605] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Command Center Reactor (Command Center)&#10;Command Centers can train two SCVs at once." class=" btn-research-terran-commandcenterreactor-png"></div>
           </div>
         </div>
         <div id="class-terran-macro" class="item-class ss-6">
           <div class="item-class-upgrades">
             <div class="progressive lvl-{{[inventory[1206], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fire-Suppression System (Terran) - Level 1&#10;Level 1: While on low health, Terran structures are repaired to half health instead of burning down.&#10;Level 2: Terran structures are repaired to full health instead of half health." class=" btn-upgrade-swann-firesuppressionsystem-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fire-Suppression System (Terran) - Level 2&#10;Level 1: While on low health, Terran structures are repaired to half health instead of burning down.&#10;Level 2: Terran structures are repaired to full health instead of half health." class=" btn-fire-suppression-system-lvl2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fire-Suppression System (Terran) - Level 1&#10;Level 1: While on low health, Terran structures are repaired to half health instead of burning down.&#10;Level 2: Terran structures are repaired to full health instead of half health." class=" btn-upgrade-swann-firesuppressionsystem-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fire-Suppression System (Terran) - Level 2&#10;Level 1: While on low health, Terran structures are repaired to half health instead of burning down.&#10;Level 2: Terran structures are repaired to full health instead of half health." class=" btn-fire-suppression-system-lvl2-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1600] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ultra-Capacitors (Terran)&#10;Increases attack speed of units by 5% per weapon upgrade." class=" btn-research-terran-ultracapacitors-png"></div>
-            <div class="f {{'unacquired' if inventory[1601] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vanadium Plating (Terran)&#10;Increases the life of units by 5% per armor upgrade." class=" btn-research-terran-vanadiumplating-png"></div>
-            <div class="f {{'unacquired' if inventory[1602] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Orbital Depots (Terran)&#10;Supply depots are built instantly." class=" btn-research-terran-orbitaldepots-png"></div>
-            <div class="f {{'unacquired' if inventory[1603] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Micro-Filtering (Terran)&#10;Refineries produce Vespene gas 25% faster." class=" btn-research-terran-microfiltering-png"></div>
-            <div class="f {{'unacquired' if inventory[1604] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Automated Refinery (Terran)&#10;Eliminates the need for SCVs in vespene gas production." class=" btn-building-terran-refineryautomated-png"></div>
-            <div class="f {{'unacquired' if inventory[1608] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tech Reactor (Terran)&#10;Merges Tech Labs and Reactors into one add on structure to provide both functions." class=" btn-building-terran-techreactor-png"></div>
-            <div class="f {{'unacquired' if inventory[1609] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Orbital Strike (Barracks)&#10;Trained units from Barracks are instantly deployed on rally point." class=" btn-research-terran-orbitalstrikerally-png"></div>
-            <div class="f {{'unacquired' if inventory[1616] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cellular Reactor (Terran)&#10;All Terran spellcasters get +100 starting and maximum energy." class=" btn-research-zerg-cellularreactor-png"></div>
+            <div class="f {{'unacquired' if inventory[1600] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ultra-Capacitors (Terran)&#10;Increases attack speed of units by 5% per weapon upgrade." class=" btn-research-terran-ultracapacitors-png"></div>
+            <div class="f {{'unacquired' if inventory[1601] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vanadium Plating (Terran)&#10;Increases the life of units by 5% per armor upgrade." class=" btn-research-terran-vanadiumplating-png"></div>
+            <div class="f {{'unacquired' if inventory[1602] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Orbital Depots (Terran)&#10;Supply depots are built instantly." class=" btn-research-terran-orbitaldepots-png"></div>
+            <div class="f {{'unacquired' if inventory[1603] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Micro-Filtering (Terran)&#10;Refineries produce Vespene gas 25% faster." class=" btn-research-terran-microfiltering-png"></div>
+            <div class="f {{'unacquired' if inventory[1604] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Automated Refinery (Terran)&#10;Eliminates the need for SCVs in vespene gas production." class=" btn-building-terran-refineryautomated-png"></div>
+            <div class="f {{'unacquired' if inventory[1608] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tech Reactor (Terran)&#10;Merges Tech Labs and Reactors into one add on structure to provide both functions." class=" btn-building-terran-techreactor-png"></div>
+            <div class="f {{'unacquired' if inventory[1609] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Orbital Strike (Barracks)&#10;Trained units from Barracks are instantly deployed on rally point." class=" btn-research-terran-orbitalstrikerally-png"></div>
+            <div class="f {{'unacquired' if inventory[1616] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cellular Reactor (Terran)&#10;All Terran spellcasters get +100 starting and maximum energy." class=" btn-research-zerg-cellularreactor-png"></div>
             <div class="progressive lvl-{{[inventory[1617], 3]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 1&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-regenerativebiosteel-blue-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 2&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-regenerativebiosteel-green-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 3&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-research-zerg-regenerativebio-steel-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 1&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-regenerativebiosteel-blue-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 2&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-regenerativebiosteel-green-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Regenerative Bio-Steel (Terran) - Level 3&#10;Allows Terran mechanical units to regenerate health while not in combat.&#10;Each level increases life regeneration speed." class=" btn-research-zerg-regenerativebio-steel-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1620] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Structure Armor (Terran)&#10;Increases armor of all Terran structures by 2." class=" btn-upgrade-terran-buildingarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[1621] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hi-Sec Auto Tracking (Terran)&#10;Increases attack range of all Terran structures by 1." class=" btn-upgrade-terran-hisecautotracking-png"></div>
-            <div class="f {{'unacquired' if inventory[1622] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Optics (Terran)&#10;Increases attack range of all Terran mechanical units by 1." class=" btn-upgrade-swann-vehiclerangeincrease-png"></div>
-            <div class="f {{'unacquired' if inventory[1624] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mechanical Know-how (Terran)&#10;Increases mechanical unit life by 20%." class=" talent-swann-level14-vehiclehealthincrease-png"></div>
-            <div class="f {{'unacquired' if inventory[1625] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mercenary Munitions (Terran)&#10;Increases attack speed of all Terran combat units by 15%." class=" talent-raynor-level14-infantryattackspeed-png"></div>
-            <div class="f {{'unacquired' if inventory[1628] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fusion Reactor (Fusion Core)&#10;Fusion Cores increase the energy regeneration of nearby units by +1 energy per second." class=" btn-tips-terran-energynova-png"></div>
+            <div class="f {{'unacquired' if inventory[1620] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Structure Armor (Terran)&#10;Increases armor of all Terran structures by 2." class=" btn-upgrade-terran-buildingarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[1621] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hi-Sec Auto Tracking (Terran)&#10;Increases attack range of all Terran structures by 1." class=" btn-upgrade-terran-hisecautotracking-png"></div>
+            <div class="f {{'unacquired' if inventory[1622] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Optics (Terran)&#10;Increases attack range of all Terran mechanical units by 1." class=" btn-upgrade-swann-vehiclerangeincrease-png"></div>
+            <div class="f {{'unacquired' if inventory[1624] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mechanical Know-how (Terran)&#10;Increases mechanical unit life by 20%." class=" talent-swann-level14-vehiclehealthincrease-png"></div>
+            <div class="f {{'unacquired' if inventory[1625] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mercenary Munitions (Terran)&#10;Increases attack speed of all Terran combat units by 15%." class=" talent-raynor-level14-infantryattackspeed-png"></div>
+            <div class="f {{'unacquired' if inventory[1628] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fusion Reactor (Fusion Core)&#10;Fusion Cores increase the energy regeneration of nearby units by +1 energy per second." class=" btn-tips-terran-energynova-png"></div>
           </div>
         </div>
       </div>
@@ -871,133 +871,133 @@
         </div>
         <div id="class-zergling" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2000] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Zergling&#10;Fast inexpensive melee attacker. Hatches in pairs from a single larva. Can morph into a Baneling." class=" btn-unit-zerg-zergling-png"></div>
+            <div class="f {{'unacquired' if inventory[2000] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Zergling&#10;Fast inexpensive melee attacker. Hatches in pairs from a single larva. Can morph into a Baneling." class=" btn-unit-zerg-zergling-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2201] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adrenal Overload (Zergling)&#10;Increases Zergling attack speed." class=" btn-upgrade-zerg-adrenaloverload-png"></div>
-            <div class="f {{'unacquired' if inventory[2200] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hardened Carapace (Zergling)&#10;Increases Zergling health by +10." class=" btn-upgrade-zerg-hardenedcarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2202] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Metabolic Boost (Zergling)&#10;Increases Zergling movement speed." class=" btn-upgrade-zerg-hotsmetabolicboost-png"></div>
-            <div class="f {{'unacquired' if inventory[2300] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Raptor Strain (Zergling)&#10;Allows Zerglings to jump up and down cliffs and leap onto enemies. Also increases Zergling attack damage by 2." class=" btn-unit-zerg-zergling-raptor-png"></div>
-            <div class="f {{'unacquired' if inventory[2406] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Zergling Reconstitution (Zerg)&#10;Killed Zerglings respawn from your primary Hatchery at no cost." class=" btn-ability-kerrigan-zerglingreconstitution-png"></div>
-            <div class="f {{'unacquired' if inventory[2226] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shredding Claws (Zergling)&#10;Zergling attacks will temporarily reduce their target's armor to 0." class=" btn-upgrade-zergling-armorshredding-png"></div>
-            <div class="f {{'unacquired' if inventory[2301] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Swarmling Strain (Zergling)&#10;Zerglings will spawn instantly and with an extra Zergling per egg at no additional cost." class=" btn-unit-zerg-zergling-swarmling-png"></div>
+            <div class="f {{'unacquired' if inventory[2201] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adrenal Overload (Zergling)&#10;Increases Zergling attack speed." class=" btn-upgrade-zerg-adrenaloverload-png"></div>
+            <div class="f {{'unacquired' if inventory[2200] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hardened Carapace (Zergling)&#10;Increases Zergling health by +10." class=" btn-upgrade-zerg-hardenedcarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2202] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Metabolic Boost (Zergling)&#10;Increases Zergling movement speed." class=" btn-upgrade-zerg-hotsmetabolicboost-png"></div>
+            <div class="f {{'unacquired' if inventory[2300] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Raptor Strain (Zergling)&#10;Allows Zerglings to jump up and down cliffs and leap onto enemies. Also increases Zergling attack damage by 2." class=" btn-unit-zerg-zergling-raptor-png"></div>
+            <div class="f {{'unacquired' if inventory[2406] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Zergling Reconstitution (Zerg)&#10;Killed Zerglings respawn from your primary Hatchery at no cost." class=" btn-ability-kerrigan-zerglingreconstitution-png"></div>
+            <div class="f {{'unacquired' if inventory[2226] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shredding Claws (Zergling)&#10;Zergling attacks will temporarily reduce their target's armor to 0." class=" btn-upgrade-zergling-armorshredding-png"></div>
+            <div class="f {{'unacquired' if inventory[2301] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Swarmling Strain (Zergling)&#10;Zerglings will spawn instantly and with an extra Zergling per egg at no additional cost." class=" btn-unit-zerg-zergling-swarmling-png"></div>
           </div>
         </div>
         <div id="class-swarm-queen" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2001] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Swarm Queen&#10;Ranged support caster. Can use the Spawn Creep Tumor and Rapid Transfusion abilities." class=" btn-unit-zerg-broodqueen-png"></div>
+            <div class="f {{'unacquired' if inventory[2001] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Swarm Queen&#10;Ranged support caster. Can use the Spawn Creep Tumor and Rapid Transfusion abilities." class=" btn-unit-zerg-broodqueen-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2271] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bio-Mechanical Transfusion (Swarm Queen)&#10;Swarm Queen Burst Heal heals an additional +10 life and can now target mechanical units." class=" btn-upgrade-zerg-abathur-biomechanicaltransfusion-png"></div>
-            <div class="f {{'unacquired' if inventory[2269] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Deep Tunnel (Swarm Queen)&#10;Swarm Queens gain the Deep Tunnel ability." class=" btn-ability-zerg-deeptunnel-png"></div>
-            <div class="f {{'unacquired' if inventory[2273] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Incubator Chamber (Swarm Queen)&#10;Swarm Queens may now be built two at a time from the Hatchery, Lair, or Hive." class=" btn-upgrade-zerg-abathur-incubationchamber-png"></div>
-            <div class="f {{'unacquired' if inventory[2270] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Organic Carapace (Swarm Queen)&#10;Swarm Queens gain +25 life." class=" btn-upgrade-zerg-organiccarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2272] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Swarm Queen)&#10;Reduces Swarm Queen cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2268] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spawn Larvae (Swarm Queen)&#10;Swarm Queens gain the Spawn Larvae ability." class=" btn-unit-zerg-larva-png"></div>
+            <div class="f {{'unacquired' if inventory[2271] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bio-Mechanical Transfusion (Swarm Queen)&#10;Swarm Queen Burst Heal heals an additional +10 life and can now target mechanical units." class=" btn-upgrade-zerg-abathur-biomechanicaltransfusion-png"></div>
+            <div class="f {{'unacquired' if inventory[2269] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Deep Tunnel (Swarm Queen)&#10;Swarm Queens gain the Deep Tunnel ability." class=" btn-ability-zerg-deeptunnel-png"></div>
+            <div class="f {{'unacquired' if inventory[2273] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Incubator Chamber (Swarm Queen)&#10;Swarm Queens may now be built two at a time from the Hatchery, Lair, or Hive." class=" btn-upgrade-zerg-abathur-incubationchamber-png"></div>
+            <div class="f {{'unacquired' if inventory[2270] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Organic Carapace (Swarm Queen)&#10;Swarm Queens gain +25 life." class=" btn-upgrade-zerg-organiccarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2272] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Swarm Queen)&#10;Reduces Swarm Queen cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2268] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spawn Larvae (Swarm Queen)&#10;Swarm Queens gain the Spawn Larvae ability." class=" btn-unit-zerg-larva-png"></div>
           </div>
         </div>
         <div id="class-roach" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2002] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Roach&#10;Durable short ranged attacker. Regenerates life quickly when burrowed." class=" btn-unit-zerg-roach-png"></div>
+            <div class="f {{'unacquired' if inventory[2002] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Roach&#10;Durable short ranged attacker. Regenerates life quickly when burrowed." class=" btn-unit-zerg-roach-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2204] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adaptive Plating (Roach)&#10;Roaches gain +3 armor when their life is below 50%." class=" btn-upgrade-zerg-adaptivecarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2303] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corpser Strain (Roach)&#10;Units killed after being attacked by Roaches will spawn 2 Roachlings." class=" btn-unit-zerg-roach-corpser-png"></div>
-            <div class="f {{'unacquired' if inventory[2227] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Glial Reconstitution (Roach)&#10;Increases Roach movement speed." class=" btn-upgrade-zerg-glialreconstitution-png"></div>
-            <div class="f {{'unacquired' if inventory[2203] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hydriodic Bile (Roach)&#10;Roaches deal +8 damage to light targets." class=" btn-upgrade-zerg-hydriaticacid-png"></div>
-            <div class="f {{'unacquired' if inventory[2228] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Organic Carapace (Roach)&#10;Increases Roach health by +25." class=" btn-upgrade-zerg-organiccarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2205] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tunneling Claws (Roach)&#10;Allows Roaches to move while burrowed." class=" btn-upgrade-zerg-hotstunnelingclaws-png"></div>
-            <div class="f {{'unacquired' if inventory[2302] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vile Strain (Roach)&#10;Roach attacks will slow the movement and attack speed of enemies." class=" btn-unit-zerg-roach-vile-png"></div>
+            <div class="f {{'unacquired' if inventory[2204] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adaptive Plating (Roach)&#10;Roaches gain +3 armor when their life is below 50%." class=" btn-upgrade-zerg-adaptivecarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2303] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corpser Strain (Roach)&#10;Units killed after being attacked by Roaches will spawn 2 Roachlings." class=" btn-unit-zerg-roach-corpser-png"></div>
+            <div class="f {{'unacquired' if inventory[2227] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Glial Reconstitution (Roach)&#10;Increases Roach movement speed." class=" btn-upgrade-zerg-glialreconstitution-png"></div>
+            <div class="f {{'unacquired' if inventory[2203] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hydriodic Bile (Roach)&#10;Roaches deal +8 damage to light targets." class=" btn-upgrade-zerg-hydriaticacid-png"></div>
+            <div class="f {{'unacquired' if inventory[2228] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Organic Carapace (Roach)&#10;Increases Roach health by +25." class=" btn-upgrade-zerg-organiccarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2205] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tunneling Claws (Roach)&#10;Allows Roaches to move while burrowed." class=" btn-upgrade-zerg-hotstunnelingclaws-png"></div>
+            <div class="f {{'unacquired' if inventory[2302] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vile Strain (Roach)&#10;Roach attacks will slow the movement and attack speed of enemies." class=" btn-unit-zerg-roach-vile-png"></div>
           </div>
         </div>
         <div id="class-hydralisk" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2003] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hydralisk&#10;High-damage generalist ranged attacker." class=" btn-unit-zerg-hydralisk-png"></div>
+            <div class="f {{'unacquired' if inventory[2003] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hydralisk&#10;High-damage generalist ranged attacker." class=" btn-unit-zerg-hydralisk-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2207] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ancillary Carapace (Hydralisk)&#10;Hydralisks gain +20 health." class=" btn-upgrade-zerg-ancillaryarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[2206] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Frenzy (Hydralisk)&#10;Allows Hydralisks to use the Frenzy ability, which increases their attack speed by 50%." class=" btn-upgrade-zerg-frenzy-png"></div>
-            <div class="f {{'unacquired' if inventory[2208] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Grooved Spines (Hydralisk)&#10;Hydralisks gain +1 range." class=" btn-upgrade-zerg-hotsgroovedspines-png"></div>
-            <div class="f {{'unacquired' if inventory[2229] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Muscular Augments (Hydralisk)&#10;Increases Hydralisk movement speed." class=" btn-upgrade-zerg-evolvemuscularaugments-png"></div>
-            <div class="f {{'unacquired' if inventory[2230] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Hydralisk)&#10;Reduces Hydralisk cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2207] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ancillary Carapace (Hydralisk)&#10;Hydralisks gain +20 health." class=" btn-upgrade-zerg-ancillaryarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[2206] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Frenzy (Hydralisk)&#10;Allows Hydralisks to use the Frenzy ability, which increases their attack speed by 50%." class=" btn-upgrade-zerg-frenzy-png"></div>
+            <div class="f {{'unacquired' if inventory[2208] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Grooved Spines (Hydralisk)&#10;Hydralisks gain +1 range." class=" btn-upgrade-zerg-hotsgroovedspines-png"></div>
+            <div class="f {{'unacquired' if inventory[2229] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Muscular Augments (Hydralisk)&#10;Increases Hydralisk movement speed." class=" btn-upgrade-zerg-evolvemuscularaugments-png"></div>
+            <div class="f {{'unacquired' if inventory[2230] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Hydralisk)&#10;Reduces Hydralisk cost by 25 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-aberration" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2005] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Aberration&#10;Durable melee attacker that deals heavy damage and can walk over other units." class=" btn-unit-zerg-aberration-png"></div>
+            <div class="f {{'unacquired' if inventory[2005] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Aberration&#10;Durable melee attacker that deals heavy damage and can walk over other units." class=" btn-unit-zerg-aberration-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2283] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Baneling Incubation (Aberration)&#10;Aberrations spawn 2 Banelings upon death." class=" btn-upgrade-zerg-rupture-png"></div>
-            <div class="f {{'unacquired' if inventory[2282] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Construct Regeneration (Aberration)&#10;Aberrations gain increased life regeneration." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
-            <div class="f {{'unacquired' if inventory[2281] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Monstrous Resilience (Aberration)&#10;Aberrations gain +140 life." class=" btn-monstrous-resilience-aberration-png"></div>
+            <div class="f {{'unacquired' if inventory[2283] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Baneling Incubation (Aberration)&#10;Aberrations spawn 2 Banelings upon death." class=" btn-upgrade-zerg-rupture-png"></div>
+            <div class="f {{'unacquired' if inventory[2282] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Construct Regeneration (Aberration)&#10;Aberrations gain increased life regeneration." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
+            <div class="f {{'unacquired' if inventory[2281] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Monstrous Resilience (Aberration)&#10;Aberrations gain +140 life." class=" btn-monstrous-resilience-aberration-png"></div>
             <div class="progressive lvl-{{[inventory[2381], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Baneling Launch (Aberration) - Level 1&#10;Level 1: Allows Aberrations to periodically throw generated Banelings at air targets.&#10;Level 2: Can store up to 3 Banelings. Can consume Banelings to recharge faster. Thrown Banelings benefit from Baneling upgrades. " class=" abilityicon_spawnbanelings_square-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Baneling Launch (Aberration) - Level 2&#10;Level 1: Allows Aberrations to periodically throw generated Banelings at air targets.&#10;Level 2: Can store up to 3 Banelings. Can consume Banelings to recharge faster. Thrown Banelings benefit from Baneling upgrades. " class=" talent-zagara-level14-unlocksplitterling-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Baneling Launch (Aberration) - Level 1&#10;Level 1: Allows Aberrations to periodically throw generated Banelings at air targets.&#10;Level 2: Can store up to 3 Banelings. Can consume Banelings to recharge faster. Thrown Banelings benefit from Baneling upgrades. " class=" abilityicon_spawnbanelings_square-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Baneling Launch (Aberration) - Level 2&#10;Level 1: Allows Aberrations to periodically throw generated Banelings at air targets.&#10;Level 2: Can store up to 3 Banelings. Can consume Banelings to recharge faster. Thrown Banelings benefit from Baneling upgrades. " class=" talent-zagara-level14-unlocksplitterling-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[2284] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Protective Cover (Aberration)&#10;Aberrations grant damage reduction to allied units directly beneath them." class=" btn-upgrade-zagara-aberrationarmorcover-png"></div>
-            <div class="f {{'unacquired' if inventory[2285] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Aberration)&#10;Reduces Aberration cost by 50 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2284] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Protective Cover (Aberration)&#10;Aberrations grant damage reduction to allied units directly beneath them." class=" btn-upgrade-zagara-aberrationarmorcover-png"></div>
+            <div class="f {{'unacquired' if inventory[2285] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Aberration)&#10;Reduces Aberration cost by 50 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-swarm-host" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2007] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Swarm Host&#10;Siege unit that attacks by rooting in place and continually spawning Locusts." class=" btn-unit-zerg-swarmhost-png"></div>
+            <div class="f {{'unacquired' if inventory[2007] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Swarm Host&#10;Siege unit that attacks by rooting in place and continually spawning Locusts." class=" btn-unit-zerg-swarmhost-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2215] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Burrow (Swarm Host)&#10;Allows Swarm Hosts to burrow instead of root to spawn locusts." class=" btn-ability-zerg-burrow-color-png"></div>
-            <div class="f {{'unacquired' if inventory[2310] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Carrion Strain (Swarm Host)&#10;Swarm Hosts will spawn Flying Locusts." class=" btn-unit-zerg-swarmhost-carrion-png"></div>
-            <div class="f {{'unacquired' if inventory[2311] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Creeper Strain (Swarm Host)&#10;Allows Swarm Hosts to teleport to any creep on the map in vision. Swarm Hosts will spread creep around them when rooted or burrowed." class=" btn-unit-zerg-swarmhost-creeper-png"></div>
-            <div class="f {{'unacquired' if inventory[2237] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enduring Locusts (Swarm Host)&#10;Increases the duration of Swarm Hosts' Locusts by 10s." class=" btn-upgrade-zerg-evolveincreasedlocustlifetime-png"></div>
-            <div class="f {{'unacquired' if inventory[2236] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Locust Metabolic Boost (Swarm Host)&#10;Increases Locust movement speed." class=" btn-upgrade-zerg-glialreconstitution-png"></div>
-            <div class="f {{'unacquired' if inventory[2238] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Organic Carapace (Swarm Host)&#10;Increases Swarm Host health by +40." class=" btn-upgrade-zerg-organiccarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2217] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pressurized Glands (Swarm Host)&#10;Allows Swarm Host Locusts to attack air targets." class=" btn-upgrade-zerg-pressurizedglands-png"></div>
-            <div class="f {{'unacquired' if inventory[2216] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Incubation (Swarm Host)&#10;Swarm Hosts will spawn locusts 20% faster." class=" btn-upgrade-zerg-rapidincubation-png"></div>
-            <div class="f {{'unacquired' if inventory[2239] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Swarm Host)&#10;Reduces Swarm Host cost by 100 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2215] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Burrow (Swarm Host)&#10;Allows Swarm Hosts to burrow instead of root to spawn locusts." class=" btn-ability-zerg-burrow-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2310] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Carrion Strain (Swarm Host)&#10;Swarm Hosts will spawn Flying Locusts." class=" btn-unit-zerg-swarmhost-carrion-png"></div>
+            <div class="f {{'unacquired' if inventory[2311] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Creeper Strain (Swarm Host)&#10;Allows Swarm Hosts to teleport to any creep on the map in vision. Swarm Hosts will spread creep around them when rooted or burrowed." class=" btn-unit-zerg-swarmhost-creeper-png"></div>
+            <div class="f {{'unacquired' if inventory[2237] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enduring Locusts (Swarm Host)&#10;Increases the duration of Swarm Hosts' Locusts by 10s." class=" btn-upgrade-zerg-evolveincreasedlocustlifetime-png"></div>
+            <div class="f {{'unacquired' if inventory[2236] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Locust Metabolic Boost (Swarm Host)&#10;Increases Locust movement speed." class=" btn-upgrade-zerg-glialreconstitution-png"></div>
+            <div class="f {{'unacquired' if inventory[2238] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Organic Carapace (Swarm Host)&#10;Increases Swarm Host health by +40." class=" btn-upgrade-zerg-organiccarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2217] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pressurized Glands (Swarm Host)&#10;Allows Swarm Host Locusts to attack air targets." class=" btn-upgrade-zerg-pressurizedglands-png"></div>
+            <div class="f {{'unacquired' if inventory[2216] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Incubation (Swarm Host)&#10;Swarm Hosts will spawn locusts 20% faster." class=" btn-upgrade-zerg-rapidincubation-png"></div>
+            <div class="f {{'unacquired' if inventory[2239] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Swarm Host)&#10;Reduces Swarm Host cost by 100 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-infestor" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2008] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infestor&#10;Support caster that can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities." class=" btn-unit-zerg-infestor-png"></div>
+            <div class="f {{'unacquired' if inventory[2008] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infestor&#10;Support caster that can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities." class=" btn-unit-zerg-infestor-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2266] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Terran (Infestor)&#10;Infestors gain the Spawn Infested Terran ability." class=" btn-unit-zerg-infestedmarine-png"></div>
-            <div class="f {{'unacquired' if inventory[2267] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Microbial Shroud (Infestor)&#10;Infestors gain the Microbial Shroud ability, &#10;which reduces incoming damage from air units in an area." class=" btn-ability-zerg-darkswarm-png"></div>
+            <div class="f {{'unacquired' if inventory[2266] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Terran (Infestor)&#10;Infestors gain the Spawn Infested Terran ability." class=" btn-unit-zerg-infestedmarine-png"></div>
+            <div class="f {{'unacquired' if inventory[2267] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Microbial Shroud (Infestor)&#10;Infestors gain the Microbial Shroud ability, &#10;which reduces incoming damage from air units in an area." class=" btn-ability-zerg-darkswarm-png"></div>
           </div>
         </div>
         <div id="class-ultralisk" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2009] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ultralisk&#10;Massive melee attacker. Has an area-damage cleave attack." class=" btn-unit-zerg-ultralisk-png"></div>
+            <div class="f {{'unacquired' if inventory[2009] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ultralisk&#10;Massive melee attacker. Has an area-damage cleave attack." class=" btn-unit-zerg-ultralisk-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2240] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anabolic Synthesis (Ultralisk)&#10;Ultralisks gain increased movement speed." class=" btn-upgrade-zerg-anabolicsynthesis-png"></div>
-            <div class="f {{'unacquired' if inventory[2218] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Burrow Charge (Ultralisk)&#10;Allows Ultralisks to burrow and charge at enemy units, knocking back and stunning units when it emerges." class=" btn-upgrade-zerg-burrowcharge-png"></div>
-            <div class="f {{'unacquired' if inventory[2241] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chitinous Plating (Ultralisk)&#10;Ultralisks gain +2 armor." class=" btn-upgrade-zerg-chitinousplating-png"></div>
-            <div class="f {{'unacquired' if inventory[2220] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Monarch Blades (Ultralisk)&#10;Ultralisks gain increased splash damage." class=" btn-upgrade-zerg-monarchblades-png"></div>
-            <div class="f {{'unacquired' if inventory[2312] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Noxious Strain (Ultralisk)&#10;Ultralisks will periodically spread poison, damaging nearby biological enemies." class=" btn-unit-zerg-ultralisk-noxious-png"></div>
-            <div class="f {{'unacquired' if inventory[2242] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Organic Carapace (Ultralisk)&#10;Ultralisks gain +100 life." class=" btn-upgrade-zerg-organiccarapace-png"></div>
-            <div class="f {{'unacquired' if inventory[2243] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Ultralisk)&#10;Reduces Ultralisk cost by 100 minerals and 2 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2219] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tissue Assimilation (Ultralisk)&#10;Ultralisks recover health when they deal damage." class=" btn-upgrade-zerg-tissueassimilation-png"></div>
-            <div class="f {{'unacquired' if inventory[2313] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Torrasque Strain (Ultralisk)&#10;Ultralisks will revive after being killed." class=" btn-unit-zerg-ultralisk-torrasque-png"></div>
+            <div class="f {{'unacquired' if inventory[2240] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anabolic Synthesis (Ultralisk)&#10;Ultralisks gain increased movement speed." class=" btn-upgrade-zerg-anabolicsynthesis-png"></div>
+            <div class="f {{'unacquired' if inventory[2218] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Burrow Charge (Ultralisk)&#10;Allows Ultralisks to burrow and charge at enemy units, knocking back and stunning units when it emerges." class=" btn-upgrade-zerg-burrowcharge-png"></div>
+            <div class="f {{'unacquired' if inventory[2241] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chitinous Plating (Ultralisk)&#10;Ultralisks gain +2 armor." class=" btn-upgrade-zerg-chitinousplating-png"></div>
+            <div class="f {{'unacquired' if inventory[2220] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Monarch Blades (Ultralisk)&#10;Ultralisks gain increased splash damage." class=" btn-upgrade-zerg-monarchblades-png"></div>
+            <div class="f {{'unacquired' if inventory[2312] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Noxious Strain (Ultralisk)&#10;Ultralisks will periodically spread poison, damaging nearby biological enemies." class=" btn-unit-zerg-ultralisk-noxious-png"></div>
+            <div class="f {{'unacquired' if inventory[2242] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Organic Carapace (Ultralisk)&#10;Ultralisks gain +100 life." class=" btn-upgrade-zerg-organiccarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2243] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Ultralisk)&#10;Reduces Ultralisk cost by 100 minerals and 2 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2219] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tissue Assimilation (Ultralisk)&#10;Ultralisks recover health when they deal damage." class=" btn-upgrade-zerg-tissueassimilation-png"></div>
+            <div class="f {{'unacquired' if inventory[2313] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Torrasque Strain (Ultralisk)&#10;Ultralisks will revive after being killed." class=" btn-unit-zerg-ultralisk-torrasque-png"></div>
           </div>
         </div>
         <div id="class-defiler" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2015] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Defiler&#10;Support caster. Can use the Dark Swarm, Consume, and Plague abilities." class=" btn-unit-zerg-defilerscbw-png"></div>
+            <div class="f {{'unacquired' if inventory[2015] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Defiler&#10;Support caster. Can use the Dark Swarm, Consume, and Plague abilities." class=" btn-unit-zerg-defilerscbw-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2280] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Comorbidity (Defiler)&#10;Plague now stacks up to three times, and depletes energy as well as health." class=" btn-upgrade-zerg-dehaka-tenderize-png"></div>
-            <div class="f {{'unacquired' if inventory[2277] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pathogen Projectors (Defiler)&#10;Defilers gain +4 cast range for Dark Swarm and Plague." class=" btn-upgrade-zagara-increasebilelauncherrange-png"></div>
-            <div class="f {{'unacquired' if inventory[2279] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Predatory Consumption (Defiler)&#10;Defilers can now use Consume on any non-heroic biological unit, not just friendly Zerg." class=" btn-progression-zerg-dehaka-15-genemutation-png"></div>
-            <div class="f {{'unacquired' if inventory[2278] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Trapdoor Adaptation (Defiler)&#10;Defilers can now use abilities while burrowed." class=" btn-upgrade-zerg-burrowmove-png"></div>
+            <div class="f {{'unacquired' if inventory[2280] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Comorbidity (Defiler)&#10;Plague now stacks up to three times, and depletes energy as well as health." class=" btn-upgrade-zerg-dehaka-tenderize-png"></div>
+            <div class="f {{'unacquired' if inventory[2277] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pathogen Projectors (Defiler)&#10;Defilers gain +4 cast range for Dark Swarm and Plague." class=" btn-upgrade-zagara-increasebilelauncherrange-png"></div>
+            <div class="f {{'unacquired' if inventory[2279] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Predatory Consumption (Defiler)&#10;Defilers can now use Consume on any non-heroic biological unit, not just friendly Zerg." class=" btn-progression-zerg-dehaka-15-genemutation-png"></div>
+            <div class="f {{'unacquired' if inventory[2278] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Trapdoor Adaptation (Defiler)&#10;Defilers can now use abilities while burrowed." class=" btn-upgrade-zerg-burrowmove-png"></div>
           </div>
         </div>
         <div id="class-pygalisk" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2025] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pygalisk&#10;Miniature melee attacker." class=" btn-unit-zerg-ultralisk-rcz-png"></div>
+            <div class="f {{'unacquired' if inventory[2025] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pygalisk&#10;Miniature melee attacker." class=" btn-unit-zerg-ultralisk-rcz-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2384] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Combat Carapace (Pygalisk)&#10;Increases Pygalisk health by +25." class=" btn-upgrade-stetmann-mechachitinousplating-png"></div>
-            <div class="f {{'unacquired' if inventory[2383] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ducal Blades (Pygalisk)&#10;Pygalisks do splash damage." class=" btn-ability-zerg-dehaka-ultralisk-brutalcharge-png"></div>
-            <div class="f {{'unacquired' if inventory[2382] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stimpack (Pygalisk)&#10;Pygalisks gain the Stimpack ability, &#10;which temporarily increases movement and attack speed at the cost of 10 health." class=" btn-ability-terran-stimpack-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2384] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Combat Carapace (Pygalisk)&#10;Increases Pygalisk health by +25." class=" btn-upgrade-stetmann-mechachitinousplating-png"></div>
+            <div class="f {{'unacquired' if inventory[2383] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ducal Blades (Pygalisk)&#10;Pygalisks do splash damage." class=" btn-ability-zerg-dehaka-ultralisk-brutalcharge-png"></div>
+            <div class="f {{'unacquired' if inventory[2382] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stimpack (Pygalisk)&#10;Pygalisks gain the Stimpack ability, &#10;which temporarily increases movement and attack speed at the cost of 10 health." class=" btn-ability-terran-stimpack-color-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1005,47 +1005,47 @@
         </div>
         <div id="class-mutalisk" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2006] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mutalisk&#10;Fragile flying attacker. Attacks bounce between targets." class=" btn-unit-zerg-mutalisk-png"></div>
+            <div class="f {{'unacquired' if inventory[2006] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mutalisk&#10;Fragile flying attacker. Attacks bounce between targets." class=" btn-unit-zerg-mutalisk-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2235] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Aerodynamic Glaive Shape (Mutalisk)&#10;Increases the attack range of Mutalisks by 2." class=" btn-ability-dehaka-airbonusdamage-png"></div>
-            <div class="f {{'unacquired' if inventory[2213] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Regeneration (Mutalisk)&#10;Mutalisks will regenerate quickly when out of combat." class=" btn-upgrade-zerg-rapidregeneration-png"></div>
-            <div class="f {{'unacquired' if inventory[2234] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Severing Glaive (Mutalisk)&#10;Mutalisk bounce attacks will deal full damage." class=" btn-upgrade-zerg-explosiveglaive-png"></div>
-            <div class="f {{'unacquired' if inventory[2214] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sundering Glaive (Mutalisk)&#10;Mutalisks deal increased damage to their primary target." class=" btn-upgrade-zerg-explosiveglaive-png"></div>
-            <div class="f {{'unacquired' if inventory[2212] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vicious Glaive (Mutalisk)&#10;Mutalisks attacks will bounce an additional 3 times." class=" btn-upgrade-zerg-viciousglaive-png"></div>
+            <div class="f {{'unacquired' if inventory[2235] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Aerodynamic Glaive Shape (Mutalisk)&#10;Increases the attack range of Mutalisks by 2." class=" btn-ability-dehaka-airbonusdamage-png"></div>
+            <div class="f {{'unacquired' if inventory[2213] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Regeneration (Mutalisk)&#10;Mutalisks will regenerate quickly when out of combat." class=" btn-upgrade-zerg-rapidregeneration-png"></div>
+            <div class="f {{'unacquired' if inventory[2234] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Severing Glaive (Mutalisk)&#10;Mutalisk bounce attacks will deal full damage." class=" btn-upgrade-zerg-explosiveglaive-png"></div>
+            <div class="f {{'unacquired' if inventory[2214] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sundering Glaive (Mutalisk)&#10;Mutalisks deal increased damage to their primary target." class=" btn-upgrade-zerg-explosiveglaive-png"></div>
+            <div class="f {{'unacquired' if inventory[2212] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vicious Glaive (Mutalisk)&#10;Mutalisks attacks will bounce an additional 3 times." class=" btn-upgrade-zerg-viciousglaive-png"></div>
           </div>
         </div>
         <div id="class-corruptor" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2012] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corruptor&#10;Anti-air flying attacker specializing in taking down enemy capital ships." class=" btn-unit-zerg-corruptor-png"></div>
+            <div class="f {{'unacquired' if inventory[2012] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corruptor&#10;Anti-air flying attacker specializing in taking down enemy capital ships." class=" btn-unit-zerg-corruptor-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2221] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Caustic Spray (Corruptor)&#10;Allows Corruptors to use the Caustic Spray ability, which deals ramping damage to buildings over time." class=" btn-ability-zerg-causticspray-png"></div>
-            <div class="f {{'unacquired' if inventory[2287] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Construct Regeneration (Corruptor)&#10;Corruptors gain increased life regeneration." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
-            <div class="f {{'unacquired' if inventory[2222] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corruption (Corruptor)&#10;Allows Corruptors to use the Corruption ability, which causes a target enemy unit to take increased damage." class=" btn-ability-zerg-corruption-color-png"></div>
-            <div class="f {{'unacquired' if inventory[2286] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Monstrous Resilience (Corruptor)&#10;Corruptors gain +100 life." class=" btn-monstrous-resilience-corruptor-png"></div>
-            <div class="f {{'unacquired' if inventory[2289] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Corruptor)&#10;Reduces Corruptor cost by 50 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2288] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scourge Incubation (Corruptor)&#10;Corruptors spawn 2 Scourge upon death (3 with Swarm Scourge)." class=" btn-unit-zerg-scourge-png"></div>
+            <div class="f {{'unacquired' if inventory[2221] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Caustic Spray (Corruptor)&#10;Allows Corruptors to use the Caustic Spray ability, which deals ramping damage to buildings over time." class=" btn-ability-zerg-causticspray-png"></div>
+            <div class="f {{'unacquired' if inventory[2287] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Construct Regeneration (Corruptor)&#10;Corruptors gain increased life regeneration." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
+            <div class="f {{'unacquired' if inventory[2222] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corruption (Corruptor)&#10;Allows Corruptors to use the Corruption ability, which causes a target enemy unit to take increased damage." class=" btn-ability-zerg-corruption-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2286] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Monstrous Resilience (Corruptor)&#10;Corruptors gain +100 life." class=" btn-monstrous-resilience-corruptor-png"></div>
+            <div class="f {{'unacquired' if inventory[2289] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Corruptor)&#10;Reduces Corruptor cost by 50 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2288] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scourge Incubation (Corruptor)&#10;Corruptors spawn 2 Scourge upon death (3 with Swarm Scourge)." class=" btn-unit-zerg-scourge-png"></div>
           </div>
         </div>
         <div id="class-scourge" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2013] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scourge&#10;Flying anti-air suicide unit. Hatches in pairs from a single larva." class=" btn-unit-zerg-scourge-png"></div>
+            <div class="f {{'unacquired' if inventory[2013] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scourge&#10;Flying anti-air suicide unit. Hatches in pairs from a single larva." class=" btn-unit-zerg-scourge-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2224] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Scourge)&#10;Reduces Scourge cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2225] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Swarm Scourge (Scourge)&#10;An extra Scourge will be built from each egg at no additional cost." class=" btn-upgrade-custom-triple-scourge-png"></div>
-            <div class="f {{'unacquired' if inventory[2223] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Virulent Spores (Scourge)&#10;Scourge will deal splash damage." class=" btn-upgrade-zagara-scourgesplashdamage-png"></div>
+            <div class="f {{'unacquired' if inventory[2224] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Scourge)&#10;Reduces Scourge cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2225] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Swarm Scourge (Scourge)&#10;An extra Scourge will be built from each egg at no additional cost." class=" btn-upgrade-custom-triple-scourge-png"></div>
+            <div class="f {{'unacquired' if inventory[2223] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Virulent Spores (Scourge)&#10;Scourge will deal splash damage." class=" btn-upgrade-zagara-scourgesplashdamage-png"></div>
           </div>
         </div>
         <div id="class-brood-queen" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2014] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Brood Queen&#10;Flying support caster. Can cast the Ocular Symbiote and Spawn Broodlings abilities." class=" btn-unit-zerg-classicqueen-png"></div>
+            <div class="f {{'unacquired' if inventory[2014] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Brood Queen&#10;Flying support caster. Can cast the Ocular Symbiote and Spawn Broodlings abilities." class=" btn-unit-zerg-classicqueen-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2276] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enhanced Mitochondria (Brood Queen)&#10;Brood Queens start with maximum energy and gain increased energy regeneration. Like powerhouses (of the cell)." class=" btn-upgrade-zerg-stukov-queenenergyregen-png"></div>
-            <div class="f {{'unacquired' if inventory[2275] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ensnare (Brood Queen)&#10;Brood Queens gain the Ensnare ability." class=" btn-ability-zerg-fungalgrowth-color-png"></div>
-            <div class="f {{'unacquired' if inventory[2274] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fungal Growth (Brood Queen)&#10;Brood Queens gain the Fungal Growth ability." class=" btn-upgrade-zerg-stukov-researchqueenfungalgrowth-png"></div>
+            <div class="f {{'unacquired' if inventory[2276] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enhanced Mitochondria (Brood Queen)&#10;Brood Queens start with maximum energy and gain increased energy regeneration. Like powerhouses (of the cell)." class=" btn-upgrade-zerg-stukov-queenenergyregen-png"></div>
+            <div class="f {{'unacquired' if inventory[2275] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ensnare (Brood Queen)&#10;Brood Queens gain the Ensnare ability." class=" btn-ability-zerg-fungalgrowth-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2274] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fungal Growth (Brood Queen)&#10;Brood Queens gain the Fungal Growth ability." class=" btn-upgrade-zerg-stukov-researchqueenfungalgrowth-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1053,116 +1053,116 @@
         </div>
         <div id="class-baneling" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2004] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Baneling&#10;Anti-ground suicide unit. Does damage over a small area on death. Morphed from the Zergling." class=" btn-unit-zerg-baneling-png"></div>
+            <div class="f {{'unacquired' if inventory[2004] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Baneling&#10;Anti-ground suicide unit. Does damage over a small area on death. Morphed from the Zergling." class=" btn-unit-zerg-baneling-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2231] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Centrifugal Hooks (Baneling)&#10;Increases the movement speed of Banelings." class=" btn-upgrade-zerg-centrifugalhooks-png"></div>
-            <div class="f {{'unacquired' if inventory[2209] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corrosive Acid (Baneling)&#10;Increases the damage banelings deal to their primary target. Splash damage remains the same." class=" btn-upgrade-zerg-corrosiveacid-png"></div>
-            <div class="f {{'unacquired' if inventory[2307] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hunter Strain (Baneling)&#10;Allows Banelings to jump up and down cliffs and leap onto enemies." class=" btn-unit-zerg-baneling-hunter-png"></div>
-            <div class="f {{'unacquired' if inventory[2233] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Metamorph (Baneling)&#10;Banelings morph faster and no longer cost vespene gas to morph." class=" btn-rapid-metamorph-png"></div>
-            <div class="f {{'unacquired' if inventory[2211] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Regenerative Acid (Baneling)&#10;Banelings will heal nearby friendly units when they explode." class=" btn-upgrade-zerg-regenerativebile-png"></div>
-            <div class="f {{'unacquired' if inventory[2210] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rupture (Baneling)&#10;Increases the splash radius of baneling attacks." class=" btn-upgrade-zerg-rupture-png"></div>
-            <div class="f {{'unacquired' if inventory[2306] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Splitter Strain (Baneling)&#10;Banelings will split into two smaller Splitterlings on exploding." class=" talent-zagara-level14-unlocksplitterling-png"></div>
-            <div class="f {{'unacquired' if inventory[2232] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tunneling Jaws (Baneling)&#10;Allows Banelings to move while burrowed." class=" btn-upgrade-zerg-tunnelingjaws-png"></div>
+            <div class="f {{'unacquired' if inventory[2231] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Centrifugal Hooks (Baneling)&#10;Increases the movement speed of Banelings." class=" btn-upgrade-zerg-centrifugalhooks-png"></div>
+            <div class="f {{'unacquired' if inventory[2209] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corrosive Acid (Baneling)&#10;Increases the damage banelings deal to their primary target. Splash damage remains the same." class=" btn-upgrade-zerg-corrosiveacid-png"></div>
+            <div class="f {{'unacquired' if inventory[2307] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hunter Strain (Baneling)&#10;Allows Banelings to jump up and down cliffs and leap onto enemies." class=" btn-unit-zerg-baneling-hunter-png"></div>
+            <div class="f {{'unacquired' if inventory[2233] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Metamorph (Baneling)&#10;Banelings morph faster and no longer cost vespene gas to morph." class=" btn-rapid-metamorph-png"></div>
+            <div class="f {{'unacquired' if inventory[2211] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Regenerative Acid (Baneling)&#10;Banelings will heal nearby friendly units when they explode." class=" btn-upgrade-zerg-regenerativebile-png"></div>
+            <div class="f {{'unacquired' if inventory[2210] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rupture (Baneling)&#10;Increases the splash radius of baneling attacks." class=" btn-upgrade-zerg-rupture-png"></div>
+            <div class="f {{'unacquired' if inventory[2306] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Splitter Strain (Baneling)&#10;Banelings will split into two smaller Splitterlings on exploding." class=" talent-zagara-level14-unlocksplitterling-png"></div>
+            <div class="f {{'unacquired' if inventory[2232] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tunneling Jaws (Baneling)&#10;Allows Banelings to move while burrowed." class=" btn-upgrade-zerg-tunnelingjaws-png"></div>
           </div>
         </div>
         <div id="class-impaler" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2304] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Impaler&#10;Allows Hydralisks to morph into Impalers." class=" btn-unit-zerg-impaler-png"></div>
+            <div class="f {{'unacquired' if inventory[2304] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Impaler&#10;Allows Hydralisks to morph into Impalers." class=" btn-unit-zerg-impaler-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2251] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adaptive Talons (Impaler)&#10;Impalers burrow faster." class=" btn-upgrade-zerg-adaptivetalons-png"></div>
-            <div class="f {{'unacquired' if inventory[2252] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Secretion Glands (Impaler)&#10;Impalers generate creep while standing still or burrowed." class=" btn-ability-zerg-creepspread-png"></div>
-            <div class="f {{'unacquired' if inventory[2253] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sunken Spines (Impaler)&#10;Impalers deal increased damage." class=" btn-ability-zerg-dehaka-impaler-tenderize-png"></div>
+            <div class="f {{'unacquired' if inventory[2251] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adaptive Talons (Impaler)&#10;Impalers burrow faster." class=" btn-upgrade-zerg-adaptivetalons-png"></div>
+            <div class="f {{'unacquired' if inventory[2252] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Secretion Glands (Impaler)&#10;Impalers generate creep while standing still or burrowed." class=" btn-ability-zerg-creepspread-png"></div>
+            <div class="f {{'unacquired' if inventory[2253] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sunken Spines (Impaler)&#10;Impalers deal increased damage." class=" btn-ability-zerg-dehaka-impaler-tenderize-png"></div>
           </div>
         </div>
         <div id="class-lurker" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2305] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Lurker&#10;Allows Hydralisks to morph into Lurkers." class=" btn-unit-zerg-lurker-png"></div>
+            <div class="f {{'unacquired' if inventory[2305] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Lurker&#10;Allows Hydralisks to morph into Lurkers." class=" btn-unit-zerg-lurker-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2255] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adapted Spines (Lurker)&#10;Lurkers deal increased damage to non-light targets." class=" btn-upgrade-zerg-groovedspines-png"></div>
-            <div class="f {{'unacquired' if inventory[2254] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Seismic Spines (Lurker)&#10;Lurkers gain +6 range." class=" btn-upgrade-kerrigan-seismicspines-png"></div>
+            <div class="f {{'unacquired' if inventory[2255] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adapted Spines (Lurker)&#10;Lurkers deal increased damage to non-light targets." class=" btn-upgrade-zerg-groovedspines-png"></div>
+            <div class="f {{'unacquired' if inventory[2254] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Seismic Spines (Lurker)&#10;Lurkers gain +6 range." class=" btn-upgrade-kerrigan-seismicspines-png"></div>
           </div>
         </div>
         <div id="class-brood-lord" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2308] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Brood Lord&#10;Allows Mutalisks and Corruptors to morph into Brood Lords." class=" btn-unit-zerg-broodlord-png"></div>
+            <div class="f {{'unacquired' if inventory[2308] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Brood Lord&#10;Allows Mutalisks and Corruptors to morph into Brood Lords." class=" btn-unit-zerg-broodlord-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2263] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Behemoth Stellarskin (Brood Lord)&#10;Brood Lords gain +100 life and +1 armor." class=" btn-behemoth-stellarskin-png"></div>
-            <div class="f {{'unacquired' if inventory[2262] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Porous Cartilage (Brood Lord)&#10;Brood Lords gain increased movement speed." class=" btn-upgrade-kerrigan-broodlordspeed-png"></div>
-            <div class="f {{'unacquired' if inventory[2265] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Brood Lord)&#10;Reduces Brood Lord cost by 75 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2264] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Splitter Mitosis (Brood Lord)&#10;Brood Lord attacks spawn twice as many broodlings." class=" abilityicon_spawnbroodlings_square-png"></div>
+            <div class="f {{'unacquired' if inventory[2263] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Behemoth Stellarskin (Brood Lord)&#10;Brood Lords gain +100 life and +1 armor." class=" btn-behemoth-stellarskin-png"></div>
+            <div class="f {{'unacquired' if inventory[2262] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Porous Cartilage (Brood Lord)&#10;Brood Lords gain increased movement speed." class=" btn-upgrade-kerrigan-broodlordspeed-png"></div>
+            <div class="f {{'unacquired' if inventory[2265] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Brood Lord)&#10;Reduces Brood Lord cost by 75 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2264] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Splitter Mitosis (Brood Lord)&#10;Brood Lord attacks spawn twice as many broodlings." class=" abilityicon_spawnbroodlings_square-png"></div>
           </div>
         </div>
         <div id="class-viper" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2309] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Viper&#10;Allows Mutalisks and Corruptors to morph into Vipers." class=" btn-unit-zerg-viper-png"></div>
+            <div class="f {{'unacquired' if inventory[2309] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Viper&#10;Allows Mutalisks and Corruptors to morph into Vipers." class=" btn-unit-zerg-viper-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2260] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Paralytic Barbs (Viper)&#10;Viper Abduct stuns units for an additional 5 seconds." class=" btn-upgrade-zerg-abathur-abduct-png"></div>
-            <div class="f {{'unacquired' if inventory[2259] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Parasitic Bomb (Viper)&#10;Vipers gain the Parasitic Bomb ability, &#10;which inflicts an area-damaging effect on an enemy air unit." class=" btn-ability-zerg-parasiticbomb-png"></div>
-            <div class="f {{'unacquired' if inventory[2261] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Virulent Microbes (Viper)&#10;All Viper abilities gain +4 range." class=" btn-upgrade-zerg-abathur-castrange-png"></div>
+            <div class="f {{'unacquired' if inventory[2260] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Paralytic Barbs (Viper)&#10;Viper Abduct stuns units for an additional 5 seconds." class=" btn-upgrade-zerg-abathur-abduct-png"></div>
+            <div class="f {{'unacquired' if inventory[2259] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Parasitic Bomb (Viper)&#10;Vipers gain the Parasitic Bomb ability, &#10;which inflicts an area-damaging effect on an enemy air unit." class=" btn-ability-zerg-parasiticbomb-png"></div>
+            <div class="f {{'unacquired' if inventory[2261] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Virulent Microbes (Viper)&#10;All Viper abilities gain +4 range." class=" btn-upgrade-zerg-abathur-castrange-png"></div>
           </div>
         </div>
         <div id="class-guardian" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2800] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Guardian&#10;Long-range anti-ground flyer. Can attack ground units. Morphed from the Mutalisk or Corruptor." class=" btn-unit-zerg-primalguardian-png"></div>
+            <div class="f {{'unacquired' if inventory[2800] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Guardian&#10;Long-range anti-ground flyer. Can attack ground units. Morphed from the Mutalisk or Corruptor." class=" btn-unit-zerg-primalguardian-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2369] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Explosive Spores (Guardian)&#10;Allows Guardians to launch an explosive spore at ground targets, dealing damage and knocking them back in an area." class=" btn-ability-zerg-dehaka-guardian-explosivespores-png"></div>
-            <div class="f {{'unacquired' if inventory[2249] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Primal Adaptation (Guardian)&#10;Allows Guardians to attack air units with a decreased attack damage." class=" biomassrecovery_coop-png"></div>
-            <div class="f {{'unacquired' if inventory[2370] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Primordial Fury (Guardian)&#10;Guardians gain increasing attack speed as they attack." class=" btn-ability-zerg-dehaka-guardian-primordialfury-png"></div>
-            <div class="f {{'unacquired' if inventory[2248] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Prolonged Dispersion (Guardian)&#10;Guardians gain +3 range." class=" btn-upgrade-zerg-abathur-prolongeddispersion-png"></div>
-            <div class="f {{'unacquired' if inventory[2368] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Propellant Sacs (Guardian)&#10;Guardians gain increased movement speed." class=" btn-propellant-sacs-png"></div>
-            <div class="f {{'unacquired' if inventory[2250] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Soronan Acid (Guardian)&#10;Guardians deal +10 increased base damage to ground targets." class=" btn-upgrade-zerg-abathur-biomass-png"></div>
+            <div class="f {{'unacquired' if inventory[2369] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Explosive Spores (Guardian)&#10;Allows Guardians to launch an explosive spore at ground targets, dealing damage and knocking them back in an area." class=" btn-ability-zerg-dehaka-guardian-explosivespores-png"></div>
+            <div class="f {{'unacquired' if inventory[2249] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Primal Adaptation (Guardian)&#10;Allows Guardians to attack air units with a decreased attack damage." class=" biomassrecovery_coop-png"></div>
+            <div class="f {{'unacquired' if inventory[2370] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Primordial Fury (Guardian)&#10;Guardians gain increasing attack speed as they attack." class=" btn-ability-zerg-dehaka-guardian-primordialfury-png"></div>
+            <div class="f {{'unacquired' if inventory[2248] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Prolonged Dispersion (Guardian)&#10;Guardians gain +3 range." class=" btn-upgrade-zerg-abathur-prolongeddispersion-png"></div>
+            <div class="f {{'unacquired' if inventory[2368] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Propellant Sacs (Guardian)&#10;Guardians gain increased movement speed." class=" btn-propellant-sacs-png"></div>
+            <div class="f {{'unacquired' if inventory[2250] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Soronan Acid (Guardian)&#10;Guardians deal +10 increased base damage to ground targets." class=" btn-upgrade-zerg-abathur-biomass-png"></div>
           </div>
         </div>
         <div id="class-devourer" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2801] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Devourer&#10;Anti-air flyer. Attack inflict Acid Spores. Can attack air units. Morphed from the Mutalisk or Corruptor." class=" btn-unit-zerg-devourerex3-png"></div>
+            <div class="f {{'unacquired' if inventory[2801] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Devourer&#10;Anti-air flyer. Attack inflict Acid Spores. Can attack air units. Morphed from the Mutalisk or Corruptor." class=" btn-unit-zerg-devourerex3-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2244] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corrosive Spray (Devourer)&#10;Devourer attacks will now deal area damage." class=" btn-upgrade-zerg-abathur-devourer-corrosivespray-png"></div>
-            <div class="f {{'unacquired' if inventory[2245] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Gaping Maw (Devourer)&#10;Devourer's attack speed increased by 25%." class=" btn-gaping-maw-png"></div>
-            <div class="f {{'unacquired' if inventory[2246] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Improved Osmosis (Devourer)&#10;Devourer's Acid Spores duration increased by 50%." class=" btn-improved-osmosis-png"></div>
-            <div class="f {{'unacquired' if inventory[2247] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Prescient Spores (Devourer)&#10;Allows Devourers to attack ground targets." class=" btn-prescient-spores-png"></div>
+            <div class="f {{'unacquired' if inventory[2244] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corrosive Spray (Devourer)&#10;Devourer attacks will now deal area damage." class=" btn-upgrade-zerg-abathur-devourer-corrosivespray-png"></div>
+            <div class="f {{'unacquired' if inventory[2245] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Gaping Maw (Devourer)&#10;Devourer's attack speed increased by 25%." class=" btn-gaping-maw-png"></div>
+            <div class="f {{'unacquired' if inventory[2246] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Improved Osmosis (Devourer)&#10;Devourer's Acid Spores duration increased by 50%." class=" btn-improved-osmosis-png"></div>
+            <div class="f {{'unacquired' if inventory[2247] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Prescient Spores (Devourer)&#10;Allows Devourers to attack ground targets." class=" btn-prescient-spores-png"></div>
           </div>
         </div>
         <div id="class-ravager" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2802] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ravager&#10;Ranged artillery. Can use Corrosive Bile. Can attack ground units. Morphed from the Roach." class=" btn-unit-zerg-ravager-png"></div>
+            <div class="f {{'unacquired' if inventory[2802] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ravager&#10;Ranged artillery. Can use Corrosive Bile. Can attack ground units. Morphed from the Roach." class=" btn-unit-zerg-ravager-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2257] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bloated Bile Ducts (Ravager)&#10;Ravager Corrosive Bile hits a much larger area." class=" btn-ability-zerg-abathur-corrosivebilelarge-png"></div>
-            <div class="f {{'unacquired' if inventory[2258] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Deep Tunnel (Ravager)&#10;Ravagers gain the Deep Tunnel ability, &#10;which allows them to burrow to any visible location on the map." class=" btn-ability-zerg-deeptunnel-png"></div>
-            <div class="f {{'unacquired' if inventory[2256] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Potent Bile (Ravager)&#10;Ravager Corrosive Bile deals an additional +40 damage." class=" potentbile_coop-png"></div>
+            <div class="f {{'unacquired' if inventory[2257] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bloated Bile Ducts (Ravager)&#10;Ravager Corrosive Bile hits a much larger area." class=" btn-ability-zerg-abathur-corrosivebilelarge-png"></div>
+            <div class="f {{'unacquired' if inventory[2258] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Deep Tunnel (Ravager)&#10;Ravagers gain the Deep Tunnel ability, &#10;which allows them to burrow to any visible location on the map." class=" btn-ability-zerg-deeptunnel-png"></div>
+            <div class="f {{'unacquired' if inventory[2256] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Potent Bile (Ravager)&#10;Ravager Corrosive Bile deals an additional +40 damage." class=" potentbile_coop-png"></div>
           </div>
         </div>
         <div id="class-overseer" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2803] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Overseer&#10;Allows Overlords to morph into Overseers. Overseers can use the Spawn Creep Tumor and Contaminate abilities." class=" btn-unit-zerg-overseer-png"></div>
+            <div class="f {{'unacquired' if inventory[2803] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Overseer&#10;Allows Overlords to morph into Overseers. Overseers can use the Spawn Creep Tumor and Contaminate abilities." class=" btn-unit-zerg-overseer-png"></div>
           </div>
         </div>
         <div id="class-primal-igniter" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2804] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Primal Igniter&#10;Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed. Can attack ground units. Morphed by merging two Roaches." class=" btn-unit-collection-primal-roachupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[2804] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Primal Igniter&#10;Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed. Can attack ground units. Morphed by merging two Roaches." class=" btn-unit-collection-primal-roachupgrade-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2290] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concentrated Fire (Primal Igniter)&#10;Primal Igniters deal +15 damage vs light armor." class=" btn-ability-zerg-fireroach-increasefiredamage-png"></div>
-            <div class="f {{'unacquired' if inventory[2291] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Primal Tenacity (Primal Igniter)&#10;Primal Igniters gain +100 health and +1 armor." class=" btn-ability-zerg-genemutation-thornsaura-png"></div>
+            <div class="f {{'unacquired' if inventory[2290] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concentrated Fire (Primal Igniter)&#10;Primal Igniters deal +15 damage vs light armor." class=" btn-ability-zerg-fireroach-increasefiredamage-png"></div>
+            <div class="f {{'unacquired' if inventory[2291] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Primal Tenacity (Primal Igniter)&#10;Primal Igniters gain +100 health and +1 armor." class=" btn-ability-zerg-genemutation-thornsaura-png"></div>
           </div>
         </div>
         <div id="class-tyrannozor" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2805] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tyrannozor&#10;Heavy assault beast. Has a ground-area attack, and powerful anti-air attack. Morphed by merging two Ultralisks." class=" btn-unit-collection-primal-tyrannozor-png"></div>
+            <div class="f {{'unacquired' if inventory[2805] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tyrannozor&#10;Heavy assault beast. Has a ground-area attack, and powerful anti-air attack. Morphed by merging two Ultralisks." class=" btn-unit-collection-primal-tyrannozor-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2351] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Barrage of Spikes (Tyrannozor)&#10;Tyrannozors gain the Barrage of Spikes ability, &#10;which deals 60 damage to enemy ground units around the Tyrannozor." class=" btn-ability-zerg-dehaka-tyrannozor-barrageofspikes-png"></div>
-            <div class="f {{'unacquired' if inventory[2353] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Healing Adaptation (Tyrannozor)&#10;Tyrannozors regenerate life quickly when out of combat." class=" btn-ability-zerg-dehaka-ultralisk-healingadaptation-png"></div>
-            <div class="f {{'unacquired' if inventory[2352] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Impaling Strike (Tyrannozor)&#10;Tyrannozor melee attacks have a 20% chance to stun for 2 seconds." class=" btn-ability-zerg-dehaka-ultralisk-impalingstrike-png"></div>
-            <div class="f {{'unacquired' if inventory[2350] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tyrant's Protection (Tyrannozor)&#10;Tyrannozors grant nearby friendly units 1 armor." class=" btn-ability-zerg-dehaka-tyrannozor-tyrantprotection-png"></div>
+            <div class="f {{'unacquired' if inventory[2351] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Barrage of Spikes (Tyrannozor)&#10;Tyrannozors gain the Barrage of Spikes ability, &#10;which deals 60 damage to enemy ground units around the Tyrannozor." class=" btn-ability-zerg-dehaka-tyrannozor-barrageofspikes-png"></div>
+            <div class="f {{'unacquired' if inventory[2353] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Healing Adaptation (Tyrannozor)&#10;Tyrannozors regenerate life quickly when out of combat." class=" btn-ability-zerg-dehaka-ultralisk-healingadaptation-png"></div>
+            <div class="f {{'unacquired' if inventory[2352] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Impaling Strike (Tyrannozor)&#10;Tyrannozor melee attacks have a 20% chance to stun for 2 seconds." class=" btn-ability-zerg-dehaka-ultralisk-impalingstrike-png"></div>
+            <div class="f {{'unacquired' if inventory[2350] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tyrant's Protection (Tyrannozor)&#10;Tyrannozors grant nearby friendly units 1 armor." class=" btn-ability-zerg-dehaka-tyrannozor-tyrantprotection-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1170,75 +1170,75 @@
         </div>
         <div id="class-infested-marine" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2016] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Marine&#10;General-purpose Infested infantry. Has a timed life of 90 seconds." class=" btn-unit-zerg-infestedmarine-png"></div>
+            <div class="f {{'unacquired' if inventory[2016] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Marine&#10;General-purpose Infested infantry. Has a timed life of 90 seconds." class=" btn-unit-zerg-infestedmarine-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2293] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Plagued Munitions (Infested Marine)&#10;Infested Marines deal an extra 50 damage over 15 seconds to targets they attack." class=" btn-ability-stukov-plaugedmunitions-png"></div>
-            <div class="f {{'unacquired' if inventory[2294] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Retinal Augmentation (Infested Marine)&#10;Infested Marines gain +1 range." class=" btn-upgrade-zerg-stukov-infestedmarinerangeupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[2293] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Plagued Munitions (Infested Marine)&#10;Infested Marines deal an extra 50 damage over 15 seconds to targets they attack." class=" btn-ability-stukov-plaugedmunitions-png"></div>
+            <div class="f {{'unacquired' if inventory[2294] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Retinal Augmentation (Infested Marine)&#10;Infested Marines gain +1 range." class=" btn-upgrade-zerg-stukov-infestedmarinerangeupgrade-png"></div>
           </div>
         </div>
         <div id="class-infested-diamondback" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2021] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Diamondback&#10;Fast, high-damage attacker. Can attack while moving and can bring flying units to the ground." class=" btn-unit-zerg-infesteddiamondback-png"></div>
+            <div class="f {{'unacquired' if inventory[2021] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Diamondback&#10;Fast, high-damage attacker. Can attack while moving and can bring flying units to the ground." class=" btn-unit-zerg-infesteddiamondback-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2362] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Caustic Mucus (Infested Diamondback)&#10;Infested Diamondbacks leave behind a trail of acid when moving that deals 12 damage per second to enemy units." class=" btn-upgrade-zerg-stukov-diamondbacksnailtrail-png"></div>
-            <div class="f {{'unacquired' if inventory[2375] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concentrated Spew (Infested Diamondback)&#10;Infested Diamondbacks gain +2 weapon range. Fungal Snare gains +2 range." class=" btn-upgrade-zerg-concentrated-spew-png"></div>
+            <div class="f {{'unacquired' if inventory[2362] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Caustic Mucus (Infested Diamondback)&#10;Infested Diamondbacks leave behind a trail of acid when moving that deals 12 damage per second to enemy units." class=" btn-upgrade-zerg-stukov-diamondbacksnailtrail-png"></div>
+            <div class="f {{'unacquired' if inventory[2375] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concentrated Spew (Infested Diamondback)&#10;Infested Diamondbacks gain +2 weapon range. Fungal Snare gains +2 range." class=" btn-upgrade-zerg-concentrated-spew-png"></div>
             <div class="progressive lvl-{{[inventory[2374], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fungal Snare (Infested Diamondback) - Level 1&#10;Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporarily ground flying units.&#10;Level 2: Infested Diamondback Fungal Snare ability cooldown reduced by 15 seconds." class=" btn-ability-zerg-stukov-ensnare-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Fungal Snare (Infested Diamondback) - Level 2&#10;Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporarily ground flying units.&#10;Level 2: Infested Diamondback Fungal Snare ability cooldown reduced by 15 seconds." class=" btn-ability-zerg-stukov-ensnarecdr-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fungal Snare (Infested Diamondback) - Level 1&#10;Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporarily ground flying units.&#10;Level 2: Infested Diamondback Fungal Snare ability cooldown reduced by 15 seconds." class=" btn-ability-zerg-stukov-ensnare-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Fungal Snare (Infested Diamondback) - Level 2&#10;Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporarily ground flying units.&#10;Level 2: Infested Diamondback Fungal Snare ability cooldown reduced by 15 seconds." class=" btn-ability-zerg-stukov-ensnarecdr-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[2363] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Violent Enzymes (Infested Diamondback)&#10;Infested Diamondbacks deal an additional +8 damage." class=" btn-ability-mengsk-ghost-pyrokineticimmolation_orange-png"></div>
-            <div class="f {{'unacquired' if inventory[2377] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Diamondback)&#10;Reduces Infested Diamondback cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2363] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Violent Enzymes (Infested Diamondback)&#10;Infested Diamondbacks deal an additional +8 damage." class=" btn-ability-mengsk-ghost-pyrokineticimmolation_orange-png"></div>
+            <div class="f {{'unacquired' if inventory[2377] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Diamondback)&#10;Reduces Infested Diamondback cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-infested-siege-tank" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2020] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Siege Tank&#10;Siege tank. Can uproot itself to provide mobile tank support." class=" btn-unit-zerg-infestedsiegetank-png"></div>
+            <div class="f {{'unacquired' if inventory[2020] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Siege Tank&#10;Siege tank. Can uproot itself to provide mobile tank support." class=" btn-unit-zerg-infestedsiegetank-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2360] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Acidic Enzymes (Infested Siege Tank)&#10;Infested Siege Tanks deal an additional 15 damage to armored units and structures in both modes." class=" btn-upgrade-zerg-stukov-siegetankbonusdamage-png"></div>
-            <div class="f {{'unacquired' if inventory[2373] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Balanced Roots (Infested Siege Tank)&#10;Allows Infested Siege Tanks to attack while moving with their Tentacle weapons." class=" btn-ability-zerg-creepteleport-png"></div>
-            <div class="f {{'unacquired' if inventory[2361] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Deep Tunnel (Infested Siege Tank)&#10;Infested Siege Tanks gain the Deep Tunnel ability, &#10;which allows them to burrow to any visible location on the map covered in creep." class=" btn-ability-zerg-deeptunnel-png"></div>
+            <div class="f {{'unacquired' if inventory[2360] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Acidic Enzymes (Infested Siege Tank)&#10;Infested Siege Tanks deal an additional 15 damage to armored units and structures in both modes." class=" btn-upgrade-zerg-stukov-siegetankbonusdamage-png"></div>
+            <div class="f {{'unacquired' if inventory[2373] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Balanced Roots (Infested Siege Tank)&#10;Allows Infested Siege Tanks to attack while moving with their Tentacle weapons." class=" btn-ability-zerg-creepteleport-png"></div>
+            <div class="f {{'unacquired' if inventory[2361] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Deep Tunnel (Infested Siege Tank)&#10;Infested Siege Tanks gain the Deep Tunnel ability, &#10;which allows them to burrow to any visible location on the map covered in creep." class=" btn-ability-zerg-deeptunnel-png"></div>
             <div class="progressive lvl-{{[inventory[2359], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Automated Mitosis (Infested Siege Tank) - Level 1&#10;Level 1: Infested Siege Tanks generate 1 Volatile Biomass every 30 seconds.&#10;Level 2: Infested Siege Tanks generate 1 Volatile Biomass every 10 seconds." class=" btn-automated-mitosis-lvl1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Automated Mitosis (Infested Siege Tank) - Level 2&#10;Level 1: Infested Siege Tanks generate 1 Volatile Biomass every 30 seconds.&#10;Level 2: Infested Siege Tanks generate 1 Volatile Biomass every 10 seconds." class=" btn-upgrade-zerg-stukov-siegetankammoregen-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Automated Mitosis (Infested Siege Tank) - Level 1&#10;Level 1: Infested Siege Tanks generate 1 Volatile Biomass every 30 seconds.&#10;Level 2: Infested Siege Tanks generate 1 Volatile Biomass every 10 seconds." class=" btn-automated-mitosis-lvl1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Automated Mitosis (Infested Siege Tank) - Level 2&#10;Level 1: Infested Siege Tanks generate 1 Volatile Biomass every 30 seconds.&#10;Level 2: Infested Siege Tanks generate 1 Volatile Biomass every 10 seconds." class=" btn-upgrade-zerg-stukov-siegetankammoregen-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[2371] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Seismic Sonar (Infested Siege Tank)&#10;Infested Siege Tank Tentacle weapon gains +1 range. Volatile Burst weapon gains +3 range." class=" btn-seismic-sonar-png"></div>
-            <div class="f {{'unacquired' if inventory[2376] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Siege Tank)&#10;Reduces Infested Siege Tank cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2371] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Seismic Sonar (Infested Siege Tank)&#10;Infested Siege Tank Tentacle weapon gains +1 range. Volatile Burst weapon gains +3 range." class=" btn-seismic-sonar-png"></div>
+            <div class="f {{'unacquired' if inventory[2376] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Siege Tank)&#10;Reduces Infested Siege Tank cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-infested-banshee" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2022] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Banshee&#10;Tactical-strike aircraft. Can cloak and can be upgraded to burrow." class=" btn-unit-zerg-infestedbanshee-png"></div>
+            <div class="f {{'unacquired' if inventory[2022] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Banshee&#10;Tactical-strike aircraft. Can cloak and can be upgraded to burrow." class=" btn-unit-zerg-infestedbanshee-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2364] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Braced Exoskeleton (Infested Banshee)&#10;Infested Banshees gain +100 life." class=" btn-upgrade-zerg-stukov-bansheemorelife-png"></div>
-            <div class="f {{'unacquired' if inventory[2372] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fleshfused Targeting Optics (Infested Banshee)&#10;Infested Banshees gain +2 range while cloaked." class=" btn-fleshfused-targeting-optics-png"></div>
-            <div class="f {{'unacquired' if inventory[2365] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Hibernation (Infested Banshee)&#10;Infested Banshees regenerate 20 life and energy per second while burrowed." class=" btn-upgrade-zerg-stukov-bansheeburrowregeneration-png"></div>
-            <div class="f {{'unacquired' if inventory[2378] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Banshee)&#10;Reduces Infested Banshee cost by 25 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2364] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Braced Exoskeleton (Infested Banshee)&#10;Infested Banshees gain +100 life." class=" btn-upgrade-zerg-stukov-bansheemorelife-png"></div>
+            <div class="f {{'unacquired' if inventory[2372] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fleshfused Targeting Optics (Infested Banshee)&#10;Infested Banshees gain +2 range while cloaked." class=" btn-fleshfused-targeting-optics-png"></div>
+            <div class="f {{'unacquired' if inventory[2365] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Hibernation (Infested Banshee)&#10;Infested Banshees regenerate 20 life and energy per second while burrowed." class=" btn-upgrade-zerg-stukov-bansheeburrowregeneration-png"></div>
+            <div class="f {{'unacquired' if inventory[2378] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Banshee)&#10;Reduces Infested Banshee cost by 25 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-infested-liberator" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2023] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Liberator&#10;Anti-Air flying attacker. Attacks deal high area-damage." class=" btn-unit-zerg-infestedliberator-png"></div>
+            <div class="f {{'unacquired' if inventory[2023] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Liberator&#10;Anti-Air flying attacker. Attacks deal high area-damage." class=" btn-unit-zerg-infestedliberator-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2366] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cloud Dispersal (Infested Liberator)&#10;Infested Liberators instantly transform into a cloud of microscopic organisms while attacking, reducing the damage they take by 85%." class=" btn-upgrade-zerg-stukov-infestedliberatorswarmcloud-png"></div>
-            <div class="f {{'unacquired' if inventory[2380] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Defender Mode (Infested Liberator)&#10;Allows Infested Liberators to deploy into Defender Mode to attack ground units. Weapon knocks back the attack target and damages units behind it." class=" btn-infested-liberator-ag-png"></div>
-            <div class="f {{'unacquired' if inventory[2367] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Viral Contamination (Infested Liberator)&#10;Increases the damage Infested Liberators deal to their primary target by 100%." class=" btn-upgrade-zerg-stukov-infestedliberatoraoe-png"></div>
-            <div class="f {{'unacquired' if inventory[2379] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Liberator)&#10;Reduces Infested Liberator cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2366] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cloud Dispersal (Infested Liberator)&#10;Infested Liberators instantly transform into a cloud of microscopic organisms while attacking, reducing the damage they take by 85%." class=" btn-upgrade-zerg-stukov-infestedliberatorswarmcloud-png"></div>
+            <div class="f {{'unacquired' if inventory[2380] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Defender Mode (Infested Liberator)&#10;Allows Infested Liberators to deploy into Defender Mode to attack ground units. Weapon knocks back the attack target and damages units behind it." class=" btn-infested-liberator-ag-png"></div>
+            <div class="f {{'unacquired' if inventory[2367] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Viral Contamination (Infested Liberator)&#10;Increases the damage Infested Liberators deal to their primary target by 100%." class=" btn-upgrade-zerg-stukov-infestedliberatoraoe-png"></div>
+            <div class="f {{'unacquired' if inventory[2379] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Frightful Fleshwelder (Infested Liberator)&#10;Reduces Infested Liberator cost by 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-bullfrog" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2027] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bullfrog&#10;Grounded transport. Launches itself through the air, dealing damage and unloading cargo on impact." class=" btn-unit-zerg-bullfrog-png"></div>
+            <div class="f {{'unacquired' if inventory[2027] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bullfrog&#10;Grounded transport. Launches itself through the air, dealing damage and unloading cargo on impact." class=" btn-unit-zerg-bullfrog-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2388] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Suffused With Vermin (Bullfrog)&#10;Bullfrogs spawn two broodlings on impact, in addition to unloading their cargo." class=" btn-upgrade-zerg-stukov-infestedspawnbroodling-png"></div>
-            <div class="f {{'unacquired' if inventory[2389] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Lethal Impact (Bullfrog)&#10;Bullfrogs deal more damage and stun longer on impact." class=" btn-ability-mengsk-ghost-tacticalmissilestrike-png"></div>
-            <div class="f {{'unacquired' if inventory[2390] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Catalytic Boosters (Bullfrog)&#10;Bullfrog leap gains +4 range, and unload-leap gains +6 range." class=" btn-ability-mengsk-medivac-igniteafterburners-png"></div>
-            <div class="f {{'unacquired' if inventory[2387] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mutagen Vents (Bullfrog)&#10;Bullfrogs grant themselves and their cargo temporary health and an attack speed boost on impact." class=" btn-ability-zerg-dehaka-essencecollector-png"></div>
+            <div class="f {{'unacquired' if inventory[2388] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Suffused With Vermin (Bullfrog)&#10;Bullfrogs spawn two broodlings on impact, in addition to unloading their cargo." class=" btn-upgrade-zerg-stukov-infestedspawnbroodling-png"></div>
+            <div class="f {{'unacquired' if inventory[2389] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Lethal Impact (Bullfrog)&#10;Bullfrogs deal more damage and stun longer on impact." class=" btn-ability-mengsk-ghost-tacticalmissilestrike-png"></div>
+            <div class="f {{'unacquired' if inventory[2390] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Catalytic Boosters (Bullfrog)&#10;Bullfrog leap gains +4 range, and unload-leap gains +6 range." class=" btn-ability-mengsk-medivac-igniteafterburners-png"></div>
+            <div class="f {{'unacquired' if inventory[2387] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mutagen Vents (Bullfrog)&#10;Bullfrogs grant themselves and their cargo temporary health and an attack speed boost on impact." class=" btn-ability-zerg-dehaka-essencecollector-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1246,59 +1246,59 @@
         </div>
         <div id="class-spine-crawler" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2011] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spine Crawler&#10;Anti-ground defensive structure. Can uproot to reposition itself." class=" btn-building-zerg-spinecrawler-png"></div>
+            <div class="f {{'unacquired' if inventory[2011] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spine Crawler&#10;Anti-ground defensive structure. Can uproot to reposition itself." class=" btn-building-zerg-spinecrawler-png"></div>
           </div>
         </div>
         <div id="class-spore-crawler" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2010] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spore Crawler&#10;Anti-air defensive structure. Detects cloaked units and can uproot." class=" btn-building-zerg-sporecrawler-png"></div>
+            <div class="f {{'unacquired' if inventory[2010] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spore Crawler&#10;Anti-air defensive structure. Detects cloaked units and can uproot." class=" btn-building-zerg-sporecrawler-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2391] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Caustic Enzymes (Spore Crawler)&#10;Spore Crawler gain +30 bonus damage against biological units." class=" btn-ability-zerg-acidspores-png"></div>
+            <div class="f {{'unacquired' if inventory[2391] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Caustic Enzymes (Spore Crawler)&#10;Spore Crawler gain +30 bonus damage against biological units." class=" btn-ability-zerg-acidspores-png"></div>
           </div>
         </div>
         <div id="class-bile-launcher" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2026] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bile Launcher&#10;Long-range anti-ground bombardment structure." class=" btn-building-zerg-sporecannon-png"></div>
+            <div class="f {{'unacquired' if inventory[2026] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bile Launcher&#10;Long-range anti-ground bombardment structure." class=" btn-building-zerg-sporecannon-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2385] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Artillery Ducts (Bile Launcher)&#10;Increases Bile Launcher range by +8." class=" btn-upgrade-zagara-increasebilelauncherrange-png"></div>
-            <div class="f {{'unacquired' if inventory[2386] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Bombardment (Bile Launcher)&#10;Bile Launchers attack 40% faster." class=" btn-upgrade-zerg-demolition-png"></div>
+            <div class="f {{'unacquired' if inventory[2385] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Artillery Ducts (Bile Launcher)&#10;Increases Bile Launcher range by +8." class=" btn-upgrade-zagara-increasebilelauncherrange-png"></div>
+            <div class="f {{'unacquired' if inventory[2386] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Bombardment (Bile Launcher)&#10;Bile Launchers attack 40% faster." class=" btn-upgrade-zerg-demolition-png"></div>
           </div>
         </div>
         <div id="class-infested-bunker" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2017] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Bunker&#10;Defensive structure. Periodically spawns Infested infantry that fight from inside. Acts as a mobile ground transport while uprooted." class=" btn-building-stukov-infestedbunker-png"></div>
+            <div class="f {{'unacquired' if inventory[2017] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Bunker&#10;Defensive structure. Periodically spawns Infested infantry that fight from inside. Acts as a mobile ground transport while uprooted." class=" btn-building-stukov-infestedbunker-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2295] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Calcified Armor (Infested Bunker)&#10;Infested Bunkers gain +3 armor." class=" btn-upgrade-zerg-stukov-infestedbunkermorelife-png"></div>
-            <div class="f {{'unacquired' if inventory[2297] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Engorged Bunkers (Infested Bunker)&#10;Infested Bunkers gain +2 cargo slots. Infested Trooper spawn cooldown is reduced by 20%." class=" btn-upgrade-zerg-stukov-bunkerupgradeii_14-png"></div>
-            <div class="f {{'unacquired' if inventory[2296] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Regenerative Plating (Infested Bunker)&#10;Infested Bunkers gain increased life regeneration while rooted." class=" btn-upgrade-zerg-stukov-bunkerformliferegenupgraded-png"></div>
+            <div class="f {{'unacquired' if inventory[2295] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Calcified Armor (Infested Bunker)&#10;Infested Bunkers gain +3 armor." class=" btn-upgrade-zerg-stukov-infestedbunkermorelife-png"></div>
+            <div class="f {{'unacquired' if inventory[2297] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Engorged Bunkers (Infested Bunker)&#10;Infested Bunkers gain +2 cargo slots. Infested Trooper spawn cooldown is reduced by 20%." class=" btn-upgrade-zerg-stukov-bunkerupgradeii_14-png"></div>
+            <div class="f {{'unacquired' if inventory[2296] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Regenerative Plating (Infested Bunker)&#10;Infested Bunkers gain increased life regeneration while rooted." class=" btn-upgrade-zerg-stukov-bunkerformliferegenupgraded-png"></div>
           </div>
         </div>
         <div id="class-infested-missile-turret" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2024] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Missile Turret&#10;Anti-air defensive structure. Detects cloaked units and can uproot." class=" btn-building-stukov-infestedturret-png"></div>
+            <div class="f {{'unacquired' if inventory[2024] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Missile Turret&#10;Anti-air defensive structure. Detects cloaked units and can uproot." class=" btn-building-stukov-infestedturret-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2299] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Acid Spore Vents (Infested Missile Turret)&#10;Infested Missile Turrets gain a secondary weapon that applies Devourer Acid Spores in an area around the target." class=" btn-ability-zerg-acidspores-png"></div>
-            <div class="f {{'unacquired' if inventory[2298] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bioelectric Payload (Infested Missile Turret)&#10;Increases anti-mechanical damage of Infested Missile Turrets by +6 per missile." class=" btn-ability-zeratul-immortal-forcecannon-png"></div>
+            <div class="f {{'unacquired' if inventory[2299] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Acid Spore Vents (Infested Missile Turret)&#10;Infested Missile Turrets gain a secondary weapon that applies Devourer Acid Spores in an area around the target." class=" btn-ability-zerg-acidspores-png"></div>
+            <div class="f {{'unacquired' if inventory[2298] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bioelectric Payload (Infested Missile Turret)&#10;Increases anti-mechanical damage of Infested Missile Turrets by +6 per missile." class=" btn-ability-zeratul-immortal-forcecannon-png"></div>
           </div>
         </div>
         <div id="class-nydus-worm" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2018] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Nydus Worm&#10;Long-range transport network. Nydus Worms and Nydus Networks can load friendly ground units to be unloaded to any other Nydus structure on the map." class=" btn-building-zerg-nydusworm-png"></div>
+            <div class="f {{'unacquired' if inventory[2018] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Nydus Worm&#10;Long-range transport network. Nydus Worms and Nydus Networks can load friendly ground units to be unloaded to any other Nydus structure on the map." class=" btn-building-zerg-nydusworm-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2358] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ravenous Appetite (Nydus Worm)&#10;Allows Nydus Worms to unload and load units nearly instantly." class=" ui_tipicon_evolution_hydralisk-waves-png"></div>
+            <div class="f {{'unacquired' if inventory[2358] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ravenous Appetite (Nydus Worm)&#10;Allows Nydus Worms to unload and load units nearly instantly." class=" ui_tipicon_evolution_hydralisk-waves-png"></div>
           </div>
         </div>
         <div id="class-echidna-worm" class="item-class ss-5">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2019] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Echidna Worm&#10;Long-range deployable base. Unable to load and unload units, but can generate Creep and Creep Tumors. Can also serve as a dropoff point for resources and can create Drones." class=" btn-unit-zerg-nydusdragon-png"></div>
+            <div class="f {{'unacquired' if inventory[2019] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Echidna Worm&#10;Long-range deployable base. Unable to load and unload units, but can generate Creep and Creep Tumors. Can also serve as a dropoff point for resources and can create Drones." class=" btn-unit-zerg-nydusdragon-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2357] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ouroboros Strain (Echidna Worm)&#10;Allows Echidna Worms to train a limited assortment of combat units (Zerglings, Roaches, Hydralisks, and Aberrations) at a reduced time and cost." class=" talent-zagara-level12-unlockswarmling-png"></div>
+            <div class="f {{'unacquired' if inventory[2357] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ouroboros Strain (Echidna Worm)&#10;Allows Echidna Worms to train a limited assortment of combat units (Zerglings, Roaches, Hydralisks, and Aberrations) at a reduced time and cost." class=" talent-zagara-level12-unlockswarmling-png"></div>
           </div>
         </div>
         <div id="class-zerg-worm" class="item-class ss-5">
@@ -1306,9 +1306,9 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2355] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jormungandr Strain (Nydus Worm/Echidna Worm)&#10;Removes emerge time for Nydus Worm and Echidna Worm, and allows them to be salvaged to return the resources spent on them." class=" btn-upgrade-zerg-enduringcorruption-png"></div>
-            <div class="f {{'unacquired' if inventory[2356] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Nydus Worm/Echidna Worm)&#10;Reduces Nydus Worm and Echidna Worm cost by 50 minerals and 75 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[2354] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Subterranean Scales (Nydus Worm/Echidna Worm)&#10;Increases Nydus Worm and Echidna Worm maximum health by 250 and armor by 1." class=" btn-upgrade-zerg-buildingarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[2355] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jormungandr Strain (Nydus Worm/Echidna Worm)&#10;Removes emerge time for Nydus Worm and Echidna Worm, and allows them to be salvaged to return the resources spent on them." class=" btn-upgrade-zerg-enduringcorruption-png"></div>
+            <div class="f {{'unacquired' if inventory[2356] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Nydus Worm/Echidna Worm)&#10;Reduces Nydus Worm and Echidna Worm cost by 50 minerals and 75 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[2354] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Subterranean Scales (Nydus Worm/Echidna Worm)&#10;Increases Nydus Worm and Echidna Worm maximum health by 250 and armor by 1." class=" btn-upgrade-zerg-buildingarmor-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1316,23 +1316,23 @@
         </div>
         <div id="class-zerg-mercenary" class="item-class ss-6">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2600] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Medics&#10;Mercenary infested Medics that may be called in from the Predator Nest." class=" btn-unit-infested-infestedmedic-png"></div>
-            <div class="f {{'unacquired' if inventory[2601] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Siege Breakers&#10;Mercenary infested Siege Breakers that may be called in from the Predator Nest." class=" btn-unit-terran-siegetankmercenary-tank-png"></div>
-            <div class="f {{'unacquired' if inventory[2602] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infested Dusk Wings&#10;Mercenary infested Dusk Wings that may be called in from the Predator Nest." class=" btn-unit-terran-bansheemercenary-png"></div>
-            <div class="f {{'unacquired' if inventory[2603] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Devouring Ones&#10;Elite Zergling strain. Summoned at the Predator Nest." class=" btn-unit-zerg-zergling-scr-png"></div>
-            <div class="f {{'unacquired' if inventory[2604] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hunter Killers&#10;Elite Hydralisk strain. Summoned at the Predator Nest." class=" btn-unit-zerg-hydralisk-remastered-png"></div>
-            <div class="f {{'unacquired' if inventory[2605] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Wise Old Torrasque&#10;Elite Ultralisk strain. Summoned at the Predator Nest." class=" btn-unit-zerg-ultralisk-remastered-png"></div>
-            <div class="f {{'unacquired' if inventory[2606] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hunterling&#10;Elite strain. Can jump up and down cliffs and stun enemies by jumping on them. Summoned at the Predator Nest." class=" btn-unit-hunterling-png"></div>
-            <div class="f {{'unacquired' if inventory[2607] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Yggdrasil&#10;Elite Overlord strain that has the ability to transport buildings and ground units. Summoned at the Predator Nest." class=" btn-unit-zerg-overlordscbw-png"></div>
-            <div class="f {{'unacquired' if inventory[2608] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Caustic Horrors&#10;Elite Roach Strain that has the ability to attack air units. Summoned at the Predator Nest." class=" btn-unit-zerg-roach_collection-png"></div>
+            <div class="f {{'unacquired' if inventory[2600] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Medics&#10;Mercenary infested Medics that may be called in from the Predator Nest." class=" btn-unit-infested-infestedmedic-png"></div>
+            <div class="f {{'unacquired' if inventory[2601] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Siege Breakers&#10;Mercenary infested Siege Breakers that may be called in from the Predator Nest." class=" btn-unit-terran-siegetankmercenary-tank-png"></div>
+            <div class="f {{'unacquired' if inventory[2602] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infested Dusk Wings&#10;Mercenary infested Dusk Wings that may be called in from the Predator Nest." class=" btn-unit-terran-bansheemercenary-png"></div>
+            <div class="f {{'unacquired' if inventory[2603] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Devouring Ones&#10;Elite Zergling strain. Summoned at the Predator Nest." class=" btn-unit-zerg-zergling-scr-png"></div>
+            <div class="f {{'unacquired' if inventory[2604] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hunter Killers&#10;Elite Hydralisk strain. Summoned at the Predator Nest." class=" btn-unit-zerg-hydralisk-remastered-png"></div>
+            <div class="f {{'unacquired' if inventory[2605] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Wise Old Torrasque&#10;Elite Ultralisk strain. Summoned at the Predator Nest." class=" btn-unit-zerg-ultralisk-remastered-png"></div>
+            <div class="f {{'unacquired' if inventory[2606] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hunterling&#10;Elite strain. Can jump up and down cliffs and stun enemies by jumping on them. Summoned at the Predator Nest." class=" btn-unit-hunterling-png"></div>
+            <div class="f {{'unacquired' if inventory[2607] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Yggdrasil&#10;Elite Overlord strain that has the ability to transport buildings and ground units. Summoned at the Predator Nest." class=" btn-unit-zerg-overlordscbw-png"></div>
+            <div class="f {{'unacquired' if inventory[2608] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Caustic Horrors&#10;Elite Roach Strain that has the ability to attack air units. Summoned at the Predator Nest." class=" btn-unit-zerg-roach_collection-png"></div>
           </div>
         </div>
         <div id="class-zerg-mercenary-upgrade" class="item-class ss-6">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2711] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Self-Sufficient (Zerg)&#10;Zerg Mercenaries no longer use supply." class=" btn-progression-zerg-dehaka-7-newdehakaabilities-png"></div>
-            <div class="f {{'unacquired' if inventory[2712] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Unrestricted Mutation (Zerg)&#10;Zerg Mercenary units are no longer limited by charges." class=" btn-upgrade-zerg-swarmfrenzy-png"></div>
-            <div class="f {{'unacquired' if inventory[2713] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Evolutionary Leap (Zerg)&#10;Halves the initial cooldown for all Zerg Mercenaries." class=" evolution_coop-png"></div>
-            <div class="f {{'unacquired' if inventory[2710] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cell Division (Zerg)&#10;Adds additional units to Zerg Mercenary calldowns." class=" btn-upgrade-zerg-celldivisionon-png"></div>
+            <div class="f {{'unacquired' if inventory[2711] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Self-Sufficient (Zerg)&#10;Zerg Mercenaries no longer use supply." class=" btn-progression-zerg-dehaka-7-newdehakaabilities-png"></div>
+            <div class="f {{'unacquired' if inventory[2712] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Unrestricted Mutation (Zerg)&#10;Zerg Mercenary units are no longer limited by charges." class=" btn-upgrade-zerg-swarmfrenzy-png"></div>
+            <div class="f {{'unacquired' if inventory[2713] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Evolutionary Leap (Zerg)&#10;Halves the initial cooldown for all Zerg Mercenaries." class=" evolution_coop-png"></div>
+            <div class="f {{'unacquired' if inventory[2710] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cell Division (Zerg)&#10;Adds additional units to Zerg Mercenary calldowns." class=" btn-upgrade-zerg-celldivisionon-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1341,64 +1341,64 @@
         <div id="class-zerg-wa" class="item-class ss-7">
           <div class="item-class-header">
             <div class="progressive lvl-{{[inventory[2100], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 1&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 2&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 3&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 4&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 5&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 1&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 2&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 3&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 4&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Melee Attack - Level 5&#10;Increases damage of Zerg melee ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-meleeattacks-level5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[2101], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 1&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 2&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 3&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 4&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 5&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 1&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 2&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 3&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 4&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Missile Attack - Level 5&#10;Increases damage of Zerg ranged ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-missileattacks-level5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[2102], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 1&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 2&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 3&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 4&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 5&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 1&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 2&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 3&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 4&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Ground Carapace - Level 5&#10;Increases armor of Zerg ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-groundcarapace-level5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[2103], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 1&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 2&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 3&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 4&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 5&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 1&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 2&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 3&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 4&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Attack - Level 5&#10;Increases damage of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-airattacks-level5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[2104], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 1&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 2&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 3&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 4&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 5&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 1&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 2&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 3&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 4&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Zerg Flyer Carapace - Level 5&#10;Increases armor of Zerg flyers.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-zerg-flyercarapace-level5-png"></div>
             </div>
           </div>
         </div>
         <div id="class-overlord" class="item-class ss-7">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2407] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Improved Overlords (Overlord)&#10;Overlords morph instantly and provide 50% more supply." class=" btn-ability-kerrigan-improvedoverlords-png"></div>
-            <div class="f {{'unacquired' if inventory[2700] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ventral Sacs (Overlord)&#10;Overlords gain the ability to transport ground units." class=" btn-upgrade-zerg-ventralsacs-png"></div>
-            <div class="f {{'unacquired' if inventory[2701] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Generate Creep (Overlord)&#10;Overlords gain the ability to generate creep while standing still." class=" btn-ability-zerg-generatecreep-color-png"></div>
-            <div class="f {{'unacquired' if inventory[2702] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Antennae (Overlord)&#10;Increases Overlord sight range." class=" btn-ability-zerg-overlord-oversight-off-png"></div>
-            <div class="f {{'unacquired' if inventory[2703] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pneumatized Carapace (Overlord)&#10;Increases Overlord movement speed." class=" btn-upgrade-zerg-pneumatizedcarapace-png"></div>
+            <div class="f {{'unacquired' if inventory[2407] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Improved Overlords (Overlord)&#10;Overlords morph instantly and provide 50% more supply." class=" btn-ability-kerrigan-improvedoverlords-png"></div>
+            <div class="f {{'unacquired' if inventory[2700] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ventral Sacs (Overlord)&#10;Overlords gain the ability to transport ground units." class=" btn-upgrade-zerg-ventralsacs-png"></div>
+            <div class="f {{'unacquired' if inventory[2701] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Generate Creep (Overlord)&#10;Overlords gain the ability to generate creep while standing still." class=" btn-ability-zerg-generatecreep-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2702] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Antennae (Overlord)&#10;Increases Overlord sight range." class=" btn-ability-zerg-overlord-oversight-off-png"></div>
+            <div class="f {{'unacquired' if inventory[2703] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pneumatized Carapace (Overlord)&#10;Increases Overlord movement speed." class=" btn-upgrade-zerg-pneumatizedcarapace-png"></div>
           </div>
         </div>
         <div id="class-zerg-macro" class="item-class ss-7">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[2292] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sustained Cultivation Ventricles (Infested SCV)&#10;Starting Infested SCV charges increased to 3. Maximum charges increased to 5." class=" btn-upgrade-swann-scvdoublerepair-png"></div>
-            <div class="f {{'unacquired' if inventory[2412] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Twin Drones (Zerg)&#10;Drones morph in groups of two at no additional cost and require less supply." class=" btn-ability-kerrigan-twindrones-png"></div>
-            <div class="f {{'unacquired' if inventory[2408] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Automated Extractors (Zerg)&#10;Extractors automatically harvest Vespene Gas without the need for Drones." class=" btn-ability-kerrigan-automatedextractors-png"></div>
-            <div class="f {{'unacquired' if inventory[2413] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Malignant Creep (Zerg)&#10;Your units and structures gain increased life regeneration and 30% increased attack speed while on creep. Creep Tumors also spread creep faster and farther." class=" btn-ability-kerrigan-malignantcreep-png"></div>
-            <div class="f {{'unacquired' if inventory[2414] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vespene Efficiency (Zerg)&#10;Extractors produce Vespene gas 25% faster." class=" btn-ability-kerrigan-vespeneefficiency-png"></div>
-            <div class="f {{'unacquired' if inventory[2704] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Excavating Claws (Zerg)&#10;Increases movement speed of uprooted Zerg structures, especially off creep. Also increases root speed." class=" btn-upgrade-zerg-anabolicsynthesis-png"></div>
-            <div class="f {{'unacquired' if inventory[2705] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Creep Stomach (Zerg)&#10;Zerg buildings no longer take damage off-creep. Defensive structures can now root off-creep." class=" btn-ability-zerg-creepspread-png"></div>
-            <div class="f {{'unacquired' if inventory[2706] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hive Cluster Maturation (Zerg)&#10;Lairs are replaced with Hives, and Hatcheries can now upgrade directly to Hives at the Lair's original cost." class=" btn-building-zerg-hive-png"></div>
-            <div class="f {{'unacquired' if inventory[2707] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Macroscopic Recuperation (Zerg)&#10;Zerg structures regenerate health rapidly while on creep and out of combat. Does not apply to uprooted structures, or structures with the Mechanical tag." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
-            <div class="f {{'unacquired' if inventory[2708] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bio-Mechanical Stockpiling (Zerg)&#10;Infested Factories and Starports can store 3 additional unit charges." class=" btn-upgrade-zerg-stukov-queenenergyregen-png"></div>
-            <div class="f {{'unacquired' if inventory[2709] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Broodling Spore Saturation (Zerg)&#10;Zerg buildings release twice as many broodlings on death. Zerg defensive structures release 4 broodlings on death." class=" btn-ability-kerrigan-broodlingnest-png"></div>
+            <div class="f {{'unacquired' if inventory[2292] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sustained Cultivation Ventricles (Infested SCV)&#10;Starting Infested SCV charges increased to 3. Maximum charges increased to 5." class=" btn-upgrade-swann-scvdoublerepair-png"></div>
+            <div class="f {{'unacquired' if inventory[2412] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Twin Drones (Zerg)&#10;Drones morph in groups of two at no additional cost and require less supply." class=" btn-ability-kerrigan-twindrones-png"></div>
+            <div class="f {{'unacquired' if inventory[2408] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Automated Extractors (Zerg)&#10;Extractors automatically harvest Vespene Gas without the need for Drones." class=" btn-ability-kerrigan-automatedextractors-png"></div>
+            <div class="f {{'unacquired' if inventory[2413] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Malignant Creep (Zerg)&#10;Your units and structures gain increased life regeneration and 30% increased attack speed while on creep. Creep Tumors also spread creep faster and farther." class=" btn-ability-kerrigan-malignantcreep-png"></div>
+            <div class="f {{'unacquired' if inventory[2414] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vespene Efficiency (Zerg)&#10;Extractors produce Vespene gas 25% faster." class=" btn-ability-kerrigan-vespeneefficiency-png"></div>
+            <div class="f {{'unacquired' if inventory[2704] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Excavating Claws (Zerg)&#10;Increases movement speed of uprooted Zerg structures, especially off creep. Also increases root speed." class=" btn-upgrade-zerg-anabolicsynthesis-png"></div>
+            <div class="f {{'unacquired' if inventory[2705] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Creep Stomach (Zerg)&#10;Zerg buildings no longer take damage off-creep. Defensive structures can now root off-creep." class=" btn-ability-zerg-creepspread-png"></div>
+            <div class="f {{'unacquired' if inventory[2706] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hive Cluster Maturation (Zerg)&#10;Lairs are replaced with Hives, and Hatcheries can now upgrade directly to Hives at the Lair's original cost." class=" btn-building-zerg-hive-png"></div>
+            <div class="f {{'unacquired' if inventory[2707] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Macroscopic Recuperation (Zerg)&#10;Zerg structures regenerate health rapidly while on creep and out of combat. Does not apply to uprooted structures, or structures with the Mechanical tag." class=" btn-upgrade-zerg-abathur-improvedmend-png"></div>
+            <div class="f {{'unacquired' if inventory[2708] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bio-Mechanical Stockpiling (Zerg)&#10;Infested Factories and Starports can store 3 additional unit charges." class=" btn-upgrade-zerg-stukov-queenenergyregen-png"></div>
+            <div class="f {{'unacquired' if inventory[2709] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Broodling Spore Saturation (Zerg)&#10;Zerg buildings release twice as many broodlings on death. Zerg defensive structures release 4 broodlings on death." class=" btn-ability-kerrigan-broodlingnest-png"></div>
           </div>
         </div>
       </div>
@@ -1438,26 +1438,26 @@
         </div>
         <div id="class-zealot" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1700] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Zealot&#10;Powerful melee warrior. Can use the charge ability." class=" btn-unit-protoss-zealot-png"></div>
+            <div class="f {{'unacquired' if inventory[1700] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Zealot&#10;Powerful melee warrior. Can use the charge ability." class=" btn-unit-protoss-zealot-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3500] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Whirlwind (Zealot)&#10;Zealot War Council ability.&#10;Gives Zealots the whirlwind ability, dealing damage in an area over 3 seconds." class=" btn-ability-protoss-whirlwind-png"></div>
+            <div class="f {{'unacquired' if inventory[3500] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Whirlwind (Zealot)&#10;Zealot War Council ability.&#10;Gives Zealots the whirlwind ability, dealing damage in an area over 3 seconds." class=" btn-ability-protoss-whirlwind-png"></div>
           </div>
         </div>
         <div id="class-centurion" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3001] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Centurion&#10;Powerful melee warrior. Has the Shadow Charge and Darkcoil abilities." class=" btn-unit-protoss-zealot-nerazim-png"></div>
+            <div class="f {{'unacquired' if inventory[3001] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Centurion&#10;Powerful melee warrior. Has the Shadow Charge and Darkcoil abilities." class=" btn-unit-protoss-zealot-nerazim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3501] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Centurion)&#10;Centurion War Council upgrade.&#10;Reduces Centurion cost by 40 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3501] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Centurion)&#10;Centurion War Council upgrade.&#10;Reduces Centurion cost by 40 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-sentinel" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3002] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sentinel&#10;Powerful melee warrior. Has the Charge and Reconstruction abilities." class=" btn-unit-protoss-zealot-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3002] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sentinel&#10;Powerful melee warrior. Has the Charge and Reconstruction abilities." class=" btn-unit-protoss-zealot-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3502] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Sentinel)&#10;Sentinel War Council upgrade.&#10;Reduces Sentinel cost by 60 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3502] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Sentinel)&#10;Sentinel War Council upgrade.&#10;Reduces Sentinel cost by 60 minerals and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-zealot-tier" class="item-class ss-1">
@@ -1465,46 +1465,46 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3376] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Leg Enhancements (Zealot/Sentinel/Centurion)&#10;Zealots, Sentinels, and Centurions gain increased movement speed." class=" btn-ability-protoss-lightningdash-png"></div>
-            <div class="f {{'unacquired' if inventory[3377] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shield Capacity (Zealot/Sentinel/Centurion)&#10;Zealots, Sentinels, and Centurions gain +30 maximum shields." class=" btn-shield-capacity-png"></div>
+            <div class="f {{'unacquired' if inventory[3376] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Leg Enhancements (Zealot/Sentinel/Centurion)&#10;Zealots, Sentinels, and Centurions gain increased movement speed." class=" btn-ability-protoss-lightningdash-png"></div>
+            <div class="f {{'unacquired' if inventory[3377] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shield Capacity (Zealot/Sentinel/Centurion)&#10;Zealots, Sentinels, and Centurions gain +30 maximum shields." class=" btn-shield-capacity-png"></div>
           </div>
         </div>
         <div id="class-supplicant" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3003] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Supplicant&#10;Powerful melee warrior. Has powerful damage-resistant shields." class=" btn-unit-protoss-alarak-taldarim-supplicant-png"></div>
+            <div class="f {{'unacquired' if inventory[3003] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Supplicant&#10;Powerful melee warrior. Has powerful damage-resistant shields." class=" btn-unit-protoss-alarak-taldarim-supplicant-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3300] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blood Shield (Supplicant)&#10;Increases the armor value of Supplicant shields." class=" btn-upgrade-protoss-alarak-supplicantarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[3302] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Endless Servitude (Supplicant)&#10;Increases Supplicant shield regeneration rate." class=" btn-endless-servitude-png"></div>
-            <div class="f {{'unacquired' if inventory[3553] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sacrifice (Supplicant)&#10;Supplicant War Council ability.&#10;Allows Supplicants to sacrifice themselves to save nearby units from death." class=" btn-ability-protoss-supplicant-sacrificeon-png"></div>
-            <div class="f {{'unacquired' if inventory[3301] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Soul Augmentation (Supplicant)&#10;Increases Supplicant max shields by +25." class=" btn-upgrade-protoss-alarak-supplicantextrashields-png"></div>
-            <div class="f {{'unacquired' if inventory[3395] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Zenith Pitch (Supplicant)&#10;Allows Supplicants to attack air units." class=" btn-upgrade-protoss-alarak-rangeweapon-png"></div>
+            <div class="f {{'unacquired' if inventory[3300] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blood Shield (Supplicant)&#10;Increases the armor value of Supplicant shields." class=" btn-upgrade-protoss-alarak-supplicantarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[3302] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Endless Servitude (Supplicant)&#10;Increases Supplicant shield regeneration rate." class=" btn-endless-servitude-png"></div>
+            <div class="f {{'unacquired' if inventory[3553] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sacrifice (Supplicant)&#10;Supplicant War Council ability.&#10;Allows Supplicants to sacrifice themselves to save nearby units from death." class=" btn-ability-protoss-supplicant-sacrificeon-png"></div>
+            <div class="f {{'unacquired' if inventory[3301] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Soul Augmentation (Supplicant)&#10;Increases Supplicant max shields by +25." class=" btn-upgrade-protoss-alarak-supplicantextrashields-png"></div>
+            <div class="f {{'unacquired' if inventory[3395] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Zenith Pitch (Supplicant)&#10;Allows Supplicants to attack air units." class=" btn-upgrade-protoss-alarak-rangeweapon-png"></div>
           </div>
         </div>
         <div id="class-stalker" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1701] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stalker&#10;Ranged attack strider. Can use the Blink ability." class=" btn-unit-protoss-stalker-png"></div>
+            <div class="f {{'unacquired' if inventory[1701] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stalker&#10;Ranged attack strider. Can use the Blink ability." class=" btn-unit-protoss-stalker-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3503] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phase Reactor (Stalker)&#10;Stalker War Council upgrade.&#10;Stalkers restore 80 shields over 5 seconds after they Blink." class=" btn-ability-protoss-blinkshieldrestore-png"></div>
+            <div class="f {{'unacquired' if inventory[3503] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phase Reactor (Stalker)&#10;Stalker War Council upgrade.&#10;Stalkers restore 80 shields over 5 seconds after they Blink." class=" btn-ability-protoss-blinkshieldrestore-png"></div>
           </div>
         </div>
         <div id="class-instigator" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3004] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Instigator&#10;Ranged support strider. Can store multiple Blink charges." class=" btn-unit-protoss-stalker-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3004] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Instigator&#10;Ranged support strider. Can store multiple Blink charges." class=" btn-unit-protoss-stalker-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3415] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blink Overdrive (Instigator)&#10;Instigators gain +2 maximum blink charges and +1 blink range." class=" btn-ability-zeratul-darkarchon-maelstrom-png"></div>
-            <div class="f {{'unacquired' if inventory[3505] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Modernized Servos (Instigator)&#10;Instigator War Council upgrade.&#10;Instigators move 28% faster." class=" btn-modernized-servos-png"></div>
-            <div class="f {{'unacquired' if inventory[3416] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reconstruction (Instigator)&#10;Instigators gain the Reconstruction ability, allowing them to be reconstructed on death with a 240 seconds cooldown. Using Blink reduces the cooldown." class=" btn-upgrade-protoss-stalkerpurifier-reconstruction-png"></div>
+            <div class="f {{'unacquired' if inventory[3415] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blink Overdrive (Instigator)&#10;Instigators gain +2 maximum blink charges and +1 blink range." class=" btn-ability-zeratul-darkarchon-maelstrom-png"></div>
+            <div class="f {{'unacquired' if inventory[3505] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Modernized Servos (Instigator)&#10;Instigator War Council upgrade.&#10;Instigators move 28% faster." class=" btn-modernized-servos-png"></div>
+            <div class="f {{'unacquired' if inventory[3416] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reconstruction (Instigator)&#10;Instigators gain the Reconstruction ability, allowing them to be reconstructed on death with a 240 seconds cooldown. Using Blink reduces the cooldown." class=" btn-upgrade-protoss-stalkerpurifier-reconstruction-png"></div>
           </div>
         </div>
         <div id="class-slayer" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3005] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Slayer&#10;Ranged attack strider. Can use the Phase Blink and Phasing Armor abilities." class=" btn-unit-protoss-stalker-taldarim-collection-ds-png"></div>
+            <div class="f {{'unacquired' if inventory[3005] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Slayer&#10;Ranged attack strider. Can use the Phase Blink and Phasing Armor abilities." class=" btn-unit-protoss-stalker-taldarim-collection-ds-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3507] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phase Blink (Slayer)&#10;Slayer War Council ability.&#10;Slayers can now blink. After blinking, the Slayer's next attack within 8 seconds deals double damage." class=" btn-ability-protoss-blink-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3507] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phase Blink (Slayer)&#10;Slayer War Council ability.&#10;Slayers can now blink. After blinking, the Slayer's next attack within 8 seconds deals double damage." class=" btn-ability-protoss-blink-color-png"></div>
           </div>
         </div>
         <div id="class-stalker-tier" class="item-class ss-1">
@@ -1512,38 +1512,38 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3306] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Disintegrating Particles (Stalker/Instigator/Slayer)&#10;Increases weapon damage of Stalkers, Instigators, and Slayers." class=" btn-disintegrating-particles-png"></div>
-            <div class="f {{'unacquired' if inventory[3307] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Particle Reflection (Stalker/Instigator/Slayer)&#10;Attacks fired by Stalkers, Instigators, and Slayers have a chance to bounce to additional targets for reduced damage." class=" btn-upgrade-protoss-fenix-adeptchampionbounceattack-png"></div>
+            <div class="f {{'unacquired' if inventory[3306] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Disintegrating Particles (Stalker/Instigator/Slayer)&#10;Increases weapon damage of Stalkers, Instigators, and Slayers." class=" btn-disintegrating-particles-png"></div>
+            <div class="f {{'unacquired' if inventory[3307] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Particle Reflection (Stalker/Instigator/Slayer)&#10;Attacks fired by Stalkers, Instigators, and Slayers have a chance to bounce to additional targets for reduced damage." class=" btn-upgrade-protoss-fenix-adeptchampionbounceattack-png"></div>
           </div>
         </div>
         <div id="class-sentry" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3006] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sentry&#10;Robotic support unit. Can use the Guardian Shield ability and can restore the shields of nearby Protoss units." class=" btn-unit-protoss-sentry-png"></div>
+            <div class="f {{'unacquired' if inventory[3006] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sentry&#10;Robotic support unit. Can use the Guardian Shield ability and can restore the shields of nearby Protoss units." class=" btn-unit-protoss-sentry-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3512] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Double Shield Recharge (Sentry)&#10;Sentry War Council upgrade.&#10;Sentries can heal the shields of two targets at once." class=" btn-ability-protoss-doubleshieldrecharge-png"></div>
-            <div class="f {{'unacquired' if inventory[3370] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Force Field (Sentry)&#10;Sentries gain the Force Field ability, &#10;which creates a force field that blocks units from walking through." class=" btn-ability-protoss-forcefield-color-png"></div>
-            <div class="f {{'unacquired' if inventory[3371] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hallucination (Sentry)&#10;Sentries gain the Hallucination ability, &#10;which creates hallucinated versions of Protoss units." class=" btn-ability-protoss-hallucination-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3512] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Double Shield Recharge (Sentry)&#10;Sentry War Council upgrade.&#10;Sentries can heal the shields of two targets at once." class=" btn-ability-protoss-doubleshieldrecharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3370] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Force Field (Sentry)&#10;Sentries gain the Force Field ability, &#10;which creates a force field that blocks units from walking through." class=" btn-ability-protoss-forcefield-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3371] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hallucination (Sentry)&#10;Sentries gain the Hallucination ability, &#10;which creates hallucinated versions of Protoss units." class=" btn-ability-protoss-hallucination-color-png"></div>
           </div>
         </div>
         <div id="class-energizer" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3007] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Energizer&#10;Robotic support unit. Can use the Chrono Beam ability and can become stationary to power nearby structures." class=" btn-unit-protoss-sentry-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3007] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Energizer&#10;Robotic support unit. Can use the Chrono Beam ability and can become stationary to power nearby structures." class=" btn-unit-protoss-sentry-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3373] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Forged Chassis (Energizer)&#10;Increases Energizer Life by +20." class=" btn-forged-chassis-png"></div>
-            <div class="f {{'unacquired' if inventory[3513] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mobile Chrono Beam (Energizer)&#10;Energizer War Council upgrade.&#10;Allows Energizers to use Chrono Beam in Mobile Mode." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
-            <div class="f {{'unacquired' if inventory[3372] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reclamation (Energizer)&#10;Energizers gain the Reclamation ability, &#10;which temporarily takes control of an enemy mechanical unit. When the ability expires, the enemy unit self-destructs." class=" btn-ability-protoss-reclamation-png"></div>
+            <div class="f {{'unacquired' if inventory[3373] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Forged Chassis (Energizer)&#10;Increases Energizer Life by +20." class=" btn-forged-chassis-png"></div>
+            <div class="f {{'unacquired' if inventory[3513] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mobile Chrono Beam (Energizer)&#10;Energizer War Council upgrade.&#10;Allows Energizers to use Chrono Beam in Mobile Mode." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
+            <div class="f {{'unacquired' if inventory[3372] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reclamation (Energizer)&#10;Energizers gain the Reclamation ability, &#10;which temporarily takes control of an enemy mechanical unit. When the ability expires, the enemy unit self-destructs." class=" btn-ability-protoss-reclamation-png"></div>
           </div>
         </div>
         <div id="class-havoc" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3008] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Havoc&#10;Robotic support unit. Can use the Target Lock and Force Field abilities and increases the range of nearby Protoss units." class=" btn-unit-protoss-sentry-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3008] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Havoc&#10;Robotic support unit. Can use the Target Lock and Force Field abilities and increases the range of nearby Protoss units." class=" btn-unit-protoss-sentry-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3375] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bloodshard Resonance (Havoc)&#10;Havocs gain increased range for Squad Sight, Target Lock, and Force Field." class=" btn-upgrade-protoss-alarak-rangeincrease-png"></div>
-            <div class="f {{'unacquired' if inventory[3374] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Detect Weakness (Havoc)&#10;Havocs' Target Lock gives an additional +15% damage bonus." class=" btn-upgrade-protoss-alarak-havoctargetlockbuffed-png"></div>
-            <div class="f {{'unacquired' if inventory[3514] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enduring Sight (Havoc)&#10;Havoc War Council upgrade.&#10;Havoc Squad Sight stays up indefinitely and no longer takes energy." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
+            <div class="f {{'unacquired' if inventory[3375] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bloodshard Resonance (Havoc)&#10;Havocs gain increased range for Squad Sight, Target Lock, and Force Field." class=" btn-upgrade-protoss-alarak-rangeincrease-png"></div>
+            <div class="f {{'unacquired' if inventory[3374] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Detect Weakness (Havoc)&#10;Havocs' Target Lock gives an additional +15% damage bonus." class=" btn-upgrade-protoss-alarak-havoctargetlockbuffed-png"></div>
+            <div class="f {{'unacquired' if inventory[3514] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enduring Sight (Havoc)&#10;Havoc War Council upgrade.&#10;Havoc Squad Sight stays up indefinitely and no longer takes energy." class=" btn-ability-hornerhan-raven-analyzetarget-png"></div>
           </div>
         </div>
         <div id="class-sentry-tier" class="item-class ss-1">
@@ -1551,59 +1551,59 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3368] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cloaking Module (Sentry/Energizer/Havoc)&#10;Sentries, Energizers, and Havocs become permanently cloaked." class=" btn-upgrade-protoss-alarak-permanentcloak-png"></div>
-            <div class="f {{'unacquired' if inventory[3369] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Recharging (Sentry/Energizer/Havoc/Shield Battery)&#10;Sentries, Energizers, and Havocs gain +100% energy regeneration rate." class=" btn-upgrade-karax-energyregen200-png"></div>
+            <div class="f {{'unacquired' if inventory[3368] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cloaking Module (Sentry/Energizer/Havoc)&#10;Sentries, Energizers, and Havocs become permanently cloaked." class=" btn-upgrade-protoss-alarak-permanentcloak-png"></div>
+            <div class="f {{'unacquired' if inventory[3369] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Recharging (Sentry/Energizer/Havoc/Shield Battery)&#10;Sentries, Energizers, and Havocs gain +100% energy regeneration rate." class=" btn-upgrade-karax-energyregen200-png"></div>
           </div>
         </div>
         <div id="class-dragoon" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3013] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dragoon&#10;Ranged assault strider. Has enhanced health and damage." class=" btn-unit-protoss-dragoon-void-png"></div>
+            <div class="f {{'unacquired' if inventory[3013] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dragoon&#10;Ranged assault strider. Has enhanced health and damage." class=" btn-unit-protoss-dragoon-void-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3308] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Concentrated Antimatter (Dragoon)&#10;Dragoons deal increased damage." class=" btn-concentrated-antimatter-png"></div>
-            <div class="f {{'unacquired' if inventory[3311] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enhanced Strider Servos (Dragoon)&#10;Increases Dragoon movement speed." class=" btn-enhanced-servo-striders-png"></div>
-            <div class="f {{'unacquired' if inventory[3504] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phalanx Suit (Dragoon)&#10;Dragoon War Council upgrade.&#10;Dragoons gain +1 range, move slightly faster, and can form tighter formations." class=" btn-upgrade-protoss-fenix-zealotsuit-armorplate-png"></div>
-            <div class="f {{'unacquired' if inventory[3310] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Singularity Charge (Dragoon)&#10;Increases Dragoon range by +2." class=" btn-upgrade-artanis-singularitycharge-png"></div>
-            <div class="f {{'unacquired' if inventory[3309] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Trillic Compression System (Dragoon)&#10;Dragoons gain +20 life and their shield regeneration rate is doubled. Allows Dragoons to regenerate shields in combat." class=" btn-ability-protoss-dragoonchassis-png"></div>
+            <div class="f {{'unacquired' if inventory[3308] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Concentrated Antimatter (Dragoon)&#10;Dragoons deal increased damage." class=" btn-concentrated-antimatter-png"></div>
+            <div class="f {{'unacquired' if inventory[3311] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enhanced Strider Servos (Dragoon)&#10;Increases Dragoon movement speed." class=" btn-enhanced-servo-striders-png"></div>
+            <div class="f {{'unacquired' if inventory[3504] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phalanx Suit (Dragoon)&#10;Dragoon War Council upgrade.&#10;Dragoons gain +1 range, move slightly faster, and can form tighter formations." class=" btn-upgrade-protoss-fenix-zealotsuit-armorplate-png"></div>
+            <div class="f {{'unacquired' if inventory[3310] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Singularity Charge (Dragoon)&#10;Increases Dragoon range by +2." class=" btn-upgrade-artanis-singularitycharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3309] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Trillic Compression System (Dragoon)&#10;Dragoons gain +20 life and their shield regeneration rate is doubled. Allows Dragoons to regenerate shields in combat." class=" btn-ability-protoss-dragoonchassis-png"></div>
           </div>
         </div>
         <div id="class-adept" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3015] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Adept&#10;Ranged specialist. Can use the Psionic Transfer ability." class=" btn-unit-protoss-adept-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3015] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Adept&#10;Ranged specialist. Can use the Psionic Transfer ability." class=" btn-unit-protoss-adept-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3506] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Disruptive Transfer (Adept)&#10;Adept War Council upgrade.&#10;Adept shades apply a debuff to enemies they touch, increasing damage taken by +5." class=" btn-ability-protoss-adept-spiritform-png"></div>
-            <div class="f {{'unacquired' if inventory[3305] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phase Bulwark (Adept)&#10;Increases Adept shield maximum by +50." class=" btn-upgrade-protoss-adeptshieldupgrade-png"></div>
-            <div class="f {{'unacquired' if inventory[3304] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resonating Glaives (Adept)&#10;Increases Adept attack speed." class=" btn-upgrade-protoss-resonatingglaives-png"></div>
-            <div class="f {{'unacquired' if inventory[3303] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shockwave (Adept)&#10;When Adepts deal a finishing blow, their projectiles can jump onto 2 additional targets." class=" btn-upgrade-protoss-fenix-adept-recochetglaiveupgraded-png"></div>
+            <div class="f {{'unacquired' if inventory[3506] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Disruptive Transfer (Adept)&#10;Adept War Council upgrade.&#10;Adept shades apply a debuff to enemies they touch, increasing damage taken by +5." class=" btn-ability-protoss-adept-spiritform-png"></div>
+            <div class="f {{'unacquired' if inventory[3305] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phase Bulwark (Adept)&#10;Increases Adept shield maximum by +50." class=" btn-upgrade-protoss-adeptshieldupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[3304] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resonating Glaives (Adept)&#10;Increases Adept attack speed." class=" btn-upgrade-protoss-resonatingglaives-png"></div>
+            <div class="f {{'unacquired' if inventory[3303] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shockwave (Adept)&#10;When Adepts deal a finishing blow, their projectiles can jump onto 2 additional targets." class=" btn-upgrade-protoss-fenix-adept-recochetglaiveupgraded-png"></div>
           </div>
         </div>
         <div id="class-high-templar" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1702] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="High Templar&#10;Potent psionic master. Can use the Feedback and Psionic Storm abilities. Can merge into an Archon." class=" btn-unit-protoss-hightemplar-png"></div>
+            <div class="f {{'unacquired' if inventory[1702] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="High Templar&#10;Potent psionic master. Can use the Feedback and Psionic Storm abilities. Can merge into an Archon." class=" btn-unit-protoss-hightemplar-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3515] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Plasma Surge (High Templar)&#10;High Templar War Council upgrade.&#10;High Templar Psionic Storm will heal fiendly protoss shields under it." class=" btn-upgrade-artanis-healingpsionicstorm-png"></div>
+            <div class="f {{'unacquired' if inventory[3515] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Plasma Surge (High Templar)&#10;High Templar War Council upgrade.&#10;High Templar Psionic Storm will heal fiendly protoss shields under it." class=" btn-upgrade-artanis-healingpsionicstorm-png"></div>
           </div>
         </div>
         <div id="class-signifier" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3009] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Signifier&#10;Potent permanently cloaked psionic master. Can use the Feedback and Crippling Psionic Storm abilities. Can merge into an Archon." class=" btn-unit-protoss-hightemplar-nerazim-png"></div>
+            <div class="f {{'unacquired' if inventory[3009] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Signifier&#10;Potent permanently cloaked psionic master. Can use the Feedback and Crippling Psionic Storm abilities. Can merge into an Archon." class=" btn-unit-protoss-hightemplar-nerazim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3516] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Feedback (Signifier)&#10;Signifier War Council ability.&#10;Signifiers gain the Feedback ability, &#10;which drains all energy from a target and deals 1 damage per point of energy drained." class=" btn-ability-protoss-feedback-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3516] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Feedback (Signifier)&#10;Signifier War Council ability.&#10;Signifiers gain the Feedback ability, &#10;which drains all energy from a target and deals 1 damage per point of energy drained." class=" btn-ability-protoss-feedback-color-png"></div>
           </div>
         </div>
         <div id="class-ascendant" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3010] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ascendant&#10;Potent psionic master. Can use the Psionic Orb, Mind Blast, and Sacrifice abilities." class=" btn-unit-protoss-hightemplar-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3010] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ascendant&#10;Potent psionic master. Can use the Psionic Orb, Mind Blast, and Sacrifice abilities." class=" btn-unit-protoss-hightemplar-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3418] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Archon Merge (Ascendant)&#10;Allows 2 Ascendants to merge into a Archon." class=" btn-unit-protoss-archon-png hidden-item"></div>
-            <div class="f {{'unacquired' if inventory[3367] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blood Amulet (Ascendant)&#10;Ascendants gain +150 starting energy and +50 maximum energy." class=" btn-blood-amulet-png"></div>
-            <div class="f {{'unacquired' if inventory[3517] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Breath of Creation (Ascendant)&#10;Ascendant War Council upgrade.&#10;Ascendant spells cost -25 energy." class=" tip_terrazinefog-png"></div>
-            <div class="f {{'unacquired' if inventory[3366] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chaotic Attunement (Ascendant)&#10;Ascendants' Psionic Orbs gain 25% increased travel distance." class=" btn-upgrade-protoss-alarak-ascendantspsiorbtravelsfurther-png"></div>
-            <div class="f {{'unacquired' if inventory[3365] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Power Overwhelming (Ascendant)&#10;Ascendants gain the ability to sacrifice Supplicants for increased shields and spell damage." class=" btn-upgrade-protoss-alarak-ascendantspermanentlybetter-png"></div>
+            <div class="f {{'unacquired hidden-item' if inventory[3418] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Archon Merge (Ascendant)&#10;Allows 2 Ascendants to merge into a Archon." class=" btn-unit-protoss-archon-png"></div>
+            <div class="f {{'unacquired' if inventory[3367] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blood Amulet (Ascendant)&#10;Ascendants gain +150 starting energy and +50 maximum energy." class=" btn-blood-amulet-png"></div>
+            <div class="f {{'unacquired' if inventory[3517] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Breath of Creation (Ascendant)&#10;Ascendant War Council upgrade.&#10;Ascendant spells cost -25 energy." class=" tip_terrazinefog-png"></div>
+            <div class="f {{'unacquired' if inventory[3366] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chaotic Attunement (Ascendant)&#10;Ascendants' Psionic Orbs gain 25% increased travel distance." class=" btn-upgrade-protoss-alarak-ascendantspsiorbtravelsfurther-png"></div>
+            <div class="f {{'unacquired' if inventory[3365] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Power Overwhelming (Ascendant)&#10;Ascendants gain the ability to sacrifice Supplicants for increased shields and spell damage." class=" btn-upgrade-protoss-alarak-ascendantspermanentlybetter-png"></div>
           </div>
         </div>
         <div id="class-high-templar-tier" class="item-class ss-1">
@@ -1611,9 +1611,9 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3359] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hallucination (High Templar/Signifier)&#10;High Templar and Signifiers gain the Hallucination ability, &#10;which creates 2 hallucinated copies of a target unit." class=" btn-ability-protoss-hallucination-color-png"></div>
-            <div class="f {{'unacquired' if inventory[3360] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Khaydarin Amulet (High Templar/Signifier)&#10;High Templar and Signifiers gain +150 starting energy and +50 maximum energy." class=" btn-upgrade-protoss-khaydarinamulet-png"></div>
-            <div class="f {{'unacquired' if inventory[3358] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Unshackled Psionic Storm (High Templar/Signifier)&#10;High Templar and Signifiers deal increased damage with Psi Storm." class=" btn-unshackled-psionic-storm-png"></div>
+            <div class="f {{'unacquired' if inventory[3359] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hallucination (High Templar/Signifier)&#10;High Templar and Signifiers gain the Hallucination ability, &#10;which creates 2 hallucinated copies of a target unit." class=" btn-ability-protoss-hallucination-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3360] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Khaydarin Amulet (High Templar/Signifier)&#10;High Templar and Signifiers gain +150 starting energy and +50 maximum energy." class=" btn-upgrade-protoss-khaydarinamulet-png"></div>
+            <div class="f {{'unacquired' if inventory[3358] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Unshackled Psionic Storm (High Templar/Signifier)&#10;High Templar and Signifiers deal increased damage with Psi Storm." class=" btn-unshackled-psionic-storm-png"></div>
           </div>
         </div>
         <div id="class-archon" class="item-class ss-1">
@@ -1621,49 +1621,49 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3361] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="High Archon (Archon)&#10;Archons can use High Templar abilities." class=" btn-unit-protoss-archon-upgraded-png"></div>
-            <div class="f {{'unacquired' if inventory[3391] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Transcendence (Archon)&#10;Archons can float in the air. Can traverse cliffs and phase through most units. Increases Archon attack range by 1." class=" btn-ability-protoss-astralwind-png"></div>
-            <div class="f {{'unacquired' if inventory[3392] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Power Siphon (Archon)&#10;Archons gain the Power Siphon ability, &#10;which deals damage to a target and replenishes shields over 2 seconds." class=" btn-ability-protoss-shieldrecharge-png"></div>
-            <div class="f {{'unacquired' if inventory[3393] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Eradicate (Archon)&#10;On death, Archons launch towards nearby enemy ground units, dealing damage on impact." class=" btn-ability-protoss-recallondeath-png"></div>
-            <div class="f {{'unacquired' if inventory[3394] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Obliterate (Archon)&#10;Archon attacks get increased area of effect, and deal their biological bonus damage to all targets." class=" btn-obliterate-png"></div>
+            <div class="f {{'unacquired' if inventory[3361] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="High Archon (Archon)&#10;Archons can use High Templar abilities." class=" btn-unit-protoss-archon-upgraded-png"></div>
+            <div class="f {{'unacquired' if inventory[3391] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Transcendence (Archon)&#10;Archons can float in the air. Can traverse cliffs and phase through most units. Increases Archon attack range by 1." class=" btn-ability-protoss-astralwind-png"></div>
+            <div class="f {{'unacquired' if inventory[3392] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Power Siphon (Archon)&#10;Archons gain the Power Siphon ability, &#10;which deals damage to a target and replenishes shields over 2 seconds." class=" btn-ability-protoss-shieldrecharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3393] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Eradicate (Archon)&#10;On death, Archons launch towards nearby enemy ground units, dealing damage on impact." class=" btn-ability-protoss-recallondeath-png"></div>
+            <div class="f {{'unacquired' if inventory[3394] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Obliterate (Archon)&#10;Archon attacks get increased area of effect, and deal their biological bonus damage to all targets." class=" btn-obliterate-png"></div>
           </div>
         </div>
         <div id="class-dark-archon" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3014] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dark Archon&#10;Potent psionic master. Can use the Confuse and Mind Control abilities." class=" talent-vorazun-level05-unlockdarkarchon-png"></div>
+            <div class="f {{'unacquired' if inventory[3014] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dark Archon&#10;Potent psionic master. Can use the Confuse and Mind Control abilities." class=" talent-vorazun-level05-unlockdarkarchon-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3364] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Argus Talisman (Dark Archon)&#10;Dark Archons gain +150 starting energy and +50 maximum energy." class=" btn-argus-talisman-png"></div>
-            <div class="f {{'unacquired' if inventory[3362] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Feedback (Dark Archon)&#10;Dark Archons gain the Feedback ability, &#10;which drains all energy from a target and deals 1 damage per point of energy drained." class=" btn-ability-protoss-feedback-color-png"></div>
-            <div class="f {{'unacquired' if inventory[3518] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Indomitable Will (Dark Archon)&#10;Dark Archon War Council upgrade.&#10;Casting Mind Control will no longer deplete the Dark Archon's shields." class=" btn-ability-zeratul-topbar-serdathlegion-png"></div>
-            <div class="f {{'unacquired' if inventory[3363] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Maelstrom (Dark Archon)&#10;Dark Archons gain the Maelstrom ability, &#10;which stuns biological units in an area." class=" btn-ability-protoss-voidstasis-png"></div>
+            <div class="f {{'unacquired' if inventory[3364] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Argus Talisman (Dark Archon)&#10;Dark Archons gain +150 starting energy and +50 maximum energy." class=" btn-argus-talisman-png"></div>
+            <div class="f {{'unacquired' if inventory[3362] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Feedback (Dark Archon)&#10;Dark Archons gain the Feedback ability, &#10;which drains all energy from a target and deals 1 damage per point of energy drained." class=" btn-ability-protoss-feedback-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3518] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Indomitable Will (Dark Archon)&#10;Dark Archon War Council upgrade.&#10;Casting Mind Control will no longer deplete the Dark Archon's shields." class=" btn-ability-zeratul-topbar-serdathlegion-png"></div>
+            <div class="f {{'unacquired' if inventory[3363] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Maelstrom (Dark Archon)&#10;Dark Archons gain the Maelstrom ability, &#10;which stuns biological units in an area." class=" btn-ability-protoss-voidstasis-png"></div>
           </div>
         </div>
         <div id="class-dark-templar" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1703] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dark Templar&#10;Deadly warrior-assassin. Permanently cloaked. Can use the Shadow Fury ability." class=" btn-unit-protoss-darktemplar-png"></div>
+            <div class="f {{'unacquired' if inventory[1703] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dark Templar&#10;Deadly warrior-assassin. Permanently cloaked. Can use the Shadow Fury ability." class=" btn-unit-protoss-darktemplar-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3417] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Archon Merge (Dark Templar)&#10;Allows 2 Dark Templar to merge into a Archon." class=" btn-unit-protoss-archon-png"></div>
-            <div class="f {{'unacquired' if inventory[3357] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dark Archon Meld (Dark Templar)&#10;Allows 2 Dark Templar to meld into a Dark Archon." class=" talent-vorazun-level05-unlockdarkarchon-png"></div>
-            <div class="f {{'unacquired' if inventory[3510] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Greater Shadow Fury (Dark Templar)&#10;Dark Templar War Council ability.&#10;Dark Templar gain three strikes of their Shadow Fury ability." class=" btn-ability-protoss-shadowfury-png"></div>
-            <div class="f {{'unacquired' if inventory[3509] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Lesser Shadow Fury (Dark Templar)&#10;Dark Templar War Council ability.&#10;Dark Templar gain two strikes of their Shadow Fury ability." class=" btn-lesser-shadow-fury-png"></div>
+            <div class="f {{'unacquired' if inventory[3417] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Archon Merge (Dark Templar)&#10;Allows 2 Dark Templar to merge into a Archon." class=" btn-unit-protoss-archon-png"></div>
+            <div class="f {{'unacquired' if inventory[3357] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dark Archon Meld (Dark Templar)&#10;Allows 2 Dark Templar to meld into a Dark Archon." class=" talent-vorazun-level05-unlockdarkarchon-png"></div>
+            <div class="f {{'unacquired' if inventory[3510] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Greater Shadow Fury (Dark Templar)&#10;Dark Templar War Council ability.&#10;Dark Templar gain three strikes of their Shadow Fury ability." class=" btn-ability-protoss-shadowfury-png"></div>
+            <div class="f {{'unacquired' if inventory[3509] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Lesser Shadow Fury (Dark Templar)&#10;Dark Templar War Council ability.&#10;Dark Templar gain two strikes of their Shadow Fury ability." class=" btn-lesser-shadow-fury-png"></div>
           </div>
         </div>
         <div id="class-avenger" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3011] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Avenger&#10;Deadly warrior-assassin. Permanently cloaked. Recalls to the nearest Dark Shrine upon death." class=" btn-unit-protoss-darktemplar-aiur-png"></div>
+            <div class="f {{'unacquired' if inventory[3011] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Avenger&#10;Deadly warrior-assassin. Permanently cloaked. Recalls to the nearest Dark Shrine upon death." class=" btn-unit-protoss-darktemplar-aiur-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3508] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kryhas Cloak (Avenger)&#10;Avenger War Council upgrade.&#10;Avengers are now permanently cloaked." class=" btn-kryhas-cloak-png"></div>
+            <div class="f {{'unacquired' if inventory[3508] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kryhas Cloak (Avenger)&#10;Avenger War Council upgrade.&#10;Avengers are now permanently cloaked." class=" btn-kryhas-cloak-png"></div>
           </div>
         </div>
         <div id="class-blood-hunter" class="item-class ss-1">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3012] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blood Hunter&#10;Deadly warrior-assassin. Permanently cloaked. Can use the Void Stasis ability." class=" btn-unit-protoss-darktemplar-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3012] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blood Hunter&#10;Deadly warrior-assassin. Permanently cloaked. Can use the Void Stasis ability." class=" btn-unit-protoss-darktemplar-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3511] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Brutal Efficiency (Blood Hunter)&#10;Blood Hunter War Council upgrade.&#10;Blood Hunters attack twice as quickly." class=" btn-upgrade-protoss-alarak-melleeweapon-png"></div>
+            <div class="f {{'unacquired' if inventory[3511] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Brutal Efficiency (Blood Hunter)&#10;Blood Hunter War Council upgrade.&#10;Blood Hunters attack twice as quickly." class=" btn-upgrade-protoss-alarak-melleeweapon-png"></div>
           </div>
         </div>
         <div id="class-dark-templar-tier" class="item-class ss-1">
@@ -1671,10 +1671,10 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3355] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blink (Dark Templar/Avenger/Blood Hunter)&#10;Dark Templar, Avengers, and Blood Hunters gain the Blink ability." class=" btn-ability-protoss-shadowdash-png"></div>
-            <div class="f {{'unacquired' if inventory[3356] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Dark Templar/Avenger/Blood Hunter)&#10;Reduces Dark Templar, Avenger, and Blood Hunter cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[3354] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shadow Guard Training (Dark Templar/Avenger/Blood Hunter)&#10;Increases Dark Templar, Avenger, and Blood Hunter maximum life by +40." class=" btn-shadow-guard-training-png"></div>
-            <div class="f {{'unacquired' if inventory[3353] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shroud of Adun (Dark Templar/Avenger/Blood Hunter)&#10;Increases Dark Templar, Avenger, and Blood Hunter maximum shields by +80." class=" talent-vorazun-level01-shadowstalk-png"></div>
+            <div class="f {{'unacquired' if inventory[3355] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blink (Dark Templar/Avenger/Blood Hunter)&#10;Dark Templar, Avengers, and Blood Hunters gain the Blink ability." class=" btn-ability-protoss-shadowdash-png"></div>
+            <div class="f {{'unacquired' if inventory[3356] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Dark Templar/Avenger/Blood Hunter)&#10;Reduces Dark Templar, Avenger, and Blood Hunter cost by 50 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3354] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shadow Guard Training (Dark Templar/Avenger/Blood Hunter)&#10;Increases Dark Templar, Avenger, and Blood Hunter maximum life by +40." class=" btn-shadow-guard-training-png"></div>
+            <div class="f {{'unacquired' if inventory[3353] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shroud of Adun (Dark Templar/Avenger/Blood Hunter)&#10;Increases Dark Templar, Avenger, and Blood Hunter maximum shields by +80." class=" talent-vorazun-level01-shadowstalk-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1682,18 +1682,18 @@
         </div>
         <div id="class-immortal" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1704] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Immortal&#10;Assault strider. Can use Barrier to absorb damage." class=" btn-unit-protoss-immortal-png"></div>
+            <div class="f {{'unacquired' if inventory[1704] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Immortal&#10;Assault strider. Can use Barrier to absorb damage." class=" btn-unit-protoss-immortal-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3519] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Improved Barrier (Immortal)&#10;Immortal War Council upgrade.&#10;The Immortal's Barrier ability absorbs an additional +100 damage." class=" btn-ability-protoss-barrier-upgraded-png"></div>
+            <div class="f {{'unacquired' if inventory[3519] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Improved Barrier (Immortal)&#10;Immortal War Council upgrade.&#10;The Immortal's Barrier ability absorbs an additional +100 damage." class=" btn-ability-protoss-barrier-upgraded-png"></div>
           </div>
         </div>
         <div id="class-annihilator" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3017] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Annihilator&#10;Assault Strider. Can use the Shadow Cannon ability to damage air and ground units." class=" btn-unit-protoss-immortal-nerazim-png"></div>
+            <div class="f {{'unacquired' if inventory[3017] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Annihilator&#10;Assault Strider. Can use the Shadow Cannon ability to damage air and ground units." class=" btn-unit-protoss-immortal-nerazim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3522] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Twilight Chassis (Annihilator)&#10;Annihilator War Council upgrade.&#10;The Annihilator gains +100 maximum life." class=" btn-twilight-chassis-png"></div>
+            <div class="f {{'unacquired' if inventory[3522] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Twilight Chassis (Annihilator)&#10;Annihilator War Council upgrade.&#10;The Annihilator gains +100 maximum life." class=" btn-twilight-chassis-png"></div>
           </div>
         </div>
         <div id="class-immortal-tier" class="item-class ss-2">
@@ -1701,96 +1701,96 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3349] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Targeting (Immortal/Annihilator)&#10;Immortals and Annihilators can attack air units." class=" btn-advanced-targeting-png"></div>
-            <div class="f {{'unacquired' if inventory[3380] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Disruptor Dispersion (Immortal/Annihilator)&#10;Immortals and Annihilators deal minor splash damage." class=" btn-disruptor-dispersion-png"></div>
-            <div class="f {{'unacquired' if inventory[3348] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Singularity Charge (Immortal/Annihilator)&#10;Increases Immortal and Annihilator attack range by +2." class=" btn-upgrade-artanis-singularitycharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3349] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Targeting (Immortal/Annihilator)&#10;Immortals and Annihilators can attack air units." class=" btn-advanced-targeting-png"></div>
+            <div class="f {{'unacquired' if inventory[3380] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Disruptor Dispersion (Immortal/Annihilator)&#10;Immortals and Annihilators deal minor splash damage." class=" btn-disruptor-dispersion-png"></div>
+            <div class="f {{'unacquired' if inventory[3348] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Singularity Charge (Immortal/Annihilator)&#10;Increases Immortal and Annihilator attack range by +2." class=" btn-upgrade-artanis-singularitycharge-png"></div>
           </div>
         </div>
         <div id="class-vanguard" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3018] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vanguard&#10;Assault Strider. Deals splash damage around the primary target." class=" btn-unit-protoss-immortal-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3018] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vanguard&#10;Assault Strider. Deals splash damage around the primary target." class=" btn-unit-protoss-immortal-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3346] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Agony Launchers (Vanguard)&#10;Increases Vanguard attack range by +2." class=" btn-ability-protoss-chargedblast-png"></div>
-            <div class="f {{'unacquired' if inventory[3521] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fusion Mortars (Vanguard)&#10;Vanguard War Council upgrade.&#10;Vanguards deal +7 damage to armored targets per attack." class=" btn-upgrade-protoss-vanguard-increasedarmordamage-png"></div>
-            <div class="f {{'unacquired' if inventory[3347] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Matter Dispersion (Vanguard)&#10;Increases Vanguard attack area." class=" btn-upgrade-protoss-vanguard-aoeradiusincreased-png"></div>
-            <div class="f {{'unacquired' if inventory[3520] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid-Fire Cannon (Vanguard)&#10;Vanguard War Council upgrade.&#10;Vanguards attack 60% faster." class=" btn-upgrade-mengsk-engineeringbay-orbitaldrop-png"></div>
+            <div class="f {{'unacquired' if inventory[3346] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Agony Launchers (Vanguard)&#10;Increases Vanguard attack range by +2." class=" btn-ability-protoss-chargedblast-png"></div>
+            <div class="f {{'unacquired' if inventory[3521] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fusion Mortars (Vanguard)&#10;Vanguard War Council upgrade.&#10;Vanguards deal +7 damage to armored targets per attack." class=" btn-upgrade-protoss-vanguard-increasedarmordamage-png"></div>
+            <div class="f {{'unacquired' if inventory[3347] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Matter Dispersion (Vanguard)&#10;Increases Vanguard attack area." class=" btn-upgrade-protoss-vanguard-aoeradiusincreased-png"></div>
+            <div class="f {{'unacquired' if inventory[3520] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid-Fire Cannon (Vanguard)&#10;Vanguard War Council upgrade.&#10;Vanguards attack 60% faster." class=" btn-upgrade-mengsk-engineeringbay-orbitaldrop-png"></div>
           </div>
         </div>
         <div id="class-stalwart" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3030] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stalwart&#10;Assault strider. Has shields that deflect high-damage attacks." class=" btn-unit-collection-purifier-immortal-png"></div>
+            <div class="f {{'unacquired' if inventory[3030] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stalwart&#10;Assault strider. Has shields that deflect high-damage attacks." class=" btn-unit-collection-purifier-immortal-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3523] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Arc Inducers (Stalwart)&#10;Stalwart War Council upgrade.&#10;Stalwarts damage up to 3 additional units when attacking." class=" btn-arc-inducers-png"></div>
-            <div class="f {{'unacquired' if inventory[3387] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="High Voltage Capacitors (Stalwart)&#10;Increases Stalwart attack bounce range by +1." class=" btn-high-voltage-capacitors-png"></div>
-            <div class="f {{'unacquired' if inventory[3390] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Latticed Shielding (Stalwart)&#10;Increases Stalwart max shields by +50." class=" btn-latticed-shielding-png"></div>
-            <div class="f {{'unacquired' if inventory[3388] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reintegrated Framework (Stalwart)&#10;Increases the movement speed of Stalwarts." class=" btn-reintigrated-framework-png"></div>
-            <div class="f {{'unacquired' if inventory[3389] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stabilized Electrodes (Stalwart)&#10;Allows Stalwarts to attack while moving, and increases attack range by +1." class=" btn-stabilized-electrodes-png"></div>
+            <div class="f {{'unacquired' if inventory[3523] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Arc Inducers (Stalwart)&#10;Stalwart War Council upgrade.&#10;Stalwarts damage up to 3 additional units when attacking." class=" btn-arc-inducers-png"></div>
+            <div class="f {{'unacquired' if inventory[3387] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="High Voltage Capacitors (Stalwart)&#10;Increases Stalwart attack bounce range by +1." class=" btn-high-voltage-capacitors-png"></div>
+            <div class="f {{'unacquired' if inventory[3390] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Latticed Shielding (Stalwart)&#10;Increases Stalwart max shields by +50." class=" btn-latticed-shielding-png"></div>
+            <div class="f {{'unacquired' if inventory[3388] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reintegrated Framework (Stalwart)&#10;Increases the movement speed of Stalwarts." class=" btn-reintigrated-framework-png"></div>
+            <div class="f {{'unacquired' if inventory[3389] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stabilized Electrodes (Stalwart)&#10;Allows Stalwarts to attack while moving, and increases attack range by +1." class=" btn-stabilized-electrodes-png"></div>
           </div>
         </div>
         <div id="class-colossus" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1705] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Colossus&#10;Battle strider with a powerful area attack. Can walk up and down cliffs. Attacks set fire to the ground, dealing extra damage to enemies over time." class=" btn-unit-protoss-colossus-png"></div>
+            <div class="f {{'unacquired' if inventory[1705] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Colossus&#10;Battle strider with a powerful area attack. Can walk up and down cliffs. Attacks set fire to the ground, dealing extra damage to enemies over time." class=" btn-unit-protoss-colossus-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3524] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fire Lance (Colossus)&#10;Colossus War Council upgrade.&#10;Colossi set the ground on fire with their attacks, dealing damage to enemies over time." class=" btn-ability-protoss-firebeam-png"></div>
-            <div class="f {{'unacquired' if inventory[3350] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pacification Protocol (Colossus)&#10;Increases Colossus attack speed." class=" btn-pacification-protocols-png"></div>
+            <div class="f {{'unacquired' if inventory[3524] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fire Lance (Colossus)&#10;Colossus War Council upgrade.&#10;Colossi set the ground on fire with their attacks, dealing damage to enemies over time." class=" btn-ability-protoss-firebeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3350] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pacification Protocol (Colossus)&#10;Increases Colossus attack speed." class=" btn-pacification-protocols-png"></div>
           </div>
         </div>
         <div id="class-wrathwalker" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3019] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Wrathwalker&#10;Battle strider with a powerful single-target attack. Can walk up and down cliffs." class=" btn-unit-protoss-colossus-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3019] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Wrathwalker&#10;Battle strider with a powerful single-target attack. Can walk up and down cliffs." class=" btn-unit-protoss-colossus-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3525] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Aerial Tracking (Wrathwalker)&#10;Wrathwalker War Council upgrade.&#10;Wrathwalkers can now target air units." class=" btn-upgrade-protoss-wrathwalker-cantargetairunits-png"></div>
-            <div class="f {{'unacquired' if inventory[3352] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Eye of Wrath (Wrathwalker)&#10;Increases Wrathwalker weapon range by +1." class=" btn-eye-of-wrath-png"></div>
-            <div class="f {{'unacquired' if inventory[3351] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rapid Power Cycling (Wrathwalker)&#10;Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast." class=" btn-upgrade-protoss-wrathwalker-chargetimeimproved-png"></div>
+            <div class="f {{'unacquired' if inventory[3525] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Aerial Tracking (Wrathwalker)&#10;Wrathwalker War Council upgrade.&#10;Wrathwalkers can now target air units." class=" btn-upgrade-protoss-wrathwalker-cantargetairunits-png"></div>
+            <div class="f {{'unacquired' if inventory[3352] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Eye of Wrath (Wrathwalker)&#10;Increases Wrathwalker weapon range by +1." class=" btn-eye-of-wrath-png"></div>
+            <div class="f {{'unacquired' if inventory[3351] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rapid Power Cycling (Wrathwalker)&#10;Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast." class=" btn-upgrade-protoss-wrathwalker-chargetimeimproved-png"></div>
           </div>
         </div>
         <div id="class-reaver" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3020] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reaver&#10;Area damage siege unit. Builds and launches explosive Scarabs for high burst damage." class=" btn-unit-protoss-reaver-png"></div>
+            <div class="f {{'unacquired' if inventory[3020] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reaver&#10;Area damage siege unit. Builds and launches explosive Scarabs for high burst damage." class=" btn-unit-protoss-reaver-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3420] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Reaver)&#10;Reduces Reaver cost by 50 minerals, 75 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
-            <div class="f {{'unacquired' if inventory[3526] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Khalai Replicators (Reaver)&#10;Reaver War Council upgrade.&#10;Reaver Scarabs no longer cost minerals." class=" btn-ability-protoss-entomb-png"></div>
-            <div class="f {{'unacquired' if inventory[3344] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reaver Capacity (Reaver)&#10;Reavers can store 10 Scarabs." class=" btn-upgrade-protoss-increasedscarabcapacityscbw-png"></div>
-            <div class="f {{'unacquired' if inventory[3345] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Reaver)&#10;Reduces Reaver cost by 50 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[3342] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scarab Damage (Reaver)&#10;Reaver Scarabs deal +25 damage." class=" btn-upgrade-artanis-scarabsplashradius-png"></div>
-            <div class="f {{'unacquired' if inventory[3343] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solarite Payload (Reaver)&#10;Reaver Scarabs gain increased splash damage radius." class=" btn-solarite-payload-png"></div>
+            <div class="f {{'unacquired' if inventory[3420] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bargain Bin Prices (Reaver)&#10;Reduces Reaver cost by 50 minerals, 75 gas, and 1 supply." class=" icon-bargain-bin-prices-png"></div>
+            <div class="f {{'unacquired' if inventory[3526] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Khalai Replicators (Reaver)&#10;Reaver War Council upgrade.&#10;Reaver Scarabs no longer cost minerals." class=" btn-ability-protoss-entomb-png"></div>
+            <div class="f {{'unacquired' if inventory[3344] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reaver Capacity (Reaver)&#10;Reavers can store 10 Scarabs." class=" btn-upgrade-protoss-increasedscarabcapacityscbw-png"></div>
+            <div class="f {{'unacquired' if inventory[3345] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Reaver)&#10;Reduces Reaver cost by 50 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3342] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scarab Damage (Reaver)&#10;Reaver Scarabs deal +25 damage." class=" btn-upgrade-artanis-scarabsplashradius-png"></div>
+            <div class="f {{'unacquired' if inventory[3343] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solarite Payload (Reaver)&#10;Reaver Scarabs gain increased splash damage radius." class=" btn-solarite-payload-png"></div>
           </div>
         </div>
         <div id="class-disruptor" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3021] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Disruptor&#10;Robotic disruption unit. Can use the Purification Nova ability to deal heavy area damage." class=" btn-unit-collection-purifier-disruptor-png"></div>
+            <div class="f {{'unacquired' if inventory[3021] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Disruptor&#10;Robotic disruption unit. Can use the Purification Nova ability to deal heavy area damage." class=" btn-unit-collection-purifier-disruptor-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3381] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Cloaking Module (Disruptor)&#10;Disruptors are permanently cloaked." class=" btn-upgrade-protoss-fenix-disruptorpermanentcloak-png"></div>
-            <div class="f {{'unacquired' if inventory[3527] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mobility Protocols (Disruptor)&#10;Disruptor War Council upgrade.&#10;Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink." class=" btn-mobility-protocols-png"></div>
-            <div class="f {{'unacquired' if inventory[3382] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Perfected Power (Disruptor)&#10;Allows Purification Nova to hit air units. Bonus damage to shields is now baseline for enemies (friendly damage unaffected)." class=" btn-ability-spearofadun-purifierbeam-png"></div>
-            <div class="f {{'unacquired' if inventory[3383] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Restrained Destruction (Disruptor)&#10;Purification Nova does 50% reduced damage to friendly units and structures." class=" btn-upgrade-stetmann-banelingmanashieldefficiency-png"></div>
+            <div class="f {{'unacquired' if inventory[3381] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Cloaking Module (Disruptor)&#10;Disruptors are permanently cloaked." class=" btn-upgrade-protoss-fenix-disruptorpermanentcloak-png"></div>
+            <div class="f {{'unacquired' if inventory[3527] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mobility Protocols (Disruptor)&#10;Disruptor War Council upgrade.&#10;Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink." class=" btn-mobility-protocols-png"></div>
+            <div class="f {{'unacquired' if inventory[3382] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Perfected Power (Disruptor)&#10;Allows Purification Nova to hit air units. Bonus damage to shields is now baseline for enemies (friendly damage unaffected)." class=" btn-ability-spearofadun-purifierbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3383] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Restrained Destruction (Disruptor)&#10;Purification Nova does 50% reduced damage to friendly units and structures." class=" btn-upgrade-stetmann-banelingmanashieldefficiency-png"></div>
           </div>
         </div>
         <div id="class-observer" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3000] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Observer&#10;Flying spy. Cloak renders the unit invisible to enemies without detection." class=" btn-unit-protoss-observer-png"></div>
+            <div class="f {{'unacquired' if inventory[3000] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Observer&#10;Flying spy. Cloak renders the unit invisible to enemies without detection." class=" btn-unit-protoss-observer-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3340] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Gravitic Boosters (Observer)&#10;Increases Observer movement speed." class=" btn-upgrade-protoss-graviticbooster-png"></div>
-            <div class="f {{'unacquired' if inventory[3529] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Induce Scopophobia (Observer)&#10;Observer War Council ability.&#10;Observers gain the Induce Scopophobia ability, &#10;which reduces the attack and movement speed of an enemy by 20%." class=" btn-upgrade-afaidofthedark-png"></div>
-            <div class="f {{'unacquired' if inventory[3341] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sensor Array (Observer)&#10;Increases Observer sight range." class=" btn-ability-zeratul-observer-sensorarray-png"></div>
+            <div class="f {{'unacquired' if inventory[3340] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Gravitic Boosters (Observer)&#10;Increases Observer movement speed." class=" btn-upgrade-protoss-graviticbooster-png"></div>
+            <div class="f {{'unacquired' if inventory[3529] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Induce Scopophobia (Observer)&#10;Observer War Council ability.&#10;Observers gain the Induce Scopophobia ability, &#10;which reduces the attack and movement speed of an enemy by 20%." class=" btn-upgrade-afaidofthedark-png"></div>
+            <div class="f {{'unacquired' if inventory[3341] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sensor Array (Observer)&#10;Increases Observer sight range." class=" btn-ability-zeratul-observer-sensorarray-png"></div>
           </div>
         </div>
         <div id="class-warp-prism" class="item-class ss-2">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3016] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Warp Prism&#10;Flying transport. Can carry units and become stationary to deploy a power field." class=" btn-unit-protoss-warpprism-png"></div>
+            <div class="f {{'unacquired' if inventory[3016] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Warp Prism&#10;Flying transport. Can carry units and become stationary to deploy a power field." class=" btn-unit-protoss-warpprism-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3337] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Gravitic Drive (Warp Prism)&#10;Increases the movement speed of Warp Prisms." class=" btn-upgrade-protoss-graviticdrive-png"></div>
-            <div class="f {{'unacquired' if inventory[3338] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phase Blaster (Warp Prism)&#10;Equips Warp Prisms with an auto-attack that can hit ground and air targets." class=" btn-phase-blaster-png"></div>
-            <div class="f {{'unacquired' if inventory[3528] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Warp Refraction (Warp Prism)&#10;Warp Prism War Council upgrade.&#10;Warp Prisms gain +5 pickup range and unload units 10 times faster." class=" btn-warp-refraction-png"></div>
-            <div class="f {{'unacquired' if inventory[3339] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="War Configuration (Warp Prism)&#10;Warp Prisms transform faster and gain increased power radius in Phasing Mode." class=" btn-upgrade-protoss-alarak-graviticdrive-png"></div>
+            <div class="f {{'unacquired' if inventory[3337] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Gravitic Drive (Warp Prism)&#10;Increases the movement speed of Warp Prisms." class=" btn-upgrade-protoss-graviticdrive-png"></div>
+            <div class="f {{'unacquired' if inventory[3338] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phase Blaster (Warp Prism)&#10;Equips Warp Prisms with an auto-attack that can hit ground and air targets." class=" btn-phase-blaster-png"></div>
+            <div class="f {{'unacquired' if inventory[3528] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Warp Refraction (Warp Prism)&#10;Warp Prism War Council upgrade.&#10;Warp Prisms gain +5 pickup range and unload units 10 times faster." class=" btn-warp-refraction-png"></div>
+            <div class="f {{'unacquired' if inventory[3339] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="War Configuration (Warp Prism)&#10;Warp Prisms transform faster and gain increased power radius in Phasing Mode." class=" btn-upgrade-protoss-alarak-graviticdrive-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -1798,26 +1798,26 @@
         </div>
         <div id="class-phoenix" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1706] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phoenix&#10;Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities." class=" btn-unit-protoss-phoenix-png"></div>
+            <div class="f {{'unacquired' if inventory[1706] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phoenix&#10;Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities." class=" btn-unit-protoss-phoenix-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3530] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Double Graviton Beam (Phoenix)&#10;Phoenix War Council upgrade.&#10;Phoenixes can now use Graviton Beam to lift two targets at once." class=" btn-ability-protoss-dualgravitonbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3530] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Double Graviton Beam (Phoenix)&#10;Phoenix War Council upgrade.&#10;Phoenixes can now use Graviton Beam to lift two targets at once." class=" btn-ability-protoss-dualgravitonbeam-png"></div>
           </div>
         </div>
         <div id="class-mirage" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3022] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mirage&#10;Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities." class=" btn-unit-protoss-phoenix-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3022] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mirage&#10;Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities." class=" btn-unit-protoss-phoenix-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3532] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Graviton Beam (Mirage)&#10;Mirage War Council ability.&#10;Allows Mirages to use Graviton Beam." class=" btn-ability-protoss-gravitonbeam-color-png"></div>
+            <div class="f {{'unacquired' if inventory[3532] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Graviton Beam (Mirage)&#10;Mirage War Council ability.&#10;Allows Mirages to use Graviton Beam." class=" btn-ability-protoss-gravitonbeam-color-png"></div>
           </div>
         </div>
         <div id="class-skirmisher" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3035] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Skirmisher&#10;Fast skirmish starfighter. Can target ground units." class=" btn-unit-collection-taldarim-phoenix-png"></div>
+            <div class="f {{'unacquired' if inventory[3035] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Skirmisher&#10;Fast skirmish starfighter. Can target ground units." class=" btn-unit-collection-taldarim-phoenix-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3533] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Peer Contempt (Skirmisher)&#10;Skirmisher War Council upgrade.&#10;Allows Skirmishers to target air units." class=" btn-peer-contempt-png"></div>
+            <div class="f {{'unacquired' if inventory[3533] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Peer Contempt (Skirmisher)&#10;Skirmisher War Council upgrade.&#10;Allows Skirmishers to target air units." class=" btn-peer-contempt-png"></div>
           </div>
         </div>
         <div id="class-phoenix-tier" class="item-class ss-3">
@@ -1825,57 +1825,57 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3320] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anion Pulse-Crystals (Phoenix/Mirage/Skirmisher)&#10;Increases Phoenix, Mirage, and Skirmiser range by +2." class=" btn-upgrade-protoss-phoenixrange-png"></div>
-            <div class="f {{'unacquired' if inventory[3319] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ionic Wavelength Flux (Phoenix/Mirage/Skirmisher)&#10;Increases Phoenix, Mirage, and Skirmisher weapon damage by +2." class=" btn-iconic-wavelength-flux-png"></div>
+            <div class="f {{'unacquired' if inventory[3320] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anion Pulse-Crystals (Phoenix/Mirage/Skirmisher)&#10;Increases Phoenix, Mirage, and Skirmiser range by +2." class=" btn-upgrade-protoss-phoenixrange-png"></div>
+            <div class="f {{'unacquired' if inventory[3319] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ionic Wavelength Flux (Phoenix/Mirage/Skirmisher)&#10;Increases Phoenix, Mirage, and Skirmisher weapon damage by +2." class=" btn-iconic-wavelength-flux-png"></div>
           </div>
         </div>
         <div id="class-corsair" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3023] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corsair&#10;Air superiority starfighter. Can use the Disruption Web ability." class=" btn-unit-protoss-corsair-png"></div>
+            <div class="f {{'unacquired' if inventory[3023] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corsair&#10;Air superiority starfighter. Can use the Disruption Web ability." class=" btn-unit-protoss-corsair-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3322] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Argus Jewel (Corsair)&#10;Corsairs can store 2 charges of disruption web." class=" btn-ability-protoss-stasistrap-png"></div>
-            <div class="f {{'unacquired' if inventory[3531] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Network Disruption (Corsair)&#10;Corsair War Council upgrade.&#10;Triples the radius of Disruption Web." class=" btn-ability-protoss-disruptionblast-png"></div>
-            <div class="f {{'unacquired' if inventory[3324] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Neutron Shields (Corsair)&#10;Increases corsair maximum shields by +20." class=" btn-neutron-shields-png"></div>
-            <div class="f {{'unacquired' if inventory[3321] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stealth Drive (Corsair)&#10;Corsairs become permanently cloaked." class=" btn-upgrade-vorazun-corsairpermanentlycloaked-png"></div>
-            <div class="f {{'unacquired' if inventory[3323] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Sustaining Disruption (Corsair)&#10;Corsair disruption webs last longer." class=" btn-sustaining-disruption-png"></div>
+            <div class="f {{'unacquired' if inventory[3322] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Argus Jewel (Corsair)&#10;Corsairs can store 2 charges of disruption web." class=" btn-ability-protoss-stasistrap-png"></div>
+            <div class="f {{'unacquired' if inventory[3531] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Network Disruption (Corsair)&#10;Corsair War Council upgrade.&#10;Triples the radius of Disruption Web." class=" btn-ability-protoss-disruptionblast-png"></div>
+            <div class="f {{'unacquired' if inventory[3324] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Neutron Shields (Corsair)&#10;Increases corsair maximum shields by +20." class=" btn-neutron-shields-png"></div>
+            <div class="f {{'unacquired' if inventory[3321] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stealth Drive (Corsair)&#10;Corsairs become permanently cloaked." class=" btn-upgrade-vorazun-corsairpermanentlycloaked-png"></div>
+            <div class="f {{'unacquired' if inventory[3323] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Sustaining Disruption (Corsair)&#10;Corsair disruption webs last longer." class=" btn-sustaining-disruption-png"></div>
           </div>
         </div>
         <div id="class-void-ray" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1707] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Void Ray&#10;Surgical strike craft. Has the Prismatic Alignment and Prismatic Range abilities." class=" btn-unit-protoss-warpray-png"></div>
+            <div class="f {{'unacquired' if inventory[1707] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Void Ray&#10;Surgical strike craft. Has the Prismatic Alignment and Prismatic Range abilities." class=" btn-unit-protoss-warpray-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3534] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Prismatic Range (Void Ray)&#10;Void Ray War Council upgrade.&#10;Void Rays gain increased range as they charge their beam." class=" btn-ability-protoss-prismaticrange-png"></div>
+            <div class="f {{'unacquired' if inventory[3534] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Prismatic Range (Void Ray)&#10;Void Ray War Council upgrade.&#10;Void Rays gain increased range as they charge their beam." class=" btn-ability-protoss-prismaticrange-png"></div>
           </div>
         </div>
         <div id="class-destroyer" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3024] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Destroyer&#10;Area assault craft. Can use the Destruction Beam ability to attack multiple units at once." class=" btn-unit-protoss-voidray-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3024] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Destroyer&#10;Area assault craft. Can use the Destruction Beam ability to attack multiple units at once." class=" btn-unit-protoss-voidray-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3336] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reforged Bloodshard Core (Destroyer)&#10;Destroyer War Council upgrade.&#10;Increases the Destroyer's bounce attack damage to 3 (+2 vs armored) at all charge levels, and allows the bounces to benefit from protoss air weapon upgrades." class=" btn-amonshardsarmor-png"></div>
-            <div class="f {{'unacquired' if inventory[3535] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Destroyer)&#10;Reduces Destroyer cost by 50 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3336] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reforged Bloodshard Core (Destroyer)&#10;Destroyer War Council upgrade.&#10;Increases the Destroyer's bounce attack damage to 3 (+2 vs armored) at all charge levels, and allows the bounces to benefit from protoss air weapon upgrades." class=" btn-amonshardsarmor-png"></div>
+            <div class="f {{'unacquired' if inventory[3535] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Destroyer)&#10;Reduces Destroyer cost by 50 minerals, 25 gas, and 1 supply." class=" btn-ability-hornerhan-salvagebonus-png"></div>
           </div>
         </div>
         <div id="class-pulsar" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3031] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pulsar&#10;Support craft. Applies a stacking slow to targets." class=" btn-unit-voidray-aiur-png"></div>
+            <div class="f {{'unacquired' if inventory[3031] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pulsar&#10;Support craft. Applies a stacking slow to targets." class=" btn-unit-voidray-aiur-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3396] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chronoclysm (Pulsar)&#10;Pulsar slow effect is also applied in an area around the primary target." class=" btn-ability-zeratul-avatarofform-psionicblast-png"></div>
-            <div class="f {{'unacquired' if inventory[3536] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chrono Shear (Pulsar)&#10;Pulsar War Council upgrade.&#10;Fully-stacked slow on non-heroic targets also applies a defense debuff." class=" btn-ability-spearofadun-chronomancy-png"></div>
-            <div class="f {{'unacquired' if inventory[3397] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Entropic Reversal (Pulsar)&#10;Pulsars now regenerate life when out of combat." class=" btn-ability-protoss-stasistrap-png"></div>
+            <div class="f {{'unacquired' if inventory[3396] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chronoclysm (Pulsar)&#10;Pulsar slow effect is also applied in an area around the primary target." class=" btn-ability-zeratul-avatarofform-psionicblast-png"></div>
+            <div class="f {{'unacquired' if inventory[3536] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chrono Shear (Pulsar)&#10;Pulsar War Council upgrade.&#10;Fully-stacked slow on non-heroic targets also applies a defense debuff." class=" btn-ability-spearofadun-chronomancy-png"></div>
+            <div class="f {{'unacquired' if inventory[3397] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Entropic Reversal (Pulsar)&#10;Pulsars now regenerate life when out of combat." class=" btn-ability-protoss-stasistrap-png"></div>
           </div>
         </div>
         <div id="class-dawnbringer" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3032] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Dawnbringer&#10;Flying Anti-Surface Assault Ship. Attacks in an area around the target. Attack count increases as it continues firing." class=" btn-unit-protoss-voidray-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3032] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Dawnbringer&#10;Flying Anti-Surface Assault Ship. Attacks in an area around the target. Attack count increases as it continues firing." class=" btn-unit-protoss-voidray-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3385] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Anti-Surface Countermeasures (Dawnbringer)&#10;Dawnbringers take reduced damage from non-spell ground sources." class=" btn-anti-surface-countermeasures-png"></div>
-            <div class="f {{'unacquired' if inventory[3386] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enhanced Shield Generator (Dawnbringer)&#10;Increases Dawnbringer maximum shields by +50." class=" btn-enhanced-shield-generator-png"></div>
-            <div class="f {{'unacquired' if inventory[3537] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solarite Lens (Dawnbringer)&#10;Dawnbringer War Council upgrade.&#10;Dawnbringers gain +2 range." class=" btn-solarite-lens-png"></div>
+            <div class="f {{'unacquired' if inventory[3385] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Anti-Surface Countermeasures (Dawnbringer)&#10;Dawnbringers take reduced damage from non-spell ground sources." class=" btn-anti-surface-countermeasures-png"></div>
+            <div class="f {{'unacquired' if inventory[3386] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enhanced Shield Generator (Dawnbringer)&#10;Increases Dawnbringer maximum shields by +50." class=" btn-enhanced-shield-generator-png"></div>
+            <div class="f {{'unacquired' if inventory[3537] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solarite Lens (Dawnbringer)&#10;Dawnbringer War Council upgrade.&#10;Dawnbringers gain +2 range." class=" btn-solarite-lens-png"></div>
           </div>
         </div>
         <div id="class-void-ray-tier" class="item-class ss-3">
@@ -1883,49 +1883,49 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3335] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Flux Vanes (Void Ray/Destroyer/Pulsar/Dawnbringer)&#10;Increases movement speed of Void Ray variants." class=" btn-upgrade-protoss-fluxvanes-png"></div>
+            <div class="f {{'unacquired' if inventory[3335] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Flux Vanes (Void Ray/Destroyer/Pulsar/Dawnbringer)&#10;Increases movement speed of Void Ray variants." class=" btn-upgrade-protoss-fluxvanes-png"></div>
           </div>
         </div>
         <div id="class-scout" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3025] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Scout&#10;Versatile high-speed fighter. Has a powerful anti-armored air attack and a weaker anti-ground attack." class=" btn-unit-protoss-scout-png"></div>
+            <div class="f {{'unacquired' if inventory[3025] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Scout&#10;Versatile high-speed fighter. Has a powerful anti-armored air attack and a weaker anti-ground attack." class=" btn-unit-protoss-scout-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3313] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Apial Sensors (Scout)&#10;Scouts gain increased sight range." class=" btn-apial-sensors-png"></div>
-            <div class="f {{'unacquired' if inventory[3542] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Expeditionary Hull (Scout)&#10;Scout War Council upgrade.&#10;Scouts gain +25 shields, +50 health, +1 shield armor, and reduced shield regeneration delay." class=" btn-upgrade-stetmann-zerglinghardenedshield-png"></div>
-            <div class="f {{'unacquired' if inventory[3379] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Scout)&#10;Reduces Scout cost by 75 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[3419] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Supply Efficiency (Scout)&#10;Reduces Scout cost by 50 minerals and 1 supply." class=" talent-artanis-level14-startingmaxsupply-png"></div>
+            <div class="f {{'unacquired' if inventory[3313] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Apial Sensors (Scout)&#10;Scouts gain increased sight range." class=" btn-apial-sensors-png"></div>
+            <div class="f {{'unacquired' if inventory[3542] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Expeditionary Hull (Scout)&#10;Scout War Council upgrade.&#10;Scouts gain +25 shields, +50 health, +1 shield armor, and reduced shield regeneration delay." class=" btn-upgrade-stetmann-zerglinghardenedshield-png"></div>
+            <div class="f {{'unacquired' if inventory[3379] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Scout)&#10;Reduces Scout cost by 75 minerals and 25 gas." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3419] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Supply Efficiency (Scout)&#10;Reduces Scout cost by 50 minerals and 1 supply." class=" talent-artanis-level14-startingmaxsupply-png"></div>
           </div>
         </div>
         <div id="class-oppressor" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3038] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Oppressor&#10;Tal'Darim Scout variant. Has a weaker air attack, but a stronger ground attack. Can use the Vulcan Blaster ability." class=" btn-unit-protoss-scouttaldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3038] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Oppressor&#10;Tal'Darim Scout variant. Has a weaker air attack, but a stronger ground attack. Can use the Vulcan Blaster ability." class=" btn-unit-protoss-scouttaldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3408] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Accelerated Warp (Oppressor)&#10;Oppressors gain increased training and warp-in speed." class=" btn-accelerated-warp-png"></div>
-            <div class="f {{'unacquired' if inventory[3409] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Armor Melting Blasters (Oppressor)&#10;Oppressor ground weapons gain bonus damage to armored targets. Allows Vulcan Blaster to hit structures." class=" btn-armor-metling-blasters-png"></div>
-            <div class="f {{'unacquired' if inventory[3550] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vulcan Blaster (Oppressor)&#10;Oppressor War Council ability.&#10;Oppressors gain the Vulcan Blaster ability, &#10;which activates a powerful short range anti-ground weapon for a limited time. Greatly reduces movement and turning speed, and disables other weapons while active." class=" btn-ability-protoss-vulcanblaster-png"></div>
+            <div class="f {{'unacquired' if inventory[3408] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Accelerated Warp (Oppressor)&#10;Oppressors gain increased training and warp-in speed." class=" btn-accelerated-warp-png"></div>
+            <div class="f {{'unacquired' if inventory[3409] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Armor Melting Blasters (Oppressor)&#10;Oppressor ground weapons gain bonus damage to armored targets. Allows Vulcan Blaster to hit structures." class=" btn-armor-metling-blasters-png"></div>
+            <div class="f {{'unacquired' if inventory[3550] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vulcan Blaster (Oppressor)&#10;Oppressor War Council ability.&#10;Oppressors gain the Vulcan Blaster ability, &#10;which activates a powerful short range anti-ground weapon for a limited time. Greatly reduces movement and turning speed, and disables other weapons while active." class=" btn-ability-protoss-vulcanblaster-png"></div>
           </div>
         </div>
         <div id="class-caladrius" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3039] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Caladrius&#10;Purifier Scout variant. Has no ground attack, but a stronger air attack, which can be upgraded to hit multiple targets. Can use the Corona Beam ability." class=" btn-unit-protoss-scoutpurifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3039] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Caladrius&#10;Purifier Scout variant. Has no ground attack, but a stronger air attack, which can be upgraded to hit multiple targets. Can use the Corona Beam ability." class=" btn-unit-protoss-scoutpurifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3551] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Corona Beam (Caladrius)&#10;Caladrius War Council ability.&#10;Caladrius gain the Corona Beam ability, &#10;which channels a beam that drains up to 100 of the Caladrius' shields to deal up to 200 damage over time to a single target." class=" btn-ability-protoss-coronabeam-png"></div>
-            <div class="f {{'unacquired' if inventory[3410] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Side Missiles (Caladrius)&#10;Caladrius can hit up to 4 additional air targets with their missiles." class=" btn-side-missiles-png"></div>
-            <div class="f {{'unacquired' if inventory[3412] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solarite Reactor (Caladrius)&#10;If the Caladrius is low on shields, it recovers shields quickly for a short time." class=" btn-ability-zeratul-darkarchon-maelstrom-png"></div>
-            <div class="f {{'unacquired' if inventory[3411] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Structure Targeting (Caladrius)&#10;Allows Caladrius to hit ground structures with their anti-air missiles." class=" btn-caladrius-structure-png"></div>
+            <div class="f {{'unacquired' if inventory[3551] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Corona Beam (Caladrius)&#10;Caladrius War Council ability.&#10;Caladrius gain the Corona Beam ability, &#10;which channels a beam that drains up to 100 of the Caladrius' shields to deal up to 200 damage over time to a single target." class=" btn-ability-protoss-coronabeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3410] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Side Missiles (Caladrius)&#10;Caladrius can hit up to 4 additional air targets with their missiles." class=" btn-side-missiles-png"></div>
+            <div class="f {{'unacquired' if inventory[3412] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solarite Reactor (Caladrius)&#10;If the Caladrius is low on shields, it recovers shields quickly for a short time." class=" btn-ability-zeratul-darkarchon-maelstrom-png"></div>
+            <div class="f {{'unacquired' if inventory[3411] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Structure Targeting (Caladrius)&#10;Allows Caladrius to hit ground structures with their anti-air missiles." class=" btn-caladrius-structure-png"></div>
           </div>
         </div>
         <div id="class-mist-wing" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3040] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mist Wing&#10;Nerazim Scout variant. Specialized stealth fighter. Can use the Cloak, Phantom Dash and Pilot (Transport) abilities." class=" btn-unit-protoss-scoutnerazim-png"></div>
+            <div class="f {{'unacquired' if inventory[3040] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mist Wing&#10;Nerazim Scout variant. Specialized stealth fighter. Can use the Cloak, Phantom Dash and Pilot (Transport) abilities." class=" btn-unit-protoss-scoutnerazim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3413] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Null Shroud (Mist Wing)&#10;Cloak no longer drains energy (but still prevents base energy regeneration). The Mist Wing becomes undetectable for 5 seconds upon cloaking." class=" btn-null-shroud-png"></div>
-            <div class="f {{'unacquired' if inventory[3552] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Phantom Dash (Mist Wing)&#10;Mist Wing War Council ability.&#10;Mist Wings gain the Phantom Dash ability, &#10;which dashes forward to cover some distance quickly. Deals damage in a line if the Mist Wing is cloaked." class=" btn-ability-protoss-phantomdash-png"></div>
-            <div class="f {{'unacquired' if inventory[3414] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pilot (Mist Wing)&#10;Mistwings gain the Pilot ability, &#10;which can transport one unit as an additional co-pilot. A pilot grants a small bonus to damage and armor." class=" btn-ability-protoss-veilofshadowsvorazun-png"></div>
+            <div class="f {{'unacquired' if inventory[3413] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Null Shroud (Mist Wing)&#10;Cloak no longer drains energy (but still prevents base energy regeneration). The Mist Wing becomes undetectable for 5 seconds upon cloaking." class=" btn-null-shroud-png"></div>
+            <div class="f {{'unacquired' if inventory[3552] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Phantom Dash (Mist Wing)&#10;Mist Wing War Council ability.&#10;Mist Wings gain the Phantom Dash ability, &#10;which dashes forward to cover some distance quickly. Deals damage in a line if the Mist Wing is cloaked." class=" btn-ability-protoss-phantomdash-png"></div>
+            <div class="f {{'unacquired' if inventory[3414] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pilot (Mist Wing)&#10;Mistwings gain the Pilot ability, &#10;which can transport one unit as an additional co-pilot. A pilot grants a small bonus to damage and armor." class=" btn-ability-protoss-veilofshadowsvorazun-png"></div>
           </div>
         </div>
         <div id="class-scout-tier" class="item-class ss-3">
@@ -1933,33 +1933,33 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3315] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Advanced Photon Blasters (Scout/Oppressor/Mist Wing)&#10;Scouts, Oppressors and Mist Wings gain increased damage against ground targets." class=" btn-advanced-photon-blasters-png"></div>
-            <div class="f {{'unacquired' if inventory[3312] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Combat Sensor Array (Scout/Oppressor/Caladrius/Mist Wing)&#10;All Scout variants gain increased range against air and ground." class=" btn-upgrade-protoss-fenix-scoutchampionrange-png"></div>
-            <div class="f {{'unacquired' if inventory[3314] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Gravitic Thrusters (Scout/Oppressor/Caladrius/Mist Wing)&#10;All Scout variants gain increased movement speed." class=" btn-gravitic-thrusters-png"></div>
+            <div class="f {{'unacquired' if inventory[3315] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Advanced Photon Blasters (Scout/Oppressor/Mist Wing)&#10;Scouts, Oppressors and Mist Wings gain increased damage against ground targets." class=" btn-advanced-photon-blasters-png"></div>
+            <div class="f {{'unacquired' if inventory[3312] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Combat Sensor Array (Scout/Oppressor/Caladrius/Mist Wing)&#10;All Scout variants gain increased range against air and ground." class=" btn-upgrade-protoss-fenix-scoutchampionrange-png"></div>
+            <div class="f {{'unacquired' if inventory[3314] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Gravitic Thrusters (Scout/Oppressor/Caladrius/Mist Wing)&#10;All Scout variants gain increased movement speed." class=" btn-gravitic-thrusters-png"></div>
           </div>
         </div>
         <div id="class-carrier" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1708] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Carrier&#10;Capital ship. Builds and launches Interceptors that attack enemy targets. Repair Drones heal nearby mechanical units." class=" btn-unit-protoss-carrier-png"></div>
+            <div class="f {{'unacquired' if inventory[1708] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Carrier&#10;Capital ship. Builds and launches Interceptors that attack enemy targets. Repair Drones heal nearby mechanical units." class=" btn-unit-protoss-carrier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3538] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Repair Drones (Carrier)&#10;Carrier War Council upgrade.&#10;Carriers gain 2 repair drones which heal nearby mechanical units." class=" btn-ability-protoss-carrierrepairdrones-png"></div>
+            <div class="f {{'unacquired' if inventory[3538] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Repair Drones (Carrier)&#10;Carrier War Council upgrade.&#10;Carriers gain 2 repair drones which heal nearby mechanical units." class=" btn-ability-protoss-carrierrepairdrones-png"></div>
           </div>
         </div>
         <div id="class-trireme" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3034] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Trireme&#10;Capital ship. Builds and launches Bombers that attack enemy targets." class=" btn-unit-collection-purifier-carrier-png"></div>
+            <div class="f {{'unacquired' if inventory[3034] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Trireme&#10;Capital ship. Builds and launches Bombers that attack enemy targets." class=" btn-unit-collection-purifier-carrier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3540] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solar Beam (Trireme)&#10;Trireme War Council weapon.&#10;Triremes gain an anti-air laser attack that deals more damage over time." class=" btn-upgrade-protoss-fenix-carrier-solarbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3540] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solar Beam (Trireme)&#10;Trireme War Council weapon.&#10;Triremes gain an anti-air laser attack that deals more damage over time." class=" btn-upgrade-protoss-fenix-carrier-solarbeam-png"></div>
           </div>
         </div>
         <div id="class-skylord" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3033] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Skylord&#10;Capital ship. Fires a powerful laser that deals damage in a line. Can use Tactical Jump ability." class=" btn-unit-collection-taldarim-carrier-png"></div>
+            <div class="f {{'unacquired' if inventory[3033] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Skylord&#10;Capital ship. Fires a powerful laser that deals damage in a line. Can use Tactical Jump ability." class=" btn-unit-collection-taldarim-carrier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3539] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jump (Skylord)&#10;Skylord War Council ability.&#10;Skylords gain the Jump ability, &#10;which instantly teleports the Skylord a short distance." class=" btn-jump-png"></div>
+            <div class="f {{'unacquired' if inventory[3539] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jump (Skylord)&#10;Skylord War Council ability.&#10;Skylords gain the Jump ability, &#10;which instantly teleports the Skylord a short distance." class=" btn-jump-png"></div>
           </div>
         </div>
         <div id="class-carrier-tier" class="item-class ss-3">
@@ -1967,53 +1967,53 @@
             <div class="spacer"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3334] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hull of Past Glories (Carrier/Skylord/Trireme)&#10;Carrier-class ships gain +2 armor." class=" btn-hull-of-past-glories-png"></div>
-            <div class="f {{'unacquired' if inventory[3333] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Graviton Catapult (Carrier/Trireme)&#10;Carriers and Triremes can launch Interceptors and Bombers more quickly." class=" btn-upgrade-protoss-gravitoncatapult-png"></div>
+            <div class="f {{'unacquired' if inventory[3334] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hull of Past Glories (Carrier/Skylord/Trireme)&#10;Carrier-class ships gain +2 armor." class=" btn-hull-of-past-glories-png"></div>
+            <div class="f {{'unacquired' if inventory[3333] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Graviton Catapult (Carrier/Trireme)&#10;Carriers and Triremes can launch Interceptors and Bombers more quickly." class=" btn-upgrade-protoss-gravitoncatapult-png"></div>
           </div>
         </div>
         <div id="class-tempest" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3026] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tempest&#10;Siege artillery craft. Attacks from long range. Can use the Disintegration ability." class=" btn-unit-protoss-tempest-purifier-png"></div>
+            <div class="f {{'unacquired' if inventory[3026] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tempest&#10;Siege artillery craft. Attacks from long range. Can use the Disintegration ability." class=" btn-unit-protoss-tempest-purifier-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3541] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Disintegration (Tempest)&#10;Tempest War Council ability.&#10;Tempests gain the Disintegration ability, &#10;which deals 500 damage to a target unit or structure over 20 seconds." class=" btn-ability-protoss-disintegration-png"></div>
-            <div class="f {{'unacquired' if inventory[3318] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Gravity Sling (Tempest)&#10;Tempests gain +8 range against air targets and +8 cast range." class=" btn-upgrade-protoss-tectonicdisruptors-png"></div>
-            <div class="f {{'unacquired' if inventory[3384] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Interplanetary Range (Tempest)&#10;Tempests gain +8 weapon range against all targets." class=" ui_aicommand_build_open_aggressivepush-png"></div>
-            <div class="f {{'unacquired' if inventory[3317] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Quantic Reactor (Tempest)&#10;Tempests deal increased damage to massive units." class=" btn-upgrade-protoss-researchgravitysling-png"></div>
-            <div class="f {{'unacquired' if inventory[3316] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tectonic Destabilizers (Tempest)&#10;Tempests deal increased damage to buildings." class=" btn-ability-protoss-disruptionblast-png"></div>
+            <div class="f {{'unacquired' if inventory[3541] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Disintegration (Tempest)&#10;Tempest War Council ability.&#10;Tempests gain the Disintegration ability, &#10;which deals 500 damage to a target unit or structure over 20 seconds." class=" btn-ability-protoss-disintegration-png"></div>
+            <div class="f {{'unacquired' if inventory[3318] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Gravity Sling (Tempest)&#10;Tempests gain +8 range against air targets and +8 cast range." class=" btn-upgrade-protoss-tectonicdisruptors-png"></div>
+            <div class="f {{'unacquired' if inventory[3384] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Interplanetary Range (Tempest)&#10;Tempests gain +8 weapon range against all targets." class=" ui_aicommand_build_open_aggressivepush-png"></div>
+            <div class="f {{'unacquired' if inventory[3317] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Quantic Reactor (Tempest)&#10;Tempests deal increased damage to massive units." class=" btn-upgrade-protoss-researchgravitysling-png"></div>
+            <div class="f {{'unacquired' if inventory[3316] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tectonic Destabilizers (Tempest)&#10;Tempests deal increased damage to buildings." class=" btn-ability-protoss-disruptionblast-png"></div>
           </div>
         </div>
         <div id="class-arbiter" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3028] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Arbiter&#10;Army support craft. Has the Stasis Field and Recall abilities. Cloaks nearby units." class=" btn-unit-protoss-arbiter-png"></div>
+            <div class="f {{'unacquired' if inventory[3028] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Arbiter&#10;Army support craft. Has the Stasis Field and Recall abilities. Cloaks nearby units." class=" btn-unit-protoss-arbiter-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3328] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chronostatic Reinforcement (Arbiter)&#10;Arbiters gain +50 maximum life and +1 armor." class=" btn-chronostatic-reinforcement-png"></div>
-            <div class="f {{'unacquired' if inventory[3332] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Judicator's Veil (Arbiter)&#10;Increases Arbiter Cloaking Field range." class=" btn-veil-of-the-judicator-png"></div>
-            <div class="f {{'unacquired' if inventory[3329] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Khaydarin Core (Arbiter)&#10;Arbiters gain +150 starting energy and +50 maximum energy." class=" btn-upgrade-protoss-adeptshieldupgrade-png"></div>
-            <div class="f {{'unacquired' if inventory[3331] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Resource Efficiency (Arbiter)&#10;Reduces Arbiter cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
-            <div class="f {{'unacquired' if inventory[3330] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spacetime Anchor (Arbiter)&#10;Allows Arbiters to use an alternate version of Stasis Field which lasts 50 seconds longer." class=" btn-upgrade-protoss-fenix-stasisfield-png"></div>
-            <div class="f {{'unacquired' if inventory[3543] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Vessel of the Conclave (Arbiter)&#10;Arbiter War Council upgrade.&#10;Reduces the energy cost of Recall by 50 and Stasis Field by 100." class=" btn-ability-protoss-forceofwill-png"></div>
+            <div class="f {{'unacquired' if inventory[3328] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chronostatic Reinforcement (Arbiter)&#10;Arbiters gain +50 maximum life and +1 armor." class=" btn-chronostatic-reinforcement-png"></div>
+            <div class="f {{'unacquired' if inventory[3332] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Judicator's Veil (Arbiter)&#10;Increases Arbiter Cloaking Field range." class=" btn-veil-of-the-judicator-png"></div>
+            <div class="f {{'unacquired' if inventory[3329] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Khaydarin Core (Arbiter)&#10;Arbiters gain +150 starting energy and +50 maximum energy." class=" btn-upgrade-protoss-adeptshieldupgrade-png"></div>
+            <div class="f {{'unacquired' if inventory[3331] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Resource Efficiency (Arbiter)&#10;Reduces Arbiter cost by 50 minerals." class=" btn-ability-hornerhan-salvagebonus-png"></div>
+            <div class="f {{'unacquired' if inventory[3330] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spacetime Anchor (Arbiter)&#10;Allows Arbiters to use an alternate version of Stasis Field which lasts 50 seconds longer." class=" btn-upgrade-protoss-fenix-stasisfield-png"></div>
+            <div class="f {{'unacquired' if inventory[3543] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Vessel of the Conclave (Arbiter)&#10;Arbiter War Council upgrade.&#10;Reduces the energy cost of Recall by 50 and Stasis Field by 100." class=" btn-ability-protoss-forceofwill-png"></div>
           </div>
         </div>
         <div id="class-oracle" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3029] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Oracle&#10;Flying caster. Can use the Revelation and Stasis Ward abilities." class=" btn-unit-protoss-oracle-png"></div>
+            <div class="f {{'unacquired' if inventory[3029] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Oracle&#10;Flying caster. Can use the Revelation and Stasis Ward abilities." class=" btn-unit-protoss-oracle-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3378] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Bosonic Core (Oracle)&#10;Increases starting energy by 150 and maximum energy by 50." class=" btn-upgrade-protoss-researchbosoniccore-png"></div>
-            <div class="f {{'unacquired' if inventory[3544] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Skyward Chronoanomaly (Oracle)&#10;The Oracle's Stasis Ward can affect air units." class=" btn-skyward-chronoanomaly-png"></div>
-            <div class="f {{'unacquired' if inventory[3326] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stasis Calibration (Oracle)&#10;Oracle War Council upgrade.&#10;Enemies caught by the Oracle's Stasis Ward may now be attacked for the first 5 seconds of stasis." class=" btn-ability-protoss-oracle-stasiscalibration-png"></div>
-            <div class="f {{'unacquired' if inventory[3325] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stealth Drive (Oracle)&#10;Oracles become permanently cloaked." class=" btn-upgrade-vorazun-oraclepermanentlycloaked-png"></div>
-            <div class="f {{'unacquired' if inventory[3327] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Temporal Acceleration Beam (Oracle)&#10;Oracles no longer need to to spend energy to attack." class=" btn-ability-protoss-oraclepulsarcannonon-png"></div>
+            <div class="f {{'unacquired' if inventory[3378] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Bosonic Core (Oracle)&#10;Increases starting energy by 150 and maximum energy by 50." class=" btn-upgrade-protoss-researchbosoniccore-png"></div>
+            <div class="f {{'unacquired' if inventory[3544] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Skyward Chronoanomaly (Oracle)&#10;The Oracle's Stasis Ward can affect air units." class=" btn-skyward-chronoanomaly-png"></div>
+            <div class="f {{'unacquired' if inventory[3326] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stasis Calibration (Oracle)&#10;Oracle War Council upgrade.&#10;Enemies caught by the Oracle's Stasis Ward may now be attacked for the first 5 seconds of stasis." class=" btn-ability-protoss-oracle-stasiscalibration-png"></div>
+            <div class="f {{'unacquired' if inventory[3325] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stealth Drive (Oracle)&#10;Oracles become permanently cloaked." class=" btn-upgrade-vorazun-oraclepermanentlycloaked-png"></div>
+            <div class="f {{'unacquired' if inventory[3327] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Temporal Acceleration Beam (Oracle)&#10;Oracles no longer need to to spend energy to attack." class=" btn-ability-protoss-oraclepulsarcannonon-png"></div>
           </div>
         </div>
         <div id="class-mothership" class="item-class ss-3">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3027] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mothership&#10;Ultimate Protoss vessel. Can use the Vortex and Mass Recall abilities." class=" btn-unit-protoss-mothership-taldarim-png"></div>
+            <div class="f {{'unacquired' if inventory[3027] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mothership&#10;Ultimate Protoss vessel. Can use the Vortex and Mass Recall abilities." class=" btn-unit-protoss-mothership-taldarim-png"></div>
           </div>
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3545] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Integrated Power (Mothership)&#10;Mothership War Council upgrade.&#10;Allows Motherships to move at full speed outside pylon power." class=" btn-integrated-power-png"></div>
+            <div class="f {{'unacquired' if inventory[3545] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Integrated Power (Mothership)&#10;Mothership War Council upgrade.&#10;Allows Motherships to move at full speed outside pylon power." class=" btn-integrated-power-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -2021,16 +2021,16 @@
         </div>
         <div id="class-protoss-static-defense" class="item-class ss-4">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[3200] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Photon Cannon&#10;Protoss defensive structure. Can attack ground and air units." class=" btn-building-protoss-photoncannon-png"></div>
-            <div class="f {{'unacquired' if inventory[3201] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Khaydarin Monolith&#10;Advanced Protoss defensive structure. Has superior range and damage, but is very expensive and attacks slowly." class=" btn-unit-protoss-khaydarinmonolith-png"></div>
-            <div class="f {{'unacquired' if inventory[3202] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shield Battery&#10;Protoss defensive structure. Restores shields to nearby friendly units and structures." class=" btn-building-protoss-shieldbattery-png"></div>
+            <div class="f {{'unacquired' if inventory[3200] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Photon Cannon&#10;Protoss defensive structure. Can attack ground and air units." class=" btn-building-protoss-photoncannon-png"></div>
+            <div class="f {{'unacquired' if inventory[3201] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Khaydarin Monolith&#10;Advanced Protoss defensive structure. Has superior range and damage, but is very expensive and attacks slowly." class=" btn-unit-protoss-khaydarinmonolith-png"></div>
+            <div class="f {{'unacquired' if inventory[3202] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shield Battery&#10;Protoss defensive structure. Restores shields to nearby friendly units and structures." class=" btn-building-protoss-shieldbattery-png"></div>
           </div>
         </div>
         <div id="class-protoss-static-defense-upgrade" class="item-class ss-4">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3802] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Nexus Overcharge (Protoss)&#10;The Protoss Nexus gains a long-range auto-attack." class=" btn-ability-spearofadun-nexusovercharge-png"></div>
-            <div class="f {{'unacquired' if inventory[3809] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Enhanced Targeting (Protoss)&#10;Protoss defensive structures gain +2 range." class=" btn-upgrade-karax-turretrange-png"></div>
-            <div class="f {{'unacquired' if inventory[3810] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Optimized Ordnance (Protoss)&#10;Increases the attack speed of Protoss defensive structures by 25%." class=" btn-upgrade-karax-turretattackspeed-png"></div>
+            <div class="f {{'unacquired' if inventory[3802] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Nexus Overcharge (Protoss)&#10;The Protoss Nexus gains a long-range auto-attack." class=" btn-ability-spearofadun-nexusovercharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3809] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Enhanced Targeting (Protoss)&#10;Protoss defensive structures gain +2 range." class=" btn-upgrade-karax-turretrange-png"></div>
+            <div class="f {{'unacquired' if inventory[3810] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Optimized Ordnance (Protoss)&#10;Increases the attack speed of Protoss defensive structures by 25%." class=" btn-upgrade-karax-turretattackspeed-png"></div>
           </div>
         </div>
         <div class="ss-header">
@@ -2039,83 +2039,83 @@
         <div id="class-protoss-wa" class="item-class ss-5">
           <div class="item-class-header">
             <div class="progressive lvl-{{[inventory[3100], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 1&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 2&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 3&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 4&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 5&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 1&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 2&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 3&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 4&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Weapon - Level 5&#10;Increases damage of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundweaponslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[3101], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 1&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 2&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 3&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 4&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 5&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 1&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 2&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 3&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 4&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Ground Armor - Level 5&#10;Increases armor of Protoss ground units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-groundarmorlevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[3102], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 1&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 2&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 3&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 4&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 5&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 1&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 2&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 3&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 4&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Shields - Level 5&#10;Increases shields of Protoss units.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-shieldslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[3103], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 1&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 2&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 3&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 4&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 5&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 1&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 2&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 3&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 4&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Weapon - Level 5&#10;Increases damage of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airweaponslevel5-png"></div>
             </div>
             <div class="progressive lvl-{{[inventory[3104], 5]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 1&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel1-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 2&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel2-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 3&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel3-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 4&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel4-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 5&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel5-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 1&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel1-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 2&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 3&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel3-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 4&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel4-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Protoss Air Armor - Level 5&#10;Increases armor of Protoss starships.&#10;Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades." class=" btn-upgrade-protoss-airarmorlevel5-png"></div>
             </div>
           </div>
         </div>
         <div id="class-soa" class="item-class ss-5">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3700] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chrono Surge (Spear of Adun)&#10;The Spear of Adun increases a target structure's unit warp in and research speeds by +1000% for 20 seconds." class=" btn-ability-spearofadun-chronosurge-png"></div>
+            <div class="f {{'unacquired' if inventory[3700] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chrono Surge (Spear of Adun)&#10;The Spear of Adun increases a target structure's unit warp in and research speeds by +1000% for 20 seconds." class=" btn-ability-spearofadun-chronosurge-png"></div>
             <div class="progressive lvl-{{[inventory[3701], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Proxy Pylon (Spear of Adun) - Level 1&#10;Level 1: The Spear of Adun quickly warps in a Pylon to a target location.&#10;Level 2: The Spear of Adun warps in a Pylon, 2 melee warriors, and 2 ranged warriors to a target location." class=" btn-ability-spearofadun-deploypylon-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Proxy Pylon (Spear of Adun) - Level 2&#10;Level 1: The Spear of Adun quickly warps in a Pylon to a target location.&#10;Level 2: The Spear of Adun warps in a Pylon, 2 melee warriors, and 2 ranged warriors to a target location." class=" btn-ability-spearofadun-warpinreinforcements-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Proxy Pylon (Spear of Adun) - Level 1&#10;Level 1: The Spear of Adun quickly warps in a Pylon to a target location.&#10;Level 2: The Spear of Adun warps in a Pylon, 2 melee warriors, and 2 ranged warriors to a target location." class=" btn-ability-spearofadun-deploypylon-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Proxy Pylon (Spear of Adun) - Level 2&#10;Level 1: The Spear of Adun quickly warps in a Pylon to a target location.&#10;Level 2: The Spear of Adun warps in a Pylon, 2 melee warriors, and 2 ranged warriors to a target location." class=" btn-ability-spearofadun-warpinreinforcements-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[3702] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pylon Overcharge (Spear of Adun)&#10;The Spear of Adun temporarily gives a target Pylon increased shields and a powerful attack." class=" btn-ability-protoss-purify-png"></div>
-            <div class="f {{'unacquired' if inventory[3703] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Orbital Strike (Spear of Adun)&#10;The Spear of Adun fires 5 laser blasts from orbit." class=" btn-ability-spearofadun-orbitalstrike-png"></div>
-            <div class="f {{'unacquired' if inventory[3704] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Temporal Field (Spear of Adun)&#10;The Spear of Adun creates 3 temporal fields that freeze enemy units and structures in time." class=" btn-ability-spearofadun-temporalfield-png"></div>
-            <div class="f {{'unacquired' if inventory[3705] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solar Lance (Spear of Adun)&#10;The Spear of Adun strafes a target area with 3 laser beams." class=" btn-ability-spearofadun-solarlance-png"></div>
-            <div class="f {{'unacquired' if inventory[3706] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mass Recall (Spear of Adun)&#10;The Spear of Adun warps all units in a target area back to the primary Nexus and gives them a temporary shield." class=" btn-ability-spearofadun-massrecall-png"></div>
-            <div class="f {{'unacquired' if inventory[3707] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Shield Overcharge (Spear of Adun)&#10;The Spear of Adun gives all friendly units a shield that absorbs 200 damage. Lasts 20 seconds." class=" btn-ability-spearofadun-shieldovercharge-png"></div>
-            <div class="f {{'unacquired' if inventory[3708] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Deploy Fenix (Spear of Adun)&#10;The Spear of Adun drops Fenix onto the battlefield. Fenix is a powerful warrior who will fight for 30 seconds." class=" btn-unit-protoss-fenix-png"></div>
-            <div class="f {{'unacquired' if inventory[3709] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Purifier Beam (Spear of Adun)&#10;The Spear of Adun fires a wide laser that deals large amounts of damage in a moveable area. Lasts 15 seconds." class=" btn-ability-spearofadun-purifierbeam-png"></div>
-            <div class="f {{'unacquired' if inventory[3710] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Time Stop (Spear of Adun)&#10;The Spear of Adun freezes all enemy units and structures in time for 20 seconds." class=" btn-ability-spearofadun-timestop-png"></div>
-            <div class="f {{'unacquired' if inventory[3711] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Solar Bombardment (Spear of Adun)&#10;The Spear of Adun fires 200 laser blasts randomly over a wide area." class=" btn-ability-spearofadun-solarbombardment-png"></div>
+            <div class="f {{'unacquired' if inventory[3702] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pylon Overcharge (Spear of Adun)&#10;The Spear of Adun temporarily gives a target Pylon increased shields and a powerful attack." class=" btn-ability-protoss-purify-png"></div>
+            <div class="f {{'unacquired' if inventory[3703] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Orbital Strike (Spear of Adun)&#10;The Spear of Adun fires 5 laser blasts from orbit." class=" btn-ability-spearofadun-orbitalstrike-png"></div>
+            <div class="f {{'unacquired' if inventory[3704] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Temporal Field (Spear of Adun)&#10;The Spear of Adun creates 3 temporal fields that freeze enemy units and structures in time." class=" btn-ability-spearofadun-temporalfield-png"></div>
+            <div class="f {{'unacquired' if inventory[3705] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solar Lance (Spear of Adun)&#10;The Spear of Adun strafes a target area with 3 laser beams." class=" btn-ability-spearofadun-solarlance-png"></div>
+            <div class="f {{'unacquired' if inventory[3706] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mass Recall (Spear of Adun)&#10;The Spear of Adun warps all units in a target area back to the primary Nexus and gives them a temporary shield." class=" btn-ability-spearofadun-massrecall-png"></div>
+            <div class="f {{'unacquired' if inventory[3707] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Shield Overcharge (Spear of Adun)&#10;The Spear of Adun gives all friendly units a shield that absorbs 200 damage. Lasts 20 seconds." class=" btn-ability-spearofadun-shieldovercharge-png"></div>
+            <div class="f {{'unacquired' if inventory[3708] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Deploy Fenix (Spear of Adun)&#10;The Spear of Adun drops Fenix onto the battlefield. Fenix is a powerful warrior who will fight for 30 seconds." class=" btn-unit-protoss-fenix-png"></div>
+            <div class="f {{'unacquired' if inventory[3709] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Purifier Beam (Spear of Adun)&#10;The Spear of Adun fires a wide laser that deals large amounts of damage in a moveable area. Lasts 15 seconds." class=" btn-ability-spearofadun-purifierbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3710] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Time Stop (Spear of Adun)&#10;The Spear of Adun freezes all enemy units and structures in time for 20 seconds." class=" btn-ability-spearofadun-timestop-png"></div>
+            <div class="f {{'unacquired' if inventory[3711] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Solar Bombardment (Spear of Adun)&#10;The Spear of Adun fires 200 laser blasts randomly over a wide area." class=" btn-ability-spearofadun-solarbombardment-png"></div>
           </div>
         </div>
         <div id="class-soa" class="item-class ss-5">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3805] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Guardian Shell (Spear of Adun)&#10;The Spear of Adun passively shields friendly Protoss units before death, making them invulnerable for 5 seconds. Each unit can only be shielded once every 60 seconds." class=" btn-ability-spearofadun-guardianshell-png"></div>
-            <div class="f {{'unacquired' if inventory[3806] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Reconstruction Beam (Spear of Adun)&#10;The Spear of Adun will passively heal mechanical units for 5 and non-biological structures for 10 life per second. Up to 3 targets can be repaired at once." class=" btn-ability-spearofadun-reconstructionbeam-png"></div>
-            <div class="f {{'unacquired' if inventory[3807] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Overwatch (Spear of Adun)&#10;Once per second, the Spear of Adun will last-hit a damaged enemy unit that is below 50 health." class=" btn-ability-zeratul-chargedcrystal-psionicwinds-png"></div>
+            <div class="f {{'unacquired' if inventory[3805] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Guardian Shell (Spear of Adun)&#10;The Spear of Adun passively shields friendly Protoss units before death, making them invulnerable for 5 seconds. Each unit can only be shielded once every 60 seconds." class=" btn-ability-spearofadun-guardianshell-png"></div>
+            <div class="f {{'unacquired' if inventory[3806] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Reconstruction Beam (Spear of Adun)&#10;The Spear of Adun will passively heal mechanical units for 5 and non-biological structures for 10 life per second. Up to 3 targets can be repaired at once." class=" btn-ability-spearofadun-reconstructionbeam-png"></div>
+            <div class="f {{'unacquired' if inventory[3807] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Overwatch (Spear of Adun)&#10;Once per second, the Spear of Adun will last-hit a damaged enemy unit that is below 50 health." class=" btn-ability-zeratul-chargedcrystal-psionicwinds-png"></div>
           </div>
         </div>
         <div id="class-protoss-macro" class="item-class ss-5">
           <div class="item-class-upgrades">
-            <div class="f {{'unacquired' if inventory[3800] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Matrix Overload (Protoss)&#10;All friendly units gain 25% movement speed and 15% attack speed within a Pylon's power field and for 15 seconds after leaving it." class=" btn-ability-spearofadun-matrixoverload-png"></div>
-            <div class="f {{'unacquired' if inventory[3801] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Quatro (Protoss)&#10;All friendly Protoss units gain the equivalent of their +1 armor, attack, and shield upgrades." class=" btn-progression-protoss-fenix-6-forgeresearch-png"></div>
-            <div class="f {{'unacquired' if inventory[3803] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Orbital Assimilators (Protoss)&#10;Assimilators automatically harvest Vespene Gas without the need for Probes." class=" btn-ability-spearofadun-orbitalassimilator-png"></div>
-            <div class="f {{'unacquired' if inventory[3812] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Amplified Assimilators (Protoss)&#10;Assimilators produce Vespene gas 25% faster." class=" btn-research-terran-microfiltering-png"></div>
-            <div class="f {{'unacquired' if inventory[3804] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Warp Harmonization (Protoss)&#10;Stargates and Robotics Facilities can transform to utilize Warp In technology. Warp In cooldowns are 20% faster than original build times." class=" btn-ability-spearofadun-warpharmonization-png"></div>
-            <div class="f {{'unacquired' if inventory[3808] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Superior Warp Gates (Protoss)&#10;Protoss Warp Gates can hold up to 3 charges of unit warp-ins." class=" talent-artanis-level03-warpgatecharges-png"></div>
-            <div class="f {{'unacquired' if inventory[3811] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Khalai Ingenuity (Protoss)&#10;Pylons, Photon Cannons, Monoliths, and Shield Batteries warp in near-instantly." class=" btn-upgrade-karax-pylonwarpininstantly-png"></div>
+            <div class="f {{'unacquired' if inventory[3800] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Matrix Overload (Protoss)&#10;All friendly units gain 25% movement speed and 15% attack speed within a Pylon's power field and for 15 seconds after leaving it." class=" btn-ability-spearofadun-matrixoverload-png"></div>
+            <div class="f {{'unacquired' if inventory[3801] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Quatro (Protoss)&#10;All friendly Protoss units gain the equivalent of their +1 armor, attack, and shield upgrades." class=" btn-progression-protoss-fenix-6-forgeresearch-png"></div>
+            <div class="f {{'unacquired' if inventory[3803] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Orbital Assimilators (Protoss)&#10;Assimilators automatically harvest Vespene Gas without the need for Probes." class=" btn-ability-spearofadun-orbitalassimilator-png"></div>
+            <div class="f {{'unacquired' if inventory[3812] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Amplified Assimilators (Protoss)&#10;Assimilators produce Vespene gas 25% faster." class=" btn-research-terran-microfiltering-png"></div>
+            <div class="f {{'unacquired' if inventory[3804] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Warp Harmonization (Protoss)&#10;Stargates and Robotics Facilities can transform to utilize Warp In technology. Warp In cooldowns are 20% faster than original build times." class=" btn-ability-spearofadun-warpharmonization-png"></div>
+            <div class="f {{'unacquired' if inventory[3808] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Superior Warp Gates (Protoss)&#10;Protoss Warp Gates can hold up to 3 charges of unit warp-ins." class=" talent-artanis-level03-warpgatecharges-png"></div>
+            <div class="f {{'unacquired' if inventory[3811] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Khalai Ingenuity (Protoss)&#10;Pylons, Photon Cannons, Monoliths, and Shield Batteries warp in near-instantly." class=" btn-upgrade-karax-pylonwarpininstantly-png"></div>
             <div class="progressive lvl-{{[inventory[3813], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Warp Relocate (Protoss) - Level 1&#10;Level 1: Protoss structures can be moved anywhere within pylon power after a brief delay. Max 3 charges, shared globally.&#10;Level 2: No longer consumes or requires charges." class=" btn-ability-protoss-massrecall-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Warp Relocate (Protoss) - Level 2&#10;Level 1: Protoss structures can be moved anywhere within pylon power after a brief delay. Max 3 charges, shared globally.&#10;Level 2: No longer consumes or requires charges." class=" btn-ability-protoss-warprelocatelvl2-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Warp Relocate (Protoss) - Level 1&#10;Level 1: Protoss structures can be moved anywhere within pylon power after a brief delay. Max 3 charges, shared globally.&#10;Level 2: No longer consumes or requires charges." class=" btn-ability-protoss-massrecall-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Warp Relocate (Protoss) - Level 2&#10;Level 1: Protoss structures can be moved anywhere within pylon power after a brief delay. Max 3 charges, shared globally.&#10;Level 2: No longer consumes or requires charges." class=" btn-ability-protoss-warprelocatelvl2-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[3814] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Probe Warp-In (Protoss)&#10;You can warp in additonal Probes from your Nexus to any visible location within a Pylon's power field. Has a 30 second cooldown and can store up to 2 charges." class=" btn-unit-protoss-probe-warpin-png"></div>
-            <div class="f {{'unacquired' if inventory[3815] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Elder Probes (Protoss)&#10;You can warp in a group of 5 Elder Probes, tough builders from the Brood War. Elder Probes can provide a Power Field and get reconstructed on death. Can only be used once per mission." class=" btn-unit-collection-probe-remastered-png"></div>
+            <div class="f {{'unacquired' if inventory[3814] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Probe Warp-In (Protoss)&#10;You can warp in additonal Probes from your Nexus to any visible location within a Pylon's power field. Has a 30 second cooldown and can store up to 2 charges." class=" btn-unit-protoss-probe-warpin-png"></div>
+            <div class="f {{'unacquired' if inventory[3815] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Elder Probes (Protoss)&#10;You can warp in a group of 5 Elder Probes, tough builders from the Brood War. Elder Probes can provide a Power Field and get reconstructed on death. Can only be used once per mission." class=" btn-unit-collection-probe-remastered-png"></div>
           </div>
         </div>
       </div>
@@ -2129,44 +2129,44 @@
       <div id="section-nova" class="section-body">
         <div id="class-nova-weapons" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1908] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="C20A Canister Rifle (Nova Weapon)&#10;Allows Nova to equip the C20A Canister Rifle, which has a ranged attack and allows Nova to cast Snipe." class=" btn-upgrade-nova-equipment-canisterrifle-png"></div>
-            <div class="f {{'unacquired' if inventory[1909] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Hellfire Shotgun (Nova Weapon)&#10;Allows Nova to equip the Hellfire Shotgun, which has a short-range area attack in a cone and allows Nova to cast Penetrating Blast." class=" btn-upgrade-nova-equipment-shotgun-png"></div>
-            <div class="f {{'unacquired' if inventory[1910] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Plasma Rifle (Nova Weapon)&#10;Allows Nova to equip the Plasma Rifle, which has a rapidfire ranged attack and allows Nova to cast Plasma Shot." class=" btn-upgrade-nova-equipment-plasmagun-png"></div>
-            <div class="f {{'unacquired' if inventory[1911] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Monomolecular Blade (Nova Weapon)&#10;Allows Nova to equip the Monomolecular Blade, which has a melee attack and allows Nova to cast Dash Attack." class=" btn-upgrade-nova-equipment-monomolecularblade-png"></div>
-            <div class="f {{'unacquired' if inventory[1912] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blazefire Gunblade (Nova Weapon)&#10;Allows Nova to equip the Blazefire Gunblade, which has a melee attack and allows Nova to cast Fury of One." class=" btn-upgrade-nova-equipment-gunblade_sword-png"></div>
+            <div class="f {{'unacquired' if inventory[1908] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="C20A Canister Rifle (Nova Weapon)&#10;Allows Nova to equip the C20A Canister Rifle, which has a ranged attack and allows Nova to cast Snipe." class=" btn-upgrade-nova-equipment-canisterrifle-png"></div>
+            <div class="f {{'unacquired' if inventory[1909] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Hellfire Shotgun (Nova Weapon)&#10;Allows Nova to equip the Hellfire Shotgun, which has a short-range area attack in a cone and allows Nova to cast Penetrating Blast." class=" btn-upgrade-nova-equipment-shotgun-png"></div>
+            <div class="f {{'unacquired' if inventory[1910] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Plasma Rifle (Nova Weapon)&#10;Allows Nova to equip the Plasma Rifle, which has a rapidfire ranged attack and allows Nova to cast Plasma Shot." class=" btn-upgrade-nova-equipment-plasmagun-png"></div>
+            <div class="f {{'unacquired' if inventory[1911] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Monomolecular Blade (Nova Weapon)&#10;Allows Nova to equip the Monomolecular Blade, which has a melee attack and allows Nova to cast Dash Attack." class=" btn-upgrade-nova-equipment-monomolecularblade-png"></div>
+            <div class="f {{'unacquired' if inventory[1912] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blazefire Gunblade (Nova Weapon)&#10;Allows Nova to equip the Blazefire Gunblade, which has a melee attack and allows Nova to cast Fury of One." class=" btn-upgrade-nova-equipment-gunblade_sword-png"></div>
           </div>
         </div>
         <div id="class-nova-visors" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1900] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ghost Visor (Nova Equipment)&#10;Reveals the locations of enemy units in the fog of war around Nova. Can detect cloaked units." class=" btn-upgrade-nova-equipment-ghostvisor-png"></div>
-            <div class="f {{'unacquired' if inventory[1901] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Rangefinder Oculus (Nova Equipment)&#10;Increases Nova's vision range and non-melee weapon attack range by 2. Also increases range of melee weapons by 1." class=" btn-upgrade-nova-equipment-rangefinderoculus-png"></div>
-            <div class="f {{'unacquired' if inventory[1902] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Domination (Nova Ability)&#10;Gives Nova the ability to mind-control a target enemy unit." class=" btn-ability-nova-domination-png"></div>
+            <div class="f {{'unacquired' if inventory[1900] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ghost Visor (Nova Equipment)&#10;Reveals the locations of enemy units in the fog of war around Nova. Can detect cloaked units." class=" btn-upgrade-nova-equipment-ghostvisor-png"></div>
+            <div class="f {{'unacquired' if inventory[1901] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Rangefinder Oculus (Nova Equipment)&#10;Increases Nova's vision range and non-melee weapon attack range by 2. Also increases range of melee weapons by 1." class=" btn-upgrade-nova-equipment-rangefinderoculus-png"></div>
+            <div class="f {{'unacquired' if inventory[1902] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Domination (Nova Ability)&#10;Gives Nova the ability to mind-control a target enemy unit." class=" btn-ability-nova-domination-png"></div>
           </div>
         </div>
         <div id="class-nova-gadgets" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1914] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Pulse Grenades (Nova Gadget)&#10;Gives Nova the ability to throw a grenade dealing large damage in an area." class=" btn-upgrade-nova-btn-upgrade-nova-pulsegrenade-png"></div>
-            <div class="f {{'unacquired' if inventory[1915] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Flashbang Grenades (Nova Gadget)&#10;Gives Nova the ability to throw a grenade to stun enemies and disable detection in a large area." class=" btn-upgrade-nova-btn-upgrade-nova-flashgrenade-png"></div>
-            <div class="f {{'unacquired' if inventory[1913] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Stim Infusion (Nova Gadget)&#10;Gives Nova the ability to heal herself and temporarily increase her movement and attack speeds." class=" btn-upgrade-terran-superstimppack-png"></div>
-            <div class="f {{'unacquired' if inventory[1916] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ionic Force Field (Nova Gadget)&#10;Gives Nova the ability to shield herself temporarily." class=" btn-upgrade-terran-nova-personaldefensivematrix-png"></div>
-            <div class="f {{'unacquired' if inventory[1917] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Holo Decoy (Nova Gadget)&#10;Gives Nova the ability to summon a decoy unit which enemies will prefer to target and takes reduced damage." class=" btn-upgrade-nova-holographicdecoy-png"></div>
+            <div class="f {{'unacquired' if inventory[1914] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Pulse Grenades (Nova Gadget)&#10;Gives Nova the ability to throw a grenade dealing large damage in an area." class=" btn-upgrade-nova-btn-upgrade-nova-pulsegrenade-png"></div>
+            <div class="f {{'unacquired' if inventory[1915] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Flashbang Grenades (Nova Gadget)&#10;Gives Nova the ability to throw a grenade to stun enemies and disable detection in a large area." class=" btn-upgrade-nova-btn-upgrade-nova-flashgrenade-png"></div>
+            <div class="f {{'unacquired' if inventory[1913] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Stim Infusion (Nova Gadget)&#10;Gives Nova the ability to heal herself and temporarily increase her movement and attack speeds." class=" btn-upgrade-terran-superstimppack-png"></div>
+            <div class="f {{'unacquired' if inventory[1916] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ionic Force Field (Nova Gadget)&#10;Gives Nova the ability to shield herself temporarily." class=" btn-upgrade-terran-nova-personaldefensivematrix-png"></div>
+            <div class="f {{'unacquired' if inventory[1917] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Holo Decoy (Nova Gadget)&#10;Gives Nova the ability to summon a decoy unit which enemies will prefer to target and takes reduced damage." class=" btn-upgrade-nova-holographicdecoy-png"></div>
           </div>
         </div>
         <div id="class-nova-suits" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1903] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Blink (Nova Ability)&#10;Gives Nova the ability to teleport a short distance and cloak for 10s." class=" btn-upgrade-nova-blink-png"></div>
+            <div class="f {{'unacquired' if inventory[1903] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Blink (Nova Ability)&#10;Gives Nova the ability to teleport a short distance and cloak for 10s." class=" btn-upgrade-nova-blink-png"></div>
             <div class="progressive lvl-{{[inventory[1904], 2]|min}}">
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stealth Suit Module (Nova Suit Module) - Level 1&#10;Level 1: Gives Nova the ability to cloak.&#10;Level 2: Nova is permanently cloaked." class=" btn-upgrade-nova-equipment-stealthsuit-png"></div>
-              <div class="f"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Progressive Stealth Suit Module (Nova Suit Module) - Level 2&#10;Level 1: Gives Nova the ability to cloak.&#10;Level 2: Nova is permanently cloaked." class=" btn-upgrade-nova-tacticalstealthsuit-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stealth Suit Module (Nova Suit Module) - Level 1&#10;Level 1: Gives Nova the ability to cloak.&#10;Level 2: Nova is permanently cloaked." class=" btn-upgrade-nova-equipment-stealthsuit-png"></div>
+              <div class="f"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Progressive Stealth Suit Module (Nova Suit Module) - Level 2&#10;Level 1: Gives Nova the ability to cloak.&#10;Level 2: Nova is permanently cloaked." class=" btn-upgrade-nova-tacticalstealthsuit-png"></div>
             </div>
-            <div class="f {{'unacquired' if inventory[1905] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Energy Suit Module (Nova Suit Module)&#10;Increases Nova's maximum energy and energy regeneration rate." class=" btn-upgrade-nova-equipment-apolloinfantrysuit-png"></div>
-            <div class="f {{'unacquired' if inventory[1906] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Armored Suit Module (Nova Suit Module)&#10;Increases Nova's health by 100 and armor by 1. Nova also regenerates life quickly out of combat." class=" btn-upgrade-nova-equipment-blinksuit-png"></div>
-            <div class="f {{'unacquired' if inventory[1907] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Jump Suit Module (Nova Suit Module)&#10;Increases Nova's movement speed and allows her to jump up and down cliffs." class=" btn-upgrade-nova-jetpack-png"></div>
+            <div class="f {{'unacquired' if inventory[1905] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Energy Suit Module (Nova Suit Module)&#10;Increases Nova's maximum energy and energy regeneration rate." class=" btn-upgrade-nova-equipment-apolloinfantrysuit-png"></div>
+            <div class="f {{'unacquired' if inventory[1906] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Armored Suit Module (Nova Suit Module)&#10;Increases Nova's health by 100 and armor by 1. Nova also regenerates life quickly out of combat." class=" btn-upgrade-nova-equipment-blinksuit-png"></div>
+            <div class="f {{'unacquired' if inventory[1907] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Jump Suit Module (Nova Suit Module)&#10;Increases Nova's movement speed and allows her to jump up and down cliffs." class=" btn-upgrade-nova-jetpack-png"></div>
           </div>
         </div>
         <div id="class-nova-utility" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[1918] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Tac Nuke Strike (Nova Ability)&#10;Gives Nova the ability to launch tactical nukes built from the Shadow Ops." class=" btn-ability-terran-nuclearstrike-color-png"></div>
+            <div class="f {{'unacquired' if inventory[1918] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Tac Nuke Strike (Nova Ability)&#10;Gives Nova the ability to launch tactical nukes built from the Shadow Ops." class=" btn-ability-terran-nuclearstrike-color-png"></div>
           </div>
         </div>
       </div>
@@ -2178,41 +2178,41 @@
       </div>
       <div id="section-kerrigan" class="section-body">
         <div class="item-counter">
-          <img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kerrigan Level" class=" btn-ability-kerrigan-revive-png">
+          <img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kerrigan Level" class=" btn-ability-kerrigan-revive-png">
           <span class="item-count">{{kerrigan_level}}</span>
         </div>
         <div id="class-kerrigan-actives" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2400] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Kinetic Blast (Kerrigan Ability)&#10;Kerrigan deals 300 damage to target unit or structure from long range." class=" btn-ability-kerrigan-kineticblast-png"></div>
-            <div class="f {{'unacquired' if inventory[2402] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Leaping Strike (Kerrigan Ability)&#10;Kerrigan leaps to her target and deals 150 damage." class=" btn-ability-kerrigan-leapingstrike-png"></div>
-            <div class="f {{'unacquired' if inventory[2403] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Crushing Grip (Kerrigan Ability)&#10;Kerrigan stuns enemies in a target area for 3 seconds and deals 30 damage over time. Heroic units are not stunned." class=" btn-ability-swarm-kerrigan-crushinggrip-png"></div>
-            <div class="f {{'unacquired' if inventory[2405] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Psionic Shift (Kerrigan Ability)&#10;Kerrigan dashes through enemies, dealing 50 damage to all enemies in her path." class=" btn-ability-kerrigan-psychicshift-png"></div>
-            <div class="f {{'unacquired' if inventory[2409] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Wild Mutation (Kerrigan Ability)&#10;Kerrigan gives all units in an area +200 max life and double attack speed for 10 seconds." class=" btn-ability-kerrigan-wildmutation-png"></div>
-            <div class="f {{'unacquired' if inventory[2410] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spawn Banelings (Kerrigan Ability)&#10;Kerrigan spawns six Banelings with timed life." class=" abilityicon_spawnbanelings_square-png"></div>
-            <div class="f {{'unacquired' if inventory[2411] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Mend (Kerrigan Ability)&#10;Kerrigan heals for 150 life and heals nearby friendly units for 50 life. An additional +50% life is healed over 15 seconds." class=" btn-ability-zerg-transfusion-color-png"></div>
-            <div class="f {{'unacquired' if inventory[2422] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Assimilation Aura (Kerrigan Ability)&#10;Causes all nearby enemies to drop resources when killed." class=" btn-upgrade-kerrigan-assimilationaura-png"></div>
+            <div class="f {{'unacquired' if inventory[2400] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Kinetic Blast (Kerrigan Ability)&#10;Kerrigan deals 300 damage to target unit or structure from long range." class=" btn-ability-kerrigan-kineticblast-png"></div>
+            <div class="f {{'unacquired' if inventory[2402] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Leaping Strike (Kerrigan Ability)&#10;Kerrigan leaps to her target and deals 150 damage." class=" btn-ability-kerrigan-leapingstrike-png"></div>
+            <div class="f {{'unacquired' if inventory[2403] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Crushing Grip (Kerrigan Ability)&#10;Kerrigan stuns enemies in a target area for 3 seconds and deals 30 damage over time. Heroic units are not stunned." class=" btn-ability-swarm-kerrigan-crushinggrip-png"></div>
+            <div class="f {{'unacquired' if inventory[2405] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Psionic Shift (Kerrigan Ability)&#10;Kerrigan dashes through enemies, dealing 50 damage to all enemies in her path." class=" btn-ability-kerrigan-psychicshift-png"></div>
+            <div class="f {{'unacquired' if inventory[2409] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Wild Mutation (Kerrigan Ability)&#10;Kerrigan gives all units in an area +200 max life and double attack speed for 10 seconds." class=" btn-ability-kerrigan-wildmutation-png"></div>
+            <div class="f {{'unacquired' if inventory[2410] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spawn Banelings (Kerrigan Ability)&#10;Kerrigan spawns six Banelings with timed life." class=" abilityicon_spawnbanelings_square-png"></div>
+            <div class="f {{'unacquired' if inventory[2411] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Mend (Kerrigan Ability)&#10;Kerrigan heals for 150 life and heals nearby friendly units for 50 life. An additional +50% life is healed over 15 seconds." class=" btn-ability-zerg-transfusion-color-png"></div>
+            <div class="f {{'unacquired' if inventory[2422] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Assimilation Aura (Kerrigan Ability)&#10;Causes all nearby enemies to drop resources when killed." class=" btn-upgrade-kerrigan-assimilationaura-png"></div>
           </div>
         </div>
         <div id="class-kerrigan-passives" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2401] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Heroic Fortitude (Kerrigan Passive)&#10;Kerrigan gains +200 maximum life and double life regeneration rate." class=" btn-ability-kerrigan-heroicfortitude-png"></div>
-            <div class="f {{'unacquired' if inventory[2404] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Chain Reaction (Kerrigan Passive)&#10;Kerrigan's attacks deal normal damage to her target then jump to additional nearby enemies." class=" btn-ability-swarm-kerrigan-chainreaction-png"></div>
-            <div class="f {{'unacquired' if inventory[2415] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Infest Broodlings (Kerrigan Passive)&#10;Enemies damaged by Kerrigan become infested and will spawn Broodlings with timed life if killed quickly." class=" abilityicon_spawnbroodlings_square-png"></div>
-            <div class="f {{'unacquired' if inventory[2416] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Fury (Kerrigan Passive)&#10;Each of Kerrigan's attacks temporarily increase her attack speed by 15%. Can stack up to 75%." class=" btn-ability-kerrigan-fury-png"></div>
-            <div class="f {{'unacquired' if inventory[2417] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Ability Efficiency (Kerrigan Passive)&#10;Kerrigan's abilities have their cooldown and energy cost reduced by 20%." class=" btn-ability-kerrigan-abilityefficiency-png"></div>
+            <div class="f {{'unacquired' if inventory[2401] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Heroic Fortitude (Kerrigan Passive)&#10;Kerrigan gains +200 maximum life and double life regeneration rate." class=" btn-ability-kerrigan-heroicfortitude-png"></div>
+            <div class="f {{'unacquired' if inventory[2404] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Chain Reaction (Kerrigan Passive)&#10;Kerrigan's attacks deal normal damage to her target then jump to additional nearby enemies." class=" btn-ability-swarm-kerrigan-chainreaction-png"></div>
+            <div class="f {{'unacquired' if inventory[2415] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Infest Broodlings (Kerrigan Passive)&#10;Enemies damaged by Kerrigan become infested and will spawn Broodlings with timed life if killed quickly." class=" abilityicon_spawnbroodlings_square-png"></div>
+            <div class="f {{'unacquired' if inventory[2416] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Fury (Kerrigan Passive)&#10;Each of Kerrigan's attacks temporarily increase her attack speed by 15%. Can stack up to 75%." class=" btn-ability-kerrigan-fury-png"></div>
+            <div class="f {{'unacquired' if inventory[2417] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Ability Efficiency (Kerrigan Passive)&#10;Kerrigan's abilities have their cooldown and energy cost reduced by 20%." class=" btn-ability-kerrigan-abilityefficiency-png"></div>
           </div>
         </div>
         <div id="class-kerrigan-ultimates" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2418] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Apocalypse (Kerrigan Ability)&#10;Kerrigan deals 300 damage (+400 vs Structure) to enemies in a large area." class=" btn-ability-kerrigan-apocalypse-png"></div>
-            <div class="f {{'unacquired' if inventory[2419] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Spawn Leviathan (Kerrigan Ability)&#10;Kerrigan summons a mighty flying Leviathan with timed life. Deals massive damage and has energy-based abilities." class=" btn-unit-zerg-leviathan-png"></div>
-            <div class="f {{'unacquired' if inventory[2420] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Drop-Pods (Kerrigan Ability)&#10;Kerrigan drops Primal Zerg forces with timed life to the battlefield." class=" btn-ability-kerrigan-droppods-png"></div>
-            <div class="f {{'unacquired' if inventory[2423] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Immobilization Wave (Kerrigan Ability)&#10;Deals 100 damage to enemies around a large area and stuns them for 10 seconds." class=" btn-upgrade-kerrigan-crushinggripwave-png"></div>
+            <div class="f {{'unacquired' if inventory[2418] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Apocalypse (Kerrigan Ability)&#10;Kerrigan deals 300 damage (+400 vs Structure) to enemies in a large area." class=" btn-ability-kerrigan-apocalypse-png"></div>
+            <div class="f {{'unacquired' if inventory[2419] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Spawn Leviathan (Kerrigan Ability)&#10;Kerrigan summons a mighty flying Leviathan with timed life. Deals massive damage and has energy-based abilities." class=" btn-unit-zerg-leviathan-png"></div>
+            <div class="f {{'unacquired' if inventory[2420] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Drop-Pods (Kerrigan Ability)&#10;Kerrigan drops Primal Zerg forces with timed life to the battlefield." class=" btn-ability-kerrigan-droppods-png"></div>
+            <div class="f {{'unacquired' if inventory[2423] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Immobilization Wave (Kerrigan Ability)&#10;Deals 100 damage to enemies around a large area and stuns them for 10 seconds." class=" btn-upgrade-kerrigan-crushinggripwave-png"></div>
           </div>
         </div>
         <div id="class-kerrigan-form" class="item-class">
           <div class="item-class-header">
-            <div class="f {{'unacquired' if inventory[2421] == 0}}"><img src="https://matthewmarinets.github.io/ap_sc2_icons/icons/atlas.v4.0.0.png" title="Primal Form (Kerrigan)&#10;Kerrigan takes on her Primal Zerg form and gains greatly increased energy regeneration." class=" btn-unit-zerg-kerriganascended-png"></div>
+            <div class="f {{'unacquired' if inventory[2421] == 0}}"><img src="https://archipelago-sc2.github.io/content-docs/icons/atlas.v4.0.0.png" title="Primal Form (Kerrigan)&#10;Kerrigan takes on her Primal Zerg form and gains greatly increased energy regeneration." class=" btn-unit-zerg-kerriganascended-png"></div>
           </div>
         </div>
       </div>
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index ead679fd98..cb40c8293f 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -10,7 +10,7 @@ from werkzeug.exceptions import abort
 
 from MultiServer import Context, get_saving_second
 from NetUtils import ClientStatus, Hint, NetworkItem, NetworkSlot, SlotType
-from Utils import restricted_loads, KeyedDefaultDict
+from Utils import restricted_loads, KeyedDefaultDict, utcnow
 from . import app, cache
 from .models import GameDataPackage, Room
 
@@ -273,9 +273,10 @@ class TrackerData:
         Does not include players who have no activity recorded.
         """
         last_activity: Dict[TeamPlayer, datetime.timedelta] = {}
-        now = datetime.datetime.utcnow()
+        now = utcnow()
         for (team, player), timestamp in self._multisave.get("client_activity_timers", []):
-            last_activity[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
+            from_timestamp = datetime.datetime.fromtimestamp(timestamp, datetime.timezone.utc).replace(tzinfo=None)
+            last_activity[team, player] = now - from_timestamp
 
         return last_activity
 
@@ -959,7 +960,7 @@ if "Timespinner" in network_data_package["games"]:
 
         timespinner_location_ids = {
             "Present": list(range(1337000, 1337085)),
-            "Past": list(range(1337086, 1337175)),
+            "Past": list(range(1337086, 1337157)) + list(range(1337159, 1337175)),
             "Ancient Pyramid": [
                 1337236,
                 1337246, 1337247, 1337248, 1337249]
@@ -1228,7 +1229,7 @@ if "Starcraft 2" in network_data_package["games"]:
     def render_Starcraft2_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
         SC2WOL_ITEM_ID_OFFSET = 1000
         SC2HOTS_ITEM_ID_OFFSET = 2000
-        SC2LOTV_ITEM_ID_OFFSET = 2000
+        SC2LOTV_ITEM_ID_OFFSET = 3000
         SC2_KEY_ITEM_ID_OFFSET = 4000
         NCO_LOCATION_ID_LOW = 20004500
         NCO_LOCATION_ID_HIGH = NCO_LOCATION_ID_LOW + 1000
diff --git a/Zelda1Client.py b/Zelda1Client.py
index 6dd7a36165..b4292ecf75 100644
--- a/Zelda1Client.py
+++ b/Zelda1Client.py
@@ -289,7 +289,7 @@ async def nes_sync_task(ctx: ZeldaContext):
                     if not ctx.auth:
                         ctx.auth = ''.join([chr(i) for i in data_decoded['playerName'] if i != 0])
                         if ctx.auth == '':
-                            logger.info("Invalid ROM detected. No player name built into the ROM. Please regenerate"
+                            logger.info("Invalid ROM detected. No player name built into the ROM. Please regenerate "
                                         "the ROM using the same link but adding your slot name")
                         if ctx.awaiting_rom:
                             await ctx.server_auth(False)
diff --git a/ci-requirements.txt b/ci-requirements.txt
index 12460e4f15..80a1c78366 100644
--- a/ci-requirements.txt
+++ b/ci-requirements.txt
@@ -1,3 +1,2 @@
-pytest>=8.4.2,<9  # pytest 9.0.0 is broken for our CI
+pytest>=9.0.1,<10  # this includes subtests support
 pytest-xdist>=3.8.0
-pytest-subtests>=0.15.0  # will not be required anymore once we upgrade to pytest 9.x
diff --git a/data/GLOBAL.apignore b/data/GLOBAL.apignore
new file mode 100644
index 0000000000..fe242e68d1
--- /dev/null
+++ b/data/GLOBAL.apignore
@@ -0,0 +1,13 @@
+# This file specifies patterns that are ignored by default for any world built with the "Build APWorlds" component.
+# These patterns can be overriden by a world-specific .apignore using !-prefixed patterns for negation.
+
+# Auto-created folders
+__MACOSX
+.DS_Store
+__pycache__
+
+# Unneeded files
+/archipelago.json
+/.apignore
+/.git
+/.gitignore
diff --git a/data/client.kv b/data/client.kv
index 08f4c8d718..cf8e88446d 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -224,6 +224,7 @@
     height: self.content.texture_size[1] + 80
 <ScrollBox>:
     layout: layout
+    box_height: dp(100)
     bar_width: "12dp"
     scroll_wheel_distance: 40
     do_scroll_x: False
@@ -234,4 +235,11 @@
         orientation: "vertical"
         spacing: 10
         size_hint_y: None
-        height: self.minimum_height
+        height: max(self.minimum_height, root.box_height)
+
+<MessageBoxLabel>:
+    valign: "middle"
+    halign: "center"
+    text_size: self.width, None
+    height: self.texture_size[1]
+
diff --git a/data/options.yaml b/data/options.yaml
index 3278a3c5c1..2cc6ffa36d 100644
--- a/data/options.yaml
+++ b/data/options.yaml
@@ -28,7 +28,7 @@
 name: Player{number}
 
 # Used to describe your yaml. Useful if you have multiple files.
-description: {{ yaml_dump("Default %s Template" % game) }}
+description: {{ yaml_dump("%s Preset for %s" % (preset_name, game)) if preset_name else yaml_dump("Default %s Template" % game) }}
 
 game: {{ yaml_dump(game) }}
 requires:
@@ -38,11 +38,11 @@ requires:
     {{ yaml_dump(game) }}: {{ world_version }} # Version of the world required for this yaml to work as expected.
   {%- endif %}
 
-{%- macro range_option(option) %}
+{%- macro range_option(option, option_val) %}
     # You can define additional values between the minimum and maximum values.
     # Minimum value is {{ option.range_start }}
     # Maximum value is {{ option.range_end }}
-    {%- set data, notes = dictify_range(option) %}
+    {%- set data, notes = dictify_range(option, option_val) %}
     {%- for entry, default in data.items() %}
     {{ entry }}: {{ default }}{% if notes[entry] %} # {{ notes[entry] }}{% endif %}
     {%- endfor -%}
@@ -56,6 +56,10 @@ requires:
 
   {%- for option_key, option in group_options.items() %}
   {{ option_key }}:
+    {%- set option_val = option.default %}
+    {%- if option_key in preset %}
+      {%- set option_val = preset[option_key] %}
+    {%- endif -%}
     {%- if option.__doc__ %}
     # {{ cleandoc(option.__doc__)
         | trim
@@ -69,25 +73,25 @@ requires:
     {%- endif -%}
 
     {%- if option.range_start is defined and option.range_start is number %}
-    {{- range_option(option) -}}
+    {{- range_option(option, option_val) -}}
 
     {%- elif option.options -%}
     {%- for suboption_option_id, sub_option_name in option.name_lookup.items() %}
-    {{ yaml_dump(sub_option_name) }}: {% if suboption_option_id == option.default %}50{% else %}0{% endif %}
+    {{ yaml_dump(sub_option_name) }}: {% if suboption_option_id == option_val or sub_option_name == option_val %}50{% else %}0{% endif %}
     {%- endfor -%}
-
-    {%- if option.name_lookup[option.default] not in option.options %}
-    {{ yaml_dump(option.default) }}: 50
+  
+    {%- if option.name_lookup[option_val] not in option.options and option_val not in option.options %}
+    {{ yaml_dump(option_val) }}: 50
     {%- endif -%}
 
-    {%- elif option.default is string %}
-    {{ yaml_dump(option.default) }}: 50
+    {%- elif option_val is string %}
+    {{ yaml_dump(option_val) }}: 50
 
-    {%- elif option.default is iterable and option.default is not mapping %}
-    {{ option.default | list }}
+    {%- elif option_val is iterable and option_val is not mapping %}
+    {{ option_val | list }}
 
     {%- else %}
-    {{ yaml_dump(option.default) | indent(4, first=false) }}
+    {{ yaml_dump(option_val) | indent(4, first=false) }}
     {%- endif -%}
     {{ "\n" }}
   {%- endfor %}
diff --git a/data/optionscreator.kv b/data/optionscreator.kv
new file mode 100644
index 0000000000..4c0cc81782
--- /dev/null
+++ b/data/optionscreator.kv
@@ -0,0 +1,174 @@
+<VisualRange>:
+    id: this
+    spacing: 15
+    orientation: "horizontal"
+    slider: slider
+    tag: tag
+    MDLabel:
+        id: tag
+        text: str(this.option.default) if not isinstance(this.option.default, str) else str(this.option.range_start)
+    MDSlider:
+        id: slider
+        min: this.option.range_start
+        max: this.option.range_end
+        value: min(max(this.option.default, this.option.range_start), this.option.range_end) if not isinstance(this.option.default, str) else this.option.range_start
+        step: 1
+        step_point_size: 0
+        MDSliderHandle:
+
+        MDSliderValueLabel:
+
+<VisualChoice>:
+    id: this
+    text: text
+    MDButtonText:
+        id: text
+        text: this.option.get_option_name(this.option.default if not isinstance(this.option.default, str) else list(this.option.options.values())[0])
+        theme_text_color: "Primary"
+
+<VisualNamedRange>:
+    id: this
+    orientation: "horizontal"
+    spacing: "10dp"
+    padding: (0, 0, "10dp", 0)
+    choice: choice
+
+    MDButton:
+        id: choice
+        text: text
+        MDButtonText:
+            id: text
+            text: this.option.default.title() if this.option.default in this.option.special_range_names else "Custom"
+
+<VisualFreeText>:
+    multiline: False
+    font_size: "15sp"
+    text: self.option.default if isinstance(self.option.default, str) else ""
+    theme_height: "Custom"
+    height: "30dp"
+
+
+<VisualTextChoice>:
+    id: this
+    orientation: "horizontal"
+    spacing: "5dp"
+    padding: (0, 0, "10dp", 0)
+
+<VisualToggle>:
+    id: this
+    button: button
+    MDIconButton:
+        id: button
+        icon: "checkbox-outline" if this.option.default else "checkbox-blank-outline"
+
+<VisualListSetEntry@ResizableTextField>:
+    height: "20dp"
+
+<CounterItemValue>:
+    height: "30dp"
+
+<VisualListSetCounter>:
+    id: this
+    scrollbox: scrollbox
+    add: add
+    save: save
+    input: input
+    focus_behavior: False
+
+    MDDialogHeadlineText:
+        text: getattr(this.option, "display_name", this.name)
+
+    MDDialogSupportingText:
+        text: "Add or Remove Entries"
+
+    MDDialogContentContainer:
+        orientation: "vertical"
+        spacing: 10
+
+        MDBoxLayout:
+            orientation: "horizontal"
+            VisualListSetEntry:
+                id: input
+                height: "20dp"
+
+            MDIconButton:
+                id: add
+                icon: "plus"
+                theme_height: "Custom"
+                height: "20dp"
+                on_press: root.validate_add(input)
+
+        ScrollBox:
+            id: scrollbox
+            size_hint_y: None
+            adapt_minimum: False
+
+        MDButton:
+            id: save
+            MDButtonText:
+                text: "Save Changes"
+
+ContainerLayout:
+    md_bg_color: app.theme_cls.backgroundColor
+
+    MainLayout:
+        id: main
+        cols: 3
+        padding: 3, 5, 0, 3
+        spacing: "2dp"
+
+        ScrollBox:
+            id: scrollbox
+            size_hint_x: None
+            width: "150dp"
+
+        MDDivider:
+            orientation: "vertical"
+            width: "4dp"
+
+        MainLayout:
+            id: player_layout
+            rows: 2
+            spacing: "20dp"
+
+            MDBoxLayout:
+                id: player_options
+                orientation: "horizontal"
+                height: "75dp"
+                size_hint_y: None
+                padding: ["10dp", "30dp", "10dp", 0]
+                spacing: "10dp"
+
+                ResizableTextField:
+                    id: player_name
+                    multiline: False
+
+                    MDTextFieldHintText:
+                        text: "Player Name"
+
+                    MDTextFieldMaxLengthText:
+                        max_text_length: 16
+
+                MDBoxLayout:
+                    orientation: "vertical"
+                    spacing: "15dp"
+
+                    MDLabel:
+                        id: game
+                        text: "Game: None"
+                        pos_hint: {"center_x": 0.5, "center_y": 0.5}
+
+                    MDButton:
+                        pos_hint: {"center_x": 0.5, "center_y": 0.5}
+                        on_press: app.export_options(self)
+                        theme_width: "Custom"
+                        size_hint_y: 1
+                        size_hint_x: 1
+
+                        MDButtonText:
+                            pos_hint: {"center_x": 0.5, "center_y": 0.5}
+                            text: "Export Options"
+
+            MainLayout:
+                cols: 1
+                id: options
diff --git a/deploy/example_nginx.conf b/deploy/example_nginx.conf
index b0c0e8e5a0..d44d1ffbd1 100644
--- a/deploy/example_nginx.conf
+++ b/deploy/example_nginx.conf
@@ -41,16 +41,8 @@ http {
     # server_name example.com www.example.com;
 
     keepalive_timeout 5;
-
-    # path for static files
-    root /app/WebHostLib;
-
+    
     location / {
-      # checks for static file, if not found proxy to app
-      try_files $uri @proxy_to_app;
-    }
-
-    location @proxy_to_app {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_set_header Host $http_host;
@@ -60,5 +52,15 @@ http {
 
       proxy_pass http://app_server;
     }
+
+    location /static/ {
+      root /app/WebHostLib/;
+      autoindex off;
+    }
+
+    location = /favicon.ico {
+      alias /app/WebHostLib/static/static/favicon.ico;
+      access_log off;
+    }
   }
 }
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 7b8e48af14..30b61f5c85 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -15,8 +15,10 @@
 # A Link to the Past
 /worlds/alttp/ @Berserker66
 
-# Sudoku (APSudoku)
-/worlds/apsudoku/ @EmilyV99
+# APQuest
+# NewSoupVi is acting maintainer, but world belongs to core with the exception of the music
+/worlds/apquest/ @NewSoupVi
+
 
 # Aquaria
 /worlds/aquaria/ @tioui
@@ -66,6 +68,9 @@
 # DOOM II
 /worlds/doom_ii/ @Daivuk @KScl
 
+# EarthBound
+/worlds/earthbound/ @PinkSwitch
+
 # Factorio
 /worlds/factorio/ @Berserker66
 
@@ -127,6 +132,9 @@
 # Mega Man 2
 /worlds/mm2/ @Silvris
 
+# Mega Man 3
+/worlds/mm3/ @Silvris
+
 # MegaMan Battle Network 3
 /worlds/mmbn3/ @digiholic
 
@@ -172,8 +180,12 @@
 # Sonic Adventure 2 Battle
 /worlds/sa2b/ @PoryGone @RaspberrySpace
 
+# Satisfactory
+/worlds/satisfactory/ @Jarno458 @budak7273
+
 # Starcraft 2
-/worlds/sc2/ @Ziktofel
+# Note: @Ziktofel acts as a mentor
+/worlds/sc2/ @MatthewMarinets @Snarkie @SirChuckOfTheChuckles
 
 # Super Metroid
 /worlds/sm/ @lordlou
diff --git a/docs/adding games.md b/docs/adding games.md
index 762a908fc8..a977109bde 100644
--- a/docs/adding games.md	
+++ b/docs/adding games.md	
@@ -17,7 +17,8 @@ it will not be detailed here.
 The client is an intermediary program between the game and the Archipelago server. This can either be a direct
 modification to the game, an external program, or both. This can be implemented in nearly any modern language, but it
 must fulfill a few requirements in order to function as expected. Libraries for most modern languages and the spec for 
-various packets can be found in the [network protocol](/docs/network%20protocol.md) API reference document.
+various packets can be found in the [network protocol](/docs/network%20protocol.md) API reference document. Additional help with specific game
+engines and rom formats can be found in the #ap-modding-help channel in the [Discord](https://archipelago.gg/discord).
 
 ### Hard Requirements
 
@@ -86,7 +87,8 @@ The world is your game integration for the Archipelago generator, webhost, and m
 information necessary for creating the items and locations to be randomized, the logic for item placement, the 
 datapackage information so other game clients can recognize your game data, and documentation. Your world must be
 written as a Python package to be loaded by Archipelago. This is currently done by creating a fork of the Archipelago
-repository and creating a new world package in `/worlds/`. 
+repository and creating a new world package in `/worlds/` (see [running from source](/docs/running%20from%20source.md)
+for setup).
 
 The base World class can be found in [AutoWorld](/worlds/AutoWorld.py). Methods available for your world to call 
 during generation can be found in [BaseClasses](/BaseClasses.py) and [Fill](/Fill.py). Some examples and documentation 
@@ -139,8 +141,8 @@ if possible.
 
 * An implementation of
   [get_filler_item_name](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/AutoWorld.py#L473)
-  * By default, this function chooses any item name from `item_name_to_id`, so you want to limit it to only the true
-    filler items.
+  * By default, this function chooses any item name from `item_name_to_id`, which may include items you consider
+  "non-repeatable".
 * An `options_dataclass` defining the options players have available to them
   * This should be accompanied by a type hint for `options` with the same class name
 * A [bug report page](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/AutoWorld.py#L220)
diff --git a/docs/apworld specification.md b/docs/apworld specification.md
index 7022e0ac3d..7e13d6ccd3 100644
--- a/docs/apworld specification.md	
+++ b/docs/apworld specification.md	
@@ -41,16 +41,18 @@ There are also the following optional fields:
 If the APWorld is packaged as an `.apworld` zip file, it also needs to have `version` and `compatible_version`,
 which refer to the version of the APContainer packaging scheme defined in [Files.py](../worlds/Files.py).  
 These get automatically added to the `archipelago.json` of an .apworld if it is packaged using the 
-["Build apworlds" launcher component](#build-apworlds-launcher-component),
+["Build APWorlds" launcher component](#build-apworlds-launcher-component),
 which is the correct way to package your `.apworld` as a world developer. Do not write these fields yourself.
 
-### "Build apworlds" Launcher Component
+### "Build APWorlds" Launcher Component
 
-In the Archipelago Launcher, there is a "Build apworlds" component that will package all world folders to `.apworld`,
-and add `archipelago.json` manifest files to them.  
+In the Archipelago Launcher (on [source only](/docs/running%20from%20source.md)), there is a "Build APWorlds"
+component that will package all world folders to `.apworld`, and add `archipelago.json` manifest files to them.  
 These .apworld files will be output to `build/apworlds` (relative to the Archipelago root directory).  
 The `archipelago.json` file in each .apworld will automatically include the appropriate
-`version` and `compatible_version`.
+`version` and `compatible_version`.  
+The component can also be called from the command line to allow for specifying a certain list of worlds to build.
+For example, running `Launcher.py "Build APWorlds" -- "Game Name"` will build only the game called `Game Name`.
 
 If a world folder has an `archipelago.json` in its root, any fields it contains will be carried over.  
 So, a world folder with an `archipelago.json` that looks like this:
@@ -79,10 +81,26 @@ will be packaged into an `.apworld` with a manifest file inside of it that looks
 
 This is the recommended workflow for packaging your world to an `.apworld`.
 
-## Extra Data
+### .apignore Exclusions
 
-The zip can contain arbitrary files in addition what was specified above.
+By default, any additional files inside of the world folder will be packaged into the resulting `.apworld` archive and
+can then be read by the world. However, if there are any other files that aren't needed in the resulting `.apworld`, you
+can automatically prevent the build component from including them by specifying them in a file called `.apignore` inside
+the root of the world folder.
 
+The `.apignore` file selects files in the same way as the `.gitignore` format with patterns separated by line describing
+which files to ignore. For example, an `.apignore` like this:
+
+```gitignore
+*.iso
+scripts/
+!scripts/needed.py
+```
+
+would ignore any `.iso` files and anything in the scripts folder except for `scripts/needed.py`.
+
+Some exclusions are made by default for all worlds such as `__pycache__` folders. These are listed in the
+`GLOBAL.apignore` file inside of the `data` directory.
 
 ## Caveats
 
diff --git a/docs/apworld_dev_faq.md b/docs/apworld_dev_faq.md
index 6e1c102c6a..54f7698998 100644
--- a/docs/apworld_dev_faq.md
+++ b/docs/apworld_dev_faq.md
@@ -6,6 +6,49 @@ including [Contributing](contributing.md), [Adding Games](<adding games.md>), an
 
 ---
 
+### I've never added a game to Archipelago before. Should I start with the APWorld or the game client?
+
+Strictly speaking, this is a false dichotomy: we do *not* recommend doing 100% of client work before the APWorld,
+or 100% of APWorld work before the client. It's important to iterate on both parts and test them together.
+However, the early iterations tend to be very similar for most games,
+so the typical recommendation for first-time AP developers is:
+
+- Start with a proof-of-concept for [the game client](adding%20games.md#client)
+  - Figure out how to interface with the game. Whether that means "modding" the game, or patching a ROM file,
+    or developing a separate client program that edits the game's memory, or some other technique.
+  - Figure out how to give items and detect locations in the actual game. Not every item and location,
+    just one of each major type (e.g. opening a chest vs completing a sidequest) to prove all the items and locations
+    you want can actually be implemented.
+  - Figure out how to make a websocket connection to an AP server, possibly using a client library (see [Network Protocol](<network%20protocol.md>).
+    To make absolutely sure this part works, you may want to test the connection by generating a multiworld
+    with a different game, then making your client temporarily pretend to be that other game.
+- Next, make a "trivial" APWorld, i.e. an APWorld that always generates the same items and locations
+  - If you've never done this before, likely the fastest approach is to copy-paste [APQuest](<../worlds/apquest>), and read the many
+    comments in there until you understand how to edit the items and locations.
+- Then you can do your first "end-to-end test": generate a multiworld using your APWorld, [run a local server](<running%20from%20source.md>)
+  to host it, connect to that local server from your game client, actually check a location in the game,
+  and finally make sure the client successfully sent that location check to the AP server
+  as well as received an item from it.
+
+That's about where general recommendations end. What you should do next will depend entirely on your game
+(e.g. implement more items, write down logic rules, add client features, prototype a tracker, etc).
+If you're not sure, then this would be a good time to re-read [Adding Games](<adding%20games.md>), and [World API](<world%20api.md>).
+
+There are a few assumptions in this recommendation worth stating explicitly, namely:
+
+- If something you want to do is infeasible, you want to find out that it's infeasible as soon as possible, before
+  you write a bunch of code assuming it could be done. That's why we recommend starting with the game client.
+  - Getting an APWorld to generate whatever items/locations you want is always feasible, since items/locations are
+    little more than id numbers and name strings during generation.
+- You generally want to get to an "end-to-end playable" prototype quickly. On top of all the technical challenges these
+  docs describe, it's also important to check that a randomizer is *fun to play*, and figure out what features would be
+  essential for a public release.
+- A first-time world developer may or may not be deeply familiar with Archipelago, but they're almost certainly familiar
+  with the game they want to randomize. So judging whether your game client is working correctly might be significantly
+  easier than judging if your APWorld is working.
+
+---
+
 ### My game has a restrictive start that leads to fill errors
 
 A "restrictive start" here means having a combination of very few sphere 1 locations and potentially requiring more
@@ -140,3 +183,58 @@ So when the game itself does not follow this assumption, the options are:
   - For connections, any logical regions will still need to be reachable through other, *repeatable* connections
   - For locations, this may require game changes to remove the vanilla item if it affects logic
 - Decide that resetting the save file is part of the game's logic, and warn players about that
+
+---
+
+### What are "local" vs "remote" items, and what are the pros and cons of each?
+
+First off, these terms can be misleading. Since the whole point of a multi-game multiworld randomizer is that some items
+are going to be placed in other slots (unless there's only one slot), the choice isn't really "local vs remote";
+it's "mixed local/remote vs all remote". You have to get "remote items" working to be an AP implementation at all, and
+it's often simpler to handle every item/location the same way, so you generally shouldn't worry about "local items"
+until you've finished more critical features.
+
+Next, "local" and "remote" items confusingly refer to multiple concepts, so it's important to clearly separate them:
+
+- Whether an item happens to get placed in the same slot it originates from, or a different slot. I'll call these
+  "locally placed" and "remotely placed" items.
+- Whether an AP client implements location checking for locally placed items by skipping the usual AP server roundtrip
+  (i.e. sending [LocationChecks](<network%20protocol.md#locationchecks>)
+  then receiving [ReceivedItems](<network%20protocol.md#receiveditems>)
+  ) and directly giving the item to the player, or by doing the AP server roundtrip regardless. I'll call these
+  "locally implemented" items and "remotely implemented" items.
+  - Locally implementing items requires the AP client to know what the locally placed items were without asking an AP
+    server (or else you'd effectively be doing remote items with extra steps). Typically, it gets that information from
+    a patch file, which is one reason why games that already need a patch file are more likely to choose local items.
+  - If items are remotely implemented, the AP client can use [location scouts](<network%20protocol.md#LocationScouts>)
+    to learn what items are placed on what locations. Features that require this information are sometimes mistakenly
+    assumed to require locally implemented items, but location scouts work just as well as patch file data.
+- [The `items_handling` bitflags in the Connect packet](<network%20protocol.md#items_handling-flags>).
+  AP clients with remotely implemented items will typically set all three flags, including "from your own world".
+  Clients with locally implemented items might set only the "from other worlds" flag.
+  - Whether a local items client sets the "starting inventory" flag likely depends on other details. For example, if a ROM
+    is being patched, and starting inventory can be added to that patch, then it makes sense to leave the flag unset.
+
+When people talk about "local vs remote items" as a choice that world devs have to make, they mean deciding whether
+your client will locally or remotely implement the items which happen to be locally placed (or make both
+implementations, or let the player choose an implementation).
+
+Theoretically, the biggest benefit of "local items" is that it allows a solo (single slot) multiworld to be played
+entirely offline, with no AP server, from start to finish. This is similar to a "standalone"/non-AP randomizer,
+except that you still get AP's player options, generation, etc. for free.
+For some games, there are also technical constraints that make certain items easier to implement locally,
+or less glitchy when implemented locally, as long as you're okay with never allowing these items to be placed remotely
+(or offering the player even more options).
+
+The main downside (besides more implementation work) is that "local items" can't support "same slot co-op".
+That's when two players on two different machines connect to the same slot and play together.
+This only works if both players receive all the items for that slot, including ones found by the other player,
+which requires those items to be implemented remotely so the AP server can send them to all of that slot's clients.
+
+So to recap:
+
+- (All) remote items is often the simplest choice, since you have to implement remote items anyway.
+- Remote items enable same slot co-op.
+- Local items enable solo offline play.
+- If you want to support both solo offline play and same slot co-op,
+  you might need to expose local vs remote items as an option to the player.
diff --git a/docs/contributing.md b/docs/contributing.md
index 06d83bebbc..689c765559 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -20,7 +20,7 @@ game contributions:
   It is recommended that automated github actions are turned on in your fork to have github run unit tests after
   pushing.
   You can turn them on here:  
-  ![Github actions example](./img/github-actions-example.png)
+  ![Github actions example](/docs/img/github-actions-example.png)
 
 * **When reviewing PRs, please leave a message about what was done.**
   We don't have full test coverage, so manual testing can help.
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 0f6a246c1d..c3e4956557 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -225,7 +225,7 @@ Sent to clients after a client requested this message be sent to them, more info
 | games | list\[str\] | Optional. Game names this message is targeting |
 | slots | list\[int\] | Optional. Player slot IDs that this message is targeting |
 | tags | list\[str\] | Optional. Client [Tags](#Tags) this message is targeting |
-| data | dict | The data in the [Bounce](#Bounce) package copied |
+| data | dict | Optional. The data in the [Bounce](#Bounce) package copied |
 
 ### InvalidPacket
 Sent to clients if the server caught a problem with a packet. This only occurs for errors that are explicitly checked for.
@@ -425,7 +425,7 @@ the server will forward the message to all those targets to which any one requir
 | games | list\[str\] | Optional. Game names that should receive this message |
 | slots | list\[int\] | Optional. Player IDs that should receive this message |
 | tags | list\[str\] | Optional. Client tags that should receive this message |
-| data | dict | Any data you want to send |
+| data | dict | Optional. Any data you want to send |
 
 ### Get
 Used to request a single or multiple values from the server's data storage, see the [Set](#Set) package for how to write values to the data storage. A Get package will be answered with a [Retrieved](#Retrieved) package.
diff --git a/docs/options api.md b/docs/options api.md
index 193d395342..7234d1cc49 100644
--- a/docs/options api.md	
+++ b/docs/options api.md	
@@ -269,7 +269,8 @@ placed on them.
 
 ### PriorityLocations
 Marks locations given here as `LocationProgressType.Priority` forcing progression items on them if any are available in
-the pool.
+the pool. Progression items without a deprioritized flag will be used first when filling priority_locations. Progression items with
+a deprioritized flag will be used next.
 
 ### ItemLinks
 Allows users to share their item pool with other players. Currently item links are per game. A link of one game between
diff --git a/docs/rule builder.md b/docs/rule builder.md
new file mode 100644
index 0000000000..4f9102a2ba
--- /dev/null
+++ b/docs/rule builder.md	
@@ -0,0 +1,482 @@
+# Rule Builder
+
+This document describes the API provided for the rule builder. Using this API provides you with with a simple interface to define rules and the following advantages:
+
+- Rule classes that avoid all the common pitfalls
+- Logic optimization
+- Automatic result caching (opt-in)
+- Serialization/deserialization
+- Human-readable logic explanations for players
+
+## Overview
+
+The rule builder consists of 3 main parts:
+
+1. The rules, which are classes that inherit from `rule_builder.rules.Rule`. These are what you write for your logic. They can be combined and take into account your world's options. There are a number of default rules listed below, and you can create as many custom rules for your world as needed. When assigning the rules to a location or entrance they must be resolved.
+1. Resolved rules, which are classes that inherit from `rule_builder.rules.Rule.Resolved`. These are the optimized rules specific to one player that are set as a location or entrance's access rule. You generally shouldn't be directly creating these but they'll be created when assigning rules to locations or entrances. These are what power the human-readable logic explanations.
+1. The optional rule builder world subclass `CachedRuleBuilderWorld`, which is a class your world can inherit from instead of `World`. It adds a caching system to the rules that will lazy evaluate and cache the result.
+
+## Usage
+
+For the most part the only difference in usage is instead of writing lambdas for your logic, you write static Rule objects. You then must use `world.set_rule` to assign the rule to a location or entrance.
+
+```python
+# In your world's create_regions method
+location = MyWorldLocation(...)
+self.set_rule(location, Has("A Big Gun"))
+```
+
+The rule builder comes with a number of rules by default:
+
+- `True_`: Always returns true
+- `False_`: Always returns false
+- `And`: Checks that all child rules are true (also provided by `&` operator)
+- `Or`: Checks that at least one child rule is true (also provided by `|` operator)
+- `Has`: Checks that the player has the given item with the given count (default 1)
+- `HasAll`: Checks that the player has all given items
+- `HasAny`: Checks that the player has at least one of the given items
+- `HasAllCounts`: Checks that the player has all of the counts for the given items
+- `HasAnyCount`: Checks that the player has any of the counts for the given items
+- `HasFromList`: Checks that the player has some number of given items
+- `HasFromListUnique`: Checks that the player has some number of given items, ignoring duplicates of the same item
+- `HasGroup`: Checks that the player has some number of items from a given item group
+- `HasGroupUnique`: Checks that the player has some number of items from a given item group, ignoring duplicates of the same item
+- `CanReachLocation`: Checks that the player can logically reach the given location
+- `CanReachRegion`: Checks that the player can logically reach the given region
+- `CanReachEntrance`: Checks that the player can logically reach the given entrance
+
+You can combine these rules together to describe the logic required for something. For example, to check if a player either has `Movement ability` or they have both `Key 1` and `Key 2`, you can do:
+
+```python
+rule = Has("Movement ability") | HasAll("Key 1", "Key 2")
+```
+
+> ⚠️ Composing rules with the `and` and `or` keywords will not work. You must use the bitwise `&` and `|` operators. In order to catch mistakes, the rule builder will not let you do boolean operations. As a consequence, in order to check if a rule is defined you must use `if rule is not None`.
+
+### Assigning rules
+
+When assigning the rule you must use the `set_rule` helper to correctly resolve and register the rule.
+
+```python
+self.set_rule(location_or_entrance, rule)
+```
+
+There is also a `create_entrance` helper that will resolve the rule, check if it's `False`, and if not create the entrance and set the rule. This allows you to skip creating entrances that will never be valid. You can also specify `force_creation=True` if you would like to create the entrance even if the rule is `False`.
+
+```python
+self.create_entrance(from_region, to_region, rule)
+```
+
+> ⚠️ If you use a `CanReachLocation` rule on an entrance, you will either have to create the locations first, or specify the location's parent region name with the `parent_region_name` argument of `CanReachLocation`.
+
+You can also set a rule for your world's completion condition:
+
+```python
+self.set_completion_rule(rule)
+```
+
+### Restricting options
+
+Every rule allows you to specify which options it's applicable for. You can provide the argument `options` which is an iterable of `OptionFilter` instances. Rules that pass the options check will be resolved as normal, and those that fail will be resolved as `False`.
+
+If you want a comparison that isn't equals, you can specify with the `operator` argument. The following operators are allowed:
+
+- `eq`: `==`
+- `ne`: `!=`
+- `gt`: `>`
+- `lt`: `<`
+- `ge`: `>=`
+- `le`: `<=`
+- `contains`: `in`
+
+By default rules that are excluded by their options will default to `False`. If you want to default to `True` instead, you can specify `filtered_resolution=True` on your rule.
+
+To check if the player can reach a switch, or if they've received the switch item if switches are randomized:
+
+```python
+rule = (
+    Has("Red switch", options=[OptionFilter(SwitchRando, 1)])
+    | CanReachLocation("Red switch", options=[OptionFilter(SwitchRando, 0)])
+)
+```
+
+To add an extra logic requirement on the easiest difficulty which is ignored for other difficulties:
+
+```python
+rule = (
+    # ...the rest of the logic
+    & Has("QoL item", options=[OptionFilter(Difficulty, Difficulty.option_easy)], filtered_resolution=True)
+)
+```
+
+If you would like to provide option filters when reusing or composing rules, you can use the `Filtered` helper rule:
+
+```python
+common_rule = Has("A") | HasAny("B", "C")
+...
+rule = (
+    Filtered(common_rule, options=[OptionFilter(Opt, 0)]),
+    | Filtered(Has("X") | CanReachRegion("Y"), options=[OptionFilter(Opt, 1)]),
+)
+```
+
+You can also use the & and | operators to apply options to rules:
+
+```python
+common_rule = Has("A")
+easy_filter = [OptionFilter(Difficulty, Difficulty.option_easy)]
+common_rule_only_on_easy = common_rule & easy_filter
+common_rule_skipped_on_easy = common_rule | easy_filter
+```
+
+## Enabling caching
+
+The rule builder provides a `CachedRuleBuilderWorld` base class for your `World` class that enables caching on your rules.
+
+```python
+class MyWorld(CachedRuleBuilderWorld):
+    game = "My Game"
+```
+
+If your world's logic is very simple and you don't have many nested rules, the caching system may have more overhead cost than time it saves. You'll have to benchmark your own world to see if it should be enabled or not.
+
+### Item name mapping
+
+If you have multiple real items that map to a single logic item, add a `item_mapping` class dict to your world that maps actual item names to real item names so the cache system knows what to invalidate.
+
+For example, if you have multiple `Currency x<num>` items on locations, but your rules only check a singular logical `Currency` item, eg `Has("Currency", 1000)`, you'll want to map each numerical currency item to the single logical `Currency`.
+
+```python
+class MyWorld(CachedRuleBuilderWorld):
+    item_mapping = {
+        "Currency x10": "Currency",
+        "Currency x50": "Currency",
+        "Currency x100": "Currency",
+        "Currency x500": "Currency",
+    }
+```
+
+## Defining custom rules
+
+You can create a custom rule by creating a class that inherits from `Rule` or any of the default rules. You must provide the game name as an argument to the class. It's recommended to use the `@dataclass` decorator to reduce boilerplate, and to also provide your world as a type argument to add correct type checking to the `_instantiate` method.
+
+You must provide or inherit a `Resolved` child class that defines an `_evaluate` method. This class will automatically be converted into a frozen `dataclass`. If your world has caching enabled you may need to define one or more dependencies functions as outlined below.
+
+To add a rule that checks if the user has enough mcguffins to goal, with a randomized requirement:
+
+```python
+@dataclasses.dataclass()
+class CanGoal(Rule["MyWorld"], game="My Game"):
+    @override
+    def _instantiate(self, world: "MyWorld") -> Rule.Resolved:
+        # caching_enabled only needs to be passed in when your world inherits from CachedRuleBuilderWorld
+        return self.Resolved(world.required_mcguffins, player=world.player, caching_enabled=True)
+
+    class Resolved(Rule.Resolved):
+        goal: int
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return state.has("McGuffin", self.player, count=self.goal)
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            # this function is only required if you have caching enabled
+            return {"McGuffin": {id(self)}}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            # this method can be overridden to display custom explanations
+            return [
+                {"type": "text", "text": "Goal with "},
+                {"type": "color", "color": "green" if state and self(state) else "salmon", "text": str(self.goal)},
+                {"type": "text", "text": " McGuffins"},
+            ]
+```
+
+Your custom rule can also resolve to builtin rules instead of needing to define your own:
+
+```python
+@dataclasses.dataclass()
+class ComplicatedFilter(Rule["MyWorld"], game="My Game"):
+    def _instantiate(self, world: "MyWorld") -> Rule.Resolved:
+        if world.some_precalculated_bool:
+            return Has("Item 1").resolve(world)
+        if world.options.some_option:
+            return CanReachRegion("Region 1").resolve(world)
+        return False_().resolve(world)
+```
+
+### Item dependencies
+
+If your world inherits from `CachedRuleBuilderWorld` and there are items that when collected will affect the result of your rule evaluation, it must define an `item_dependencies` function that returns a mapping of the item name to the id of your rule. These dependencies will be combined to inform the caching system. It may be worthwhile to define this function even when caching is disabled as more things may use it in the future.
+
+```python
+@dataclasses.dataclass()
+class MyRule(Rule["MyWorld"], game="My Game"):
+    class Resolved(Rule.Resolved):
+        item_name: str
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {self.item_name: {id(self)}}
+```
+
+All of the default `Has*` rules define this function already.
+
+### Region dependencies
+
+If your custom rule references other regions, it must define a `region_dependencies` function that returns a mapping of region names to the id of your rule regardless of if your world inherits from `CachedRuleBuilderWorld`. These dependencies will be combined to register indirect connections when you set this rule on an entrance and inform the caching system if applicable.
+
+```python
+@dataclasses.dataclass()
+class MyRule(Rule["MyWorld"], game="My Game"):
+    class Resolved(Rule.Resolved):
+        region_name: str
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            return {self.region_name: {id(self)}}
+```
+
+The default `CanReachLocation`, `CanReachRegion`, and `CanReachEntrance` rules define this function already.
+
+### Location dependencies
+
+If your custom rule references other locations, it must define a `location_dependencies` function that returns a mapping of the location name to the id of your rule regardless of if your world inherits from `CachedRuleBuilderWorld`. These dependencies will be combined to register indirect connections when you set this rule on an entrance and inform the caching system if applicable.
+
+```python
+@dataclasses.dataclass()
+class MyRule(Rule["MyWorld"], game="My Game"):
+    class Resolved(Rule.Resolved):
+        location_name: str
+
+        @override
+        def location_dependencies(self) -> dict[str, set[int]]:
+            return {self.location_name: {id(self)}}
+```
+
+The default `CanReachLocation` rule defines this function already.
+
+### Entrance dependencies
+
+If your custom rule references other entrances, it must define a `entrance_dependencies` function that returns a mapping of the entrance name to the id of your rule regardless of if your world inherits from `CachedRuleBuilderWorld`. These dependencies will be combined to register indirect connections when you set this rule on an entrance and inform the caching system if applicable.
+
+```python
+@dataclasses.dataclass()
+class MyRule(Rule["MyWorld"], game="My Game"):
+    class Resolved(Rule.Resolved):
+        entrance_name: str
+
+        @override
+        def entrance_dependencies(self) -> dict[str, set[int]]:
+            return {self.entrance_name: {id(self)}}
+```
+
+The default `CanReachEntrance` rule defines this function already.
+
+### Rule explanations
+
+Resolved rules have a default implementation for `explain_json` and `explain_str` functions. The former optionally accepts a `CollectionState` and returns a list of `JSONMessagePart` appropriate for `print_json` in a client. It will display a human-readable message that explains what the rule requires. The latter is similar but returns a string. It is useful when debugging. There is also a `__str__` method defined to check what a rule is without a state.
+
+To implement a custom message with a custom rule, override the `explain_json` and/or `explain_str` method on your `Resolved` class:
+
+```python
+class MyRule(Rule, game="My Game"):
+    class Resolved(Rule.Resolved):
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            has_item = state and state.has("growth spurt", self.player)
+            color = "yellow"
+            start = "You must be "
+            if has_item:
+                start = "You are "
+                color = "green"
+            elif state is not None:
+                start = "You are not "
+                color = "salmon"
+            return [
+                {"type": "text", "text": start},
+                {"type": "color", "color": color, "text": "THIS"},
+                {"type": "text", "text": " tall to beat the game"},
+            ]
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            if state.has("growth spurt", self.player):
+                return "You ARE this tall and can beat the game"
+            return "You are not THIS tall and cannot beat the game"
+
+        @override
+        def __str__(self) -> str:
+            return "You must be THIS tall to beat the game"
+```
+
+### Cache control
+
+By default your custom rule will work through the cache system as any other rule if caching is enabled. There are two class attributes on the `Resolved` class you can override to change this behavior.
+
+- `force_recalculate`: Setting this to `True` will cause your custom rule to skip going through the caching system and always recalculate when being evaluated. When a rule with this flag enabled is composed with `And` or `Or` it will cause any parent rules to always force recalculate as well. Use this flag when it's difficult to determine when your rule should be marked as stale.
+- `skip_cache`: Setting this to `True` will also cause your custom rule to skip going through the caching system when being evaluated. However, it will **not** affect any other rules when composed with `And` or `Or`, so it must still define its `*_dependencies` functions as required. Use this flag when the evaluation of this rule is trivial and the overhead of the caching system will slow it down.
+
+### Caveats
+
+- Ensure you are passing `caching_enabled=True` in your `_instantiate` function when creating resolved rule instances if your world has opted into caching.
+- Resolved rules are forced to be frozen dataclasses. They and all their attributes must be immutable and hashable.
+- If your rule creates child rules ensure they are being resolved through the world rather than creating `Resolved` instances directly.
+
+## Serialization
+
+The rule builder is intended to be written first in Python for optimization and type safety. To facilitate exporting the rules to a client or tracker, rules have a `to_dict` method that returns a JSON-compatible dict. Since the location and entrance logic structure varies greatly from world to world, the actual JSON dumping is left up to the world dev.
+
+The dict contains a `rule` key with the name of the rule, an `options` key with the rule's list of option filters, and an `args` key that contains any other arguments the individual rule has. For example, this is what a simple `Has` rule would look like:
+
+```python
+{
+    "rule": "Has",
+    "options": [],
+    "args": {
+        "item_name": "Some item",
+        "count": 1,
+    },
+}
+```
+
+For `And` and `Or` rules, instead of an `args` key, they have a `children` key containing a list of their child rules in the same serializable format:
+
+```python
+{
+    "rule": "And",
+    "options": [],
+    "children": [
+        ...,  # each serialized rule
+    ]
+}
+```
+
+A full example is as follows:
+
+```python
+rule = And(
+    Has("a", options=[OptionFilter(ToggleOption, 0)]),
+    Or(Has("b", count=2), CanReachRegion("c"), options=[OptionFilter(ToggleOption, 1)]),
+)
+assert rule.to_dict() == {
+    "rule": "And",
+    "options": [],
+    "children": [
+        {
+            "rule": "Has",
+            "options": [
+                {
+                    "option": "worlds.my_world.options.ToggleOption",
+                    "value": 0,
+                    "operator": "eq",
+                },
+            ],
+            "args": {
+                "item_name": "a",
+                "count": 1,
+            },
+        },
+        {
+            "rule": "Or",
+            "options": [
+                {
+                    "option": "worlds.my_world.options.ToggleOption",
+                    "value": 1,
+                    "operator": "eq",
+                },
+            ],
+            "children": [
+                {
+                    "rule": "Has",
+                    "options": [],
+                    "args": {
+                        "item_name": "b",
+                        "count": 2,
+                    },
+                },
+                {
+                    "rule": "CanReachRegion",
+                    "options": [],
+                    "args": {
+                        "region_name": "c",
+                    },
+                },
+            ],
+        },
+    ],
+}
+```
+
+### Custom serialization
+
+To define a different format for your custom rules, override the `to_dict` function:
+
+```python
+class BasicLogicRule(Rule, game="My Game"):
+    items = ("one", "two")
+
+    def to_dict(self) -> dict[str, Any]:
+        # Return whatever format works best for you
+        return {
+            "logic": "basic",
+            "items": self.items,
+        }
+```
+
+If your logic has been done in custom JSON first, you can define a `from_dict` class method on your rules to parse it correctly:
+
+```python
+class BasicLogicRule(Rule, game="My Game"):
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: type[World]) -> Self:
+        items = data.get("items", ())
+        return cls(*items)
+```
+
+## APIs
+
+This section is provided for reference, refer to the above sections for examples.
+
+### World API
+
+These are properties and helpers that are available to you in your world.
+
+#### Methods
+
+- `rule_from_dict(data)`: Create a rule instance from a deserialized dict representation
+- `register_rule_builder_dependencies()`: Register all rules that depend on location or entrance access with the inherited dependencies, gets called automatically after set_rules
+- `set_rule(spot: Location | Entrance, rule: Rule)`: Resolve a rule, register its dependencies, and set it on the given location or entrance
+- `set_completion_rule(rule: Rule)`: Sets the completion condition for this world
+- `create_entrance(from_region: Region, to_region: Region, rule: Rule | None, name: str | None = None, force_creation: bool = False)`: Attempt to create an entrance from `from_region` to `to_region`, skipping creation if `rule` is defined and evaluates to `False_()` unless force_creation is `True`
+
+#### CachedRuleBuilderWorld Properties
+
+The following property is only available when inheriting from `CachedRuleBuilderWorld`
+
+- `item_mapping: dict[str, str]`: A mapping of actual item name to logical item name
+
+### Rule API
+
+These are properties and helpers that you can use or override for custom rules.
+
+- `_instantiate(world: World)`: Create a new resolved rule instance, override for custom rules as required
+- `to_dict()`: Create a JSON-compatible dict representation of this rule, override if you want to customize your rule's serialization
+- `from_dict(data, world_cls: type[World])`: Return a new rule instance from a deserialized representation, override if you've overridden `to_dict`
+- `__str__()`: Basic string representation of a rule, useful for debugging
+
+#### Resolved rule API
+
+- `player: int`: The slot this rule is resolved for
+- `_evaluate(state: CollectionState)`: Evaluate this rule against the given state, override this to define the logic for this rule
+- `item_dependencies()`: A mapping of item name to set of ids, override this if your custom rule depends on item collection
+- `region_dependencies()`: A mapping of region name to set of ids, override this if your custom rule depends on reaching regions
+- `location_dependencies()`: A mapping of location name to set of ids, override this if your custom rule depends on reaching locations
+- `entrance_dependencies()`: A mapping of entrance name to set of ids, override this if your custom rule depends on reaching entrances
+- `explain_json(state: CollectionState | None = None)`: Return a list of printJSON messages describing this rule's logic (and if state is defined its evaluation) in a human readable way, override to explain custom rules
+- `explain_str(state: CollectionState | None = None)`: Return a string describing this rule's logic (and if state is defined its evaluation) in a human readable way, override to explain custom rules, more useful for debugging
+- `__str__()`: A string describing this rule's logic without its evaluation, override to explain custom rules
diff --git a/docs/running from source.md b/docs/running from source.md
index efe6e24361..dbb2516961 100644
--- a/docs/running from source.md	
+++ b/docs/running from source.md	
@@ -7,10 +7,9 @@ use that version. These steps are for developers or platforms without compiled r
 ## General
 
 What you'll need:
- * [Python 3.11.9 or newer](https://www.python.org/downloads/), not the Windows Store version
+ * [Python 3.11.9 or newer but less than 3.14](https://www.python.org/downloads/), not the Windows Store version
    * On Windows, please consider only using the latest supported version in production environments since security
      updates for older versions are not easily available.
-   * Python 3.13.x is currently the newest supported version
  * pip: included in downloads from python.org, separate in many Linux distributions
  * Matching C compiler
    * possibly optional, read operating system specific sections
@@ -53,6 +52,32 @@ Recommended steps
 Refer to [Guide to Run Archipelago from Source Code on macOS](../worlds/generic/docs/mac_en.md).
 
 
+## Linux
+
+If your Linux distribution ships a compatible Python version (see [General](#general)) and pip, you can use that,
+otherwise you may need to install Python from a 3rd party. Refer to documentation of your Linux distribution.
+
+Installing a C compiler is usually optional. The package is typically named `gcc`, sometimes another package with the
+base build tools may be required, i.e. `build-essential` (Debian/Ubuntu) or `base-devel` (Arch).
+
+After getting the source code, it is strongly recommended to create a
+[venv](https://docs.python.org/3/tutorial/venv.html) (Virtual Environment)
+by hand or using an IDE, such as PyCharm, because Archipelago requires specific versions of Python packages.
+
+Run `python ModuleUpdate.py` in the project root to install packages, run `python Launcher.py` to run the Launcher.
+
+### Building
+
+Builds contain (almost) all dependencies to run Archipelago on any Linux distribution that is as new or newer than the
+one it was built on. Beware that currently only the oldest Ubuntu LTS available in GitHub actions is supported for that.
+This means the easiest way to generate a build is by running the `Build` action from GitHub actions instead of building
+locally. If you still want to, e.g. for local testing, you can by running
+
+`python setup.py build_exe` to generate a binary distribution of Archipelago in `build/`. Or to generate an AppImage
+first generate the binary distribution and then run `python setup.py bdist_appimage` to populate `dist/`. You need to
+put an `appimagetool` into the directory you run the command from, rename it to `appimagetool` and make it executable.
+
+
 ## Optional: A Link to the Past Enemizer
 
 Only required to generate seeds that include A Link to the Past with certain options enabled. You will receive an
diff --git a/docs/style.md b/docs/style.md
index e38be9d649..e4eeadeacf 100644
--- a/docs/style.md
+++ b/docs/style.md
@@ -47,21 +47,27 @@
 
 ## HTML
 
-* Indent with 2 spaces for new code.
+* Indent with 4 spaces for new code.
 * kebab-case for ids and classes.
+* Avoid using on* attributes (onclick, etc.).
 
-## CSS
+## CSS / SCSS
 
-* Indent with 2 spaces for new code.
+* Indent with 4 spaces for new code.
 * `{` on the same line as the selector.
-* No space between selector and `{`.
+* Space between selector and `{`.
 
 ## JS
 
-* Indent with 2 spaces.
-* Indent `case` inside `switch ` with 2 spaces.
-* Use single quotes.
+* Indent with 4 spaces.
+* Indent `case` inside `switch ` with 4 spaces.
+* Prefer double quotation marks (`"`).
 * Semicolons are required after every statement.
+* Use [IIFEs](https://developer.mozilla.org/docs/Glossary/IIFE) to avoid polluting global scope.
+* Prefer to use [defer](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/script#defer)
+  in script tags, which retains order of execution but does not block.
+* Avoid `<script async ...` in most cases, see [async and defer](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/script#async_and_defer).
+* Use addEventListener.
 
 ## KV
 
diff --git a/docs/webhost api.md b/docs/webhost api.md
index 0482113484..7405e1f5bf 100644
--- a/docs/webhost api.md	
+++ b/docs/webhost api.md	
@@ -4,7 +4,7 @@ Archipelago has a rudimentary API that can be queried by endpoints. The API is a
 
 The following API requests are formatted as: `https://<Archipelago URL>/api/<endpoint>`
 
-The returned data will be formated in a combination of JSON lists or dicts, with their keys or values being notated in `blocks` (if applicable)
+The returned data will be formatted in a combination of JSON lists or dicts, with their keys or values being notated in `blocks` (if applicable)
 
 Current endpoints:
 - Datapackage API
@@ -24,13 +24,21 @@ Current endpoints:
     - [`/get_rooms`](#getrooms)
     - [`/get_seeds`](#getseeds)
 
+## API Data Caching
+To reduce the strain on an Archipelago WebHost, many API endpoints will cache their data and only poll new data in timed intervals. Each endpoint has their own caching time related to the type of data being served. More dynamic data is refreshed more frequently, while static data is cached for longer.  
+Each API endpoint will have their "Cache timer" listed under their definition (if any).
+API calls to these endpoints should not be faster than the listed timer. This will result in wasted processing for your client and (more importantly) the Archipelago WebHost, as the data will not be refreshed by the WebHost until the internal timer has elapsed.
+
 
 ## Datapackage Endpoints
 These endpoints are used by applications to acquire a room's datapackage, and validate that they have the correct datapackage for use. Datapackages normally include, item IDs, location IDs, and name groupings, for a given room, and are essential for mapping IDs received from Archipelago to their correct items or locations.
 
 ### `/datapackage`
 <a name="datapackage"></a>
+
 Fetches the current datapackage from the WebHost.  
+**Cache timer: None**
+
 You'll receive a dict named `games` that contains a named dict of every game and its data currently supported by Archipelago.  
 Each game will have:
 - A checksum `checksum`
@@ -40,7 +48,7 @@ Each game will have:
 - Location name to AP ID dict `location_name_to_id`
 
 Example:
-```
+```json
 {
     "games": {
         ...
@@ -76,7 +84,10 @@ Example:
 
 ### `/datapackage/<string:checksum>`
 <a name="datapackagestringchecksum"></a>
-Fetches a single datapackage by checksum.
+
+Fetches a single datapackage by checksum.  
+**Cache timer: None**
+
 Returns a dict of the game's data with:
 - A checksum `checksum`
 - A dict of item groups `item_name_groups`
@@ -88,10 +99,13 @@ Its format will be identical to the whole-datapackage endpoint (`/datapackage`),
 
 ### `/datapackage_checksum`
 <a name="datapackagechecksum"></a>
-Fetches the checksums of the current static datapackages on the WebHost.
+
+Fetches the checksums of the current static datapackages on the WebHost.  
+**Cache timer: None**
+
 You'll receive a dict with `game:checksum` key-value pairs for all the current officially supported games.  
 Example:
-```
+```json
 {
 ...
 "Donkey Kong Country 3":"f90acedcd958213f483a6a4c238e2a3faf92165e",
@@ -108,6 +122,7 @@ These endpoints are used internally for the WebHost to generate games and valida
 <a name="generate"></a>
 Submits a game to the WebHost for generation.  
 **This endpoint only accepts a POST HTTP request.**  
+**Cache timer: None**
 
 There are two ways to submit data for generation: With a file and with JSON.
 
@@ -116,7 +131,7 @@ Have your ZIP of yaml(s) or a single yaml, and submit a POST request to the `/ge
 If the options are valid, you'll be returned a successful generation response. (see [Generation Response](#generation-response))
 
 Example using the python requests library:
-```
+```python
 file = {'file': open('Games.zip', 'rb')}
 req = requests.post("https://archipelago.gg/api/generate", files=file)
 ```
@@ -127,7 +142,7 @@ Finally, submit a POST request to the `/generate` endpoint.
 If the weighted options are valid, you'll be returned a successful generation response (see [Generation Response](#generation-response))
 
 Example using the python requests library:
-```
+```python
 data = {"Test":{"game": "Factorio","name": "Test","Factorio": {}},}
 weights={"weights": data}
 req = requests.post("https://archipelago.gg/api/generate", json=weights)
@@ -143,7 +158,7 @@ Upon successful generation, you'll be sent a JSON dict response detailing the ge
 - The API status page of the generation `wait_api_url` (see [Status Endpoint](#status))
 
 Example:
-```
+```json
 {
     "detail": "19878f16-5a58-4b76-aab7-d6bf38be9463",
     "encoded": "GYePFlpYS3aqt9a_OL6UYw",
@@ -167,12 +182,14 @@ If the generation detects a issue in generation, you'll be sent a dict with two
 - Detailed issue in `detail`
 
 In the event of an unhandled server exception, you'll be provided a dict with a single key `text`:
-- Exception, `Uncought Exception: <error>` with a 500 status code
+- Exception, `Uncaught Exception: <error>` with a 500 status code
 
 ### `/status/<suuid:seed>`
 <a name="status"></a>
 Retrieves the status of the seed's generation.  
-This endpoint will return a dict with a single key-vlaue pair. The key will always be `text`  
+**Cache timer: None**
+
+This endpoint will return a dict with a single key-value pair. The key will always be `text`  
 The value will tell you the status of the generation:
 - Generation was completed: `Generation done` with a 201 status code
 - Generation request was not found: `Generation not found` with a 404 status code
@@ -184,6 +201,8 @@ Endpoints to fetch information of the active WebHost room with the supplied room
 
 ### `/room_status/<suuid:room_id>`  
 <a name="roomstatus"></a>
+**Cache timer: None**
+
 Will provide a dict of room data with the following keys:
 - Tracker SUUID (`tracker`)
 - A list of players (`players`)
@@ -192,10 +211,10 @@ Will provide a dict of room data with the following keys:
 - Last activity timestamp (`last_activity`)
 - The room timeout counter (`timeout`)
 - A list of downloads for files required for gameplay (`downloads`)
-    - Each item is a dict containings the download URL and slot (`slot`, `download`)
+    - Each item is a dict containing the download URL and slot (`slot`, `download`)
 
 Example:
-```
+```json
 {
     "downloads": [
         {
@@ -244,7 +263,7 @@ Example:
         ]
     ],
     "timeout": 7200,
-    "tracker": "cf6989c0-4703-45d7-a317-2e5158431171"
+    "tracker": "2gVkMQgISGScA8wsvDZg5A"
 }
 ```
 
@@ -254,17 +273,27 @@ can either be viewed while on a room tracker page, or from the [room's endpoint]
 
 ### `/tracker/<suuid:tracker>`
 <a name=tracker></a>
+**Cache timer: 60 seconds**
+
 Will provide a dict of tracker data with the following keys:
 
-- Each player's current alias (`aliases`)
-  - Will return the name if there is none
-- A list of items each player has received as a NetworkItem (`player_items_received`)
+- A list of players current alias data (`aliases`)
+  - Each item containing a dict with, their alias `alias`, their player number `player`, and their team `team`
+  - `alias` will return `null` if there is no alias set
+- A list of items each player has received as a [NetworkItem](network%20protocol.md#networkitem) (`player_items_received`)
+  - Each item containing a dict with, a list of NetworkItems `items`, their player number `player`, their team `team`
 - A list of checks done by each player as a list of the location id's (`player_checks_done`)
-- The total number of checks done by all players (`total_checks_done`)
-- Hints that players have used or received (`hints`)
-- The time of last activity of each player in RFC 1123 format (`activity_timers`)
-- The time of last active connection of each player in RFC 1123 format (`connection_timers`)
-- The current client status of each player (`player_status`)
+  - Each item containing a dict with, a list of checked location id's `locations`, their player number `player`, and their team `team`
+- A list of the total number of checks done by all players (`total_checks_done`)
+  - Each item will contain a dict with, the total checks done `checks_done`, and the team `team`  
+- A list of [Hints](network%20protocol.md#hint) data that players have used or received (`hints`)
+  - Each item containing a dict containing, a list of hint data `hints`, the player number `player`, and their team `team`
+- A list containing the last activity time for each player, formatted in RFC 1123 format (`activity_timers`)
+  - Each item containing, last activity time `time`, their player number `player`, and their team `team`
+- A list containing the last connection time for each player, formatted in RFC 1123 format (`connection_timers`)
+  - Each item containing, the time of their last connection `time`, their player number `player`, and their team `team`
+- A list of the current [ClientStatus](network%20protocol.md#clientstatus) of each player (`player_status`)
+  - Each item will contain, their status `status`, their player number `player`, and their team `team`
 
 Example:
 ```json
@@ -279,7 +308,12 @@ Example:
       "team": 0,
       "player": 2,
       "alias": "Slot_Name_2"
-    }
+    },
+    {
+      "team": 0,
+      "player": 3,
+      "alias": null
+    },
   ],
   "player_items_received": [
     {
@@ -378,13 +412,21 @@ Example:
 
 ### `/static_tracker/<suuid:tracker>`
 <a name=statictracker></a>
+**Cache timer: 300 seconds**
+
 Will provide a dict of static tracker data with the following keys:
 
-- item_link groups and their players (`groups`)
-- The datapackage hash for each game (`datapackage`)
+- A list of item_link groups and their member players (`groups`)
+  - Each item containing a dict with, the slot registering the group `slot`, the item_link name `name`, and a list of members `members`
+- A dict of datapackage hashes for each game (`datapackage`)
+  - Each item is a named dict of the game's name.
+    - Each game contains two keys, the datapackage's checksum hash `checksum`, and the version `version`
   - This hash can then be sent to the datapackage API to receive the appropriate datapackage as necessary
-- The number of checks found vs. total checks available per player (`player_locations_total`)
+- A list of number of checks found vs. total checks available per player (`player_locations_total`)
+  - Each list item contains a dict with three keys, the total locations for that slot `total_locations`, their player number `player`, and their team `team`
   - Same logic as the multitracker template: found = len(player_checks_done.locations) / total = player_locations_total.total_locations (all available checks).
+- The game each player is playing (`player_game`)
+  - Provided as a list of objects with `team`, `player`, and `game`.
 
 Example:
 ```json
@@ -409,10 +451,10 @@ Example:
   ],
   "datapackage": {
     "Archipelago": {
-      "checksum": "ac9141e9ad0318df2fa27da5f20c50a842afeecb",
+      "checksum": "ac9141e9ad0318df2fa27da5f20c50a842afeecb"
     },
     "The Messenger": {
-      "checksum": "6991cbcda7316b65bcb072667f3ee4c4cae71c0b",
+      "checksum": "6991cbcda7316b65bcb072667f3ee4c4cae71c0b"
     }
   },
   "player_locations_total": [
@@ -427,12 +469,29 @@ Example:
       "total_locations": 20
     }
   ],
+  "player_game": [
+    {
+      "team": 0,
+      "player": 1,
+      "game": "Archipelago"
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "game": "The Messenger"
+    }
+  ]
 }
 ```
 
 ### `/slot_data_tracker/<suuid:tracker>`
 <a name=slotdatatracker></a>
-Will provide a list of each player's slot_data.
+Will provide a list of each player's slot_data.  
+**Cache timer: 300 seconds**
+
+Each list item will contain a dict with the player's data:
+- player slot number `player`
+- A named dict `slot_data` containing any set slot data for that player
 
 Example:
 ```json
@@ -460,6 +519,8 @@ User endpoints can get room and seed details from the current session tokens (co
 ### `/get_rooms`  
 <a name="getrooms"></a>
 Retreives a list of all rooms currently owned by the session token.  
+**Cache timer: None**
+
 Each list item will contain a dict with the room's details:
 - Room SUUID (`room_id`)
 - Seed SUUID (`seed_id`)
@@ -470,25 +531,25 @@ Each list item will contain a dict with the room's details:
 - Room tracker SUUID (`tracker`)
 
 Example:
-```
+```json
 [
     {
         "creation_time": "Fri, 18 Apr 2025 19:46:53 GMT",
         "last_activity": "Fri, 18 Apr 2025 21:16:02 GMT",
         "last_port": 52122,
-        "room_id": "90ae5f9b-177c-4df8-ac53-9629fc3bff7a",
-        "seed_id": "efbd62c2-aaeb-4dda-88c3-f461c029cef6",
+        "room_id": "0D30FgQaRcWivFsw9o8qzw",
+        "seed_id": "TFjiarBgTsCj5-Jbe8u33A",
         "timeout": 7200,
-        "tracker": "cf6989c0-4703-45d7-a317-2e5158431171"
+        "tracker": "52BycvJhRe6knrYH8v4bag"
     },
     {
         "creation_time": "Fri, 18 Apr 2025 20:36:42 GMT",
         "last_activity": "Fri, 18 Apr 2025 20:36:46 GMT",
         "last_port": 56884,
-        "room_id": "14465c05-d08e-4d28-96bd-916f994609d8",
-        "seed_id": "a528e34c-3b4f-42a9-9f8f-00a4fd40bacb",
+        "room_id": "LMCFchESSNyuqcY3GxkhwA",
+        "seed_id": "CENtJMXCTGmkIYCzjB5Csg",
         "timeout": 7200,
-        "tracker": "4e624bd8-32b6-42e4-9178-aa407f72751c"
+        "tracker": "2gVkMQgISGScA8wsvDZg5A"
     }
 ]
 ```
@@ -496,6 +557,8 @@ Example:
 ### `/get_seeds`  
 <a name="getseeds"></a>
 Retreives a list of all seeds currently owned by the session token.  
+**Cache timer: None**
+
 Each item in the list will contain a dict with the seed's details:
 - Seed SUUID (`seed_id`)
 - Creation timestamp (`creation_time`)
@@ -503,7 +566,7 @@ Each item in the list will contain a dict with the seed's details:
     - Each item in the list will contain a list of the slot name and game
 
 Example:
-```
+```json
 [
     {
         "creation_time": "Fri, 18 Apr 2025 19:46:52 GMT",
@@ -529,7 +592,7 @@ Example:
                 "Ocarina of Time"
             ]
         ],
-        "seed_id": "efbd62c2-aaeb-4dda-88c3-f461c029cef6"
+        "seed_id": "CENtJMXCTGmkIYCzjB5Csg"
     },
     {
         "creation_time": "Fri, 18 Apr 2025 20:36:39 GMT",
@@ -551,7 +614,7 @@ Example:
                 "Archipelago"
             ]
         ],
-        "seed_id": "a528e34c-3b4f-42a9-9f8f-00a4fd40bacb"
+        "seed_id": "TFjiarBgTsCj5-Jbe8u33A"
     }
 ]
 ```
\ No newline at end of file
diff --git a/docs/world api.md b/docs/world api.md
index db6da50cf4..4e23549304 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -225,7 +225,10 @@ and has a classification. The name needs to be unique within each game and must
 letter or symbol). The ID needs to be unique across all locations within the game. 
 Locations and items can share IDs, and locations can share IDs with other games' locations.
 
-World-specific IDs must be in the range 1 to 2<sup>53</sup>-1; IDs ≤ 0 are global and reserved.
+World-specific IDs **must** be in the range 1 to 2<sup>53</sup>-1 (the largest integer that is "[safe](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER#description)"
+to store in a 64-bit float, and thus all popular programming languages can handle). IDs ≤ 0 are global and reserved.
+It's **recommended** to keep your IDs in the range 1 to 2<sup>31</sup>-1,
+so only 32-bit integers are needed to hold your IDs.
 
 Classification is one of `LocationProgressType.DEFAULT`, `PRIORITY` or `EXCLUDED`.
 The Fill algorithm will force progression items to be placed at priority locations, giving a higher chance of them being
@@ -488,9 +491,10 @@ class MyGameWorld(World):
     base_id = 1234
     # instead of dynamic numbering, IDs could be part of data
 
-    # The following two dicts are required for the generation to know which
-    # items exist. They could be generated from json or something else. They can
-    # include events, but don't have to since events will be placed manually.
+    # The following two dicts are required for the generation to know which items exist.
+    # They can be generated with arbitrary code during world load, but keep in mind that
+    # anything expensive (e.g. parsing non-python data files) will delay world loading.
+    # They can include events, but don't have to since events will be placed manually.
     item_name_to_id = {name: id for
                        id, name in enumerate(mygame_items, base_id)}
     location_name_to_id = {name: id for
@@ -767,6 +771,7 @@ class MyGameState(LogicMixin):
         new_state.mygame_defeatable_enemies = {
             player: enemies.copy() for player, enemies in self.mygame_defeatable_enemies.items()
         }
+        return new_state
 ```
 
 After doing this, you can now access `state.mygame_defeatable_enemies[player]` from your access rules.
diff --git a/entrance_rando.py b/entrance_rando.py
index 578059ae6f..47664cb685 100644
--- a/entrance_rando.py
+++ b/entrance_rando.py
@@ -186,9 +186,20 @@ class ERPlacementState:
         self.pairings = []
         self.world = world
         self.coupled = coupled
-        self.collection_state = world.multiworld.get_all_state(False, True)
         self.entrance_lookup = entrance_lookup
 
+        # Construct an 'all state', similar to MultiWorld.get_all_state(), but only for the world which is having its
+        # entrances randomized.
+        single_player_all_state = CollectionState(world.multiworld, True)
+        player = world.player
+        for item in world.multiworld.itempool:
+            if item.player == player:
+                world.collect(single_player_all_state, item)
+        for item in world.get_pre_fill_items():
+            world.collect(single_player_all_state, item)
+        single_player_all_state.sweep_for_advancements(world.get_locations())
+        self.collection_state = single_player_all_state
+
     @property
     def placed_regions(self) -> set[Region]:
         return self.collection_state.reachable_regions[self.world.player]
@@ -226,7 +237,7 @@ class ERPlacementState:
         copied_state.blocked_connections[self.world.player].remove(source_exit)
         copied_state.blocked_connections[self.world.player].update(target_entrance.connected_region.exits)
         copied_state.update_reachable_regions(self.world.player)
-        copied_state.sweep_for_advancements()
+        copied_state.sweep_for_advancements(self.world.get_locations())
         # test that at there are newly reachable randomized exits that are ACTUALLY reachable
         available_randomized_exits = copied_state.blocked_connections[self.world.player]
         for _exit in available_randomized_exits:
@@ -402,7 +413,7 @@ def randomize_entrances(
         placed_exits, paired_entrances = er_state.connect(source_exit, target_entrance)
         # propagate new connections
         er_state.collection_state.update_reachable_regions(world.player)
-        er_state.collection_state.sweep_for_advancements()
+        er_state.collection_state.sweep_for_advancements(world.get_locations())
         if on_connect:
             change = on_connect(er_state, placed_exits, paired_entrances)
             if change:
@@ -525,7 +536,7 @@ def randomize_entrances(
 
     running_time = time.perf_counter() - start_time
     if running_time > 1.0:
-        logging.info(f"Took {running_time:.4f} seconds during entrance randomization for player {world.player},"
+        logging.info(f"Took {running_time:.4f} seconds during entrance randomization for player {world.player}, "
                      f"named {world.multiworld.player_name[world.player]}")
 
     return er_state
diff --git a/inno_setup.iss b/inno_setup.iss
index 1891cf83d0..999070ad07 100644
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -208,6 +208,16 @@ Root: HKCR; Subkey: "{#MyAppName}apcivvipatch";                     ValueData: "
 Root: HKCR; Subkey: "{#MyAppName}apcivvipatch\DefaultIcon";         ValueData: "{app}\ArchipelagoLauncher.exe,0";                           ValueType: string;  ValueName: "";
 Root: HKCR; Subkey: "{#MyAppName}apcivvipatch\shell\open\command";  ValueData: """{app}\ArchipelagoLauncher.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
+Root: HKCR; Subkey: ".apeb";                                   ValueData: "{#MyAppName}ebpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ebpatch";                     ValueData: "Archipelago EarthBound Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ebpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ebpatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
+
+Root: HKCR; Subkey: ".apmm3";                                   ValueData: "{#MyAppName}mm3patch";                               Flags: uninsdeletevalue; ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mm3patch";                     ValueData: "Archipelago Mega Man 3 Patch";                    Flags: uninsdeletekey;   ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mm3patch\DefaultIcon";         ValueData: "{app}\ArchipelagoBizHawkClient.exe,0";                                          ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mm3patch\shell\open\command";  ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1""";                                 ValueType: string; ValueName: "";
+
 Root: HKCR; Subkey: ".archipelago";                              ValueData: "{#MyAppName}multidata";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
 Root: HKCR; Subkey: "{#MyAppName}multidata";                     ValueData: "Archipelago Server Data";      Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
 Root: HKCR; Subkey: "{#MyAppName}multidata\DefaultIcon";         ValueData: "{app}\ArchipelagoServer.exe,0";                         ValueType: string;  ValueName: "";
diff --git a/kvui.py b/kvui.py
index 1989dd164a..14d8d18528 100644
--- a/kvui.py
+++ b/kvui.py
@@ -19,6 +19,7 @@ os.environ["KIVY_NO_CONSOLELOG"] = "1"
 os.environ["KIVY_NO_FILELOG"] = "1"
 os.environ["KIVY_NO_ARGS"] = "1"
 os.environ["KIVY_LOG_ENABLE"] = "0"
+os.environ["SDL_MOUSE_FOCUS_CLICKTHROUGH"] = "1"
 
 import Utils
 
@@ -35,6 +36,17 @@ Config.set("input", "mouse", "mouse,disable_multitouch")
 Config.set("kivy", "exit_on_escape", "0")
 Config.set("graphics", "multisamples", "0")  # multisamples crash old intel drivers
 
+# Workaround for Kivy issue #9226.
+# caused by kivy by default using probesysfs,
+# which assumes all multi touch deviecs are touch screens. 
+# workaround provided by Snu of the kivy commmunity c:
+from kivy.utils import platform
+if platform == "linux":
+    options = Config.options("input")
+    for option in options:
+        if Config.get("input", option) == "probesysfs":
+            Config.remove_option("input", option)
+
 # Workaround for an issue where importing kivy.core.window before loading sounds
 # will hang the whole application on Linux once the first sound is loaded.
 # kivymd imports kivy.core.window, so we have to do this before the first kivymd import.
@@ -127,7 +139,7 @@ class ImageButton(MDIconButton):
             val = kwargs.pop(kwarg, "None")
             if val != "None":
                 image_args[kwarg.replace("image_", "")] = val
-        super().__init__()
+        super().__init__(**kwargs)
         self.image = ApAsyncImage(**image_args)
 
         def set_center(button, center):
@@ -143,6 +155,7 @@ class ImageButton(MDIconButton):
 
 class ScrollBox(MDScrollView):
     layout: MDBoxLayout = ObjectProperty(None)
+    box_height: int = NumericProperty(dp(100))
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -153,6 +166,7 @@ class ToggleButton(MDButton, ToggleButtonBehavior):
     def __init__(self, *args, **kwargs):
         super(ToggleButton, self).__init__(*args, **kwargs)
         self.bind(state=self._update_bg)
+        self._update_bg(self, self.state)
 
     def _update_bg(self, _, state: str):
         if self.disabled:
@@ -170,7 +184,7 @@ class ToggleButton(MDButton, ToggleButtonBehavior):
                 child.text_color = self.theme_cls.onPrimaryColor
                 child.icon_color = self.theme_cls.onPrimaryColor
         else:
-            self.md_bg_color = self.theme_cls.surfaceContainerLowestColor
+            self.md_bg_color = self.theme_cls.surfaceContainerLowColor
             for child in self.children:
                 if child.theme_text_color == "Primary":
                     child.theme_text_color = "Custom"
@@ -184,7 +198,6 @@ class ToggleButton(MDButton, ToggleButtonBehavior):
 class ResizableTextField(MDTextField):
     """
     Resizable MDTextField that manually overrides the builtin sizing.
-
     Note that in order to use this, the sizing must be specified from within a .kv rule.
     """
     def __init__(self, *args, **kwargs):
@@ -248,7 +261,7 @@ Factory.register("HoverBehavior", HoverBehavior)
 
 
 class ToolTip(MDTooltipPlain):
-    pass
+    markup = True
 
 
 class ServerToolTip(ToolTip):
@@ -283,6 +296,8 @@ class TooltipLabel(HovererableLabel, MDTooltip):
     def on_mouse_pos(self, window, pos):
         if not self.get_root_window():
             return  # Abort if not displayed
+        if self.disabled:
+            return
         super().on_mouse_pos(window, pos)
         if self.refs and self.hovered:
 
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 0000000000..3a8372455c
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,2 @@
+[mypy]
+mypy_path = typings
diff --git a/requirements.txt b/requirements.txt
index 951db610d3..27bca5c7c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,21 @@
 colorama>=0.4.6
 websockets>=13.0.1,<14
-PyYAML>=6.0.2
-jellyfish>=1.1.3
+PyYAML>=6.0.3
+jellyfish>=1.2.1
 jinja2>=3.1.6
-schema>=0.7.7
+schema>=0.7.8
 kivy>=2.3.1
 bsdiff4>=1.2.6
-platformdirs>=4.3.6
-certifi>=2025.4.26
-cython>=3.0.12
-cymem>=2.0.11
-orjson>=3.10.15
-typing_extensions>=4.12.2
-pyshortcuts>=1.9.1
+platformdirs>=4.5.0
+certifi>=2025.11.12
+cython>=3.2.1
+cymem>=2.0.13
+orjson>=3.11.4
+typing_extensions>=4.15.0
+pyshortcuts>=1.9.6
+pathspec>=0.12.1
 kivymd @ git+https://github.com/kivymd/KivyMD@5ff9d0d
 kivymd>=2.0.1.dev0
+
+# Legacy world dependencies that custom worlds rely on
+Pymem>=1.13.0
diff --git a/rule_builder/__init__.py b/rule_builder/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/rule_builder/cached_world.py b/rule_builder/cached_world.py
new file mode 100644
index 0000000000..bb7cc4d9b5
--- /dev/null
+++ b/rule_builder/cached_world.py
@@ -0,0 +1,146 @@
+from collections import defaultdict
+from typing import ClassVar, cast
+
+from typing_extensions import override
+
+from BaseClasses import CollectionState, Item, MultiWorld, Region
+from worlds.AutoWorld import LogicMixin, World
+
+from .rules import Rule
+
+
+class CachedRuleBuilderWorld(World):
+    """A World subclass that provides helpers for interacting with the rule builder"""
+
+    rule_item_dependencies: dict[str, set[int]]
+    """A mapping of item name to set of rule ids"""
+
+    rule_region_dependencies: dict[str, set[int]]
+    """A mapping of region name to set of rule ids"""
+
+    rule_location_dependencies: dict[str, set[int]]
+    """A mapping of location name to set of rule ids"""
+
+    rule_entrance_dependencies: dict[str, set[int]]
+    """A mapping of entrance name to set of rule ids"""
+
+    item_mapping: ClassVar[dict[str, str]] = {}
+    """A mapping of actual item name to logical item name.
+    Useful when there are multiple versions of a collected item but the logic only uses one. For example:
+    item = Item("Currency x500"), rule = Has("Currency", count=1000), item_mapping = {"Currency x500": "Currency"}"""
+
+    rule_caching_enabled: ClassVar[bool] = True
+    """Flag to inform rules that the caching system for this world is enabled. It should not be overridden."""
+
+    def __init__(self, multiworld: MultiWorld, player: int) -> None:
+        super().__init__(multiworld, player)
+        self.rule_item_dependencies = defaultdict(set)
+        self.rule_region_dependencies = defaultdict(set)
+        self.rule_location_dependencies = defaultdict(set)
+        self.rule_entrance_dependencies = defaultdict(set)
+
+    @override
+    def register_rule_dependencies(self, resolved_rule: Rule.Resolved) -> None:
+        for item_name, rule_ids in resolved_rule.item_dependencies().items():
+            self.rule_item_dependencies[item_name] |= rule_ids
+        for region_name, rule_ids in resolved_rule.region_dependencies().items():
+            self.rule_region_dependencies[region_name] |= rule_ids
+        for location_name, rule_ids in resolved_rule.location_dependencies().items():
+            self.rule_location_dependencies[location_name] |= rule_ids
+        for entrance_name, rule_ids in resolved_rule.entrance_dependencies().items():
+            self.rule_entrance_dependencies[entrance_name] |= rule_ids
+
+    def register_rule_builder_dependencies(self) -> None:
+        """Register all rules that depend on locations or entrances with their dependencies"""
+        for location_name, rule_ids in self.rule_location_dependencies.items():
+            try:
+                location = self.get_location(location_name)
+            except KeyError:
+                continue
+            if not isinstance(location.access_rule, Rule.Resolved):
+                continue
+            for item_name in location.access_rule.item_dependencies():
+                self.rule_item_dependencies[item_name] |= rule_ids
+            for region_name in location.access_rule.region_dependencies():
+                self.rule_region_dependencies[region_name] |= rule_ids
+
+        for entrance_name, rule_ids in self.rule_entrance_dependencies.items():
+            try:
+                entrance = self.get_entrance(entrance_name)
+            except KeyError:
+                continue
+            if not isinstance(entrance.access_rule, Rule.Resolved):
+                continue
+            for item_name in entrance.access_rule.item_dependencies():
+                self.rule_item_dependencies[item_name] |= rule_ids
+            for region_name in entrance.access_rule.region_dependencies():
+                self.rule_region_dependencies[region_name] |= rule_ids
+
+    @override
+    def collect(self, state: CollectionState, item: Item) -> bool:
+        changed = super().collect(state, item)
+        if changed and self.rule_item_dependencies:
+            player_results = cast(dict[int, bool], state.rule_builder_cache[self.player])  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType]
+            mapped_name = self.item_mapping.get(item.name, "")
+            rule_ids = self.rule_item_dependencies[item.name] | self.rule_item_dependencies[mapped_name]
+            for rule_id in rule_ids:
+                if player_results.get(rule_id, None) is False:
+                    del player_results[rule_id]
+
+        return changed
+
+    @override
+    def remove(self, state: CollectionState, item: Item) -> bool:
+        changed = super().remove(state, item)
+        if not changed:
+            return changed
+
+        player_results = cast(dict[int, bool], state.rule_builder_cache[self.player])  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType]
+        if self.rule_item_dependencies:
+            mapped_name = self.item_mapping.get(item.name, "")
+            rule_ids = self.rule_item_dependencies[item.name] | self.rule_item_dependencies[mapped_name]
+            for rule_id in rule_ids:
+                player_results.pop(rule_id, None)
+
+        # clear all region dependent caches as none can be trusted
+        if self.rule_region_dependencies:
+            for rule_ids in self.rule_region_dependencies.values():
+                for rule_id in rule_ids:
+                    player_results.pop(rule_id, None)
+
+        # clear all location dependent caches as they may have lost region access
+        if self.rule_location_dependencies:
+            for rule_ids in self.rule_location_dependencies.values():
+                for rule_id in rule_ids:
+                    player_results.pop(rule_id, None)
+
+        # clear all entrance dependent caches as they may have lost region access
+        if self.rule_entrance_dependencies:
+            for rule_ids in self.rule_entrance_dependencies.values():
+                for rule_id in rule_ids:
+                    player_results.pop(rule_id, None)
+
+        return changed
+
+    @override
+    def reached_region(self, state: CollectionState, region: Region) -> None:
+        super().reached_region(state, region)
+        if self.rule_region_dependencies:
+            player_results = cast(dict[int, bool], state.rule_builder_cache[self.player])  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType]
+            for rule_id in self.rule_region_dependencies[region.name]:
+                player_results.pop(rule_id, None)
+
+
+class CachedRuleBuilderLogicMixin(LogicMixin):
+    multiworld: MultiWorld  # pyright: ignore[reportUninitializedInstanceVariable]
+    rule_builder_cache: dict[int, dict[int, bool]]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+    def init_mixin(self, multiworld: "MultiWorld") -> None:
+        players = multiworld.get_all_ids()
+        self.rule_builder_cache = {player: {} for player in players}
+
+    def copy_mixin(self, new_state: "CachedRuleBuilderLogicMixin") -> "CachedRuleBuilderLogicMixin":
+        new_state.rule_builder_cache = {
+            player: player_results.copy() for player, player_results in self.rule_builder_cache.items()
+        }
+        return new_state
diff --git a/rule_builder/options.py b/rule_builder/options.py
new file mode 100644
index 0000000000..979a72315e
--- /dev/null
+++ b/rule_builder/options.py
@@ -0,0 +1,91 @@
+import dataclasses
+import importlib
+import operator
+from collections.abc import Callable, Iterable
+from typing import Any, Final, Literal, Self, cast
+
+from typing_extensions import override
+
+from Options import CommonOptions, Option
+
+Operator = Literal["eq", "ne", "gt", "lt", "ge", "le", "contains", "in"]
+
+OPERATORS: Final[dict[Operator, Callable[..., bool]]] = {
+    "eq": operator.eq,
+    "ne": operator.ne,
+    "gt": operator.gt,
+    "lt": operator.lt,
+    "ge": operator.ge,
+    "le": operator.le,
+    "contains": operator.contains,
+    "in": operator.contains,
+}
+OPERATOR_STRINGS: Final[dict[Operator, str]] = {
+    "eq": "==",
+    "ne": "!=",
+    "gt": ">",
+    "lt": "<",
+    "ge": ">=",
+    "le": "<=",
+}
+REVERSE_OPERATORS: Final[tuple[Operator, ...]] = ("in",)
+
+
+@dataclasses.dataclass(frozen=True)
+class OptionFilter:
+    option: type[Option[Any]]
+    value: Any
+    operator: Operator = "eq"
+
+    def to_dict(self) -> dict[str, Any]:
+        """Returns a JSON compatible dict representation of this option filter"""
+        return {
+            "option": f"{self.option.__module__}.{self.option.__name__}",
+            "value": self.value,
+            "operator": self.operator,
+        }
+
+    def check(self, options: CommonOptions) -> bool:
+        """Tests the given options dataclass to see if it passes this option filter"""
+        option_name = next(
+            (name for name, cls in options.__class__.type_hints.items() if cls is self.option),
+            None,
+        )
+        if option_name is None:
+            raise ValueError(f"Cannot find option {self.option.__name__} in options class {options.__class__.__name__}")
+        opt = cast(Option[Any] | None, getattr(options, option_name, None))
+        if opt is None:
+            raise ValueError(f"Invalid option: {option_name}")
+
+        fn = OPERATORS[self.operator]
+        return fn(self.value, opt) if self.operator in REVERSE_OPERATORS else fn(opt, self.value)
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> Self:
+        """Returns a new OptionFilter instance from a dict representation"""
+        if "option" not in data or "value" not in data:
+            raise ValueError("Missing required value and/or option")
+
+        option_path = data["option"]
+        try:
+            option_mod_name, option_cls_name = option_path.rsplit(".", 1)
+            option_module = importlib.import_module(option_mod_name)
+            option = getattr(option_module, option_cls_name, None)
+        except (ValueError, ImportError) as e:
+            raise ValueError(f"Cannot parse option '{option_path}'") from e
+        if option is None or not issubclass(option, Option):
+            raise ValueError(f"Invalid option '{option_path}' returns type '{option}' instead of Option subclass")
+
+        value = data["value"]
+        operator = data.get("operator", "eq")
+        return cls(option=cast(type[Option[Any]], option), value=value, operator=operator)
+
+    @classmethod
+    def multiple_from_dict(cls, data: Iterable[dict[str, Any]]) -> tuple[Self, ...]:
+        """Returns a tuple of OptionFilters instances from an iterable of dict representations"""
+        return tuple(cls.from_dict(o) for o in data)
+
+    @override
+    def __str__(self) -> str:
+        op = OPERATOR_STRINGS.get(self.operator, self.operator)
+        return f"{self.option.__name__} {op} {self.value}"
diff --git a/rule_builder/rules.py b/rule_builder/rules.py
new file mode 100644
index 0000000000..77a89c96c2
--- /dev/null
+++ b/rule_builder/rules.py
@@ -0,0 +1,1822 @@
+import dataclasses
+from collections.abc import Callable, Iterable, Mapping
+from typing import TYPE_CHECKING, Any, ClassVar, Final, Generic, Never, Self, cast
+
+from typing_extensions import TypeVar, dataclass_transform, override
+
+from BaseClasses import CollectionState
+from NetUtils import JSONMessagePart
+
+from .options import OptionFilter
+
+if TYPE_CHECKING:
+    from worlds.AutoWorld import World
+
+    TWorld = TypeVar("TWorld", bound=World, contravariant=True, default=World)  # noqa: PLC0105
+else:
+    TWorld = TypeVar("TWorld")
+
+
+def _create_hash_fn(resolved_rule_cls: "CustomRuleRegister") -> Callable[..., int]:
+    def hash_impl(self: "Rule.Resolved") -> int:
+        return hash(
+            (
+                self.__class__.__module__,
+                self.rule_name,
+                *[getattr(self, f.name) for f in dataclasses.fields(self)],
+            )
+        )
+
+    hash_impl.__qualname__ = f"{resolved_rule_cls.__qualname__}.__hash__"
+    return hash_impl
+
+
+@dataclass_transform(frozen_default=True, field_specifiers=(dataclasses.field, dataclasses.Field))
+class CustomRuleRegister(type):
+    """A metaclass to contain world custom rules and automatically convert resolved rules to frozen dataclasses"""
+
+    resolved_rules: ClassVar[dict[int, "Rule.Resolved"]] = {}
+    """A cached of resolved rules to turn each unique one into a singleton"""
+
+    custom_rules: ClassVar[dict[str, dict[str, type["Rule[Any]"]]]] = {}
+    """A mapping of game name to mapping of rule name to rule class to hold custom rules implemented by worlds"""
+
+    rule_name: str = "Rule"
+    """The string name of a rule, must be unique per game"""
+
+    def __new__(
+        cls,
+        name: str,
+        bases: tuple[type, ...],
+        namespace: dict[str, Any],
+        /,
+        **kwds: dict[str, Any],
+    ) -> type["CustomRuleRegister"]:
+        new_cls = super().__new__(cls, name, bases, namespace, **kwds)
+        new_cls.__hash__ = _create_hash_fn(new_cls)
+        rule_name = new_cls.__qualname__
+        if rule_name.endswith(".Resolved"):
+            rule_name = rule_name[:-9]
+        new_cls.rule_name = rule_name
+        return dataclasses.dataclass(frozen=True)(new_cls)
+
+    @override
+    def __call__(cls, *args: Any, **kwds: Any) -> Any:
+        rule = super().__call__(*args, **kwds)
+        rule_hash = hash(rule)
+        if rule_hash in cls.resolved_rules:
+            return cls.resolved_rules[rule_hash]
+        cls.resolved_rules[rule_hash] = rule
+        return rule
+
+    @classmethod
+    def get_rule_cls(cls, game_name: str, rule_name: str) -> type["Rule[Any]"]:
+        """Returns the world-registered or default rule with the given name"""
+        custom_rule_classes = cls.custom_rules.get(game_name, {})
+        if rule_name not in DEFAULT_RULES and rule_name not in custom_rule_classes:
+            raise ValueError(f"Rule '{rule_name}' for game '{game_name}' not found")
+        return custom_rule_classes.get(rule_name) or DEFAULT_RULES[rule_name]
+
+
+@dataclasses.dataclass()
+class Rule(Generic[TWorld]):
+    """Base class for a static rule used to generate an access rule"""
+
+    options: Iterable[OptionFilter] = dataclasses.field(default=(), kw_only=True)
+    """An iterable of OptionFilters to restrict what options are required for this rule to be active"""
+
+    filtered_resolution: bool = dataclasses.field(default=False, kw_only=True)
+    """If this rule should default to True or False when filtered by its options"""
+
+    game_name: ClassVar[str]
+    """The name of the game this rule belongs to, default rules belong to 'Archipelago'"""
+
+    def __post_init__(self) -> None:
+        if not isinstance(self.options, tuple):
+            self.options = tuple(self.options)
+
+    def _instantiate(self, world: TWorld) -> "Resolved":
+        """Create a new resolved rule for this world"""
+        return self.Resolved(player=world.player, caching_enabled=getattr(world, "rule_caching_enabled", False))
+
+    def resolve(self, world: TWorld) -> "Resolved":
+        """Resolve a rule with the given world"""
+        for option_filter in self.options:
+            if not option_filter.check(world.options):
+                return True_().resolve(world) if self.filtered_resolution else False_().resolve(world)
+        return self._instantiate(world)
+
+    def to_dict(self) -> dict[str, Any]:
+        """Returns a JSON compatible dict representation of this rule"""
+        args = {
+            field.name: getattr(self, field.name, None)
+            for field in dataclasses.fields(self)
+            if field.name not in ("options", "filtered_resolution")
+        }
+        return {
+            "rule": self.__class__.__qualname__,
+            "options": [o.to_dict() for o in self.options],
+            "filtered_resolution": self.filtered_resolution,
+            "args": args,
+        }
+
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        """Returns a new instance of this rule from a serialized dict representation"""
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(**data.get("args", {}), options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    def __and__(self, other: "Rule[Any] | Iterable[OptionFilter] | OptionFilter") -> "Rule[TWorld]":
+        """Combines two rules or a rule and an option filter into an And rule"""
+        if isinstance(other, OptionFilter):
+            other = (other,)
+        if isinstance(other, Iterable):
+            if not other:
+                return self
+            return Filtered(self, options=other)
+        if self.options == other.options:
+            if isinstance(self, And):
+                if isinstance(other, And):
+                    return And(*self.children, *other.children, options=self.options)
+                return And(*self.children, other, options=self.options)
+            if isinstance(other, And):
+                return And(self, *other.children, options=other.options)
+        return And(self, other)
+
+    def __rand__(self, other: "Rule[Any] | Iterable[OptionFilter] | OptionFilter") -> "Rule[TWorld]":
+        return self.__and__(other)
+
+    def __or__(self, other: "Rule[Any] | Iterable[OptionFilter] | OptionFilter") -> "Rule[TWorld]":
+        """Combines two rules or a rule and an option filter into an Or rule"""
+        if isinstance(other, OptionFilter):
+            other = (other,)
+        if isinstance(other, Iterable):
+            if not other:
+                return self
+            return Or(self, True_(options=other))
+        if self.options == other.options:
+            if isinstance(self, Or):
+                if isinstance(other, Or):
+                    return Or(*self.children, *other.children, options=self.options)
+                return Or(*self.children, other, options=self.options)
+            if isinstance(other, Or):
+                return Or(self, *other.children, options=self.options)
+        return Or(self, other)
+
+    def __ror__(self, other: "Rule[Any] | Iterable[OptionFilter] | OptionFilter") -> "Rule[TWorld]":
+        return self.__or__(other)
+
+    def __bool__(self) -> Never:
+        """Safeguard to prevent devs from mistakenly doing `rule1 and rule2` and getting the wrong result"""
+        raise TypeError("Use & or | to combine rules, or use `is not None` for boolean tests")
+
+    @override
+    def __str__(self) -> str:
+        options = f"options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({options})"
+
+    @classmethod
+    def __init_subclass__(cls, /, game: str) -> None:
+        if game != "Archipelago":
+            custom_rules = CustomRuleRegister.custom_rules.setdefault(game, {})
+            if cls.__qualname__ in custom_rules:
+                raise TypeError(f"Rule {cls.__qualname__} has already been registered for game {game}")
+            custom_rules[cls.__qualname__] = cls
+        elif cls.__module__ != "rule_builder.rules":
+            raise TypeError("You cannot define custom rules for the base Archipelago world")
+        cls.game_name = game
+
+    class Resolved(metaclass=CustomRuleRegister):
+        """A resolved rule for a given world that can be used as an access rule"""
+
+        _: dataclasses.KW_ONLY
+
+        player: int
+        """The player this rule is for"""
+
+        caching_enabled: bool = dataclasses.field(repr=False, default=False, kw_only=True)
+        """If the world this rule is for has caching enabled"""
+
+        force_recalculate: ClassVar[bool] = False
+        """Forces this rule to be recalculated every time it is evaluated.
+        Forces any parent composite rules containing this rule to also be recalculated. Implies skip_cache."""
+
+        skip_cache: ClassVar[bool] = False
+        """Skips the caching layer when evaluating this rule.
+        Composite rules will still respect the caching layer so dependencies functions should be implemented as normal.
+        Set to True when rule calculation is trivial."""
+
+        always_true: ClassVar[bool] = False
+        """Whether this rule always evaluates to True, used to short-circuit logic"""
+
+        always_false: ClassVar[bool] = False
+        """Whether this rule always evaluates to True, used to short-circuit logic"""
+
+        def __post_init__(self) -> None:
+            object.__setattr__(
+                self,
+                "caching_enabled",
+                self.caching_enabled and not self.force_recalculate and not self.skip_cache,
+            )
+
+        def __call__(self, state: CollectionState) -> bool:
+            """Evaluate this rule's result with the given state, using the cached value if possible"""
+            if not self.caching_enabled:
+                return self._evaluate(state)
+
+            player_results = cast(dict[int, bool], state.rule_builder_cache[self.player])  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType]
+            cached_result = player_results.get(id(self))
+            if cached_result is not None:
+                return cached_result
+
+            result = self._evaluate(state)
+            player_results[id(self)] = result
+            return result
+
+        def _evaluate(self, state: CollectionState) -> bool:
+            """Calculate this rule's result with the given state"""
+            ...
+
+        def item_dependencies(self) -> dict[str, set[int]]:
+            """Returns a mapping of item name to set of object ids, used for cache invalidation"""
+            return {}
+
+        def region_dependencies(self) -> dict[str, set[int]]:
+            """Returns a mapping of region name to set of object ids,
+            used for indirect connections and cache invalidation"""
+            return {}
+
+        def location_dependencies(self) -> dict[str, set[int]]:
+            """Returns a mapping of location name to set of object ids, used for cache invalidation"""
+            return {}
+
+        def entrance_dependencies(self) -> dict[str, set[int]]:
+            """Returns a mapping of entrance name to set of object ids, used for cache invalidation"""
+            return {}
+
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            """Returns a list of printJSON messages that explain the logic for this rule"""
+            return [{"type": "text", "text": self.rule_name}]
+
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            """Returns a human readable string describing this rule"""
+            return str(self)
+
+        @override
+        def __str__(self) -> str:
+            return self.rule_name
+
+
+@dataclasses.dataclass()
+class True_(Rule[TWorld], game="Archipelago"):  # noqa: N801
+    """A rule that always returns True"""
+
+    class Resolved(Rule.Resolved):
+        always_true: ClassVar[bool] = True
+        skip_cache: ClassVar[bool] = True
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return True
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            return [{"type": "color", "color": "green", "text": "True"}]
+
+        @override
+        def __str__(self) -> str:
+            return "True"
+
+
+@dataclasses.dataclass()
+class False_(Rule[TWorld], game="Archipelago"):  # noqa: N801
+    """A rule that always returns False"""
+
+    class Resolved(Rule.Resolved):
+        always_false: ClassVar[bool] = True
+        skip_cache: ClassVar[bool] = True
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return False
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            return [{"type": "color", "color": "salmon", "text": "False"}]
+
+        @override
+        def __str__(self) -> str:
+            return "False"
+
+
+@dataclasses.dataclass(init=False)
+class NestedRule(Rule[TWorld], game="Archipelago"):
+    """A base rule class that takes an iterable of other rules as an argument and does logic based on them"""
+
+    children: tuple[Rule[TWorld], ...]
+    """The child rules this rule's logic is based on"""
+
+    def __init__(
+        self,
+        *children: Rule[TWorld],
+        options: Iterable[OptionFilter] = (),
+        filtered_resolution: bool = False,
+    ) -> None:
+        super().__init__(options=options, filtered_resolution=filtered_resolution)
+        self.children = children
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        children = [c.resolve(world) for c in self.children]
+        return self.Resolved(
+            tuple(children),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def to_dict(self) -> dict[str, Any]:
+        data = super().to_dict()
+        del data["args"]
+        data["children"] = [c.to_dict() for c in self.children]
+        return data
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        children = [world_cls.rule_from_dict(c) for c in data.get("children", ())]
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(*children, options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    @override
+    def __str__(self) -> str:
+        children = ", ".join(str(c) for c in self.children)
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({children}{options})"
+
+    class Resolved(Rule.Resolved):
+        children: tuple[Rule.Resolved, ...]
+
+        def __post_init__(self) -> None:
+            object.__setattr__(
+                self,
+                "force_recalculate",
+                self.force_recalculate or any(c.force_recalculate for c in self.children),
+            )
+            super().__post_init__()
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            combined_deps: dict[str, set[int]] = {}
+            for child in self.children:
+                for item_name, rules in child.item_dependencies().items():
+                    if item_name in combined_deps:
+                        combined_deps[item_name] |= rules
+                    else:
+                        combined_deps[item_name] = {id(self), *rules}
+            return combined_deps
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            combined_deps: dict[str, set[int]] = {}
+            for child in self.children:
+                for region_name, rules in child.region_dependencies().items():
+                    if region_name in combined_deps:
+                        combined_deps[region_name] |= rules
+                    else:
+                        combined_deps[region_name] = {id(self), *rules}
+            return combined_deps
+
+        @override
+        def location_dependencies(self) -> dict[str, set[int]]:
+            combined_deps: dict[str, set[int]] = {}
+            for child in self.children:
+                for location_name, rules in child.location_dependencies().items():
+                    if location_name in combined_deps:
+                        combined_deps[location_name] |= rules
+                    else:
+                        combined_deps[location_name] = {id(self), *rules}
+            return combined_deps
+
+        @override
+        def entrance_dependencies(self) -> dict[str, set[int]]:
+            combined_deps: dict[str, set[int]] = {}
+            for child in self.children:
+                for entrance_name, rules in child.entrance_dependencies().items():
+                    if entrance_name in combined_deps:
+                        combined_deps[entrance_name] |= rules
+                    else:
+                        combined_deps[entrance_name] = {id(self), *rules}
+            return combined_deps
+
+
+@dataclasses.dataclass(init=False)
+class And(NestedRule[TWorld], game="Archipelago"):
+    """A rule that only returns true when all child rules evaluate as true"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        children_to_process = [c.resolve(world) for c in self.children]
+        clauses: list[Rule.Resolved] = []
+        items: dict[str, int] = {}
+        true_rule: Rule.Resolved | None = None
+
+        while children_to_process:
+            child = children_to_process.pop(0)
+            if child.always_false:
+                # false always wins
+                return child
+            if child.always_true:
+                # dedupe trues
+                true_rule = child
+                continue
+            if isinstance(child, And.Resolved):
+                children_to_process.extend(child.children)
+                continue
+
+            if isinstance(child, Has.Resolved):
+                if child.item_name not in items or items[child.item_name] < child.count:
+                    items[child.item_name] = child.count
+            elif isinstance(child, HasAll.Resolved):
+                for item in child.item_names:
+                    if item not in items:
+                        items[item] = 1
+            elif isinstance(child, HasAllCounts.Resolved):
+                for item, count in child.item_counts:
+                    if item not in items or items[item] < count:
+                        items[item] = count
+            else:
+                clauses.append(child)
+
+        if not clauses and not items:
+            return true_rule or False_().resolve(world)
+
+        if len(items) == 1:
+            item, count = next(iter(items.items()))
+            clauses.append(Has(item, count).resolve(world))
+        elif items and all(count == 1 for count in items.values()):
+            clauses.append(HasAll(*items).resolve(world))
+        elif items:
+            clauses.append(HasAllCounts(items).resolve(world))
+
+        if len(clauses) == 1:
+            return clauses[0]
+
+        return And.Resolved(
+            tuple(clauses),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    class Resolved(NestedRule.Resolved):
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            for rule in self.children:
+                if not rule(state):
+                    return False
+            return True
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = [{"type": "text", "text": "("}]
+            for i, child in enumerate(self.children):
+                if i > 0:
+                    messages.append({"type": "text", "text": " & "})
+                messages.extend(child.explain_json(state))
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            clauses = " & ".join([c.explain_str(state) for c in self.children])
+            return f"({clauses})"
+
+        @override
+        def __str__(self) -> str:
+            clauses = " & ".join([str(c) for c in self.children])
+            return f"({clauses})"
+
+
+@dataclasses.dataclass(init=False)
+class Or(NestedRule[TWorld], game="Archipelago"):
+    """A rule that returns true when any child rule evaluates as true"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        children_to_process = [c.resolve(world) for c in self.children]
+        clauses: list[Rule.Resolved] = []
+        items: dict[str, int] = {}
+
+        while children_to_process:
+            child = children_to_process.pop(0)
+            if child.always_true:
+                # true always wins
+                return child
+            if child.always_false:
+                # falses can be ignored
+                continue
+            if isinstance(child, Or.Resolved):
+                children_to_process.extend(child.children)
+                continue
+
+            if isinstance(child, Has.Resolved):
+                if child.item_name not in items or child.count < items[child.item_name]:
+                    items[child.item_name] = child.count
+            elif isinstance(child, HasAny.Resolved):
+                for item in child.item_names:
+                    items[item] = 1
+            elif isinstance(child, HasAnyCount.Resolved):
+                for item, count in child.item_counts:
+                    if item not in items or count < items[item]:
+                        items[item] = count
+            else:
+                clauses.append(child)
+
+        if not clauses and not items:
+            return False_().resolve(world)
+
+        if len(items) == 1:
+            item, count = next(iter(items.items()))
+            clauses.append(Has(item, count).resolve(world))
+        elif items and all(count == 1 for count in items.values()):
+            clauses.append(HasAny(*items).resolve(world))
+        elif items:
+            clauses.append(HasAnyCount(items).resolve(world))
+
+        if len(clauses) == 1:
+            return clauses[0]
+
+        return Or.Resolved(
+            tuple(clauses),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    class Resolved(NestedRule.Resolved):
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            for rule in self.children:
+                if rule(state):
+                    return True
+            return False
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = [{"type": "text", "text": "("}]
+            for i, child in enumerate(self.children):
+                if i > 0:
+                    messages.append({"type": "text", "text": " | "})
+                messages.extend(child.explain_json(state))
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            clauses = " | ".join([c.explain_str(state) for c in self.children])
+            return f"({clauses})"
+
+        @override
+        def __str__(self) -> str:
+            clauses = " | ".join([str(c) for c in self.children])
+            return f"({clauses})"
+
+
+@dataclasses.dataclass()
+class WrapperRule(Rule[TWorld], game="Archipelago"):
+    """A base rule class that wraps another rule to provide extra logic or data"""
+
+    child: Rule[TWorld]
+    """The child rule being wrapped"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        return self.Resolved(
+            self.child.resolve(world),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def to_dict(self) -> dict[str, Any]:
+        data = super().to_dict()
+        del data["args"]
+        data["child"] = self.child.to_dict()
+        return data
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        child = data.get("child")
+        if child is None:
+            raise ValueError("Child rule cannot be None")
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(
+            world_cls.rule_from_dict(child),
+            options=options,
+            filtered_resolution=data.get("filtered_resolution", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        return f"{self.__class__.__name__}[{self.child}]"
+
+    class Resolved(Rule.Resolved):
+        child: Rule.Resolved
+
+        def __post_init__(self) -> None:
+            object.__setattr__(self, "force_recalculate", self.force_recalculate or self.child.force_recalculate)
+            super().__post_init__()
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return self.child(state)
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            deps: dict[str, set[int]] = {}
+            for item_name, rules in self.child.item_dependencies().items():
+                deps[item_name] = {id(self), *rules}
+            return deps
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            deps: dict[str, set[int]] = {}
+            for region_name, rules in self.child.region_dependencies().items():
+                deps[region_name] = {id(self), *rules}
+            return deps
+
+        @override
+        def location_dependencies(self) -> dict[str, set[int]]:
+            deps: dict[str, set[int]] = {}
+            for location_name, rules in self.child.location_dependencies().items():
+                deps[location_name] = {id(self), *rules}
+            return deps
+
+        @override
+        def entrance_dependencies(self) -> dict[str, set[int]]:
+            deps: dict[str, set[int]] = {}
+            for entrance_name, rules in self.child.entrance_dependencies().items():
+                deps[entrance_name] = {id(self), *rules}
+            return deps
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = [{"type": "text", "text": f"{self.rule_name} ["}]
+            messages.extend(self.child.explain_json(state))
+            messages.append({"type": "text", "text": "]"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            return f"{self.rule_name}[{self.child.explain_str(state)}]"
+
+        @override
+        def __str__(self) -> str:
+            return f"{self.rule_name}[{self.child}]"
+
+
+@dataclasses.dataclass()
+class Filtered(WrapperRule[TWorld], game="Archipelago"):
+    """A convenience rule to wrap an existing rule with an options filter"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        return self.child.resolve(world)
+
+
+@dataclasses.dataclass()
+class Has(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least `count` of a given item"""
+
+    item_name: str
+    """The item to check for"""
+
+    count: int = 1
+    """The count the player is required to have"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        return self.Resolved(
+            self.item_name,
+            self.count,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        count = f", count={self.count}" if self.count > 1 else ""
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.item_name}{count}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_name: str
+        count: int = 1
+        skip_cache: ClassVar[bool] = True
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has
+            return state.prog_items[self.player][self.item_name] >= self.count
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {self.item_name: set()}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            verb = "Missing " if state and not self(state) else "Has "
+            messages: list[JSONMessagePart] = [{"type": "text", "text": verb}]
+            if self.count > 1:
+                messages.append({"type": "color", "color": "cyan", "text": str(self.count)})
+                messages.append({"type": "text", "text": "x "})
+            if state:
+                color = "green" if self(state) else "salmon"
+                messages.append({"type": "color", "color": color, "text": self.item_name})
+            else:
+                messages.append({"type": "item_name", "flags": 0b001, "text": self.item_name, "player": self.player})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            prefix = "Has" if self(state) else "Missing"
+            count = f"{self.count}x " if self.count > 1 else ""
+            return f"{prefix} {count}{self.item_name}"
+
+        @override
+        def __str__(self) -> str:
+            count = f"{self.count}x " if self.count > 1 else ""
+            return f"Has {count}{self.item_name}"
+
+
+@dataclasses.dataclass(init=False)
+class HasAll(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has all of the given items"""
+
+    item_names: tuple[str, ...]
+    """A tuple of item names to check for"""
+
+    def __init__(
+        self,
+        *item_names: str,
+        options: Iterable[OptionFilter] = (),
+        filtered_resolution: bool = False,
+    ) -> None:
+        super().__init__(options=options, filtered_resolution=filtered_resolution)
+        self.item_names = tuple(sorted(set(item_names)))
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_names) == 0:
+            # match state.has_all
+            return True_().resolve(world)
+        if len(self.item_names) == 1:
+            return Has(self.item_names[0]).resolve(world)
+        return self.Resolved(
+            self.item_names,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        args = {**data.get("args", {})}
+        item_names = args.pop("item_names", ())
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(*item_names, **args, options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join(self.item_names)
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_names: tuple[str, ...]
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_all
+            player_prog_items = state.prog_items[self.player]
+            for item in self.item_names:
+                if not player_prog_items[item]:
+                    return False
+            return True
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": "all"},
+                    {"type": "text", "text": " of ("},
+                ]
+                for i, item in enumerate(self.item_names):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            messages = [
+                {"type": "text", "text": "Has " if not missing else "Missing "},
+                {"type": "color", "color": "cyan", "text": "all" if not missing else "some"},
+                {"type": "text", "text": " of ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, item in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, item in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            prefix = "Has all" if self(state) else "Missing some"
+            found_str = f"Found: {', '.join(found)}" if found else ""
+            missing_str = f"Missing: {', '.join(missing)}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"{prefix} of ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join(self.item_names)
+            return f"Has all of ({items})"
+
+
+@dataclasses.dataclass(init=False)
+class HasAny(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least one of the given items"""
+
+    item_names: tuple[str, ...]
+    """A tuple of item names to check for"""
+
+    def __init__(
+        self,
+        *item_names: str,
+        options: Iterable[OptionFilter] = (),
+        filtered_resolution: bool = False,
+    ) -> None:
+        super().__init__(options=options, filtered_resolution=filtered_resolution)
+        self.item_names = tuple(sorted(set(item_names)))
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_names) == 0:
+            # match state.has_any
+            return False_().resolve(world)
+        if len(self.item_names) == 1:
+            return Has(self.item_names[0]).resolve(world)
+        return self.Resolved(
+            self.item_names,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        args = {**data.get("args", {})}
+        item_names = args.pop("item_names", ())
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(*item_names, **args, options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join(self.item_names)
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_names: tuple[str, ...]
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_any
+            player_prog_items = state.prog_items[self.player]
+            for item in self.item_names:
+                if player_prog_items[item]:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": "any"},
+                    {"type": "text", "text": " of ("},
+                ]
+                for i, item in enumerate(self.item_names):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            messages = [
+                {"type": "text", "text": "Has " if found else "Missing "},
+                {"type": "color", "color": "cyan", "text": "some" if found else "all"},
+                {"type": "text", "text": " of ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, item in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, item in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            prefix = "Has some" if self(state) else "Missing all"
+            found_str = f"Found: {', '.join(found)}" if found else ""
+            missing_str = f"Missing: {', '.join(missing)}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"{prefix} of ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join(self.item_names)
+            return f"Has any of ({items})"
+
+
+@dataclasses.dataclass()
+class HasAllCounts(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has all of the specified counts of the given items"""
+
+    item_counts: dict[str, int]
+    """A mapping of item name to count to check for"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_counts) == 0:
+            # match state.has_all_counts
+            return True_().resolve(world)
+        if len(self.item_counts) == 1:
+            item = next(iter(self.item_counts))
+            return Has(item, self.item_counts[item]).resolve(world)
+        return self.Resolved(
+            tuple(self.item_counts.items()),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join([f"{item} x{count}" for item, count in self.item_counts.items()])
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_counts: tuple[tuple[str, int], ...]
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_all_counts
+            player_prog_items = state.prog_items[self.player]
+            for item, count in self.item_counts:
+                if player_prog_items[item] < count:
+                    return False
+            return True
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item, _ in self.item_counts}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": "all"},
+                    {"type": "text", "text": " of ("},
+                ]
+                for i, (item, count) in enumerate(self.item_counts):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                    messages.append({"type": "text", "text": f" x{count}"})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found = [(item, count) for item, count in self.item_counts if state.has(item, self.player, count)]
+            missing = [(item, count) for item, count in self.item_counts if (item, count) not in found]
+            messages = [
+                {"type": "text", "text": "Has " if not missing else "Missing "},
+                {"type": "color", "color": "cyan", "text": "all" if not missing else "some"},
+                {"type": "text", "text": " of ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, (item, count) in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                    messages.append({"type": "text", "text": f" x{count}"})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, (item, count) in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+                    messages.append({"type": "text", "text": f" x{count}"})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found = [(item, count) for item, count in self.item_counts if state.has(item, self.player, count)]
+            missing = [(item, count) for item, count in self.item_counts if (item, count) not in found]
+            prefix = "Has all" if self(state) else "Missing some"
+            found_str = f"Found: {', '.join([f'{item} x{count}' for item, count in found])}" if found else ""
+            missing_str = f"Missing: {', '.join([f'{item} x{count}' for item, count in missing])}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"{prefix} of ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join([f"{item} x{count}" for item, count in self.item_counts])
+            return f"Has all of ({items})"
+
+
+@dataclasses.dataclass()
+class HasAnyCount(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has any of the specified counts of the given items"""
+
+    item_counts: dict[str, int]
+    """A mapping of item name to count to check for"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_counts) == 0:
+            # match state.has_any_count
+            return False_().resolve(world)
+        if len(self.item_counts) == 1:
+            item = next(iter(self.item_counts))
+            return Has(item, self.item_counts[item]).resolve(world)
+        return self.Resolved(
+            tuple(self.item_counts.items()),
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join([f"{item} x{count}" for item, count in self.item_counts.items()])
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_counts: tuple[tuple[str, int], ...]
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_any_count
+            player_prog_items = state.prog_items[self.player]
+            for item, count in self.item_counts:
+                if player_prog_items[item] >= count:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item, _ in self.item_counts}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": "any"},
+                    {"type": "text", "text": " of ("},
+                ]
+                for i, (item, count) in enumerate(self.item_counts):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                    messages.append({"type": "text", "text": f" x{count}"})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found = [(item, count) for item, count in self.item_counts if state.has(item, self.player, count)]
+            missing = [(item, count) for item, count in self.item_counts if (item, count) not in found]
+            messages = [
+                {"type": "text", "text": "Has " if found else "Missing "},
+                {"type": "color", "color": "cyan", "text": "some" if found else "all"},
+                {"type": "text", "text": " of ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, (item, count) in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                    messages.append({"type": "text", "text": f" x{count}"})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, (item, count) in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+                    messages.append({"type": "text", "text": f" x{count}"})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found = [(item, count) for item, count in self.item_counts if state.has(item, self.player, count)]
+            missing = [(item, count) for item, count in self.item_counts if (item, count) not in found]
+            prefix = "Has some" if self(state) else "Missing all"
+            found_str = f"Found: {', '.join([f'{item} x{count}' for item, count in found])}" if found else ""
+            missing_str = f"Missing: {', '.join([f'{item} x{count}' for item, count in missing])}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"{prefix} of ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join([f"{item} x{count}" for item, count in self.item_counts])
+            return f"Has any of ({items})"
+
+
+@dataclasses.dataclass(init=False)
+class HasFromList(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least `count` of the given items"""
+
+    item_names: tuple[str, ...]
+    """A tuple of item names to check for"""
+
+    count: int = 1
+    """The number of items the player needs to have"""
+
+    def __init__(
+        self,
+        *item_names: str,
+        count: int = 1,
+        options: Iterable[OptionFilter] = (),
+        filtered_resolution: bool = False,
+    ) -> None:
+        super().__init__(options=options, filtered_resolution=filtered_resolution)
+        self.item_names = tuple(sorted(set(item_names)))
+        self.count = count
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_names) == 0:
+            # match state.has_from_list
+            return False_().resolve(world)
+        if len(self.item_names) == 1:
+            return Has(self.item_names[0], self.count).resolve(world)
+        return self.Resolved(
+            self.item_names,
+            self.count,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        args = {**data.get("args", {})}
+        item_names = args.pop("item_names", ())
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(*item_names, **args, options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join(self.item_names)
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}, count={self.count}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_names: tuple[str, ...]
+        count: int = 1
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_from_list
+            found = 0
+            player_prog_items = state.prog_items[self.player]
+            for item_name in self.item_names:
+                found += player_prog_items[item_name]
+                if found >= self.count:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": str(self.count)},
+                    {"type": "text", "text": "x items from ("},
+                ]
+                for i, item in enumerate(self.item_names):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found_count = state.count_from_list(self.item_names, self.player)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            color = "green" if found_count >= self.count else "salmon"
+            messages = [
+                {"type": "text", "text": "Has "},
+                {
+                    "type": "color",
+                    "color": color,
+                    "text": f"{found_count}/{self.count}",
+                },
+                {"type": "text", "text": " items from ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, item in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, item in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found_count = state.count_from_list(self.item_names, self.player)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            found_str = f"Found: {', '.join(found)}" if found else ""
+            missing_str = f"Missing: {', '.join(missing)}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"Has {found_count}/{self.count} items from ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join(self.item_names)
+            count = f"{self.count}x items" if self.count > 1 else "an item"
+            return f"Has {count} from ({items})"
+
+
+@dataclasses.dataclass(init=False)
+class HasFromListUnique(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least `count` of the given items, ignoring duplicates of the same item"""
+
+    item_names: tuple[str, ...]
+    """A tuple of item names to check for"""
+
+    count: int = 1
+    """The number of items the player needs to have"""
+
+    def __init__(
+        self,
+        *item_names: str,
+        count: int = 1,
+        options: Iterable[OptionFilter] = (),
+        filtered_resolution: bool = False,
+    ) -> None:
+        super().__init__(options=options, filtered_resolution=filtered_resolution)
+        self.item_names = tuple(sorted(set(item_names)))
+        self.count = count
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        if len(self.item_names) == 0 or len(self.item_names) < self.count:
+            # match state.has_from_list_unique
+            return False_().resolve(world)
+        if len(self.item_names) == 1:
+            return Has(self.item_names[0]).resolve(world)
+        return self.Resolved(
+            self.item_names,
+            self.count,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    @classmethod
+    def from_dict(cls, data: Mapping[str, Any], world_cls: "type[World]") -> Self:
+        args = {**data.get("args", {})}
+        item_names = args.pop("item_names", ())
+        options = OptionFilter.multiple_from_dict(data.get("options", ()))
+        return cls(*item_names, **args, options=options, filtered_resolution=data.get("filtered_resolution", False))
+
+    @override
+    def __str__(self) -> str:
+        items = ", ".join(self.item_names)
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({items}, count={self.count}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_names: tuple[str, ...]
+        count: int = 1
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_from_list_unique
+            found = 0
+            player_prog_items = state.prog_items[self.player]
+            for item_name in self.item_names:
+                found += player_prog_items[item_name] > 0
+                if found >= self.count:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = []
+            if state is None:
+                messages = [
+                    {"type": "text", "text": "Has "},
+                    {"type": "color", "color": "cyan", "text": str(self.count)},
+                    {"type": "text", "text": "x unique items from ("},
+                ]
+                for i, item in enumerate(self.item_names):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "item_name", "flags": 0b001, "text": item, "player": self.player})
+                messages.append({"type": "text", "text": ")"})
+                return messages
+
+            found_count = state.count_from_list_unique(self.item_names, self.player)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            color = "green" if found_count >= self.count else "salmon"
+            messages = [
+                {"type": "text", "text": "Has "},
+                {"type": "color", "color": color, "text": f"{found_count}/{self.count}"},
+                {"type": "text", "text": " unique items from ("},
+            ]
+            if found:
+                messages.append({"type": "text", "text": "Found: "})
+                for i, item in enumerate(found):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "green", "text": item})
+                if missing:
+                    messages.append({"type": "text", "text": "; "})
+
+            if missing:
+                messages.append({"type": "text", "text": "Missing: "})
+                for i, item in enumerate(missing):
+                    if i > 0:
+                        messages.append({"type": "text", "text": ", "})
+                    messages.append({"type": "color", "color": "salmon", "text": item})
+            messages.append({"type": "text", "text": ")"})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            found_count = state.count_from_list_unique(self.item_names, self.player)
+            found = [item for item in self.item_names if state.has(item, self.player)]
+            missing = [item for item in self.item_names if item not in found]
+            found_str = f"Found: {', '.join(found)}" if found else ""
+            missing_str = f"Missing: {', '.join(missing)}" if missing else ""
+            infix = "; " if found and missing else ""
+            return f"Has {found_count}/{self.count} unique items from ({found_str}{infix}{missing_str})"
+
+        @override
+        def __str__(self) -> str:
+            items = ", ".join(self.item_names)
+            count = f"{self.count}x unique items" if self.count > 1 else "a unique item"
+            return f"Has {count} from ({items})"
+
+
+@dataclasses.dataclass()
+class HasGroup(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least `count` of the items present in the specified item group"""
+
+    item_name_group: str
+    """The name of the item group containing the items"""
+
+    count: int = 1
+    """The number of items the player needs to have"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        item_names = tuple(sorted(world.item_name_groups[self.item_name_group]))
+        return self.Resolved(
+            self.item_name_group,
+            item_names,
+            self.count,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        count = f", count={self.count}" if self.count > 1 else ""
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.item_name_group}{count}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_name_group: str
+        item_names: tuple[str, ...]
+        count: int = 1
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_group
+            found = 0
+            player_prog_items = state.prog_items[self.player]
+            for item_name in self.item_names:
+                found += player_prog_items[item_name]
+                if found >= self.count:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = [{"type": "text", "text": "Has "}]
+            if state is None:
+                messages.append({"type": "color", "color": "cyan", "text": str(self.count)})
+            else:
+                count = state.count_group(self.item_name_group, self.player)
+                color = "green" if count >= self.count else "salmon"
+                messages.append({"type": "color", "color": color, "text": f"{count}/{self.count}"})
+            messages.append({"type": "text", "text": " items from "})
+            messages.append({"type": "color", "color": "cyan", "text": self.item_name_group})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            count = state.count_group(self.item_name_group, self.player)
+            return f"Has {count}/{self.count} items from {self.item_name_group}"
+
+        @override
+        def __str__(self) -> str:
+            count = f"{self.count}x items" if self.count > 1 else "an item"
+            return f"Has {count} from {self.item_name_group}"
+
+
+@dataclasses.dataclass()
+class HasGroupUnique(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the player has at least `count` of the items present
+    in the specified item group, ignoring duplicates of the same item"""
+
+    item_name_group: str
+    """The name of the item group containing the items"""
+
+    count: int = 1
+    """The number of items the player needs to have"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        item_names = tuple(sorted(world.item_name_groups[self.item_name_group]))
+        return self.Resolved(
+            self.item_name_group,
+            item_names,
+            self.count,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        count = f", count={self.count}" if self.count > 1 else ""
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.item_name_group}{count}{options})"
+
+    class Resolved(Rule.Resolved):
+        item_name_group: str
+        item_names: tuple[str, ...]
+        count: int = 1
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            # implementation based on state.has_group_unique
+            found = 0
+            player_prog_items = state.prog_items[self.player]
+            for item_name in self.item_names:
+                found += player_prog_items[item_name] > 0
+                if found >= self.count:
+                    return True
+            return False
+
+        @override
+        def item_dependencies(self) -> dict[str, set[int]]:
+            return {item: {id(self)} for item in self.item_names}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            messages: list[JSONMessagePart] = [{"type": "text", "text": "Has "}]
+            if state is None:
+                messages.append({"type": "color", "color": "cyan", "text": str(self.count)})
+            else:
+                count = state.count_group_unique(self.item_name_group, self.player)
+                color = "green" if count >= self.count else "salmon"
+                messages.append({"type": "color", "color": color, "text": f"{count}/{self.count}"})
+            messages.append({"type": "text", "text": " unique items from "})
+            messages.append({"type": "color", "color": "cyan", "text": self.item_name_group})
+            return messages
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            count = state.count_group_unique(self.item_name_group, self.player)
+            return f"Has {count}/{self.count} unique items from {self.item_name_group}"
+
+        @override
+        def __str__(self) -> str:
+            count = f"{self.count}x unique items" if self.count > 1 else "a unique item"
+            return f"Has {count} from {self.item_name_group}"
+
+
+@dataclasses.dataclass()
+class CanReachLocation(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the given location is reachable by the current player"""
+
+    location_name: str
+    """The name of the location to test access to"""
+
+    parent_region_name: str = ""
+    """The name of the location's parent region. If not specified it will be resolved when the rule is resolved"""
+
+    skip_indirect_connection: bool = False
+    """Skip finding the location's parent region.
+    Do not use this if this rule is for an entrance and explicit_indirect_conditions is True
+    """
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        parent_region_name = self.parent_region_name
+        if not parent_region_name and not self.skip_indirect_connection:
+            location = world.get_location(self.location_name)
+            if not location.parent_region:
+                raise ValueError(f"Location {location.name} has no parent region")
+            parent_region_name = location.parent_region.name
+        return self.Resolved(
+            self.location_name,
+            parent_region_name,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.location_name}{options})"
+
+    class Resolved(Rule.Resolved):
+        location_name: str
+        parent_region_name: str
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return state.can_reach_location(self.location_name, self.player)
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            if self.parent_region_name:
+                return {self.parent_region_name: {id(self)}}
+            return {}
+
+        @override
+        def location_dependencies(self) -> dict[str, set[int]]:
+            return {self.location_name: {id(self)}}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            if state is None:
+                verb = "Can reach"
+            elif self(state):
+                verb = "Reached"
+            else:
+                verb = "Cannot reach"
+            return [
+                {"type": "text", "text": f"{verb} location "},
+                {"type": "location_name", "text": self.location_name, "player": self.player},
+            ]
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            prefix = "Reached" if self(state) else "Cannot reach"
+            return f"{prefix} location {self.location_name}"
+
+        @override
+        def __str__(self) -> str:
+            return f"Can reach location {self.location_name}"
+
+
+@dataclasses.dataclass()
+class CanReachRegion(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the given region is reachable by the current player"""
+
+    region_name: str
+    """The name of the region to test access to"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        return self.Resolved(
+            self.region_name,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.region_name}{options})"
+
+    class Resolved(Rule.Resolved):
+        region_name: str
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return state.can_reach_region(self.region_name, self.player)
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            return {self.region_name: {id(self)}}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            if state is None:
+                verb = "Can reach"
+            elif self(state):
+                verb = "Reached"
+            else:
+                verb = "Cannot reach"
+            return [
+                {"type": "text", "text": f"{verb} region "},
+                {"type": "color", "color": "yellow", "text": self.region_name},
+            ]
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            prefix = "Reached" if self(state) else "Cannot reach"
+            return f"{prefix} region {self.region_name}"
+
+        @override
+        def __str__(self) -> str:
+            return f"Can reach region {self.region_name}"
+
+
+@dataclasses.dataclass()
+class CanReachEntrance(Rule[TWorld], game="Archipelago"):
+    """A rule that checks if the given entrance is reachable by the current player"""
+
+    entrance_name: str
+    """The name of the entrance to test access to"""
+
+    parent_region_name: str = ""
+    """The name of the entrance's parent region. If not specified it will be resolved when the rule is resolved"""
+
+    @override
+    def _instantiate(self, world: TWorld) -> Rule.Resolved:
+        parent_region_name = self.parent_region_name
+        if not parent_region_name:
+            entrance = world.get_entrance(self.entrance_name)
+            if not entrance.parent_region:
+                raise ValueError(f"Entrance {entrance.name} has no parent region")
+            parent_region_name = entrance.parent_region.name
+        return self.Resolved(
+            self.entrance_name,
+            parent_region_name,
+            player=world.player,
+            caching_enabled=getattr(world, "rule_caching_enabled", False),
+        )
+
+    @override
+    def __str__(self) -> str:
+        options = f", options={self.options}" if self.options else ""
+        return f"{self.__class__.__name__}({self.entrance_name}{options})"
+
+    class Resolved(Rule.Resolved):
+        entrance_name: str
+        parent_region_name: str
+
+        @override
+        def _evaluate(self, state: CollectionState) -> bool:
+            return state.can_reach_entrance(self.entrance_name, self.player)
+
+        @override
+        def region_dependencies(self) -> dict[str, set[int]]:
+            if self.parent_region_name:
+                return {self.parent_region_name: {id(self)}}
+            return {}
+
+        @override
+        def entrance_dependencies(self) -> dict[str, set[int]]:
+            return {self.entrance_name: {id(self)}}
+
+        @override
+        def explain_json(self, state: CollectionState | None = None) -> list[JSONMessagePart]:
+            if state is None:
+                verb = "Can reach"
+            elif self(state):
+                verb = "Reached"
+            else:
+                verb = "Cannot reach"
+            return [
+                {"type": "text", "text": f"{verb} entrance "},
+                {"type": "entrance_name", "text": self.entrance_name, "player": self.player},
+            ]
+
+        @override
+        def explain_str(self, state: CollectionState | None = None) -> str:
+            if state is None:
+                return str(self)
+            prefix = "Reached" if self(state) else "Cannot reach"
+            return f"{prefix} entrance {self.entrance_name}"
+
+        @override
+        def __str__(self) -> str:
+            return f"Can reach entrance {self.entrance_name}"
+
+
+DEFAULT_RULES: "Final[dict[str, type[Rule[World]]]]" = {
+    rule_name: cast("type[Rule[World]]", rule_class)
+    for rule_name, rule_class in locals().items()
+    if isinstance(rule_class, type) and issubclass(rule_class, Rule) and rule_class is not Rule
+}
diff --git a/setup.py b/setup.py
index def2e518ce..d6cd3e1ffc 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ from Cython.Build import cythonize
 
 non_apworlds: set[str] = {
     "Archipelago",  # needs a way to specify load order
+    "Adventure", # loads basepatch badly
     "Final Fantasy",  # loads json files badly
     "Lufia II Ancient Cave",  # loads basepatch badly
     "Ocarina of Time",  # has executables in folder
@@ -387,11 +388,11 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
                         manifest = json.load(manifest_file)
 
                     assert "game" in manifest, (
-                        f"World directory {world_directory} has an archipelago.json manifest file, but it"
+                        f"World directory {world_directory} has an archipelago.json manifest file, but it "
                         "does not define a \"game\"."
                     )
                     assert manifest["game"] == worldtype.game, (
-                        f"World directory {world_directory} has an archipelago.json manifest file, but value of the"
+                        f"World directory {world_directory} has an archipelago.json manifest file, but value of the "
                         f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})."
                     )
                 else:
diff --git a/test/bases.py b/test/bases.py
index dd93ca6452..19b19bea67 100644
--- a/test/bases.py
+++ b/test/bases.py
@@ -248,6 +248,7 @@ class WorldTestBase(unittest.TestCase):
         with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
             distribute_items_restrictive(self.multiworld)
             call_all(self.multiworld, "post_fill")
+            call_all(self.multiworld, "finalize_multiworld")
             self.assertTrue(fulfills_accessibility(), "Collected all locations, but can't beat the game.")
             placed_items = [loc.item for loc in self.multiworld.get_locations() if loc.item and loc.item.code]
             self.assertLessEqual(len(self.multiworld.itempool), len(placed_items),
diff --git a/test/general/test_helpers.py b/test/general/test_helpers.py
index 7e850f9744..71d1866561 100644
--- a/test/general/test_helpers.py
+++ b/test/general/test_helpers.py
@@ -1,9 +1,11 @@
 import unittest
-from typing import Callable, Dict, Optional
+from typing import Any, Dict, Optional
 
 from typing_extensions import override
 
-from BaseClasses import CollectionState, MultiWorld, Region
+from BaseClasses import CollectionRule, MultiWorld, Region
+from rule_builder.rules import Has, Rule
+from test.general import TestWorld
 
 
 class TestHelpers(unittest.TestCase):
@@ -16,6 +18,7 @@ class TestHelpers(unittest.TestCase):
         self.multiworld.game[self.player] = "helper_test_game"
         self.multiworld.player_name = {1: "Tester"}
         self.multiworld.set_seed()
+        self.multiworld.worlds[self.player] = TestWorld(self.multiworld, self.player)
 
     def test_region_helpers(self) -> None:
         """Tests `Region.add_locations()` and `Region.add_exits()` have correct behavior"""
@@ -46,8 +49,9 @@ class TestHelpers(unittest.TestCase):
             "TestRegion1": {"TestRegion3"}
         }
 
-        exit_rules: Dict[str, Callable[[CollectionState], bool]] = {
-            "TestRegion1": lambda state: state.has("test_item", self.player)
+        exit_rules: Dict[str, CollectionRule | Rule[Any]] = {
+            "TestRegion1": lambda state: state.has("test_item", self.player),
+            "TestRegion2": Has("test_item2"),
         }
 
         self.multiworld.regions += [Region(region, self.player, self.multiworld, regions[region]) for region in regions]
@@ -74,13 +78,17 @@ class TestHelpers(unittest.TestCase):
                         self.assertTrue(f"{parent} -> {exit_reg}" in created_exit_names)
                     if exit_reg in exit_rules:
                         entrance_name = exit_name if exit_name else f"{parent} -> {exit_reg}"
-                        self.assertEqual(exit_rules[exit_reg],
-                                         self.multiworld.get_entrance(entrance_name, self.player).access_rule)
+                        rule = exit_rules[exit_reg]
+                        if isinstance(rule, Rule):
+                            self.assertEqual(rule.resolve(self.multiworld.worlds[self.player]),
+                                             self.multiworld.get_entrance(entrance_name, self.player).access_rule)
+                        else:
+                            self.assertEqual(rule, self.multiworld.get_entrance(entrance_name, self.player).access_rule)
 
-            for region in reg_exit_set:
+            for region, exit_set in reg_exit_set.items():
                 current_region = self.multiworld.get_region(region, self.player)
-                current_region.add_exits(reg_exit_set[region])
+                current_region.add_exits(exit_set)
                 exit_names = {_exit.name for _exit in current_region.exits}
-                for reg_exit in reg_exit_set[region]:
+                for reg_exit in exit_set:
                     self.assertTrue(f"{region} -> {reg_exit}" in exit_names,
                                     f"{region} -> {reg_exit} not in {exit_names}")
diff --git a/test/general/test_ids.py b/test/general/test_ids.py
index ad8aad11d1..08b4d0aa49 100644
--- a/test/general/test_ids.py
+++ b/test/general/test_ids.py
@@ -88,6 +88,7 @@ class TestIDs(unittest.TestCase):
                 multiworld = setup_solo_multiworld(world_type)
                 distribute_items_restrictive(multiworld)
                 call_all(multiworld, "post_fill")
+                call_all(multiworld, "finalize_multiworld")
                 datapackage = world_type.get_data_package_data()
                 for item_group, item_names in datapackage["item_name_groups"].items():
                     self.assertIsInstance(item_group, str,
diff --git a/test/general/test_implemented.py b/test/general/test_implemented.py
index de432e3690..0bc7b62d5b 100644
--- a/test/general/test_implemented.py
+++ b/test/general/test_implemented.py
@@ -11,7 +11,7 @@ class TestImplemented(unittest.TestCase):
     def test_completion_condition(self):
         """Ensure a completion condition is set that has requirements."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
-            if not world_type.hidden and game_name not in {"Sudoku"}:
+            if not world_type.hidden:
                 with self.subTest(game_name):
                     multiworld = setup_solo_multiworld(world_type)
                     self.assertFalse(multiworld.completion_condition[1](multiworld.state))
@@ -46,6 +46,8 @@ class TestImplemented(unittest.TestCase):
             with self.subTest(game=game_name, seed=multiworld.seed):
                 distribute_items_restrictive(multiworld)
                 call_all(multiworld, "post_fill")
+                call_all(multiworld, "finalize_multiworld")
+                call_all(multiworld, "pre_output")
                 for key, data in multiworld.worlds[1].fill_slot_data().items():
                     self.assertIsInstance(key, str, "keys in slot data must be a string")
                     convert_to_base_types(data)  # only put base data types into slot data
@@ -57,7 +59,7 @@ class TestImplemented(unittest.TestCase):
     def test_prefill_items(self):
         """Test that every world can reach every location from allstate before pre_fill."""
         for gamename, world_type in AutoWorldRegister.world_types.items():
-            if gamename not in ("Archipelago", "Sudoku", "Final Fantasy", "Test Game"):
+            if gamename not in ("Archipelago", "Final Fantasy", "Test Game"):
                 with self.subTest(gamename):
                     multiworld = setup_solo_multiworld(world_type, ("generate_early", "create_regions", "create_items",
                                                                     "set_rules", "connect_entrances", "generate_basic"))
@@ -93,6 +95,7 @@ class TestImplemented(unittest.TestCase):
             with self.subTest(game=game_name, seed=multiworld.seed):
                 distribute_items_restrictive(multiworld)
                 call_all(multiworld, "post_fill")
+                call_all(multiworld, "finalize_multiworld")
 
                 # Note: `multiworld.get_spheres()` iterates a set of locations, so the order that locations are checked
                 # is nondeterministic and may vary between runs with the same seed.
diff --git a/test/general/test_items.py b/test/general/test_items.py
index a48576da52..9c300cf94e 100644
--- a/test/general/test_items.py
+++ b/test/general/test_items.py
@@ -1,5 +1,6 @@
 import unittest
 from argparse import Namespace
+from collections import ChainMap
 from typing import Type
 
 from BaseClasses import CollectionState, MultiWorld
@@ -82,12 +83,13 @@ class TestBase(unittest.TestCase):
 
     def test_items_in_datapackage(self):
         """Test that any created items in the itempool are in the datapackage"""
+        archipelago = AutoWorldRegister.world_types["Archipelago"]
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game=game_name):
                 multiworld = setup_solo_multiworld(world_type)
                 for item in multiworld.itempool:
-                    self.assertIn(item.name, world_type.item_name_to_id)
-    
+                    self.assertIn(item.name, ChainMap(world_type.item_name_to_id, archipelago.item_name_to_id))
+
     def test_item_links(self) -> None:
         """
         Tests item link creation by creating a multiworld of 2 worlds for every game and linking their items together.
@@ -121,6 +123,7 @@ class TestBase(unittest.TestCase):
             call_all(multiworld, "pre_fill")
             distribute_items_restrictive(multiworld)
             call_all(multiworld, "post_fill")
+            call_all(multiworld, "finalize_multiworld")
             self.assertTrue(multiworld.can_beat_game(CollectionState(multiworld)), f"seed = {multiworld.seed}")
 
         for game_name, world_type in AutoWorldRegister.world_types.items():
diff --git a/test/general/test_options.py b/test/general/test_options.py
index f5111e9138..5d69b6820b 100644
--- a/test/general/test_options.py
+++ b/test/general/test_options.py
@@ -1,8 +1,9 @@
 import unittest
 
 from BaseClasses import PlandoOptions
-from Options import Choice, ItemLinks, PlandoConnections, PlandoItems, PlandoTexts
+from Options import Choice, TextChoice, ItemLinks, OptionSet, PlandoConnections, PlandoItems, PlandoTexts
 from Utils import restricted_dumps
+
 from worlds.AutoWorld import AutoWorldRegister
 
 
@@ -15,6 +16,29 @@ class TestOptions(unittest.TestCase):
                     with self.subTest(game=gamename, option=option_key):
                         self.assertTrue(option.__doc__)
 
+    def test_option_defaults(self):
+        """Test that defaults for submitted options are valid."""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            if not world_type.hidden:
+                for option_key, option in world_type.options_dataclass.type_hints.items():
+                    with self.subTest(game=gamename, option=option_key):
+                        if issubclass(option, TextChoice):
+                            self.assertTrue(option.default in option.name_lookup,
+                                f"Default value {option.default} for TextChoice option {option.__name__} in"
+                                f" {gamename} does not resolve to a listed value!"
+                            )
+                        # Standard "can default generate" test
+                        err_raised = None
+                        try:
+                            option.from_any(option.default)
+                        except Exception as ex:
+                            err_raised = ex
+                        self.assertIsNone(err_raised,
+                            f"Default value {option.default} for option {option.__name__} in {gamename}"
+                            f" is not valid! Exception: {err_raised}"
+                        )
+
+
     def test_options_are_not_set_by_world(self):
         """Test that options attribute is not already set"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
@@ -44,19 +68,19 @@ class TestOptions(unittest.TestCase):
             }],
             [{
                 "name": "ItemLinkGroup",
-                "item_pool": ["Hammer", "Bow"],
+                "item_pool": ["Hammer", "Sword"],
                 "link_replacement": False,
                 "replacement_item": None,
             }]
         ]
         # we really need some sort of test world but generic doesn't have enough items for this
-        world = AutoWorldRegister.world_types["A Link to the Past"]
+        world = AutoWorldRegister.world_types["APQuest"]
         plando_options = PlandoOptions.from_option_string("bosses")
         item_links = [ItemLinks.from_any(item_link_groups[0]), ItemLinks.from_any(item_link_groups[1])]
         for link in item_links:
             link.verify(world, "tester", plando_options)
             self.assertIn("Hammer", link.value[0]["item_pool"])
-            self.assertIn("Bow", link.value[0]["item_pool"])
+            self.assertIn("Sword", link.value[0]["item_pool"])
         
         # TODO test that the group created using these options has the items
 
@@ -81,6 +105,19 @@ class TestOptions(unittest.TestCase):
                         restricted_dumps(option.from_any(option.default))
                         if issubclass(option, Choice) and option.default in option.name_lookup:
                             restricted_dumps(option.from_text(option.name_lookup[option.default]))
+
+    def test_option_set_keys_random(self):
+        """Tests that option sets do not contain 'random' and its variants as valid keys"""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            if game_name not in ("Archipelago", "Super Metroid"):
+                for option_key, option in world_type.options_dataclass.type_hints.items():
+                    if issubclass(option, OptionSet):
+                        with self.subTest(game=game_name, option=option_key):
+                            self.assertFalse(any(random_key in option.valid_keys for random_key in ("random",
+                                                                                                    "random-high",
+                                                                                                    "random-low")))
+                            for key in option.valid_keys:
+                                self.assertFalse("random-range" in key)
     
     def test_pickle_dumps_plando(self):
         """Test that plando options using containers of a custom type can be pickled"""
diff --git a/test/general/test_player_options.py b/test/general/test_player_options.py
index ea7f19e3d9..7dd612f4f1 100644
--- a/test/general/test_player_options.py
+++ b/test/general/test_player_options.py
@@ -37,3 +37,23 @@ class TestPlayerOptions(unittest.TestCase):
         self.assertEqual(new_weights["dict_2"]["option_g"], 50)
         self.assertEqual(len(new_weights["set_1"]), 2)
         self.assertIn("option_d", new_weights["set_1"])
+
+    def test_update_dict_supports_negatives_and_zeroes(self):
+        original_options = {
+            "dict_1": {"a": 1, "b": -1},
+            "dict_2": {"a": 1, "b": -1},
+        }
+        new_weights = Generate.update_weights(
+            original_options,
+            {
+                "+dict_1": {"a": -2, "b": 2},
+                "-dict_2": {"a": 1, "b": 2},
+            },
+            "Tested",
+            "",
+        )
+        self.assertEqual(new_weights["dict_1"]["a"], -1)
+        self.assertEqual(new_weights["dict_1"]["b"], 1)
+        self.assertEqual(new_weights["dict_2"]["a"], 0)
+        self.assertEqual(new_weights["dict_2"]["b"], -3)
+        self.assertIn("a", new_weights["dict_2"])
diff --git a/test/general/test_rule_builder.py b/test/general/test_rule_builder.py
new file mode 100644
index 0000000000..81003dcd87
--- /dev/null
+++ b/test/general/test_rule_builder.py
@@ -0,0 +1,1344 @@
+import unittest
+from dataclasses import dataclass, fields
+from typing import Any, ClassVar, cast
+
+from typing_extensions import override
+
+from BaseClasses import CollectionState, Item, ItemClassification, Location, MultiWorld, Region
+from NetUtils import JSONMessagePart
+from Options import Choice, FreeText, Option, OptionSet, PerGameCommonOptions, Toggle
+from rule_builder.cached_world import CachedRuleBuilderWorld
+from rule_builder.options import Operator, OptionFilter
+from rule_builder.rules import (
+    And,
+    CanReachEntrance,
+    CanReachLocation,
+    CanReachRegion,
+    False_,
+    Filtered,
+    Has,
+    HasAll,
+    HasAllCounts,
+    HasAny,
+    HasAnyCount,
+    HasFromList,
+    HasFromListUnique,
+    HasGroup,
+    HasGroupUnique,
+    Or,
+    Rule,
+    True_,
+)
+from test.general import setup_solo_multiworld
+from test.param import classvar_matrix
+from worlds.AutoWorld import AutoWorldRegister, World
+
+
+class CachedCollectionState(CollectionState):
+    rule_builder_cache: dict[int, dict[int, bool]]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+class ToggleOption(Toggle):
+    auto_display_name = True
+
+
+class ChoiceOption(Choice):
+    auto_display_name = True
+    option_first = 0
+    option_second = 1
+    option_third = 2
+    default = 0
+
+
+class FreeTextOption(FreeText):
+    auto_display_name = True
+
+
+class SetOption(OptionSet):
+    auto_display_name = True
+    valid_keys: ClassVar[set[str]] = {"one", "two", "three"}  # pyright: ignore[reportIncompatibleVariableOverride]
+
+
+@dataclass
+class RuleBuilderOptions(PerGameCommonOptions):
+    toggle_option: ToggleOption
+    choice_option: ChoiceOption
+    text_option: FreeTextOption
+    set_option: SetOption
+
+
+GAME_NAME = "Rule Builder Test Game"
+LOC_COUNT = 20
+
+
+class RuleBuilderItem(Item):
+    game = GAME_NAME
+
+
+class RuleBuilderLocation(Location):
+    game = GAME_NAME
+
+
+class RuleBuilderTestCase(unittest.TestCase):
+    old_world_types: dict[str, type[World]]  # pyright: ignore[reportUninitializedInstanceVariable]
+    world_cls: type[World]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+    @override
+    def setUp(self) -> None:
+        self.old_world_types = AutoWorldRegister.world_types.copy()
+        self._create_world_class()
+
+    @override
+    def tearDown(self) -> None:
+        AutoWorldRegister.world_types = self.old_world_types
+        assert GAME_NAME not in AutoWorldRegister.world_types
+
+    def _create_world_class(self) -> None:
+        class RuleBuilderWorld(World):
+            game = GAME_NAME
+            item_name_to_id: ClassVar = {f"Item {i}": i for i in range(1, LOC_COUNT + 1)}
+            location_name_to_id: ClassVar = {f"Location {i}": i for i in range(1, LOC_COUNT + 1)}
+            item_name_groups: ClassVar = {
+                "Group 1": {"Item 1", "Item 2", "Item 3"},
+                "Group 2": {"Item 4", "Item 5"},
+            }
+            hidden = True
+            options_dataclass = RuleBuilderOptions
+            options: RuleBuilderOptions  # pyright: ignore[reportIncompatibleVariableOverride]
+            origin_region_name = "Region 1"
+
+            @override
+            def create_item(self, name: str) -> RuleBuilderItem:
+                classification = ItemClassification.filler if name == "Filler" else ItemClassification.progression
+                return RuleBuilderItem(name, classification, self.item_name_to_id[name], self.player)
+
+            @override
+            def get_filler_item_name(self) -> str:
+                return "Filler"
+
+        self.world_cls = RuleBuilderWorld
+
+
+class CachedRuleBuilderTestCase(RuleBuilderTestCase):
+    @override
+    def _create_world_class(self) -> None:
+        class RuleBuilderWorld(CachedRuleBuilderWorld):
+            game = GAME_NAME
+            item_name_to_id: ClassVar = {f"Item {i}": i for i in range(1, LOC_COUNT + 1)}
+            location_name_to_id: ClassVar = {f"Location {i}": i for i in range(1, LOC_COUNT + 1)}
+            item_name_groups: ClassVar = {
+                "Group 1": {"Item 1", "Item 2", "Item 3"},
+                "Group 2": {"Item 4", "Item 5"},
+            }
+            hidden = True
+            options_dataclass = RuleBuilderOptions
+            options: RuleBuilderOptions  # pyright: ignore[reportIncompatibleVariableOverride]
+            origin_region_name = "Region 1"
+
+            @override
+            def create_item(self, name: str) -> RuleBuilderItem:
+                classification = ItemClassification.filler if name == "Filler" else ItemClassification.progression
+                return RuleBuilderItem(name, classification, self.item_name_to_id[name], self.player)
+
+            @override
+            def get_filler_item_name(self) -> str:
+                return "Filler"
+
+        self.world_cls = RuleBuilderWorld
+
+
+@classvar_matrix(
+    rules=(
+        (
+            And(Has("A", 1), Has("A", 2)),
+            Has.Resolved("A", 2, player=1),
+        ),
+        (
+            And(Has("A"), HasAll("B", "C")),
+            HasAll.Resolved(("A", "B", "C"), player=1),
+        ),
+        (
+            Or(Has("A", 1), Has("A", 2)),
+            Has.Resolved("A", 1, player=1),
+        ),
+        (
+            Or(Has("A"), HasAny("B", "C")),
+            HasAny.Resolved(("A", "B", "C"), player=1),
+        ),
+        (
+            Or(HasAll("A"), HasAll("A", "A")),
+            Has.Resolved("A", player=1),
+        ),
+        (
+            Or(
+                Has("A"),
+                Or(
+                    True_(options=[OptionFilter(ChoiceOption, 0)]),
+                    HasAny("B", "C", options=[OptionFilter(ChoiceOption, 0, "gt")]),
+                    options=[OptionFilter(ToggleOption, 1)],
+                ),
+                And(Has("D"), Has("E"), options=[OptionFilter(ToggleOption, 0)]),
+                Has("F"),
+            ),
+            Or.Resolved(
+                (
+                    HasAll.Resolved(("D", "E"), player=1),
+                    HasAny.Resolved(("A", "F"), player=1),
+                ),
+                player=1,
+            ),
+        ),
+        (
+            Or(
+                Has("A"),
+                Or(
+                    True_(options=[OptionFilter(ChoiceOption, 0, "gt")]),
+                    HasAny("B", "C", options=[OptionFilter(ChoiceOption, 0)]),
+                    options=[OptionFilter(ToggleOption, 0)],
+                ),
+                And(Has("D"), Has("E"), options=[OptionFilter(ToggleOption, 1)]),
+                Has("F"),
+            ),
+            HasAny.Resolved(("A", "B", "C", "F"), player=1),
+        ),
+        (
+            And(Has("A"), True_()),
+            Has.Resolved("A", player=1),
+        ),
+        (
+            And(Has("A"), False_()),
+            False_.Resolved(player=1),
+        ),
+        (
+            Or(Has("A"), True_()),
+            True_.Resolved(player=1),
+        ),
+        (
+            Or(Has("A"), False_()),
+            Has.Resolved("A", player=1),
+        ),
+        (
+            And(Has("A"), HasAll("B", "C"), HasAllCounts({"D": 2, "E": 3})),
+            HasAllCounts.Resolved((("A", 1), ("B", 1), ("C", 1), ("D", 2), ("E", 3)), player=1),
+        ),
+        (
+            And(Has("A"), HasAll("B", "C"), HasAllCounts({"D": 1, "E": 1})),
+            HasAll.Resolved(("A", "B", "C", "D", "E"), player=1),
+        ),
+        (
+            Or(Has("A"), HasAny("B", "C"), HasAnyCount({"D": 2, "E": 3})),
+            HasAnyCount.Resolved((("A", 1), ("B", 1), ("C", 1), ("D", 2), ("E", 3)), player=1),
+        ),
+        (
+            Or(Has("A"), HasAny("B", "C"), HasAnyCount({"D": 1, "E": 1})),
+            HasAny.Resolved(("A", "B", "C", "D", "E"), player=1),
+        ),
+        (
+            And(HasAllCounts({"A": 1, "B": 2}), HasAllCounts({"A": 2, "B": 2})),
+            HasAllCounts.Resolved((("A", 2), ("B", 2)), player=1),
+        ),
+        (
+            Or(HasAnyCount({"A": 1, "B": 2}), HasAnyCount({"A": 2, "B": 2})),
+            HasAnyCount.Resolved((("A", 1), ("B", 2)), player=1),
+        ),
+    )
+)
+class TestSimplify(RuleBuilderTestCase):
+    rules: ClassVar[tuple[Rule[Any], Rule.Resolved]]
+
+    def test_simplify(self) -> None:
+        multiworld = setup_solo_multiworld(self.world_cls, steps=("generate_early",), seed=0)
+        world = multiworld.worlds[1]
+        rule, expected = self.rules
+        resolved_rule = rule.resolve(world)
+        self.assertEqual(resolved_rule, expected, f"\n{resolved_rule}\n{expected}")
+
+
+@classvar_matrix(
+    cases=(
+        (ToggleOption, 0, "eq", 0, True),
+        (ToggleOption, 0, "eq", 1, False),
+        (ToggleOption, 0, "ne", 0, False),
+        (ToggleOption, 0, "ne", 1, True),
+        (ChoiceOption, 0, "gt", 1, False),
+        (ChoiceOption, 1, "gt", 1, False),
+        (ChoiceOption, 2, "gt", 1, True),
+        (ChoiceOption, 0, "ge", "second", False),
+        (ChoiceOption, 1, "ge", "second", True),
+        (ChoiceOption, 1, "in", (0, 1), True),
+        (ChoiceOption, 1, "in", ("first", "second"), True),
+        (FreeTextOption, "no", "eq", "yes", False),
+        (FreeTextOption, "yes", "eq", "yes", True),
+        (SetOption, ("one", "two"), "contains", "three", False),
+        (SetOption, ("one", "two"), "contains", "two", True),
+    )
+)
+class TestOptions(RuleBuilderTestCase):
+    cases: ClassVar[tuple[type[Option[Any]], Any, Operator, Any, bool]]
+
+    def test_option_resolution(self) -> None:
+        multiworld = setup_solo_multiworld(self.world_cls, steps=("generate_early",), seed=0)
+        world = multiworld.worlds[1]
+        option_cls, world_value, operator, filter_value, expected = self.cases
+
+        for field in fields(world.options_dataclass):
+            if field.type is option_cls:
+                setattr(world.options, field.name, option_cls.from_any(world_value))
+                break
+
+        option_filter = OptionFilter(option_cls, filter_value, operator)
+        result = option_filter.check(world.options)
+        self.assertEqual(result, expected, f"Expected {result} for option={option_filter} with value={world_value}")
+
+
+class TestFilteredResolution(RuleBuilderTestCase):
+    def test_filtered_resolution(self) -> None:
+        multiworld = setup_solo_multiworld(self.world_cls, steps=("generate_early",), seed=0)
+        world = multiworld.worlds[1]
+
+        rule_and_false = Has("A") & Has("B", options=[OptionFilter(ToggleOption, 1)], filtered_resolution=False)
+        rule_and_true = Has("A") & Has("B", options=[OptionFilter(ToggleOption, 1)], filtered_resolution=True)
+        rule_or_false = Has("A") | Has("B", options=[OptionFilter(ToggleOption, 1)], filtered_resolution=False)
+        rule_or_true = Has("A") | Has("B", options=[OptionFilter(ToggleOption, 1)], filtered_resolution=True)
+
+        # option fails check
+        world.options.toggle_option.value = 0  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+        self.assertEqual(rule_and_false.resolve(world), False_.Resolved(player=1))
+        self.assertEqual(rule_and_true.resolve(world), Has.Resolved("A", player=1))
+        self.assertEqual(rule_or_false.resolve(world), Has.Resolved("A", player=1))
+        self.assertEqual(rule_or_true.resolve(world), True_.Resolved(player=1))
+
+        # option passes check
+        world.options.toggle_option.value = 1  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+        self.assertEqual(rule_and_false.resolve(world), HasAll.Resolved(("A", "B"), player=1))
+        self.assertEqual(rule_and_true.resolve(world), HasAll.Resolved(("A", "B"), player=1))
+        self.assertEqual(rule_or_false.resolve(world), HasAny.Resolved(("A", "B"), player=1))
+        self.assertEqual(rule_or_true.resolve(world), HasAny.Resolved(("A", "B"), player=1))
+
+
+@classvar_matrix(
+    rules=(
+        (
+            Has("A") & Has("B"),
+            And(Has("A"), Has("B")),
+        ),
+        (
+            Has("A") | Has("B"),
+            Or(Has("A"), Has("B")),
+        ),
+        (
+            And(Has("A")) & Has("B"),
+            And(Has("A"), Has("B")),
+        ),
+        (
+            And(Has("A"), Has("B")) & And(Has("C")),
+            And(Has("A"), Has("B"), Has("C")),
+        ),
+        (
+            And(Has("A"), Has("B")) | Or(Has("C"), Has("D")),
+            Or(And(Has("A"), Has("B")), Has("C"), Has("D")),
+        ),
+        (
+            Or(Has("A")) | Or(Has("B"), options=[OptionFilter(ToggleOption, 1)]),
+            Or(Or(Has("A")), Or(Has("B"), options=[OptionFilter(ToggleOption, 1)])),
+        ),
+        (
+            (
+                And(Has("A"), options=[OptionFilter(ToggleOption, 1)])
+                & And(Has("B"), options=[OptionFilter(ToggleOption, 1)])
+            ),
+            And(Has("A"), Has("B"), options=[OptionFilter(ToggleOption, 1)]),
+        ),
+        (
+            Has("A") & Has("B") & Has("C"),
+            And(Has("A"), Has("B"), Has("C")),
+        ),
+        (
+            Has("A") & Has("B") | Has("C") & Has("D"),
+            Or(And(Has("A"), Has("B")), And(Has("C"), Has("D"))),
+        ),
+        (
+            Has("A") | Or(Has("B"), options=[OptionFilter(ToggleOption, 1)]),
+            Or(Has("A"), Or(Has("B"), options=[OptionFilter(ToggleOption, 1)])),
+        ),
+        (
+            Has("A") & And(Has("B"), options=[OptionFilter(ToggleOption, 1)]),
+            And(Has("A"), And(Has("B"), options=[OptionFilter(ToggleOption, 1)])),
+        ),
+        (
+            (Has("A") | Has("B")) & [OptionFilter(ToggleOption, 1)],
+            Filtered(Or(Has("A"), Has("B")), options=[OptionFilter(ToggleOption, 1)]),
+        ),
+        (
+            (Has("A") | Has("B")) | OptionFilter(ToggleOption, 1),
+            Or(Or(Has("A"), Has("B")), True_(options=[OptionFilter(ToggleOption, 1)])),
+        ),
+        (
+            OptionFilter(ToggleOption, 1) & (Has("A") | Has("B")),
+            Filtered(Or(Has("A"), Has("B")), options=[OptionFilter(ToggleOption, 1)]),
+        ),
+        (
+            [OptionFilter(ToggleOption, 1)] | (Has("A") | Has("B")),
+            Or(Or(Has("A"), Has("B")), True_(options=[OptionFilter(ToggleOption, 1)])),
+        ),
+    )
+)
+class TestComposition(unittest.TestCase):
+    rules: ClassVar[tuple[Rule[Any], Rule[Any]]]
+
+    def test_composition(self) -> None:
+        combined_rule, expected = self.rules
+        self.assertEqual(combined_rule, expected, str(combined_rule))
+
+
+class TestHashes(RuleBuilderTestCase):
+    def test_and_hash(self) -> None:
+        rule1 = And.Resolved((True_.Resolved(player=1),), player=1)
+        rule2 = And.Resolved((True_.Resolved(player=1),), player=1)
+        rule3 = Or.Resolved((True_.Resolved(player=1),), player=1)
+
+        self.assertEqual(hash(rule1), hash(rule2))
+        self.assertNotEqual(hash(rule1), hash(rule3))
+
+    def test_has_all_hash(self) -> None:
+        multiworld = setup_solo_multiworld(self.world_cls, steps=("generate_early",), seed=0)
+        world = multiworld.worlds[1]
+        rule1 = HasAll("1", "2")
+        rule2 = HasAll("2", "2", "2", "1")
+        self.assertEqual(hash(rule1.resolve(world)), hash(rule2.resolve(world)))
+
+
+class TestCaching(CachedRuleBuilderTestCase):
+    multiworld: MultiWorld  # pyright: ignore[reportUninitializedInstanceVariable]
+    world: World  # pyright: ignore[reportUninitializedInstanceVariable]
+    state: CachedCollectionState  # pyright: ignore[reportUninitializedInstanceVariable]
+    player: int = 1
+
+    @override
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.multiworld = setup_solo_multiworld(self.world_cls, seed=0)
+        world = self.multiworld.worlds[1]
+        self.world = world
+        self.state = cast(CachedCollectionState, self.multiworld.state)
+
+        region1 = Region("Region 1", self.player, self.multiworld)
+        region2 = Region("Region 2", self.player, self.multiworld)
+        region3 = Region("Region 3", self.player, self.multiworld)
+        self.multiworld.regions.extend([region1, region2, region3])
+
+        region1.add_locations({"Location 1": 1, "Location 2": 2, "Location 6": 6}, RuleBuilderLocation)
+        region2.add_locations({"Location 3": 3, "Location 4": 4}, RuleBuilderLocation)
+        region3.add_locations({"Location 5": 5}, RuleBuilderLocation)
+
+        world.create_entrance(region1, region2, Has("Item 1"))
+        world.create_entrance(region1, region3, HasAny("Item 3", "Item 4"))
+        world.set_rule(world.get_location("Location 2"), CanReachRegion("Region 2") & Has("Item 2"))
+        world.set_rule(world.get_location("Location 4"), HasAll("Item 2", "Item 3"))
+        world.set_rule(world.get_location("Location 5"), CanReachLocation("Location 4"))
+        world.set_rule(world.get_location("Location 6"), CanReachEntrance("Region 1 -> Region 2") & Has("Item 2"))
+
+        for i in range(1, LOC_COUNT + 1):
+            self.multiworld.itempool.append(world.create_item(f"Item {i}"))
+
+        world.register_rule_builder_dependencies()
+
+    def test_item_cache_busting(self) -> None:
+        location = self.world.get_location("Location 4")
+        self.state.collect(self.world.create_item("Item 1"))  # access to region 2
+        self.state.collect(self.world.create_item("Item 2"))  # item directly needed
+        self.assertFalse(location.can_reach(self.state))  # populates cache
+        self.assertFalse(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+        self.state.collect(self.world.create_item("Item 3"))  # clears cache, item directly needed
+        self.assertNotIn(id(location.access_rule), self.state.rule_builder_cache[1])
+        self.assertTrue(location.can_reach(self.state))
+        self.assertTrue(self.state.rule_builder_cache[1][id(location.access_rule)])
+        self.state.collect(self.world.create_item("Item 3"))  # does not clear cache as rule is already true
+        self.assertTrue(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+    def test_region_cache_busting(self) -> None:
+        location = self.world.get_location("Location 2")
+        self.state.collect(self.world.create_item("Item 2"))  # item directly needed for location rule
+        self.assertFalse(location.can_reach(self.state))  # populates cache
+        self.assertFalse(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+        self.state.collect(self.world.create_item("Item 1"))  # clears cache, item only needed for region 2 access
+        # cache gets cleared during the can_reach
+        self.assertTrue(location.can_reach(self.state))
+        self.assertTrue(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+    def test_location_cache_busting(self) -> None:
+        location = self.world.get_location("Location 5")
+        self.state.collect(self.world.create_item("Item 1"))  # access to region 2
+        self.state.collect(self.world.create_item("Item 3"))  # access to region 3
+        self.assertFalse(location.can_reach(self.state))  # populates cache
+        self.assertFalse(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+        self.state.collect(self.world.create_item("Item 2"))  # clears cache, item only needed for location 2 access
+        self.assertNotIn(id(location.access_rule), self.state.rule_builder_cache[1])
+        self.assertTrue(location.can_reach(self.state))
+
+    def test_entrance_cache_busting(self) -> None:
+        location = self.world.get_location("Location 6")
+        self.state.collect(self.world.create_item("Item 2"))  # item directly needed for location rule
+        self.assertFalse(location.can_reach(self.state))  # populates cache
+        self.assertFalse(self.state.rule_builder_cache[1][id(location.access_rule)])
+
+        self.state.collect(self.world.create_item("Item 1"))  # clears cache, item only needed for entrance access
+        self.assertNotIn(id(location.access_rule), self.state.rule_builder_cache[1])
+        self.assertTrue(location.can_reach(self.state))
+
+    def test_has_skips_cache(self) -> None:
+        entrance = self.world.get_entrance("Region 1 -> Region 2")
+        self.assertFalse(entrance.can_reach(self.state))  # does not populates cache
+        self.assertNotIn(id(entrance.access_rule), self.state.rule_builder_cache[1])
+
+        self.state.collect(self.world.create_item("Item 1"))  # no need to clear cache, item directly needed
+        self.assertNotIn(id(entrance.access_rule), self.state.rule_builder_cache[1])
+        self.assertTrue(entrance.can_reach(self.state))
+
+
+class TestCacheDisabled(RuleBuilderTestCase):
+    multiworld: MultiWorld  # pyright: ignore[reportUninitializedInstanceVariable]
+    world: World  # pyright: ignore[reportUninitializedInstanceVariable]
+    state: CachedCollectionState  # pyright: ignore[reportUninitializedInstanceVariable]
+    player: int = 1
+
+    @override
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.multiworld = setup_solo_multiworld(self.world_cls, seed=0)
+        world = self.multiworld.worlds[1]
+        self.world = world
+        self.state = cast(CachedCollectionState, self.multiworld.state)
+
+        region1 = Region("Region 1", self.player, self.multiworld)
+        region2 = Region("Region 2", self.player, self.multiworld)
+        region3 = Region("Region 3", self.player, self.multiworld)
+        self.multiworld.regions.extend([region1, region2, region3])
+
+        region1.add_locations({"Location 1": 1, "Location 2": 2, "Location 6": 6}, RuleBuilderLocation)
+        region2.add_locations({"Location 3": 3, "Location 4": 4}, RuleBuilderLocation)
+        region3.add_locations({"Location 5": 5}, RuleBuilderLocation)
+
+        world.create_entrance(region1, region2, Has("Item 1"))
+        world.create_entrance(region1, region3, HasAny("Item 3", "Item 4"))
+        world.set_rule(world.get_location("Location 2"), CanReachRegion("Region 2") & Has("Item 2"))
+        world.set_rule(world.get_location("Location 4"), HasAll("Item 2", "Item 3"))
+        world.set_rule(world.get_location("Location 5"), CanReachLocation("Location 4"))
+        world.set_rule(world.get_location("Location 6"), CanReachEntrance("Region 1 -> Region 2") & Has("Item 2"))
+
+        for i in range(1, LOC_COUNT + 1):
+            self.multiworld.itempool.append(world.create_item(f"Item {i}"))
+
+    def test_item_logic(self) -> None:
+        entrance = self.world.get_entrance("Region 1 -> Region 2")
+        self.assertFalse(entrance.can_reach(self.state))
+        self.assertFalse(self.state.rule_builder_cache[1])
+
+        self.state.collect(self.world.create_item("Item 1"))  # item directly needed
+        self.assertFalse(self.state.rule_builder_cache[1])
+        self.assertTrue(entrance.can_reach(self.state))
+
+    def test_region_logic(self) -> None:
+        location = self.world.get_location("Location 2")
+        self.state.collect(self.world.create_item("Item 2"))  # item directly needed for location rule
+        self.assertFalse(location.can_reach(self.state))
+        self.assertFalse(self.state.rule_builder_cache[1])
+
+        self.state.collect(self.world.create_item("Item 1"))  # item only needed for region 2 access
+        self.assertTrue(location.can_reach(self.state))
+        self.assertFalse(self.state.rule_builder_cache[1])
+
+    def test_location_logic(self) -> None:
+        location = self.world.get_location("Location 5")
+        self.state.collect(self.world.create_item("Item 1"))  # access to region 2
+        self.state.collect(self.world.create_item("Item 3"))  # access to region 3
+        self.assertFalse(location.can_reach(self.state))
+        self.assertFalse(self.state.rule_builder_cache[1])
+
+        self.state.collect(self.world.create_item("Item 2"))  # item only needed for location 2 access
+        self.assertFalse(self.state.rule_builder_cache[1])
+        self.assertTrue(location.can_reach(self.state))
+
+    def test_entrance_logic(self) -> None:
+        location = self.world.get_location("Location 6")
+        self.state.collect(self.world.create_item("Item 2"))  # item directly needed for location rule
+        self.assertFalse(location.can_reach(self.state))
+        self.assertFalse(self.state.rule_builder_cache[1])
+
+        self.state.collect(self.world.create_item("Item 1"))  # item only needed for entrance access
+        self.assertFalse(self.state.rule_builder_cache[1])
+        self.assertTrue(location.can_reach(self.state))
+
+
+class TestRules(RuleBuilderTestCase):
+    multiworld: MultiWorld  # pyright: ignore[reportUninitializedInstanceVariable]
+    world: World  # pyright: ignore[reportUninitializedInstanceVariable]
+    state: CollectionState  # pyright: ignore[reportUninitializedInstanceVariable]
+    player: int = 1
+
+    @override
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.multiworld = setup_solo_multiworld(self.world_cls, seed=0)
+        world = self.multiworld.worlds[1]
+        self.world = world
+        self.state = self.multiworld.state
+
+    def test_true(self) -> None:
+        rule = True_()
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertTrue(resolved_rule(self.state))
+
+    def test_false(self) -> None:
+        rule = False_()
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has(self) -> None:
+        rule = Has("Item 1")
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+        item = self.world.create_item("Item 1")
+        self.state.collect(item)
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(item)
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_all(self) -> None:
+        rule = HasAll("Item 1", "Item 2")
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+        item1 = self.world.create_item("Item 1")
+        self.state.collect(item1)
+        self.assertFalse(resolved_rule(self.state))
+        item2 = self.world.create_item("Item 2")
+        self.state.collect(item2)
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(item1)
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_any(self) -> None:
+        item_names = ("Item 1", "Item 2")
+        rule = HasAny(*item_names)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+
+        for item_name in item_names:
+            item = self.world.create_item(item_name)
+            self.state.collect(item)
+            self.assertTrue(resolved_rule(self.state))
+            self.state.remove(item)
+            self.assertFalse(resolved_rule(self.state))
+
+    def test_has_all_counts(self) -> None:
+        rule = HasAllCounts({"Item 1": 1, "Item 2": 2})
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+        item1 = self.world.create_item("Item 1")
+        self.state.collect(item1)
+        self.assertFalse(resolved_rule(self.state))
+        item2 = self.world.create_item("Item 2")
+        self.state.collect(item2)
+        self.assertFalse(resolved_rule(self.state))
+        item2 = self.world.create_item("Item 2")
+        self.state.collect(item2)
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(item2)
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_any_count(self) -> None:
+        item_counts = {"Item 1": 1, "Item 2": 2}
+        rule = HasAnyCount(item_counts)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+
+        for item_name, count in item_counts.items():
+            item = self.world.create_item(item_name)
+            for _ in range(count):
+                self.assertFalse(resolved_rule(self.state))
+                self.state.collect(item)
+            self.assertTrue(resolved_rule(self.state))
+            self.state.remove(item)
+            self.assertFalse(resolved_rule(self.state))
+
+    def test_has_from_list(self) -> None:
+        item_names = ("Item 1", "Item 2", "Item 3")
+        rule = HasFromList(*item_names, count=2)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+
+        items: list[Item] = []
+        for i, item_name in enumerate(item_names):
+            item = self.world.create_item(item_name)
+            self.state.collect(item)
+            items.append(item)
+            if i == 0:
+                self.assertFalse(resolved_rule(self.state))
+            else:
+                self.assertTrue(resolved_rule(self.state))
+
+        for i in range(2):
+            self.state.remove(items[i])
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_from_list_unique(self) -> None:
+        item_names = ("Item 1", "Item 1", "Item 2")
+        rule = HasFromListUnique(*item_names, count=2)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+        self.assertFalse(resolved_rule(self.state))
+
+        items: list[Item] = []
+        for i, item_name in enumerate(item_names):
+            item = self.world.create_item(item_name)
+            self.state.collect(item)
+            items.append(item)
+            if i < 2:
+                self.assertFalse(resolved_rule(self.state))
+            else:
+                self.assertTrue(resolved_rule(self.state))
+
+        self.state.remove(items[0])
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(items[1])
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_group(self) -> None:
+        rule = HasGroup("Group 1", count=2)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+
+        items: list[Item] = []
+        for item_name in ("Item 1", "Item 2"):
+            self.assertFalse(resolved_rule(self.state))
+            item = self.world.create_item(item_name)
+            self.state.collect(item)
+            items.append(item)
+
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(items[0])
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_has_group_unique(self) -> None:
+        rule = HasGroupUnique("Group 1", count=2)
+        resolved_rule = rule.resolve(self.world)
+        self.world.register_rule_dependencies(resolved_rule)
+
+        items: list[Item] = []
+        for item_name in ("Item 1", "Item 1", "Item 2"):
+            self.assertFalse(resolved_rule(self.state))
+            item = self.world.create_item(item_name)
+            self.state.collect(item)
+            items.append(item)
+
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(items[0])
+        self.assertTrue(resolved_rule(self.state))
+        self.state.remove(items[1])
+        self.assertFalse(resolved_rule(self.state))
+
+    def test_completion_rule(self) -> None:
+        rule = Has("Item 1")
+        self.world.set_completion_rule(rule)
+        self.assertEqual(self.multiworld.can_beat_game(self.state), False)
+        self.state.collect(self.world.create_item("Item 1"))
+        self.assertEqual(self.multiworld.can_beat_game(self.state), True)
+
+
+class TestSerialization(RuleBuilderTestCase):
+    maxDiff: int | None = None
+
+    rule: ClassVar[Rule[Any]] = And(
+        Or(
+            Has("i1", count=4),
+            HasFromList("i2", "i3", "i4", count=2),
+            HasAnyCount({"i5": 2, "i6": 3}),
+            options=[OptionFilter(ToggleOption, 0)],
+        ),
+        Or(
+            HasAll("i7", "i8"),
+            HasAllCounts(
+                {"i9": 1, "i10": 5},
+                options=[OptionFilter(ToggleOption, 1, operator="ne")],
+                filtered_resolution=True,
+            ),
+            CanReachRegion("r1"),
+            HasGroup("g1"),
+        ),
+        And(
+            HasAny("i11", "i12"),
+            CanReachLocation("l1", "r2"),
+            HasFromListUnique("i13", "i14"),
+            options=[
+                OptionFilter(ToggleOption, ToggleOption.option_false),
+                OptionFilter(ChoiceOption, ChoiceOption.option_second, "ge"),
+            ],
+        ),
+        CanReachEntrance("e1"),
+        HasGroupUnique("g2", count=5),
+    )
+
+    rule_dict: ClassVar[dict[str, Any]] = {
+        "rule": "And",
+        "options": [],
+        "filtered_resolution": False,
+        "children": [
+            {
+                "rule": "Or",
+                "options": [
+                    {
+                        "option": "test.general.test_rule_builder.ToggleOption",
+                        "value": 0,
+                        "operator": "eq",
+                    },
+                ],
+                "filtered_resolution": False,
+                "children": [
+                    {
+                        "rule": "Has",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_name": "i1", "count": 4},
+                    },
+                    {
+                        "rule": "HasFromList",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_names": ("i2", "i3", "i4"), "count": 2},
+                    },
+                    {
+                        "rule": "HasAnyCount",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_counts": {"i5": 2, "i6": 3}},
+                    },
+                ],
+            },
+            {
+                "rule": "Or",
+                "options": [],
+                "filtered_resolution": False,
+                "children": [
+                    {
+                        "rule": "HasAll",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_names": ("i7", "i8")},
+                    },
+                    {
+                        "rule": "HasAllCounts",
+                        "options": [
+                            {
+                                "option": "test.general.test_rule_builder.ToggleOption",
+                                "value": 1,
+                                "operator": "ne",
+                            },
+                        ],
+                        "filtered_resolution": True,
+                        "args": {"item_counts": {"i9": 1, "i10": 5}},
+                    },
+                    {
+                        "rule": "CanReachRegion",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"region_name": "r1"},
+                    },
+                    {
+                        "rule": "HasGroup",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_name_group": "g1", "count": 1},
+                    },
+                ],
+            },
+            {
+                "rule": "And",
+                "options": [
+                    {
+                        "option": "test.general.test_rule_builder.ToggleOption",
+                        "value": 0,
+                        "operator": "eq",
+                    },
+                    {
+                        "option": "test.general.test_rule_builder.ChoiceOption",
+                        "value": 1,
+                        "operator": "ge",
+                    },
+                ],
+                "filtered_resolution": False,
+                "children": [
+                    {
+                        "rule": "HasAny",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_names": ("i11", "i12")},
+                    },
+                    {
+                        "rule": "CanReachLocation",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"location_name": "l1", "parent_region_name": "r2", "skip_indirect_connection": False},
+                    },
+                    {
+                        "rule": "HasFromListUnique",
+                        "options": [],
+                        "filtered_resolution": False,
+                        "args": {"item_names": ("i13", "i14"), "count": 1},
+                    },
+                ],
+            },
+            {
+                "rule": "CanReachEntrance",
+                "options": [],
+                "filtered_resolution": False,
+                "args": {"entrance_name": "e1", "parent_region_name": ""},
+            },
+            {
+                "rule": "HasGroupUnique",
+                "options": [],
+                "filtered_resolution": False,
+                "args": {"item_name_group": "g2", "count": 5},
+            },
+        ],
+    }
+
+    def test_serialize(self) -> None:
+        serialized_rule = self.rule.to_dict()
+        self.assertDictEqual(serialized_rule, self.rule_dict)
+
+    def test_deserialize(self) -> None:
+        multiworld = setup_solo_multiworld(self.world_cls, steps=(), seed=0)
+        world = multiworld.worlds[1]
+        deserialized_rule = world.rule_from_dict(self.rule_dict)
+        self.assertEqual(deserialized_rule, self.rule, str(deserialized_rule))
+
+
+class TestExplain(RuleBuilderTestCase):
+    multiworld: MultiWorld  # pyright: ignore[reportUninitializedInstanceVariable]
+    world: World  # pyright: ignore[reportUninitializedInstanceVariable]
+    state: CollectionState  # pyright: ignore[reportUninitializedInstanceVariable]
+    player: int = 1
+
+    resolved_rule: ClassVar[Rule.Resolved] = And.Resolved(
+        (
+            Or.Resolved(
+                (
+                    Has.Resolved("Item 1", count=4, player=1),
+                    HasAll.Resolved(("Item 2", "Item 3"), player=1),
+                    HasAny.Resolved(("Item 4", "Item 5"), player=1),
+                ),
+                player=1,
+            ),
+            HasAllCounts.Resolved((("Item 6", 1), ("Item 7", 5)), player=1),
+            HasAnyCount.Resolved((("Item 8", 2), ("Item 9", 3)), player=1),
+            HasFromList.Resolved(("Item 10", "Item 11", "Item 12"), count=2, player=1),
+            HasFromListUnique.Resolved(("Item 13", "Item 14"), player=1),
+            HasGroup.Resolved("Group 1", ("Item 15", "Item 16", "Item 17"), player=1),
+            HasGroupUnique.Resolved("Group 2", ("Item 18", "Item 19"), count=2, player=1),
+            CanReachRegion.Resolved("Region 2", player=1),
+            CanReachLocation.Resolved("Location 2", "Region 2", player=1),
+            CanReachEntrance.Resolved("Entrance 2", "Region 2", player=1),
+            True_.Resolved(player=1),
+            False_.Resolved(player=1),
+        ),
+        player=1,
+    )
+
+    @override
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.multiworld = setup_solo_multiworld(self.world_cls, seed=0)
+        world = self.multiworld.worlds[1]
+        self.world = world
+        self.state = self.multiworld.state
+
+        region1 = Region("Region 1", self.player, self.multiworld)
+        region2 = Region("Region 2", self.player, self.multiworld)
+        region3 = Region("Region 3", self.player, self.multiworld)
+        self.multiworld.regions.extend([region1, region2, region3])
+
+        region2.add_locations({"Location 2": 1}, RuleBuilderLocation)
+        world.create_entrance(region1, region2, Has("Item 1"))
+        world.create_entrance(region2, region3, name="Entrance 2")
+
+    def _collect_all(self) -> None:
+        for i in range(1, LOC_COUNT + 1):
+            for _ in range(10):
+                item = self.world.create_item(f"Item {i}")
+                self.state.collect(item)
+
+    def test_explain_json_with_state_no_items(self) -> None:
+        expected: list[JSONMessagePart] = [
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "Missing "},
+            {"type": "color", "color": "cyan", "text": "4"},
+            {"type": "text", "text": "x "},
+            {"type": "color", "color": "salmon", "text": "Item 1"},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Missing "},
+            {"type": "color", "color": "cyan", "text": "some"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 2"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 3"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Missing "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 4"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 5"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Missing "},
+            {"type": "color", "color": "cyan", "text": "some"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 6"},
+            {"type": "text", "text": " x1"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 7"},
+            {"type": "text", "text": " x5"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Missing "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 8"},
+            {"type": "text", "text": " x2"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 9"},
+            {"type": "text", "text": " x3"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "salmon", "text": "0/2"},
+            {"type": "text", "text": " items from ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 10"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 11"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 12"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "salmon", "text": "0/1"},
+            {"type": "text", "text": " unique items from ("},
+            {"type": "text", "text": "Missing: "},
+            {"type": "color", "color": "salmon", "text": "Item 13"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "salmon", "text": "Item 14"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "salmon", "text": "0/1"},
+            {"type": "text", "text": " items from "},
+            {"type": "color", "color": "cyan", "text": "Group 1"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "salmon", "text": "0/2"},
+            {"type": "text", "text": " unique items from "},
+            {"type": "color", "color": "cyan", "text": "Group 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Cannot reach region "},
+            {"type": "color", "color": "yellow", "text": "Region 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Cannot reach location "},
+            {"type": "location_name", "text": "Location 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Cannot reach entrance "},
+            {"type": "entrance_name", "text": "Entrance 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "green", "text": "True"},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "salmon", "text": "False"},
+            {"type": "text", "text": ")"},
+        ]
+        assert self.resolved_rule.explain_json(self.state) == expected
+
+    def test_explain_json_with_state_all_items(self) -> None:
+        self._collect_all()
+
+        expected: list[JSONMessagePart] = [
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "4"},
+            {"type": "text", "text": "x "},
+            {"type": "color", "color": "green", "text": "Item 1"},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 2"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 3"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "some"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 4"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 5"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 6"},
+            {"type": "text", "text": " x1"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 7"},
+            {"type": "text", "text": " x5"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "some"},
+            {"type": "text", "text": " of ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 8"},
+            {"type": "text", "text": " x2"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 9"},
+            {"type": "text", "text": " x3"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "green", "text": "30/2"},
+            {"type": "text", "text": " items from ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 10"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 11"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 12"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "green", "text": "2/1"},
+            {"type": "text", "text": " unique items from ("},
+            {"type": "text", "text": "Found: "},
+            {"type": "color", "color": "green", "text": "Item 13"},
+            {"type": "text", "text": ", "},
+            {"type": "color", "color": "green", "text": "Item 14"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "green", "text": "30/1"},
+            {"type": "text", "text": " items from "},
+            {"type": "color", "color": "cyan", "text": "Group 1"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "green", "text": "2/2"},
+            {"type": "text", "text": " unique items from "},
+            {"type": "color", "color": "cyan", "text": "Group 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Reached region "},
+            {"type": "color", "color": "yellow", "text": "Region 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Reached location "},
+            {"type": "location_name", "text": "Location 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Reached entrance "},
+            {"type": "entrance_name", "text": "Entrance 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "green", "text": "True"},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "salmon", "text": "False"},
+            {"type": "text", "text": ")"},
+        ]
+        assert self.resolved_rule.explain_json(self.state) == expected
+
+    def test_explain_json_without_state(self) -> None:
+        expected: list[JSONMessagePart] = [
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "("},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "4"},
+            {"type": "text", "text": "x "},
+            {"type": "item_name", "flags": 1, "text": "Item 1", "player": 1},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "item_name", "flags": 1, "text": "Item 2", "player": 1},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 3", "player": 1},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " | "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "any"},
+            {"type": "text", "text": " of ("},
+            {"type": "item_name", "flags": 1, "text": "Item 4", "player": 1},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 5", "player": 1},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "all"},
+            {"type": "text", "text": " of ("},
+            {"type": "item_name", "flags": 1, "text": "Item 6", "player": 1},
+            {"type": "text", "text": " x1"},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 7", "player": 1},
+            {"type": "text", "text": " x5"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "any"},
+            {"type": "text", "text": " of ("},
+            {"type": "item_name", "flags": 1, "text": "Item 8", "player": 1},
+            {"type": "text", "text": " x2"},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 9", "player": 1},
+            {"type": "text", "text": " x3"},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "2"},
+            {"type": "text", "text": "x items from ("},
+            {"type": "item_name", "flags": 1, "text": "Item 10", "player": 1},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 11", "player": 1},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 12", "player": 1},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "1"},
+            {"type": "text", "text": "x unique items from ("},
+            {"type": "item_name", "flags": 1, "text": "Item 13", "player": 1},
+            {"type": "text", "text": ", "},
+            {"type": "item_name", "flags": 1, "text": "Item 14", "player": 1},
+            {"type": "text", "text": ")"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "1"},
+            {"type": "text", "text": " items from "},
+            {"type": "color", "color": "cyan", "text": "Group 1"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Has "},
+            {"type": "color", "color": "cyan", "text": "2"},
+            {"type": "text", "text": " unique items from "},
+            {"type": "color", "color": "cyan", "text": "Group 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Can reach region "},
+            {"type": "color", "color": "yellow", "text": "Region 2"},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Can reach location "},
+            {"type": "location_name", "text": "Location 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "text", "text": "Can reach entrance "},
+            {"type": "entrance_name", "text": "Entrance 2", "player": 1},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "green", "text": "True"},
+            {"type": "text", "text": " & "},
+            {"type": "color", "color": "salmon", "text": "False"},
+            {"type": "text", "text": ")"},
+        ]
+        assert self.resolved_rule.explain_json() == expected
+
+    def test_explain_str_with_state_no_items(self) -> None:
+        expected = (
+            "((Missing 4x Item 1",
+            "| Missing some of (Missing: Item 2, Item 3)",
+            "| Missing all of (Missing: Item 4, Item 5))",
+            "& Missing some of (Missing: Item 6 x1, Item 7 x5)",
+            "& Missing all of (Missing: Item 8 x2, Item 9 x3)",
+            "& Has 0/2 items from (Missing: Item 10, Item 11, Item 12)",
+            "& Has 0/1 unique items from (Missing: Item 13, Item 14)",
+            "& Has 0/1 items from Group 1",
+            "& Has 0/2 unique items from Group 2",
+            "& Cannot reach region Region 2",
+            "& Cannot reach location Location 2",
+            "& Cannot reach entrance Entrance 2",
+            "& True",
+            "& False)",
+        )
+        assert self.resolved_rule.explain_str(self.state) == " ".join(expected)
+
+    def test_explain_str_with_state_all_items(self) -> None:
+        self._collect_all()
+
+        expected = (
+            "((Has 4x Item 1",
+            "| Has all of (Found: Item 2, Item 3)",
+            "| Has some of (Found: Item 4, Item 5))",
+            "& Has all of (Found: Item 6 x1, Item 7 x5)",
+            "& Has some of (Found: Item 8 x2, Item 9 x3)",
+            "& Has 30/2 items from (Found: Item 10, Item 11, Item 12)",
+            "& Has 2/1 unique items from (Found: Item 13, Item 14)",
+            "& Has 30/1 items from Group 1",
+            "& Has 2/2 unique items from Group 2",
+            "& Reached region Region 2",
+            "& Reached location Location 2",
+            "& Reached entrance Entrance 2",
+            "& True",
+            "& False)",
+        )
+        assert self.resolved_rule.explain_str(self.state) == " ".join(expected)
+
+    def test_explain_str_without_state(self) -> None:
+        expected = (
+            "((Has 4x Item 1",
+            "| Has all of (Item 2, Item 3)",
+            "| Has any of (Item 4, Item 5))",
+            "& Has all of (Item 6 x1, Item 7 x5)",
+            "& Has any of (Item 8 x2, Item 9 x3)",
+            "& Has 2x items from (Item 10, Item 11, Item 12)",
+            "& Has a unique item from (Item 13, Item 14)",
+            "& Has an item from Group 1",
+            "& Has 2x unique items from Group 2",
+            "& Can reach region Region 2",
+            "& Can reach location Location 2",
+            "& Can reach entrance Entrance 2",
+            "& True",
+            "& False)",
+        )
+        assert self.resolved_rule.explain_str() == " ".join(expected)
+
+    def test_str(self) -> None:
+        expected = (
+            "((Has 4x Item 1",
+            "| Has all of (Item 2, Item 3)",
+            "| Has any of (Item 4, Item 5))",
+            "& Has all of (Item 6 x1, Item 7 x5)",
+            "& Has any of (Item 8 x2, Item 9 x3)",
+            "& Has 2x items from (Item 10, Item 11, Item 12)",
+            "& Has a unique item from (Item 13, Item 14)",
+            "& Has an item from Group 1",
+            "& Has 2x unique items from Group 2",
+            "& Can reach region Region 2",
+            "& Can reach location Location 2",
+            "& Can reach entrance Entrance 2",
+            "& True",
+            "& False)",
+        )
+        assert str(self.resolved_rule) == " ".join(expected)
diff --git a/test/hosting/__main__.py b/test/hosting/__main__.py
index 8f2a34a7a8..7ac2700eb8 100644
--- a/test/hosting/__main__.py
+++ b/test/hosting/__main__.py
@@ -70,13 +70,13 @@ if __name__ == "__main__":
         empty_file = str(Path(tempdir) / "empty")
         open(empty_file, "w").close()
         sys.argv += ["--config_override", empty_file]  # tests #5541
-        multis = [["VVVVVV"], ["Temp World"], ["VVVVVV", "Temp World"]]
+        multis = [["APQuest"], ["Temp World"], ["APQuest", "Temp World"]]
         p1_games: list[str] = []
         data_paths: list[Path | None] = []
         rooms: list[str] = []
         multidata: Path | None
 
-        copy_world("VVVVVV", "Temp World")
+        copy_world("APQuest", "Temp World")
         try:
             for n, games in enumerate(multis, 1):
                 print(f"Generating [{n}] {', '.join(games)} offline")
diff --git a/test/hosting/webhost.py b/test/hosting/webhost.py
index a8e70a50c2..0250445551 100644
--- a/test/hosting/webhost.py
+++ b/test/hosting/webhost.py
@@ -6,6 +6,7 @@ import zipfile
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterable, Optional, cast
 
+from Utils import utcnow
 from WebHostLib import to_python
 
 if TYPE_CHECKING:
@@ -133,7 +134,7 @@ def stop_room(app_client: "FlaskClient",
               room_id: str,
               timeout: Optional[float] = None,
               simulate_idle: bool = True) -> None:
-    from datetime import datetime, timedelta
+    from datetime import timedelta
     from time import sleep
 
     from pony.orm import db_session
@@ -151,10 +152,11 @@ def stop_room(app_client: "FlaskClient",
 
     with db_session:
         room: Room = Room.get(id=room_uuid)
+        now = utcnow()
         if simulate_idle:
-            new_last_activity = datetime.utcnow() - timedelta(seconds=room.timeout + 5)
+            new_last_activity = now - timedelta(seconds=room.timeout + 5)
         else:
-            new_last_activity = datetime.utcnow() - timedelta(days=3)
+            new_last_activity = now - timedelta(days=3)
         room.last_activity = new_last_activity
         address = f"localhost:{room.last_port}" if room.last_port > 0 else None
         if address:
@@ -188,6 +190,7 @@ def stop_room(app_client: "FlaskClient",
             if address:
                 room.timeout = original_timeout
                 room.last_activity = new_last_activity
+                room.commands.clear()  # make sure there is no leftover /exit
                 print("timeout restored")
 
 
diff --git a/test/hosting/world.py b/test/hosting/world.py
index 20f8df8cb1..9a523f6845 100644
--- a/test/hosting/world.py
+++ b/test/hosting/world.py
@@ -20,7 +20,7 @@ def copy(src: str, dst: str) -> None:
     src_cls = AutoWorldRegister.world_types[src]
     src_folder = Path(src_cls.__file__).parent
     worlds_folder = src_folder.parent
-    if (not src_cls.__file__.endswith("__init__.py") or not src_folder.is_dir()
+    if (not src_cls.__file__.endswith(("__init__.py", "world.py")) or not src_folder.is_dir()
             or not (worlds_folder / "generic").is_dir()):
         raise ValueError(f"Unsupported layout for copy_world from {src}")
     dst_folder = worlds_folder / dst_folder_name
@@ -28,11 +28,14 @@ def copy(src: str, dst: str) -> None:
         raise ValueError(f"Destination {dst_folder} already exists")
     shutil.copytree(src_folder, dst_folder)
     _new_worlds[dst] = str(dst_folder)
-    with open(dst_folder / "__init__.py", "r", encoding="utf-8-sig") as f:
-        contents = f.read()
-    contents = re.sub(r'game\s*(:\s*[a-zA-Z\[\]]+)?\s*=\s*[\'"]' + re.escape(src) + r'[\'"]', f'game = "{dst}"', contents)
-    with open(dst_folder / "__init__.py", "w", encoding="utf-8") as f:
-        f.write(contents)
+
+    for potential_world_class_file in ("__init__.py", "world.py"):
+        with open(dst_folder / potential_world_class_file, "r", encoding="utf-8-sig") as f:
+            contents = f.read()
+        r_src = re.escape(src)
+        contents = re.sub(r'game\s*(:\s*[a-zA-Z\[\]]+)?\s*=\s*[\'"]' + r_src + r'[\'"]', f'game = "{dst}"', contents)
+        with open(dst_folder / "__init__.py", "w", encoding="utf-8") as f:
+            f.write(contents)
 
 
 def delete(name: str) -> None:
diff --git a/test/multiworld/test_multiworlds.py b/test/multiworld/test_multiworlds.py
index 203af8b63a..d22013b4e0 100644
--- a/test/multiworld/test_multiworlds.py
+++ b/test/multiworld/test_multiworlds.py
@@ -61,6 +61,7 @@ class TestAllGamesMultiworld(MultiworldTestBase):
         with self.subTest("filling multiworld", seed=self.multiworld.seed):
             distribute_items_restrictive(self.multiworld)
             call_all(self.multiworld, "post_fill")
+            call_all(self.multiworld, "finalize_multiworld")
             self.assertTrue(self.fulfills_accessibility(), "Collected all locations, but can't beat the game")
 
 
@@ -78,4 +79,5 @@ class TestTwoPlayerMulti(MultiworldTestBase):
         with self.subTest("filling multiworld", games=world_type.game, seed=self.multiworld.seed):
             distribute_items_restrictive(self.multiworld)
             call_all(self.multiworld, "post_fill")
+            call_all(self.multiworld, "finalize_multiworld")
             self.assertTrue(self.fulfills_accessibility(), "Collected all locations, but can't beat the game")
diff --git a/test/options/test_generate_templates.py b/test/options/test_generate_templates.py
index cab97c54b1..1691f3c2cd 100644
--- a/test/options/test_generate_templates.py
+++ b/test/options/test_generate_templates.py
@@ -25,31 +25,41 @@ class TestGenerateYamlTemplates(unittest.TestCase):
         if "World: with colon" in worlds.AutoWorld.AutoWorldRegister.world_types:
             del worlds.AutoWorld.AutoWorldRegister.world_types["World: with colon"]
 
+
     def test_name_with_colon(self) -> None:
         from Options import generate_yaml_templates
         from worlds.AutoWorld import AutoWorldRegister
-        from worlds.AutoWorld import World
+        from worlds.AutoWorld import World, WebWorld
+
+        class WebWorldWithColon(WebWorld):
+            options_presets = {
+                "Generic": {
+                    "progression_balancing": "disabled",
+                    "accessibility": "minimal",
+                }
+            }
 
         class WorldWithColon(World):
             game = "World: with colon"
             item_name_to_id = {}
             location_name_to_id = {}
+            web = WebWorldWithColon()
 
         AutoWorldRegister.world_types = {WorldWithColon.game: WorldWithColon}
         with TemporaryDirectory(f"archipelago_{__name__}") as temp_dir:
             generate_yaml_templates(temp_dir)
             path: Path
-            for path in Path(temp_dir).iterdir():
-                self.assertTrue(path.is_file())
-                self.assertTrue(path.suffix == ".yaml")
-                with path.open(encoding="utf-8") as f:
-                    try:
-                        data = parse_yaml(f)
-                    except:
-                        f.seek(0)
-                        print(f"Error in {path.name}:\n{f.read()}")
-                        raise
-                    self.assertIn("game", data)
-                    self.assertIn(":", data["game"])
-                    self.assertIn(data["game"], data)
-                    self.assertIsInstance(data[data["game"]], dict)
+            for path in Path(temp_dir).rglob("*"):
+                if path.is_file():
+                    self.assertTrue(path.suffix == ".yaml")
+                    with path.open(encoding="utf-8") as f:
+                        try:
+                            data = parse_yaml(f)
+                        except:
+                            f.seek(0)
+                            print(f"Error in {path.name}:\n{f.read()}")
+                            raise
+                        self.assertIn("game", data)
+                        self.assertIn(":", data["game"])
+                        self.assertIn(data["game"], data)
+                        self.assertIsInstance(data[data["game"]], dict)
diff --git a/test/programs/data/one_player/test.yaml b/test/programs/data/one_player/test.yaml
index 47d79cf636..a934937027 100644
--- a/test/programs/data/one_player/test.yaml
+++ b/test/programs/data/one_player/test.yaml
@@ -2,8 +2,8 @@ description: Almost blank test yaml
 name: Player{NUMBER}
 
 game:
-  Timespinner: 1  # what else
+  APQuest: 1  # what else
 requires:
   version: 0.2.6
-Timespinner: {}
+APQuest: {}
 
diff --git a/test/webhost/test_host_room.py b/test/webhost/test_host_room.py
index 4aa83e3b1c..0f43fea208 100644
--- a/test/webhost/test_host_room.py
+++ b/test/webhost/test_host_room.py
@@ -1,11 +1,22 @@
+import logging
 import os
 from uuid import UUID, uuid4, uuid5
 
 from flask import url_for
 
+from WebHostLib.customserver import set_up_logging, tear_down_logging
 from . import TestBase
 
 
+def _cleanup_logger(room_id: UUID) -> None:
+    from Utils import user_path
+    tear_down_logging(room_id)
+    try:
+        os.unlink(user_path("logs", f"{room_id}.txt"))
+    except OSError:
+        pass
+
+
 class TestHostFakeRoom(TestBase):
     room_id: UUID
     log_filename: str
@@ -39,7 +50,7 @@ class TestHostFakeRoom(TestBase):
 
         try:
             os.unlink(self.log_filename)
-        except FileNotFoundError:
+        except OSError:
             pass
 
     def test_display_log_missing_full(self) -> None:
@@ -191,3 +202,27 @@ class TestHostFakeRoom(TestBase):
         with db_session:
             commands = select(command for command in Command if command.room.id == self.room_id)  # type: ignore
             self.assertNotIn("/help", (command.commandtext for command in commands))
+
+    def test_logger_teardown(self) -> None:
+        """Verify that room loggers are removed from the global logging manager."""
+        from WebHostLib.customserver import tear_down_logging
+        room_id = uuid4()
+        self.addCleanup(_cleanup_logger, room_id)
+        set_up_logging(room_id)
+        self.assertIn(f"RoomLogger {room_id}", logging.Logger.manager.loggerDict)
+        tear_down_logging(room_id)
+        self.assertNotIn(f"RoomLogger {room_id}", logging.Logger.manager.loggerDict)
+
+    def test_handler_teardown(self) -> None:
+        """Verify that handlers for room loggers are closed by tear_down_logging."""
+        from WebHostLib.customserver import tear_down_logging
+        room_id = uuid4()
+        self.addCleanup(_cleanup_logger, room_id)
+        logger = set_up_logging(room_id)
+        handlers = logger.handlers[:]
+        self.assertGreater(len(handlers), 0)
+
+        tear_down_logging(room_id)
+        for handler in handlers:
+            if isinstance(handler, logging.FileHandler):
+                self.assertTrue(handler.stream is None or handler.stream.closed)
diff --git a/test/webhost/test_option_presets.py b/test/webhost/test_option_presets.py
index efacddb22e..7f05de5d11 100644
--- a/test/webhost/test_option_presets.py
+++ b/test/webhost/test_option_presets.py
@@ -2,7 +2,7 @@ import unittest
 
 from BaseClasses import PlandoOptions
 from worlds import AutoWorldRegister
-from Options import OptionCounter, NamedRange, NumericOption, OptionList, OptionSet
+from Options import OptionCounter, NamedRange, NumericOption, OptionList, OptionSet, Visibility
 
 
 class TestOptionPresets(unittest.TestCase):
@@ -19,6 +19,9 @@ class TestOptionPresets(unittest.TestCase):
                             # pass in all plando options in case a preset wants to require certain plando options
                             # for some reason
                             option.verify(world_type, "Test Player", PlandoOptions(sum(PlandoOptions)))
+                            if not (Visibility.complex_ui in option.visibility or Visibility.simple_ui in option.visibility):
+                                self.fail(f"'{option_name}' in preset '{preset_name}' for game '{game_name}' is not "
+                                          f"visible in any supported UI.")
                             supported_types = [NumericOption, OptionSet, OptionList, OptionCounter]
                             if not any([issubclass(option.__class__, t) for t in supported_types]):
                                 self.fail(f"'{option_name}' in preset '{preset_name}' for game '{game_name}' "
diff --git a/typings/kivy/clock.pyi b/typings/kivy/clock.pyi
new file mode 100644
index 0000000000..74b2c26799
--- /dev/null
+++ b/typings/kivy/clock.pyi
@@ -0,0 +1,82 @@
+from _typeshed import Incomplete
+from kivy._clock import (
+    ClockEvent as ClockEvent,
+    ClockNotRunningError as ClockNotRunningError,
+    CyClockBase as CyClockBase,
+    CyClockBaseFree as CyClockBaseFree,
+    FreeClockEvent as FreeClockEvent,
+)
+
+__all__ = [
+    "Clock",
+    "ClockNotRunningError",
+    "ClockEvent",
+    "FreeClockEvent",
+    "CyClockBase",
+    "CyClockBaseFree",
+    "triggered",
+    "ClockBaseBehavior",
+    "ClockBaseInterruptBehavior",
+    "ClockBaseInterruptFreeBehavior",
+    "ClockBase",
+    "ClockBaseInterrupt",
+    "ClockBaseFreeInterruptAll",
+    "ClockBaseFreeInterruptOnly",
+    "mainthread",
+]
+
+class ClockBaseBehavior:
+    MIN_SLEEP: float
+    SLEEP_UNDERSHOOT: Incomplete
+    def __init__(self, async_lib: str = "asyncio", **kwargs) -> None: ...
+    def init_async_lib(self, lib) -> None: ...
+    @property
+    def frametime(self): ...
+    @property
+    def frames(self): ...
+    @property
+    def frames_displayed(self): ...
+    def usleep(self, microseconds) -> None: ...
+    def idle(self): ...
+    async def async_idle(self): ...
+    def tick(self) -> None: ...
+    async def async_tick(self) -> None: ...
+    def pre_idle(self) -> None: ...
+    def post_idle(self, ts, current): ...
+    def tick_draw(self) -> None: ...
+    def get_fps(self): ...
+    def get_rfps(self): ...
+    def get_time(self): ...
+    def get_boottime(self): ...
+    time: Incomplete
+    def handle_exception(self, e) -> None: ...
+
+class ClockBaseInterruptBehavior(ClockBaseBehavior):
+    interupt_next_only: bool
+    def __init__(self, interupt_next_only: bool = False, **kwargs) -> None: ...
+    def init_async_lib(self, lib) -> None: ...
+    def usleep(self, microseconds) -> None: ...
+    async def async_usleep(self, microseconds) -> None: ...
+    def on_schedule(self, event) -> None: ...
+    def idle(self): ...
+    async def async_idle(self): ...
+
+class ClockBaseInterruptFreeBehavior(ClockBaseInterruptBehavior):
+    def __init__(self, **kwargs) -> None: ...
+    def on_schedule(self, event): ...
+
+class ClockBase(ClockBaseBehavior, CyClockBase):
+    def __init__(self, **kwargs) -> None: ...
+    def usleep(self, microseconds) -> None: ...
+
+class ClockBaseInterrupt(ClockBaseInterruptBehavior, CyClockBase): ...
+class ClockBaseFreeInterruptAll(ClockBaseInterruptFreeBehavior, CyClockBaseFree): ...
+
+class ClockBaseFreeInterruptOnly(ClockBaseInterruptFreeBehavior, CyClockBaseFree):
+    def idle(self): ...
+    async def async_idle(self): ...
+
+def mainthread(func): ...
+def triggered(timeout: int = 0, interval: bool = False): ...
+
+Clock: ClockBase
diff --git a/worlds/AutoSNIClient.py b/worlds/AutoSNIClient.py
index 98243ce3fc..d2558bb98d 100644
--- a/worlds/AutoSNIClient.py
+++ b/worlds/AutoSNIClient.py
@@ -1,14 +1,26 @@
 
 from __future__ import annotations
 import abc
+from bisect import bisect_right
+from dataclasses import dataclass
+import enum
 import logging
-from typing import TYPE_CHECKING, ClassVar, Dict, Iterable, Tuple, Any, Optional, Union, TypeGuard
+from typing import (TYPE_CHECKING, Any, ClassVar, Dict, Generic, Iterable,
+                    Optional, Sequence, Tuple, TypeGuard, TypeVar, Union)
+
 
 from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components
 
 if TYPE_CHECKING:
     from SNIClient import SNIContext
 
+SNES_READ_CHUNK_SIZE = 2048
+"""
+note: SNI v0.0.101 currently has a bug where reads from
+RetroArch >2048 bytes will only return the last ~2048 bytes read.
+https://github.com/alttpo/sni/issues/51
+"""
+
 component = Component('SNI Client', 'SNIClient', component_type=Type.CLIENT, file_identifier=SuffixIdentifier(".apsoe"),
                       description="A client for connecting to SNES consoles via Super Nintendo Interface.")
 components.append(component)
@@ -91,3 +103,119 @@ class SNIClient(abc.ABC, metaclass=AutoSNIClientRegister):
     def on_package(self, ctx: SNIContext, cmd: str, args: Dict[str, Any]) -> None:
         """ override this with code to handle packages from the server """
         pass
+
+
+@dataclass(frozen=True, slots=True, order=True)
+class Read:
+    """ snes memory read - address and size in bytes """
+    address: int
+    size: int
+
+
+@dataclass(frozen=True, slots=True)
+class _MemRead:
+    location: Read
+    data: bytes
+
+
+_T_Enum = TypeVar("_T_Enum", bound=enum.Enum)
+
+
+class SnesData(Generic[_T_Enum]):
+    _ranges: Sequence[_MemRead]
+    """ sorted by address """
+
+    def __init__(self, ranges: Sequence[tuple[Read, bytes]]) -> None:
+        self._ranges = [_MemRead(r, d) for r, d in ranges]
+
+    def get(self, read: _T_Enum) -> bytes:
+        assert isinstance(read.value, Read), read.value
+        address = read.value.address
+        index = bisect_right(self._ranges, address, key=lambda r: r.location.address) - 1
+        assert index >= 0, (self._ranges, read.value)
+        mem_read = self._ranges[index]
+        sub_index = address - mem_read.location.address
+        return mem_read.data[sub_index:sub_index + read.value.size]
+
+
+class SnesReader(Generic[_T_Enum]):
+    """
+    how to use:
+    ```
+    from enum import Enum
+    from worlds.AutoSNIClient import Read, SNIClient, SnesReader
+
+    class MyGameMemory(Enum):
+        game_mode = Read(WRAM_START + 0x0998, 1)
+        send_queue = Read(SEND_QUEUE_START, 8 * 127)
+        ...
+
+    snes_reader = SnesReader(MyGameMemory)
+
+    snes_data = await snes_reader.read(ctx)
+    if snes_data is None:
+        snes_logger.info("error reading from snes")
+        return
+
+    game_mode = snes_data.get(MyGameMemory.game_mode)
+    ```
+    """
+    _ranges: Sequence[Read]
+    """ sorted by address """
+
+    def __init__(self, reads: type[_T_Enum]) -> None:
+        self._ranges = self._make_ranges(reads)
+
+    @staticmethod
+    def _make_ranges(reads: type[enum.Enum]) -> Sequence[Read]:
+
+        unprocessed_reads: list[Read] = []
+        for e in reads:
+            assert isinstance(e.value, Read), (reads.__name__, e, e.value)
+            unprocessed_reads.append(e.value)
+        unprocessed_reads.sort()
+
+        ranges: list[Read] = []
+        for read in unprocessed_reads:
+            #                                      v  end of the previous range
+            if len(ranges) == 0 or read.address - (ranges[-1].address + ranges[-1].size) > 255:
+                ranges.append(read)
+            else:  # combine with previous range
+                chunk_address = ranges[-1].address
+                assert read.address >= chunk_address, "sort() didn't work? or something"
+                original_chunk_size = ranges[-1].size
+                new_size = max((read.address + read.size) - chunk_address,
+                               original_chunk_size)
+                ranges[-1] = Read(chunk_address, new_size)
+        logging.debug(f"{len(ranges)=} {max(r.size for r in ranges)=}")
+        return ranges
+
+    async def read(self, ctx: "SNIContext") -> SnesData[_T_Enum] | None:
+        """
+        returns `None` if reading fails,
+        otherwise returns the data for the registered `Enum`
+        """
+        from SNIClient import snes_read
+
+        reads: list[tuple[Read, bytes]] = []
+        for r in self._ranges:
+            if r.size < SNES_READ_CHUNK_SIZE:  # most common
+                response = await snes_read(ctx, r.address, r.size)
+                if response is None:
+                    return None
+                reads.append((r, response))
+            else:  # big read
+                # Problems were reported with big reads,
+                # so we chunk it into smaller pieces.
+                read_so_far = 0
+                collection: list[bytes] = []
+                while read_so_far < r.size:
+                    remaining_size = r.size - read_so_far
+                    chunk_size = min(SNES_READ_CHUNK_SIZE, remaining_size)
+                    response = await snes_read(ctx, r.address + read_so_far, chunk_size)
+                    if response is None:
+                        return None
+                    collection.append(response)
+                    read_so_far += chunk_size
+                reads.append((r, b"".join(collection)))
+        return SnesData(reads)
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index 1805b11a09..04f0b61ff8 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -5,17 +5,18 @@ import logging
 import pathlib
 import sys
 import time
+from collections.abc import Callable, Iterable, Mapping
 from random import Random
-from dataclasses import make_dataclass
-from typing import (Any, Callable, ClassVar, Dict, FrozenSet, Iterable, List, Mapping, Optional, Set, TextIO, Tuple,
+from typing import (Any, ClassVar, Dict, FrozenSet, List, Optional, Self, Set, TextIO, Tuple,
                     TYPE_CHECKING, Type, Union)
 
 from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
-from BaseClasses import CollectionState
+from BaseClasses import CollectionState, Entrance
+from rule_builder.rules import CustomRuleRegister, Rule
 from Utils import Version
 
 if TYPE_CHECKING:
-    from BaseClasses import MultiWorld, Item, Location, Tutorial, Region, Entrance
+    from BaseClasses import CollectionRule, Item, Location, MultiWorld, Region, Tutorial
     from NetUtils import GamesPackage, MultiData
     from settings import Group
 
@@ -47,27 +48,31 @@ class AutoWorldRegister(type):
     def __new__(mcs, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]) -> AutoWorldRegister:
         if "web" in dct:
             assert isinstance(dct["web"], WebWorld), "WebWorld has to be instantiated."
-        # filter out any events
-        dct["item_name_to_id"] = {name: id for name, id in dct["item_name_to_id"].items() if id}
-        dct["location_name_to_id"] = {name: id for name, id in dct["location_name_to_id"].items() if id}
-        # build reverse lookups
-        dct["item_id_to_name"] = {code: name for name, code in dct["item_name_to_id"].items()}
-        dct["location_id_to_name"] = {code: name for name, code in dct["location_name_to_id"].items()}
 
-        # build rest
-        dct["item_names"] = frozenset(dct["item_name_to_id"])
-        dct["item_name_groups"] = {group_name: frozenset(group_set) for group_name, group_set
-                                   in dct.get("item_name_groups", {}).items()}
-        dct["item_name_groups"]["Everything"] = dct["item_names"]
-
-        dct["location_names"] = frozenset(dct["location_name_to_id"])
-        dct["location_name_groups"] = {group_name: frozenset(group_set) for group_name, group_set
-                                       in dct.get("location_name_groups", {}).items()}
-        dct["location_name_groups"]["Everywhere"] = dct["location_names"]
-        dct["all_item_and_group_names"] = frozenset(dct["item_names"] | set(dct.get("item_name_groups", {})))
-
-        # move away from get_required_client_version function
         if "game" in dct:
+            assert "item_name_to_id" in dct, f"{name}: item_name_to_id is required"
+            assert "location_name_to_id" in dct, f"{name}: location_name_to_id is required"
+
+            # filter out any events
+            dct["item_name_to_id"] = {name: id for name, id in dct["item_name_to_id"].items() if id}
+            dct["location_name_to_id"] = {name: id for name, id in dct["location_name_to_id"].items() if id}
+            # build reverse lookups
+            dct["item_id_to_name"] = {code: name for name, code in dct["item_name_to_id"].items()}
+            dct["location_id_to_name"] = {code: name for name, code in dct["location_name_to_id"].items()}
+
+            # build rest
+            dct["item_names"] = frozenset(dct["item_name_to_id"])
+            dct["item_name_groups"] = {group_name: frozenset(group_set) for group_name, group_set
+                                    in dct.get("item_name_groups", {}).items()}
+            dct["item_name_groups"]["Everything"] = dct["item_names"]
+
+            dct["location_names"] = frozenset(dct["location_name_to_id"])
+            dct["location_name_groups"] = {group_name: frozenset(group_set) for group_name, group_set
+                                        in dct.get("location_name_groups", {}).items()}
+            dct["location_name_groups"]["Everywhere"] = dct["location_names"]
+            dct["all_item_and_group_names"] = frozenset(dct["item_names"] | set(dct.get("item_name_groups", {})))
+
+            # move away from get_required_client_version function
             assert "get_required_client_version" not in dct, f"{name}: required_client_version is an attribute now"
         # set minimum required_client_version from bases
         if "required_client_version" in dct and bases:
@@ -173,7 +178,8 @@ def _timed_call(method: Callable[..., Any], *args: Any,
 
 
 def call_single(multiworld: "MultiWorld", method_name: str, player: int, *args: Any) -> Any:
-    method = getattr(multiworld.worlds[player], method_name)
+    world = multiworld.worlds[player]
+    method = getattr(world, method_name)
     try:
         ret = _timed_call(method, *args, multiworld=multiworld, player=player)
     except Exception as e:
@@ -184,6 +190,10 @@ def call_single(multiworld: "MultiWorld", method_name: str, player: int, *args:
             logging.error(message)
         raise e
     else:
+        # Convenience for CachedRuleBuilderWorld users: Ensure that caching setup function is called
+        # Can be removed once dependency system is improved
+        if method_name == "set_rules" and hasattr(world, "register_rule_builder_dependencies"):
+            call_single(multiworld, "register_rule_builder_dependencies", player)
         return ret
 
 
@@ -224,7 +234,7 @@ class WebWorld(metaclass=WebWorldRegister):
     tutorials: List["Tutorial"]
     """docs folder will also be scanned for tutorial guides. Each Tutorial class is to be used for one guide."""
 
-    theme = "grass"
+    theme: str = "grass"
     """Choose a theme for you /game/* pages.
     Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime, stone"""
 
@@ -353,7 +363,7 @@ class World(metaclass=AutoWorldRegister):
 
     def __getattr__(self, item: str) -> Any:
         if item == "settings":
-            return self.__class__.settings
+            return getattr(self.__class__, item)
         raise AttributeError
 
     # overridable methods that get called by Main.py, sorted by execution order
@@ -420,6 +430,23 @@ class World(metaclass=AutoWorldRegister):
         This happens before progression balancing, so the items may not be in their final locations yet.
         """
 
+    def finalize_multiworld(self) -> None:
+        """
+        Optional Method that is called after fill and progression balancing.
+        This is the last stage of generation where worlds may change logically relevant data,
+        such as item placements and connections. To not break assumptions,
+        only ever increase accessibility, never decrease it.
+        """
+        pass
+
+    def pre_output(self):
+        """
+        Optional method that is called before output generation.
+        Items and connections are not meant to be moved anymore,
+        anything that would affect logical spheres is forbidden at this point.
+        """
+        pass
+
     def generate_output(self, output_directory: str) -> None:
         """
         This method gets called from a threadpool, do not use multiworld.random here.
@@ -484,7 +511,14 @@ class World(metaclass=AutoWorldRegister):
         raise NotImplementedError
 
     def get_filler_item_name(self) -> str:
-        """Called when the item pool needs to be filled with additional items to match location count."""
+        """
+        Called when the item pool needs to be filled with additional items to match location count.
+
+        Any returned item name must be for a "repeatable" item, i.e. one that it's okay to generate arbitrarily many of.
+        For most worlds this will be one or more of your filler items, but the classification of these items
+        does not need to be ItemClassification.filler.
+        The item name returned can be for a trap, useful, and/or progression item as long as it's repeatable.
+        """
         logging.warning(f"World {self} is generating a filler item without custom filler pool.")
         return self.random.choice(tuple(self.item_name_to_id.keys()))
 
@@ -538,6 +572,10 @@ class World(metaclass=AutoWorldRegister):
             return True
         return False
 
+    def reached_region(self, state: "CollectionState", region: "Region") -> None:
+        """Called when a region is newly reachable by the state."""
+        pass
+
     # following methods should not need to be overridden.
     def create_filler(self) -> "Item":
         return self.create_item(self.get_filler_item_name())
@@ -586,6 +624,64 @@ class World(metaclass=AutoWorldRegister):
         res["checksum"] = data_package_checksum(res)
         return res
 
+    @classmethod
+    def get_rule_cls(cls, name: str) -> type[Rule[Self]]:
+        """Returns the world-registered or default rule with the given name"""
+        return CustomRuleRegister.get_rule_cls(cls.game, name)
+
+    @classmethod
+    def rule_from_dict(cls, data: Mapping[str, Any]) -> Rule[Self]:
+        """Create a rule instance from a serialized dict representation"""
+        name = data.get("rule", "")
+        rule_class = cls.get_rule_cls(name)
+        return rule_class.from_dict(data, cls)
+
+    def set_rule(self, spot: Location | Entrance, rule: CollectionRule | Rule[Any]) -> None:
+        """Sets an access rule for a location or entrance"""
+        if isinstance(rule, Rule):
+            rule = rule.resolve(self)
+            self.register_rule_dependencies(rule)
+            if isinstance(spot, Entrance):
+                self._register_rule_indirects(rule, spot)
+        spot.access_rule = rule
+
+    def set_completion_rule(self, rule: CollectionRule | Rule[Any]) -> None:
+        """Set the completion rule for this world"""
+        if isinstance(rule, Rule):
+            rule = rule.resolve(self)
+            self.register_rule_dependencies(rule)
+        self.multiworld.completion_condition[self.player] = rule
+
+    def create_entrance(
+        self,
+        from_region: Region,
+        to_region: Region,
+        rule: CollectionRule | Rule[Any] | None = None,
+        name: str | None = None,
+        force_creation: bool = False,
+    ) -> Entrance | None:
+        """Try to create an entrance between regions with the given rule,
+        skipping it if the rule resolves to False (unless force_creation is True)"""
+        if rule is not None and isinstance(rule, Rule):
+            rule = rule.resolve(self)
+            if rule.always_false and not force_creation:
+                return None
+            self.register_rule_dependencies(rule)
+
+        entrance = from_region.connect(to_region, name, rule=rule)
+        if rule and isinstance(rule, Rule.Resolved):
+            self._register_rule_indirects(rule, entrance)
+        return entrance
+
+    def register_rule_dependencies(self, resolved_rule: Rule.Resolved) -> None:
+        """Hook for registering dependencies when a rule is assigned for this world"""
+        pass
+
+    def _register_rule_indirects(self, resolved_rule: Rule.Resolved, entrance: Entrance) -> None:
+        if self.explicit_indirect_conditions:
+            for indirect_region in resolved_rule.region_dependencies().keys():
+                self.multiworld.register_indirect_condition(self.get_region(indirect_region), entrance)
+
 
 # any methods attached to this can be used as part of CollectionState,
 # please use a prefix as all of them get clobbered together
diff --git a/worlds/Files.py b/worlds/Files.py
index a41424183f..ddd1f4e1ce 100644
--- a/worlds/Files.py
+++ b/worlds/Files.py
@@ -21,6 +21,10 @@ if TYPE_CHECKING:
     from Utils import Version
 
 
+class ImproperlyConfiguredAutoPatchError(Exception):
+    pass
+
+
 class AutoPatchRegister(abc.ABCMeta):
     patch_types: ClassVar[Dict[str, AutoPatchRegister]] = {}
     file_endings: ClassVar[Dict[str, AutoPatchRegister]] = {}
@@ -30,8 +34,28 @@ class AutoPatchRegister(abc.ABCMeta):
         new_class = super().__new__(mcs, name, bases, dct)
         if "game" in dct:
             AutoPatchRegister.patch_types[dct["game"]] = new_class
-            if not dct["patch_file_ending"]:
-                raise Exception(f"Need an expected file ending for {name}")
+
+            if not callable(getattr(new_class, "patch", None)):
+                raise ImproperlyConfiguredAutoPatchError(
+                    f"Container {new_class} uses metaclass AutoPatchRegister, but does not have a patch method defined."
+                )
+
+            patch_file_ending = dct.get("patch_file_ending")
+            if patch_file_ending == ".zip":
+                raise ImproperlyConfiguredAutoPatchError(
+                    f'Auto patch container {new_class} uses file ending ".zip", which is not allowed.'
+                )
+            if patch_file_ending is None:
+                raise ImproperlyConfiguredAutoPatchError(
+                    f"Need an expected file ending for auto patch container {new_class}"
+                )
+
+            existing_handler = AutoPatchRegister.file_endings.get(patch_file_ending)
+            if existing_handler:
+                raise ImproperlyConfiguredAutoPatchError(
+                    f"Two auto patch containers are using the same file extension: {new_class}, {existing_handler}"
+                )
+
             AutoPatchRegister.file_endings[dct["patch_file_ending"]] = new_class
         return new_class
 
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index 2ec70832c0..19be413708 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -5,7 +5,7 @@ import weakref
 from enum import Enum, auto
 from typing import Optional, Callable, List, Iterable, Tuple
 
-from Utils import local_path, open_filename, is_frozen, is_kivy_running
+from Utils import local_path, open_filename, is_frozen, is_kivy_running, open_file, user_path, read_apignore
 
 
 class Type(Enum):
@@ -204,6 +204,18 @@ def install_apworld(apworld_path: str = "") -> None:
         Utils.messagebox("Install complete.", f"Installed APWorld from {source}.")
 
 
+def export_datapackage() -> None:
+    import json
+
+    from worlds import network_data_package
+
+    path = user_path("datapackage_export.json")
+    with open(path, "w") as f:
+        json.dump(network_data_package, f, indent=4)
+
+    open_file(path)
+
+
 components: List[Component] = [
     # Launcher
     Component('Launcher', 'Launcher', component_type=Type.HIDDEN),
@@ -213,6 +225,8 @@ components: List[Component] = [
               description="Host a generated multiworld on your computer."),
     Component('Generate', 'Generate', cli=True,
               description="Generate a multiworld with the YAMLs in the players folder."),
+    Component("Options Creator", "OptionsCreator", "ArchipelagoOptionsCreator", component_type=Type.TOOL,
+              description="Visual creator for Archipelago option files."),
     Component("Install APWorld", func=install_apworld, file_identifier=SuffixIdentifier(".apworld"),
               description="Install an APWorld to play games not included with Archipelago by default."),
     Component('Text Client', 'CommonClient', 'ArchipelagoTextClient', func=launch_textclient,
@@ -230,8 +244,11 @@ components: List[Component] = [
     Component('Zillion Client', 'ZillionClient',
               file_identifier=SuffixIdentifier('.apzl')),
 
-    #MegaMan Battle Network 3
-    Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3'))
+    # MegaMan Battle Network 3
+    Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3')),
+
+    Component("Export Datapackage", func=export_datapackage, component_type=Type.TOOL,
+              description="Write item/location data for installed worlds to a file and open it."),
 ]
 
 
@@ -262,6 +279,10 @@ if not is_frozen():
             games = [(worldname, worldtype) for worldname, worldtype in AutoWorldRegister.world_types.items()
                      if not worldtype.zip_path]
 
+        global_apignores = read_apignore(local_path("data", "GLOBAL.apignore"))
+        if not global_apignores:
+            raise RuntimeError("Could not read global apignore file for build component")
+
         apworlds_folder = os.path.join("build", "apworlds")
         os.makedirs(apworlds_folder, exist_ok=True)
         for worldname, worldtype in games:
@@ -275,11 +296,11 @@ if not is_frozen():
                     manifest = json.load(manifest_file)
 
                 assert "game" in manifest, (
-                    f"World directory {world_directory} has an archipelago.json manifest file, but it"
+                    f"World directory {world_directory} has an archipelago.json manifest file, but it "
                     "does not define a \"game\"."
                 )
                 assert manifest["game"] == worldtype.game, (
-                    f"World directory {world_directory} has an archipelago.json manifest file, but value of the"
+                    f"World directory {world_directory} has an archipelago.json manifest file, but value of the "
                     f"\"game\" field ({manifest['game']} does not equal the World class's game ({worldtype.game})."
                 )
             else:
@@ -289,18 +310,17 @@ if not is_frozen():
             apworld = APWorldContainer(str(zip_path))
             apworld.game = worldtype.game
             manifest.update(apworld.get_manifest())
-            apworld.manifest_path = f"{file_name}/archipelago.json"
-            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED,
-                                 compresslevel=9) as zf:
-                for path in pathlib.Path(world_directory).rglob("*"):
-                    relative_path = os.path.join(*path.parts[path.parts.index("worlds") + 1:])
-                    if "__MACOSX" in relative_path or ".DS_STORE" in relative_path or "__pycache__" in relative_path:
-                        continue
-                    if not relative_path.endswith("archipelago.json"):
-                        zf.write(path, relative_path)
+            apworld.manifest_path = os.path.join(file_name, "archipelago.json")
+
+            local_ignores = read_apignore(pathlib.Path(world_directory, ".apignore"))
+            apignores = global_apignores + local_ignores if local_ignores else global_apignores
+
+            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED, compresslevel=9) as zf:
+                for file in apignores.match_tree_files(world_directory, negate=True):
+                    zf.write(pathlib.Path(world_directory, file), pathlib.Path(file_name, file))
+
                 zf.writestr(apworld.manifest_path, json.dumps(manifest))
         open_folder(apworlds_folder)
 
-
-    components.append(Component('Build APWorlds', func=_build_apworlds, cli=True,
+    components.append(Component("Build APWorlds", func=_build_apworlds, cli=True,
                                 description="Build APWorlds from loose-file world folders."))
diff --git a/worlds/__init__.py b/worlds/__init__.py
index 72ac818198..dd2d83a27e 100644
--- a/worlds/__init__.py
+++ b/worlds/__init__.py
@@ -1,17 +1,20 @@
 import importlib
-import importlib.util
+import importlib.abc
+import importlib.machinery
 import logging
 import os
 import sys
-import warnings
 import zipimport
 import time
 import dataclasses
 import json
-from typing import List
+from pathlib import Path
+from types import ModuleType
+from typing import List, Sequence
+from zipfile import BadZipFile
 
 from NetUtils import DataPackage
-from Utils import local_path, user_path, Version, version_tuple, tuplize_version
+from Utils import local_path, user_path, Version, version_tuple, tuplize_version, messagebox
 
 local_folder = os.path.dirname(__file__)
 user_folder = user_path("worlds") if user_path() != local_path() else user_path("custom_worlds")
@@ -20,14 +23,14 @@ try:
 except OSError:  # can't access/write?
     user_folder = None
 
-__all__ = {
+__all__ = [
     "network_data_package",
     "AutoWorldRegister",
     "world_sources",
     "local_folder",
     "user_folder",
     "failed_world_loads",
-}
+]
 
 
 failed_world_loads: List[str] = []
@@ -53,21 +56,7 @@ class WorldSource:
     def load(self) -> bool:
         try:
             start = time.perf_counter()
-            if self.is_zip:
-                importer = zipimport.zipimporter(self.resolved_path)
-                spec = importer.find_spec(os.path.basename(self.path).rsplit(".", 1)[0])
-                assert spec, f"{self.path} is not a loadable module"
-                mod = importlib.util.module_from_spec(spec)
-
-                mod.__package__ = f"worlds.{mod.__package__}"
-
-                mod.__name__ = f"worlds.{mod.__name__}"
-                sys.modules[mod.__name__] = mod
-                with warnings.catch_warnings():
-                    warnings.filterwarnings("ignore", message="__package__ != __spec__.parent")
-                    importer.exec_module(mod)
-            else:
-                importlib.import_module(f".{self.path}", "worlds")
+            importlib.import_module(f".{Path(self.path).stem}", "worlds")
             self.time_taken = time.perf_counter()-start
             return True
 
@@ -112,7 +101,6 @@ for world_source in world_sources:
     else:
         world_source.load()
 
-
 from .AutoWorld import AutoWorldRegister
 
 for world_source in world_sources:
@@ -157,6 +145,15 @@ if apworlds:
                     logging.error(e)
                 else:
                     raise e
+            except BadZipFile as e:
+                err_message = (f"The world source {apworld_source.resolved_path} is not a valid zip. "
+                               "It is likely either corrupted, or was packaged incorrectly.")
+
+                if sys.stdout:
+                    raise RuntimeError(err_message) from e
+                else:
+                    messagebox("Couldn't load worlds", err_message, error=True)
+                    sys.exit(1)
 
             if apworld.minimum_ap_version and apworld.minimum_ap_version > version_tuple:
                 fail_world(apworld.game,
@@ -174,6 +171,16 @@ if apworlds:
         core_compatible.sort(
             key=lambda element: element[1].world_version if element[1].world_version else Version(0, 0, 0),
             reverse=True)
+
+        apworld_module_specs = {}
+        class APWorldModuleFinder(importlib.abc.MetaPathFinder):
+            def find_spec(
+                    self, fullname: str, _path: Sequence[str] | None, _target: ModuleType = None
+            ) -> importlib.machinery.ModuleSpec | None:
+                return apworld_module_specs.get(fullname)
+
+        sys.meta_path.insert(0, APWorldModuleFinder())
+
         for apworld_source, apworld in core_compatible:
             if apworld.game and apworld.game in AutoWorldRegister.world_types:
                 fail_world(apworld.game,
@@ -181,6 +188,12 @@ if apworlds:
                            f"as its game {apworld.game} is already loaded.",
                            add_as_failed_to_load=False)
             else:
+                importer = zipimport.zipimporter(apworld_source.resolved_path)
+                world_name = Path(apworld.path).stem
+
+                spec = importer.find_spec(f"worlds.{world_name}")
+                apworld_module_specs[f"worlds.{world_name}"] = spec
+
                 apworld_source.load()
                 if apworld.game in AutoWorldRegister.world_types:
                     # world could fail to load at this point
diff --git a/worlds/_sc2common/bot/bot_ai_internal.py b/worlds/_sc2common/bot/bot_ai_internal.py
index 583c491dc2..1cdd3bda06 100644
--- a/worlds/_sc2common/bot/bot_ai_internal.py
+++ b/worlds/_sc2common/bot/bot_ai_internal.py
@@ -9,7 +9,7 @@ from collections import Counter
 from typing import TYPE_CHECKING, Any
 from typing import Dict, Generator, Iterable, List, Set, Tuple, Union, final
 
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import sc2api_pb2 as sc_pb
 
 from .constants import (
     IS_PLACEHOLDER,
diff --git a/worlds/_sc2common/bot/client.py b/worlds/_sc2common/bot/client.py
index a902c99d55..bb4bc4c866 100644
--- a/worlds/_sc2common/bot/client.py
+++ b/worlds/_sc2common/bot/client.py
@@ -4,11 +4,11 @@ from typing import Dict, Iterable, List, Optional, Set, Tuple, Union
 
 from worlds._sc2common.bot import logger
 
-from s2clientprotocol import debug_pb2 as debug_pb
-from s2clientprotocol import query_pb2 as query_pb
-from s2clientprotocol import raw_pb2 as raw_pb
-from s2clientprotocol import sc2api_pb2 as sc_pb
-from s2clientprotocol import spatial_pb2 as spatial_pb
+from .proto import debug_pb2 as debug_pb
+from .proto import query_pb2 as query_pb
+from .proto import raw_pb2 as raw_pb
+from .proto import sc2api_pb2 as sc_pb
+from .proto import spatial_pb2 as spatial_pb
 
 from .data import ActionResult, ChatChannel, Race, Result, Status
 from .game_data import AbilityData, GameData
diff --git a/worlds/_sc2common/bot/controller.py b/worlds/_sc2common/bot/controller.py
index abb26ef8a9..8ddb6131e2 100644
--- a/worlds/_sc2common/bot/controller.py
+++ b/worlds/_sc2common/bot/controller.py
@@ -2,7 +2,7 @@ import platform
 from pathlib import Path
 
 from worlds._sc2common.bot import logger
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import sc2api_pb2 as sc_pb
 
 from .player import Computer
 from .protocol import Protocol
diff --git a/worlds/_sc2common/bot/data.py b/worlds/_sc2common/bot/data.py
index 4c9b3b94a0..36681a5b87 100644
--- a/worlds/_sc2common/bot/data.py
+++ b/worlds/_sc2common/bot/data.py
@@ -7,11 +7,11 @@ https://github.com/Blizzard/s2client-api/blob/d9ba0a33d6ce9d233c2a4ee988360c188f
 """
 import enum
 
-from s2clientprotocol import common_pb2 as common_pb
-from s2clientprotocol import data_pb2 as data_pb
-from s2clientprotocol import error_pb2 as error_pb
-from s2clientprotocol import raw_pb2 as raw_pb
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import common_pb2 as common_pb
+from .proto import data_pb2 as data_pb
+from .proto import error_pb2 as error_pb
+from .proto import raw_pb2 as raw_pb
+from .proto import sc2api_pb2 as sc_pb
 
 CreateGameError = enum.Enum("CreateGameError", sc_pb.ResponseCreateGame.Error.items())
 
diff --git a/worlds/_sc2common/bot/main.py b/worlds/_sc2common/bot/main.py
index f18c568361..5d40269ed3 100644
--- a/worlds/_sc2common/bot/main.py
+++ b/worlds/_sc2common/bot/main.py
@@ -15,7 +15,7 @@ import mpyq
 import portpicker
 from aiohttp import ClientSession, ClientWebSocketResponse
 from worlds._sc2common.bot import logger
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import sc2api_pb2 as sc_pb
 
 from .bot_ai import BotAI
 from .client import Client
diff --git a/worlds/_sc2common/bot/position.py b/worlds/_sc2common/bot/position.py
index aca9a5105c..bde21b15c3 100644
--- a/worlds/_sc2common/bot/position.py
+++ b/worlds/_sc2common/bot/position.py
@@ -5,7 +5,7 @@ import math
 import random
 from typing import TYPE_CHECKING, Iterable, List, Set, Tuple, Union
 
-from s2clientprotocol import common_pb2 as common_pb
+from .proto import common_pb2 as common_pb
 
 if TYPE_CHECKING:
     from .unit import Unit
diff --git a/worlds/_sc2common/bot/proto/__init__.py b/worlds/_sc2common/bot/proto/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/_sc2common/bot/proto/common_pb2.py b/worlds/_sc2common/bot/proto/common_pb2.py
new file mode 100644
index 0000000000..f84ad4d9ee
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/common_pb2.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/common.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/common.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ds2clientprotocol/common.proto\x12\x0eSC2APIProtocol\">\n\x10\x41vailableAbility\x12\x12\n\nability_id\x18\x01 \x01(\x05\x12\x16\n\x0erequires_point\x18\x02 \x01(\x08\"X\n\tImageData\x12\x16\n\x0e\x62its_per_pixel\x18\x01 \x01(\x05\x12%\n\x04size\x18\x02 \x01(\x0b\x32\x17.SC2APIProtocol.Size2DI\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\x1e\n\x06PointI\x12\t\n\x01x\x18\x01 \x01(\x05\x12\t\n\x01y\x18\x02 \x01(\x05\"T\n\nRectangleI\x12\"\n\x02p0\x18\x01 \x01(\x0b\x32\x16.SC2APIProtocol.PointI\x12\"\n\x02p1\x18\x02 \x01(\x0b\x32\x16.SC2APIProtocol.PointI\"\x1f\n\x07Point2D\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"(\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"\x1f\n\x07Size2DI\x12\t\n\x01x\x18\x01 \x01(\x05\x12\t\n\x01y\x18\x02 \x01(\x05*A\n\x04Race\x12\n\n\x06NoRace\x10\x00\x12\n\n\x06Terran\x10\x01\x12\x08\n\x04Zerg\x10\x02\x12\x0b\n\x07Protoss\x10\x03\x12\n\n\x06Random\x10\x04')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.common_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_RACE']._serialized_start=429
+  _globals['_RACE']._serialized_end=494
+  _globals['_AVAILABLEABILITY']._serialized_start=49
+  _globals['_AVAILABLEABILITY']._serialized_end=111
+  _globals['_IMAGEDATA']._serialized_start=113
+  _globals['_IMAGEDATA']._serialized_end=201
+  _globals['_POINTI']._serialized_start=203
+  _globals['_POINTI']._serialized_end=233
+  _globals['_RECTANGLEI']._serialized_start=235
+  _globals['_RECTANGLEI']._serialized_end=319
+  _globals['_POINT2D']._serialized_start=321
+  _globals['_POINT2D']._serialized_end=352
+  _globals['_POINT']._serialized_start=354
+  _globals['_POINT']._serialized_end=394
+  _globals['_SIZE2DI']._serialized_start=396
+  _globals['_SIZE2DI']._serialized_end=427
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/data_pb2.py b/worlds/_sc2common/bot/proto/data_pb2.py
new file mode 100644
index 0000000000..6785ea3ed7
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/data_pb2.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/data.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/data.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bs2clientprotocol/data.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\"\xc4\x03\n\x0b\x41\x62ilityData\x12\x12\n\nability_id\x18\x01 \x01(\r\x12\x11\n\tlink_name\x18\x02 \x01(\t\x12\x12\n\nlink_index\x18\x03 \x01(\r\x12\x13\n\x0b\x62utton_name\x18\x04 \x01(\t\x12\x15\n\rfriendly_name\x18\x05 \x01(\t\x12\x0e\n\x06hotkey\x18\x06 \x01(\t\x12\x1c\n\x14remaps_to_ability_id\x18\x07 \x01(\r\x12\x11\n\tavailable\x18\x08 \x01(\x08\x12\x32\n\x06target\x18\t \x01(\x0e\x32\".SC2APIProtocol.AbilityData.Target\x12\x15\n\rallow_minimap\x18\n \x01(\x08\x12\x16\n\x0e\x61llow_autocast\x18\x0b \x01(\x08\x12\x13\n\x0bis_building\x18\x0c \x01(\x08\x12\x18\n\x10\x66ootprint_radius\x18\r \x01(\x02\x12\x1c\n\x14is_instant_placement\x18\x0e \x01(\x08\x12\x12\n\ncast_range\x18\x0f \x01(\x02\"I\n\x06Target\x12\x08\n\x04None\x10\x01\x12\t\n\x05Point\x10\x02\x12\x08\n\x04Unit\x10\x03\x12\x0f\n\x0bPointOrUnit\x10\x04\x12\x0f\n\x0bPointOrNone\x10\x05\"J\n\x0b\x44\x61mageBonus\x12,\n\tattribute\x18\x01 \x01(\x0e\x32\x19.SC2APIProtocol.Attribute\x12\r\n\x05\x62onus\x18\x02 \x01(\x02\"\xd7\x01\n\x06Weapon\x12/\n\x04type\x18\x01 \x01(\x0e\x32!.SC2APIProtocol.Weapon.TargetType\x12\x0e\n\x06\x64\x61mage\x18\x02 \x01(\x02\x12\x31\n\x0c\x64\x61mage_bonus\x18\x03 \x03(\x0b\x32\x1b.SC2APIProtocol.DamageBonus\x12\x0f\n\x07\x61ttacks\x18\x04 \x01(\r\x12\r\n\x05range\x18\x05 \x01(\x02\x12\r\n\x05speed\x18\x06 \x01(\x02\"*\n\nTargetType\x12\n\n\x06Ground\x10\x01\x12\x07\n\x03\x41ir\x10\x02\x12\x07\n\x03\x41ny\x10\x03\"\x95\x04\n\x0cUnitTypeData\x12\x0f\n\x07unit_id\x18\x01 \x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\tavailable\x18\x03 \x01(\x08\x12\x12\n\ncargo_size\x18\x04 \x01(\r\x12\x14\n\x0cmineral_cost\x18\x0c \x01(\r\x12\x14\n\x0cvespene_cost\x18\r \x01(\r\x12\x15\n\rfood_required\x18\x0e \x01(\x02\x12\x15\n\rfood_provided\x18\x12 \x01(\x02\x12\x12\n\nability_id\x18\x0f \x01(\r\x12\"\n\x04race\x18\x10 \x01(\x0e\x32\x14.SC2APIProtocol.Race\x12\x12\n\nbuild_time\x18\x11 \x01(\x02\x12\x13\n\x0bhas_vespene\x18\x13 \x01(\x08\x12\x14\n\x0chas_minerals\x18\x14 \x01(\x08\x12\x13\n\x0bsight_range\x18\x19 \x01(\x02\x12\x12\n\ntech_alias\x18\x15 \x03(\r\x12\x12\n\nunit_alias\x18\x16 \x01(\r\x12\x18\n\x10tech_requirement\x18\x17 \x01(\r\x12\x18\n\x10require_attached\x18\x18 \x01(\x08\x12-\n\nattributes\x18\x08 \x03(\x0e\x32\x19.SC2APIProtocol.Attribute\x12\x16\n\x0emovement_speed\x18\t \x01(\x02\x12\r\n\x05\x61rmor\x18\n \x01(\x02\x12\'\n\x07weapons\x18\x0b \x03(\x0b\x32\x16.SC2APIProtocol.Weapon\"\x86\x01\n\x0bUpgradeData\x12\x12\n\nupgrade_id\x18\x01 \x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0cmineral_cost\x18\x03 \x01(\r\x12\x14\n\x0cvespene_cost\x18\x04 \x01(\r\x12\x15\n\rresearch_time\x18\x05 \x01(\x02\x12\x12\n\nability_id\x18\x06 \x01(\r\")\n\x08\x42uffData\x12\x0f\n\x07\x62uff_id\x18\x01 \x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\"T\n\nEffectData\x12\x11\n\teffect_id\x18\x01 \x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x15\n\rfriendly_name\x18\x03 \x01(\t\x12\x0e\n\x06radius\x18\x04 \x01(\x02*\x9e\x01\n\tAttribute\x12\t\n\x05Light\x10\x01\x12\x0b\n\x07\x41rmored\x10\x02\x12\x0e\n\nBiological\x10\x03\x12\x0e\n\nMechanical\x10\x04\x12\x0b\n\x07Robotic\x10\x05\x12\x0b\n\x07Psionic\x10\x06\x12\x0b\n\x07Massive\x10\x07\x12\r\n\tStructure\x10\x08\x12\t\n\x05Hover\x10\t\x12\n\n\x06Heroic\x10\n\x12\x0c\n\x08Summoned\x10\x0b')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.data_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_ATTRIBUTE']._serialized_start=1630
+  _globals['_ATTRIBUTE']._serialized_end=1788
+  _globals['_ABILITYDATA']._serialized_start=79
+  _globals['_ABILITYDATA']._serialized_end=531
+  _globals['_ABILITYDATA_TARGET']._serialized_start=458
+  _globals['_ABILITYDATA_TARGET']._serialized_end=531
+  _globals['_DAMAGEBONUS']._serialized_start=533
+  _globals['_DAMAGEBONUS']._serialized_end=607
+  _globals['_WEAPON']._serialized_start=610
+  _globals['_WEAPON']._serialized_end=825
+  _globals['_WEAPON_TARGETTYPE']._serialized_start=783
+  _globals['_WEAPON_TARGETTYPE']._serialized_end=825
+  _globals['_UNITTYPEDATA']._serialized_start=828
+  _globals['_UNITTYPEDATA']._serialized_end=1361
+  _globals['_UPGRADEDATA']._serialized_start=1364
+  _globals['_UPGRADEDATA']._serialized_end=1498
+  _globals['_BUFFDATA']._serialized_start=1500
+  _globals['_BUFFDATA']._serialized_end=1541
+  _globals['_EFFECTDATA']._serialized_start=1543
+  _globals['_EFFECTDATA']._serialized_end=1627
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/debug_pb2.py b/worlds/_sc2common/bot/proto/debug_pb2.py
new file mode 100644
index 0000000000..6715c8b0f2
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/debug_pb2.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/debug.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/debug.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cs2clientprotocol/debug.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\"\xbb\x03\n\x0c\x44\x65\x62ugCommand\x12)\n\x04\x64raw\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.DebugDrawH\x00\x12\x34\n\ngame_state\x18\x02 \x01(\x0e\x32\x1e.SC2APIProtocol.DebugGameStateH\x00\x12\x36\n\x0b\x63reate_unit\x18\x03 \x01(\x0b\x32\x1f.SC2APIProtocol.DebugCreateUnitH\x00\x12\x32\n\tkill_unit\x18\x04 \x01(\x0b\x32\x1d.SC2APIProtocol.DebugKillUnitH\x00\x12\x38\n\x0ctest_process\x18\x05 \x01(\x0b\x32 .SC2APIProtocol.DebugTestProcessH\x00\x12.\n\x05score\x18\x06 \x01(\x0b\x32\x1d.SC2APIProtocol.DebugSetScoreH\x00\x12\x30\n\x08\x65nd_game\x18\x07 \x01(\x0b\x32\x1c.SC2APIProtocol.DebugEndGameH\x00\x12\x37\n\nunit_value\x18\x08 \x01(\x0b\x32!.SC2APIProtocol.DebugSetUnitValueH\x00\x42\t\n\x07\x63ommand\"\xb5\x01\n\tDebugDraw\x12\'\n\x04text\x18\x01 \x03(\x0b\x32\x19.SC2APIProtocol.DebugText\x12(\n\x05lines\x18\x02 \x03(\x0b\x32\x19.SC2APIProtocol.DebugLine\x12\'\n\x05\x62oxes\x18\x03 \x03(\x0b\x32\x18.SC2APIProtocol.DebugBox\x12,\n\x07spheres\x18\x04 \x03(\x0b\x32\x1b.SC2APIProtocol.DebugSphere\"L\n\x04Line\x12!\n\x02p0\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12!\n\x02p1\x18\x02 \x01(\x0b\x32\x15.SC2APIProtocol.Point\"(\n\x05\x43olor\x12\t\n\x01r\x18\x01 \x01(\r\x12\t\n\x01g\x18\x02 \x01(\r\x12\t\n\x01\x62\x18\x03 \x01(\r\"\xa3\x01\n\tDebugText\x12$\n\x05\x63olor\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Color\x12\x0c\n\x04text\x18\x02 \x01(\t\x12*\n\x0bvirtual_pos\x18\x03 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12(\n\tworld_pos\x18\x04 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x0c\n\x04size\x18\x05 \x01(\r\"U\n\tDebugLine\x12$\n\x05\x63olor\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Color\x12\"\n\x04line\x18\x02 \x01(\x0b\x32\x14.SC2APIProtocol.Line\"x\n\x08\x44\x65\x62ugBox\x12$\n\x05\x63olor\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Color\x12\"\n\x03min\x18\x02 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\"\n\x03max\x18\x03 \x01(\x0b\x32\x15.SC2APIProtocol.Point\"`\n\x0b\x44\x65\x62ugSphere\x12$\n\x05\x63olor\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Color\x12 \n\x01p\x18\x02 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\t\n\x01r\x18\x03 \x01(\x02\"k\n\x0f\x44\x65\x62ugCreateUnit\x12\x11\n\tunit_type\x18\x01 \x01(\r\x12\r\n\x05owner\x18\x02 \x01(\x05\x12$\n\x03pos\x18\x03 \x01(\x0b\x32\x17.SC2APIProtocol.Point2D\x12\x10\n\x08quantity\x18\x04 \x01(\r\"\x1c\n\rDebugKillUnit\x12\x0b\n\x03tag\x18\x01 \x03(\x04\"\x80\x01\n\x10\x44\x65\x62ugTestProcess\x12\x33\n\x04test\x18\x01 \x01(\x0e\x32%.SC2APIProtocol.DebugTestProcess.Test\x12\x10\n\x08\x64\x65lay_ms\x18\x02 \x01(\x05\"%\n\x04Test\x12\x08\n\x04hang\x10\x01\x12\t\n\x05\x63rash\x10\x02\x12\x08\n\x04\x65xit\x10\x03\"\x1e\n\rDebugSetScore\x12\r\n\x05score\x18\x01 \x01(\x02\"z\n\x0c\x44\x65\x62ugEndGame\x12:\n\nend_result\x18\x01 \x01(\x0e\x32&.SC2APIProtocol.DebugEndGame.EndResult\".\n\tEndResult\x12\r\n\tSurrender\x10\x01\x12\x12\n\x0e\x44\x65\x63lareVictory\x10\x02\"\xa5\x01\n\x11\x44\x65\x62ugSetUnitValue\x12?\n\nunit_value\x18\x01 \x01(\x0e\x32+.SC2APIProtocol.DebugSetUnitValue.UnitValue\x12\r\n\x05value\x18\x02 \x01(\x02\x12\x10\n\x08unit_tag\x18\x03 \x01(\x04\".\n\tUnitValue\x12\n\n\x06\x45nergy\x10\x01\x12\x08\n\x04Life\x10\x02\x12\x0b\n\x07Shields\x10\x03*\xb2\x01\n\x0e\x44\x65\x62ugGameState\x12\x0c\n\x08show_map\x10\x01\x12\x11\n\rcontrol_enemy\x10\x02\x12\x08\n\x04\x66ood\x10\x03\x12\x08\n\x04\x66ree\x10\x04\x12\x11\n\rall_resources\x10\x05\x12\x07\n\x03god\x10\x06\x12\x0c\n\x08minerals\x10\x07\x12\x07\n\x03gas\x10\x08\x12\x0c\n\x08\x63ooldown\x10\t\x12\r\n\ttech_tree\x10\n\x12\x0b\n\x07upgrade\x10\x0b\x12\x0e\n\nfast_build\x10\x0c')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.debug_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_DEBUGGAMESTATE']._serialized_start=1897
+  _globals['_DEBUGGAMESTATE']._serialized_end=2075
+  _globals['_DEBUGCOMMAND']._serialized_start=80
+  _globals['_DEBUGCOMMAND']._serialized_end=523
+  _globals['_DEBUGDRAW']._serialized_start=526
+  _globals['_DEBUGDRAW']._serialized_end=707
+  _globals['_LINE']._serialized_start=709
+  _globals['_LINE']._serialized_end=785
+  _globals['_COLOR']._serialized_start=787
+  _globals['_COLOR']._serialized_end=827
+  _globals['_DEBUGTEXT']._serialized_start=830
+  _globals['_DEBUGTEXT']._serialized_end=993
+  _globals['_DEBUGLINE']._serialized_start=995
+  _globals['_DEBUGLINE']._serialized_end=1080
+  _globals['_DEBUGBOX']._serialized_start=1082
+  _globals['_DEBUGBOX']._serialized_end=1202
+  _globals['_DEBUGSPHERE']._serialized_start=1204
+  _globals['_DEBUGSPHERE']._serialized_end=1300
+  _globals['_DEBUGCREATEUNIT']._serialized_start=1302
+  _globals['_DEBUGCREATEUNIT']._serialized_end=1409
+  _globals['_DEBUGKILLUNIT']._serialized_start=1411
+  _globals['_DEBUGKILLUNIT']._serialized_end=1439
+  _globals['_DEBUGTESTPROCESS']._serialized_start=1442
+  _globals['_DEBUGTESTPROCESS']._serialized_end=1570
+  _globals['_DEBUGTESTPROCESS_TEST']._serialized_start=1533
+  _globals['_DEBUGTESTPROCESS_TEST']._serialized_end=1570
+  _globals['_DEBUGSETSCORE']._serialized_start=1572
+  _globals['_DEBUGSETSCORE']._serialized_end=1602
+  _globals['_DEBUGENDGAME']._serialized_start=1604
+  _globals['_DEBUGENDGAME']._serialized_end=1726
+  _globals['_DEBUGENDGAME_ENDRESULT']._serialized_start=1680
+  _globals['_DEBUGENDGAME_ENDRESULT']._serialized_end=1726
+  _globals['_DEBUGSETUNITVALUE']._serialized_start=1729
+  _globals['_DEBUGSETUNITVALUE']._serialized_end=1894
+  _globals['_DEBUGSETUNITVALUE_UNITVALUE']._serialized_start=1848
+  _globals['_DEBUGSETUNITVALUE_UNITVALUE']._serialized_end=1894
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/error_pb2.py b/worlds/_sc2common/bot/proto/error_pb2.py
new file mode 100644
index 0000000000..d9c5709d74
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/error_pb2.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/error.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/error.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cs2clientprotocol/error.proto\x12\x0eSC2APIProtocol*\xa8-\n\x0c\x41\x63tionResult\x12\x0b\n\x07Success\x10\x01\x12\x10\n\x0cNotSupported\x10\x02\x12\t\n\x05\x45rror\x10\x03\x12\x16\n\x12\x43\x61ntQueueThatOrder\x10\x04\x12\t\n\x05Retry\x10\x05\x12\x0c\n\x08\x43ooldown\x10\x06\x12\x0f\n\x0bQueueIsFull\x10\x07\x12\x14\n\x10RallyQueueIsFull\x10\x08\x12\x15\n\x11NotEnoughMinerals\x10\t\x12\x14\n\x10NotEnoughVespene\x10\n\x12\x16\n\x12NotEnoughTerrazine\x10\x0b\x12\x13\n\x0fNotEnoughCustom\x10\x0c\x12\x11\n\rNotEnoughFood\x10\r\x12\x17\n\x13\x46oodUsageImpossible\x10\x0e\x12\x11\n\rNotEnoughLife\x10\x0f\x12\x14\n\x10NotEnoughShields\x10\x10\x12\x13\n\x0fNotEnoughEnergy\x10\x11\x12\x12\n\x0eLifeSuppressed\x10\x12\x12\x15\n\x11ShieldsSuppressed\x10\x13\x12\x14\n\x10\x45nergySuppressed\x10\x14\x12\x14\n\x10NotEnoughCharges\x10\x15\x12\x16\n\x12\x43\x61ntAddMoreCharges\x10\x16\x12\x13\n\x0fTooMuchMinerals\x10\x17\x12\x12\n\x0eTooMuchVespene\x10\x18\x12\x14\n\x10TooMuchTerrazine\x10\x19\x12\x11\n\rTooMuchCustom\x10\x1a\x12\x0f\n\x0bTooMuchFood\x10\x1b\x12\x0f\n\x0bTooMuchLife\x10\x1c\x12\x12\n\x0eTooMuchShields\x10\x1d\x12\x11\n\rTooMuchEnergy\x10\x1e\x12\x1a\n\x16MustTargetUnitWithLife\x10\x1f\x12\x1d\n\x19MustTargetUnitWithShields\x10 \x12\x1c\n\x18MustTargetUnitWithEnergy\x10!\x12\r\n\tCantTrade\x10\"\x12\r\n\tCantSpend\x10#\x12\x16\n\x12\x43\x61ntTargetThatUnit\x10$\x12\x17\n\x13\x43ouldntAllocateUnit\x10%\x12\x10\n\x0cUnitCantMove\x10&\x12\x1e\n\x1aTransportIsHoldingPosition\x10\'\x12\x1f\n\x1b\x42uildTechRequirementsNotMet\x10(\x12\x1d\n\x19\x43\x61ntFindPlacementLocation\x10)\x12\x13\n\x0f\x43\x61ntBuildOnThat\x10*\x12\x1e\n\x1a\x43\x61ntBuildTooCloseToDropOff\x10+\x12\x1c\n\x18\x43\x61ntBuildLocationInvalid\x10,\x12\x18\n\x14\x43\x61ntSeeBuildLocation\x10-\x12\"\n\x1e\x43\x61ntBuildTooCloseToCreepSource\x10.\x12 \n\x1c\x43\x61ntBuildTooCloseToResources\x10/\x12\x1c\n\x18\x43\x61ntBuildTooFarFromWater\x10\x30\x12\"\n\x1e\x43\x61ntBuildTooFarFromCreepSource\x10\x31\x12\'\n#CantBuildTooFarFromBuildPowerSource\x10\x32\x12\x1b\n\x17\x43\x61ntBuildOnDenseTerrain\x10\x33\x12\'\n#CantTrainTooFarFromTrainPowerSource\x10\x34\x12\x1b\n\x17\x43\x61ntLandLocationInvalid\x10\x35\x12\x17\n\x13\x43\x61ntSeeLandLocation\x10\x36\x12!\n\x1d\x43\x61ntLandTooCloseToCreepSource\x10\x37\x12\x1f\n\x1b\x43\x61ntLandTooCloseToResources\x10\x38\x12\x1b\n\x17\x43\x61ntLandTooFarFromWater\x10\x39\x12!\n\x1d\x43\x61ntLandTooFarFromCreepSource\x10:\x12&\n\"CantLandTooFarFromBuildPowerSource\x10;\x12&\n\"CantLandTooFarFromTrainPowerSource\x10<\x12\x1a\n\x16\x43\x61ntLandOnDenseTerrain\x10=\x12\x1b\n\x17\x41\x64\x64OnTooFarFromBuilding\x10>\x12\x1a\n\x16MustBuildRefineryFirst\x10?\x12\x1f\n\x1b\x42uildingIsUnderConstruction\x10@\x12\x13\n\x0f\x43\x61ntFindDropOff\x10\x41\x12\x1d\n\x19\x43\x61ntLoadOtherPlayersUnits\x10\x42\x12\x1b\n\x17NotEnoughRoomToLoadUnit\x10\x43\x12\x18\n\x14\x43\x61ntUnloadUnitsThere\x10\x44\x12\x18\n\x14\x43\x61ntWarpInUnitsThere\x10\x45\x12\x19\n\x15\x43\x61ntLoadImmobileUnits\x10\x46\x12\x1d\n\x19\x43\x61ntRechargeImmobileUnits\x10G\x12&\n\"CantRechargeUnderConstructionUnits\x10H\x12\x14\n\x10\x43\x61ntLoadThatUnit\x10I\x12\x13\n\x0fNoCargoToUnload\x10J\x12\x19\n\x15LoadAllNoTargetsFound\x10K\x12\x14\n\x10NotWhileOccupied\x10L\x12\x19\n\x15\x43\x61ntAttackWithoutAmmo\x10M\x12\x17\n\x13\x43\x61ntHoldAnyMoreAmmo\x10N\x12\x1a\n\x16TechRequirementsNotMet\x10O\x12\x19\n\x15MustLockdownUnitFirst\x10P\x12\x12\n\x0eMustTargetUnit\x10Q\x12\x17\n\x13MustTargetInventory\x10R\x12\x19\n\x15MustTargetVisibleUnit\x10S\x12\x1d\n\x19MustTargetVisibleLocation\x10T\x12\x1e\n\x1aMustTargetWalkableLocation\x10U\x12\x1a\n\x16MustTargetPawnableUnit\x10V\x12\x1a\n\x16YouCantControlThatUnit\x10W\x12\"\n\x1eYouCantIssueCommandsToThatUnit\x10X\x12\x17\n\x13MustTargetResources\x10Y\x12\x16\n\x12RequiresHealTarget\x10Z\x12\x18\n\x14RequiresRepairTarget\x10[\x12\x11\n\rNoItemsToDrop\x10\\\x12\x18\n\x14\x43\x61ntHoldAnyMoreItems\x10]\x12\x10\n\x0c\x43\x61ntHoldThat\x10^\x12\x18\n\x14TargetHasNoInventory\x10_\x12\x14\n\x10\x43\x61ntDropThisItem\x10`\x12\x14\n\x10\x43\x61ntMoveThisItem\x10\x61\x12\x14\n\x10\x43\x61ntPawnThisUnit\x10\x62\x12\x14\n\x10MustTargetCaster\x10\x63\x12\x14\n\x10\x43\x61ntTargetCaster\x10\x64\x12\x13\n\x0fMustTargetOuter\x10\x65\x12\x13\n\x0f\x43\x61ntTargetOuter\x10\x66\x12\x1a\n\x16MustTargetYourOwnUnits\x10g\x12\x1a\n\x16\x43\x61ntTargetYourOwnUnits\x10h\x12\x1b\n\x17MustTargetFriendlyUnits\x10i\x12\x1b\n\x17\x43\x61ntTargetFriendlyUnits\x10j\x12\x1a\n\x16MustTargetNeutralUnits\x10k\x12\x1a\n\x16\x43\x61ntTargetNeutralUnits\x10l\x12\x18\n\x14MustTargetEnemyUnits\x10m\x12\x18\n\x14\x43\x61ntTargetEnemyUnits\x10n\x12\x16\n\x12MustTargetAirUnits\x10o\x12\x16\n\x12\x43\x61ntTargetAirUnits\x10p\x12\x19\n\x15MustTargetGroundUnits\x10q\x12\x19\n\x15\x43\x61ntTargetGroundUnits\x10r\x12\x18\n\x14MustTargetStructures\x10s\x12\x18\n\x14\x43\x61ntTargetStructures\x10t\x12\x18\n\x14MustTargetLightUnits\x10u\x12\x18\n\x14\x43\x61ntTargetLightUnits\x10v\x12\x1a\n\x16MustTargetArmoredUnits\x10w\x12\x1a\n\x16\x43\x61ntTargetArmoredUnits\x10x\x12\x1d\n\x19MustTargetBiologicalUnits\x10y\x12\x1d\n\x19\x43\x61ntTargetBiologicalUnits\x10z\x12\x19\n\x15MustTargetHeroicUnits\x10{\x12\x19\n\x15\x43\x61ntTargetHeroicUnits\x10|\x12\x1a\n\x16MustTargetRoboticUnits\x10}\x12\x1a\n\x16\x43\x61ntTargetRoboticUnits\x10~\x12\x1d\n\x19MustTargetMechanicalUnits\x10\x7f\x12\x1e\n\x19\x43\x61ntTargetMechanicalUnits\x10\x80\x01\x12\x1b\n\x16MustTargetPsionicUnits\x10\x81\x01\x12\x1b\n\x16\x43\x61ntTargetPsionicUnits\x10\x82\x01\x12\x1b\n\x16MustTargetMassiveUnits\x10\x83\x01\x12\x1b\n\x16\x43\x61ntTargetMassiveUnits\x10\x84\x01\x12\x16\n\x11MustTargetMissile\x10\x85\x01\x12\x16\n\x11\x43\x61ntTargetMissile\x10\x86\x01\x12\x1a\n\x15MustTargetWorkerUnits\x10\x87\x01\x12\x1a\n\x15\x43\x61ntTargetWorkerUnits\x10\x88\x01\x12!\n\x1cMustTargetEnergyCapableUnits\x10\x89\x01\x12!\n\x1c\x43\x61ntTargetEnergyCapableUnits\x10\x8a\x01\x12!\n\x1cMustTargetShieldCapableUnits\x10\x8b\x01\x12!\n\x1c\x43\x61ntTargetShieldCapableUnits\x10\x8c\x01\x12\x15\n\x10MustTargetFlyers\x10\x8d\x01\x12\x15\n\x10\x43\x61ntTargetFlyers\x10\x8e\x01\x12\x1a\n\x15MustTargetBuriedUnits\x10\x8f\x01\x12\x1a\n\x15\x43\x61ntTargetBuriedUnits\x10\x90\x01\x12\x1b\n\x16MustTargetCloakedUnits\x10\x91\x01\x12\x1b\n\x16\x43\x61ntTargetCloakedUnits\x10\x92\x01\x12\"\n\x1dMustTargetUnitsInAStasisField\x10\x93\x01\x12\"\n\x1d\x43\x61ntTargetUnitsInAStasisField\x10\x94\x01\x12%\n MustTargetUnderConstructionUnits\x10\x95\x01\x12%\n CantTargetUnderConstructionUnits\x10\x96\x01\x12\x18\n\x13MustTargetDeadUnits\x10\x97\x01\x12\x18\n\x13\x43\x61ntTargetDeadUnits\x10\x98\x01\x12\x1d\n\x18MustTargetRevivableUnits\x10\x99\x01\x12\x1d\n\x18\x43\x61ntTargetRevivableUnits\x10\x9a\x01\x12\x1a\n\x15MustTargetHiddenUnits\x10\x9b\x01\x12\x1a\n\x15\x43\x61ntTargetHiddenUnits\x10\x9c\x01\x12\"\n\x1d\x43\x61ntRechargeOtherPlayersUnits\x10\x9d\x01\x12\x1d\n\x18MustTargetHallucinations\x10\x9e\x01\x12\x1d\n\x18\x43\x61ntTargetHallucinations\x10\x9f\x01\x12 \n\x1bMustTargetInvulnerableUnits\x10\xa0\x01\x12 \n\x1b\x43\x61ntTargetInvulnerableUnits\x10\xa1\x01\x12\x1c\n\x17MustTargetDetectedUnits\x10\xa2\x01\x12\x1c\n\x17\x43\x61ntTargetDetectedUnits\x10\xa3\x01\x12\x1d\n\x18\x43\x61ntTargetUnitWithEnergy\x10\xa4\x01\x12\x1e\n\x19\x43\x61ntTargetUnitWithShields\x10\xa5\x01\x12!\n\x1cMustTargetUncommandableUnits\x10\xa6\x01\x12!\n\x1c\x43\x61ntTargetUncommandableUnits\x10\xa7\x01\x12!\n\x1cMustTargetPreventDefeatUnits\x10\xa8\x01\x12!\n\x1c\x43\x61ntTargetPreventDefeatUnits\x10\xa9\x01\x12!\n\x1cMustTargetPreventRevealUnits\x10\xaa\x01\x12!\n\x1c\x43\x61ntTargetPreventRevealUnits\x10\xab\x01\x12\x1b\n\x16MustTargetPassiveUnits\x10\xac\x01\x12\x1b\n\x16\x43\x61ntTargetPassiveUnits\x10\xad\x01\x12\x1b\n\x16MustTargetStunnedUnits\x10\xae\x01\x12\x1b\n\x16\x43\x61ntTargetStunnedUnits\x10\xaf\x01\x12\x1c\n\x17MustTargetSummonedUnits\x10\xb0\x01\x12\x1c\n\x17\x43\x61ntTargetSummonedUnits\x10\xb1\x01\x12\x14\n\x0fMustTargetUser1\x10\xb2\x01\x12\x14\n\x0f\x43\x61ntTargetUser1\x10\xb3\x01\x12\x1f\n\x1aMustTargetUnstoppableUnits\x10\xb4\x01\x12\x1f\n\x1a\x43\x61ntTargetUnstoppableUnits\x10\xb5\x01\x12\x1d\n\x18MustTargetResistantUnits\x10\xb6\x01\x12\x1d\n\x18\x43\x61ntTargetResistantUnits\x10\xb7\x01\x12\x19\n\x14MustTargetDazedUnits\x10\xb8\x01\x12\x19\n\x14\x43\x61ntTargetDazedUnits\x10\xb9\x01\x12\x11\n\x0c\x43\x61ntLockdown\x10\xba\x01\x12\x14\n\x0f\x43\x61ntMindControl\x10\xbb\x01\x12\x1c\n\x17MustTargetDestructibles\x10\xbc\x01\x12\x1c\n\x17\x43\x61ntTargetDestructibles\x10\xbd\x01\x12\x14\n\x0fMustTargetItems\x10\xbe\x01\x12\x14\n\x0f\x43\x61ntTargetItems\x10\xbf\x01\x12\x18\n\x13NoCalldownAvailable\x10\xc0\x01\x12\x15\n\x10WaypointListFull\x10\xc1\x01\x12\x13\n\x0eMustTargetRace\x10\xc2\x01\x12\x13\n\x0e\x43\x61ntTargetRace\x10\xc3\x01\x12\x1b\n\x16MustTargetSimilarUnits\x10\xc4\x01\x12\x1b\n\x16\x43\x61ntTargetSimilarUnits\x10\xc5\x01\x12\x1a\n\x15\x43\x61ntFindEnoughTargets\x10\xc6\x01\x12\x19\n\x14\x41lreadySpawningLarva\x10\xc7\x01\x12!\n\x1c\x43\x61ntTargetExhaustedResources\x10\xc8\x01\x12\x13\n\x0e\x43\x61ntUseMinimap\x10\xc9\x01\x12\x15\n\x10\x43\x61ntUseInfoPanel\x10\xca\x01\x12\x15\n\x10OrderQueueIsFull\x10\xcb\x01\x12\x1c\n\x17\x43\x61ntHarvestThatResource\x10\xcc\x01\x12\x1a\n\x15HarvestersNotRequired\x10\xcd\x01\x12\x14\n\x0f\x41lreadyTargeted\x10\xce\x01\x12\x1e\n\x19\x43\x61ntAttackWeaponsDisabled\x10\xcf\x01\x12\x17\n\x12\x43ouldntReachTarget\x10\xd0\x01\x12\x17\n\x12TargetIsOutOfRange\x10\xd1\x01\x12\x15\n\x10TargetIsTooClose\x10\xd2\x01\x12\x15\n\x10TargetIsOutOfArc\x10\xd3\x01\x12\x1d\n\x18\x43\x61ntFindTeleportLocation\x10\xd4\x01\x12\x15\n\x10InvalidItemClass\x10\xd5\x01\x12\x18\n\x13\x43\x61ntFindCancelOrder\x10\xd6\x01')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.error_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_ACTIONRESULT']._serialized_start=49
+  _globals['_ACTIONRESULT']._serialized_end=5849
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/query_pb2.py b/worlds/_sc2common/bot/proto/query_pb2.py
new file mode 100644
index 0000000000..40d09ecce1
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/query_pb2.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/query.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/query.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+from . import error_pb2 as s2clientprotocol_dot_error__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cs2clientprotocol/query.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\x1a\x1cs2clientprotocol/error.proto\"\xf0\x01\n\x0cRequestQuery\x12\x34\n\x07pathing\x18\x01 \x03(\x0b\x32#.SC2APIProtocol.RequestQueryPathing\x12\x41\n\tabilities\x18\x02 \x03(\x0b\x32..SC2APIProtocol.RequestQueryAvailableAbilities\x12\x41\n\nplacements\x18\x03 \x03(\x0b\x32-.SC2APIProtocol.RequestQueryBuildingPlacement\x12$\n\x1cignore_resource_requirements\x18\x04 \x01(\x08\"\xce\x01\n\rResponseQuery\x12\x35\n\x07pathing\x18\x01 \x03(\x0b\x32$.SC2APIProtocol.ResponseQueryPathing\x12\x42\n\tabilities\x18\x02 \x03(\x0b\x32/.SC2APIProtocol.ResponseQueryAvailableAbilities\x12\x42\n\nplacements\x18\x03 \x03(\x0b\x32..SC2APIProtocol.ResponseQueryBuildingPlacement\"\x8a\x01\n\x13RequestQueryPathing\x12,\n\tstart_pos\x18\x01 \x01(\x0b\x32\x17.SC2APIProtocol.Point2DH\x00\x12\x12\n\x08unit_tag\x18\x02 \x01(\x04H\x00\x12(\n\x07\x65nd_pos\x18\x03 \x01(\x0b\x32\x17.SC2APIProtocol.Point2DB\x07\n\x05start\"(\n\x14ResponseQueryPathing\x12\x10\n\x08\x64istance\x18\x01 \x01(\x02\"2\n\x1eRequestQueryAvailableAbilities\x12\x10\n\x08unit_tag\x18\x01 \x01(\x04\"~\n\x1fResponseQueryAvailableAbilities\x12\x33\n\tabilities\x18\x01 \x03(\x0b\x32 .SC2APIProtocol.AvailableAbility\x12\x10\n\x08unit_tag\x18\x02 \x01(\x04\x12\x14\n\x0cunit_type_id\x18\x03 \x01(\r\"z\n\x1dRequestQueryBuildingPlacement\x12\x12\n\nability_id\x18\x01 \x01(\x05\x12+\n\ntarget_pos\x18\x02 \x01(\x0b\x32\x17.SC2APIProtocol.Point2D\x12\x18\n\x10placing_unit_tag\x18\x03 \x01(\x04\"N\n\x1eResponseQueryBuildingPlacement\x12,\n\x06result\x18\x01 \x01(\x0e\x32\x1c.SC2APIProtocol.ActionResult')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.query_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_REQUESTQUERY']._serialized_start=110
+  _globals['_REQUESTQUERY']._serialized_end=350
+  _globals['_RESPONSEQUERY']._serialized_start=353
+  _globals['_RESPONSEQUERY']._serialized_end=559
+  _globals['_REQUESTQUERYPATHING']._serialized_start=562
+  _globals['_REQUESTQUERYPATHING']._serialized_end=700
+  _globals['_RESPONSEQUERYPATHING']._serialized_start=702
+  _globals['_RESPONSEQUERYPATHING']._serialized_end=742
+  _globals['_REQUESTQUERYAVAILABLEABILITIES']._serialized_start=744
+  _globals['_REQUESTQUERYAVAILABLEABILITIES']._serialized_end=794
+  _globals['_RESPONSEQUERYAVAILABLEABILITIES']._serialized_start=796
+  _globals['_RESPONSEQUERYAVAILABLEABILITIES']._serialized_end=922
+  _globals['_REQUESTQUERYBUILDINGPLACEMENT']._serialized_start=924
+  _globals['_REQUESTQUERYBUILDINGPLACEMENT']._serialized_end=1046
+  _globals['_RESPONSEQUERYBUILDINGPLACEMENT']._serialized_start=1048
+  _globals['_RESPONSEQUERYBUILDINGPLACEMENT']._serialized_end=1126
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/raw_pb2.py b/worlds/_sc2common/bot/proto/raw_pb2.py
new file mode 100644
index 0000000000..3eb9ea182c
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/raw_pb2.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/raw.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/raw.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1as2clientprotocol/raw.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\"\xb1\x02\n\x08StartRaw\x12)\n\x08map_size\x18\x01 \x01(\x0b\x32\x17.SC2APIProtocol.Size2DI\x12/\n\x0cpathing_grid\x18\x02 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0eterrain_height\x18\x03 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0eplacement_grid\x18\x04 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\rplayable_area\x18\x05 \x01(\x0b\x32\x1a.SC2APIProtocol.RectangleI\x12\x30\n\x0fstart_locations\x18\x06 \x03(\x0b\x32\x17.SC2APIProtocol.Point2D\"\x86\x02\n\x0eObservationRaw\x12)\n\x06player\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.PlayerRaw\x12#\n\x05units\x18\x02 \x03(\x0b\x32\x14.SC2APIProtocol.Unit\x12+\n\tmap_state\x18\x03 \x01(\x0b\x32\x18.SC2APIProtocol.MapState\x12$\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x15.SC2APIProtocol.Event\x12\'\n\x07\x65\x66\x66\x65\x63ts\x18\x05 \x03(\x0b\x32\x16.SC2APIProtocol.Effect\x12(\n\x05radar\x18\x06 \x03(\x0b\x32\x19.SC2APIProtocol.RadarRing\"?\n\tRadarRing\x12\"\n\x03pos\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x0e\n\x06radius\x18\x02 \x01(\x02\"N\n\x0bPowerSource\x12\"\n\x03pos\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x0e\n\x06radius\x18\x02 \x01(\x02\x12\x0b\n\x03tag\x18\x03 \x01(\x04\"{\n\tPlayerRaw\x12\x32\n\rpower_sources\x18\x01 \x03(\x0b\x32\x1b.SC2APIProtocol.PowerSource\x12%\n\x06\x63\x61mera\x18\x02 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x13\n\x0bupgrade_ids\x18\x03 \x03(\r\"\x8f\x01\n\tUnitOrder\x12\x12\n\nability_id\x18\x01 \x01(\r\x12\x37\n\x16target_world_space_pos\x18\x02 \x01(\x0b\x32\x15.SC2APIProtocol.PointH\x00\x12\x19\n\x0ftarget_unit_tag\x18\x03 \x01(\x04H\x00\x12\x10\n\x08progress\x18\x04 \x01(\x02\x42\x08\n\x06target\"\x9b\x01\n\rPassengerUnit\x12\x0b\n\x03tag\x18\x01 \x01(\x04\x12\x0e\n\x06health\x18\x02 \x01(\x02\x12\x12\n\nhealth_max\x18\x03 \x01(\x02\x12\x0e\n\x06shield\x18\x04 \x01(\x02\x12\x12\n\nshield_max\x18\x07 \x01(\x02\x12\x0e\n\x06\x65nergy\x18\x05 \x01(\x02\x12\x12\n\nenergy_max\x18\x08 \x01(\x02\x12\x11\n\tunit_type\x18\x06 \x01(\r\"@\n\x0bRallyTarget\x12$\n\x05point\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x0b\n\x03tag\x18\x02 \x01(\x04\"\xf5\x08\n\x04Unit\x12\x31\n\x0c\x64isplay_type\x18\x01 \x01(\x0e\x32\x1b.SC2APIProtocol.DisplayType\x12*\n\x08\x61lliance\x18\x02 \x01(\x0e\x32\x18.SC2APIProtocol.Alliance\x12\x0b\n\x03tag\x18\x03 \x01(\x04\x12\x11\n\tunit_type\x18\x04 \x01(\r\x12\r\n\x05owner\x18\x05 \x01(\x05\x12\"\n\x03pos\x18\x06 \x01(\x0b\x32\x15.SC2APIProtocol.Point\x12\x0e\n\x06\x66\x61\x63ing\x18\x07 \x01(\x02\x12\x0e\n\x06radius\x18\x08 \x01(\x02\x12\x16\n\x0e\x62uild_progress\x18\t \x01(\x02\x12)\n\x05\x63loak\x18\n \x01(\x0e\x32\x1a.SC2APIProtocol.CloakState\x12\x10\n\x08\x62uff_ids\x18\x1b \x03(\r\x12\x14\n\x0c\x64\x65tect_range\x18\x1f \x01(\x02\x12\x13\n\x0bradar_range\x18  \x01(\x02\x12\x13\n\x0bis_selected\x18\x0b \x01(\x08\x12\x14\n\x0cis_on_screen\x18\x0c \x01(\x08\x12\x0f\n\x07is_blip\x18\r \x01(\x08\x12\x12\n\nis_powered\x18# \x01(\x08\x12\x11\n\tis_active\x18\' \x01(\x08\x12\x1c\n\x14\x61ttack_upgrade_level\x18( \x01(\x05\x12\x1b\n\x13\x61rmor_upgrade_level\x18) \x01(\x05\x12\x1c\n\x14shield_upgrade_level\x18* \x01(\x05\x12\x0e\n\x06health\x18\x0e \x01(\x02\x12\x12\n\nhealth_max\x18\x0f \x01(\x02\x12\x0e\n\x06shield\x18\x10 \x01(\x02\x12\x12\n\nshield_max\x18$ \x01(\x02\x12\x0e\n\x06\x65nergy\x18\x11 \x01(\x02\x12\x12\n\nenergy_max\x18% \x01(\x02\x12\x18\n\x10mineral_contents\x18\x12 \x01(\x05\x12\x18\n\x10vespene_contents\x18\x13 \x01(\x05\x12\x11\n\tis_flying\x18\x14 \x01(\x08\x12\x13\n\x0bis_burrowed\x18\x15 \x01(\x08\x12\x18\n\x10is_hallucination\x18& \x01(\x08\x12)\n\x06orders\x18\x16 \x03(\x0b\x32\x19.SC2APIProtocol.UnitOrder\x12\x12\n\nadd_on_tag\x18\x17 \x01(\x04\x12\x31\n\npassengers\x18\x18 \x03(\x0b\x32\x1d.SC2APIProtocol.PassengerUnit\x12\x19\n\x11\x63\x61rgo_space_taken\x18\x19 \x01(\x05\x12\x17\n\x0f\x63\x61rgo_space_max\x18\x1a \x01(\x05\x12\x1b\n\x13\x61ssigned_harvesters\x18\x1c \x01(\x05\x12\x18\n\x10ideal_harvesters\x18\x1d \x01(\x05\x12\x17\n\x0fweapon_cooldown\x18\x1e \x01(\x02\x12\x1a\n\x12\x65ngaged_target_tag\x18\" \x01(\x04\x12\x1c\n\x14\x62uff_duration_remain\x18+ \x01(\x05\x12\x19\n\x11\x62uff_duration_max\x18, \x01(\x05\x12\x32\n\rrally_targets\x18- \x03(\x0b\x32\x1b.SC2APIProtocol.RallyTarget\"c\n\x08MapState\x12-\n\nvisibility\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12(\n\x05\x63reep\x18\x02 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\"\x1b\n\x05\x45vent\x12\x12\n\ndead_units\x18\x01 \x03(\x04\"\x8c\x01\n\x06\x45\x66\x66\x65\x63t\x12\x11\n\teffect_id\x18\x01 \x01(\r\x12$\n\x03pos\x18\x02 \x03(\x0b\x32\x17.SC2APIProtocol.Point2D\x12*\n\x08\x61lliance\x18\x03 \x01(\x0e\x32\x18.SC2APIProtocol.Alliance\x12\r\n\x05owner\x18\x04 \x01(\x05\x12\x0e\n\x06radius\x18\x05 \x01(\x02\"\xd3\x01\n\tActionRaw\x12<\n\x0cunit_command\x18\x01 \x01(\x0b\x32$.SC2APIProtocol.ActionRawUnitCommandH\x00\x12:\n\x0b\x63\x61mera_move\x18\x02 \x01(\x0b\x32#.SC2APIProtocol.ActionRawCameraMoveH\x00\x12\x42\n\x0ftoggle_autocast\x18\x03 \x01(\x0b\x32\'.SC2APIProtocol.ActionRawToggleAutocastH\x00\x42\x08\n\x06\x61\x63tion\"\xb4\x01\n\x14\x41\x63tionRawUnitCommand\x12\x12\n\nability_id\x18\x01 \x01(\x05\x12\x39\n\x16target_world_space_pos\x18\x02 \x01(\x0b\x32\x17.SC2APIProtocol.Point2DH\x00\x12\x19\n\x0ftarget_unit_tag\x18\x03 \x01(\x04H\x00\x12\x11\n\tunit_tags\x18\x04 \x03(\x04\x12\x15\n\rqueue_command\x18\x05 \x01(\x08\x42\x08\n\x06target\"H\n\x13\x41\x63tionRawCameraMove\x12\x31\n\x12\x63\x65nter_world_space\x18\x01 \x01(\x0b\x32\x15.SC2APIProtocol.Point\"@\n\x17\x41\x63tionRawToggleAutocast\x12\x12\n\nability_id\x18\x01 \x01(\x05\x12\x11\n\tunit_tags\x18\x02 \x03(\x04*E\n\x0b\x44isplayType\x12\x0b\n\x07Visible\x10\x01\x12\x0c\n\x08Snapshot\x10\x02\x12\n\n\x06Hidden\x10\x03\x12\x0f\n\x0bPlaceholder\x10\x04*6\n\x08\x41lliance\x12\x08\n\x04Self\x10\x01\x12\x08\n\x04\x41lly\x10\x02\x12\x0b\n\x07Neutral\x10\x03\x12\t\n\x05\x45nemy\x10\x04*e\n\nCloakState\x12\x12\n\x0e\x43loakedUnknown\x10\x00\x12\x0b\n\x07\x43loaked\x10\x01\x12\x13\n\x0f\x43loakedDetected\x10\x02\x12\x0e\n\nNotCloaked\x10\x03\x12\x11\n\rCloakedAllied\x10\x04')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.raw_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_DISPLAYTYPE']._serialized_start=3244
+  _globals['_DISPLAYTYPE']._serialized_end=3313
+  _globals['_ALLIANCE']._serialized_start=3315
+  _globals['_ALLIANCE']._serialized_end=3369
+  _globals['_CLOAKSTATE']._serialized_start=3371
+  _globals['_CLOAKSTATE']._serialized_end=3472
+  _globals['_STARTRAW']._serialized_start=78
+  _globals['_STARTRAW']._serialized_end=383
+  _globals['_OBSERVATIONRAW']._serialized_start=386
+  _globals['_OBSERVATIONRAW']._serialized_end=648
+  _globals['_RADARRING']._serialized_start=650
+  _globals['_RADARRING']._serialized_end=713
+  _globals['_POWERSOURCE']._serialized_start=715
+  _globals['_POWERSOURCE']._serialized_end=793
+  _globals['_PLAYERRAW']._serialized_start=795
+  _globals['_PLAYERRAW']._serialized_end=918
+  _globals['_UNITORDER']._serialized_start=921
+  _globals['_UNITORDER']._serialized_end=1064
+  _globals['_PASSENGERUNIT']._serialized_start=1067
+  _globals['_PASSENGERUNIT']._serialized_end=1222
+  _globals['_RALLYTARGET']._serialized_start=1224
+  _globals['_RALLYTARGET']._serialized_end=1288
+  _globals['_UNIT']._serialized_start=1291
+  _globals['_UNIT']._serialized_end=2432
+  _globals['_MAPSTATE']._serialized_start=2434
+  _globals['_MAPSTATE']._serialized_end=2533
+  _globals['_EVENT']._serialized_start=2535
+  _globals['_EVENT']._serialized_end=2562
+  _globals['_EFFECT']._serialized_start=2565
+  _globals['_EFFECT']._serialized_end=2705
+  _globals['_ACTIONRAW']._serialized_start=2708
+  _globals['_ACTIONRAW']._serialized_end=2919
+  _globals['_ACTIONRAWUNITCOMMAND']._serialized_start=2922
+  _globals['_ACTIONRAWUNITCOMMAND']._serialized_end=3102
+  _globals['_ACTIONRAWCAMERAMOVE']._serialized_start=3104
+  _globals['_ACTIONRAWCAMERAMOVE']._serialized_end=3176
+  _globals['_ACTIONRAWTOGGLEAUTOCAST']._serialized_start=3178
+  _globals['_ACTIONRAWTOGGLEAUTOCAST']._serialized_end=3242
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/sc2api_pb2.py b/worlds/_sc2common/bot/proto/sc2api_pb2.py
new file mode 100644
index 0000000000..55a4d01008
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/sc2api_pb2.py
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/sc2api.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/sc2api.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+from . import data_pb2 as s2clientprotocol_dot_data__pb2
+from . import debug_pb2 as s2clientprotocol_dot_debug__pb2
+from . import error_pb2 as s2clientprotocol_dot_error__pb2
+from . import query_pb2 as s2clientprotocol_dot_query__pb2
+from . import raw_pb2 as s2clientprotocol_dot_raw__pb2
+from . import score_pb2 as s2clientprotocol_dot_score__pb2
+from . import spatial_pb2 as s2clientprotocol_dot_spatial__pb2
+from . import ui_pb2 as s2clientprotocol_dot_ui__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ds2clientprotocol/sc2api.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\x1a\x1bs2clientprotocol/data.proto\x1a\x1cs2clientprotocol/debug.proto\x1a\x1cs2clientprotocol/error.proto\x1a\x1cs2clientprotocol/query.proto\x1a\x1as2clientprotocol/raw.proto\x1a\x1cs2clientprotocol/score.proto\x1a\x1es2clientprotocol/spatial.proto\x1a\x19s2clientprotocol/ui.proto\"\xc3\t\n\x07Request\x12\x38\n\x0b\x63reate_game\x18\x01 \x01(\x0b\x32!.SC2APIProtocol.RequestCreateGameH\x00\x12\x34\n\tjoin_game\x18\x02 \x01(\x0b\x32\x1f.SC2APIProtocol.RequestJoinGameH\x00\x12:\n\x0crestart_game\x18\x03 \x01(\x0b\x32\".SC2APIProtocol.RequestRestartGameH\x00\x12:\n\x0cstart_replay\x18\x04 \x01(\x0b\x32\".SC2APIProtocol.RequestStartReplayH\x00\x12\x36\n\nleave_game\x18\x05 \x01(\x0b\x32 .SC2APIProtocol.RequestLeaveGameH\x00\x12\x36\n\nquick_save\x18\x06 \x01(\x0b\x32 .SC2APIProtocol.RequestQuickSaveH\x00\x12\x36\n\nquick_load\x18\x07 \x01(\x0b\x32 .SC2APIProtocol.RequestQuickLoadH\x00\x12+\n\x04quit\x18\x08 \x01(\x0b\x32\x1b.SC2APIProtocol.RequestQuitH\x00\x12\x34\n\tgame_info\x18\t \x01(\x0b\x32\x1f.SC2APIProtocol.RequestGameInfoH\x00\x12\x39\n\x0bobservation\x18\n \x01(\x0b\x32\".SC2APIProtocol.RequestObservationH\x00\x12/\n\x06\x61\x63tion\x18\x0b \x01(\x0b\x32\x1d.SC2APIProtocol.RequestActionH\x00\x12;\n\nobs_action\x18\x15 \x01(\x0b\x32%.SC2APIProtocol.RequestObserverActionH\x00\x12+\n\x04step\x18\x0c \x01(\x0b\x32\x1b.SC2APIProtocol.RequestStepH\x00\x12+\n\x04\x64\x61ta\x18\r \x01(\x0b\x32\x1b.SC2APIProtocol.RequestDataH\x00\x12-\n\x05query\x18\x0e \x01(\x0b\x32\x1c.SC2APIProtocol.RequestQueryH\x00\x12\x38\n\x0bsave_replay\x18\x0f \x01(\x0b\x32!.SC2APIProtocol.RequestSaveReplayH\x00\x12\x38\n\x0bmap_command\x18\x16 \x01(\x0b\x32!.SC2APIProtocol.RequestMapCommandH\x00\x12\x38\n\x0breplay_info\x18\x10 \x01(\x0b\x32!.SC2APIProtocol.RequestReplayInfoH\x00\x12>\n\x0e\x61vailable_maps\x18\x11 \x01(\x0b\x32$.SC2APIProtocol.RequestAvailableMapsH\x00\x12\x32\n\x08save_map\x18\x12 \x01(\x0b\x32\x1e.SC2APIProtocol.RequestSaveMapH\x00\x12+\n\x04ping\x18\x13 \x01(\x0b\x32\x1b.SC2APIProtocol.RequestPingH\x00\x12-\n\x05\x64\x65\x62ug\x18\x14 \x01(\x0b\x32\x1c.SC2APIProtocol.RequestDebugH\x00\x12\n\n\x02id\x18\x61 \x01(\rB\t\n\x07request\"\x92\n\n\x08Response\x12\x39\n\x0b\x63reate_game\x18\x01 \x01(\x0b\x32\".SC2APIProtocol.ResponseCreateGameH\x00\x12\x35\n\tjoin_game\x18\x02 \x01(\x0b\x32 .SC2APIProtocol.ResponseJoinGameH\x00\x12;\n\x0crestart_game\x18\x03 \x01(\x0b\x32#.SC2APIProtocol.ResponseRestartGameH\x00\x12;\n\x0cstart_replay\x18\x04 \x01(\x0b\x32#.SC2APIProtocol.ResponseStartReplayH\x00\x12\x37\n\nleave_game\x18\x05 \x01(\x0b\x32!.SC2APIProtocol.ResponseLeaveGameH\x00\x12\x37\n\nquick_save\x18\x06 \x01(\x0b\x32!.SC2APIProtocol.ResponseQuickSaveH\x00\x12\x37\n\nquick_load\x18\x07 \x01(\x0b\x32!.SC2APIProtocol.ResponseQuickLoadH\x00\x12,\n\x04quit\x18\x08 \x01(\x0b\x32\x1c.SC2APIProtocol.ResponseQuitH\x00\x12\x35\n\tgame_info\x18\t \x01(\x0b\x32 .SC2APIProtocol.ResponseGameInfoH\x00\x12:\n\x0bobservation\x18\n \x01(\x0b\x32#.SC2APIProtocol.ResponseObservationH\x00\x12\x30\n\x06\x61\x63tion\x18\x0b \x01(\x0b\x32\x1e.SC2APIProtocol.ResponseActionH\x00\x12<\n\nobs_action\x18\x15 \x01(\x0b\x32&.SC2APIProtocol.ResponseObserverActionH\x00\x12,\n\x04step\x18\x0c \x01(\x0b\x32\x1c.SC2APIProtocol.ResponseStepH\x00\x12,\n\x04\x64\x61ta\x18\r \x01(\x0b\x32\x1c.SC2APIProtocol.ResponseDataH\x00\x12.\n\x05query\x18\x0e \x01(\x0b\x32\x1d.SC2APIProtocol.ResponseQueryH\x00\x12\x39\n\x0bsave_replay\x18\x0f \x01(\x0b\x32\".SC2APIProtocol.ResponseSaveReplayH\x00\x12\x39\n\x0breplay_info\x18\x10 \x01(\x0b\x32\".SC2APIProtocol.ResponseReplayInfoH\x00\x12?\n\x0e\x61vailable_maps\x18\x11 \x01(\x0b\x32%.SC2APIProtocol.ResponseAvailableMapsH\x00\x12\x33\n\x08save_map\x18\x12 \x01(\x0b\x32\x1f.SC2APIProtocol.ResponseSaveMapH\x00\x12\x39\n\x0bmap_command\x18\x16 \x01(\x0b\x32\".SC2APIProtocol.ResponseMapCommandH\x00\x12,\n\x04ping\x18\x13 \x01(\x0b\x32\x1c.SC2APIProtocol.ResponsePingH\x00\x12.\n\x05\x64\x65\x62ug\x18\x14 \x01(\x0b\x32\x1d.SC2APIProtocol.ResponseDebugH\x00\x12\n\n\x02id\x18\x61 \x01(\r\x12\r\n\x05\x65rror\x18\x62 \x03(\t\x12&\n\x06status\x18\x63 \x01(\x0e\x32\x16.SC2APIProtocol.StatusB\n\n\x08response\"\xd6\x01\n\x11RequestCreateGame\x12-\n\tlocal_map\x18\x01 \x01(\x0b\x32\x18.SC2APIProtocol.LocalMapH\x00\x12\x1c\n\x12\x62\x61ttlenet_map_name\x18\x02 \x01(\tH\x00\x12\x31\n\x0cplayer_setup\x18\x03 \x03(\x0b\x32\x1b.SC2APIProtocol.PlayerSetup\x12\x13\n\x0b\x64isable_fog\x18\x04 \x01(\x08\x12\x13\n\x0brandom_seed\x18\x05 \x01(\r\x12\x10\n\x08realtime\x18\x06 \x01(\x08\x42\x05\n\x03Map\".\n\x08LocalMap\x12\x10\n\x08map_path\x18\x01 \x01(\t\x12\x10\n\x08map_data\x18\x07 \x01(\x0c\"\x9c\x02\n\x12ResponseCreateGame\x12\x37\n\x05\x65rror\x18\x01 \x01(\x0e\x32(.SC2APIProtocol.ResponseCreateGame.Error\x12\x15\n\rerror_details\x18\x02 \x01(\t\"\xb5\x01\n\x05\x45rror\x12\x0e\n\nMissingMap\x10\x01\x12\x12\n\x0eInvalidMapPath\x10\x02\x12\x12\n\x0eInvalidMapData\x10\x03\x12\x12\n\x0eInvalidMapName\x10\x04\x12\x14\n\x10InvalidMapHandle\x10\x05\x12\x16\n\x12MissingPlayerSetup\x10\x06\x12\x16\n\x12InvalidPlayerSetup\x10\x07\x12\x1a\n\x16MultiplayerUnsupported\x10\x08\"\xb2\x02\n\x0fRequestJoinGame\x12$\n\x04race\x18\x01 \x01(\x0e\x32\x14.SC2APIProtocol.RaceH\x00\x12\x1c\n\x12observed_player_id\x18\x02 \x01(\rH\x00\x12\x31\n\x07options\x18\x03 \x01(\x0b\x32 .SC2APIProtocol.InterfaceOptions\x12-\n\x0cserver_ports\x18\x04 \x01(\x0b\x32\x17.SC2APIProtocol.PortSet\x12-\n\x0c\x63lient_ports\x18\x05 \x03(\x0b\x32\x17.SC2APIProtocol.PortSet\x12\x13\n\x0bshared_port\x18\x06 \x01(\x05\x12\x13\n\x0bplayer_name\x18\x07 \x01(\t\x12\x0f\n\x07host_ip\x18\x08 \x01(\tB\x0f\n\rparticipation\"/\n\x07PortSet\x12\x11\n\tgame_port\x18\x01 \x01(\x05\x12\x11\n\tbase_port\x18\x02 \x01(\x05\"\x82\x03\n\x10ResponseJoinGame\x12\x11\n\tplayer_id\x18\x01 \x01(\r\x12\x35\n\x05\x65rror\x18\x02 \x01(\x0e\x32&.SC2APIProtocol.ResponseJoinGame.Error\x12\x15\n\rerror_details\x18\x03 \x01(\t\"\x8c\x02\n\x05\x45rror\x12\x18\n\x14MissingParticipation\x10\x01\x12\x1b\n\x17InvalidObservedPlayerId\x10\x02\x12\x12\n\x0eMissingOptions\x10\x03\x12\x10\n\x0cMissingPorts\x10\x04\x12\x0c\n\x08GameFull\x10\x05\x12\x0f\n\x0bLaunchError\x10\x06\x12\x16\n\x12\x46\x65\x61tureUnsupported\x10\x07\x12\x12\n\x0eNoSpaceForUser\x10\x08\x12\x13\n\x0fMapDoesNotExist\x10\t\x12\x11\n\rCannotOpenMap\x10\n\x12\x11\n\rChecksumError\x10\x0b\x12\x10\n\x0cNetworkError\x10\x0c\x12\x0e\n\nOtherError\x10\r\"\x14\n\x12RequestRestartGame\"\x99\x01\n\x13ResponseRestartGame\x12\x38\n\x05\x65rror\x18\x01 \x01(\x0e\x32).SC2APIProtocol.ResponseRestartGame.Error\x12\x15\n\rerror_details\x18\x02 \x01(\t\x12\x17\n\x0fneed_hard_reset\x18\x03 \x01(\x08\"\x18\n\x05\x45rror\x12\x0f\n\x0bLaunchError\x10\x01\"\xeb\x01\n\x12RequestStartReplay\x12\x15\n\x0breplay_path\x18\x01 \x01(\tH\x00\x12\x15\n\x0breplay_data\x18\x05 \x01(\x0cH\x00\x12\x10\n\x08map_data\x18\x06 \x01(\x0c\x12\x1a\n\x12observed_player_id\x18\x02 \x01(\x05\x12\x31\n\x07options\x18\x03 \x01(\x0b\x32 .SC2APIProtocol.InterfaceOptions\x12\x13\n\x0b\x64isable_fog\x18\x04 \x01(\x08\x12\x10\n\x08realtime\x18\x07 \x01(\x08\x12\x15\n\rrecord_replay\x18\x08 \x01(\x08\x42\x08\n\x06replay\"\x87\x02\n\x13ResponseStartReplay\x12\x38\n\x05\x65rror\x18\x01 \x01(\x0e\x32).SC2APIProtocol.ResponseStartReplay.Error\x12\x15\n\rerror_details\x18\x02 \x01(\t\"\x9e\x01\n\x05\x45rror\x12\x11\n\rMissingReplay\x10\x01\x12\x15\n\x11InvalidReplayPath\x10\x02\x12\x15\n\x11InvalidReplayData\x10\x03\x12\x12\n\x0eInvalidMapData\x10\x04\x12\x1b\n\x17InvalidObservedPlayerId\x10\x05\x12\x12\n\x0eMissingOptions\x10\x06\x12\x0f\n\x0bLaunchError\x10\x07\"(\n\x11RequestMapCommand\x12\x13\n\x0btrigger_cmd\x18\x01 \x01(\t\"\x81\x01\n\x12ResponseMapCommand\x12\x37\n\x05\x65rror\x18\x01 \x01(\x0e\x32(.SC2APIProtocol.ResponseMapCommand.Error\x12\x15\n\rerror_details\x18\x02 \x01(\t\"\x1b\n\x05\x45rror\x12\x12\n\x0eNoTriggerError\x10\x01\"\x12\n\x10RequestLeaveGame\"\x13\n\x11ResponseLeaveGame\"\x12\n\x10RequestQuickSave\"\x13\n\x11ResponseQuickSave\"\x12\n\x10RequestQuickLoad\"\x13\n\x11ResponseQuickLoad\"\r\n\x0bRequestQuit\"\x0e\n\x0cResponseQuit\"\x11\n\x0fRequestGameInfo\"\xe0\x01\n\x10ResponseGameInfo\x12\x10\n\x08map_name\x18\x01 \x01(\t\x12\x11\n\tmod_names\x18\x06 \x03(\t\x12\x16\n\x0elocal_map_path\x18\x02 \x01(\t\x12/\n\x0bplayer_info\x18\x03 \x03(\x0b\x32\x1a.SC2APIProtocol.PlayerInfo\x12+\n\tstart_raw\x18\x04 \x01(\x0b\x32\x18.SC2APIProtocol.StartRaw\x12\x31\n\x07options\x18\x05 \x01(\x0b\x32 .SC2APIProtocol.InterfaceOptions\"<\n\x12RequestObservation\x12\x13\n\x0b\x64isable_fog\x18\x01 \x01(\x08\x12\x11\n\tgame_loop\x18\x02 \x01(\r\"\x85\x02\n\x13ResponseObservation\x12\'\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x16.SC2APIProtocol.Action\x12\x32\n\raction_errors\x18\x02 \x03(\x0b\x32\x1b.SC2APIProtocol.ActionError\x12\x30\n\x0bobservation\x18\x03 \x01(\x0b\x32\x1b.SC2APIProtocol.Observation\x12\x33\n\rplayer_result\x18\x04 \x03(\x0b\x32\x1c.SC2APIProtocol.PlayerResult\x12*\n\x04\x63hat\x18\x05 \x03(\x0b\x32\x1c.SC2APIProtocol.ChatReceived\"2\n\x0c\x43hatReceived\x12\x11\n\tplayer_id\x18\x01 \x01(\r\x12\x0f\n\x07message\x18\x02 \x01(\t\"8\n\rRequestAction\x12\'\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x16.SC2APIProtocol.Action\">\n\x0eResponseAction\x12,\n\x06result\x18\x01 \x03(\x0e\x32\x1c.SC2APIProtocol.ActionResult\"H\n\x15RequestObserverAction\x12/\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x1e.SC2APIProtocol.ObserverAction\"\x18\n\x16ResponseObserverAction\"\x1c\n\x0bRequestStep\x12\r\n\x05\x63ount\x18\x01 \x01(\r\"\'\n\x0cResponseStep\x12\x17\n\x0fsimulation_loop\x18\x01 \x01(\r\"o\n\x0bRequestData\x12\x12\n\nability_id\x18\x01 \x01(\x08\x12\x14\n\x0cunit_type_id\x18\x02 \x01(\x08\x12\x12\n\nupgrade_id\x18\x03 \x01(\x08\x12\x0f\n\x07\x62uff_id\x18\x04 \x01(\x08\x12\x11\n\teffect_id\x18\x05 \x01(\x08\"\xf0\x01\n\x0cResponseData\x12.\n\tabilities\x18\x01 \x03(\x0b\x32\x1b.SC2APIProtocol.AbilityData\x12+\n\x05units\x18\x02 \x03(\x0b\x32\x1c.SC2APIProtocol.UnitTypeData\x12-\n\x08upgrades\x18\x03 \x03(\x0b\x32\x1b.SC2APIProtocol.UpgradeData\x12\'\n\x05\x62uffs\x18\x04 \x03(\x0b\x32\x18.SC2APIProtocol.BuffData\x12+\n\x07\x65\x66\x66\x65\x63ts\x18\x05 \x03(\x0b\x32\x1a.SC2APIProtocol.EffectData\"\x13\n\x11RequestSaveReplay\"\"\n\x12ResponseSaveReplay\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"b\n\x11RequestReplayInfo\x12\x15\n\x0breplay_path\x18\x01 \x01(\tH\x00\x12\x15\n\x0breplay_data\x18\x02 \x01(\x0cH\x00\x12\x15\n\rdownload_data\x18\x03 \x01(\x08\x42\x08\n\x06replay\"\x9f\x01\n\x0fPlayerInfoExtra\x12/\n\x0bplayer_info\x18\x01 \x01(\x0b\x32\x1a.SC2APIProtocol.PlayerInfo\x12\x33\n\rplayer_result\x18\x02 \x01(\x0b\x32\x1c.SC2APIProtocol.PlayerResult\x12\x12\n\nplayer_mmr\x18\x03 \x01(\x05\x12\x12\n\nplayer_apm\x18\x04 \x01(\x05\"\xc3\x03\n\x12ResponseReplayInfo\x12\x10\n\x08map_name\x18\x01 \x01(\t\x12\x16\n\x0elocal_map_path\x18\x02 \x01(\t\x12\x34\n\x0bplayer_info\x18\x03 \x03(\x0b\x32\x1f.SC2APIProtocol.PlayerInfoExtra\x12\x1b\n\x13game_duration_loops\x18\x04 \x01(\r\x12\x1d\n\x15game_duration_seconds\x18\x05 \x01(\x02\x12\x14\n\x0cgame_version\x18\x06 \x01(\t\x12\x14\n\x0c\x64\x61ta_version\x18\x0b \x01(\t\x12\x12\n\ndata_build\x18\x07 \x01(\r\x12\x12\n\nbase_build\x18\x08 \x01(\r\x12\x37\n\x05\x65rror\x18\t \x01(\x0e\x32(.SC2APIProtocol.ResponseReplayInfo.Error\x12\x15\n\rerror_details\x18\n \x01(\t\"m\n\x05\x45rror\x12\x11\n\rMissingReplay\x10\x01\x12\x15\n\x11InvalidReplayPath\x10\x02\x12\x15\n\x11InvalidReplayData\x10\x03\x12\x10\n\x0cParsingError\x10\x04\x12\x11\n\rDownloadError\x10\x05\"\x16\n\x14RequestAvailableMaps\"M\n\x15ResponseAvailableMaps\x12\x17\n\x0flocal_map_paths\x18\x01 \x03(\t\x12\x1b\n\x13\x62\x61ttlenet_map_names\x18\x02 \x03(\t\"4\n\x0eRequestSaveMap\x12\x10\n\x08map_path\x18\x01 \x01(\t\x12\x10\n\x08map_data\x18\x02 \x01(\x0c\"d\n\x0fResponseSaveMap\x12\x34\n\x05\x65rror\x18\x01 \x01(\x0e\x32%.SC2APIProtocol.ResponseSaveMap.Error\"\x1b\n\x05\x45rror\x12\x12\n\x0eInvalidMapData\x10\x01\"\r\n\x0bRequestPing\"b\n\x0cResponsePing\x12\x14\n\x0cgame_version\x18\x01 \x01(\t\x12\x14\n\x0c\x64\x61ta_version\x18\x02 \x01(\t\x12\x12\n\ndata_build\x18\x03 \x01(\r\x12\x12\n\nbase_build\x18\x04 \x01(\r\";\n\x0cRequestDebug\x12+\n\x05\x64\x65\x62ug\x18\x01 \x03(\x0b\x32\x1c.SC2APIProtocol.DebugCommand\"\x0f\n\rResponseDebug\"\xcb\x01\n\x0bPlayerSetup\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.SC2APIProtocol.PlayerType\x12\"\n\x04race\x18\x02 \x01(\x0e\x32\x14.SC2APIProtocol.Race\x12.\n\ndifficulty\x18\x03 \x01(\x0e\x32\x1a.SC2APIProtocol.Difficulty\x12\x13\n\x0bplayer_name\x18\x04 \x01(\t\x12)\n\x08\x61i_build\x18\x05 \x01(\x0e\x32\x17.SC2APIProtocol.AIBuild\"\xc3\x01\n\x12SpatialCameraSetup\x12+\n\nresolution\x18\x02 \x01(\x0b\x32\x17.SC2APIProtocol.Size2DI\x12\x33\n\x12minimap_resolution\x18\x03 \x01(\x0b\x32\x17.SC2APIProtocol.Size2DI\x12\r\n\x05width\x18\x01 \x01(\x02\x12\x1d\n\x15\x63rop_to_playable_area\x18\x04 \x01(\x08\x12\x1d\n\x15\x61llow_cheating_layers\x18\x05 \x01(\x08\"\xaf\x02\n\x10InterfaceOptions\x12\x0b\n\x03raw\x18\x01 \x01(\x08\x12\r\n\x05score\x18\x02 \x01(\x08\x12\x39\n\rfeature_layer\x18\x03 \x01(\x0b\x32\".SC2APIProtocol.SpatialCameraSetup\x12\x32\n\x06render\x18\x04 \x01(\x0b\x32\".SC2APIProtocol.SpatialCameraSetup\x12\x14\n\x0cshow_cloaked\x18\x05 \x01(\x08\x12\x1d\n\x15show_burrowed_shadows\x18\t \x01(\x08\x12\x19\n\x11show_placeholders\x18\x08 \x01(\x08\x12\x1d\n\x15raw_affects_selection\x18\x06 \x01(\x08\x12!\n\x19raw_crop_to_playable_area\x18\x07 \x01(\x08\"\x92\x02\n\nPlayerInfo\x12\x11\n\tplayer_id\x18\x01 \x01(\r\x12(\n\x04type\x18\x02 \x01(\x0e\x32\x1a.SC2APIProtocol.PlayerType\x12,\n\x0erace_requested\x18\x03 \x01(\x0e\x32\x14.SC2APIProtocol.Race\x12)\n\x0brace_actual\x18\x04 \x01(\x0e\x32\x14.SC2APIProtocol.Race\x12.\n\ndifficulty\x18\x05 \x01(\x0e\x32\x1a.SC2APIProtocol.Difficulty\x12)\n\x08\x61i_build\x18\x07 \x01(\x0e\x32\x17.SC2APIProtocol.AIBuild\x12\x13\n\x0bplayer_name\x18\x06 \x01(\t\"\xef\x01\n\x0cPlayerCommon\x12\x11\n\tplayer_id\x18\x01 \x01(\r\x12\x10\n\x08minerals\x18\x02 \x01(\r\x12\x0f\n\x07vespene\x18\x03 \x01(\r\x12\x10\n\x08\x66ood_cap\x18\x04 \x01(\r\x12\x11\n\tfood_used\x18\x05 \x01(\r\x12\x11\n\tfood_army\x18\x06 \x01(\r\x12\x14\n\x0c\x66ood_workers\x18\x07 \x01(\r\x12\x19\n\x11idle_worker_count\x18\x08 \x01(\r\x12\x12\n\narmy_count\x18\t \x01(\r\x12\x17\n\x0fwarp_gate_count\x18\n \x01(\r\x12\x13\n\x0blarva_count\x18\x0b \x01(\r\"\xb6\x03\n\x0bObservation\x12\x11\n\tgame_loop\x18\t \x01(\r\x12\x33\n\rplayer_common\x18\x01 \x01(\x0b\x32\x1c.SC2APIProtocol.PlayerCommon\x12%\n\x06\x61lerts\x18\n \x03(\x0e\x32\x15.SC2APIProtocol.Alert\x12\x33\n\tabilities\x18\x03 \x03(\x0b\x32 .SC2APIProtocol.AvailableAbility\x12$\n\x05score\x18\x04 \x01(\x0b\x32\x15.SC2APIProtocol.Score\x12\x30\n\x08raw_data\x18\x05 \x01(\x0b\x32\x1e.SC2APIProtocol.ObservationRaw\x12\x43\n\x12\x66\x65\x61ture_layer_data\x18\x06 \x01(\x0b\x32\'.SC2APIProtocol.ObservationFeatureLayer\x12\x36\n\x0brender_data\x18\x07 \x01(\x0b\x32!.SC2APIProtocol.ObservationRender\x12.\n\x07ui_data\x18\x08 \x01(\x0b\x32\x1d.SC2APIProtocol.ObservationUI\"\x9b\x02\n\x06\x41\x63tion\x12-\n\naction_raw\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.ActionRaw\x12;\n\x14\x61\x63tion_feature_layer\x18\x02 \x01(\x0b\x32\x1d.SC2APIProtocol.ActionSpatial\x12\x34\n\raction_render\x18\x03 \x01(\x0b\x32\x1d.SC2APIProtocol.ActionSpatial\x12+\n\taction_ui\x18\x04 \x01(\x0b\x32\x18.SC2APIProtocol.ActionUI\x12/\n\x0b\x61\x63tion_chat\x18\x06 \x01(\x0b\x32\x1a.SC2APIProtocol.ActionChat\x12\x11\n\tgame_loop\x18\x07 \x01(\r\"v\n\nActionChat\x12\x33\n\x07\x63hannel\x18\x01 \x01(\x0e\x32\".SC2APIProtocol.ActionChat.Channel\x12\x0f\n\x07message\x18\x02 \x01(\t\"\"\n\x07\x43hannel\x12\r\n\tBroadcast\x10\x01\x12\x08\n\x04Team\x10\x02\"a\n\x0b\x41\x63tionError\x12\x10\n\x08unit_tag\x18\x01 \x01(\x04\x12\x12\n\nability_id\x18\x02 \x01(\x04\x12,\n\x06result\x18\x03 \x01(\x0e\x32\x1c.SC2APIProtocol.ActionResult\"\xcc\x02\n\x0eObserverAction\x12M\n\x12player_perspective\x18\x01 \x01(\x0b\x32/.SC2APIProtocol.ActionObserverPlayerPerspectiveH\x00\x12?\n\x0b\x63\x61mera_move\x18\x02 \x01(\x0b\x32(.SC2APIProtocol.ActionObserverCameraMoveH\x00\x12P\n\x14\x63\x61mera_follow_player\x18\x03 \x01(\x0b\x32\x30.SC2APIProtocol.ActionObserverCameraFollowPlayerH\x00\x12N\n\x13\x63\x61mera_follow_units\x18\x04 \x01(\x0b\x32/.SC2APIProtocol.ActionObserverCameraFollowUnitsH\x00\x42\x08\n\x06\x61\x63tion\"4\n\x1f\x41\x63tionObserverPlayerPerspective\x12\x11\n\tplayer_id\x18\x01 \x01(\r\"X\n\x18\x41\x63tionObserverCameraMove\x12*\n\tworld_pos\x18\x01 \x01(\x0b\x32\x17.SC2APIProtocol.Point2D\x12\x10\n\x08\x64istance\x18\x02 \x01(\x02\"5\n ActionObserverCameraFollowPlayer\x12\x11\n\tplayer_id\x18\x01 \x01(\r\"4\n\x1f\x41\x63tionObserverCameraFollowUnits\x12\x11\n\tunit_tags\x18\x01 \x03(\x04\"I\n\x0cPlayerResult\x12\x11\n\tplayer_id\x18\x01 \x01(\r\x12&\n\x06result\x18\x02 \x01(\x0e\x32\x16.SC2APIProtocol.Result*c\n\x06Status\x12\x0c\n\x08launched\x10\x01\x12\r\n\tinit_game\x10\x02\x12\x0b\n\x07in_game\x10\x03\x12\r\n\tin_replay\x10\x04\x12\t\n\x05\x65nded\x10\x05\x12\x08\n\x04quit\x10\x06\x12\x0b\n\x07unknown\x10\x63*\x96\x01\n\nDifficulty\x12\x0c\n\x08VeryEasy\x10\x01\x12\x08\n\x04\x45\x61sy\x10\x02\x12\n\n\x06Medium\x10\x03\x12\x0e\n\nMediumHard\x10\x04\x12\x08\n\x04Hard\x10\x05\x12\n\n\x06Harder\x10\x06\x12\x0c\n\x08VeryHard\x10\x07\x12\x0f\n\x0b\x43heatVision\x10\x08\x12\x0e\n\nCheatMoney\x10\t\x12\x0f\n\x0b\x43heatInsane\x10\n*9\n\nPlayerType\x12\x0f\n\x0bParticipant\x10\x01\x12\x0c\n\x08\x43omputer\x10\x02\x12\x0c\n\x08Observer\x10\x03*O\n\x07\x41IBuild\x12\x0f\n\x0bRandomBuild\x10\x01\x12\x08\n\x04Rush\x10\x02\x12\n\n\x06Timing\x10\x03\x12\t\n\x05Power\x10\x04\x12\t\n\x05Macro\x10\x05\x12\x07\n\x03\x41ir\x10\x06*\xdb\x03\n\x05\x41lert\x12\x0e\n\nAlertError\x10\x03\x12\x11\n\rAddOnComplete\x10\x04\x12\x14\n\x10\x42uildingComplete\x10\x05\x12\x17\n\x13\x42uildingUnderAttack\x10\x06\x12\x10\n\x0cLarvaHatched\x10\x07\x12\x11\n\rMergeComplete\x10\x08\x12\x15\n\x11MineralsExhausted\x10\t\x12\x11\n\rMorphComplete\x10\n\x12\x16\n\x12MothershipComplete\x10\x0b\x12\x0f\n\x0bMULEExpired\x10\x0c\x12\x19\n\x15NuclearLaunchDetected\x10\x01\x12\x10\n\x0cNukeComplete\x10\r\x12\x15\n\x11NydusWormDetected\x10\x02\x12\x14\n\x10ResearchComplete\x10\x0e\x12\x0e\n\nTrainError\x10\x0f\x12\x15\n\x11TrainUnitComplete\x10\x10\x12\x17\n\x13TrainWorkerComplete\x10\x11\x12\x1a\n\x16TransformationComplete\x10\x12\x12\x13\n\x0fUnitUnderAttack\x10\x13\x12\x13\n\x0fUpgradeComplete\x10\x14\x12\x14\n\x10VespeneExhausted\x10\x15\x12\x12\n\x0eWarpInComplete\x10\x16*9\n\x06Result\x12\x0b\n\x07Victory\x10\x01\x12\n\n\x06\x44\x65\x66\x65\x61t\x10\x02\x12\x07\n\x03Tie\x10\x03\x12\r\n\tUndecided\x10\x04')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.sc2api_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_STATUS']._serialized_start=10484
+  _globals['_STATUS']._serialized_end=10583
+  _globals['_DIFFICULTY']._serialized_start=10586
+  _globals['_DIFFICULTY']._serialized_end=10736
+  _globals['_PLAYERTYPE']._serialized_start=10738
+  _globals['_PLAYERTYPE']._serialized_end=10795
+  _globals['_AIBUILD']._serialized_start=10797
+  _globals['_AIBUILD']._serialized_end=10876
+  _globals['_ALERT']._serialized_start=10879
+  _globals['_ALERT']._serialized_end=11354
+  _globals['_RESULT']._serialized_start=11356
+  _globals['_RESULT']._serialized_end=11413
+  _globals['_REQUEST']._serialized_start=317
+  _globals['_REQUEST']._serialized_end=1536
+  _globals['_RESPONSE']._serialized_start=1539
+  _globals['_RESPONSE']._serialized_end=2837
+  _globals['_REQUESTCREATEGAME']._serialized_start=2840
+  _globals['_REQUESTCREATEGAME']._serialized_end=3054
+  _globals['_LOCALMAP']._serialized_start=3056
+  _globals['_LOCALMAP']._serialized_end=3102
+  _globals['_RESPONSECREATEGAME']._serialized_start=3105
+  _globals['_RESPONSECREATEGAME']._serialized_end=3389
+  _globals['_RESPONSECREATEGAME_ERROR']._serialized_start=3208
+  _globals['_RESPONSECREATEGAME_ERROR']._serialized_end=3389
+  _globals['_REQUESTJOINGAME']._serialized_start=3392
+  _globals['_REQUESTJOINGAME']._serialized_end=3698
+  _globals['_PORTSET']._serialized_start=3700
+  _globals['_PORTSET']._serialized_end=3747
+  _globals['_RESPONSEJOINGAME']._serialized_start=3750
+  _globals['_RESPONSEJOINGAME']._serialized_end=4136
+  _globals['_RESPONSEJOINGAME_ERROR']._serialized_start=3868
+  _globals['_RESPONSEJOINGAME_ERROR']._serialized_end=4136
+  _globals['_REQUESTRESTARTGAME']._serialized_start=4138
+  _globals['_REQUESTRESTARTGAME']._serialized_end=4158
+  _globals['_RESPONSERESTARTGAME']._serialized_start=4161
+  _globals['_RESPONSERESTARTGAME']._serialized_end=4314
+  _globals['_RESPONSERESTARTGAME_ERROR']._serialized_start=4290
+  _globals['_RESPONSERESTARTGAME_ERROR']._serialized_end=4314
+  _globals['_REQUESTSTARTREPLAY']._serialized_start=4317
+  _globals['_REQUESTSTARTREPLAY']._serialized_end=4552
+  _globals['_RESPONSESTARTREPLAY']._serialized_start=4555
+  _globals['_RESPONSESTARTREPLAY']._serialized_end=4818
+  _globals['_RESPONSESTARTREPLAY_ERROR']._serialized_start=4660
+  _globals['_RESPONSESTARTREPLAY_ERROR']._serialized_end=4818
+  _globals['_REQUESTMAPCOMMAND']._serialized_start=4820
+  _globals['_REQUESTMAPCOMMAND']._serialized_end=4860
+  _globals['_RESPONSEMAPCOMMAND']._serialized_start=4863
+  _globals['_RESPONSEMAPCOMMAND']._serialized_end=4992
+  _globals['_RESPONSEMAPCOMMAND_ERROR']._serialized_start=4965
+  _globals['_RESPONSEMAPCOMMAND_ERROR']._serialized_end=4992
+  _globals['_REQUESTLEAVEGAME']._serialized_start=4994
+  _globals['_REQUESTLEAVEGAME']._serialized_end=5012
+  _globals['_RESPONSELEAVEGAME']._serialized_start=5014
+  _globals['_RESPONSELEAVEGAME']._serialized_end=5033
+  _globals['_REQUESTQUICKSAVE']._serialized_start=5035
+  _globals['_REQUESTQUICKSAVE']._serialized_end=5053
+  _globals['_RESPONSEQUICKSAVE']._serialized_start=5055
+  _globals['_RESPONSEQUICKSAVE']._serialized_end=5074
+  _globals['_REQUESTQUICKLOAD']._serialized_start=5076
+  _globals['_REQUESTQUICKLOAD']._serialized_end=5094
+  _globals['_RESPONSEQUICKLOAD']._serialized_start=5096
+  _globals['_RESPONSEQUICKLOAD']._serialized_end=5115
+  _globals['_REQUESTQUIT']._serialized_start=5117
+  _globals['_REQUESTQUIT']._serialized_end=5130
+  _globals['_RESPONSEQUIT']._serialized_start=5132
+  _globals['_RESPONSEQUIT']._serialized_end=5146
+  _globals['_REQUESTGAMEINFO']._serialized_start=5148
+  _globals['_REQUESTGAMEINFO']._serialized_end=5165
+  _globals['_RESPONSEGAMEINFO']._serialized_start=5168
+  _globals['_RESPONSEGAMEINFO']._serialized_end=5392
+  _globals['_REQUESTOBSERVATION']._serialized_start=5394
+  _globals['_REQUESTOBSERVATION']._serialized_end=5454
+  _globals['_RESPONSEOBSERVATION']._serialized_start=5457
+  _globals['_RESPONSEOBSERVATION']._serialized_end=5718
+  _globals['_CHATRECEIVED']._serialized_start=5720
+  _globals['_CHATRECEIVED']._serialized_end=5770
+  _globals['_REQUESTACTION']._serialized_start=5772
+  _globals['_REQUESTACTION']._serialized_end=5828
+  _globals['_RESPONSEACTION']._serialized_start=5830
+  _globals['_RESPONSEACTION']._serialized_end=5892
+  _globals['_REQUESTOBSERVERACTION']._serialized_start=5894
+  _globals['_REQUESTOBSERVERACTION']._serialized_end=5966
+  _globals['_RESPONSEOBSERVERACTION']._serialized_start=5968
+  _globals['_RESPONSEOBSERVERACTION']._serialized_end=5992
+  _globals['_REQUESTSTEP']._serialized_start=5994
+  _globals['_REQUESTSTEP']._serialized_end=6022
+  _globals['_RESPONSESTEP']._serialized_start=6024
+  _globals['_RESPONSESTEP']._serialized_end=6063
+  _globals['_REQUESTDATA']._serialized_start=6065
+  _globals['_REQUESTDATA']._serialized_end=6176
+  _globals['_RESPONSEDATA']._serialized_start=6179
+  _globals['_RESPONSEDATA']._serialized_end=6419
+  _globals['_REQUESTSAVEREPLAY']._serialized_start=6421
+  _globals['_REQUESTSAVEREPLAY']._serialized_end=6440
+  _globals['_RESPONSESAVEREPLAY']._serialized_start=6442
+  _globals['_RESPONSESAVEREPLAY']._serialized_end=6476
+  _globals['_REQUESTREPLAYINFO']._serialized_start=6478
+  _globals['_REQUESTREPLAYINFO']._serialized_end=6576
+  _globals['_PLAYERINFOEXTRA']._serialized_start=6579
+  _globals['_PLAYERINFOEXTRA']._serialized_end=6738
+  _globals['_RESPONSEREPLAYINFO']._serialized_start=6741
+  _globals['_RESPONSEREPLAYINFO']._serialized_end=7192
+  _globals['_RESPONSEREPLAYINFO_ERROR']._serialized_start=7083
+  _globals['_RESPONSEREPLAYINFO_ERROR']._serialized_end=7192
+  _globals['_REQUESTAVAILABLEMAPS']._serialized_start=7194
+  _globals['_REQUESTAVAILABLEMAPS']._serialized_end=7216
+  _globals['_RESPONSEAVAILABLEMAPS']._serialized_start=7218
+  _globals['_RESPONSEAVAILABLEMAPS']._serialized_end=7295
+  _globals['_REQUESTSAVEMAP']._serialized_start=7297
+  _globals['_REQUESTSAVEMAP']._serialized_end=7349
+  _globals['_RESPONSESAVEMAP']._serialized_start=7351
+  _globals['_RESPONSESAVEMAP']._serialized_end=7451
+  _globals['_RESPONSESAVEMAP_ERROR']._serialized_start=7424
+  _globals['_RESPONSESAVEMAP_ERROR']._serialized_end=7451
+  _globals['_REQUESTPING']._serialized_start=7453
+  _globals['_REQUESTPING']._serialized_end=7466
+  _globals['_RESPONSEPING']._serialized_start=7468
+  _globals['_RESPONSEPING']._serialized_end=7566
+  _globals['_REQUESTDEBUG']._serialized_start=7568
+  _globals['_REQUESTDEBUG']._serialized_end=7627
+  _globals['_RESPONSEDEBUG']._serialized_start=7629
+  _globals['_RESPONSEDEBUG']._serialized_end=7644
+  _globals['_PLAYERSETUP']._serialized_start=7647
+  _globals['_PLAYERSETUP']._serialized_end=7850
+  _globals['_SPATIALCAMERASETUP']._serialized_start=7853
+  _globals['_SPATIALCAMERASETUP']._serialized_end=8048
+  _globals['_INTERFACEOPTIONS']._serialized_start=8051
+  _globals['_INTERFACEOPTIONS']._serialized_end=8354
+  _globals['_PLAYERINFO']._serialized_start=8357
+  _globals['_PLAYERINFO']._serialized_end=8631
+  _globals['_PLAYERCOMMON']._serialized_start=8634
+  _globals['_PLAYERCOMMON']._serialized_end=8873
+  _globals['_OBSERVATION']._serialized_start=8876
+  _globals['_OBSERVATION']._serialized_end=9314
+  _globals['_ACTION']._serialized_start=9317
+  _globals['_ACTION']._serialized_end=9600
+  _globals['_ACTIONCHAT']._serialized_start=9602
+  _globals['_ACTIONCHAT']._serialized_end=9720
+  _globals['_ACTIONCHAT_CHANNEL']._serialized_start=9686
+  _globals['_ACTIONCHAT_CHANNEL']._serialized_end=9720
+  _globals['_ACTIONERROR']._serialized_start=9722
+  _globals['_ACTIONERROR']._serialized_end=9819
+  _globals['_OBSERVERACTION']._serialized_start=9822
+  _globals['_OBSERVERACTION']._serialized_end=10154
+  _globals['_ACTIONOBSERVERPLAYERPERSPECTIVE']._serialized_start=10156
+  _globals['_ACTIONOBSERVERPLAYERPERSPECTIVE']._serialized_end=10208
+  _globals['_ACTIONOBSERVERCAMERAMOVE']._serialized_start=10210
+  _globals['_ACTIONOBSERVERCAMERAMOVE']._serialized_end=10298
+  _globals['_ACTIONOBSERVERCAMERAFOLLOWPLAYER']._serialized_start=10300
+  _globals['_ACTIONOBSERVERCAMERAFOLLOWPLAYER']._serialized_end=10353
+  _globals['_ACTIONOBSERVERCAMERAFOLLOWUNITS']._serialized_start=10355
+  _globals['_ACTIONOBSERVERCAMERAFOLLOWUNITS']._serialized_end=10407
+  _globals['_PLAYERRESULT']._serialized_start=10409
+  _globals['_PLAYERRESULT']._serialized_end=10482
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/score_pb2.py b/worlds/_sc2common/bot/proto/score_pb2.py
new file mode 100644
index 0000000000..9045516475
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/score_pb2.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/score.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/score.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cs2clientprotocol/score.proto\x12\x0eSC2APIProtocol\"\xa8\x01\n\x05Score\x12\x33\n\nscore_type\x18\x06 \x01(\x0e\x32\x1f.SC2APIProtocol.Score.ScoreType\x12\r\n\x05score\x18\x07 \x01(\x05\x12\x33\n\rscore_details\x18\x08 \x01(\x0b\x32\x1c.SC2APIProtocol.ScoreDetails\"&\n\tScoreType\x12\x0e\n\nCurriculum\x10\x01\x12\t\n\x05Melee\x10\x02\"h\n\x14\x43\x61tegoryScoreDetails\x12\x0c\n\x04none\x18\x01 \x01(\x02\x12\x0c\n\x04\x61rmy\x18\x02 \x01(\x02\x12\x0f\n\x07\x65\x63onomy\x18\x03 \x01(\x02\x12\x12\n\ntechnology\x18\x04 \x01(\x02\x12\x0f\n\x07upgrade\x18\x05 \x01(\x02\"B\n\x11VitalScoreDetails\x12\x0c\n\x04life\x18\x01 \x01(\x02\x12\x0f\n\x07shields\x18\x02 \x01(\x02\x12\x0e\n\x06\x65nergy\x18\x03 \x01(\x02\"\x8a\n\n\x0cScoreDetails\x12\x1c\n\x14idle_production_time\x18\x01 \x01(\x02\x12\x18\n\x10idle_worker_time\x18\x02 \x01(\x02\x12\x19\n\x11total_value_units\x18\x03 \x01(\x02\x12\x1e\n\x16total_value_structures\x18\x04 \x01(\x02\x12\x1a\n\x12killed_value_units\x18\x05 \x01(\x02\x12\x1f\n\x17killed_value_structures\x18\x06 \x01(\x02\x12\x1a\n\x12\x63ollected_minerals\x18\x07 \x01(\x02\x12\x19\n\x11\x63ollected_vespene\x18\x08 \x01(\x02\x12 \n\x18\x63ollection_rate_minerals\x18\t \x01(\x02\x12\x1f\n\x17\x63ollection_rate_vespene\x18\n \x01(\x02\x12\x16\n\x0espent_minerals\x18\x0b \x01(\x02\x12\x15\n\rspent_vespene\x18\x0c \x01(\x02\x12\x37\n\tfood_used\x18\r \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12=\n\x0fkilled_minerals\x18\x0e \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12<\n\x0ekilled_vespene\x18\x0f \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12;\n\rlost_minerals\x18\x10 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12:\n\x0clost_vespene\x18\x11 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12\x44\n\x16\x66riendly_fire_minerals\x18\x12 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12\x43\n\x15\x66riendly_fire_vespene\x18\x13 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12;\n\rused_minerals\x18\x14 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12:\n\x0cused_vespene\x18\x15 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12\x41\n\x13total_used_minerals\x18\x16 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12@\n\x12total_used_vespene\x18\x17 \x01(\x0b\x32$.SC2APIProtocol.CategoryScoreDetails\x12=\n\x12total_damage_dealt\x18\x18 \x01(\x0b\x32!.SC2APIProtocol.VitalScoreDetails\x12=\n\x12total_damage_taken\x18\x19 \x01(\x0b\x32!.SC2APIProtocol.VitalScoreDetails\x12\x37\n\x0ctotal_healed\x18\x1a \x01(\x0b\x32!.SC2APIProtocol.VitalScoreDetails\x12\x13\n\x0b\x63urrent_apm\x18\x1b \x01(\x02\x12\x1d\n\x15\x63urrent_effective_apm\x18\x1c \x01(\x02')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.score_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_SCORE']._serialized_start=49
+  _globals['_SCORE']._serialized_end=217
+  _globals['_SCORE_SCORETYPE']._serialized_start=179
+  _globals['_SCORE_SCORETYPE']._serialized_end=217
+  _globals['_CATEGORYSCOREDETAILS']._serialized_start=219
+  _globals['_CATEGORYSCOREDETAILS']._serialized_end=323
+  _globals['_VITALSCOREDETAILS']._serialized_start=325
+  _globals['_VITALSCOREDETAILS']._serialized_end=391
+  _globals['_SCOREDETAILS']._serialized_start=394
+  _globals['_SCOREDETAILS']._serialized_end=1684
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/spatial_pb2.py b/worlds/_sc2common/bot/proto/spatial_pb2.py
new file mode 100644
index 0000000000..e570ab210f
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/spatial_pb2.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/spatial.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/spatial.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as s2clientprotocol_dot_common__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1es2clientprotocol/spatial.proto\x12\x0eSC2APIProtocol\x1a\x1ds2clientprotocol/common.proto\"\x88\x01\n\x17ObservationFeatureLayer\x12.\n\x07renders\x18\x01 \x01(\x0b\x32\x1d.SC2APIProtocol.FeatureLayers\x12=\n\x0fminimap_renders\x18\x02 \x01(\x0b\x32$.SC2APIProtocol.FeatureLayersMinimap\"\x9c\n\n\rFeatureLayers\x12-\n\nheight_map\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0evisibility_map\x18\x02 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12(\n\x05\x63reep\x18\x03 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12(\n\x05power\x18\x04 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tplayer_id\x18\x05 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tunit_type\x18\x06 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12+\n\x08selected\x18\x07 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x32\n\x0funit_hit_points\x18\x08 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x38\n\x15unit_hit_points_ratio\x18\x11 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12.\n\x0bunit_energy\x18\t \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x34\n\x11unit_energy_ratio\x18\x12 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12/\n\x0cunit_shields\x18\n \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x35\n\x12unit_shields_ratio\x18\x13 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x32\n\x0fplayer_relative\x18\x0b \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x32\n\x0funit_density_aa\x18\x0e \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12/\n\x0cunit_density\x18\x0f \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12*\n\x07\x65\x66\x66\x65\x63ts\x18\x14 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0ehallucinations\x18\x15 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12*\n\x07\x63loaked\x18\x16 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\'\n\x04\x62lip\x18\x17 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12(\n\x05\x62uffs\x18\x18 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x30\n\rbuff_duration\x18\x1a \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12)\n\x06\x61\x63tive\x18\x19 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0e\x62uild_progress\x18\x1b \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tbuildable\x18\x1c \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12+\n\x08pathable\x18\x1d \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12.\n\x0bplaceholder\x18\x1e \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\"\x90\x04\n\x14\x46\x65\x61tureLayersMinimap\x12-\n\nheight_map\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x31\n\x0evisibility_map\x18\x02 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12(\n\x05\x63reep\x18\x03 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12)\n\x06\x63\x61mera\x18\x04 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tplayer_id\x18\x05 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12\x32\n\x0fplayer_relative\x18\x06 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12+\n\x08selected\x18\x07 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12)\n\x06\x61lerts\x18\t \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tbuildable\x18\n \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12+\n\x08pathable\x18\x0b \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12,\n\tunit_type\x18\x08 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\"g\n\x11ObservationRender\x12&\n\x03map\x18\x01 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\x12*\n\x07minimap\x18\x02 \x01(\x0b\x32\x19.SC2APIProtocol.ImageData\"\xbb\x02\n\rActionSpatial\x12@\n\x0cunit_command\x18\x01 \x01(\x0b\x32(.SC2APIProtocol.ActionSpatialUnitCommandH\x00\x12>\n\x0b\x63\x61mera_move\x18\x02 \x01(\x0b\x32\'.SC2APIProtocol.ActionSpatialCameraMoveH\x00\x12O\n\x14unit_selection_point\x18\x03 \x01(\x0b\x32/.SC2APIProtocol.ActionSpatialUnitSelectionPointH\x00\x12M\n\x13unit_selection_rect\x18\x04 \x01(\x0b\x32..SC2APIProtocol.ActionSpatialUnitSelectionRectH\x00\x42\x08\n\x06\x61\x63tion\"\xbe\x01\n\x18\x41\x63tionSpatialUnitCommand\x12\x12\n\nability_id\x18\x01 \x01(\x05\x12\x35\n\x13target_screen_coord\x18\x02 \x01(\x0b\x32\x16.SC2APIProtocol.PointIH\x00\x12\x36\n\x14target_minimap_coord\x18\x03 \x01(\x0b\x32\x16.SC2APIProtocol.PointIH\x00\x12\x15\n\rqueue_command\x18\x04 \x01(\x08\x42\x08\n\x06target\"I\n\x17\x41\x63tionSpatialCameraMove\x12.\n\x0e\x63\x65nter_minimap\x18\x01 \x01(\x0b\x32\x16.SC2APIProtocol.PointI\"\xda\x01\n\x1f\x41\x63tionSpatialUnitSelectionPoint\x12\x36\n\x16selection_screen_coord\x18\x01 \x01(\x0b\x32\x16.SC2APIProtocol.PointI\x12\x42\n\x04type\x18\x02 \x01(\x0e\x32\x34.SC2APIProtocol.ActionSpatialUnitSelectionPoint.Type\";\n\x04Type\x12\n\n\x06Select\x10\x01\x12\n\n\x06Toggle\x10\x02\x12\x0b\n\x07\x41llType\x10\x03\x12\x0e\n\nAddAllType\x10\x04\"s\n\x1e\x41\x63tionSpatialUnitSelectionRect\x12:\n\x16selection_screen_coord\x18\x01 \x03(\x0b\x32\x1a.SC2APIProtocol.RectangleI\x12\x15\n\rselection_add\x18\x02 \x01(\x08')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.spatial_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_OBSERVATIONFEATURELAYER']._serialized_start=82
+  _globals['_OBSERVATIONFEATURELAYER']._serialized_end=218
+  _globals['_FEATURELAYERS']._serialized_start=221
+  _globals['_FEATURELAYERS']._serialized_end=1529
+  _globals['_FEATURELAYERSMINIMAP']._serialized_start=1532
+  _globals['_FEATURELAYERSMINIMAP']._serialized_end=2060
+  _globals['_OBSERVATIONRENDER']._serialized_start=2062
+  _globals['_OBSERVATIONRENDER']._serialized_end=2165
+  _globals['_ACTIONSPATIAL']._serialized_start=2168
+  _globals['_ACTIONSPATIAL']._serialized_end=2483
+  _globals['_ACTIONSPATIALUNITCOMMAND']._serialized_start=2486
+  _globals['_ACTIONSPATIALUNITCOMMAND']._serialized_end=2676
+  _globals['_ACTIONSPATIALCAMERAMOVE']._serialized_start=2678
+  _globals['_ACTIONSPATIALCAMERAMOVE']._serialized_end=2751
+  _globals['_ACTIONSPATIALUNITSELECTIONPOINT']._serialized_start=2754
+  _globals['_ACTIONSPATIALUNITSELECTIONPOINT']._serialized_end=2972
+  _globals['_ACTIONSPATIALUNITSELECTIONPOINT_TYPE']._serialized_start=2913
+  _globals['_ACTIONSPATIALUNITSELECTIONPOINT_TYPE']._serialized_end=2972
+  _globals['_ACTIONSPATIALUNITSELECTIONRECT']._serialized_start=2974
+  _globals['_ACTIONSPATIALUNITSELECTIONRECT']._serialized_end=3089
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/proto/ui_pb2.py b/worlds/_sc2common/bot/proto/ui_pb2.py
new file mode 100644
index 0000000000..c905b77db1
--- /dev/null
+++ b/worlds/_sc2common/bot/proto/ui_pb2.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: s2clientprotocol/ui.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    's2clientprotocol/ui.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19s2clientprotocol/ui.proto\x12\x0eSC2APIProtocol\"\x86\x02\n\rObservationUI\x12,\n\x06groups\x18\x01 \x03(\x0b\x32\x1c.SC2APIProtocol.ControlGroup\x12-\n\x06single\x18\x02 \x01(\x0b\x32\x1b.SC2APIProtocol.SinglePanelH\x00\x12+\n\x05multi\x18\x03 \x01(\x0b\x32\x1a.SC2APIProtocol.MultiPanelH\x00\x12+\n\x05\x63\x61rgo\x18\x04 \x01(\x0b\x32\x1a.SC2APIProtocol.CargoPanelH\x00\x12\x35\n\nproduction\x18\x05 \x01(\x0b\x32\x1f.SC2APIProtocol.ProductionPanelH\x00\x42\x07\n\x05panel\"T\n\x0c\x43ontrolGroup\x12\x1b\n\x13\x63ontrol_group_index\x18\x01 \x01(\r\x12\x18\n\x10leader_unit_type\x18\x02 \x01(\r\x12\r\n\x05\x63ount\x18\x03 \x01(\r\"\x85\x02\n\x08UnitInfo\x12\x11\n\tunit_type\x18\x01 \x01(\r\x12\x17\n\x0fplayer_relative\x18\x02 \x01(\r\x12\x0e\n\x06health\x18\x03 \x01(\x05\x12\x0f\n\x07shields\x18\x04 \x01(\x05\x12\x0e\n\x06\x65nergy\x18\x05 \x01(\x05\x12\x1d\n\x15transport_slots_taken\x18\x06 \x01(\x05\x12\x16\n\x0e\x62uild_progress\x18\x07 \x01(\x02\x12(\n\x06\x61\x64\x64_on\x18\x08 \x01(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12\x12\n\nmax_health\x18\t \x01(\x05\x12\x13\n\x0bmax_shields\x18\n \x01(\x05\x12\x12\n\nmax_energy\x18\x0b \x01(\x05\"\x9d\x01\n\x0bSinglePanel\x12&\n\x04unit\x18\x01 \x01(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12\x1c\n\x14\x61ttack_upgrade_level\x18\x02 \x01(\x05\x12\x1b\n\x13\x61rmor_upgrade_level\x18\x03 \x01(\x05\x12\x1c\n\x14shield_upgrade_level\x18\x04 \x01(\x05\x12\r\n\x05\x62uffs\x18\x05 \x03(\x05\"5\n\nMultiPanel\x12\'\n\x05units\x18\x01 \x03(\x0b\x32\x18.SC2APIProtocol.UnitInfo\"{\n\nCargoPanel\x12&\n\x04unit\x18\x01 \x01(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12,\n\npassengers\x18\x02 \x03(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12\x17\n\x0fslots_available\x18\x03 \x01(\x05\"7\n\tBuildItem\x12\x12\n\nability_id\x18\x01 \x01(\r\x12\x16\n\x0e\x62uild_progress\x18\x02 \x01(\x02\"\x9d\x01\n\x0fProductionPanel\x12&\n\x04unit\x18\x01 \x01(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12-\n\x0b\x62uild_queue\x18\x02 \x03(\x0b\x32\x18.SC2APIProtocol.UnitInfo\x12\x33\n\x10production_queue\x18\x03 \x03(\x0b\x32\x19.SC2APIProtocol.BuildItem\"\xda\x04\n\x08\x41\x63tionUI\x12;\n\rcontrol_group\x18\x01 \x01(\x0b\x32\".SC2APIProtocol.ActionControlGroupH\x00\x12\x37\n\x0bselect_army\x18\x02 \x01(\x0b\x32 .SC2APIProtocol.ActionSelectArmyH\x00\x12\x42\n\x11select_warp_gates\x18\x03 \x01(\x0b\x32%.SC2APIProtocol.ActionSelectWarpGatesH\x00\x12\x39\n\x0cselect_larva\x18\x04 \x01(\x0b\x32!.SC2APIProtocol.ActionSelectLarvaH\x00\x12\x44\n\x12select_idle_worker\x18\x05 \x01(\x0b\x32&.SC2APIProtocol.ActionSelectIdleWorkerH\x00\x12\x37\n\x0bmulti_panel\x18\x06 \x01(\x0b\x32 .SC2APIProtocol.ActionMultiPanelH\x00\x12=\n\x0b\x63\x61rgo_panel\x18\x07 \x01(\x0b\x32&.SC2APIProtocol.ActionCargoPanelUnloadH\x00\x12P\n\x10production_panel\x18\x08 \x01(\x0b\x32\x34.SC2APIProtocol.ActionProductionPanelRemoveFromQueueH\x00\x12?\n\x0ftoggle_autocast\x18\t \x01(\x0b\x32$.SC2APIProtocol.ActionToggleAutocastH\x00\x42\x08\n\x06\x61\x63tion\"\xd4\x01\n\x12\x41\x63tionControlGroup\x12\x45\n\x06\x61\x63tion\x18\x01 \x01(\x0e\x32\x35.SC2APIProtocol.ActionControlGroup.ControlGroupAction\x12\x1b\n\x13\x63ontrol_group_index\x18\x02 \x01(\r\"Z\n\x12\x43ontrolGroupAction\x12\n\n\x06Recall\x10\x01\x12\x07\n\x03Set\x10\x02\x12\n\n\x06\x41ppend\x10\x03\x12\x0f\n\x0bSetAndSteal\x10\x04\x12\x12\n\x0e\x41ppendAndSteal\x10\x05\")\n\x10\x41\x63tionSelectArmy\x12\x15\n\rselection_add\x18\x01 \x01(\x08\".\n\x15\x41\x63tionSelectWarpGates\x12\x15\n\rselection_add\x18\x01 \x01(\x08\"\x13\n\x11\x41\x63tionSelectLarva\"\x82\x01\n\x16\x41\x63tionSelectIdleWorker\x12\x39\n\x04type\x18\x01 \x01(\x0e\x32+.SC2APIProtocol.ActionSelectIdleWorker.Type\"-\n\x04Type\x12\x07\n\x03Set\x10\x01\x12\x07\n\x03\x41\x64\x64\x10\x02\x12\x07\n\x03\x41ll\x10\x03\x12\n\n\x06\x41\x64\x64\x41ll\x10\x04\"\xb3\x01\n\x10\x41\x63tionMultiPanel\x12\x33\n\x04type\x18\x01 \x01(\x0e\x32%.SC2APIProtocol.ActionMultiPanel.Type\x12\x12\n\nunit_index\x18\x02 \x01(\x05\"V\n\x04Type\x12\x10\n\x0cSingleSelect\x10\x01\x12\x10\n\x0c\x44\x65selectUnit\x10\x02\x12\x13\n\x0fSelectAllOfType\x10\x03\x12\x15\n\x11\x44\x65selectAllOfType\x10\x04\",\n\x16\x41\x63tionCargoPanelUnload\x12\x12\n\nunit_index\x18\x01 \x01(\x05\":\n$ActionProductionPanelRemoveFromQueue\x12\x12\n\nunit_index\x18\x01 \x01(\x05\"*\n\x14\x41\x63tionToggleAutocast\x12\x12\n\nability_id\x18\x01 \x01(\x05')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 's2clientprotocol.ui_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_OBSERVATIONUI']._serialized_start=46
+  _globals['_OBSERVATIONUI']._serialized_end=308
+  _globals['_CONTROLGROUP']._serialized_start=310
+  _globals['_CONTROLGROUP']._serialized_end=394
+  _globals['_UNITINFO']._serialized_start=397
+  _globals['_UNITINFO']._serialized_end=658
+  _globals['_SINGLEPANEL']._serialized_start=661
+  _globals['_SINGLEPANEL']._serialized_end=818
+  _globals['_MULTIPANEL']._serialized_start=820
+  _globals['_MULTIPANEL']._serialized_end=873
+  _globals['_CARGOPANEL']._serialized_start=875
+  _globals['_CARGOPANEL']._serialized_end=998
+  _globals['_BUILDITEM']._serialized_start=1000
+  _globals['_BUILDITEM']._serialized_end=1055
+  _globals['_PRODUCTIONPANEL']._serialized_start=1058
+  _globals['_PRODUCTIONPANEL']._serialized_end=1215
+  _globals['_ACTIONUI']._serialized_start=1218
+  _globals['_ACTIONUI']._serialized_end=1820
+  _globals['_ACTIONCONTROLGROUP']._serialized_start=1823
+  _globals['_ACTIONCONTROLGROUP']._serialized_end=2035
+  _globals['_ACTIONCONTROLGROUP_CONTROLGROUPACTION']._serialized_start=1945
+  _globals['_ACTIONCONTROLGROUP_CONTROLGROUPACTION']._serialized_end=2035
+  _globals['_ACTIONSELECTARMY']._serialized_start=2037
+  _globals['_ACTIONSELECTARMY']._serialized_end=2078
+  _globals['_ACTIONSELECTWARPGATES']._serialized_start=2080
+  _globals['_ACTIONSELECTWARPGATES']._serialized_end=2126
+  _globals['_ACTIONSELECTLARVA']._serialized_start=2128
+  _globals['_ACTIONSELECTLARVA']._serialized_end=2147
+  _globals['_ACTIONSELECTIDLEWORKER']._serialized_start=2150
+  _globals['_ACTIONSELECTIDLEWORKER']._serialized_end=2280
+  _globals['_ACTIONSELECTIDLEWORKER_TYPE']._serialized_start=2235
+  _globals['_ACTIONSELECTIDLEWORKER_TYPE']._serialized_end=2280
+  _globals['_ACTIONMULTIPANEL']._serialized_start=2283
+  _globals['_ACTIONMULTIPANEL']._serialized_end=2462
+  _globals['_ACTIONMULTIPANEL_TYPE']._serialized_start=2376
+  _globals['_ACTIONMULTIPANEL_TYPE']._serialized_end=2462
+  _globals['_ACTIONCARGOPANELUNLOAD']._serialized_start=2464
+  _globals['_ACTIONCARGOPANELUNLOAD']._serialized_end=2508
+  _globals['_ACTIONPRODUCTIONPANELREMOVEFROMQUEUE']._serialized_start=2510
+  _globals['_ACTIONPRODUCTIONPANELREMOVEFROMQUEUE']._serialized_end=2568
+  _globals['_ACTIONTOGGLEAUTOCAST']._serialized_start=2570
+  _globals['_ACTIONTOGGLEAUTOCAST']._serialized_end=2612
+# @@protoc_insertion_point(module_scope)
diff --git a/worlds/_sc2common/bot/protocol.py b/worlds/_sc2common/bot/protocol.py
index d2c48facb5..46a7d59adc 100644
--- a/worlds/_sc2common/bot/protocol.py
+++ b/worlds/_sc2common/bot/protocol.py
@@ -4,7 +4,7 @@ from contextlib import suppress
 
 from aiohttp import ClientWebSocketResponse
 from worlds._sc2common.bot import logger
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import sc2api_pb2 as sc_pb
 
 from .data import Status
 
diff --git a/worlds/_sc2common/bot/proxy.py b/worlds/_sc2common/bot/proxy.py
index fa9f8537af..0e389fbe17 100644
--- a/worlds/_sc2common/bot/proxy.py
+++ b/worlds/_sc2common/bot/proxy.py
@@ -8,7 +8,7 @@ import traceback
 
 from aiohttp import WSMsgType, web
 from worlds._sc2common.bot import logger
-from s2clientprotocol import sc2api_pb2 as sc_pb
+from .proto import sc2api_pb2 as sc_pb
 
 from .controller import Controller
 from .data import Result, Status
diff --git a/worlds/_sc2common/bot/renderer.py b/worlds/_sc2common/bot/renderer.py
index 2edc75d844..2211fcb10c 100644
--- a/worlds/_sc2common/bot/renderer.py
+++ b/worlds/_sc2common/bot/renderer.py
@@ -1,6 +1,6 @@
 import datetime
 
-from s2clientprotocol import score_pb2 as score_pb
+from .proto import score_pb2 as score_pb
 
 from .position import Point2
 
diff --git a/worlds/_sc2common/requirements.txt b/worlds/_sc2common/requirements.txt
index 1ec405a4ab..181c7f800e 100644
--- a/worlds/_sc2common/requirements.txt
+++ b/worlds/_sc2common/requirements.txt
@@ -1,6 +1,5 @@
-s2clientprotocol>=5.0.11.90136.0
 mpyq>=0.2.5
 portpicker>=1.5.2
 aiohttp>=3.8.4
 loguru>=0.7.0
-protobuf==3.20.3
+protobuf==6.33.5
diff --git a/worlds/adventure/Rom.py b/worlds/adventure/Rom.py
index cb104c56d8..e603ed06bc 100644
--- a/worlds/adventure/Rom.py
+++ b/worlds/adventure/Rom.py
@@ -8,7 +8,7 @@ import bsdiff4
 
 import Utils
 from settings import get_settings
-from worlds.Files import APPatch, AutoPatchRegister
+from worlds.Files import APPatch
 from .Locations import LocationData
 
 ADVENTUREHASH: str = "157bddb7192754a45372be196797f284"
@@ -78,7 +78,7 @@ class BatNoTouchLocation:
         return ret_dict
 
 
-class AdventureDeltaPatch(APPatch, metaclass=AutoPatchRegister):
+class AdventureDeltaPatch(APPatch):
     hash = ADVENTUREHASH
     game = "Adventure"
     patch_file_ending = ".apadvn"
diff --git a/worlds/ahit/Locations.py b/worlds/ahit/Locations.py
index 9937c774d1..e0f256fe7d 100644
--- a/worlds/ahit/Locations.py
+++ b/worlds/ahit/Locations.py
@@ -63,6 +63,9 @@ def is_location_valid(world: "HatInTimeWorld", location: str) -> bool:
     if not world.options.ShuffleStorybookPages and location in storybook_pages.keys():
         return False
 
+    if not world.options.ShuffleDirectorTokens and location in director_tokens.keys():
+        return False
+
     if not world.options.ShuffleActContracts and location in contract_locations.keys():
         return False
 
@@ -566,6 +569,34 @@ storybook_pages = {
     "Rumbi Factory - Page: Last Area": LocData(2000345883, "Time Rift - Rumbi Factory", dlc_flags=HatDLC.dlc2),
 }
 
+director_tokens = {
+    "Murder on the Owl Express - Conductor Token: Cafeteria": LocData(2001104767, "Murder on the Owl Express"),
+    "Murder on the Owl Express - Conductor Token: Recreational Room": LocData(2001104768, "Murder on the Owl Express"),
+    "Picture Perfect - DJ Grooves Token: Cardboard Puppy": LocData(2001203990, "Picture Perfect"),
+    "Picture Perfect - DJ Grooves Token: Card Guessing Game": LocData(2001203991, "Picture Perfect"),
+    "Picture Perfect - DJ Grooves Token: Back Alley": LocData(2001203992, "Picture Perfect"),
+    "Picture Perfect - DJ Grooves Token: Cooking Show": LocData(2001203993, "Picture Perfect"),
+    "Picture Perfect - DJ Grooves Token: Pon Cluster": LocData(2001203987, "Picture Perfect"),
+    "Train Rush - Time Bonus: 1st Room": LocData(2001305235, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Falling Platform": LocData(2001305189, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Acid Crates": LocData(2001305186, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Balloon": LocData(2001305239, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Ring of Fire": LocData(2001305237, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Blue Panels": LocData(2001305236, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Sinking Lava Platform": LocData(2001305234, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Lava Panels 1": LocData(2001305193, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Lava Panels 2": LocData(2001305190, "Train Rush", hookshot=True),
+    "Train Rush - Time Bonus: Lava Panels 3": LocData(2001305238, "Train Rush", hookshot=True),
+    "The Big Parade - DJ Grooves Token (1/8)": LocData(2001400000, "The Big Parade"),
+    "The Big Parade - DJ Grooves Token (2/8)": LocData(2001400001, "The Big Parade"),
+    "The Big Parade - DJ Grooves Token (3/8)": LocData(2001400002, "The Big Parade"),
+    "The Big Parade - DJ Grooves Token (4/8)": LocData(2001400003, "The Big Parade"),
+    "The Big Parade - DJ Grooves Token (5/8)": LocData(2001400004, "The Big Parade", hit_type=HitType.umbrella),
+    "The Big Parade - DJ Grooves Token (6/8)": LocData(2001400005, "The Big Parade", hit_type=HitType.umbrella),
+    "The Big Parade - DJ Grooves Token (7/8)": LocData(2001400006, "The Big Parade", hit_type=HitType.umbrella),
+    "The Big Parade - DJ Grooves Token (8/8)": LocData(2001400007, "The Big Parade", hit_type=HitType.umbrella),
+}
+
 shop_locations = {
     "Badge Seller - Item 1": LocData(2000301003, "Badge Seller"),
     "Badge Seller - Item 2": LocData(2000301004, "Badge Seller"),
@@ -1050,6 +1081,7 @@ location_table = {
     **ahit_locations,
     **act_completions,
     **storybook_pages,
+    **director_tokens,
     **contract_locations,
     **shop_locations,
 }
diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py
index 981480970d..4929e56bd1 100644
--- a/worlds/ahit/Options.py
+++ b/worlds/ahit/Options.py
@@ -72,6 +72,7 @@ def adjust_options(world: "HatInTimeWorld"):
         world.options.EndGoal.value = EndGoal.option_seal_the_deal
         world.options.ActRandomizer.value = 0
         world.options.ShuffleAlpineZiplines.value = 0
+        world.options.ShuffleDirectorTokens.value = 0
         world.options.ShuffleSubconPaintings.value = 0
         world.options.ShuffleStorybookPages.value = 0
         world.options.ShuffleActContracts.value = 0
@@ -219,6 +220,12 @@ class ShuffleStorybookPages(DefaultOnToggle):
     display_name = "Shuffle Storybook Pages"
 
 
+class ShuffleDirectorTokens(Toggle):
+    """If enabled, causes the Conductor/DJ Grooves tokens found in Chapter 2 levels to become item checks.
+    NOTE: This also includes the time bonus pickups from Train Rush, since the level doesn't have any tokens."""
+    display_name = "Shuffle Director Tokens"
+
+
 class ShuffleActContracts(DefaultOnToggle):
     """If enabled, shuffle Snatcher's act contracts into the pool as items"""
     display_name = "Shuffle Contracts"
@@ -658,6 +665,7 @@ class AHITOptions(PerGameCommonOptions):
     StartWithCompassBadge:    StartWithCompassBadge
     CompassBadgeMode:         CompassBadgeMode
     ShuffleStorybookPages:    ShuffleStorybookPages
+    ShuffleDirectorTokens:    ShuffleDirectorTokens
     ShuffleActContracts:      ShuffleActContracts
     ShuffleSubconPaintings:   ShuffleSubconPaintings
     NoPaintingSkips:          NoPaintingSkips
@@ -722,7 +730,8 @@ class AHITOptions(PerGameCommonOptions):
 
 
 ahit_option_groups: Dict[str, List[Any]] = {
-    "General Options": [EndGoal, ShuffleStorybookPages, ShuffleAlpineZiplines, ShuffleSubconPaintings,
+    "General Options": [EndGoal, ShuffleStorybookPages, ShuffleDirectorTokens,
+                        ShuffleAlpineZiplines, ShuffleSubconPaintings,
                         ShuffleActContracts, MinPonCost, MaxPonCost, BadgeSellerMinItems, BadgeSellerMaxItems,
                         LogicDifficulty, NoPaintingSkips, CTRLogic],
 
@@ -759,6 +768,7 @@ slot_data_options: List[str] = [
     "StartWithCompassBadge",
     "CompassBadgeMode",
     "ShuffleStorybookPages",
+    "ShuffleDirectorTokens",
     "ShuffleActContracts",
     "ShuffleSubconPaintings",
     "NoPaintingSkips",
diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index 4c6c24be51..7efd72d11e 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -1,7 +1,7 @@
 from BaseClasses import Region, Entrance, ItemClassification, Location, LocationProgressType
 from .Types import ChapterIndex, Difficulty, HatInTimeLocation, HatInTimeItem
 from .Locations import location_table, storybook_pages, event_locs, is_location_valid, \
-    shop_locations, TASKSANITY_START_ID, snatcher_coins, zero_jumps, zero_jumps_expert, zero_jumps_hard
+    shop_locations, TASKSANITY_START_ID, snatcher_coins, zero_jumps, zero_jumps_expert, zero_jumps_hard, director_tokens
 from typing import TYPE_CHECKING, List, Dict, Optional
 from .Rules import set_rift_rules, get_difficulty
 from .Options import ActRandomizer, EndGoal
@@ -859,6 +859,9 @@ def create_region(world: "HatInTimeWorld", name: str) -> Region:
             if key in storybook_pages.keys() and not world.options.ShuffleStorybookPages:
                 continue
 
+            if key in director_tokens.keys() and not world.options.ShuffleDirectorTokens:
+                continue
+
             location = HatInTimeLocation(world.player, key, data.id, reg)
             reg.locations.append(location)
             if location.name in shop_locations:
diff --git a/worlds/alttp/Dungeons.py b/worlds/alttp/Dungeons.py
index 6b7da69593..04d107f1ff 100644
--- a/worlds/alttp/Dungeons.py
+++ b/worlds/alttp/Dungeons.py
@@ -239,7 +239,7 @@ def fill_dungeons_restrictive(multiworld: MultiWorld):
                 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()
+                pre_fill_items += [item for item in multiworld.worlds[player].get_pre_fill_items() if not item.crystal]
             for item in in_dungeon_items:
                 try:
                     pre_fill_items.remove(item)
diff --git a/worlds/alttp/EntranceShuffle.py b/worlds/alttp/EntranceShuffle.py
index c062a17ea6..550e4878aa 100644
--- a/worlds/alttp/EntranceShuffle.py
+++ b/worlds/alttp/EntranceShuffle.py
@@ -1,74 +1,75 @@
 # ToDo: With shuffle_ganon option, prevent gtower from linking to an exit only location through a 2 entrance cave.
 from collections import defaultdict
 
+from BaseClasses import MultiWorld
 from .OverworldGlitchRules import overworld_glitch_connections
 from .UnderworldGlitchRules import underworld_glitch_connections
 from .Regions import mark_light_world_regions
 from .InvertedRegions import mark_dark_world_regions
 
 
-def link_entrances(world, player):
-    connect_two_way(world, 'Links House', 'Links House Exit', player) # unshuffled. For now
-    connect_exit(world, 'Chris Houlihan Room Exit', 'Links House', player) # should always match link's house, except for plandos
+def link_entrances(multiworld: MultiWorld, player: int):
+    connect_two_way(multiworld, 'Links House', 'Links House Exit', player) # unshuffled. For now
+    connect_exit(multiworld, 'Chris Houlihan Room Exit', 'Links House', player) # should always match link's house, except for plandos
 
     Dungeon_Exits = Dungeon_Exits_Base.copy()
     Cave_Exits = Cave_Exits_Base.copy()
     Old_Man_House = Old_Man_House_Base.copy()
     Cave_Three_Exits = Cave_Three_Exits_Base.copy()
 
-    unbias_some_entrances(world, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits)
+    unbias_some_entrances(multiworld, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits)
 
     # setup mandatory connections
     for exitname, regionname in mandatory_connections:
-        connect_simple(world, exitname, regionname, player)
+        connect_simple(multiworld, exitname, regionname, player)
 
     # if we do not shuffle, set default connections
-    if world.worlds[player].options.entrance_shuffle == 'vanilla':
+    if multiworld.worlds[player].options.entrance_shuffle == 'vanilla':
         for exitname, regionname in default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
         for exitname, regionname in default_dungeon_connections:
-            connect_simple(world, exitname, regionname, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_simple':
+            connect_simple(multiworld, exitname, regionname, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_simple':
         for exitname, regionname in default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
 
-        simple_shuffle_dungeons(world, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_full':
+        simple_shuffle_dungeons(multiworld, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_full':
         for exitname, regionname in default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
 
-        skull_woods_shuffle(world, player)
+        skull_woods_shuffle(multiworld, player)
 
         dungeon_exits = list(Dungeon_Exits)
         lw_entrances = list(LW_Dungeon_Entrances)
         dw_entrances = list(DW_Dungeon_Entrances)
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # must connect front of hyrule castle to do escape
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
         else:
             dungeon_exits.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
             lw_entrances.append('Hyrule Castle Entrance (South)')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
         else:
             dw_entrances.append('Ganons Tower')
             dungeon_exits.append('Ganons Tower Exit')
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # rest of hyrule castle must be in light world, so it has to be the one connected to east exit of desert
             hyrule_castle_exits = [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')]
-            connect_mandatory_exits(world, lw_entrances, hyrule_castle_exits, list(LW_Dungeon_Entrances_Must_Exit), player)
-            connect_caves(world, lw_entrances, [], hyrule_castle_exits, player)
+            connect_mandatory_exits(multiworld, lw_entrances, hyrule_castle_exits, list(LW_Dungeon_Entrances_Must_Exit), player)
+            connect_caves(multiworld, lw_entrances, [], hyrule_castle_exits, player)
         else:
-            connect_mandatory_exits(world, lw_entrances, dungeon_exits, list(LW_Dungeon_Entrances_Must_Exit), player)
-        connect_mandatory_exits(world, dw_entrances, dungeon_exits, list(DW_Dungeon_Entrances_Must_Exit), player)
-        connect_caves(world, lw_entrances, dw_entrances, dungeon_exits, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_crossed':
-        crossed_shuffle_dungeons(world, player)
-    elif world.worlds[player].options.entrance_shuffle == 'simple':
-        simple_shuffle_dungeons(world, player)
+            connect_mandatory_exits(multiworld, lw_entrances, dungeon_exits, list(LW_Dungeon_Entrances_Must_Exit), player)
+        connect_mandatory_exits(multiworld, dw_entrances, dungeon_exits, list(DW_Dungeon_Entrances_Must_Exit), player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, dungeon_exits, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_crossed':
+        crossed_shuffle_dungeons(multiworld, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'simple':
+        simple_shuffle_dungeons(multiworld, player)
 
         old_man_entrances = list(Old_Man_Entrances)
         caves = list(Cave_Exits)
@@ -82,64 +83,64 @@ def link_entrances(world, player):
         # we shuffle all 2 entrance caves as pairs as a start
         # start with the ones that need to be directed
         two_door_caves = list(Two_Door_Caves_Directional)
-        world.random.shuffle(two_door_caves)
-        world.random.shuffle(caves)
+        multiworld.random.shuffle(two_door_caves)
+        multiworld.random.shuffle(caves)
         while two_door_caves:
             entrance1, entrance2 = two_door_caves.pop()
             exit1, exit2 = caves.pop()
-            connect_two_way(world, entrance1, exit1, player)
-            connect_two_way(world, entrance2, exit2, player)
+            connect_two_way(multiworld, entrance1, exit1, player)
+            connect_two_way(multiworld, entrance2, exit2, player)
 
         # now the remaining pairs
         two_door_caves = list(Two_Door_Caves)
-        world.random.shuffle(two_door_caves)
+        multiworld.random.shuffle(two_door_caves)
         while two_door_caves:
             entrance1, entrance2 = two_door_caves.pop()
             exit1, exit2 = caves.pop()
-            connect_two_way(world, entrance1, exit1, player)
-            connect_two_way(world, entrance2, exit2, player)
+            connect_two_way(multiworld, entrance1, exit1, player)
+            connect_two_way(multiworld, entrance2, exit2, player)
 
         # at this point only Light World death mountain entrances remain
         # place old man, has limited options
         remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)',
                                'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave', 'Spiral Cave (Bottom)']
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
         remaining_entrances.extend(old_man_entrances)
-        world.random.shuffle(remaining_entrances)
+        multiworld.random.shuffle(remaining_entrances)
         old_man_entrance = remaining_entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
 
         # add old man house to ensure it is always somewhere on light death mountain
         caves.extend(list(Old_Man_House))
         caves.extend(list(three_exit_caves))
 
         # connect rest
-        connect_caves(world, remaining_entrances, [], caves, player)
+        connect_caves(multiworld, remaining_entrances, [], caves, player)
 
         # scramble holes
-        scramble_holes(world, player)
+        scramble_holes(multiworld, player)
 
         # place blacksmith, has limited options
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         bomb_shop_doors.extend(blacksmith_doors)
 
         # place bomb shop, has limited options
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Big Bomb Shop', player)
         single_doors.extend(bomb_shop_doors)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         # place remaining doors
-        connect_doors(world, single_doors, door_targets, player)
-    elif world.worlds[player].options.entrance_shuffle == 'restricted':
-        simple_shuffle_dungeons(world, player)
+        connect_doors(multiworld, single_doors, door_targets, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'restricted':
+        simple_shuffle_dungeons(multiworld, player)
 
         lw_entrances = list(LW_Entrances + LW_Single_Cave_Doors + Old_Man_Entrances)
         dw_entrances = list(DW_Entrances + DW_Single_Cave_Doors)
@@ -152,26 +153,26 @@ def link_entrances(world, player):
         door_targets = list(Single_Cave_Targets)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         # in restricted, the only mandatory exits are in dark world
-        connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits, player)
+        connect_mandatory_exits(multiworld, dw_entrances, caves, dw_must_exits, player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in lw_entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         lw_entrances.remove(old_man_exit)
 
         # place blacksmith, has limited options
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in all_entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         if blacksmith_hut in lw_entrances:
             lw_entrances.remove(blacksmith_hut)
         if blacksmith_hut in dw_entrances:
@@ -182,36 +183,36 @@ def link_entrances(world, player):
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in all_entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Big Bomb Shop', player)
         if bomb_shop in lw_entrances:
             lw_entrances.remove(bomb_shop)
         if bomb_shop in dw_entrances:
             dw_entrances.remove(bomb_shop)
 
         # place the old man cave's entrance somewhere in the light world
-        world.random.shuffle(lw_entrances)
+        multiworld.random.shuffle(lw_entrances)
         old_man_entrance = lw_entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
 
         # place Old Man House in Light World
-        connect_caves(world, lw_entrances, [], list(Old_Man_House), player) #for multiple seeds
+        connect_caves(multiworld, lw_entrances, [], list(Old_Man_House), player) #for multiple seeds
 
 
         # now scramble the rest
-        connect_caves(world, lw_entrances, dw_entrances, caves, player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, caves, player)
 
         # scramble holes
-        scramble_holes(world, player)
+        scramble_holes(multiworld, player)
 
         doors = lw_entrances + dw_entrances
 
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
+        connect_doors(multiworld, doors, door_targets, player)
 
-    elif world.worlds[player].options.entrance_shuffle == 'full':
-        skull_woods_shuffle(world, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'full':
+        skull_woods_shuffle(multiworld, player)
 
         lw_entrances = list(LW_Entrances + LW_Dungeon_Entrances + LW_Single_Cave_Doors + Old_Man_Entrances)
         dw_entrances = list(DW_Entrances + DW_Dungeon_Entrances + DW_Single_Cave_Doors)
@@ -225,18 +226,18 @@ def link_entrances(world, player):
         old_man_house = list(Old_Man_House)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # must connect front of hyrule castle to do escape
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
         else:
-            caves.append(tuple(world.random.sample(
+            caves.append(tuple(multiworld.random.sample(
                 ['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
             lw_entrances.append('Hyrule Castle Entrance (South)')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
         else:
             dw_entrances.append('Ganons Tower')
             caves.append('Ganons Tower Exit')
@@ -244,45 +245,45 @@ def link_entrances(world, player):
 
         # we randomize which world requirements we fulfill first so we get better dungeon distribution
         #we also places the Old Man House at this time to make sure he can be connected to the desert one way
-        if world.random.randint(0, 1) == 0:
+        if multiworld.random.randint(0, 1) == 0:
             caves += old_man_house
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
+            connect_mandatory_exits(multiworld, lw_entrances, caves, lw_must_exits, player)
             try:
                 caves.remove(old_man_house[0])
             except ValueError:
                 pass
             else:  # if the cave wasn't placed we get here
-                connect_caves(world, lw_entrances, [], old_man_house, player)
-            connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits, player)
+                connect_caves(multiworld, lw_entrances, [], old_man_house, player)
+            connect_mandatory_exits(multiworld, dw_entrances, caves, dw_must_exits, player)
         else:
-            connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits, player)
+            connect_mandatory_exits(multiworld, dw_entrances, caves, dw_must_exits, player)
             caves += old_man_house
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
+            connect_mandatory_exits(multiworld, lw_entrances, caves, lw_must_exits, player)
             try:
                 caves.remove(old_man_house[0])
             except ValueError:
                 pass
             else: #if the cave wasn't placed we get here
-                connect_caves(world, lw_entrances, [], old_man_house, player)
-        if world.worlds[player].options.mode == 'standard':
+                connect_caves(multiworld, lw_entrances, [], old_man_house, player)
+        if multiworld.worlds[player].options.mode == 'standard':
             # rest of hyrule castle must be in light world
-            connect_caves(world, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
+            connect_caves(multiworld, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in lw_entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         lw_entrances.remove(old_man_exit)
 
         # place blacksmith, has limited options
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in all_entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         if blacksmith_hut in lw_entrances:
             lw_entrances.remove(blacksmith_hut)
         if blacksmith_hut in dw_entrances:
@@ -293,9 +294,9 @@ def link_entrances(world, player):
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in all_entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Big Bomb Shop', player)
         if bomb_shop in lw_entrances:
             lw_entrances.remove(bomb_shop)
         if bomb_shop in dw_entrances:
@@ -303,21 +304,21 @@ def link_entrances(world, player):
 
         # place the old man cave's entrance somewhere in the light world
         old_man_entrance = lw_entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
 
 
         # now scramble the rest
-        connect_caves(world, lw_entrances, dw_entrances, caves, player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, caves, player)
 
         # scramble holes
-        scramble_holes(world, player)
+        scramble_holes(multiworld, player)
 
         doors = lw_entrances + dw_entrances
 
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
-    elif world.worlds[player].options.entrance_shuffle == 'crossed':
-        skull_woods_shuffle(world, player)
+        connect_doors(multiworld, doors, door_targets, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'crossed':
+        skull_woods_shuffle(multiworld, player)
 
         entrances = list(LW_Entrances + LW_Dungeon_Entrances + LW_Single_Cave_Doors + Old_Man_Entrances + DW_Entrances + DW_Dungeon_Entrances + DW_Single_Cave_Doors)
         must_exits = list(DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit + LW_Dungeon_Entrances_Must_Exit)
@@ -329,43 +330,43 @@ def link_entrances(world, player):
         door_targets = list(Single_Cave_Targets)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # must connect front of hyrule castle to do escape
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
         else:
-            caves.append(tuple(world.random.sample(
+            caves.append(tuple(multiworld.random.sample(
                 ['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
             entrances.append('Hyrule Castle Entrance (South)')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
         else:
             entrances.append('Ganons Tower')
             caves.append('Ganons Tower Exit')
 
         #place must-exit caves 
-        connect_mandatory_exits(world, entrances, caves, must_exits, player)
+        connect_mandatory_exits(multiworld, entrances, caves, must_exits, player)
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # rest of hyrule castle must be dealt with
-            connect_caves(world, entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
+            connect_caves(multiworld, entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         entrances.remove(old_man_exit)
 
         # place blacksmith, has limited options
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         entrances.remove(blacksmith_hut)
         bomb_shop_doors.extend(blacksmith_doors)
 
@@ -373,28 +374,28 @@ def link_entrances(world, player):
 
         # cannot place it anywhere already taken (or that are otherwise not eligable for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Big Bomb Shop', player)
         entrances.remove(bomb_shop)
 
 
         # place the old man cave's entrance somewhere
-        world.random.shuffle(entrances)
+        multiworld.random.shuffle(entrances)
         old_man_entrance = entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
 
 
         # now scramble the rest
-        connect_caves(world, entrances, [], caves, player)
+        connect_caves(multiworld, entrances, [], caves, player)
 
         # scramble holes
-        scramble_holes(world, player)
+        scramble_holes(multiworld, player)
 
         # place remaining doors
-        connect_doors(world, entrances, door_targets, player)
+        connect_doors(multiworld, entrances, door_targets, player)
 
-    elif world.worlds[player].options.entrance_shuffle == 'insanity':
+    elif multiworld.worlds[player].options.entrance_shuffle == 'insanity':
         # beware ye who enter here
 
         entrances = LW_Entrances + LW_Dungeon_Entrances + DW_Entrances + DW_Dungeon_Entrances + Old_Man_Entrances + ['Skull Woods Second Section Door (East)', 'Skull Woods First Section Door', 'Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump', 'Lumberjack Tree Cave']
@@ -412,7 +413,7 @@ def link_entrances(world, player):
         blacksmith_doors = list(Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors)
         door_targets = list(Single_Cave_Targets)
 
-        world.random.shuffle(doors)
+        multiworld.random.shuffle(doors)
 
         old_man_entrances = list(Old_Man_Entrances) + ['Tower of Hera']
 
@@ -429,13 +430,13 @@ def link_entrances(world, player):
                         'Skull Woods First Section (Left)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Top)']
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # cannot move uncle cave
-            connect_entrance(world, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player)
-            connect_exit(world, 'Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance Stairs', player)
-            connect_entrance(world, 'Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Exit', player)
+            connect_entrance(multiworld, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player)
+            connect_exit(multiworld, 'Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance Stairs', player)
+            connect_entrance(multiworld, 'Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Exit', player)
         else:
             hole_entrances.append('Hyrule Castle Secret Entrance Drop')
             hole_targets.append('Hyrule Castle Secret Entrance')
@@ -443,10 +444,10 @@ def link_entrances(world, player):
             entrances.append('Hyrule Castle Secret Entrance Stairs')
             caves.append('Hyrule Castle Secret Entrance Exit')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
-            connect_two_way(world, 'Pyramid Entrance', 'Pyramid Exit', player)
-            connect_entrance(world, 'Pyramid Hole', 'Pyramid', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
+            connect_two_way(multiworld, 'Pyramid Entrance', 'Pyramid Exit', player)
+            connect_entrance(multiworld, 'Pyramid Hole', 'Pyramid', player)
         else:
             entrances.append('Ganons Tower')
             caves.extend(['Ganons Tower Exit', 'Pyramid Exit'])
@@ -455,19 +456,19 @@ def link_entrances(world, player):
             entrances_must_exits.append('Pyramid Entrance')
             doors.extend(['Ganons Tower', 'Pyramid Entrance'])
 
-        world.random.shuffle(hole_entrances)
-        world.random.shuffle(hole_targets)
-        world.random.shuffle(entrances)
+        multiworld.random.shuffle(hole_entrances)
+        multiworld.random.shuffle(hole_targets)
+        multiworld.random.shuffle(entrances)
 
         # fill up holes
         for hole in hole_entrances:
-            connect_entrance(world, hole, hole_targets.pop(), player)
+            connect_entrance(multiworld, hole, hole_targets.pop(), player)
 
         # hyrule castle handling
-        if world.worlds[player].options.mode == 'standard':
+        if multiworld.worlds[player].options.mode == 'standard':
             # must connect front of hyrule castle to do escape
-            connect_entrance(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
-            connect_exit(world, 'Hyrule Castle Exit (South)', 'Hyrule Castle Entrance (South)', player)
+            connect_entrance(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_exit(multiworld, 'Hyrule Castle Exit (South)', 'Hyrule Castle Entrance (South)', player)
             caves.append(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
         else:
             doors.append('Hyrule Castle Entrance (South)')
@@ -476,7 +477,7 @@ def link_entrances(world, player):
 
         # now let's deal with mandatory reachable stuff
         def extract_reachable_exit(cavelist):
-            world.random.shuffle(cavelist)
+            multiworld.random.shuffle(cavelist)
             candidate = None
             for cave in cavelist:
                 if isinstance(cave, tuple) and len(cave) > 1:
@@ -496,8 +497,8 @@ def link_entrances(world, player):
 
             exit = cave[-1]
             cave = cave[:-1]
-            connect_exit(world, exit, entrance, player)
-            connect_entrance(world, doors.pop(), exit, player)
+            connect_exit(multiworld, exit, entrance, player)
+            connect_entrance(multiworld, doors.pop(), exit, player)
             # rest of cave now is forced to be in this world
             caves.append(cave)
 
@@ -508,26 +509,26 @@ def link_entrances(world, player):
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [entrance for entrance in old_man_entrances if entrance in entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
         entrances.remove(old_man_exit)
 
-        connect_exit(world, 'Old Man Cave Exit (East)', old_man_exit, player)
-        connect_entrance(world, doors.pop(), 'Old Man Cave Exit (East)', player)
+        connect_exit(multiworld, 'Old Man Cave Exit (East)', old_man_exit, player)
+        connect_entrance(multiworld, doors.pop(), 'Old Man Cave Exit (East)', player)
         caves.append('Old Man Cave Exit (West)')
 
         # place blacksmith, has limited options
         blacksmith_doors = [door for door in blacksmith_doors if door in doors]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         doors.remove(blacksmith_hut)
 
         # place dam and pyramid fairy, have limited options
         bomb_shop_doors = [door for door in bomb_shop_doors if door in doors]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Big Bomb Shop', player)
         doors.remove(bomb_shop)
 
         # handle remaining caves
@@ -536,40 +537,40 @@ def link_entrances(world, player):
                 cave = (cave,)
 
             for exit in cave:
-                connect_exit(world, exit, entrances.pop(), player)
-                connect_entrance(world, doors.pop(), exit, player)
+                connect_exit(multiworld, exit, entrances.pop(), player)
+                connect_entrance(multiworld, doors.pop(), exit, player)
 
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
+        connect_doors(multiworld, doors, door_targets, player)
 
     else:
         raise NotImplementedError(
-            f'{world.worlds[player].options.entrance_shuffle} Shuffling not supported yet. Player {world.get_player_name(player)}')
+            f'{multiworld.worlds[player].options.entrance_shuffle} Shuffling not supported yet. Player {multiworld.get_player_name(player)}')
 
-    if world.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
-        overworld_glitch_connections(world, player)
+    if multiworld.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
+        overworld_glitch_connections(multiworld, player)
         # mandatory hybrid major glitches connections
-        if world.worlds[player].options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
-            underworld_glitch_connections(world, player)
+        if multiworld.worlds[player].options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
+            underworld_glitch_connections(multiworld, player)
 
     # check for swamp palace fix
-    if world.get_entrance('Dam', player).connected_region.name != 'Dam' or world.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Palace (Entrance)':
-        world.worlds[player].swamp_patch_required = True
+    if multiworld.get_entrance('Dam', player).connected_region.name != 'Dam' or multiworld.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Palace (Entrance)':
+        multiworld.worlds[player].swamp_patch_required = True
 
     # check for potion shop location
-    if world.get_entrance('Potion Shop', player).connected_region.name != 'Potion Shop':
-        world.worlds[player].powder_patch_required = True
+    if multiworld.get_entrance('Potion Shop', player).connected_region.name != 'Potion Shop':
+        multiworld.worlds[player].powder_patch_required = True
 
     # check for ganon location
-    if world.get_entrance('Pyramid Hole', player).connected_region.name != 'Pyramid':
-        world.worlds[player].ganon_at_pyramid = False
+    if multiworld.get_entrance('Pyramid Hole', player).connected_region.name != 'Pyramid':
+        multiworld.worlds[player].ganon_at_pyramid = False
 
     # check for Ganon's Tower location
-    if world.get_entrance('Ganons Tower', player).connected_region.name != 'Ganons Tower (Entrance)':
-        world.worlds[player].ganonstower_vanilla = False
+    if multiworld.get_entrance('Ganons Tower', player).connected_region.name != 'Ganons Tower (Entrance)':
+        multiworld.worlds[player].ganonstower_vanilla = False
 
 
-def link_inverted_entrances(world, player):
+def link_inverted_entrances(multiworld: MultiWorld, player: int):
     # Link's house shuffled freely, Houlihan set in mandatory_connections 
 
     Dungeon_Exits = Inverted_Dungeon_Exits_Base.copy()
@@ -577,28 +578,28 @@ def link_inverted_entrances(world, player):
     Old_Man_House = Old_Man_House_Base.copy()
     Cave_Three_Exits = Cave_Three_Exits_Base.copy()
 
-    unbias_some_entrances(world, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits)
+    unbias_some_entrances(multiworld, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits)
 
     # setup mandatory connections
     for exitname, regionname in inverted_mandatory_connections:
-        connect_simple(world, exitname, regionname, player)
+        connect_simple(multiworld, exitname, regionname, player)
 
     # if we do not shuffle, set default connections
-    if world.worlds[player].options.entrance_shuffle == 'vanilla':
+    if multiworld.worlds[player].options.entrance_shuffle == 'vanilla':
         for exitname, regionname in inverted_default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
         for exitname, regionname in inverted_default_dungeon_connections:
-            connect_simple(world, exitname, regionname, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_simple':
+            connect_simple(multiworld, exitname, regionname, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_simple':
         for exitname, regionname in inverted_default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
 
-        simple_shuffle_dungeons(world, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_full':
+        simple_shuffle_dungeons(multiworld, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_full':
         for exitname, regionname in inverted_default_connections:
-            connect_simple(world, exitname, regionname, player)
+            connect_simple(multiworld, exitname, regionname, player)
 
-        skull_woods_shuffle(world, player)
+        skull_woods_shuffle(multiworld, player)
 
         dungeon_exits = list(Dungeon_Exits)
         lw_entrances = list(Inverted_LW_Dungeon_Entrances)
@@ -606,7 +607,7 @@ def link_inverted_entrances(world, player):
         dw_entrances = list(Inverted_DW_Dungeon_Entrances)
 
         # randomize which desert ledge door is a must-exit
-        if world.random.randint(0, 1):
+        if multiworld.random.randint(0, 1):
             lw_dungeon_entrances_must_exit.append('Desert Palace Entrance (North)')
             lw_entrances.append('Desert Palace Entrance (West)')
         else:
@@ -616,8 +617,8 @@ def link_inverted_entrances(world, player):
         dungeon_exits.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
         lw_entrances.append('Hyrule Castle Entrance (South)')
         
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
             hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)']
         else:
             lw_entrances.append('Inverted Ganons Tower')
@@ -627,14 +628,14 @@ def link_inverted_entrances(world, player):
         # shuffle aga door first. If it's on HC ledge, remaining HC ledge door must be must-exit
         all_entrances_aga = lw_entrances + dw_entrances
         aga_doors = [i for i in all_entrances_aga]
-        world.random.shuffle(aga_doors)
+        multiworld.random.shuffle(aga_doors)
         aga_door = aga_doors.pop()
         
         if aga_door in hc_ledge_entrances:
             lw_entrances.remove(aga_door)
             hc_ledge_entrances.remove(aga_door)
 
-            world.random.shuffle(hc_ledge_entrances)
+            multiworld.random.shuffle(hc_ledge_entrances)
             hc_ledge_must_exit = hc_ledge_entrances.pop()
             lw_entrances.remove(hc_ledge_must_exit)
             lw_dungeon_entrances_must_exit.append(hc_ledge_must_exit)
@@ -643,16 +644,16 @@ def link_inverted_entrances(world, player):
         else:
             dw_entrances.remove(aga_door)
 
-        connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
+        connect_two_way(multiworld, aga_door, 'Inverted Agahnims Tower Exit', player)
         dungeon_exits.remove('Inverted Agahnims Tower Exit')
 
-        connect_mandatory_exits(world, lw_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player)
+        connect_mandatory_exits(multiworld, lw_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player)
 
-        connect_caves(world, lw_entrances, dw_entrances, dungeon_exits, player)
-    elif world.worlds[player].options.entrance_shuffle == 'dungeons_crossed':
-        inverted_crossed_shuffle_dungeons(world, player)
-    elif world.worlds[player].options.entrance_shuffle == 'simple':
-        simple_shuffle_dungeons(world, player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, dungeon_exits, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'dungeons_crossed':
+        inverted_crossed_shuffle_dungeons(multiworld, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'simple':
+        simple_shuffle_dungeons(multiworld, player)
 
         old_man_entrances = list(Inverted_Old_Man_Entrances)
         caves = list(Cave_Exits)
@@ -666,28 +667,28 @@ def link_inverted_entrances(world, player):
         # we shuffle all 2 entrance caves as pairs as a start
         # start with the ones that need to be directed
         two_door_caves = list(Inverted_Two_Door_Caves_Directional)
-        world.random.shuffle(two_door_caves)
-        world.random.shuffle(caves)
+        multiworld.random.shuffle(two_door_caves)
+        multiworld.random.shuffle(caves)
         while two_door_caves:
             entrance1, entrance2 = two_door_caves.pop()
             exit1, exit2 = caves.pop()
-            connect_two_way(world, entrance1, exit1, player)
-            connect_two_way(world, entrance2, exit2, player)
+            connect_two_way(multiworld, entrance1, exit1, player)
+            connect_two_way(multiworld, entrance2, exit2, player)
 
         # now the remaining pairs
         two_door_caves = list(Inverted_Two_Door_Caves)
-        world.random.shuffle(two_door_caves)
+        multiworld.random.shuffle(two_door_caves)
         while two_door_caves:
             entrance1, entrance2 = two_door_caves.pop()
             exit1, exit2 = caves.pop()
-            connect_two_way(world, entrance1, exit1, player)
-            connect_two_way(world, entrance2, exit2, player)
+            connect_two_way(multiworld, entrance1, exit1, player)
+            connect_two_way(multiworld, entrance2, exit2, player)
         
         # place links house
         links_house_doors = [i for i in bomb_shop_doors + blacksmith_doors if
                              i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
-        links_house = world.random.choice(list(links_house_doors))
-        connect_two_way(world, links_house, 'Inverted Links House Exit', player)
+        links_house = multiworld.random.choice(list(links_house_doors))
+        connect_two_way(multiworld, links_house, 'Inverted Links House Exit', player)
         if links_house in bomb_shop_doors:
             bomb_shop_doors.remove(links_house)
         if links_house in blacksmith_doors:
@@ -697,11 +698,11 @@ def link_inverted_entrances(world, player):
 
         # place dark sanc
         sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in bomb_shop_doors]
-        sanc_door = world.random.choice(sanc_doors)
+        sanc_door = multiworld.random.choice(sanc_doors)
         bomb_shop_doors.remove(sanc_door)
 
-        connect_entrance(world, sanc_door, 'Inverted Dark Sanctuary', player)
-        world.get_entrance('Inverted Dark Sanctuary Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
+        connect_entrance(multiworld, sanc_door, 'Inverted Dark Sanctuary', player)
+        multiworld.get_entrance('Inverted Dark Sanctuary Exit', player).connect(multiworld.get_entrance(sanc_door, player).parent_region)
         
         lw_dm_entrances = ['Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', 'Old Man House (Bottom)',
                            'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave (Bottom)', 'Old Man Cave (East)',
@@ -710,10 +711,10 @@ def link_inverted_entrances(world, player):
         
         # place old man, bumper cave bottom to DDM entrances not in east bottom
 
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, 'Bumper Cave (Bottom)', 'Old Man Cave Exit (West)', player)
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, 'Bumper Cave (Bottom)', 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         if old_man_exit == 'Spike Cave':
             bomb_shop_doors.remove('Spike Cave')
             bomb_shop_doors.extend(old_man_entrances)
@@ -723,33 +724,33 @@ def link_inverted_entrances(world, player):
         caves.extend(list(three_exit_caves))
 
         # connect rest
-        connect_caves(world, lw_dm_entrances, [], caves, player)
+        connect_caves(multiworld, lw_dm_entrances, [], caves, player)
         
         # scramble holes
-        scramble_inverted_holes(world, player)
+        scramble_inverted_holes(multiworld, player)
 
         # place blacksmith, has limited options
         blacksmith_doors = [door for door in blacksmith_doors[:]]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         bomb_shop_doors.extend(blacksmith_doors)
 
         # place bomb shop, has limited options
         bomb_shop_doors = [door for door in bomb_shop_doors[:]]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Inverted Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Inverted Big Bomb Shop', player)
         single_doors.extend(bomb_shop_doors)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         # place remaining doors
-        connect_doors(world, single_doors, door_targets, player)
+        connect_doors(multiworld, single_doors, door_targets, player)
     
-    elif world.worlds[player].options.entrance_shuffle == 'restricted':
-        simple_shuffle_dungeons(world, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'restricted':
+        simple_shuffle_dungeons(multiworld, player)
 
         lw_entrances = list(Inverted_LW_Entrances + Inverted_LW_Single_Cave_Doors)
         dw_entrances = list(Inverted_DW_Entrances + Inverted_DW_Single_Cave_Doors + Inverted_Old_Man_Entrances)
@@ -764,8 +765,8 @@ def link_inverted_entrances(world, player):
         # place links house
         links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if
                              i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
-        links_house = world.random.choice(list(links_house_doors))
-        connect_two_way(world, links_house, 'Inverted Links House Exit', player)
+        links_house = multiworld.random.choice(list(links_house_doors))
+        connect_two_way(multiworld, links_house, 'Inverted Links House Exit', player)
         if links_house in lw_entrances:
             lw_entrances.remove(links_house)
         elif links_house in dw_entrances:
@@ -775,32 +776,32 @@ def link_inverted_entrances(world, player):
 
         # place dark sanc
         sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances]
-        sanc_door = world.random.choice(sanc_doors)
+        sanc_door = multiworld.random.choice(sanc_doors)
         dw_entrances.remove(sanc_door)
-        connect_entrance(world, sanc_door, 'Inverted Dark Sanctuary', player)
-        world.get_entrance('Inverted Dark Sanctuary Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
+        connect_entrance(multiworld, sanc_door, 'Inverted Dark Sanctuary', player)
+        multiworld.get_entrance('Inverted Dark Sanctuary Exit', player).connect(multiworld.get_entrance(sanc_door, player).parent_region)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         # place must exits
-        connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
+        connect_mandatory_exits(multiworld, lw_entrances, caves, lw_must_exits, player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in dw_entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         dw_entrances.remove(old_man_exit)
 
         # place blacksmith, has limited options
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in all_entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         if blacksmith_hut in lw_entrances:
             lw_entrances.remove(blacksmith_hut)
         if blacksmith_hut in dw_entrances:
@@ -811,30 +812,30 @@ def link_inverted_entrances(world, player):
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in all_entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Inverted Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Inverted Big Bomb Shop', player)
         if bomb_shop in lw_entrances:
             lw_entrances.remove(bomb_shop)
         if bomb_shop in dw_entrances:
             dw_entrances.remove(bomb_shop)
 
         # place the old man cave's entrance somewhere in the dark world
-        world.random.shuffle(dw_entrances)
+        multiworld.random.shuffle(dw_entrances)
         old_man_entrance = dw_entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
 
         # now scramble the rest
-        connect_caves(world, lw_entrances, dw_entrances, caves, player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, caves, player)
 
         # scramble holes
-        scramble_inverted_holes(world, player)
+        scramble_inverted_holes(multiworld, player)
 
         doors = lw_entrances + dw_entrances
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
-    elif world.worlds[player].options.entrance_shuffle == 'full':
-        skull_woods_shuffle(world, player)
+        connect_doors(multiworld, doors, door_targets, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'full':
+        skull_woods_shuffle(multiworld, player)
 
         lw_entrances = list(Inverted_LW_Entrances + Inverted_LW_Dungeon_Entrances + Inverted_LW_Single_Cave_Doors)
         dw_entrances = list(Inverted_DW_Entrances + Inverted_DW_Dungeon_Entrances + Inverted_DW_Single_Cave_Doors + Inverted_Old_Man_Entrances)
@@ -847,7 +848,7 @@ def link_inverted_entrances(world, player):
         old_man_house = list(Old_Man_House)
 
         # randomize which desert ledge door is a must-exit
-        if world.random.randint(0, 1) == 0:
+        if multiworld.random.randint(0, 1) == 0:
             lw_must_exits.append('Desert Palace Entrance (North)')
             lw_entrances.append('Desert Palace Entrance (West)')
         else:
@@ -855,12 +856,12 @@ def link_inverted_entrances(world, player):
             lw_entrances.append('Desert Palace Entrance (North)')
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         lw_entrances.append('Hyrule Castle Entrance (South)')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
             hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)']
         else:
             lw_entrances.append('Inverted Ganons Tower')
@@ -870,14 +871,14 @@ def link_inverted_entrances(world, player):
         # shuffle aga door first. if it's on hc ledge, then one other hc ledge door has to be must_exit
         all_entrances_aga = lw_entrances + dw_entrances
         aga_doors = [i for i in all_entrances_aga]
-        world.random.shuffle(aga_doors)
+        multiworld.random.shuffle(aga_doors)
         aga_door = aga_doors.pop()
 
         if aga_door in hc_ledge_entrances:
             lw_entrances.remove(aga_door)
             hc_ledge_entrances.remove(aga_door)
 
-            world.random.shuffle(hc_ledge_entrances)
+            multiworld.random.shuffle(hc_ledge_entrances)
             hc_ledge_must_exit = hc_ledge_entrances.pop()
             lw_entrances.remove(hc_ledge_must_exit)
             lw_must_exits.append(hc_ledge_must_exit)
@@ -886,14 +887,14 @@ def link_inverted_entrances(world, player):
         else:
             dw_entrances.remove(aga_door)
 
-        connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
+        connect_two_way(multiworld, aga_door, 'Inverted Agahnims Tower Exit', player)
         caves.remove('Inverted Agahnims Tower Exit')
 
         # place links house
         links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if
                              i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
-        links_house = world.random.choice(list(links_house_doors))
-        connect_two_way(world, links_house, 'Inverted Links House Exit', player)
+        links_house = multiworld.random.choice(list(links_house_doors))
+        connect_two_way(multiworld, links_house, 'Inverted Links House Exit', player)
         if links_house in lw_entrances:
             lw_entrances.remove(links_house)
         if links_house in dw_entrances:
@@ -903,35 +904,35 @@ def link_inverted_entrances(world, player):
 
         # place dark sanc
         sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances]
-        sanc_door = world.random.choice(sanc_doors)
+        sanc_door = multiworld.random.choice(sanc_doors)
         dw_entrances.remove(sanc_door)
-        connect_entrance(world, sanc_door, 'Inverted Dark Sanctuary', player)
-        world.get_entrance('Inverted Dark Sanctuary Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
+        connect_entrance(multiworld, sanc_door, 'Inverted Dark Sanctuary', player)
+        multiworld.get_entrance('Inverted Dark Sanctuary Exit', player).connect(multiworld.get_entrance(sanc_door, player).parent_region)
         
         # place old man house
         # no dw must exits in inverted, but we randomize whether cave is in light or dark world
-        if world.random.randint(0, 1) == 0:
+        if multiworld.random.randint(0, 1) == 0:
             caves += old_man_house
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
+            connect_mandatory_exits(multiworld, lw_entrances, caves, lw_must_exits, player)
             try:
                 caves.remove(old_man_house[0])
             except ValueError:
                 pass
             else:  # if the cave wasn't placed we get here
-                connect_caves(world, lw_entrances, [], old_man_house, player)
+                connect_caves(multiworld, lw_entrances, [], old_man_house, player)
         else:
-            connect_caves(world, dw_entrances, [], old_man_house, player)
-            connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
+            connect_caves(multiworld, dw_entrances, [], old_man_house, player)
+            connect_mandatory_exits(multiworld, lw_entrances, caves, lw_must_exits, player)
 
         # put all HC exits in LW in inverted full shuffle
-        connect_caves(world, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)')], player)
+        connect_caves(multiworld, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)')], player)
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in dw_entrances + lw_entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         if old_man_exit in dw_entrances:
             dw_entrances.remove(old_man_exit)
             old_man_world = 'dark'
@@ -943,9 +944,9 @@ def link_inverted_entrances(world, player):
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in all_entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         if blacksmith_hut in lw_entrances:
             lw_entrances.remove(blacksmith_hut)
         if blacksmith_hut in dw_entrances:
@@ -956,36 +957,36 @@ def link_inverted_entrances(world, player):
         all_entrances = lw_entrances + dw_entrances
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in all_entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Inverted Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Inverted Big Bomb Shop', player)
         if bomb_shop in lw_entrances:
             lw_entrances.remove(bomb_shop)
         if bomb_shop in dw_entrances:
             dw_entrances.remove(bomb_shop)
 
-        # place the old man cave's entrance somewhere in the same world he'll exit from
+        # place the old man cave's entrance somewhere in the same multiworld he'll exit from
         if old_man_world == 'light':
-            world.random.shuffle(lw_entrances)
+            multiworld.random.shuffle(lw_entrances)
             old_man_entrance = lw_entrances.pop()
-            connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+            connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
         elif old_man_world == 'dark':
-            world.random.shuffle(dw_entrances)
+            multiworld.random.shuffle(dw_entrances)
             old_man_entrance = dw_entrances.pop()
-            connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+            connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
         
         # now scramble the rest
-        connect_caves(world, lw_entrances, dw_entrances, caves, player)
+        connect_caves(multiworld, lw_entrances, dw_entrances, caves, player)
 
         # scramble holes
-        scramble_inverted_holes(world, player)
+        scramble_inverted_holes(multiworld, player)
 
         doors = lw_entrances + dw_entrances
 
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
-    elif world.worlds[player].options.entrance_shuffle == 'crossed':
-        skull_woods_shuffle(world, player)
+        connect_doors(multiworld, doors, door_targets, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'crossed':
+        skull_woods_shuffle(multiworld, player)
 
         entrances = list(Inverted_LW_Entrances + Inverted_LW_Dungeon_Entrances + Inverted_LW_Single_Cave_Doors + Inverted_Old_Man_Entrances + Inverted_DW_Entrances + Inverted_DW_Dungeon_Entrances + Inverted_DW_Single_Cave_Doors)
         must_exits = list(Inverted_LW_Entrances_Must_Exit + Inverted_LW_Dungeon_Entrances_Must_Exit)
@@ -997,19 +998,19 @@ def link_inverted_entrances(world, player):
         door_targets = list(Inverted_Single_Cave_Targets)
 
         # randomize which desert ledge door is a must-exit
-        if world.random.randint(0, 1) == 0:
+        if multiworld.random.randint(0, 1) == 0:
             must_exits.append('Desert Palace Entrance (North)')
             entrances.append('Desert Palace Entrance (West)')
         else:
             must_exits.append('Desert Palace Entrance (West)')
             entrances.append('Desert Palace Entrance (North)')
 
-        caves.append(tuple(world.random.sample(
+        caves.append(tuple(multiworld.random.sample(
             ['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
         entrances.append('Hyrule Castle Entrance (South)')
         
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
             hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)']
         else:
             entrances.append('Inverted Ganons Tower')
@@ -1017,26 +1018,26 @@ def link_inverted_entrances(world, player):
             hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower']
 
         # shuffle aga door. if it's on hc ledge, then one other hc ledge door has to be must_exit
-        aga_door = world.random.choice(list(entrances))
+        aga_door = multiworld.random.choice(list(entrances))
         
         if aga_door in hc_ledge_entrances:
             hc_ledge_entrances.remove(aga_door)
 
-            world.random.shuffle(hc_ledge_entrances)
+            multiworld.random.shuffle(hc_ledge_entrances)
             hc_ledge_must_exit = hc_ledge_entrances.pop()
             entrances.remove(hc_ledge_must_exit)
             must_exits.append(hc_ledge_must_exit)
 
         entrances.remove(aga_door)
-        connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
+        connect_two_way(multiworld, aga_door, 'Inverted Agahnims Tower Exit', player)
         caves.remove('Inverted Agahnims Tower Exit')
 
 
         # place links house
         links_house_doors = [i for i in entrances + must_exits if
                              i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
-        links_house = world.random.choice(list(links_house_doors))
-        connect_two_way(world, links_house, 'Inverted Links House Exit', player)
+        links_house = multiworld.random.choice(list(links_house_doors))
+        connect_two_way(multiworld, links_house, 'Inverted Links House Exit', player)
         if links_house in entrances:
             entrances.remove(links_house)
         elif links_house in must_exits:
@@ -1044,58 +1045,58 @@ def link_inverted_entrances(world, player):
 
         # place dark sanc
         sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in entrances]
-        sanc_door = world.random.choice(sanc_doors)
+        sanc_door = multiworld.random.choice(sanc_doors)
         entrances.remove(sanc_door)
-        connect_entrance(world, sanc_door, 'Inverted Dark Sanctuary', player)
-        world.get_entrance('Inverted Dark Sanctuary Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
+        connect_entrance(multiworld, sanc_door, 'Inverted Dark Sanctuary', player)
+        multiworld.get_entrance('Inverted Dark Sanctuary Exit', player).connect(multiworld.get_entrance(sanc_door, player).parent_region)
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         
         #place must-exit caves 
-        connect_mandatory_exits(world, entrances, caves, must_exits, player)
+        connect_mandatory_exits(multiworld, entrances, caves, must_exits, player)
 
 
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [door for door in old_man_entrances if door in entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
-        connect_two_way(world, old_man_exit, 'Old Man Cave Exit (East)', player)
+        connect_two_way(multiworld, old_man_exit, 'Old Man Cave Exit (East)', player)
         entrances.remove(old_man_exit)
 
         # place blacksmith, has limited options
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         blacksmith_doors = [door for door in blacksmith_doors if door in entrances]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         entrances.remove(blacksmith_hut)
 
         # place bomb shop, has limited options
 
         # cannot place it anywhere already taken (or that are otherwise not eligible for placement)
         bomb_shop_doors = [door for door in bomb_shop_doors if door in entrances]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Inverted Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Inverted Big Bomb Shop', player)
         entrances.remove(bomb_shop)
         
         # place the old man cave's entrance somewhere
-        world.random.shuffle(entrances)
+        multiworld.random.shuffle(entrances)
         old_man_entrance = entrances.pop()
-        connect_two_way(world, old_man_entrance, 'Old Man Cave Exit (West)', player)
+        connect_two_way(multiworld, old_man_entrance, 'Old Man Cave Exit (West)', player)
 
         # now scramble the rest
-        connect_caves(world, entrances, [], caves, player)
+        connect_caves(multiworld, entrances, [], caves, player)
 
         # scramble holes
-        scramble_inverted_holes(world, player)
+        scramble_inverted_holes(multiworld, player)
 
         # place remaining doors
-        connect_doors(world, entrances, door_targets, player)
-    elif world.worlds[player].options.entrance_shuffle == 'insanity':
+        connect_doors(multiworld, entrances, door_targets, player)
+    elif multiworld.worlds[player].options.entrance_shuffle == 'insanity':
         # beware ye who enter here
 
         entrances = Inverted_LW_Entrances + Inverted_LW_Dungeon_Entrances + Inverted_DW_Entrances + Inverted_DW_Dungeon_Entrances + Inverted_Old_Man_Entrances + Old_Man_Entrances + ['Skull Woods Second Section Door (East)', 'Skull Woods Second Section Door (West)', 'Skull Woods First Section Door', 'Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Entrance (South)']
@@ -1106,7 +1107,7 @@ def link_inverted_entrances(world, player):
                 Inverted_LW_Single_Cave_Doors + Inverted_DW_Single_Cave_Doors + ['Desert Palace Entrance (West)', 'Desert Palace Entrance (North)']
 
         # randomize which desert ledge door is a must-exit
-        if world.random.randint(0, 1) == 0:
+        if multiworld.random.randint(0, 1) == 0:
             entrances_must_exits.append('Desert Palace Entrance (North)')
             entrances.append('Desert Palace Entrance (West)')
         else:
@@ -1121,7 +1122,7 @@ def link_inverted_entrances(world, player):
         blacksmith_doors = list(Blacksmith_Single_Cave_Doors + Inverted_Blacksmith_Multi_Cave_Doors)
         door_targets = list(Inverted_Single_Cave_Targets)
 
-        world.random.shuffle(doors)
+        multiworld.random.shuffle(doors)
 
         old_man_entrances = list(Inverted_Old_Man_Entrances + Old_Man_Entrances) + ['Tower of Hera', 'Inverted Agahnims Tower']
 
@@ -1137,17 +1138,17 @@ def link_inverted_entrances(world, player):
                         'Skull Woods First Section (Left)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Top)']
 
         # tavern back door cannot be shuffled yet
-        connect_doors(world, ['Tavern North'], ['Tavern'], player)
+        connect_doors(multiworld, ['Tavern North'], ['Tavern'], player)
 
         hole_entrances.append('Hyrule Castle Secret Entrance Drop')
         hole_targets.append('Hyrule Castle Secret Entrance')
         entrances.append('Hyrule Castle Secret Entrance Stairs')
         caves.append('Hyrule Castle Secret Entrance Exit')
 
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
-            connect_two_way(world, 'Inverted Pyramid Entrance', 'Pyramid Exit', player)
-            connect_entrance(world, 'Inverted Pyramid Hole', 'Pyramid', player)
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+            connect_two_way(multiworld, 'Inverted Pyramid Entrance', 'Pyramid Exit', player)
+            connect_entrance(multiworld, 'Inverted Pyramid Hole', 'Pyramid', player)
         else:
             entrances.append('Inverted Ganons Tower')
             caves.extend(['Inverted Ganons Tower Exit', 'Pyramid Exit'])
@@ -1155,13 +1156,13 @@ def link_inverted_entrances(world, player):
             hole_targets.append('Pyramid')
             doors.extend(['Inverted Ganons Tower', 'Inverted Pyramid Entrance'])
 
-        world.random.shuffle(hole_entrances)
-        world.random.shuffle(hole_targets)
-        world.random.shuffle(entrances)
+        multiworld.random.shuffle(hole_entrances)
+        multiworld.random.shuffle(hole_targets)
+        multiworld.random.shuffle(entrances)
 
         # fill up holes
         for hole in hole_entrances:
-            connect_entrance(world, hole, hole_targets.pop(), player)
+            connect_entrance(multiworld, hole, hole_targets.pop(), player)
 
         doors.append('Hyrule Castle Entrance (South)')
         caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
@@ -1169,8 +1170,8 @@ def link_inverted_entrances(world, player):
         # place links house and dark sanc
         links_house_doors = [i for i in entrances + entrances_must_exits if
                              i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
-        links_house = world.random.choice(list(links_house_doors))
-        connect_two_way(world, links_house, 'Inverted Links House Exit', player)
+        links_house = multiworld.random.choice(list(links_house_doors))
+        connect_two_way(multiworld, links_house, 'Inverted Links House Exit', player)
         if links_house in entrances:
             entrances.remove(links_house)
         elif links_house in entrances_must_exits:
@@ -1178,15 +1179,15 @@ def link_inverted_entrances(world, player):
         doors.remove(links_house)
 
         sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in entrances]
-        sanc_door = world.random.choice(sanc_doors)
+        sanc_door = multiworld.random.choice(sanc_doors)
         entrances.remove(sanc_door)
         doors.remove(sanc_door)
-        connect_entrance(world, sanc_door, 'Inverted Dark Sanctuary', player)
-        world.get_entrance('Inverted Dark Sanctuary Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
+        connect_entrance(multiworld, sanc_door, 'Inverted Dark Sanctuary', player)
+        multiworld.get_entrance('Inverted Dark Sanctuary Exit', player).connect(multiworld.get_entrance(sanc_door, player).parent_region)
 
         # now let's deal with mandatory reachable stuff
         def extract_reachable_exit(cavelist):
-            world.random.shuffle(cavelist)
+            multiworld.random.shuffle(cavelist)
             candidate = None
             for cave in cavelist:
                 if isinstance(cave, tuple) and len(cave) > 1:
@@ -1206,9 +1207,9 @@ def link_inverted_entrances(world, player):
 
             exit = cave[-1]
             cave = cave[:-1]
-            connect_exit(world, exit, entrance, player)
-            connect_entrance(world, doors.pop(), exit, player)
-            # rest of cave now is forced to be in this world
+            connect_exit(multiworld, exit, entrance, player)
+            connect_entrance(multiworld, doors.pop(), exit, player)
+            # rest of cave now is forced to be in this multiworld
             caves.append(cave)
 
         # connect mandatory exits
@@ -1218,26 +1219,26 @@ def link_inverted_entrances(world, player):
         # place old man, has limited options
         # exit has to come from specific set of doors, the entrance is free to move about
         old_man_entrances = [entrance for entrance in old_man_entrances if entrance in entrances]
-        world.random.shuffle(old_man_entrances)
+        multiworld.random.shuffle(old_man_entrances)
         old_man_exit = old_man_entrances.pop()
         entrances.remove(old_man_exit)
 
-        connect_exit(world, 'Old Man Cave Exit (East)', old_man_exit, player)
-        connect_entrance(world, doors.pop(), 'Old Man Cave Exit (East)', player)
+        connect_exit(multiworld, 'Old Man Cave Exit (East)', old_man_exit, player)
+        connect_entrance(multiworld, doors.pop(), 'Old Man Cave Exit (East)', player)
         caves.append('Old Man Cave Exit (West)')
 
         # place blacksmith, has limited options
         blacksmith_doors = [door for door in blacksmith_doors if door in doors]
-        world.random.shuffle(blacksmith_doors)
+        multiworld.random.shuffle(blacksmith_doors)
         blacksmith_hut = blacksmith_doors.pop()
-        connect_entrance(world, blacksmith_hut, 'Blacksmiths Hut', player)
+        connect_entrance(multiworld, blacksmith_hut, 'Blacksmiths Hut', player)
         doors.remove(blacksmith_hut)
 
         # place dam and pyramid fairy, have limited options
         bomb_shop_doors = [door for door in bomb_shop_doors if door in doors]
-        world.random.shuffle(bomb_shop_doors)
+        multiworld.random.shuffle(bomb_shop_doors)
         bomb_shop = bomb_shop_doors.pop()
-        connect_entrance(world, bomb_shop, 'Inverted Big Bomb Shop', player)
+        connect_entrance(multiworld, bomb_shop, 'Inverted Big Bomb Shop', player)
         doors.remove(bomb_shop)
 
         # handle remaining caves
@@ -1246,49 +1247,49 @@ def link_inverted_entrances(world, player):
                 cave = (cave,)
 
             for exit in cave:
-                connect_exit(world, exit, entrances.pop(), player)
-                connect_entrance(world, doors.pop(), exit, player)
+                connect_exit(multiworld, exit, entrances.pop(), player)
+                connect_entrance(multiworld, doors.pop(), exit, player)
 
         # place remaining doors
-        connect_doors(world, doors, door_targets, player)
+        connect_doors(multiworld, doors, door_targets, player)
     else:
         raise NotImplementedError('Shuffling not supported yet')
 
-    if world.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
-        overworld_glitch_connections(world, player)
+    if multiworld.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
+        overworld_glitch_connections(multiworld, player)
         # mandatory hybrid major glitches connections
-        if world.worlds[player].options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
-            underworld_glitch_connections(world, player)
+        if multiworld.worlds[player].options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
+            underworld_glitch_connections(multiworld, player)
 
     # patch swamp drain
-    if world.get_entrance('Dam', player).connected_region.name != 'Dam' or world.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Palace (Entrance)':
-        world.worlds[player].swamp_patch_required = True
+    if multiworld.get_entrance('Dam', player).connected_region.name != 'Dam' or multiworld.get_entrance('Swamp Palace', player).connected_region.name != 'Swamp Palace (Entrance)':
+        multiworld.worlds[player].swamp_patch_required = True
 
     # check for potion shop location
-    if world.get_entrance('Potion Shop', player).connected_region.name != 'Potion Shop':
-        world.worlds[player].powder_patch_required = True
+    if multiworld.get_entrance('Potion Shop', player).connected_region.name != 'Potion Shop':
+        multiworld.worlds[player].powder_patch_required = True
 
     # check for ganon location
-    if world.get_entrance('Inverted Pyramid Hole', player).connected_region.name != 'Pyramid':
-        world.worlds[player].ganon_at_pyramid = False
+    if multiworld.get_entrance('Inverted Pyramid Hole', player).connected_region.name != 'Pyramid':
+        multiworld.worlds[player].ganon_at_pyramid = False
    
     # check for Ganon's Tower location
-    if world.get_entrance('Inverted Ganons Tower', player).connected_region.name != 'Ganons Tower (Entrance)':
-        world.worlds[player].ganonstower_vanilla = False
+    if multiworld.get_entrance('Inverted Ganons Tower', player).connected_region.name != 'Ganons Tower (Entrance)':
+        multiworld.worlds[player].ganonstower_vanilla = False
 
 
-def connect_simple(world, exitname, regionname, player):
-    world.get_entrance(exitname, player).connect(world.get_region(regionname, player))
+def connect_simple(multiworld: MultiWorld, exitname: str, regionname: str, player: int):
+    multiworld.get_entrance(exitname, player).connect(multiworld.get_region(regionname, player))
 
 
-def connect_entrance(world, entrancename: str, exitname: str, player: int):
-    entrance = world.get_entrance(entrancename, player)
+def connect_entrance(multiworld: MultiWorld, entrancename: str, exitname: str, player: int):
+    entrance = multiworld.get_entrance(entrancename, player)
     # check if we got an entrance or a region to connect to
     try:
-        region = world.get_region(exitname, player)
+        region = multiworld.get_region(exitname, player)
         exit = None
     except KeyError:
-        exit = world.get_entrance(exitname, player)
+        exit = multiworld.get_entrance(exitname, player)
         region = exit.parent_region
 
     # if this was already connected somewhere, remove the backreference
@@ -1299,24 +1300,24 @@ def connect_entrance(world, entrancename: str, exitname: str, player: int):
     addresses = door_addresses[entrance.name][0]
 
     entrance.connect(region, addresses, target)
-    world.spoiler.set_entrance(entrance.name, exit.name if exit is not None else region.name, 'entrance', player)
+    multiworld.spoiler.set_entrance(entrance.name, exit.name if exit is not None else region.name, 'entrance', player)
 
 
-def connect_exit(world, exitname, entrancename, player):
-    entrance = world.get_entrance(entrancename, player)
-    exit = world.get_entrance(exitname, player)
+def connect_exit(multiworld: MultiWorld, exitname: str, entrancename: str, player: int):
+    entrance = multiworld.get_entrance(entrancename, player)
+    exit = multiworld.get_entrance(exitname, player)
 
     # if this was already connected somewhere, remove the backreference
     if exit.connected_region is not None:
         exit.connected_region.entrances.remove(exit)
 
     exit.connect(entrance.parent_region, door_addresses[entrance.name][1], exit_ids[exit.name][1])
-    world.spoiler.set_entrance(entrance.name, exit.name, 'exit', player)
+    multiworld.spoiler.set_entrance(entrance.name, exit.name, 'exit', player)
 
 
-def connect_two_way(world, entrancename, exitname, player):
-    entrance = world.get_entrance(entrancename, player)
-    exit = world.get_entrance(exitname, player)
+def connect_two_way(multiworld: MultiWorld, entrancename: str, exitname: str, player: int):
+    entrance = multiworld.get_entrance(entrancename, player)
+    exit = multiworld.get_entrance(exitname, player)
 
     # if these were already connected somewhere, remove the backreference
     if entrance.connected_region is not None:
@@ -1326,10 +1327,10 @@ def connect_two_way(world, entrancename, exitname, player):
 
     entrance.connect(exit.parent_region, door_addresses[entrance.name][0], exit_ids[exit.name][0])
     exit.connect(entrance.parent_region, door_addresses[entrance.name][1], exit_ids[exit.name][1])
-    world.spoiler.set_entrance(entrance.name, exit.name, 'both', player)
+    multiworld.spoiler.set_entrance(entrance.name, exit.name, 'both', player)
 
 
-def scramble_holes(world, player):
+def scramble_holes(multiworld: MultiWorld, player: int):
     hole_entrances = [('Kakariko Well Cave', 'Kakariko Well Drop'),
                       ('Bat Cave Cave', 'Bat Cave Drop'),
                       ('North Fairy Cave', 'North Fairy Cave Drop'),
@@ -1343,39 +1344,39 @@ def scramble_holes(world, player):
                     ('Lost Woods Hideout Exit', 'Lost Woods Hideout (top)'),
                     ('Lumberjack Tree Exit', 'Lumberjack Tree (top)')]
 
-    if not world.shuffle_ganon:
-        connect_two_way(world, 'Pyramid Entrance', 'Pyramid Exit', player)
-        connect_entrance(world, 'Pyramid Hole', 'Pyramid', player)
+    if not multiworld.shuffle_ganon:
+        connect_two_way(multiworld, 'Pyramid Entrance', 'Pyramid Exit', player)
+        connect_entrance(multiworld, 'Pyramid Hole', 'Pyramid', player)
     else:
         hole_targets.append(('Pyramid Exit', 'Pyramid'))
 
-    if world.worlds[player].options.mode == 'standard':
+    if multiworld.worlds[player].options.mode == 'standard':
         # cannot move uncle cave
-        connect_two_way(world, 'Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Exit', player)
-        connect_entrance(world, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player)
+        connect_two_way(multiworld, 'Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Exit', player)
+        connect_entrance(multiworld, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player)
     else:
         hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop'))
         hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance'))
 
     # do not shuffle sanctuary into pyramid hole unless shuffle is crossed
-    if world.worlds[player].options.entrance_shuffle == 'crossed':
+    if multiworld.worlds[player].options.entrance_shuffle == 'crossed':
         hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
-    if world.shuffle_ganon:
-        world.random.shuffle(hole_targets)
+    if multiworld.shuffle_ganon:
+        multiworld.random.shuffle(hole_targets)
         exit, target = hole_targets.pop()
-        connect_two_way(world, 'Pyramid Entrance', exit, player)
-        connect_entrance(world, 'Pyramid Hole', target, player)
-    if world.worlds[player].options.entrance_shuffle != 'crossed':
+        connect_two_way(multiworld, 'Pyramid Entrance', exit, player)
+        connect_entrance(multiworld, 'Pyramid Hole', target, player)
+    if multiworld.worlds[player].options.entrance_shuffle != 'crossed':
         hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
 
-    world.random.shuffle(hole_targets)
+    multiworld.random.shuffle(hole_targets)
     for entrance, drop in hole_entrances:
         exit, target = hole_targets.pop()
-        connect_two_way(world, entrance, exit, player)
-        connect_entrance(world, drop, target, player)
+        connect_two_way(multiworld, entrance, exit, player)
+        connect_entrance(multiworld, drop, target, player)
 
 
-def scramble_inverted_holes(world, player):
+def scramble_inverted_holes(multiworld: MultiWorld, player: int):
     hole_entrances = [('Kakariko Well Cave', 'Kakariko Well Drop'),
                       ('Bat Cave Cave', 'Bat Cave Drop'),
                       ('North Fairy Cave', 'North Fairy Cave Drop'),
@@ -1389,9 +1390,9 @@ def scramble_inverted_holes(world, player):
                     ('Lost Woods Hideout Exit', 'Lost Woods Hideout (top)'),
                     ('Lumberjack Tree Exit', 'Lumberjack Tree (top)')]
 
-    if not world.shuffle_ganon:
-        connect_two_way(world, 'Inverted Pyramid Entrance', 'Pyramid Exit', player)
-        connect_entrance(world, 'Inverted Pyramid Hole', 'Pyramid', player)
+    if not multiworld.shuffle_ganon:
+        connect_two_way(multiworld, 'Inverted Pyramid Entrance', 'Pyramid Exit', player)
+        connect_entrance(multiworld, 'Inverted Pyramid Hole', 'Pyramid', player)
     else:
         hole_targets.append(('Pyramid Exit', 'Pyramid'))
 
@@ -1400,58 +1401,59 @@ def scramble_inverted_holes(world, player):
     hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance'))
 
     # do not shuffle sanctuary into pyramid hole unless shuffle is crossed
-    if world.worlds[player].options.entrance_shuffle == 'crossed':
+    if multiworld.worlds[player].options.entrance_shuffle == 'crossed':
         hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
-    if world.shuffle_ganon:
-        world.random.shuffle(hole_targets)
+    if multiworld.shuffle_ganon:
+        multiworld.random.shuffle(hole_targets)
         exit, target = hole_targets.pop()
-        connect_two_way(world, 'Inverted Pyramid Entrance', exit, player)
-        connect_entrance(world, 'Inverted Pyramid Hole', target, player)
-    if world.worlds[player].options.entrance_shuffle != 'crossed':
+        connect_two_way(multiworld, 'Inverted Pyramid Entrance', exit, player)
+        connect_entrance(multiworld, 'Inverted Pyramid Hole', target, player)
+    if multiworld.worlds[player].options.entrance_shuffle != 'crossed':
         hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
 
-    world.random.shuffle(hole_targets)
+    multiworld.random.shuffle(hole_targets)
     for entrance, drop in hole_entrances:
         exit, target = hole_targets.pop()
-        connect_two_way(world, entrance, exit, player)
-        connect_entrance(world, drop, target, player)
+        connect_two_way(multiworld, entrance, exit, player)
+        connect_entrance(multiworld, drop, target, player)
 
-def connect_random(world, exitlist, targetlist, player, two_way=False):
+def connect_random(multiworld: MultiWorld, exitlist: list[str], targetlist: list[str],
+                   player: int, two_way: bool = False):
     targetlist = list(targetlist)
-    world.random.shuffle(targetlist)
+    multiworld.random.shuffle(targetlist)
 
     for exit, target in zip(exitlist, targetlist):
         if two_way:
-            connect_two_way(world, exit, target, player)
+            connect_two_way(multiworld, exit, target, player)
         else:
-            connect_entrance(world, exit, target, player)
+            connect_entrance(multiworld, exit, target, player)
 
 
-def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
+def connect_mandatory_exits(multiworld: MultiWorld, entrances: list[str], caves: list[tuple[str, str]], must_be_exits: list[str], player):
 
     # Keeps track of entrances that cannot be used to access each exit / cave
-    if world.worlds[player].options.mode == 'inverted':
+    if multiworld.worlds[player].options.mode == 'inverted':
         invalid_connections = Inverted_Must_Exit_Invalid_Connections.copy()
     else:
         invalid_connections = Must_Exit_Invalid_Connections.copy()
     invalid_cave_connections = defaultdict(set)
 
-    if world.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
+    if multiworld.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
         from . import OverworldGlitchRules
-        for entrance in OverworldGlitchRules.get_non_mandatory_exits(world.worlds[player].options.mode == 'inverted'):
+        for entrance in OverworldGlitchRules.get_non_mandatory_exits(multiworld.worlds[player].options.mode == 'inverted'):
             invalid_connections[entrance] = set()
             if entrance in must_be_exits:
                 must_be_exits.remove(entrance)
                 entrances.append(entrance)
 
     """This works inplace"""
-    world.random.shuffle(entrances)
-    world.random.shuffle(caves)
+    multiworld.random.shuffle(entrances)
+    multiworld.random.shuffle(caves)
 
     # Handle inverted Aga Tower - if it depends on connections, then so does Hyrule Castle Ledge
-    if world.worlds[player].options.mode == 'inverted':
+    if multiworld.worlds[player].options.mode == 'inverted':
         for entrance in invalid_connections:
-            if world.get_entrance(entrance, player).connected_region == world.get_region('Inverted Agahnims Tower',
+            if multiworld.get_entrance(entrance, player).connected_region == multiworld.get_region('Inverted Agahnims Tower',
                                                                                          player):
                 for exit in invalid_connections[entrance]:
                     invalid_connections[exit] = invalid_connections[exit].union(
@@ -1473,11 +1475,11 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
             raise KeyError('No more caves left. Should not happen!')
 
         # all caves are sorted so that the last exit is always reachable
-        connect_two_way(world, exit, cave[-1], player)
+        connect_two_way(multiworld, exit, cave[-1], player)
         if len(cave) == 2:
             entrance = next(e for e in entrances[::-1] if e not in invalid_connections[exit] and e not in invalid_cave_connections[tuple(cave)])
             entrances.remove(entrance)
-            connect_two_way(world, entrance, cave[0], player)
+            connect_two_way(multiworld, entrance, cave[0], player)
             if cave in used_caves:
                 required_entrances -= 2
                 used_caves.remove(cave)
@@ -1490,7 +1492,7 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
                 entrance = next(e for e in entrances[::-1] if e not in invalid_connections[exit])
                 cave_entrances.append(entrance)
                 entrances.remove(entrance)
-                connect_two_way(world, entrance, cave_exit, player)
+                connect_two_way(multiworld, entrance, cave_exit, player)
                 if entrance not in invalid_connections:
                     invalid_connections[exit] = set()
             if all(entrance in invalid_connections for entrance in cave_entrances):
@@ -1504,7 +1506,7 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
             else:
                 required_entrances += len(cave)-1
             caves.append(cave[0:-1])
-            world.random.shuffle(caves)
+            multiworld.random.shuffle(caves)
             used_caves.append(cave[0:-1])
             invalid_cave_connections[tuple(cave[0:-1])] = invalid_cave_connections[tuple(cave)].union(invalid_connections[exit])
         caves.remove(cave)
@@ -1514,19 +1516,20 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player):
                 entrance = next(e for e in entrances[::-1] if e not in invalid_cave_connections[tuple(cave)])
                 invalid_cave_connections[tuple(cave)] = set()
                 entrances.remove(entrance)
-                connect_two_way(world, entrance, cave_exit, player)
+                connect_two_way(multiworld, entrance, cave_exit, player)
             caves.remove(cave)
 
 
-def connect_caves(world, lw_entrances, dw_entrances, caves, player):
+def connect_caves(multiworld: MultiWorld, lw_entrances: list[str], dw_entrances: list[str],
+                  caves: list[tuple[str, str]], player: int):
     """This works inplace"""
-    world.random.shuffle(lw_entrances)
-    world.random.shuffle(dw_entrances)
-    world.random.shuffle(caves)
+    multiworld.random.shuffle(lw_entrances)
+    multiworld.random.shuffle(dw_entrances)
+    multiworld.random.shuffle(caves)
     # connect highest exit count caves first, prevent issue where we have 2 or 3 exits accross worlds left to fill
     caves.sort(key=lambda cave: 1 if isinstance(cave, str) else len(cave), reverse=True)
     for cave in caves:
-        target = lw_entrances if world.random.randint(0, 1) else dw_entrances
+        target = lw_entrances if multiworld.random.randint(0, 1) else dw_entrances
         if isinstance(cave, str):
             cave = (cave,)
 
@@ -1536,37 +1539,37 @@ def connect_caves(world, lw_entrances, dw_entrances, caves, player):
             target = lw_entrances if target is dw_entrances else dw_entrances
 
         for exit in cave:
-            connect_two_way(world, target.pop(), exit, player)
+            connect_two_way(multiworld, target.pop(), exit, player)
     caves.clear() # emulating old behaviour of popping caves from the list in-place
 
 
-def connect_doors(world, doors, targets, player):
+def connect_doors(multiworld: MultiWorld, doors: list[str], targets: list[str], player: int):
     """This works inplace"""
-    world.random.shuffle(doors)
-    world.random.shuffle(targets)
+    multiworld.random.shuffle(doors)
+    multiworld.random.shuffle(targets)
     placing = min(len(doors), len(targets))
     for door, target in zip(doors, targets):
-        connect_entrance(world, door, target, player)
+        connect_entrance(multiworld, door, target, player)
     doors[:] = doors[placing:]
     targets[:] = targets[placing:]
 
 
-def skull_woods_shuffle(world, player):
-    connect_random(world, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', 'Skull Woods Second Section Hole'],
+def skull_woods_shuffle(multiworld: MultiWorld, player: int):
+    connect_random(multiworld, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', 'Skull Woods Second Section Hole'],
                    ['Skull Woods First Section (Left)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Top)', 'Skull Woods Second Section (Drop)'], player)
-    connect_random(world, ['Skull Woods First Section Door', 'Skull Woods Second Section Door (East)', 'Skull Woods Second Section Door (West)'],
+    connect_random(multiworld, ['Skull Woods First Section Door', 'Skull Woods Second Section Door (East)', 'Skull Woods Second Section Door (West)'],
                    ['Skull Woods First Section Exit', 'Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)'], player, True)
 
 
-def simple_shuffle_dungeons(world, player):
-    skull_woods_shuffle(world, player)
+def simple_shuffle_dungeons(multiworld: MultiWorld, player: int):
+    skull_woods_shuffle(multiworld, player)
 
     dungeon_entrances = ['Eastern Palace', 'Tower of Hera', 'Thieves Town', 'Skull Woods Final Section', 'Palace of Darkness', 'Ice Palace', 'Misery Mire', 'Swamp Palace']
     dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Palace of Darkness Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit']
 
-    if world.worlds[player].options.mode != 'inverted':
-        if not world.shuffle_ganon:
-            connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
+    if multiworld.worlds[player].options.mode != 'inverted':
+        if not multiworld.shuffle_ganon:
+            connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
         else:
             dungeon_entrances.append('Ganons Tower')
             dungeon_exits.append('Ganons Tower Exit')
@@ -1575,17 +1578,17 @@ def simple_shuffle_dungeons(world, player):
         dungeon_exits.append('Inverted Agahnims Tower Exit')
 
     # shuffle up single entrance dungeons
-    connect_random(world, dungeon_entrances, dungeon_exits, player, True)
+    connect_random(multiworld, dungeon_entrances, dungeon_exits, player, True)
 
     # mix up 4 door dungeons
     multi_dungeons = ['Desert', 'Turtle Rock']
-    if world.worlds[player].options.mode == 'open' or (world.worlds[player].options.mode == 'inverted' and world.shuffle_ganon):
+    if multiworld.worlds[player].options.mode == 'open' or (multiworld.worlds[player].options.mode == 'inverted' and multiworld.shuffle_ganon):
         multi_dungeons.append('Hyrule Castle')
-    world.random.shuffle(multi_dungeons)
+    multiworld.random.shuffle(multi_dungeons)
 
     dp_target = multi_dungeons[0]
     tr_target = multi_dungeons[1]
-    if world.worlds[player].options.mode not in ['open', 'inverted'] or (world.worlds[player].options.mode == 'inverted' and world.shuffle_ganon is False):
+    if multiworld.worlds[player].options.mode not in ['open', 'inverted'] or (multiworld.worlds[player].options.mode == 'inverted' and multiworld.shuffle_ganon is False):
         # place hyrule castle as intended
         hc_target = 'Hyrule Castle'
     else:
@@ -1593,152 +1596,152 @@ def simple_shuffle_dungeons(world, player):
 
     # ToDo improve this?
 
-    if world.worlds[player].options.mode != 'inverted':
+    if multiworld.worlds[player].options.mode != 'inverted':
         if hc_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Agahnims Tower', 'Agahnims Tower Exit', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Agahnims Tower', 'Agahnims Tower Exit', player)
         elif hc_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Agahnims Tower Exit', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Agahnims Tower Exit', player)
         elif hc_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Hyrule Castle Exit (East)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Agahnims Tower Exit', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Agahnims Tower Exit', player)
 
         if dp_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Agahnims Tower', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Agahnims Tower', 'Desert Palace Exit (North)', player)
         elif dp_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Desert Palace Exit (North)', player)
         elif dp_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Desert Palace Exit (North)', player)
 
         if tr_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Agahnims Tower', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Agahnims Tower', 'Turtle Rock Isolated Ledge Exit', player)
         elif tr_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Turtle Rock Isolated Ledge Exit', player)
         elif tr_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Isolated Ledge Exit', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Turtle Rock Ledge Exit (East)', player)
     else:
         if hc_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
         elif hc_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Inverted Ganons Tower Exit', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Inverted Ganons Tower Exit', player)
         elif hc_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Hyrule Castle Exit (South)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Inverted Ganons Tower Exit', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Hyrule Castle Exit (East)', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Hyrule Castle Exit (South)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Inverted Ganons Tower Exit', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Hyrule Castle Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Hyrule Castle Exit (East)', player)
 
         if dp_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Inverted Ganons Tower', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Desert Palace Exit (North)', player)
         elif dp_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Desert Palace Exit (North)', player)
         elif dp_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Desert Palace Exit (South)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Desert Palace Exit (East)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Desert Palace Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Desert Palace Exit (North)', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Desert Palace Exit (South)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Desert Palace Exit (East)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Desert Palace Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Desert Palace Exit (North)', player)
 
         if tr_target == 'Hyrule Castle':
-            connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)', player)
-            connect_two_way(world, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Inverted Ganons Tower', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (East)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Hyrule Castle Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Inverted Ganons Tower', 'Turtle Rock Isolated Ledge Exit', player)
         elif tr_target == 'Desert':
-            connect_two_way(world, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)', player)
-            connect_two_way(world, 'Desert Palace Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Desert Palace Entrance (East)', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (South)', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (North)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Desert Palace Entrance (East)', 'Turtle Rock Isolated Ledge Exit', player)
         elif tr_target == 'Turtle Rock':
-            connect_two_way(world, 'Turtle Rock', 'Turtle Rock Exit (Front)', player)
-            connect_two_way(world, 'Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Isolated Ledge Exit', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (West)', 'Turtle Rock Ledge Exit (West)', player)
-            connect_two_way(world, 'Dark Death Mountain Ledge (East)', 'Turtle Rock Ledge Exit (East)', player)
+            connect_two_way(multiworld, 'Turtle Rock', 'Turtle Rock Exit (Front)', player)
+            connect_two_way(multiworld, 'Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Isolated Ledge Exit', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (West)', 'Turtle Rock Ledge Exit (West)', player)
+            connect_two_way(multiworld, 'Dark Death Mountain Ledge (East)', 'Turtle Rock Ledge Exit (East)', player)
 
-def crossed_shuffle_dungeons(world, player: int):
+def crossed_shuffle_dungeons(multiworld: MultiWorld, player: int):
     lw_entrances = LW_Dungeon_Entrances.copy()
     dw_entrances = DW_Dungeon_Entrances.copy()
 
     for exitname, regionname in default_connections:
-        connect_simple(world, exitname, regionname, player)
+        connect_simple(multiworld, exitname, regionname, player)
 
-    skull_woods_shuffle(world, player)
+    skull_woods_shuffle(multiworld, player)
 
     dungeon_exits = Dungeon_Exits_Base.copy()
     dungeon_entrances = lw_entrances+dw_entrances
 
-    if not world.shuffle_ganon:
-        connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit', player)
+    if not multiworld.shuffle_ganon:
+        connect_two_way(multiworld, 'Ganons Tower', 'Ganons Tower Exit', player)
     else:
         dungeon_entrances.append('Ganons Tower')
         dungeon_exits.append('Ganons Tower Exit')
 
-    if world.worlds[player].options.mode == 'standard':
+    if multiworld.worlds[player].options.mode == 'standard':
         # must connect front of hyrule castle to do escape
-        connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
+        connect_two_way(multiworld, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
     else:
         dungeon_exits.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
         dungeon_entrances.append('Hyrule Castle Entrance (South)')
 
-    connect_mandatory_exits(world, dungeon_entrances, dungeon_exits,
+    connect_mandatory_exits(multiworld, dungeon_entrances, dungeon_exits,
                             LW_Dungeon_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit, player)
 
-    if world.worlds[player].options.mode == 'standard':
-        connect_caves(world, dungeon_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
+    if multiworld.worlds[player].options.mode == 'standard':
+        connect_caves(multiworld, dungeon_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')], player)
 
-    connect_caves(world, dungeon_entrances, [], dungeon_exits, player)
+    connect_caves(multiworld, dungeon_entrances, [], dungeon_exits, player)
     assert not dungeon_exits , "make sure all exits are accounted for"
 
-def inverted_crossed_shuffle_dungeons(world, player: int):
+def inverted_crossed_shuffle_dungeons(multiworld: MultiWorld, player: int):
 
     lw_entrances = Inverted_LW_Dungeon_Entrances.copy()
     dw_entrances = Inverted_DW_Dungeon_Entrances.copy()
     lw_dungeon_entrances_must_exit = list(Inverted_LW_Dungeon_Entrances_Must_Exit)
     for exitname, regionname in inverted_default_connections:
-        connect_simple(world, exitname, regionname, player)
+        connect_simple(multiworld, exitname, regionname, player)
 
-    skull_woods_shuffle(world, player)
+    skull_woods_shuffle(multiworld, player)
 
     dungeon_exits = Inverted_Dungeon_Exits_Base.copy()
     dungeon_entrances = lw_entrances+dw_entrances
 
     # randomize which desert ledge door is a must-exit
-    if world.random.randint(0, 1):
+    if multiworld.random.randint(0, 1):
         lw_dungeon_entrances_must_exit.append('Desert Palace Entrance (North)')
         dungeon_entrances.append('Desert Palace Entrance (West)')
     else:
@@ -1748,8 +1751,8 @@ def inverted_crossed_shuffle_dungeons(world, player: int):
     dungeon_exits.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
     dungeon_entrances.append('Hyrule Castle Entrance (South)')
 
-    if not world.shuffle_ganon:
-        connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
+    if not multiworld.shuffle_ganon:
+        connect_two_way(multiworld, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
         hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)']
     else:
         dungeon_entrances.append('Inverted Ganons Tower')
@@ -1757,29 +1760,34 @@ def inverted_crossed_shuffle_dungeons(world, player: int):
         hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower']
 
     # shuffle aga door first. If it's on HC ledge, remaining HC ledge door must be must-exit
-    world.random.shuffle(dungeon_entrances)
+    multiworld.random.shuffle(dungeon_entrances)
     aga_door = dungeon_entrances.pop()
 
     if aga_door in hc_ledge_entrances:
         hc_ledge_entrances.remove(aga_door)
-        world.random.shuffle(hc_ledge_entrances)
+        multiworld.random.shuffle(hc_ledge_entrances)
         hc_ledge_must_exit = hc_ledge_entrances.pop()
         dungeon_entrances.remove(hc_ledge_must_exit)
         lw_dungeon_entrances_must_exit.append(hc_ledge_must_exit)
 
-    connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
+    connect_two_way(multiworld, aga_door, 'Inverted Agahnims Tower Exit', player)
     dungeon_exits.remove('Inverted Agahnims Tower Exit')
 
-    connect_mandatory_exits(world, dungeon_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player)
+    connect_mandatory_exits(multiworld, dungeon_entrances, dungeon_exits, lw_dungeon_entrances_must_exit, player)
 
-    connect_caves(world, dungeon_entrances, [], dungeon_exits, player)
+    connect_caves(multiworld, dungeon_entrances, [], dungeon_exits, player)
     assert not dungeon_exits, "make sure all exits are accounted for"
 
-def unbias_some_entrances(world, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_Three_Exits):
+
+def unbias_some_entrances(multiworld: MultiWorld,
+                          Dungeon_Exits: list[list[str] | str],
+                          Cave_Exits: list[str],
+                          Old_Man_House: list[str],
+                          Cave_Three_Exits: list[tuple[str, str, str]]):
     def shuffle_lists_in_list(ls):
         for i, item in enumerate(ls):
             if isinstance(item, list):
-                ls[i] = world.random.sample(item, len(item))
+                ls[i] = multiworld.random.sample(item, len(item))
 
     def tuplize_lists_in_list(ls):
         for i, item in enumerate(ls):
@@ -1793,7 +1801,7 @@ def unbias_some_entrances(world, Dungeon_Exits, Cave_Exits, Old_Man_House, Cave_
 
     # paradox fixup
     if Cave_Three_Exits[1][0] == "Paradox Cave Exit (Bottom)":
-        i = world.random.randint(1, 2)
+        i = multiworld.random.randint(1, 2)
         Cave_Three_Exits[1][0] = Cave_Three_Exits[1][i]
         Cave_Three_Exits[1][i] = "Paradox Cave Exit (Bottom)"
 
@@ -1822,18 +1830,18 @@ lookup = {
 }
 
 
-def plando_connect(world, player: int):
-    if world.worlds[player].options.plando_connections:
-        for connection in world.worlds[player].options.plando_connections:
+def plando_connect(multiworld: MultiWorld, player: int):
+    if multiworld.worlds[player].options.plando_connections:
+        for connection in multiworld.worlds[player].options.plando_connections:
             func = lookup[connection.direction]
             try:
-                func(world, connection.entrance, connection.exit, player)
+                func(multiworld, connection.entrance, connection.exit, player)
             except Exception as e:
                 raise Exception(f"Could not connect using {connection}") from e
-        if world.worlds[player].options.mode != 'inverted':
-            mark_light_world_regions(world, player)
+        if multiworld.worlds[player].options.mode != 'inverted':
+            mark_light_world_regions(multiworld, player)
         else:
-            mark_dark_world_regions(world, player)
+            mark_dark_world_regions(multiworld, player)
 
 
 LW_Dungeon_Entrances = ['Desert Palace Entrance (South)',
diff --git a/worlds/alttp/InvertedRegions.py b/worlds/alttp/InvertedRegions.py
index 63a2d499e2..47e12d313f 100644
--- a/worlds/alttp/InvertedRegions.py
+++ b/worlds/alttp/InvertedRegions.py
@@ -1,15 +1,16 @@
 import collections
 
+from BaseClasses import MultiWorld
 from .Regions import create_lw_region, create_dw_region, create_cave_region, create_dungeon_region
 from .SubClasses import LTTPRegionType
 
 
-def create_inverted_regions(world, player):
+def create_inverted_regions(multiworld: MultiWorld, player: int):
 
-    world.regions += [
-        create_dw_region(world, player, 'Menu', None,
+    multiworld.regions += [
+        create_dw_region(multiworld, player, 'Menu', None,
                          ['Links House S&Q', 'Dark Sanctuary S&Q', 'Old Man S&Q', 'Castle Ledge S&Q']),
-        create_lw_region(world, player, 'Light World',
+        create_lw_region(multiworld, player, 'Light World',
                          ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure', 'Purple Chest',
                           'Bombos Tablet'],
                          ["Blinds Hideout", "Hyrule Castle Secret Entrance Drop", 'Kings Grave Outer Rocks', 'Dam',
@@ -35,184 +36,184 @@ def create_inverted_regions(world, player):
                           'Hyrule Castle Entrance (South)', 'Secret Passage Outer Bushes',
                           'Bush Covered Lawn Outer Bushes',
                           'Potion Shop Outer Bushes', 'Graveyard Cave Outer Bushes', 'Bomb Hut Outer Bushes']),
-        create_lw_region(world, player, 'Bush Covered Lawn', None,
+        create_lw_region(multiworld, player, 'Bush Covered Lawn', None,
                          ['Bush Covered House', 'Bush Covered Lawn Inner Bushes', 'Bush Covered Lawn Mirror Spot']),
-        create_lw_region(world, player, 'Bomb Hut Area', None,
+        create_lw_region(multiworld, player, 'Bomb Hut Area', None,
                          ['Light World Bomb Hut', 'Bomb Hut Inner Bushes', 'Bomb Hut Mirror Spot']),
-        create_lw_region(world, player, 'Hyrule Castle Secret Entrance Area', None,
+        create_lw_region(multiworld, player, 'Hyrule Castle Secret Entrance Area', None,
                          ['Hyrule Castle Secret Entrance Stairs', 'Secret Passage Inner Bushes']),
-        create_lw_region(world, player, 'Death Mountain Entrance', None,
+        create_lw_region(multiworld, player, 'Death Mountain Entrance', None,
                          ['Old Man Cave (West)', 'Death Mountain Entrance Drop', 'Bumper Cave Entrance Mirror Spot']),
-        create_lw_region(world, player, 'Lake Hylia Central Island', None,
+        create_lw_region(multiworld, player, 'Lake Hylia Central Island', None,
                          ['Capacity Upgrade', 'Lake Hylia Central Island Mirror Spot']),
-        create_cave_region(world, player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
+        create_cave_region(multiworld, player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
                                                                                        "Blind\'s Hideout - Left",
                                                                                        "Blind\'s Hideout - Right",
                                                                                        "Blind\'s Hideout - Far Left",
                                                                                        "Blind\'s Hideout - Far Right"]),
-        create_lw_region(world, player, 'Northeast Light World', None,
+        create_lw_region(multiworld, player, 'Northeast Light World', None,
                          ['Zoras River', 'Waterfall of Wishing Cave', 'Potion Shop Outer Rock', 'Catfish Mirror Spot',
                           'Northeast Light World Warp']),
-        create_lw_region(world, player, 'Waterfall of Wishing Cave', None,
+        create_lw_region(multiworld, player, 'Waterfall of Wishing Cave', None,
                          ['Waterfall of Wishing', 'Northeast Light World Return']),
-        create_lw_region(world, player, 'Potion Shop Area', None,
+        create_lw_region(multiworld, player, 'Potion Shop Area', None,
                          ['Potion Shop', 'Potion Shop Inner Bushes', 'Potion Shop Inner Rock',
                           'Potion Shop Mirror Spot', 'Potion Shop River Drop']),
-        create_lw_region(world, player, 'Graveyard Cave Area', None,
+        create_lw_region(multiworld, player, 'Graveyard Cave Area', None,
                          ['Graveyard Cave', 'Graveyard Cave Inner Bushes', 'Graveyard Cave Mirror Spot']),
-        create_lw_region(world, player, 'River', None, ['Light World Pier', 'Potion Shop Pier']),
-        create_cave_region(world, player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit',
+        create_lw_region(multiworld, player, 'River', None, ['Light World Pier', 'Potion Shop Pier']),
+        create_cave_region(multiworld, player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit',
                            ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
-        create_lw_region(world, player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
-        create_cave_region(world, player, 'Waterfall of Wishing', 'a cave with two chests',
+        create_lw_region(multiworld, player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
+        create_cave_region(multiworld, player, 'Waterfall of Wishing', 'a cave with two chests',
                            ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
-        create_lw_region(world, player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
-        create_cave_region(world, player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
-        create_cave_region(world, player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
-        create_cave_region(world, player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
-        create_cave_region(world, player, 'Inverted Links House', 'your house', ['Link\'s House'],
+        create_lw_region(multiworld, player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
+        create_cave_region(multiworld, player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
+        create_cave_region(multiworld, player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
+        create_cave_region(multiworld, player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
+        create_cave_region(multiworld, player, 'Inverted Links House', 'your house', ['Link\'s House'],
                            ['Inverted Links House Exit']),
-        create_cave_region(world, player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
-        create_cave_region(world, player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
-        create_cave_region(world, player, 'Elder House', 'a connector', None,
+        create_cave_region(multiworld, player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
+        create_cave_region(multiworld, player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
+        create_cave_region(multiworld, player, 'Elder House', 'a connector', None,
                            ['Elder House Exit (East)', 'Elder House Exit (West)']),
-        create_cave_region(world, player, 'Snitch Lady (East)', 'a boring house'),
-        create_cave_region(world, player, 'Snitch Lady (West)', 'a boring house'),
-        create_cave_region(world, player, 'Bush Covered House', 'the grass man'),
-        create_cave_region(world, player, 'Tavern (Front)', 'the tavern'),
-        create_cave_region(world, player, 'Light World Bomb Hut', 'a restock room'),
-        create_cave_region(world, player, 'Kakariko Shop', 'a common shop'),
-        create_cave_region(world, player, 'Fortune Teller (Light)', 'a fortune teller'),
-        create_cave_region(world, player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
-        create_cave_region(world, player, 'Lumberjack House', 'a boring house'),
-        create_cave_region(world, player, 'Bonk Fairy (Light)', 'a fairy fountain'),
-        create_cave_region(world, player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
-        create_cave_region(world, player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Swamp Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Chicken House', 'a house with a chest', ['Chicken House']),
-        create_cave_region(world, player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
-        create_cave_region(world, player, 'Sahasrahlas Hut', 'Sahasrahla',
+        create_cave_region(multiworld, player, 'Snitch Lady (East)', 'a boring house'),
+        create_cave_region(multiworld, player, 'Snitch Lady (West)', 'a boring house'),
+        create_cave_region(multiworld, player, 'Bush Covered House', 'the grass man'),
+        create_cave_region(multiworld, player, 'Tavern (Front)', 'the tavern'),
+        create_cave_region(multiworld, player, 'Light World Bomb Hut', 'a restock room'),
+        create_cave_region(multiworld, player, 'Kakariko Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Fortune Teller (Light)', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Lumberjack House', 'a boring house'),
+        create_cave_region(multiworld, player, 'Bonk Fairy (Light)', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Swamp Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Chicken House', 'a house with a chest', ['Chicken House']),
+        create_cave_region(multiworld, player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
+        create_cave_region(multiworld, player, 'Sahasrahlas Hut', 'Sahasrahla',
                            ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right',
                             'Sahasrahla']),
-        create_cave_region(world, player, 'Kakariko Well (top)', 'a drop\'s exit',
+        create_cave_region(multiworld, player, 'Kakariko Well (top)', 'a drop\'s exit',
                            ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
                             'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
-        create_cave_region(world, player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
-        create_cave_region(world, player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
-        create_lw_region(world, player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
-        create_cave_region(world, player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
-        create_cave_region(world, player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
-        create_cave_region(world, player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
-        create_lw_region(world, player, 'Hobo Bridge', ['Hobo']),
-        create_cave_region(world, player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'],
+        create_cave_region(multiworld, player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
+        create_cave_region(multiworld, player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
+        create_lw_region(multiworld, player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
+        create_cave_region(multiworld, player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
+        create_cave_region(multiworld, player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
+        create_cave_region(multiworld, player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
+        create_lw_region(multiworld, player, 'Hobo Bridge', ['Hobo']),
+        create_cave_region(multiworld, player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'],
                            ['Lost Woods Hideout (top to bottom)']),
-        create_cave_region(world, player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None,
+        create_cave_region(multiworld, player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None,
                            ['Lost Woods Hideout Exit']),
-        create_cave_region(world, player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'],
+        create_cave_region(multiworld, player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'],
                            ['Lumberjack Tree (top to bottom)']),
-        create_cave_region(world, player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
-        create_cave_region(world, player, 'Cave 45', 'a cave with an item', ['Cave 45']),
-        create_cave_region(world, player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
-        create_cave_region(world, player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
-        create_cave_region(world, player, 'Long Fairy Cave', 'a fairy fountain'),
-        create_cave_region(world, player, 'Mini Moldorm Cave', 'a bounty of five items',
+        create_cave_region(multiworld, player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
+        create_cave_region(multiworld, player, 'Cave 45', 'a cave with an item', ['Cave 45']),
+        create_cave_region(multiworld, player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
+        create_cave_region(multiworld, player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
+        create_cave_region(multiworld, player, 'Long Fairy Cave', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Mini Moldorm Cave', 'a bounty of five items',
                            ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
                             'Mini Moldorm Cave - Far Right', 'Mini Moldorm Cave - Generous Guy']),
-        create_cave_region(world, player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
-        create_cave_region(world, player, 'Good Bee Cave', 'a cold bee'),
-        create_cave_region(world, player, '20 Rupee Cave', 'a cave with some cash'),
-        create_cave_region(world, player, 'Cave Shop (Lake Hylia)', 'a common shop'),
-        create_cave_region(world, player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
-        create_cave_region(world, player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
-        create_cave_region(world, player, 'Library', 'the library', ['Library']),
-        create_cave_region(world, player, 'Kakariko Gamble Game', 'a game of chance'),
-        create_cave_region(world, player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
-        create_lw_region(world, player, 'Lake Hylia Island', ['Lake Hylia Island']),
-        create_cave_region(world, player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade Shop']),
-        create_cave_region(world, player, 'Two Brothers House', 'a connector', None,
+        create_cave_region(multiworld, player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
+        create_cave_region(multiworld, player, 'Good Bee Cave', 'a cold bee'),
+        create_cave_region(multiworld, player, '20 Rupee Cave', 'a cave with some cash'),
+        create_cave_region(multiworld, player, 'Cave Shop (Lake Hylia)', 'a common shop'),
+        create_cave_region(multiworld, player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
+        create_cave_region(multiworld, player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
+        create_cave_region(multiworld, player, 'Library', 'the library', ['Library']),
+        create_cave_region(multiworld, player, 'Kakariko Gamble Game', 'a game of chance'),
+        create_cave_region(multiworld, player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
+        create_lw_region(multiworld, player, 'Lake Hylia Island', ['Lake Hylia Island']),
+        create_cave_region(multiworld, player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade Shop']),
+        create_cave_region(multiworld, player, 'Two Brothers House', 'a connector', None,
                            ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
-        create_lw_region(world, player, 'Maze Race Ledge', ['Maze Race'],
+        create_lw_region(multiworld, player, 'Maze Race Ledge', ['Maze Race'],
                          ['Two Brothers House (West)', 'Maze Race Mirror Spot']),
-        create_cave_region(world, player, '50 Rupee Cave', 'a cave with some cash'),
-        create_lw_region(world, player, 'Desert Ledge', ['Desert Ledge'],
+        create_cave_region(multiworld, player, '50 Rupee Cave', 'a cave with some cash'),
+        create_lw_region(multiworld, player, 'Desert Ledge', ['Desert Ledge'],
                          ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)',
                           'Desert Ledge Drop']),
-        create_lw_region(world, player, 'Desert Palace Stairs', None,
+        create_lw_region(multiworld, player, 'Desert Palace Stairs', None,
                          ['Desert Palace Entrance (South)', 'Desert Palace Stairs Mirror Spot']),
-        create_lw_region(world, player, 'Desert Palace Lone Stairs', None,
+        create_lw_region(multiworld, player, 'Desert Palace Lone Stairs', None,
                          ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
-        create_lw_region(world, player, 'Desert Palace Entrance (North) Spot', None,
+        create_lw_region(multiworld, player, 'Desert Palace Entrance (North) Spot', None,
                          ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks',
                           'Desert Palace North Mirror Spot']),
-        create_dungeon_region(world, player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
+        create_dungeon_region(multiworld, player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
                               ['Desert Palace Pots (Outer)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)', 'Desert Palace East Wing']),
-        create_dungeon_region(world, player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
-        create_dungeon_region(world, player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
-        create_dungeon_region(world, player, 'Desert Palace North', 'Desert Palace',
+        create_dungeon_region(multiworld, player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
+        create_dungeon_region(multiworld, player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Desert Palace North', 'Desert Palace',
                               ['Desert Palace - Desert Tiles 1 Pot Key', 'Desert Palace - Beamos Hall Pot Key',
                                'Desert Palace - Desert Tiles 2 Pot Key',
                                'Desert Palace - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
-        create_dungeon_region(world, player, 'Eastern Palace', 'Eastern Palace',
+        create_dungeon_region(multiworld, player, 'Eastern Palace', 'Eastern Palace',
                               ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest',
                                'Eastern Palace - Cannonball Chest',
                                'Eastern Palace - Dark Square Pot Key', 'Eastern Palace - Dark Eyegore Key Drop',
                                'Eastern Palace - Big Key Chest',
                                'Eastern Palace - Map Chest', 'Eastern Palace - Boss', 'Eastern Palace - Prize'],
                               ['Eastern Palace Exit']),
-        create_lw_region(world, player, 'Master Sword Meadow', ['Master Sword Pedestal']),
-        create_cave_region(world, player, 'Lost Woods Gamble', 'a game of chance'),
-        create_lw_region(world, player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Inverted Ganons Tower', 'Hyrule Castle Ledge Courtyard Drop', 'Inverted Pyramid Hole']),
-        create_dungeon_region(world, player, 'Hyrule Castle', 'Hyrule Castle',
+        create_lw_region(multiworld, player, 'Master Sword Meadow', ['Master Sword Pedestal']),
+        create_cave_region(multiworld, player, 'Lost Woods Gamble', 'a game of chance'),
+        create_lw_region(multiworld, player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Inverted Ganons Tower', 'Hyrule Castle Ledge Courtyard Drop', 'Inverted Pyramid Hole']),
+        create_dungeon_region(multiworld, player, 'Hyrule Castle', 'Hyrule Castle',
                               ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest',
                                'Hyrule Castle - Zelda\'s Chest',
                                'Hyrule Castle - Map Guard Key Drop', 'Hyrule Castle - Boomerang Guard Key Drop',
                                'Hyrule Castle - Big Key Drop'],
                               ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)',
                                'Throne Room']),
-        create_dungeon_region(world, player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
-        create_dungeon_region(world, player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross', 'Sewers - Key Rat Key Drop'], ['Sewers Door']),
-        create_dungeon_region(world, player, 'Sewers', 'a drop\'s exit', None, ['Sanctuary Push Door', 'Sewers Back Door', 'Sewers Secret Room']),
-        create_dungeon_region(world, player, 'Sewers Secret Room', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+        create_dungeon_region(multiworld, player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
+        create_dungeon_region(multiworld, player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross', 'Sewers - Key Rat Key Drop'], ['Sewers Door']),
+        create_dungeon_region(multiworld, player, 'Sewers', 'a drop\'s exit', None, ['Sanctuary Push Door', 'Sewers Back Door', 'Sewers Secret Room']),
+        create_dungeon_region(multiworld, player, 'Sewers Secret Room', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
                                          'Sewers - Secret Room - Right']),
-        create_dungeon_region(world, player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
-        create_dungeon_region(world, player, 'Inverted Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze',  'Castle Tower - Dark Archer Key Drop', 'Castle Tower - Circle of Pots Key Drop'], ['Agahnim 1', 'Inverted Agahnims Tower Exit']),
-        create_dungeon_region(world, player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
-        create_cave_region(world, player, 'Old Man Cave', 'a connector', ['Old Man'],
+        create_dungeon_region(multiworld, player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
+        create_dungeon_region(multiworld, player, 'Inverted Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze',  'Castle Tower - Dark Archer Key Drop', 'Castle Tower - Circle of Pots Key Drop'], ['Agahnim 1', 'Inverted Agahnims Tower Exit']),
+        create_dungeon_region(multiworld, player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
+        create_cave_region(multiworld, player, 'Old Man Cave', 'a connector', ['Old Man'],
                            ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
-        create_cave_region(world, player, 'Old Man House', 'a connector', None,
+        create_cave_region(multiworld, player, 'Old Man House', 'a connector', None,
                            ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
-        create_cave_region(world, player, 'Old Man House Back', 'a connector', None,
+        create_cave_region(multiworld, player, 'Old Man House Back', 'a connector', None,
                            ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
-        create_lw_region(world, player, 'Death Mountain', None,
+        create_lw_region(multiworld, player, 'Death Mountain', None,
                          ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)',
                           'Death Mountain Return Cave (East)', 'Spectacle Rock Cave',
                           'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)',
                           'Death Mountain Mirror Spot']),
-        create_cave_region(world, player, 'Death Mountain Return Cave', 'a connector', None,
+        create_cave_region(multiworld, player, 'Death Mountain Return Cave', 'a connector', None,
                            ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
-        create_lw_region(world, player, 'Death Mountain Return Ledge', None,
+        create_lw_region(multiworld, player, 'Death Mountain Return Ledge', None,
                          ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)',
                           'Bumper Cave Ledge Mirror Spot']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'],
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'],
                            ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Bottom)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Bottom)', 'a connector', None,
                            ['Spectacle Rock Cave Exit']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Peak)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Peak)', 'a connector', None,
                            ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
-        create_lw_region(world, player, 'East Death Mountain (Bottom)', None,
+        create_lw_region(multiworld, player, 'East Death Mountain (Bottom)', None,
                          ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)',
                           'East Death Mountain Mirror Spot (Bottom)', 'Hookshot Fairy',
                           'Fairy Ascension Rocks', 'Spiral Cave (Bottom)']),
-        create_cave_region(world, player, 'Hookshot Fairy', 'fairies deep in a cave'),
-        create_cave_region(world, player, 'Paradox Cave Front', 'a connector', None,
+        create_cave_region(multiworld, player, 'Hookshot Fairy', 'fairies deep in a cave'),
+        create_cave_region(multiworld, player, 'Paradox Cave Front', 'a connector', None,
                            ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)',
                             'Light World Death Mountain Shop']),
-        create_cave_region(world, player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
+        create_cave_region(multiworld, player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
                                                                                      'Paradox Cave Lower - Left',
                                                                                      'Paradox Cave Lower - Right',
                                                                                      'Paradox Cave Lower - Far Right',
@@ -220,273 +221,273 @@ def create_inverted_regions(world, player):
                                                                                      'Paradox Cave Upper - Left',
                                                                                      'Paradox Cave Upper - Right'],
                            ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']),
-        create_cave_region(world, player, 'Paradox Cave', 'a connector', None,
+        create_cave_region(multiworld, player, 'Paradox Cave', 'a connector', None,
                            ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
-        create_cave_region(world, player, 'Light World Death Mountain Shop', 'a common shop'),
-        create_lw_region(world, player, 'East Death Mountain (Top)', ['Floating Island'],
+        create_cave_region(multiworld, player, 'Light World Death Mountain Shop', 'a common shop'),
+        create_lw_region(multiworld, player, 'East Death Mountain (Top)', ['Floating Island'],
                          ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access',
                           'East Death Mountain Drop', 'East Death Mountain Mirror Spot (Top)',
                           'Fairy Ascension Ledge Access', 'Mimic Cave Ledge Access',
                           'Floating Island Mirror Spot']),
-        create_lw_region(world, player, 'Spiral Cave Ledge', None,
+        create_lw_region(multiworld, player, 'Spiral Cave Ledge', None,
                          ['Spiral Cave', 'Spiral Cave Ledge Drop', 'Dark Death Mountain Ledge Mirror Spot (West)']),
-        create_lw_region(world, player, 'Mimic Cave Ledge', None,
+        create_lw_region(multiworld, player, 'Mimic Cave Ledge', None,
                          ['Mimic Cave', 'Mimic Cave Ledge Drop', 'Dark Death Mountain Ledge Mirror Spot (East)']),
-        create_cave_region(world, player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'],
+        create_cave_region(multiworld, player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'],
                            ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']),
-        create_cave_region(world, player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
-        create_lw_region(world, player, 'Fairy Ascension Plateau', None,
+        create_cave_region(multiworld, player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
+        create_lw_region(multiworld, player, 'Fairy Ascension Plateau', None,
                          ['Fairy Ascension Drop', 'Fairy Ascension Cave (Bottom)']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Bottom)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Bottom)', 'a connector', None,
                            ['Fairy Ascension Cave Climb', 'Fairy Ascension Cave Exit (Bottom)']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Drop)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Drop)', 'a connector', None,
                            ['Fairy Ascension Cave Pots']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Top)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Top)', 'a connector', None,
                            ['Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Cave Drop']),
-        create_lw_region(world, player, 'Fairy Ascension Ledge', None,
+        create_lw_region(multiworld, player, 'Fairy Ascension Ledge', None,
                          ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)', 'Laser Bridge Mirror Spot']),
-        create_lw_region(world, player, 'Death Mountain (Top)', ['Ether Tablet', 'Spectacle Rock'],
+        create_lw_region(multiworld, player, 'Death Mountain (Top)', ['Ether Tablet', 'Spectacle Rock'],
                          ['East Death Mountain (Top)', 'Tower of Hera', 'Death Mountain Drop',
                           'Death Mountain (Top) Mirror Spot']),
-        create_dw_region(world, player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'],
+        create_dw_region(multiworld, player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'],
                          ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)']),
-        create_dungeon_region(world, player, 'Tower of Hera (Bottom)', 'Tower of Hera', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
-        create_dungeon_region(world, player, 'Tower of Hera (Basement)', 'Tower of Hera', ['Tower of Hera - Big Key Chest']),
-        create_dungeon_region(world, player, 'Tower of Hera (Top)', 'Tower of Hera', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss', 'Tower of Hera - Prize']),
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Bottom)', 'Tower of Hera', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Basement)', 'Tower of Hera', ['Tower of Hera - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Top)', 'Tower of Hera', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss', 'Tower of Hera - Prize']),
 
-        create_dw_region(world, player, 'East Dark World', ['Pyramid'],
+        create_dw_region(multiworld, player, 'East Dark World', ['Pyramid'],
                          ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness',
                           'Dark Lake Hylia Drop (East)',
                           'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint',
                           'Northeast Dark World Broken Bridge Pass', 'East Dark World Teleporter', 'EDW Flute']),
-        create_dw_region(world, player, 'Catfish', ['Catfish'], ['Catfish Exit Rock']),
-        create_dw_region(world, player, 'Northeast Dark World', None,
+        create_dw_region(multiworld, player, 'Catfish', ['Catfish'], ['Catfish Exit Rock']),
+        create_dw_region(multiworld, player, 'Northeast Dark World', None,
                          ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass',
                           'NEDW Flute', 'Dark Lake Hylia Teleporter', 'Catfish Entrance Rock']),
-        create_cave_region(world, player, 'Palace of Darkness Hint', 'a storyteller'),
-        create_cave_region(world, player, 'East Dark World Hint', 'a storyteller'),
-        create_dw_region(world, player, 'South Dark World', ['Stumpy', 'Digging Game'],
+        create_cave_region(multiworld, player, 'Palace of Darkness Hint', 'a storyteller'),
+        create_cave_region(multiworld, player, 'East Dark World Hint', 'a storyteller'),
+        create_dw_region(multiworld, player, 'South Dark World', ['Stumpy', 'Digging Game'],
                          ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock',
                           'East Dark World Bridge', 'Inverted Links House', 'Archery Game', 'Bonk Fairy (Dark)',
                           'Dark Lake Hylia Shop', 'South Dark World Teleporter', 'Post Aga Teleporter', 'SDW Flute']),
-        create_cave_region(world, player, 'Inverted Big Bomb Shop', 'the bomb shop'),
-        create_cave_region(world, player, 'Archery Game', 'a game of skill'),
-        create_dw_region(world, player, 'Dark Lake Hylia', None,
+        create_cave_region(multiworld, player, 'Inverted Big Bomb Shop', 'the bomb shop'),
+        create_cave_region(multiworld, player, 'Archery Game', 'a game of skill'),
+        create_dw_region(multiworld, player, 'Dark Lake Hylia', None,
                          ['East Dark World Pier', 'Dark Lake Hylia Ledge Pier', 'Ice Palace Missing Wall']),
-        create_dw_region(world, player, 'Dark Lake Hylia Central Island', None,
+        create_dw_region(multiworld, player, 'Dark Lake Hylia Central Island', None,
                          ['Dark Lake Hylia Shallows', 'Ice Palace', 'Dark Lake Hylia Central Island Teleporter']),
-        create_dw_region(world, player, 'Dark Lake Hylia Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Lake Hylia Ledge', None,
                          ['Dark Lake Hylia Ledge Drop', 'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint',
                           'Dark Lake Hylia Ledge Spike Cave', 'DLHL Flute']),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
-        create_cave_region(world, player, 'Hype Cave', 'a bounty of five items',
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
+        create_cave_region(multiworld, player, 'Hype Cave', 'a bounty of five items',
                            ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
                             'Hype Cave - Bottom', 'Hype Cave - Generous Guy']),
-        create_dw_region(world, player, 'West Dark World', ['Frog', 'Flute Activation Spot'],
+        create_dw_region(multiworld, player, 'West Dark World', ['Frog', 'Flute Activation Spot'],
                          ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House',
                           'Chest Game', 'Thieves Town', 'Bumper Cave Entrance Rock',
                           'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks',
                           'Red Shield Shop', 'Inverted Dark Sanctuary', 'Fortune Teller (Dark)',
                           'Dark World Lumberjack Shop',
                           'West Dark World Teleporter', 'WDW Flute']),
-        create_dw_region(world, player, 'Dark Grassy Lawn', None,
+        create_dw_region(multiworld, player, 'Dark Grassy Lawn', None,
                          ['Grassy Lawn Pegs', 'Village of Outcasts Shop', 'Dark Grassy Lawn Flute']),
-        create_dw_region(world, player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'],
+        create_dw_region(multiworld, player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'],
                          ['Dark World Hammer Peg Cave', 'Peg Area Rocks', 'Hammer Peg Area Flute']),
-        create_dw_region(world, player, 'Bumper Cave Entrance', None,
+        create_dw_region(multiworld, player, 'Bumper Cave Entrance', None,
                          ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Drop']),
-        create_cave_region(world, player, 'Fortune Teller (Dark)', 'a fortune teller'),
-        create_cave_region(world, player, 'Village of Outcasts Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark Lake Hylia Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Lumberjack Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Potion Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
-        create_cave_region(world, player, 'Pyramid Fairy', 'a cave with two chests',
+        create_cave_region(multiworld, player, 'Fortune Teller (Dark)', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Village of Outcasts Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Lumberjack Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Potion Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
+        create_cave_region(multiworld, player, 'Pyramid Fairy', 'a cave with two chests',
                            ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
-        create_cave_region(world, player, 'Brewery', 'a house with a chest', ['Brewery']),
-        create_cave_region(world, player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
-        create_cave_region(world, player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
-        create_cave_region(world, player, 'Red Shield Shop', 'the rare shop'),
-        create_cave_region(world, player, 'Inverted Dark Sanctuary', 'a storyteller', None,
+        create_cave_region(multiworld, player, 'Brewery', 'a house with a chest', ['Brewery']),
+        create_cave_region(multiworld, player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
+        create_cave_region(multiworld, player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
+        create_cave_region(multiworld, player, 'Red Shield Shop', 'the rare shop'),
+        create_cave_region(multiworld, player, 'Inverted Dark Sanctuary', 'a storyteller', None,
                            ['Inverted Dark Sanctuary Exit']),
-        create_cave_region(world, player, 'Bumper Cave', 'a connector', None,
+        create_cave_region(multiworld, player, 'Bumper Cave', 'a connector', None,
                            ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']),
-        create_dw_region(world, player, 'Skull Woods Forest', None,
+        create_dw_region(multiworld, player, 'Skull Woods Forest', None,
                          ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)',
                           'Skull Woods First Section Hole (North)',
                           'Skull Woods First Section Door', 'Skull Woods Second Section Door (East)']),
-        create_dw_region(world, player, 'Skull Woods Forest (West)', None,
+        create_dw_region(multiworld, player, 'Skull Woods Forest (West)', None,
                          ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)',
                           'Skull Woods Final Section']),
-        create_dw_region(world, player, 'Dark Desert', None,
+        create_dw_region(multiworld, player, 'Dark Desert', None,
                          ['Misery Mire', 'Mire Shed', 'Dark Desert Hint', 'Dark Desert Fairy', 'DD Flute']),
-        create_dw_region(world, player, 'Dark Desert Ledge', None, ['Dark Desert Drop', 'Dark Desert Teleporter']),
-        create_cave_region(world, player, 'Mire Shed', 'a cave with two chests',
+        create_dw_region(multiworld, player, 'Dark Desert Ledge', None, ['Dark Desert Drop', 'Dark Desert Teleporter']),
+        create_cave_region(multiworld, player, 'Mire Shed', 'a cave with two chests',
                            ['Mire Shed - Left', 'Mire Shed - Right']),
-        create_cave_region(world, player, 'Dark Desert Hint', 'a storyteller'),
-        create_dw_region(world, player, 'Dark Death Mountain', None,
+        create_cave_region(multiworld, player, 'Dark Desert Hint', 'a storyteller'),
+        create_dw_region(multiworld, player, 'Dark Death Mountain', None,
                          ['Dark Death Mountain Drop (East)', 'Inverted Agahnims Tower', 'Superbunny Cave (Top)',
                           'Hookshot Cave', 'Turtle Rock',
                           'Spike Cave', 'Dark Death Mountain Fairy', 'Dark Death Mountain Teleporter (West)',
                           'Turtle Rock Tail Drop', 'DDM Flute']),
-        create_dw_region(world, player, 'Dark Death Mountain Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain Ledge', None,
                          ['Dark Death Mountain Ledge (East)', 'Dark Death Mountain Ledge (West)']),
-        create_dw_region(world, player, 'Turtle Rock (Top)', None,
+        create_dw_region(multiworld, player, 'Turtle Rock (Top)', None,
                          ['Dark Death Mountain Teleporter (East)', 'Turtle Rock Drop']),
-        create_dw_region(world, player, 'Dark Death Mountain Isolated Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain Isolated Ledge', None,
                          ['Turtle Rock Isolated Ledge Entrance']),
-        create_dw_region(world, player, 'Dark Death Mountain (East Bottom)', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain (East Bottom)', None,
                          ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)',
                           'Dark Death Mountain Teleporter (East Bottom)', 'EDDM Flute']),
-        create_cave_region(world, player, 'Superbunny Cave (Top)', 'a connector',
+        create_cave_region(multiworld, player, 'Superbunny Cave (Top)', 'a connector',
                            ['Superbunny Cave - Top', 'Superbunny Cave - Bottom'], ['Superbunny Cave Exit (Top)']),
-        create_cave_region(world, player, 'Superbunny Cave (Bottom)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Superbunny Cave (Bottom)', 'a connector', None,
                            ['Superbunny Cave Climb', 'Superbunny Cave Exit (Bottom)']),
-        create_cave_region(world, player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
-        create_cave_region(world, player, 'Hookshot Cave', 'a connector',
+        create_cave_region(multiworld, player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
+        create_cave_region(multiworld, player, 'Hookshot Cave', 'a connector',
                            ['Hookshot Cave - Top Right', 'Hookshot Cave - Top Left', 'Hookshot Cave - Bottom Right',
                             'Hookshot Cave - Bottom Left'],
                            ['Hookshot Cave Exit (South)', 'Hookshot Cave Bomb Wall (South)']),
-        create_cave_region(world, player, 'Hookshot Cave (Upper)', 'a connector', None, ['Hookshot Cave Exit (North)',
+        create_cave_region(multiworld, player, 'Hookshot Cave (Upper)', 'a connector', None, ['Hookshot Cave Exit (North)',
                                                                                          'Hookshot Cave Bomb Wall (North)']),
-        create_dw_region(world, player, 'Death Mountain Floating Island (Dark World)', None,
+        create_dw_region(multiworld, player, 'Death Mountain Floating Island (Dark World)', None,
                          ['Floating Island Drop', 'Hookshot Cave Back Entrance']),
-        create_cave_region(world, player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
+        create_cave_region(multiworld, player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
 
-        create_dungeon_region(world, player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
-        create_dungeon_region(world, player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
-        create_dungeon_region(world, player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest', 'Swamp Palace - Pot Row Pot Key',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest', 'Swamp Palace - Pot Row Pot Key',
                                                                                        'Swamp Palace - Trench 1 Pot Key'], ['Swamp Palace (Center)']),
-        create_dungeon_region(world, player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest', 'Swamp Palace - Hookshot Pot Key',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest', 'Swamp Palace - Hookshot Pot Key',
                                                                                 'Swamp Palace - Trench 2 Pot Key'], ['Swamp Palace (North)', 'Swamp Palace (West)']),
-        create_dungeon_region(world, player, 'Swamp Palace (West)', 'Swamp Palace', ['Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest']),
-        create_dungeon_region(world, player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (West)', 'Swamp Palace', ['Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
                                                                                'Swamp Palace - Waterway Pot Key', 'Swamp Palace - Waterfall Room',
                                                                                'Swamp Palace - Boss', 'Swamp Palace - Prize']),
-        create_dungeon_region(world, player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
+        create_dungeon_region(multiworld, player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
                                                                             'Thieves\' Town - Map Chest',
                                                                             'Thieves\' Town - Compass Chest',
                                                                             'Thieves\' Town - Ambush Chest'], ['Thieves Town Big Key Door', 'Thieves Town Exit']),
-        create_dungeon_region(world, player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
+        create_dungeon_region(multiworld, player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
                                                                                 'Thieves\' Town - Big Chest',
                                                                                 'Thieves\' Town - Hallway Pot Key',
                                                                                 'Thieves\' Town - Spike Switch Pot Key',
                                                                                 'Thieves\' Town - Blind\'s Cell'],
                               ['Blind Fight']),
-        create_dungeon_region(world, player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
-        create_dungeon_region(world, player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
-        create_dungeon_region(world, player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
-        create_dungeon_region(world, player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest', 'Skull Woods - West Lobby Pot Key'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
-        create_dungeon_region(world, player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
-        create_dungeon_region(world, player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Spike Corner Key Drop', 'Skull Woods - Boss', 'Skull Woods - Prize']),
-        create_dungeon_region(world, player, 'Ice Palace (Entrance)', 'Ice Palace', ['Ice Palace - Jelly Key Drop', 'Ice Palace - Compass Chest'], ['Ice Palace (Second Section)', 'Ice Palace Exit']),
-        create_dungeon_region(world, player, 'Ice Palace (Second Section)', 'Ice Palace', ['Ice Palace - Conveyor Key Drop'], ['Ice Palace (Main)']),
-        create_dungeon_region(world, player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Freezor Chest',
+        create_dungeon_region(multiworld, player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest', 'Skull Woods - West Lobby Pot Key'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Spike Corner Key Drop', 'Skull Woods - Boss', 'Skull Woods - Prize']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Entrance)', 'Ice Palace', ['Ice Palace - Jelly Key Drop', 'Ice Palace - Compass Chest'], ['Ice Palace (Second Section)', 'Ice Palace Exit']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Second Section)', 'Ice Palace', ['Ice Palace - Conveyor Key Drop'], ['Ice Palace (Main)']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Freezor Chest',
                                                                           'Ice Palace - Many Pots Pot Key',
                                                                   'Ice Palace - Big Chest', 'Ice Palace - Iced T Room'], ['Ice Palace (East)', 'Ice Palace (Kholdstare)']),
-        create_dungeon_region(world, player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
-        create_dungeon_region(world, player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest', 'Ice Palace - Hammer Block Key Drop']),
-        create_dungeon_region(world, player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
-        create_dungeon_region(world, player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
-        create_dungeon_region(world, player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
+        create_dungeon_region(multiworld, player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest', 'Ice Palace - Hammer Block Key Drop']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
                                                                     'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest',
                                                                     'Misery Mire - Spikes Pot Key', 'Misery Mire - Fishbone Pot Key',
                                                                     'Misery Mire - Conveyor Crystal Key Drop'], ['Misery Mire (West)', 'Misery Mire Big Key Door']),
-        create_dungeon_region(world, player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
-        create_dungeon_region(world, player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
-        create_dungeon_region(world, player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
-        create_dungeon_region(world, player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
-        create_dungeon_region(world, player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
+        create_dungeon_region(multiworld, player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
                                                                              'Turtle Rock - Roller Room - Right'],
                                                                              ['Turtle Rock Entrance to Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
-        create_dungeon_region(world, player, 'Turtle Rock (Pokey Room)', 'Turtle Rock', ['Turtle Rock - Pokey 1 Key Drop'], ['Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Pokey Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'],
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Pokey Room)', 'Turtle Rock', ['Turtle Rock - Pokey 1 Key Drop'], ['Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Pokey Room) (South)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'],
                               ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Second Section)', 'Turtle Rock',
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Second Section)', 'Turtle Rock',
                               ['Turtle Rock - Big Key Chest', 'Turtle Rock - Pokey 2 Key Drop'],
                               ['Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door',
                                'Turtle Rock Second Section Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Second Section Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Second Section from Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
-        create_dungeon_region(world, player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Eye Bridge Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Isolated Ledge Exit', 'Turtle Rock Eye Bridge from Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Second Section Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Second Section from Bomb Wall']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Eye Bridge Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Isolated Ledge Exit', 'Turtle Rock Eye Bridge from Bomb Wall']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
                                                                           'Turtle Rock - Eye Bridge - Top Left', 'Turtle Rock - Eye Bridge - Top Right'],
                               ['Turtle Rock Dark Room (South)', 'Turtle Rock (Trinexx)', 'Turtle Rock Eye Bridge Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
                               ['Palace of Darkness Big Key Chest Staircase', 'Palace of Darkness (North)', 'Palace of Darkness Big Key Door']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
-        create_dungeon_region(world, player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
                               ['Palace of Darkness Spike Statue Room Door', 'Palace of Darkness Maze Door']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
-        create_dungeon_region(world, player, 'Inverted Ganons Tower (Entrance)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
+        create_dungeon_region(multiworld, player, 'Inverted Ganons Tower (Entrance)', 'Ganon\'s Tower',
                               ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left',
                                'Ganons Tower - Hope Room - Right', 'Ganons Tower - Conveyor Cross Pot Key'],
                               ['Ganons Tower (Tile Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower Big Key Door',
                                'Inverted Ganons Tower Exit']),
-        create_dungeon_region(world, player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'],
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'],
                               ['Ganons Tower (Tile Room) Key Door']),
-        create_dungeon_region(world, player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower',
                               ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
                                'Ganons Tower - Compass Room - Bottom Left',
                                'Ganons Tower - Compass Room - Bottom Right',
                                'Ganons Tower - Conveyor Star Pits Pot Key'],
                               ['Ganons Tower (Bottom) (East)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower',
                               ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
                                'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right',
                                'Ganons Tower - Double Switch Pot Key'],
                               ['Ganons Tower (Map Room)', 'Ganons Tower (Double Switch Room)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
-        create_dungeon_region(world, player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower',
                               ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower',
                               ['Ganons Tower - Randomizer Room - Top Left',
                                'Ganons Tower - Randomizer Room - Top Right',
                                'Ganons Tower - Randomizer Room - Bottom Left',
                                'Ganons Tower - Randomizer Room - Bottom Right'],
                               ['Ganons Tower (Bottom) (West)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower',
                               ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest',
                                'Ganons Tower - Big Key Room - Left',
                                'Ganons Tower - Big Key Room - Right', 'Ganons Tower - Big Key Chest']),
-        create_dungeon_region(world, player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
-        create_dungeon_region(world, player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower',
                               ['Ganons Tower - Mini Helmasaur Room - Left',
                                'Ganons Tower - Mini Helmasaur Room - Right',
                                'Ganons Tower - Pre-Moldorm Chest', 'Ganons Tower - Mini Helmasaur Key Drop'],
                               ['Ganons Tower Moldorm Door']),
-        create_dungeon_region(world, player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
 
-        create_dungeon_region(world, player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
-        create_cave_region(world, player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
-        create_cave_region(world, player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
-        create_dw_region(world, player, 'Pyramid Ledge', None, ['Pyramid Drop']),  # houlihan room exits here in inverted
+        create_dungeon_region(multiworld, player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
+        create_cave_region(multiworld, player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
+        create_cave_region(multiworld, player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
+        create_dw_region(multiworld, player, 'Pyramid Ledge', None, ['Pyramid Drop']),  # houlihan room exits here in inverted
         
         # to simplify flute connections
-        create_cave_region(world, player, 'The Sky', 'A Dark Sky', None,
+        create_cave_region(multiworld, player, 'The Sky', 'A Dark Sky', None,
                            ['DDM Landing', 'NEDW Landing', 'WDW Landing', 'SDW Landing', 'EDW Landing', 'DD Landing',
                             'DLHL Landing']),
 
-        create_lw_region(world, player, 'Desert Northern Cliffs'),
-        create_lw_region(world, player, 'Death Mountain Bunny Descent Area')
+        create_lw_region(multiworld, player, 'Desert Northern Cliffs'),
+        create_lw_region(multiworld, player, 'Death Mountain Bunny Descent Area')
     ]
 
 
-def mark_dark_world_regions(world, player):
+def mark_dark_world_regions(multiworld: MultiWorld, player: int):
     # cross world caves may have some sections marked as both in_light_world, and in_dark_work.
     # That is ok. the bunny logic will check for this case and incorporate special rules.
-    queue = collections.deque(region for region in world.get_regions(player) if region.type == LTTPRegionType.DarkWorld)
+    queue = collections.deque(region for region in multiworld.get_regions(player) if region.type == LTTPRegionType.DarkWorld)
     seen = set(queue)
     while queue:
         current = queue.popleft()
@@ -499,7 +500,7 @@ def mark_dark_world_regions(world, player):
                 seen.add(exit.connected_region)
                 queue.append(exit.connected_region)
 
-    queue = collections.deque(region for region in world.get_regions(player) if region.type == LTTPRegionType.LightWorld)
+    queue = collections.deque(region for region in multiworld.get_regions(player) if region.type == LTTPRegionType.LightWorld)
     seen = set(queue)
     while queue:
         current = queue.popleft()
diff --git a/worlds/alttp/ItemPool.py b/worlds/alttp/ItemPool.py
index 53059c64bc..c7dc7a6948 100644
--- a/worlds/alttp/ItemPool.py
+++ b/worlds/alttp/ItemPool.py
@@ -1,8 +1,9 @@
 from collections import namedtuple
 import logging
 
-from BaseClasses import ItemClassification
-from Fill import FillError
+from BaseClasses import ItemClassification, MultiWorld
+from Options import OptionError
+from typing import TYPE_CHECKING
 
 from .SubClasses import ALttPLocation, LTTPRegion, LTTPRegionType
 from .Shops import TakeAny, total_shop_slots, set_up_shops, shop_table_by_location, ShopType
@@ -14,6 +15,9 @@ from .Options import small_key_shuffle, compass_shuffle, big_key_shuffle, map_sh
 from .StateHelpers import has_triforce_pieces, has_melee_weapon
 from .Regions import key_drop_data
 
+if TYPE_CHECKING:
+    from . import ALTTPWorld
+
 # This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space.
 # Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided.
 
@@ -222,7 +226,7 @@ items_reduction_table = (
 )
 
 
-def generate_itempool(world):
+def generate_itempool(world: "ALTTPWorld"):
     player: int = world.player
     multiworld = world.multiworld
 
@@ -263,7 +267,6 @@ def generate_itempool(world):
         ('Frog', 'Get Frog'),
         ('Missing Smith', 'Return Smith'),
         ('Floodgate', 'Open Floodgate'),
-        ('Agahnim 1', 'Beat Agahnim 1'),
         ('Flute Activation Spot', 'Activated Flute'),
         ('Capacity Upgrade Shop', 'Capacity Upgrade Shop')
     ]
@@ -410,15 +413,16 @@ def generate_itempool(world):
     pool_count = len(items)
     new_items = ["Triforce Piece" for _ in range(additional_triforce_pieces)]
     if world.options.shuffle_capacity_upgrades or world.options.bombless_start:
-        progressive = world.options.progressive
-        progressive = multiworld.random.choice([True, False]) if progressive == 'grouped_random' else progressive == 'on'
+        progressive = world.options.progressive.want_progressives(world.random)
         if world.options.shuffle_capacity_upgrades == "on_combined":
             new_items.append("Bomb Upgrade (50)")
         elif world.options.shuffle_capacity_upgrades == "on":
             new_items += ["Bomb Upgrade (+5)"] * 6
             new_items.append("Bomb Upgrade (+5)" if progressive else "Bomb Upgrade (+10)")
-        if world.options.shuffle_capacity_upgrades != "on_combined" and world.options.bombless_start:
-            new_items.append("Bomb Upgrade (+5)" if progressive else "Bomb Upgrade (+10)")
+            if world.options.bombless_start:
+                new_items.append("Bomb Upgrade (+5)" if progressive else "Bomb Upgrade (+10)")
+        elif world.options.bombless_start:
+            new_items.append("Bomb Upgrade (+10)")
 
         if world.options.shuffle_capacity_upgrades and not world.options.retro_bow:
             if world.options.shuffle_capacity_upgrades == "on_combined":
@@ -466,6 +470,9 @@ def generate_itempool(world):
                         items_were_cut = items_were_cut or cut_item(items, *reduce_item)
                     elif len(reduce_item) == 4:
                         items_were_cut = items_were_cut or condense_items(items, *reduce_item)
+                        if reduce_item[0] == "Piece of Heart" and world.logical_heart_pieces:
+                            world.logical_heart_pieces -= reduce_item[2]
+                            world.logical_heart_containers += reduce_item[3]
                     elif len(reduce_item) == 1:  # Bottles
                         bottles = [item for item in items if item.name in item_name_groups["Bottles"]]
                         if len(bottles) > 4:
@@ -476,7 +483,7 @@ def generate_itempool(world):
                     if items_were_cut:
                         break
                 else:
-                    raise Exception(f"Failed to limit item pool size for player {player}")
+                    raise OptionError(f"Failed to limit item pool size for player {player}")
     if len(items) < pool_count:
         items += removed_filler[len(items) - pool_count:]
 
@@ -528,7 +535,7 @@ take_any_locations_inverted.sort()
 take_any_locations.sort()
 
 
-def set_up_take_anys(multiworld, world, player):
+def set_up_take_anys(multiworld: MultiWorld, world: "ALTTPWorld", player: int):
     # these are references, do not modify these lists in-place
     if world.options.mode == 'inverted':
         take_any_locs = take_any_locations_inverted
@@ -582,15 +589,15 @@ def set_up_take_anys(multiworld, world, player):
         location.place_locked_item(item_factory("Boss Heart Container", world))
 
 
-def get_pool_core(world, player: int):
-    shuffle = world.worlds[player].options.entrance_shuffle.current_key
-    difficulty = world.worlds[player].options.item_pool.current_key
-    timer = world.worlds[player].options.timer.current_key
-    goal = world.worlds[player].options.goal.current_key
-    mode = world.worlds[player].options.mode.current_key
-    swordless = world.worlds[player].options.swordless
-    retro_bow = world.worlds[player].options.retro_bow
-    logic = world.worlds[player].options.glitches_required
+def get_pool_core(multiworld: MultiWorld, player: int):
+    shuffle = multiworld.worlds[player].options.entrance_shuffle.current_key
+    difficulty = multiworld.worlds[player].options.item_pool.current_key
+    timer = multiworld.worlds[player].options.timer.current_key
+    goal = multiworld.worlds[player].options.goal.current_key
+    mode = multiworld.worlds[player].options.mode.current_key
+    swordless = multiworld.worlds[player].options.swordless
+    retro_bow = multiworld.worlds[player].options.retro_bow
+    logic = multiworld.worlds[player].options.glitches_required
 
     pool = []
     placed_items = {}
@@ -607,13 +614,13 @@ def get_pool_core(world, player: int):
         placed_items[loc] = item
 
     # provide boots to major glitch dependent seeds
-    if logic.current_key in {'overworld_glitches', 'hybrid_major_glitches', 'no_logic'} and world.worlds[player].options.glitch_boots:
+    if logic.current_key in {'overworld_glitches', 'hybrid_major_glitches', 'no_logic'} and multiworld.worlds[player].options.glitch_boots:
         precollected_items.append('Pegasus Boots')
         pool.remove('Pegasus Boots')
         pool.append('Rupees (20)')
-    want_progressives = world.worlds[player].options.progressive.want_progressives
+    want_progressives = multiworld.worlds[player].options.progressive.want_progressives
 
-    if want_progressives(world.random):
+    if want_progressives(multiworld.random):
         pool.extend(diff.progressiveglove)
     else:
         pool.extend(diff.basicglove)
@@ -637,27 +644,27 @@ def get_pool_core(world, player: int):
     thisbottle = None
     for _ in range(diff.bottle_count):
         if not diff.same_bottle or not thisbottle:
-            thisbottle = world.random.choice(diff.bottles)
+            thisbottle = multiworld.random.choice(diff.bottles)
         pool.append(thisbottle)
 
-    if want_progressives(world.random):
+    if want_progressives(multiworld.random):
         pool.extend(diff.progressiveshield)
     else:
         pool.extend(diff.basicshield)
 
-    if want_progressives(world.random):
+    if want_progressives(multiworld.random):
         pool.extend(diff.progressivearmor)
     else:
         pool.extend(diff.basicarmor)
 
-    if want_progressives(world.random):
+    if want_progressives(multiworld.random):
         pool.extend(diff.progressivemagic)
     else:
         pool.extend(diff.basicmagic)
 
-    if want_progressives(world.random):
+    if want_progressives(multiworld.random):
         pool.extend(diff.progressivebow)
-        world.worlds[player].has_progressive_bows = True
+        multiworld.worlds[player].has_progressive_bows = True
     elif (swordless or logic == 'no_glitches'):
         swordless_bows = ['Bow', 'Silver Bow']
         if difficulty == "easy":
@@ -669,7 +676,7 @@ def get_pool_core(world, player: int):
     if swordless:
         pool.extend(diff.swordless)
     else:
-        progressive_swords = want_progressives(world.random)
+        progressive_swords = want_progressives(multiworld.random)
         pool.extend(diff.progressivesword if progressive_swords else diff.basicsword)
 
     extraitems = total_items_to_place - len(pool) - len(placed_items)
@@ -685,29 +692,29 @@ def get_pool_core(world, player: int):
     additional_pieces_to_place = 0
     if 'triforce_hunt' in goal:
 
-        if world.worlds[player].options.triforce_pieces_mode.value == TriforcePiecesMode.option_extra:
-            treasure_hunt_total = (world.worlds[player].options.triforce_pieces_required.value
-                                   + world.worlds[player].options.triforce_pieces_extra.value)
-        elif world.worlds[player].options.triforce_pieces_mode.value == TriforcePiecesMode.option_percentage:
-            percentage = float(world.worlds[player].options.triforce_pieces_percentage.value) / 100
-            treasure_hunt_total = int(round(world.worlds[player].options.triforce_pieces_required.value * percentage, 0))
+        if multiworld.worlds[player].options.triforce_pieces_mode.value == TriforcePiecesMode.option_extra:
+            treasure_hunt_total = (multiworld.worlds[player].options.triforce_pieces_required.value
+                                   + multiworld.worlds[player].options.triforce_pieces_extra.value)
+        elif multiworld.worlds[player].options.triforce_pieces_mode.value == TriforcePiecesMode.option_percentage:
+            percentage = float(multiworld.worlds[player].options.triforce_pieces_percentage.value) / 100
+            treasure_hunt_total = int(round(multiworld.worlds[player].options.triforce_pieces_required.value * percentage, 0))
         else:  # available
-            treasure_hunt_total = world.worlds[player].options.triforce_pieces_available.value
+            treasure_hunt_total = multiworld.worlds[player].options.triforce_pieces_available.value
 
-        triforce_pieces = min(90, max(treasure_hunt_total, world.worlds[player].options.triforce_pieces_required.value))
+        triforce_pieces = min(90, max(treasure_hunt_total, multiworld.worlds[player].options.triforce_pieces_required.value))
 
         pieces_in_core = min(extraitems, triforce_pieces)
         additional_pieces_to_place = triforce_pieces - pieces_in_core
         pool.extend(["Triforce Piece"] * pieces_in_core)
         extraitems -= pieces_in_core
-        treasure_hunt_required = world.worlds[player].options.triforce_pieces_required.value
+        treasure_hunt_required = multiworld.worlds[player].options.triforce_pieces_required.value
 
     for extra in diff.extras:
         if extraitems >= len(extra):
             pool.extend(extra)
             extraitems -= len(extra)
         elif extraitems > 0:
-            pool.extend(world.random.sample(extra, extraitems))
+            pool.extend(multiworld.random.sample(extra, extraitems))
             break
         else:
             break
@@ -726,25 +733,25 @@ def get_pool_core(world, player: int):
             else:
                 break
 
-    if world.worlds[player].options.small_key_shuffle == small_key_shuffle.option_universal:
+    if multiworld.worlds[player].options.small_key_shuffle == small_key_shuffle.option_universal:
         pool.extend(diff.universal_keys)
         if mode == 'standard':
-            if world.worlds[player].options.key_drop_shuffle:
+            if multiworld.worlds[player].options.key_drop_shuffle:
                 key_locations = ['Secret Passage', 'Hyrule Castle - Map Guard Key Drop']
-                key_location = world.random.choice(key_locations)
+                key_location = multiworld.random.choice(key_locations)
                 key_locations.remove(key_location)
                 place_item(key_location, "Small Key (Universal)")
                 key_locations += ['Hyrule Castle - Boomerang Guard Key Drop', 'Hyrule Castle - Boomerang Chest',
                                   'Hyrule Castle - Map Chest']
-                key_location = world.random.choice(key_locations)
+                key_location = multiworld.random.choice(key_locations)
                 key_locations.remove(key_location)
                 place_item(key_location, "Small Key (Universal)")
                 key_locations += ['Hyrule Castle - Big Key Drop', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross']
-                key_location = world.random.choice(key_locations)
+                key_location = multiworld.random.choice(key_locations)
                 key_locations.remove(key_location)
                 place_item(key_location, "Small Key (Universal)")
                 key_locations += ['Sewers - Key Rat Key Drop']
-                key_location = world.random.choice(key_locations)
+                key_location = multiworld.random.choice(key_locations)
                 place_item(key_location, "Small Key (Universal)")
                 pool = pool[:-3]
 
diff --git a/worlds/alttp/Items.py b/worlds/alttp/Items.py
index cbe6e99642..1c173c619e 100644
--- a/worlds/alttp/Items.py
+++ b/worlds/alttp/Items.py
@@ -1,24 +1,24 @@
 import typing
 
-from BaseClasses import ItemClassification as IC
+from BaseClasses import MultiWorld, ItemClassification as IC
 from worlds.AutoWorld import World
 
 
-def GetBeemizerItem(world, player: int, item):
+def GetBeemizerItem(multiworld: MultiWorld, player: int, item):
     item_name = item if isinstance(item, str) else item.name
 
-    if item_name not in trap_replaceable or player in world.groups:
+    if item_name not in trap_replaceable or player in multiworld.groups:
         return item
 
     # first roll - replaceable item should be replaced, within beemizer_total_chance
-    if not world.worlds[player].options.beemizer_total_chance or world.random.random() > (world.worlds[player].options.beemizer_total_chance / 100):
+    if not multiworld.worlds[player].options.beemizer_total_chance or multiworld.random.random() > (multiworld.worlds[player].options.beemizer_total_chance / 100):
         return item
 
     # second roll - bee replacement should be trap, within beemizer_trap_chance
-    if not world.worlds[player].options.beemizer_trap_chance or world.random.random() > (world.worlds[player].options.beemizer_trap_chance / 100):
-        return "Bee" if isinstance(item, str) else world.create_item("Bee", player)
+    if not multiworld.worlds[player].options.beemizer_trap_chance or multiworld.random.random() > (multiworld.worlds[player].options.beemizer_trap_chance / 100):
+        return "Bee" if isinstance(item, str) else multiworld.create_item("Bee", player)
     else:
-        return "Bee Trap" if isinstance(item, str) else world.create_item("Bee Trap", player)
+        return "Bee Trap" if isinstance(item, str) else multiworld.create_item("Bee Trap", player)
 
 
 def item_factory(items: typing.Union[str, typing.Iterable[str]], world: World):
diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py
index 519241d7f4..53bdbd6cba 100644
--- a/worlds/alttp/Options.py
+++ b/worlds/alttp/Options.py
@@ -154,13 +154,13 @@ class OpenPyramid(Choice):
     alias_true = option_open
     alias_false = option_closed
 
-    def to_bool(self, world: MultiWorld, player: int) -> bool:
+    def to_bool(self, multiworld: MultiWorld, player: int) -> bool:
         if self.value == self.option_goal:
-            return world.worlds[player].options.goal.current_key in {'crystals', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt', 'ganon_pedestal'}
+            return multiworld.worlds[player].options.goal.current_key in {'crystals', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt', 'ganon_pedestal'}
         elif self.value == self.option_auto:
-            return world.worlds[player].options.goal.current_key in {'crystals', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt', 'ganon_pedestal'} \
-            and (world.worlds[player].options.entrance_shuffle.current_key in {'vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed'} or not
-                 world.shuffle_ganon)
+            return multiworld.worlds[player].options.goal.current_key in {'crystals', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt', 'ganon_pedestal'} \
+            and (multiworld.worlds[player].options.entrance_shuffle.current_key in {'vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed'} or not
+                 multiworld.shuffle_ganon)
         elif self.value == self.option_open:
             return True
         else:
diff --git a/worlds/alttp/OverworldGlitchRules.py b/worlds/alttp/OverworldGlitchRules.py
index aeff9cb88e..a243569cca 100644
--- a/worlds/alttp/OverworldGlitchRules.py
+++ b/worlds/alttp/OverworldGlitchRules.py
@@ -2,6 +2,7 @@
 Helper functions to deliver entrance/exit/region sets to OWG rules.
 """
 
+from BaseClasses import MultiWorld
 from .StateHelpers import can_lift_heavy_rocks, can_boots_clip_lw, can_boots_clip_dw, can_get_glitched_speed_dw
 
 
@@ -200,7 +201,7 @@ def get_mirror_offset_spots_dw():
     yield ('Dark Death Mountain Offset Mirror', 'Dark Death Mountain (West Bottom)', 'East Dark World')
 
 
-def get_mirror_offset_spots_lw(player):
+def get_mirror_offset_spots_lw(player: int):
     """
     Mirror shenanigans placing a mirror portal with a broken camera
     """
@@ -218,54 +219,54 @@ def get_invalid_bunny_revival_dungeons():
     yield 'Sanctuary'
 
 
-def overworld_glitch_connections(world, player):
+def overworld_glitch_connections(multiworld: MultiWorld, player: int):
     # Boots-accessible locations.
-    create_owg_connections(player, world, get_boots_clip_exits_lw(world.worlds[player].options.mode == 'inverted'))
-    create_owg_connections(player, world, get_boots_clip_exits_dw(world.worlds[player].options.mode == 'inverted', player))
+    create_owg_connections(player, multiworld, get_boots_clip_exits_lw(multiworld.worlds[player].options.mode == 'inverted'))
+    create_owg_connections(player, multiworld, get_boots_clip_exits_dw(multiworld.worlds[player].options.mode == 'inverted', player))
 
     # Glitched speed drops.
-    create_owg_connections(player, world, get_glitched_speed_drops_dw(world.worlds[player].options.mode == 'inverted'))
+    create_owg_connections(player, multiworld, get_glitched_speed_drops_dw(multiworld.worlds[player].options.mode == 'inverted'))
 
     # Mirror clip spots.
-    if world.worlds[player].options.mode != 'inverted':
-        create_owg_connections(player, world, get_mirror_clip_spots_dw())
-        create_owg_connections(player, world, get_mirror_offset_spots_dw())
+    if multiworld.worlds[player].options.mode != 'inverted':
+        create_owg_connections(player, multiworld, get_mirror_clip_spots_dw())
+        create_owg_connections(player, multiworld, get_mirror_offset_spots_dw())
     else:
-        create_owg_connections(player, world, get_mirror_offset_spots_lw(player))
+        create_owg_connections(player, multiworld, get_mirror_offset_spots_lw(player))
 
 
-def overworld_glitches_rules(world, player):
+def overworld_glitches_rules(multiworld: MultiWorld, player: int):
 
     # Boots-accessible locations.
-    set_owg_connection_rules(player, world, get_boots_clip_exits_lw(world.worlds[player].options.mode == 'inverted'), lambda state: can_boots_clip_lw(state, player))
-    set_owg_connection_rules(player, world, get_boots_clip_exits_dw(world.worlds[player].options.mode == 'inverted', player), lambda state: can_boots_clip_dw(state, player))
+    set_owg_connection_rules(player, multiworld, get_boots_clip_exits_lw(multiworld.worlds[player].options.mode == 'inverted'), lambda state: can_boots_clip_lw(state, player))
+    set_owg_connection_rules(player, multiworld, get_boots_clip_exits_dw(multiworld.worlds[player].options.mode == 'inverted', player), lambda state: can_boots_clip_dw(state, player))
 
     # Glitched speed drops.
-    set_owg_connection_rules(player, world, get_glitched_speed_drops_dw(world.worlds[player].options.mode == 'inverted'), lambda state: can_get_glitched_speed_dw(state, player))
+    set_owg_connection_rules(player, multiworld, get_glitched_speed_drops_dw(multiworld.worlds[player].options.mode == 'inverted'), lambda state: can_get_glitched_speed_dw(state, player))
     # Dark Death Mountain Ledge Clip Spot also accessible with mirror.
-    if world.worlds[player].options.mode != 'inverted':
-        add_alternate_rule(world.get_entrance('Dark Death Mountain Ledge Clip Spot', player), lambda state: state.has('Magic Mirror', player))
+    if multiworld.worlds[player].options.mode != 'inverted':
+        add_alternate_rule(multiworld.get_entrance('Dark Death Mountain Ledge Clip Spot', player), lambda state: state.has('Magic Mirror', player))
 
     # Mirror clip spots.
-    if world.worlds[player].options.mode != 'inverted':
-        set_owg_connection_rules(player, world, get_mirror_clip_spots_dw(), lambda state: state.has('Magic Mirror', player))
-        set_owg_connection_rules(player, world, get_mirror_offset_spots_dw(), lambda state: state.has('Magic Mirror', player) and can_boots_clip_lw(state, player))
+    if multiworld.worlds[player].options.mode != 'inverted':
+        set_owg_connection_rules(player, multiworld, get_mirror_clip_spots_dw(), lambda state: state.has('Magic Mirror', player))
+        set_owg_connection_rules(player, multiworld, get_mirror_offset_spots_dw(), lambda state: state.has('Magic Mirror', player) and can_boots_clip_lw(state, player))
     else:
-        set_owg_connection_rules(player, world, get_mirror_offset_spots_lw(player), lambda state: state.has('Magic Mirror', player) and can_boots_clip_dw(state, player))
+        set_owg_connection_rules(player, multiworld, get_mirror_offset_spots_lw(player), lambda state: state.has('Magic Mirror', player) and can_boots_clip_dw(state, player))
 
     # Regions that require the boots and some other stuff.
-    if world.worlds[player].options.mode != 'inverted':
-        world.get_entrance('Turtle Rock Teleporter', player).access_rule = lambda state: (can_boots_clip_lw(state, player) or can_lift_heavy_rocks(state, player)) and state.has('Hammer', player)
-        add_alternate_rule(world.get_entrance('Waterfall of Wishing', player), lambda state: state.has('Moon Pearl', player) or state.has('Pegasus Boots', player))
+    if multiworld.worlds[player].options.mode != 'inverted':
+        multiworld.get_entrance('Turtle Rock Teleporter', player).access_rule = lambda state: (can_boots_clip_lw(state, player) or can_lift_heavy_rocks(state, player)) and state.has('Hammer', player)
+        add_alternate_rule(multiworld.get_entrance('Waterfall of Wishing', player), lambda state: state.has('Moon Pearl', player) or state.has('Pegasus Boots', player))
     else:
-        add_alternate_rule(world.get_entrance('Waterfall of Wishing Cave', player), lambda state: state.has('Moon Pearl', player))
+        add_alternate_rule(multiworld.get_entrance('Waterfall of Wishing Cave', player), lambda state: state.has('Moon Pearl', player))
 
-    world.get_entrance('Dark Desert Teleporter', player).access_rule = lambda state: (state.has('Flute', player) or state.has('Pegasus Boots', player)) and can_lift_heavy_rocks(state, player)
-    add_alternate_rule(world.get_entrance('Catfish Exit Rock', player), lambda state: can_boots_clip_dw(state, player))
-    add_alternate_rule(world.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: can_boots_clip_dw(state, player))
+    multiworld.get_entrance('Dark Desert Teleporter', player).access_rule = lambda state: (state.has('Flute', player) or state.has('Pegasus Boots', player)) and can_lift_heavy_rocks(state, player)
+    add_alternate_rule(multiworld.get_entrance('Catfish Exit Rock', player), lambda state: can_boots_clip_dw(state, player))
+    add_alternate_rule(multiworld.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: can_boots_clip_dw(state, player))
 
     # Zora's Ledge via waterwalk setup.
-    add_alternate_rule(world.get_location('Zora\'s Ledge', player), lambda state: state.has('Pegasus Boots', player))
+    add_alternate_rule(multiworld.get_location('Zora\'s Ledge', player), lambda state: state.has('Pegasus Boots', player))
 
 
 def add_alternate_rule(entrance, rule):
@@ -273,22 +274,22 @@ def add_alternate_rule(entrance, rule):
     entrance.access_rule = lambda state: old_rule(state) or rule(state)
 
 
-def create_no_logic_connections(player, world, connections):
+def create_no_logic_connections(player: int, multiworld: MultiWorld, connections):
     for entrance, parent_region, target_region, *rule_override in connections:
-        parent = world.get_region(parent_region, player)
-        target = world.get_region(target_region, player)
+        parent = multiworld.get_region(parent_region, player)
+        target = multiworld.get_region(target_region, player)
         parent.connect(target, entrance)
 
 
-def create_owg_connections(player, world, connections):
+def create_owg_connections(player: int, multiworld: MultiWorld, connections):
     for entrance, parent_region, target_region, *rule_override in connections:
-        parent = world.get_region(parent_region, player)
-        target = world.get_region(target_region, player)
+        parent = multiworld.get_region(parent_region, player)
+        target = multiworld.get_region(target_region, player)
         parent.connect(target, entrance)
 
 
-def set_owg_connection_rules(player, world, connections, default_rule):
+def set_owg_connection_rules(player: int, multiworld: MultiWorld, connections, default_rule):
     for entrance, _, _, *rule_override in connections:
-        connection = world.get_entrance(entrance, player)
+        connection = multiworld.get_entrance(entrance, player)
         rule = rule_override[0] if len(rule_override) > 0 else default_rule
         connection.access_rule = rule
diff --git a/worlds/alttp/Regions.py b/worlds/alttp/Regions.py
index c2af795637..d3789f91ba 100644
--- a/worlds/alttp/Regions.py
+++ b/worlds/alttp/Regions.py
@@ -9,11 +9,11 @@ def is_main_entrance(entrance: LTTPEntrance) -> bool:
     return entrance.parent_region.type in {LTTPRegionType.DarkWorld, LTTPRegionType.LightWorld} if entrance.parent_region.type else True
 
 
-def create_regions(world, player):
+def create_regions(multiworld: MultiWorld, player: int):
 
-    world.regions += [
-        create_lw_region(world, player, 'Menu', None, ['Links House S&Q', 'Sanctuary S&Q', 'Old Man S&Q']),
-        create_lw_region(world, player, 'Light World', ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure',
+    multiworld.regions += [
+        create_lw_region(multiworld, player, 'Menu', None, ['Links House S&Q', 'Sanctuary S&Q', 'Old Man S&Q']),
+        create_lw_region(multiworld, player, 'Light World', ['Mushroom', 'Bottle Merchant', 'Flute Spot', 'Sunken Treasure',
                                                  'Purple Chest', 'Flute Activation Spot'],
                          ["Blinds Hideout", "Hyrule Castle Secret Entrance Drop", 'Zoras River', 'Kings Grave Outer Rocks', 'Dam',
                           'Links House', 'Tavern North', 'Chicken House', 'Aginahs Cave', 'Sahasrahlas Hut', 'Kakariko Well Drop', 'Kakariko Well Cave',
@@ -24,122 +24,122 @@ def create_regions(world, player):
                           'Elder House (East)', 'Elder House (West)', 'North Fairy Cave', 'North Fairy Cave Drop', 'Lost Woods Gamble', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Tavern (Front)',
                           'Bush Covered House', 'Light World Bomb Hut', 'Kakariko Shop', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave', 'Cave Shop (Lake Hylia)', 'Waterfall of Wishing', 'Hyrule Castle Main Gate',
                           'Bonk Fairy (Light)', '50 Rupee Cave', 'Fortune Teller (Light)', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Lumberjack House', 'Lake Hylia Fortune Teller', 'Kakariko Gamble Game', 'Top of Pyramid']),
-        create_lw_region(world, player, 'Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop']),
-        create_lw_region(world, player, 'Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Teleporter']),
-        create_cave_region(world, player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
+        create_lw_region(multiworld, player, 'Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop']),
+        create_lw_region(multiworld, player, 'Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Teleporter']),
+        create_cave_region(multiworld, player, 'Blinds Hideout', 'a bounty of five items', ["Blind\'s Hideout - Top",
                                                                         "Blind\'s Hideout - Left",
                                                                         "Blind\'s Hideout - Right",
                                                                         "Blind\'s Hideout - Far Left",
                                                                         "Blind\'s Hideout - Far Right"]),
-        create_cave_region(world, player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit', ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
-        create_lw_region(world, player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
-        create_cave_region(world, player, 'Waterfall of Wishing', 'a cave with two chests', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
-        create_lw_region(world, player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
-        create_cave_region(world, player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
-        create_cave_region(world, player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
-        create_cave_region(world, player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
-        create_cave_region(world, player, 'Links House', 'your house', ['Link\'s House'], ['Links House Exit']),
-        create_cave_region(world, player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
-        create_cave_region(world, player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
-        create_cave_region(world, player, 'Elder House', 'a connector', None, ['Elder House Exit (East)', 'Elder House Exit (West)']),
-        create_cave_region(world, player, 'Snitch Lady (East)', 'a boring house'),
-        create_cave_region(world, player, 'Snitch Lady (West)', 'a boring house'),
-        create_cave_region(world, player, 'Bush Covered House', 'the grass man'),
-        create_cave_region(world, player, 'Tavern (Front)', 'the tavern'),
-        create_cave_region(world, player, 'Light World Bomb Hut', 'a restock room'),
-        create_cave_region(world, player, 'Kakariko Shop', 'a common shop'),
-        create_cave_region(world, player, 'Fortune Teller (Light)', 'a fortune teller'),
-        create_cave_region(world, player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
-        create_cave_region(world, player, 'Lumberjack House', 'a boring house'),
-        create_cave_region(world, player, 'Bonk Fairy (Light)', 'a fairy fountain'),
-        create_cave_region(world, player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
-        create_cave_region(world, player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Swamp Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
-        create_cave_region(world, player, 'Chicken House', 'a house with a chest', ['Chicken House']),
-        create_cave_region(world, player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
-        create_cave_region(world, player, 'Sahasrahlas Hut', 'Sahasrahla', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
-        create_cave_region(world, player, 'Kakariko Well (top)', 'a drop\'s exit', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
+        create_cave_region(multiworld, player, 'Hyrule Castle Secret Entrance', 'a drop\'s exit', ['Link\'s Uncle', 'Secret Passage'], ['Hyrule Castle Secret Entrance Exit']),
+        create_lw_region(multiworld, player, 'Zoras River', ['King Zora', 'Zora\'s Ledge']),
+        create_cave_region(multiworld, player, 'Waterfall of Wishing', 'a cave with two chests', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
+        create_lw_region(multiworld, player, 'Kings Grave Area', None, ['Kings Grave', 'Kings Grave Inner Rocks']),
+        create_cave_region(multiworld, player, 'Kings Grave', 'a cave with a chest', ['King\'s Tomb']),
+        create_cave_region(multiworld, player, 'North Fairy Cave', 'a drop\'s exit', None, ['North Fairy Cave Exit']),
+        create_cave_region(multiworld, player, 'Dam', 'the dam', ['Floodgate', 'Floodgate Chest']),
+        create_cave_region(multiworld, player, 'Links House', 'your house', ['Link\'s House'], ['Links House Exit']),
+        create_cave_region(multiworld, player, 'Chris Houlihan Room', 'I AM ERROR', None, ['Chris Houlihan Room Exit']),
+        create_cave_region(multiworld, player, 'Tavern', 'the tavern', ['Kakariko Tavern']),
+        create_cave_region(multiworld, player, 'Elder House', 'a connector', None, ['Elder House Exit (East)', 'Elder House Exit (West)']),
+        create_cave_region(multiworld, player, 'Snitch Lady (East)', 'a boring house'),
+        create_cave_region(multiworld, player, 'Snitch Lady (West)', 'a boring house'),
+        create_cave_region(multiworld, player, 'Bush Covered House', 'the grass man'),
+        create_cave_region(multiworld, player, 'Tavern (Front)', 'the tavern'),
+        create_cave_region(multiworld, player, 'Light World Bomb Hut', 'a restock room'),
+        create_cave_region(multiworld, player, 'Kakariko Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Fortune Teller (Light)', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Lake Hylia Fortune Teller', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Lumberjack House', 'a boring house'),
+        create_cave_region(multiworld, player, 'Bonk Fairy (Light)', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Bonk Fairy (Dark)', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Swamp Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Desert Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Dark Death Mountain Healer Fairy', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Chicken House', 'a house with a chest', ['Chicken House']),
+        create_cave_region(multiworld, player, 'Aginahs Cave', 'a cave with a chest', ['Aginah\'s Cave']),
+        create_cave_region(multiworld, player, 'Sahasrahlas Hut', 'Sahasrahla', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
+        create_cave_region(multiworld, player, 'Kakariko Well (top)', 'a drop\'s exit', ['Kakariko Well - Top', 'Kakariko Well - Left', 'Kakariko Well - Middle',
                                                                      'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
-        create_cave_region(world, player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
-        create_cave_region(world, player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
-        create_lw_region(world, player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
-        create_cave_region(world, player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
-        create_cave_region(world, player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
-        create_cave_region(world, player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
-        create_lw_region(world, player, 'Hobo Bridge', ['Hobo']),
-        create_cave_region(world, player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'], ['Lost Woods Hideout (top to bottom)']),
-        create_cave_region(world, player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None, ['Lost Woods Hideout Exit']),
-        create_cave_region(world, player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']),
-        create_cave_region(world, player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
-        create_lw_region(world, player, 'Cave 45 Ledge', None, ['Cave 45']),
-        create_cave_region(world, player, 'Cave 45', 'a cave with an item', ['Cave 45']),
-        create_lw_region(world, player, 'Graveyard Ledge', None, ['Graveyard Cave']),
-        create_cave_region(world, player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
-        create_cave_region(world, player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
-        create_cave_region(world, player, 'Long Fairy Cave', 'a fairy fountain'),
-        create_cave_region(world, player, 'Mini Moldorm Cave', 'a bounty of five items', ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
+        create_cave_region(multiworld, player, 'Kakariko Well (bottom)', 'a drop\'s exit', None, ['Kakariko Well Exit']),
+        create_cave_region(multiworld, player, 'Blacksmiths Hut', 'the smith', ['Blacksmith', 'Missing Smith']),
+        create_lw_region(multiworld, player, 'Bat Cave Drop Ledge', None, ['Bat Cave Drop']),
+        create_cave_region(multiworld, player, 'Bat Cave (right)', 'a drop\'s exit', ['Magic Bat'], ['Bat Cave Door']),
+        create_cave_region(multiworld, player, 'Bat Cave (left)', 'a drop\'s exit', None, ['Bat Cave Exit']),
+        create_cave_region(multiworld, player, 'Sick Kids House', 'the sick kid', ['Sick Kid']),
+        create_lw_region(multiworld, player, 'Hobo Bridge', ['Hobo']),
+        create_cave_region(multiworld, player, 'Lost Woods Hideout (top)', 'a drop\'s exit', ['Lost Woods Hideout'], ['Lost Woods Hideout (top to bottom)']),
+        create_cave_region(multiworld, player, 'Lost Woods Hideout (bottom)', 'a drop\'s exit', None, ['Lost Woods Hideout Exit']),
+        create_cave_region(multiworld, player, 'Lumberjack Tree (top)', 'a drop\'s exit', ['Lumberjack Tree'], ['Lumberjack Tree (top to bottom)']),
+        create_cave_region(multiworld, player, 'Lumberjack Tree (bottom)', 'a drop\'s exit', None, ['Lumberjack Tree Exit']),
+        create_lw_region(multiworld, player, 'Cave 45 Ledge', None, ['Cave 45']),
+        create_cave_region(multiworld, player, 'Cave 45', 'a cave with an item', ['Cave 45']),
+        create_lw_region(multiworld, player, 'Graveyard Ledge', None, ['Graveyard Cave']),
+        create_cave_region(multiworld, player, 'Graveyard Cave', 'a cave with an item', ['Graveyard Cave']),
+        create_cave_region(multiworld, player, 'Checkerboard Cave', 'a cave with an item', ['Checkerboard Cave']),
+        create_cave_region(multiworld, player, 'Long Fairy Cave', 'a fairy fountain'),
+        create_cave_region(multiworld, player, 'Mini Moldorm Cave', 'a bounty of five items', ['Mini Moldorm Cave - Far Left', 'Mini Moldorm Cave - Left', 'Mini Moldorm Cave - Right',
                                                                            'Mini Moldorm Cave - Far Right', 'Mini Moldorm Cave - Generous Guy']),
-        create_cave_region(world, player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
-        create_cave_region(world, player, 'Good Bee Cave', 'a cold bee'),
-        create_cave_region(world, player, '20 Rupee Cave', 'a cave with some cash'),
-        create_cave_region(world, player, 'Cave Shop (Lake Hylia)', 'a common shop'),
-        create_cave_region(world, player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
-        create_cave_region(world, player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
-        create_cave_region(world, player, 'Library', 'the library', ['Library']),
-        create_cave_region(world, player, 'Kakariko Gamble Game', 'a game of chance'),
-        create_cave_region(world, player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
-        create_lw_region(world, player, 'Lake Hylia Island', ['Lake Hylia Island']),
-        create_cave_region(world, player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade Shop']),
-        create_cave_region(world, player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
-        create_lw_region(world, player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)']),
-        create_cave_region(world, player, '50 Rupee Cave', 'a cave with some cash'),
-        create_lw_region(world, player, 'Desert Ledge', ['Desert Ledge'], ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)']),
-        create_lw_region(world, player, 'Desert Ledge (Northeast)', None, ['Checkerboard Cave']),
-        create_lw_region(world, player, 'Desert Palace Stairs', None, ['Desert Palace Entrance (South)']),
-        create_lw_region(world, player, 'Desert Palace Lone Stairs', None, ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
-        create_lw_region(world, player, 'Desert Palace Entrance (North) Spot', None, ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks']),
-        create_dungeon_region(world, player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
+        create_cave_region(multiworld, player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']),
+        create_cave_region(multiworld, player, 'Good Bee Cave', 'a cold bee'),
+        create_cave_region(multiworld, player, '20 Rupee Cave', 'a cave with some cash'),
+        create_cave_region(multiworld, player, 'Cave Shop (Lake Hylia)', 'a common shop'),
+        create_cave_region(multiworld, player, 'Cave Shop (Dark Death Mountain)', 'a common shop'),
+        create_cave_region(multiworld, player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']),
+        create_cave_region(multiworld, player, 'Library', 'the library', ['Library']),
+        create_cave_region(multiworld, player, 'Kakariko Gamble Game', 'a game of chance'),
+        create_cave_region(multiworld, player, 'Potion Shop', 'the potion shop', ['Potion Shop']),
+        create_lw_region(multiworld, player, 'Lake Hylia Island', ['Lake Hylia Island']),
+        create_cave_region(multiworld, player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade Shop']),
+        create_cave_region(multiworld, player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
+        create_lw_region(multiworld, player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)']),
+        create_cave_region(multiworld, player, '50 Rupee Cave', 'a cave with some cash'),
+        create_lw_region(multiworld, player, 'Desert Ledge', ['Desert Ledge'], ['Desert Palace Entrance (North) Rocks', 'Desert Palace Entrance (West)']),
+        create_lw_region(multiworld, player, 'Desert Ledge (Northeast)', None, ['Checkerboard Cave']),
+        create_lw_region(multiworld, player, 'Desert Palace Stairs', None, ['Desert Palace Entrance (South)']),
+        create_lw_region(multiworld, player, 'Desert Palace Lone Stairs', None, ['Desert Palace Stairs Drop', 'Desert Palace Entrance (East)']),
+        create_lw_region(multiworld, player, 'Desert Palace Entrance (North) Spot', None, ['Desert Palace Entrance (North)', 'Desert Ledge Return Rocks']),
+        create_dungeon_region(multiworld, player, 'Desert Palace Main (Outer)', 'Desert Palace', ['Desert Palace - Big Chest', 'Desert Palace - Torch', 'Desert Palace - Map Chest'],
                               ['Desert Palace Pots (Outer)', 'Desert Palace Exit (West)', 'Desert Palace Exit (East)', 'Desert Palace East Wing']),
-        create_dungeon_region(world, player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
-        create_dungeon_region(world, player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
-        create_dungeon_region(world, player, 'Desert Palace North', 'Desert Palace', ['Desert Palace - Desert Tiles 1 Pot Key', 'Desert Palace - Beamos Hall Pot Key', 'Desert Palace - Desert Tiles 2 Pot Key',
+        create_dungeon_region(multiworld, player, 'Desert Palace Main (Inner)', 'Desert Palace', None, ['Desert Palace Exit (South)', 'Desert Palace Pots (Inner)']),
+        create_dungeon_region(multiworld, player, 'Desert Palace East', 'Desert Palace', ['Desert Palace - Compass Chest', 'Desert Palace - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Desert Palace North', 'Desert Palace', ['Desert Palace - Desert Tiles 1 Pot Key', 'Desert Palace - Beamos Hall Pot Key', 'Desert Palace - Desert Tiles 2 Pot Key',
                                                                                'Desert Palace - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
-        create_dungeon_region(world, player, 'Eastern Palace', 'Eastern Palace', ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest', 'Eastern Palace - Cannonball Chest',
+        create_dungeon_region(multiworld, player, 'Eastern Palace', 'Eastern Palace', ['Eastern Palace - Compass Chest', 'Eastern Palace - Big Chest', 'Eastern Palace - Cannonball Chest',
                                                                            'Eastern Palace - Dark Square Pot Key', 'Eastern Palace - Dark Eyegore Key Drop', 'Eastern Palace - Big Key Chest',
                                                                            'Eastern Palace - Map Chest', 'Eastern Palace - Boss', 'Eastern Palace - Prize'], ['Eastern Palace Exit']),
-        create_lw_region(world, player, 'Master Sword Meadow', ['Master Sword Pedestal']),
-        create_cave_region(world, player, 'Lost Woods Gamble', 'a game of chance'),
-        create_lw_region(world, player, 'Hyrule Castle Courtyard', None, ['Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Entrance (South)']),
-        create_lw_region(world, player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Agahnims Tower', 'Hyrule Castle Ledge Courtyard Drop']),
-        create_dungeon_region(world, player, 'Hyrule Castle', 'Hyrule Castle', ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest',
+        create_lw_region(multiworld, player, 'Master Sword Meadow', ['Master Sword Pedestal']),
+        create_cave_region(multiworld, player, 'Lost Woods Gamble', 'a game of chance'),
+        create_lw_region(multiworld, player, 'Hyrule Castle Courtyard', None, ['Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Entrance (South)']),
+        create_lw_region(multiworld, player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (West)', 'Agahnims Tower', 'Hyrule Castle Ledge Courtyard Drop']),
+        create_dungeon_region(multiworld, player, 'Hyrule Castle', 'Hyrule Castle', ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest',
                                                                          'Hyrule Castle - Map Guard Key Drop', 'Hyrule Castle - Boomerang Guard Key Drop', 'Hyrule Castle - Big Key Drop'],
                               ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)', 'Throne Room']),
-        create_dungeon_region(world, player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
-        create_dungeon_region(world, player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross', 'Sewers - Key Rat Key Drop'], ['Sewers Door']),
-        create_dungeon_region(world, player, 'Sewers', 'a drop\'s exit', None, ['Sanctuary Push Door', 'Sewers Back Door', 'Sewers Secret Room']),
-        create_dungeon_region(world, player, 'Sewers Secret Room', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+        create_dungeon_region(multiworld, player, 'Sewer Drop', 'a drop\'s exit', None, ['Sewer Drop']),  # This exists only to be referenced for access checks
+        create_dungeon_region(multiworld, player, 'Sewers (Dark)', 'a drop\'s exit', ['Sewers - Dark Cross', 'Sewers - Key Rat Key Drop'], ['Sewers Door']),
+        create_dungeon_region(multiworld, player, 'Sewers', 'a drop\'s exit', None, ['Sanctuary Push Door', 'Sewers Back Door', 'Sewers Secret Room']),
+        create_dungeon_region(multiworld, player, 'Sewers Secret Room', 'a drop\'s exit', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
                                          'Sewers - Secret Room - Right']),
-        create_dungeon_region(world, player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
-        create_dungeon_region(world, player, 'Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze',  'Castle Tower - Dark Archer Key Drop', 'Castle Tower - Circle of Pots Key Drop'], ['Agahnim 1', 'Agahnims Tower Exit']),
-        create_dungeon_region(world, player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
-        create_cave_region(world, player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
-        create_cave_region(world, player, 'Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
-        create_cave_region(world, player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
-        create_lw_region(world, player, 'Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Teleporter']),
-        create_cave_region(world, player, 'Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
-        create_lw_region(world, player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Bottom)', 'a connector', None, ['Spectacle Rock Cave Exit']),
-        create_cave_region(world, player, 'Spectacle Rock Cave (Peak)', 'a connector', None, ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
-        create_lw_region(world, player, 'East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'East Death Mountain Teleporter', 'Hookshot Fairy', 'Fairy Ascension Rocks', 'Spiral Cave (Bottom)']),
-        create_cave_region(world, player, 'Hookshot Fairy', 'fairies deep in a cave'),
-        create_cave_region(world, player, 'Paradox Cave Front', 'a connector', None, ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)', 'Light World Death Mountain Shop']),
-        create_cave_region(world, player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
+        create_dungeon_region(multiworld, player, 'Sanctuary', 'a drop\'s exit', ['Sanctuary'], ['Sanctuary Exit']),
+        create_dungeon_region(multiworld, player, 'Agahnims Tower', 'Castle Tower', ['Castle Tower - Room 03', 'Castle Tower - Dark Maze',  'Castle Tower - Dark Archer Key Drop', 'Castle Tower - Circle of Pots Key Drop'], ['Agahnim 1', 'Agahnims Tower Exit']),
+        create_dungeon_region(multiworld, player, 'Agahnim 1', 'Castle Tower', ['Agahnim 1'], None),
+        create_cave_region(multiworld, player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
+        create_cave_region(multiworld, player, 'Old Man House', 'a connector', None, ['Old Man House Exit (Bottom)', 'Old Man House Front to Back']),
+        create_cave_region(multiworld, player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
+        create_lw_region(multiworld, player, 'Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Teleporter']),
+        create_cave_region(multiworld, player, 'Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
+        create_lw_region(multiworld, player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)']),
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Bottom)', 'a connector', None, ['Spectacle Rock Cave Exit']),
+        create_cave_region(multiworld, player, 'Spectacle Rock Cave (Peak)', 'a connector', None, ['Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Exit (Peak)']),
+        create_lw_region(multiworld, player, 'East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'East Death Mountain Teleporter', 'Hookshot Fairy', 'Fairy Ascension Rocks', 'Spiral Cave (Bottom)']),
+        create_cave_region(multiworld, player, 'Hookshot Fairy', 'fairies deep in a cave'),
+        create_cave_region(multiworld, player, 'Paradox Cave Front', 'a connector', None, ['Paradox Cave Push Block Reverse', 'Paradox Cave Exit (Bottom)', 'Light World Death Mountain Shop']),
+        create_cave_region(multiworld, player, 'Paradox Cave Chest Area', 'a connector', ['Paradox Cave Lower - Far Left',
                                                                       'Paradox Cave Lower - Left',
                                                                       'Paradox Cave Lower - Right',
                                                                       'Paradox Cave Lower - Far Right',
@@ -147,267 +147,267 @@ def create_regions(world, player):
                                                                       'Paradox Cave Upper - Left',
                                                                       'Paradox Cave Upper - Right'],
                            ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']),
-        create_cave_region(world, player, 'Paradox Cave', 'a connector', None,
+        create_cave_region(multiworld, player, 'Paradox Cave', 'a connector', None,
                            ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
-        create_cave_region(world, player, 'Light World Death Mountain Shop', 'a common shop'),
-        create_lw_region(world, player, 'East Death Mountain (Top)', None,
+        create_cave_region(multiworld, player, 'Light World Death Mountain Shop', 'a common shop'),
+        create_lw_region(multiworld, player, 'East Death Mountain (Top)', None,
                          ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access',
                           'East Death Mountain Drop', 'Turtle Rock Teleporter', 'Fairy Ascension Ledge']),
-        create_lw_region(world, player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop']),
-        create_cave_region(world, player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'],
+        create_lw_region(multiworld, player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop']),
+        create_cave_region(multiworld, player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'],
                            ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']),
-        create_cave_region(world, player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
-        create_lw_region(world, player, 'Fairy Ascension Plateau', None,
+        create_cave_region(multiworld, player, 'Spiral Cave (Bottom)', 'a connector', None, ['Spiral Cave Exit']),
+        create_lw_region(multiworld, player, 'Fairy Ascension Plateau', None,
                          ['Fairy Ascension Drop', 'Fairy Ascension Cave (Bottom)']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Bottom)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Bottom)', 'a connector', None,
                            ['Fairy Ascension Cave Climb', 'Fairy Ascension Cave Exit (Bottom)']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Drop)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Drop)', 'a connector', None,
                            ['Fairy Ascension Cave Pots']),
-        create_cave_region(world, player, 'Fairy Ascension Cave (Top)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Fairy Ascension Cave (Top)', 'a connector', None,
                            ['Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Cave Drop']),
-        create_lw_region(world, player, 'Fairy Ascension Ledge', None,
+        create_lw_region(multiworld, player, 'Fairy Ascension Ledge', None,
                          ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)']),
-        create_lw_region(world, player, 'Death Mountain (Top)', ['Ether Tablet'],
+        create_lw_region(multiworld, player, 'Death Mountain (Top)', ['Ether Tablet'],
                          ['East Death Mountain (Top)', 'Tower of Hera', 'Death Mountain Drop']),
-        create_lw_region(world, player, 'Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
-        create_dungeon_region(world, player, 'Tower of Hera (Bottom)', 'Tower of Hera',
+        create_lw_region(multiworld, player, 'Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Bottom)', 'Tower of Hera',
                               ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'],
                               ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
-        create_dungeon_region(world, player, 'Tower of Hera (Basement)', 'Tower of Hera',
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Basement)', 'Tower of Hera',
                               ['Tower of Hera - Big Key Chest']),
-        create_dungeon_region(world, player, 'Tower of Hera (Top)', 'Tower of Hera',
+        create_dungeon_region(multiworld, player, 'Tower of Hera (Top)', 'Tower of Hera',
                               ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Boss',
                                'Tower of Hera - Prize']),
 
-        create_dw_region(world, player, 'East Dark World', ['Pyramid'],
+        create_dw_region(multiworld, player, 'East Dark World', ['Pyramid'],
                          ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness',
                           'Dark Lake Hylia Drop (East)',
                           'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint',
                           'East Dark World Hint', 'Pyramid Hole', 'Northeast Dark World Broken Bridge Pass', ]),
-        create_dw_region(world, player, 'Catfish', ['Catfish'], ['Catfish Exit Rock']),
-        create_dw_region(world, player, 'Northeast Dark World', None,
+        create_dw_region(multiworld, player, 'Catfish', ['Catfish'], ['Catfish Exit Rock']),
+        create_dw_region(multiworld, player, 'Northeast Dark World', None,
                          ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass',
                           'Catfish Entrance Rock', 'Dark Lake Hylia Teleporter']),
-        create_cave_region(world, player, 'Palace of Darkness Hint', 'a storyteller'),
-        create_cave_region(world, player, 'East Dark World Hint', 'a storyteller'),
-        create_dw_region(world, player, 'South Dark World', ['Stumpy', 'Digging Game'],
+        create_cave_region(multiworld, player, 'Palace of Darkness Hint', 'a storyteller'),
+        create_cave_region(multiworld, player, 'East Dark World Hint', 'a storyteller'),
+        create_dw_region(multiworld, player, 'South Dark World', ['Stumpy', 'Digging Game'],
                          ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock',
                           'Maze Race Mirror Spot',
                           'Cave 45 Mirror Spot', 'East Dark World Bridge', 'Big Bomb Shop', 'Archery Game',
                           'Bonk Fairy (Dark)', 'Dark Lake Hylia Shop',
                           'Bombos Tablet Mirror Spot']),
-        create_lw_region(world, player, 'Bombos Tablet Ledge', ['Bombos Tablet']),
-        create_cave_region(world, player, 'Big Bomb Shop', 'the bomb shop'),
-        create_cave_region(world, player, 'Archery Game', 'a game of skill'),
-        create_dw_region(world, player, 'Dark Lake Hylia', None,
+        create_lw_region(multiworld, player, 'Bombos Tablet Ledge', ['Bombos Tablet']),
+        create_cave_region(multiworld, player, 'Big Bomb Shop', 'the bomb shop'),
+        create_cave_region(multiworld, player, 'Archery Game', 'a game of skill'),
+        create_dw_region(multiworld, player, 'Dark Lake Hylia', None,
                          ['Lake Hylia Island Mirror Spot', 'East Dark World Pier', 'Dark Lake Hylia Ledge']),
-        create_dw_region(world, player, 'Dark Lake Hylia Central Island', None,
+        create_dw_region(multiworld, player, 'Dark Lake Hylia Central Island', None,
                          ['Ice Palace', 'Lake Hylia Central Island Mirror Spot']),
-        create_dw_region(world, player, 'Dark Lake Hylia Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Lake Hylia Ledge', None,
                          ['Dark Lake Hylia Ledge Drop', 'Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint',
                           'Dark Lake Hylia Ledge Spike Cave']),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
-        create_cave_region(world, player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
-        create_cave_region(world, player, 'Hype Cave', 'a bounty of five items',
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Hint', 'a storyteller'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Ledge Spike Cave', 'a spiky hint'),
+        create_cave_region(multiworld, player, 'Hype Cave', 'a bounty of five items',
                            ['Hype Cave - Top', 'Hype Cave - Middle Right', 'Hype Cave - Middle Left',
                             'Hype Cave - Bottom', 'Hype Cave - Generous Guy']),
-        create_dw_region(world, player, 'West Dark World', ['Frog'],
+        create_dw_region(multiworld, player, 'West Dark World', ['Frog'],
                          ['Village of Outcasts Drop', 'East Dark World River Pier', 'Brewery', 'C-Shaped House',
                           'Chest Game', 'Thieves Town', 'Graveyard Ledge Mirror Spot', 'Kings Grave Mirror Spot',
                           'Bumper Cave Entrance Rock',
                           'Skull Woods Forest', 'Village of Outcasts Pegs', 'Village of Outcasts Eastern Rocks',
                           'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)',
                           'Dark World Lumberjack Shop']),
-        create_dw_region(world, player, 'Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Village of Outcasts Shop']),
-        create_dw_region(world, player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'],
+        create_dw_region(multiworld, player, 'Dark Grassy Lawn', None, ['Grassy Lawn Pegs', 'Village of Outcasts Shop']),
+        create_dw_region(multiworld, player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'],
                          ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']),
-        create_dw_region(world, player, 'Bumper Cave Entrance', None,
+        create_dw_region(multiworld, player, 'Bumper Cave Entrance', None,
                          ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']),
-        create_cave_region(world, player, 'Fortune Teller (Dark)', 'a fortune teller'),
-        create_cave_region(world, player, 'Village of Outcasts Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark Lake Hylia Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Lumberjack Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Potion Shop', 'a common shop'),
-        create_cave_region(world, player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
-        create_cave_region(world, player, 'Pyramid Fairy', 'a cave with two chests',
+        create_cave_region(multiworld, player, 'Fortune Teller (Dark)', 'a fortune teller'),
+        create_cave_region(multiworld, player, 'Village of Outcasts Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark Lake Hylia Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Lumberjack Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Potion Shop', 'a common shop'),
+        create_cave_region(multiworld, player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']),
+        create_cave_region(multiworld, player, 'Pyramid Fairy', 'a cave with two chests',
                            ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
-        create_cave_region(world, player, 'Brewery', 'a house with a chest', ['Brewery']),
-        create_cave_region(world, player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
-        create_cave_region(world, player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
-        create_cave_region(world, player, 'Red Shield Shop', 'the rare shop'),
-        create_cave_region(world, player, 'Dark Sanctuary Hint', 'a storyteller'),
-        create_cave_region(world, player, 'Bumper Cave', 'a connector', None,
+        create_cave_region(multiworld, player, 'Brewery', 'a house with a chest', ['Brewery']),
+        create_cave_region(multiworld, player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']),
+        create_cave_region(multiworld, player, 'Chest Game', 'a game of 16 chests', ['Chest Game']),
+        create_cave_region(multiworld, player, 'Red Shield Shop', 'the rare shop'),
+        create_cave_region(multiworld, player, 'Dark Sanctuary Hint', 'a storyteller'),
+        create_cave_region(multiworld, player, 'Bumper Cave', 'a connector', None,
                            ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']),
-        create_dw_region(world, player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'],
+        create_dw_region(multiworld, player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'],
                          ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)', 'Bumper Cave Ledge Mirror Spot']),
-        create_dw_region(world, player, 'Skull Woods Forest', None,
+        create_dw_region(multiworld, player, 'Skull Woods Forest', None,
                          ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)',
                           'Skull Woods First Section Hole (North)',
                           'Skull Woods First Section Door', 'Skull Woods Second Section Door (East)']),
-        create_dw_region(world, player, 'Skull Woods Forest (West)', None,
+        create_dw_region(multiworld, player, 'Skull Woods Forest (West)', None,
                          ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)',
                           'Skull Woods Final Section']),
-        create_dw_region(world, player, 'Dark Desert', None,
+        create_dw_region(multiworld, player, 'Dark Desert', None,
                          ['Misery Mire', 'Mire Shed', 'Desert Ledge (Northeast) Mirror Spot',
                           'Desert Ledge Mirror Spot', 'Desert Palace Stairs Mirror Spot',
                           'Desert Palace Entrance (North) Mirror Spot', 'Dark Desert Hint', 'Dark Desert Fairy']),
-        create_cave_region(world, player, 'Mire Shed', 'a cave with two chests',
+        create_cave_region(multiworld, player, 'Mire Shed', 'a cave with two chests',
                            ['Mire Shed - Left', 'Mire Shed - Right']),
-        create_cave_region(world, player, 'Dark Desert Hint', 'a storyteller'),
-        create_dw_region(world, player, 'Dark Death Mountain (West Bottom)', None,
+        create_cave_region(multiworld, player, 'Dark Desert Hint', 'a storyteller'),
+        create_dw_region(multiworld, player, 'Dark Death Mountain (West Bottom)', None,
                          ['Spike Cave', 'Spectacle Rock Mirror Spot', 'Dark Death Mountain Fairy']),
-        create_dw_region(world, player, 'Dark Death Mountain (Top)', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain (Top)', None,
                          ['Dark Death Mountain Drop (East)', 'Dark Death Mountain Drop (West)', 'Ganons Tower',
                           'Superbunny Cave (Top)',
                           'Hookshot Cave', 'East Death Mountain (Top) Mirror Spot', 'Turtle Rock']),
-        create_dw_region(world, player, 'Dark Death Mountain Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain Ledge', None,
                          ['Dark Death Mountain Ledge (East)', 'Dark Death Mountain Ledge (West)',
                           'Mimic Cave Mirror Spot', 'Spiral Cave Mirror Spot']),
-        create_dw_region(world, player, 'Dark Death Mountain Isolated Ledge', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain Isolated Ledge', None,
                          ['Isolated Ledge Mirror Spot', 'Turtle Rock Isolated Ledge Entrance']),
-        create_dw_region(world, player, 'Dark Death Mountain (East Bottom)', None,
+        create_dw_region(multiworld, player, 'Dark Death Mountain (East Bottom)', None,
                          ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)',
                           'Fairy Ascension Mirror Spot']),
-        create_cave_region(world, player, 'Superbunny Cave (Top)', 'a connector',
+        create_cave_region(multiworld, player, 'Superbunny Cave (Top)', 'a connector',
                            ['Superbunny Cave - Top', 'Superbunny Cave - Bottom'], ['Superbunny Cave Exit (Top)']),
-        create_cave_region(world, player, 'Superbunny Cave (Bottom)', 'a connector', None,
+        create_cave_region(multiworld, player, 'Superbunny Cave (Bottom)', 'a connector', None,
                            ['Superbunny Cave Climb', 'Superbunny Cave Exit (Bottom)']),
-        create_cave_region(world, player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
-        create_cave_region(world, player, 'Hookshot Cave', 'a connector',
+        create_cave_region(multiworld, player, 'Spike Cave', 'Spike Cave', ['Spike Cave']),
+        create_cave_region(multiworld, player, 'Hookshot Cave', 'a connector',
                            ['Hookshot Cave - Top Right', 'Hookshot Cave - Top Left', 'Hookshot Cave - Bottom Right',
                             'Hookshot Cave - Bottom Left'],
                            ['Hookshot Cave Exit (South)', 'Hookshot Cave Bomb Wall (South)']),
-        create_cave_region(world, player, 'Hookshot Cave (Upper)', 'a connector', None, ['Hookshot Cave Exit (North)',
+        create_cave_region(multiworld, player, 'Hookshot Cave (Upper)', 'a connector', None, ['Hookshot Cave Exit (North)',
                                                                                          'Hookshot Cave Bomb Wall (North)']),
-        create_dw_region(world, player, 'Death Mountain Floating Island (Dark World)', None,
+        create_dw_region(multiworld, player, 'Death Mountain Floating Island (Dark World)', None,
                          ['Floating Island Drop', 'Hookshot Cave Back Entrance', 'Floating Island Mirror Spot']),
-        create_lw_region(world, player, 'Death Mountain Floating Island (Light World)', ['Floating Island']),
-        create_dw_region(world, player, 'Turtle Rock (Top)', None, ['Turtle Rock Drop']),
-        create_lw_region(world, player, 'Mimic Cave Ledge', None, ['Mimic Cave']),
-        create_cave_region(world, player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
+        create_lw_region(multiworld, player, 'Death Mountain Floating Island (Light World)', ['Floating Island']),
+        create_dw_region(multiworld, player, 'Turtle Rock (Top)', None, ['Turtle Rock Drop']),
+        create_lw_region(multiworld, player, 'Mimic Cave Ledge', None, ['Mimic Cave']),
+        create_cave_region(multiworld, player, 'Mimic Cave', 'Mimic Cave', ['Mimic Cave']),
 
-        create_dungeon_region(world, player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
-        create_dungeon_region(world, player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
-        create_dungeon_region(world, player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest', 'Swamp Palace - Pot Row Pot Key',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Entrance)', 'Swamp Palace', None, ['Swamp Palace Moat', 'Swamp Palace Exit']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (First Room)', 'Swamp Palace', ['Swamp Palace - Entrance'], ['Swamp Palace Small Key Door']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Starting Area)', 'Swamp Palace', ['Swamp Palace - Map Chest', 'Swamp Palace - Pot Row Pot Key',
                                                                                        'Swamp Palace - Trench 1 Pot Key'], ['Swamp Palace (Center)']),
-        create_dungeon_region(world, player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest', 'Swamp Palace - Hookshot Pot Key',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (Center)', 'Swamp Palace', ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest', 'Swamp Palace - Hookshot Pot Key',
                                                                                 'Swamp Palace - Trench 2 Pot Key'], ['Swamp Palace (North)', 'Swamp Palace (West)']),
-        create_dungeon_region(world, player, 'Swamp Palace (West)', 'Swamp Palace', ['Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest']),
-        create_dungeon_region(world, player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
+        create_dungeon_region(multiworld, player, 'Swamp Palace (West)', 'Swamp Palace', ['Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest']),
+        create_dungeon_region(multiworld, player, 'Swamp Palace (North)', 'Swamp Palace', ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
                                                                                'Swamp Palace - Waterway Pot Key', 'Swamp Palace - Waterfall Room',
                                                                                'Swamp Palace - Boss', 'Swamp Palace - Prize']),
-        create_dungeon_region(world, player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
+        create_dungeon_region(multiworld, player, 'Thieves Town (Entrance)', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest',
                                                                             'Thieves\' Town - Map Chest',
                                                                             'Thieves\' Town - Compass Chest',
                                                                             'Thieves\' Town - Ambush Chest'], ['Thieves Town Big Key Door', 'Thieves Town Exit']),
-        create_dungeon_region(world, player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
+        create_dungeon_region(multiworld, player, 'Thieves Town (Deep)', 'Thieves\' Town', ['Thieves\' Town - Attic',
                                                                         'Thieves\' Town - Big Chest',
                                                                         'Thieves\' Town - Hallway Pot Key',
                                                                         'Thieves\' Town - Spike Switch Pot Key',
                                                                         'Thieves\' Town - Blind\'s Cell'], ['Blind Fight']),
-        create_dungeon_region(world, player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
-        create_dungeon_region(world, player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
-        create_dungeon_region(world, player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
-        create_dungeon_region(world, player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
-        create_dungeon_region(world, player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest', 'Skull Woods - West Lobby Pot Key'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
-        create_dungeon_region(world, player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
-        create_dungeon_region(world, player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Spike Corner Key Drop', 'Skull Woods - Boss', 'Skull Woods - Prize']),
-        create_dungeon_region(world, player, 'Ice Palace (Entrance)', 'Ice Palace', ['Ice Palace - Jelly Key Drop', 'Ice Palace - Compass Chest'], ['Ice Palace (Second Section)', 'Ice Palace Exit']),
-        create_dungeon_region(world, player, 'Ice Palace (Second Section)', 'Ice Palace', ['Ice Palace - Conveyor Key Drop'], ['Ice Palace (Main)']),
-        create_dungeon_region(world, player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Freezor Chest',
+        create_dungeon_region(multiworld, player, 'Blind Fight', 'Thieves\' Town', ['Thieves\' Town - Boss', 'Thieves\' Town - Prize']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section', 'Skull Woods', ['Skull Woods - Map Chest'], ['Skull Woods First Section Exit', 'Skull Woods First Section Bomb Jump', 'Skull Woods First Section South Door', 'Skull Woods First Section West Door']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Right)', 'Skull Woods', ['Skull Woods - Pinball Room'], ['Skull Woods First Section (Right) North Door']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Left)', 'Skull Woods', ['Skull Woods - Compass Chest', 'Skull Woods - Pot Prison'], ['Skull Woods First Section (Left) Door to Exit', 'Skull Woods First Section (Left) Door to Right']),
+        create_dungeon_region(multiworld, player, 'Skull Woods First Section (Top)', 'Skull Woods', ['Skull Woods - Big Chest'], ['Skull Woods First Section (Top) One-Way Path']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Second Section (Drop)', 'Skull Woods', None, ['Skull Woods Second Section (Drop)']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Second Section', 'Skull Woods', ['Skull Woods - Big Key Chest', 'Skull Woods - West Lobby Pot Key'], ['Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Final Section (Entrance)', 'Skull Woods', ['Skull Woods - Bridge Room'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
+        create_dungeon_region(multiworld, player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Spike Corner Key Drop', 'Skull Woods - Boss', 'Skull Woods - Prize']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Entrance)', 'Ice Palace', ['Ice Palace - Jelly Key Drop', 'Ice Palace - Compass Chest'], ['Ice Palace (Second Section)', 'Ice Palace Exit']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Second Section)', 'Ice Palace', ['Ice Palace - Conveyor Key Drop'], ['Ice Palace (Main)']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Main)', 'Ice Palace', ['Ice Palace - Freezor Chest',
                                                                           'Ice Palace - Many Pots Pot Key',
                                                                   'Ice Palace - Big Chest', 'Ice Palace - Iced T Room'], ['Ice Palace (East)', 'Ice Palace (Kholdstare)']),
-        create_dungeon_region(world, player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
-        create_dungeon_region(world, player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest', 'Ice Palace - Hammer Block Key Drop']),
-        create_dungeon_region(world, player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
-        create_dungeon_region(world, player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
-        create_dungeon_region(world, player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
+        create_dungeon_region(multiworld, player, 'Ice Palace (East)', 'Ice Palace', ['Ice Palace - Spike Room'], ['Ice Palace (East Top)']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (East Top)', 'Ice Palace', ['Ice Palace - Big Key Chest', 'Ice Palace - Map Chest', 'Ice Palace - Hammer Block Key Drop']),
+        create_dungeon_region(multiworld, player, 'Ice Palace (Kholdstare)', 'Ice Palace', ['Ice Palace - Boss', 'Ice Palace - Prize']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Entrance)', 'Misery Mire', None, ['Misery Mire Entrance Gap', 'Misery Mire Exit']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Main)', 'Misery Mire', ['Misery Mire - Big Chest', 'Misery Mire - Map Chest', 'Misery Mire - Main Lobby',
                                                                     'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest',
                                                                     'Misery Mire - Spikes Pot Key', 'Misery Mire - Fishbone Pot Key',
                                                                     'Misery Mire - Conveyor Crystal Key Drop'], ['Misery Mire (West)', 'Misery Mire Big Key Door']),
-        create_dungeon_region(world, player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
-        create_dungeon_region(world, player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
-        create_dungeon_region(world, player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
-        create_dungeon_region(world, player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
-        create_dungeon_region(world, player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
+        create_dungeon_region(multiworld, player, 'Misery Mire (West)', 'Misery Mire', ['Misery Mire - Compass Chest', 'Misery Mire - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Final Area)', 'Misery Mire', None, ['Misery Mire (Vitreous)']),
+        create_dungeon_region(multiworld, player, 'Misery Mire (Vitreous)', 'Misery Mire', ['Misery Mire - Boss', 'Misery Mire - Prize']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Entrance)', 'Turtle Rock', None, ['Turtle Rock Entrance Gap', 'Turtle Rock Exit (Front)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (First Section)', 'Turtle Rock', ['Turtle Rock - Compass Chest', 'Turtle Rock - Roller Room - Left',
                                                                              'Turtle Rock - Roller Room - Right'],
                                                                              ['Turtle Rock Entrance to Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
-        create_dungeon_region(world, player, 'Turtle Rock (Pokey Room)', 'Turtle Rock', ['Turtle Rock - Pokey 1 Key Drop'], ['Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Pokey Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Second Section)', 'Turtle Rock', ['Turtle Rock - Big Key Chest', 'Turtle Rock - Pokey 2 Key Drop'], ['Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door', 'Turtle Rock Second Section Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Second Section Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Second Section from Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
-        create_dungeon_region(world, player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
-        create_dungeon_region(world, player, 'Turtle Rock (Eye Bridge Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Isolated Ledge Exit', 'Turtle Rock Eye Bridge from Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Pokey Room)', 'Turtle Rock', ['Turtle Rock - Pokey 1 Key Drop'], ['Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Pokey Room) (South)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock', ['Turtle Rock - Chain Chomps'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Second Section)', 'Turtle Rock', ['Turtle Rock - Big Key Chest', 'Turtle Rock - Pokey 2 Key Drop'], ['Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door', 'Turtle Rock Second Section Bomb Wall']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Second Section Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Second Section from Bomb Wall']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Big Chest)', 'Turtle Rock', ['Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Crystaroller Room)', 'Turtle Rock', ['Turtle Rock - Crystaroller Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Dark Room)', 'Turtle Rock', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Eye Bridge Bomb Wall)', 'Turtle Rock', None, ['Turtle Rock Isolated Ledge Exit', 'Turtle Rock Eye Bridge from Bomb Wall']),
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Eye Bridge)', 'Turtle Rock', ['Turtle Rock - Eye Bridge - Bottom Left', 'Turtle Rock - Eye Bridge - Bottom Right',
                                                                           'Turtle Rock - Eye Bridge - Top Left', 'Turtle Rock - Eye Bridge - Top Right'],
                               ['Turtle Rock Dark Room (South)', 'Turtle Rock (Trinexx)', 'Turtle Rock Eye Bridge Bomb Wall']),
-        create_dungeon_region(world, player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
+        create_dungeon_region(multiworld, player, 'Turtle Rock (Trinexx)', 'Turtle Rock', ['Turtle Rock - Boss', 'Turtle Rock - Prize']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Entrance)', 'Palace of Darkness', ['Palace of Darkness - Shooter Room'], ['Palace of Darkness Bridge Room', 'Palace of Darkness Bonk Wall', 'Palace of Darkness Exit']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Center)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - Stalfos Basement'],
                               ['Palace of Darkness Big Key Chest Staircase', 'Palace of Darkness (North)', 'Palace of Darkness Big Key Door']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
-        create_dungeon_region(world, player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Big Key Chest)', 'Palace of Darkness', ['Palace of Darkness - Big Key Chest']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Bonk Section)', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge', 'Palace of Darkness - Map Chest'], ['Palace of Darkness Hammer Peg Drop']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (North)', 'Palace of Darkness', ['Palace of Darkness - Compass Chest', 'Palace of Darkness - Dark Basement - Left', 'Palace of Darkness - Dark Basement - Right'],
                               ['Palace of Darkness Spike Statue Room Door', 'Palace of Darkness Maze Door']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
-        create_dungeon_region(world, player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
-        create_dungeon_region(world, player, 'Ganons Tower (Entrance)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left',
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Maze)', 'Palace of Darkness', ['Palace of Darkness - Dark Maze - Top', 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Big Chest']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Harmless Hellway)', 'Palace of Darkness', ['Palace of Darkness - Harmless Hellway']),
+        create_dungeon_region(multiworld, player, 'Palace of Darkness (Final Section)', 'Palace of Darkness', ['Palace of Darkness - Boss', 'Palace of Darkness - Prize']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Entrance)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left',
                                                                                     'Ganons Tower - Hope Room - Right', 'Ganons Tower - Conveyor Cross Pot Key'],
                               ['Ganons Tower (Tile Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower Big Key Door', 'Ganons Tower Exit']),
-        create_dungeon_region(world, player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'], ['Ganons Tower (Tile Room) Key Door']),
-        create_dungeon_region(world, player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower', ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Tile Room)', 'Ganon\'s Tower', ['Ganons Tower - Tile Room'], ['Ganons Tower (Tile Room) Key Door']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Compass Room)', 'Ganon\'s Tower', ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right',
                                                                                 'Ganons Tower - Compass Room - Bottom Left', 'Ganons Tower - Compass Room - Bottom Right',
                                                                                         'Ganons Tower - Conveyor Star Pits Pot Key'],
                               ['Ganons Tower (Bottom) (East)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Hookshot Room)', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',
                                                                                          'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right',
                                                                                          'Ganons Tower - Double Switch Pot Key'],
                               ['Ganons Tower (Map Room)', 'Ganons Tower (Double Switch Room)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
-        create_dungeon_region(world, player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower', ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower', ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Map Room)', 'Ganon\'s Tower', ['Ganons Tower - Map Chest']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Firesnake Room)', 'Ganon\'s Tower', ['Ganons Tower - Firesnake Room'], ['Ganons Tower (Firesnake Room)']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Teleport Room)', 'Ganon\'s Tower', ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right',
                                                                                  'Ganons Tower - Randomizer Room - Bottom Left', 'Ganons Tower - Randomizer Room - Bottom Right'],
                               ['Ganons Tower (Bottom) (West)']),
-        create_dungeon_region(world, player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest', 'Ganons Tower - Big Key Room - Left',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Bottom)', 'Ganon\'s Tower', ['Ganons Tower - Bob\'s Chest', 'Ganons Tower - Big Chest', 'Ganons Tower - Big Key Room - Left',
                                                                           'Ganons Tower - Big Key Room - Right', 'Ganons Tower - Big Key Chest']),
-        create_dungeon_region(world, player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
-        create_dungeon_region(world, player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower', ['Ganons Tower - Mini Helmasaur Room - Left', 'Ganons Tower - Mini Helmasaur Room - Right',
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Top)', 'Ganon\'s Tower', None, ['Ganons Tower Torch Rooms']),
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Before Moldorm)', 'Ganon\'s Tower', ['Ganons Tower - Mini Helmasaur Room - Left', 'Ganons Tower - Mini Helmasaur Room - Right',
                                                                                   'Ganons Tower - Pre-Moldorm Chest', 'Ganons Tower - Mini Helmasaur Key Drop'], ['Ganons Tower Moldorm Door']),
-        create_dungeon_region(world, player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
-        create_dungeon_region(world, player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
-        create_cave_region(world, player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
-        create_cave_region(world, player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
-        create_dw_region(world, player, 'Pyramid Ledge', None, ['Pyramid Entrance', 'Pyramid Drop']),
-        create_lw_region(world, player, 'Desert Northern Cliffs'),
-        create_dw_region(world, player, 'Dark Death Mountain Bunny Descent Area')
+        create_dungeon_region(multiworld, player, 'Ganons Tower (Moldorm)', 'Ganon\'s Tower', None, ['Ganons Tower Moldorm Gap']),
+        create_dungeon_region(multiworld, player, 'Agahnim 2', 'Ganon\'s Tower', ['Ganons Tower - Validation Chest', 'Agahnim 2'], None),
+        create_cave_region(multiworld, player, 'Pyramid', 'a drop\'s exit', ['Ganon'], ['Ganon Drop']),
+        create_cave_region(multiworld, player, 'Bottom of Pyramid', 'a drop\'s exit', None, ['Pyramid Exit']),
+        create_dw_region(multiworld, player, 'Pyramid Ledge', None, ['Pyramid Entrance', 'Pyramid Drop']),
+        create_lw_region(multiworld, player, 'Desert Northern Cliffs'),
+        create_dw_region(multiworld, player, 'Dark Death Mountain Bunny Descent Area')
     ]
 
 
-def create_lw_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
-    return _create_region(world, player, name, LTTPRegionType.LightWorld, 'Light World', locations, exits)
+def create_lw_region(multiworld: MultiWorld, player: int, name: str, locations=None, exits=None):
+    return _create_region(multiworld, player, name, LTTPRegionType.LightWorld, 'Light World', locations, exits)
 
 
-def create_dw_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
-    return _create_region(world, player, name, LTTPRegionType.DarkWorld, 'Dark World', locations, exits)
+def create_dw_region(multiworld: MultiWorld, player: int, name: str, locations=None, exits=None):
+    return _create_region(multiworld, player, name, LTTPRegionType.DarkWorld, 'Dark World', locations, exits)
 
 
-def create_cave_region(world: MultiWorld, player: int, name: str, hint: str, locations=None, exits=None):
-    return _create_region(world, player, name, LTTPRegionType.Cave, hint, locations, exits)
+def create_cave_region(multiworld: MultiWorld, player: int, name: str, hint: str, locations=None, exits=None):
+    return _create_region(multiworld, player, name, LTTPRegionType.Cave, hint, locations, exits)
 
 
-def create_dungeon_region(world: MultiWorld, player: int, name: str, hint: str, locations=None, exits=None):
-    return _create_region(world, player, name, LTTPRegionType.Dungeon, hint, locations, exits)
+def create_dungeon_region(multiworld: MultiWorld, player: int, name: str, hint: str, locations=None, exits=None):
+    return _create_region(multiworld, player, name, LTTPRegionType.Dungeon, hint, locations, exits)
 
 
-def _create_region(world: MultiWorld, player: int, name: str, type: LTTPRegionType, hint: str, locations=None,
+def _create_region(multiworld: MultiWorld, player: int, name: str, type: LTTPRegionType, hint: str, locations=None,
                    exits=None):
     from .SubClasses import ALttPLocation
-    ret = LTTPRegion(name, type, hint, player, world)
+    ret = LTTPRegion(name, type, hint, player, multiworld)
     if exits:
         for exit in exits:
             ret.create_exit(exit)
@@ -422,10 +422,10 @@ def _create_region(world: MultiWorld, player: int, name: str, type: LTTPRegionTy
     return ret
 
 
-def mark_light_world_regions(world, player: int):
+def mark_light_world_regions(multiworld: MultiWorld, player: int):
     # cross world caves may have some sections marked as both in_light_world, and in_dark_work.
     # That is ok. the bunny logic will check for this case and incorporate special rules.
-    queue = collections.deque(region for region in world.get_regions(player) if region.type == LTTPRegionType.LightWorld)
+    queue = collections.deque(region for region in multiworld.get_regions(player) if region.type == LTTPRegionType.LightWorld)
     seen = set(queue)
     while queue:
         current = queue.popleft()
@@ -438,7 +438,7 @@ def mark_light_world_regions(world, player: int):
                 seen.add(exit.connected_region)
                 queue.append(exit.connected_region)
 
-    queue = collections.deque(region for region in world.get_regions(player) if region.type == LTTPRegionType.DarkWorld)
+    queue = collections.deque(region for region in multiworld.get_regions(player) if region.type == LTTPRegionType.DarkWorld)
     seen = set(queue)
     while queue:
         current = queue.popleft()
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index 6a5792d21a..8acff214f2 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -19,7 +19,7 @@ import subprocess
 import threading
 import concurrent.futures
 import bsdiff4
-from typing import Collection, Optional, List, SupportsIndex
+from typing import Collection, Optional, List, SupportsIndex, TYPE_CHECKING
 
 from BaseClasses import CollectionState, Region, Location, MultiWorld
 from Utils import local_path, user_path, int16_as_bytes, int32_as_bytes, snes_to_pc, is_frozen, parse_yaml, read_snes_rom
@@ -39,6 +39,9 @@ from .Items import item_table, item_name_groups, progression_items
 from .EntranceShuffle import door_addresses
 from .Options import small_key_shuffle
 
+if TYPE_CHECKING:
+    from . import ALTTPWorld
+
 try:
     from maseya import z3pr
     from maseya.z3pr.palette_randomizer import build_offset_collections
@@ -183,7 +186,7 @@ def check_enemizer(enemizercli):
     if getattr(check_enemizer, "done", None):
         return
     if not os.path.exists(enemizercli) and not os.path.exists(enemizercli + ".exe"):
-        raise Exception(f"Enemizer not found at {enemizercli}, please install it."
+        raise Exception(f"Enemizer not found at {enemizercli}, please install it. "
                         f"Such as https://github.com/Ijwu/Enemizer/releases")
 
     with check_lock:
@@ -792,13 +795,13 @@ def get_nonnative_item_sprite(code: int) -> int:
     # https://discord.com/channels/731205301247803413/827141303330406408/852102450822905886
 
 
-def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
-    local_random = world.worlds[player].random
-    local_world = world.worlds[player]
+def patch_rom(multiworld: MultiWorld, rom: LocalRom, player: int, enemized: bool):
+    local_random = multiworld.worlds[player].random
+    local_world = multiworld.worlds[player]
 
     # patch items
 
-    for location in world.get_locations(player):
+    for location in multiworld.get_locations(player):
         if location.address is None or location.shop_slot is not None:
             continue
 
@@ -852,7 +855,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         rom.write_byte(0x155C9, local_random.choice([0x11, 0x16]))  # Randomize GT music too with map shuffle
 
     # patch entrance/exits/holes
-    for region in world.get_regions(player):
+    for region in multiworld.get_regions(player):
         for exit in region.exits:
             if exit.target is not None:
                 if isinstance(exit.addresses, tuple):
@@ -885,7 +888,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
                         rom.write_int16(0x15DB5 + 2 * offset, 0x0640)
                     elif room_id == 0x00d6 and local_world.fix_trock_exit:
                         rom.write_int16(0x15DB5 + 2 * offset, 0x0134)
-                    elif room_id == 0x000c and world.shuffle_ganon:  # fix ganons tower exit point
+                    elif room_id == 0x000c and multiworld.shuffle_ganon:  # fix ganons tower exit point
                         rom.write_int16(0x15DB5 + 2 * offset, 0x00A4)
                     else:
                         rom.write_int16(0x15DB5 + 2 * offset, link_y)
@@ -905,9 +908,9 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
                     # patch door table
                     rom.write_byte(0xDBB73 + exit.addresses, exit.target)
     if local_world.options.mode == 'inverted':
-        patch_shuffled_dark_sanc(world, rom, player)
+        patch_shuffled_dark_sanc(multiworld, rom, player)
 
-    write_custom_shops(rom, world, player)
+    write_custom_shops(rom, multiworld, player)
 
     def credits_digit(num):
         # top: $54 is 1, 55 2, etc , so 57=4, 5C=9
@@ -981,11 +984,11 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     if local_world.options.mode in ['open', 'inverted']:
         rom.write_byte(0x180032, 0x01)  # open mode
     if local_world.options.mode == 'inverted':
-        set_inverted_mode(world, player, rom)
+        set_inverted_mode(multiworld, player, rom)
     elif local_world.options.mode == 'standard':
         rom.write_byte(0x180032, 0x00)  # standard mode
 
-    uncle_location = world.get_location('Link\'s Uncle', player)
+    uncle_location = multiworld.get_location('Link\'s Uncle', player)
     if uncle_location.item is None or uncle_location.item.name not in ['Master Sword', 'Tempered Sword',
                                                                        'Fighter Sword', 'Golden Sword',
                                                                        'Progressive Sword']:
@@ -1197,8 +1200,8 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         0x51, 0x06, 0x52, 0xFF,  # 6 +5 bomb upgrades -> +10 bomb upgrade
         0x53, 0x06, 0x54, 0xFF,  # 6 +5 arrow upgrades -> +10 arrow upgrade
         0x58, 0x01, 0x36 if local_world.options.retro_bow else 0x43, 0xFF,  # silver arrows -> single arrow (red 20 in retro mode)
-        0x3E, difficulty.boss_heart_container_limit, 0x47, 0xff,  # boss heart -> green 20
-        0x17, difficulty.heart_piece_limit, 0x47, 0xff,  # piece of heart -> green 20
+        0x3E, local_world.logical_heart_containers, 0x47, 0xff,  # boss heart -> green 20
+        0x17, local_world.logical_heart_pieces, 0x47, 0xff,  # piece of heart -> green 20
         0xFF, 0xFF, 0xFF, 0xFF,  # end of table sentinel
     ])
 
@@ -1280,7 +1283,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
 
     # set up goals for treasure hunt
     rom.write_int16(0x180163, max(0, local_world.treasure_hunt_required -
-                                  sum(1 for item in world.precollected_items[player] if item.name == "Triforce Piece")))
+                                  sum(1 for item in multiworld.precollected_items[player] if item.name == "Triforce Piece")))
     rom.write_bytes(0x180165, [0x0E, 0x28])  #  Triforce Piece Sprite
     rom.write_byte(0x180194, 1)  # Must turn in triforced pieces (instant win not enabled)
 
@@ -1309,7 +1312,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     rom.write_bytes(0x50563, [0x3F, 0x14])  # disable below ganon chest
     rom.write_byte(0x50599, 0x00)  # disable below ganon chest
     rom.write_bytes(0xE9A5, [0x7E, 0x00, 0x24])  # disable below ganon chest
-    rom.write_byte(0x18008B, 0x01 if local_world.options.open_pyramid.to_bool(world, player) else 0x00)  # pre-open Pyramid Hole
+    rom.write_byte(0x18008B, 0x01 if local_world.options.open_pyramid.to_bool(multiworld, player) else 0x00)  # pre-open Pyramid Hole
     rom.write_byte(0x18008C, 0x01 if local_world.options.crystals_needed_for_gt == 0 else 0x00)  # GT pre-opened if crystal requirement is 0
     rom.write_byte(0xF5D73, 0xF0)  # bees are catchable
     rom.write_byte(0xF5F10, 0xF0)  # bees are catchable
@@ -1327,7 +1330,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     starting_max_bombs = 0 if local_world.options.bombless_start else 10
     starting_max_arrows = 30
 
-    startingstate = CollectionState(world)
+    startingstate = CollectionState(multiworld)
 
     if startingstate.has('Silver Bow', player):
         equip[0x340] = 1
@@ -1375,7 +1378,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         equip[0x37B] = 1
         equip[0x36E] = 0x80
 
-    for item in world.precollected_items[player]:
+    for item in multiworld.precollected_items[player]:
 
         if item.name in {'Bow', 'Silver Bow', 'Silver Arrows', 'Progressive Bow', 'Progressive Bow (Alt)',
                          'Titans Mitts', 'Power Glove', 'Progressive Glove',
@@ -1590,7 +1593,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     }
 
     def get_reveal_bytes(itemName):
-        locations = world.find_item_locations(itemName, player)
+        locations = multiworld.find_item_locations(itemName, player)
         if len(locations) < 1:
             return 0x0000
         location = locations[0]
@@ -1667,7 +1670,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         rom.write_byte(0x18004C, 0x01)
 
     # set correct flag for hera basement item
-    hera_basement = world.get_location('Tower of Hera - Basement Cage', player)
+    hera_basement = multiworld.get_location('Tower of Hera - Basement Cage', player)
     if hera_basement.item is not None and hera_basement.item.name == 'Small Key (Tower of Hera)' and hera_basement.item.player == player:
         rom.write_byte(0x4E3BB, 0xE4)
     else:
@@ -1684,27 +1687,26 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         rom.write_byte(0xFEE41, 0x2A)  # bombable exit
 
     if local_world.options.tile_shuffle:
-        tile_set = TileSet.get_random_tile_set(world.worlds[player].random)
+        tile_set = TileSet.get_random_tile_set(multiworld.worlds[player].random)
         rom.write_byte(0x4BA21, tile_set.get_speed())
         rom.write_byte(0x4BA1D, tile_set.get_len())
         rom.write_bytes(0x4BA2A, tile_set.get_bytes())
 
-    write_strings(rom, world, player)
+    write_strings(rom, multiworld, player)
 
     # remote items flag, does not currently work
     rom.write_byte(0x18637C, 0)
 
     # set rom name
     # 21 bytes
-    from Utils import __version__
-    rom.name = bytearray(f'AP{__version__.replace(".", "")[0:3]}_{player}_{world.seed:11}\0', 'utf8')[:21]
+    rom.name = bytearray(f'AP{local_world.world_version.as_simple_string().replace(".", "")[0:3]}_{player}_{multiworld.seed:11}\0', 'utf8')[:21]
     rom.name.extend([0] * (21 - len(rom.name)))
     rom.write_bytes(0x7FC0, rom.name)
 
     # set player names
-    encoded_players = world.players + len(world.groups)
+    encoded_players = multiworld.players + len(multiworld.groups)
     for p in range(1, min(encoded_players, ROM_PLAYER_LIMIT) + 1):
-        rom.write_bytes(0x195FFC + ((p - 1) * 32), hud_format_text(world.player_name[p]))
+        rom.write_bytes(0x195FFC + ((p - 1) * 32), hud_format_text(multiworld.player_name[p]))
     if encoded_players > ROM_PLAYER_LIMIT:
         rom.write_bytes(0x195FFC + ((ROM_PLAYER_LIMIT - 1) * 32), hud_format_text("Archipelago"))
 
@@ -1723,9 +1725,9 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     return rom
 
 
-def patch_race_rom(rom, world, player):
+def patch_race_rom(rom: LocalRom, multiworld: MultiWorld, player: int):
     rom.write_bytes(0x180213, [0x01, 0x00])  # Tournament Seed
-    rom.encrypt(world, player)
+    rom.encrypt(multiworld, player)
 
 
 def get_price_data(price: int, price_type: int) -> List[int]:
@@ -1738,8 +1740,8 @@ def get_price_data(price: int, price_type: int) -> List[int]:
         return int16_as_bytes(price)
 
 
-def write_custom_shops(rom, world, player):
-    shops = sorted([shop for shop in world.worlds[player].shops if shop.custom], key=lambda shop: shop.sram_offset)
+def write_custom_shops(rom: LocalRom, multiworld: MultiWorld, player: int):
+    shops = sorted([shop for shop in multiworld.worlds[player].shops if shop.custom], key=lambda shop: shop.sram_offset)
 
     shop_data = bytearray()
     items_data = bytearray()
@@ -1758,9 +1760,9 @@ def write_custom_shops(rom, world, player):
             slot = 0 if shop.type == ShopType.TakeAny else index
             if item is None:
                 break
-            if world.worlds[player].options.shop_item_slots or shop.type == ShopType.TakeAny:
-                count_shop = (shop.region.name != 'Potion Shop' or world.worlds[player].options.include_witch_hut) and \
-                             (shop.region.name != 'Capacity Upgrade' or world.worlds[player].options.shuffle_capacity_upgrades)
+            if multiworld.worlds[player].options.shop_item_slots or shop.type == ShopType.TakeAny:
+                count_shop = (shop.region.name != 'Potion Shop' or multiworld.worlds[player].options.include_witch_hut) and \
+                             (shop.region.name != 'Capacity Upgrade' or multiworld.worlds[player].options.shuffle_capacity_upgrades)
                 rom.write_byte(0x186560 + shop.sram_offset + slot, 1 if count_shop else 0)
             if item['item'] == 'Single Arrow' and item['player'] == 0:
                 arrow_mask |= 1 << index
@@ -1773,11 +1775,11 @@ def write_custom_shops(rom, world, player):
             price_data = get_price_data(item['price'], item["price_type"])
             replacement_price_data = get_price_data(item['replacement_price'], item['replacement_price_type'])
             slot = 0 if shop.type == ShopType.TakeAny else index
-            if item['player'] and world.game[item['player']] != "A Link to the Past":  # item not native to ALTTP
-                item_code = get_nonnative_item_sprite(world.worlds[item['player']].item_name_to_id[item['item']])
+            if item['player'] and multiworld.game[item['player']] != "A Link to the Past":  # item not native to ALTTP
+                item_code = get_nonnative_item_sprite(multiworld.worlds[item['player']].item_name_to_id[item['item']])
             else:
                 item_code = item_table[item["item"]].item_code
-                if item['item'] == 'Single Arrow' and item['player'] == 0 and world.worlds[player].options.retro_bow:
+                if item['item'] == 'Single Arrow' and item['player'] == 0 and multiworld.worlds[player].options.retro_bow:
                     rom.write_byte(0x186500 + shop.sram_offset + slot, arrow_mask)
 
             item_data = [shop_id, item_code] + price_data + \
@@ -1790,12 +1792,12 @@ def write_custom_shops(rom, world, player):
     items_data.extend([0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF])
     rom.write_bytes(0x184900, items_data)
 
-    if world.worlds[player].options.retro_bow:
+    if multiworld.worlds[player].options.retro_bow:
         retro_shop_slots.append(0xFF)
         rom.write_bytes(0x186540, retro_shop_slots)
 
 
-def hud_format_text(text):
+def hud_format_text(text: str):
     output = bytes()
     for char in text.lower():
         if 'a' <= char <= 'z':
@@ -1812,7 +1814,7 @@ def hud_format_text(text):
         output += b'\x7f\x00'
     return output[:32]
 
-def apply_oof_sfx(rom, oof: str):
+def apply_oof_sfx(rom: LocalRom, oof: str):
     with open(oof, 'rb') as stream:
         oof_bytes = bytearray(stream.read())
 
@@ -1862,9 +1864,10 @@ def apply_oof_sfx(rom, oof: str):
     rom.write_bytes(0x13000D, [0x00, 0x00, 0x00, 0x08])
 
 
-def apply_rom_settings(rom, beep, color, quickswap, menuspeed, music: bool, sprite: str, oof: str, palettes_options,
-                       world=None, player=1, allow_random_on_event=False, reduceflashing=False,
-                       triforcehud: str = None, deathlink: bool = False, allowcollect: bool = False):
+def apply_rom_settings(rom: LocalRom, beep: str, color: str, quickswap: bool, menuspeed: str, music: bool, sprite: str,
+                       oof: str, palettes_options: dict[str, str], world: "ALTTPWorld | None" = None, player: int = 1,
+                       allow_random_on_event: bool = False, reduceflashing: bool = False, triforcehud: str = None,
+                       deathlink: bool = False, allowcollect: bool = False):
     local_random = random if not world else world.worlds[player].random
     disable_music: bool = not music
     # enable instant item menu
@@ -1948,7 +1951,7 @@ def apply_rom_settings(rom, beep, color, quickswap, menuspeed, music: bool, spri
         rom.write_byte(0x180167, triforce_flag)
 
     if z3pr:
-        def buildAndRandomize(option_name, mode):
+        def buildAndRandomize(option_name: str, mode: str):
             options = {
                 option_name: True
             }
@@ -2012,7 +2015,7 @@ def apply_rom_settings(rom, beep, color, quickswap, menuspeed, music: bool, spri
         rom.write_crc()
 
 
-def restore_maseya_colors(rom, offsets_array):
+def restore_maseya_colors(rom: LocalRom, offsets_array: list[list[int]]):
     if not rom.orig_buffer:
         return
     for offsetC in offsets_array:
@@ -2020,7 +2023,7 @@ def restore_maseya_colors(rom, offsets_array):
             rom.write_bytes(address, rom.orig_buffer[address:address + 2])
 
 
-def set_color(rom, address, color, shade):
+def set_color(rom: LocalRom, address: int, color: tuple[int, int, int], shade: int):
     r = round(min(color[0], 0xFF) * pow(0.8, shade) * 0x1F / 0xFF)
     g = round(min(color[1], 0xFF) * pow(0.8, shade) * 0x1F / 0xFF)
     b = round(min(color[2], 0xFF) * pow(0.8, shade) * 0x1F / 0xFF)
@@ -2028,7 +2031,7 @@ def set_color(rom, address, color, shade):
     rom.write_bytes(address, ((b << 10) | (g << 5) | (r << 0)).to_bytes(2, byteorder='little', signed=False))
 
 
-def default_ow_palettes(rom):
+def default_ow_palettes(rom: LocalRom):
     if not rom.orig_buffer:
         return
     rom.write_bytes(0xDE604, rom.orig_buffer[0xDE604:0xDEBB4])
@@ -2037,7 +2040,7 @@ def default_ow_palettes(rom):
         rom.write_bytes(address, rom.orig_buffer[address:address + 2])
 
 
-def randomize_ow_palettes(rom, local_random):
+def randomize_ow_palettes(rom: LocalRom, local_random: random.Random):
     grass, grass2, grass3, dirt, dirt2, water, clouds, dwdirt, \
     dwgrass, dwwater, dwdmdirt, dwdmgrass, dwdmclouds1, dwdmclouds2 = [[local_random.randint(60, 215) for _ in range(3)]
                                                                        for _ in range(14)]
@@ -2113,7 +2116,7 @@ def randomize_ow_palettes(rom, local_random):
         set_color(rom, address, color, shade)
 
 
-def blackout_ow_palettes(rom):
+def blackout_ow_palettes(rom: LocalRom):
     rom.write_bytes(0xDE604, [0] * 0xC4)
     for i in range(0xDE6C8, 0xDE86C, 70):
         rom.write_bytes(i, [0] * 64)
@@ -2124,13 +2127,13 @@ def blackout_ow_palettes(rom):
         rom.write_bytes(address, [0, 0])
 
 
-def default_uw_palettes(rom):
+def default_uw_palettes(rom: LocalRom):
     if not rom.orig_buffer:
         return
     rom.write_bytes(0xDD734, rom.orig_buffer[0xDD734:0xDE544])
 
 
-def randomize_uw_palettes(rom, local_random):
+def randomize_uw_palettes(rom: LocalRom, local_random: random.Random):
     for dungeon in range(20):
         wall, pot, chest, floor1, floor2, floor3 = [[local_random.randint(60, 240) for _ in range(3)] for _ in range(6)]
 
@@ -2177,7 +2180,7 @@ def randomize_uw_palettes(rom, local_random):
         set_color(rom, 0x0DD796 + (0xB4 * dungeon), floor3, 4)
 
 
-def blackout_uw_palettes(rom):
+def blackout_uw_palettes(rom: LocalRom):
     for i in range(0xDD734, 0xDE544, 180):
         rom.write_bytes(i, [0] * 38)
         rom.write_bytes(i + 44, [0] * 76)
@@ -2188,25 +2191,25 @@ def get_hash_string(hash):
     return ", ".join([hash_alphabet[code & 0x1F] for code in hash])
 
 
-def write_string_to_rom(rom, target, string):
+def write_string_to_rom(rom: LocalRom, target: str, string: str):
     address, maxbytes = text_addresses[target]
     rom.write_bytes(address, MultiByteTextMapper.convert(string, maxbytes))
 
 
-def write_strings(rom, world, player):
+def write_strings(rom: LocalRom, multiworld: MultiWorld, player: int):
     from . import ALTTPWorld
-    local_random = world.worlds[player].random
-    w: ALTTPWorld = world.worlds[player]
+    local_random = multiworld.worlds[player].random
+    w: ALTTPWorld = multiworld.worlds[player]
 
     tt = TextTable()
     tt.removeUnwantedText()
 
     # Let's keep this guy's text accurate to the shuffle setting.
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_full', 'dungeons_simple', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_full', 'dungeons_simple', 'dungeons_crossed']:
         tt['kakariko_flophouse_man_no_flippers'] = 'I really hate mowing my yard.\n{PAGEBREAK}\nI should move.'
         tt['kakariko_flophouse_man'] = 'I really hate mowing my yard.\n{PAGEBREAK}\nI should move.'
 
-    if world.worlds[player].options.mode == 'inverted':
+    if multiworld.worlds[player].options.mode == 'inverted':
         tt['sign_village_of_outcasts'] = 'attention\nferal ducks sighted\nhiding in statues\n\nflute players beware\n'
 
     def hint_text(dest, ped_hint=False):
@@ -2218,45 +2221,45 @@ def write_strings(rom, world, player):
             hint = dest.hint_text
         if dest.player != player:
             if ped_hint:
-                hint += f" for {world.player_name[dest.player]}!"
+                hint += f" for {multiworld.player_name[dest.player]}!"
             elif isinstance(dest, (Region, Location)):
-                hint += f" in {world.player_name[dest.player]}'s world"
+                hint += f" in {multiworld.player_name[dest.player]}'s world"
             else:
-                hint += f" for {world.player_name[dest.player]}"
+                hint += f" for {multiworld.player_name[dest.player]}"
         return hint
 
-    if world.worlds[player].options.scams.gives_king_zora_hint:
+    if multiworld.worlds[player].options.scams.gives_king_zora_hint:
         # Zora hint
-        zora_location = world.get_location("King Zora", player)
+        zora_location = multiworld.get_location("King Zora", player)
         tt['zora_tells_cost'] = f"You got 500 rupees to buy {hint_text(zora_location.item)}" \
                                 f"\n  ≥ Duh\n    Oh carp\n{{CHOICE}}"
-    if world.worlds[player].options.scams.gives_bottle_merchant_hint:
+    if multiworld.worlds[player].options.scams.gives_bottle_merchant_hint:
         # Bottle Vendor hint
-        vendor_location = world.get_location("Bottle Merchant", player)
+        vendor_location = multiworld.get_location("Bottle Merchant", player)
         tt['bottle_vendor_choice'] = f"I gots {hint_text(vendor_location.item)}\nYous gots 100 rupees?" \
                                      f"\n  ≥ I want\n    no way!\n{{CHOICE}}"
 
     # First we write hints about entrances, some from the inconvenient list others from all reasonable entrances.
-    if world.worlds[player].options.hints:
-        if world.worlds[player].options.hints.value >= 2:
-            if world.worlds[player].options.hints == "full":
+    if multiworld.worlds[player].options.hints:
+        if multiworld.worlds[player].options.hints.value >= 2:
+            if multiworld.worlds[player].options.hints == "full":
                 tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles have hints!'
             else:
                 tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
             hint_locations = HintLocations.copy()
             local_random.shuffle(hint_locations)
-            all_entrances = list(world.get_entrances(player))
+            all_entrances = list(multiworld.get_entrances(player))
             local_random.shuffle(all_entrances)
 
             # First we take care of the one inconvenient dungeon in the appropriately simple shuffles.
             entrances_to_hint = {}
             entrances_to_hint.update(InconvenientDungeonEntrances)
-            if world.shuffle_ganon:
-                if world.worlds[player].options.mode == 'inverted':
+            if multiworld.shuffle_ganon:
+                if multiworld.worlds[player].options.mode == 'inverted':
                     entrances_to_hint.update({'Inverted Ganons Tower': 'The sealed castle door'})
                 else:
                     entrances_to_hint.update({'Ganons Tower': 'Ganon\'s Tower'})
-            if world.worlds[player].options.entrance_shuffle in ['simple', 'restricted']:
+            if multiworld.worlds[player].options.entrance_shuffle in ['simple', 'restricted']:
                 for entrance in all_entrances:
                     if entrance.name in entrances_to_hint:
                         this_hint = entrances_to_hint[entrance.name] + ' leads to ' + hint_text(
@@ -2266,9 +2269,9 @@ def write_strings(rom, world, player):
                         break
             # Now we write inconvenient locations for most shuffles and finish taking care of the less chaotic ones.
             entrances_to_hint.update(InconvenientOtherEntrances)
-            if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+            if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
                 hint_count = 0
-            elif world.worlds[player].options.entrance_shuffle in ['simple', 'restricted']:
+            elif multiworld.worlds[player].options.entrance_shuffle in ['simple', 'restricted']:
                 hint_count = 2
             else:
                 hint_count = 4
@@ -2285,31 +2288,31 @@ def write_strings(rom, world, player):
 
             # Next we handle hints for randomly selected other entrances,
             # curating the selection intelligently based on shuffle.
-            if world.worlds[player].options.entrance_shuffle not in ['simple', 'restricted']:
+            if multiworld.worlds[player].options.entrance_shuffle not in ['simple', 'restricted']:
                 entrances_to_hint.update(ConnectorEntrances)
                 entrances_to_hint.update(DungeonEntrances)
-                if world.worlds[player].options.mode == 'inverted':
+                if multiworld.worlds[player].options.mode == 'inverted':
                     entrances_to_hint.update({'Inverted Agahnims Tower': 'The dark mountain tower'})
                 else:
                     entrances_to_hint.update({'Agahnims Tower': 'The sealed castle door'})
-            elif world.worlds[player].options.entrance_shuffle == 'restricted':
+            elif multiworld.worlds[player].options.entrance_shuffle == 'restricted':
                 entrances_to_hint.update(ConnectorEntrances)
             entrances_to_hint.update(OtherEntrances)
-            if world.worlds[player].options.mode == 'inverted':
+            if multiworld.worlds[player].options.mode == 'inverted':
                 entrances_to_hint.update({'Inverted Dark Sanctuary': 'The dark sanctuary cave'})
                 entrances_to_hint.update({'Inverted Big Bomb Shop': 'The old hero\'s dark home'})
                 entrances_to_hint.update({'Inverted Links House': 'The old hero\'s light home'})
             else:
                 entrances_to_hint.update({'Dark Sanctuary Hint': 'The dark sanctuary cave'})
                 entrances_to_hint.update({'Big Bomb Shop': 'The old bomb shop'})
-            if world.worlds[player].options.entrance_shuffle != 'insanity':
+            if multiworld.worlds[player].options.entrance_shuffle != 'insanity':
                 entrances_to_hint.update(InsanityEntrances)
-                if world.shuffle_ganon:
-                    if world.worlds[player].options.mode == 'inverted':
+                if multiworld.shuffle_ganon:
+                    if multiworld.worlds[player].options.mode == 'inverted':
                         entrances_to_hint.update({'Inverted Pyramid Entrance': 'The extra castle passage'})
                     else:
                         entrances_to_hint.update({'Pyramid Ledge': 'The pyramid ledge'})
-            hint_count = 4 if world.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
+            hint_count = 4 if multiworld.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
                                                             'dungeons_crossed'] else 0
             for entrance in all_entrances:
                 if entrance.name in entrances_to_hint:
@@ -2324,77 +2327,77 @@ def write_strings(rom, world, player):
 
             # Next we write a few hints for specific inconvenient locations. We don't make many because in entrance this is highly unpredictable.
             locations_to_hint = InconvenientLocations.copy()
-            if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+            if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
                 locations_to_hint.extend(InconvenientVanillaLocations)
             local_random.shuffle(locations_to_hint)
-            hint_count = 3 if world.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
+            hint_count = 3 if multiworld.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
                                                             'dungeons_crossed'] else 5
             for location in locations_to_hint[:hint_count]:
                 if location == 'Swamp Left':
                     if local_random.randint(0, 1):
-                        first_item = hint_text(world.get_location('Swamp Palace - West Chest', player).item)
-                        second_item = hint_text(world.get_location('Swamp Palace - Big Key Chest', player).item)
+                        first_item = hint_text(multiworld.get_location('Swamp Palace - West Chest', player).item)
+                        second_item = hint_text(multiworld.get_location('Swamp Palace - Big Key Chest', player).item)
                     else:
-                        second_item = hint_text(world.get_location('Swamp Palace - West Chest', player).item)
-                        first_item = hint_text(world.get_location('Swamp Palace - Big Key Chest', player).item)
+                        second_item = hint_text(multiworld.get_location('Swamp Palace - West Chest', player).item)
+                        first_item = hint_text(multiworld.get_location('Swamp Palace - Big Key Chest', player).item)
                     this_hint = ('The westmost chests in Swamp Palace contain ' + first_item + ' and ' + second_item + '.')
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Mire Left':
                     if local_random.randint(0, 1):
-                        first_item = hint_text(world.get_location('Misery Mire - Compass Chest', player).item)
-                        second_item = hint_text(world.get_location('Misery Mire - Big Key Chest', player).item)
+                        first_item = hint_text(multiworld.get_location('Misery Mire - Compass Chest', player).item)
+                        second_item = hint_text(multiworld.get_location('Misery Mire - Big Key Chest', player).item)
                     else:
-                        second_item = hint_text(world.get_location('Misery Mire - Compass Chest', player).item)
-                        first_item = hint_text(world.get_location('Misery Mire - Big Key Chest', player).item)
+                        second_item = hint_text(multiworld.get_location('Misery Mire - Compass Chest', player).item)
+                        first_item = hint_text(multiworld.get_location('Misery Mire - Big Key Chest', player).item)
                     this_hint = ('The westmost chests in Misery Mire contain ' + first_item + ' and ' + second_item + '.')
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Tower of Hera - Big Key Chest':
                     this_hint = 'Waiting in the Tower of Hera basement leads to ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Ganons Tower - Big Chest':
                     this_hint = 'The big chest in Ganon\'s Tower contains ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Thieves\' Town - Big Chest':
                     this_hint = 'The big chest in Thieves\' Town contains ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Ice Palace - Big Chest':
                     this_hint = 'The big chest in Ice Palace contains ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Eastern Palace - Big Key Chest':
                     this_hint = 'The antifairy guarded chest in Eastern Palace contains ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Sahasrahla':
                     this_hint = 'Sahasrahla seeks a green pendant for ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 elif location == 'Graveyard Cave':
                     this_hint = 'The cave north of the graveyard contains ' + hint_text(
-                        world.get_location(location, player).item) + '.'
+                        multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
                 else:
-                    this_hint = location + ' contains ' + hint_text(world.get_location(location, player).item) + '.'
+                    this_hint = location + ' contains ' + hint_text(multiworld.get_location(location, player).item) + '.'
                     tt[hint_locations.pop(0)] = this_hint
 
             # Lastly we write hints to show where certain interesting items are.
             items_to_hint = RelevantItems.copy()
-            if world.worlds[player].options.small_key_shuffle.hints_useful:
+            if multiworld.worlds[player].options.small_key_shuffle.hints_useful:
                 items_to_hint |= item_name_groups["Small Keys"]
-            if world.worlds[player].options.big_key_shuffle.hints_useful:
+            if multiworld.worlds[player].options.big_key_shuffle.hints_useful:
                 items_to_hint |= item_name_groups["Big Keys"]
 
-            if world.worlds[player].options.hints == "full":
+            if multiworld.worlds[player].options.hints == "full":
                 hint_count = len(hint_locations)  # fill all remaining hint locations with Item hints.
             else:
-                hint_count = 5 if world.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
+                hint_count = 5 if multiworld.worlds[player].options.entrance_shuffle not in ['vanilla', 'dungeons_simple', 'dungeons_full',
                                                                 'dungeons_crossed'] else 8
             hint_count = min(hint_count, len(items_to_hint), len(hint_locations))
             if hint_count:
-                locations = world.find_items_in_locations(items_to_hint, player, True)
+                locations = multiworld.find_items_in_locations(items_to_hint, player, True)
                 local_random.shuffle(locations)
                 # make locked locations less likely to appear as hint,
                 # chances are the lock means the player already knows.
@@ -2414,15 +2417,15 @@ def write_strings(rom, world, player):
 
     # We still need the older hints of course. Those are done here.
 
-    silverarrows = world.find_item_locations('Silver Bow', player, True)
+    silverarrows = multiworld.find_item_locations('Silver Bow', player, True)
     local_random.shuffle(silverarrows)
     silverarrow_hint = (
             ' %s?' % hint_text(silverarrows[0]).replace('Ganon\'s', 'my')) if silverarrows else '?\nI think not!'
     tt['ganon_phase_3_no_silvers'] = 'Did you find the silver arrows%s' % silverarrow_hint
     tt['ganon_phase_3_no_silvers_alt'] = 'Did you find the silver arrows%s' % silverarrow_hint
-    if world.worlds[player].has_progressive_bows and (w.difficulty_requirements.progressive_bow_limit >= 2 or (
-            world.worlds[player].options.swordless or world.worlds[player].options.glitches_required == 'no_glitches')):
-        prog_bow_locs = world.find_item_locations('Progressive Bow', player, True)
+    if multiworld.worlds[player].has_progressive_bows and (w.difficulty_requirements.progressive_bow_limit >= 2 or (
+            multiworld.worlds[player].options.swordless or multiworld.worlds[player].options.glitches_required == 'no_glitches')):
+        prog_bow_locs = multiworld.find_item_locations('Progressive Bow', player, True)
         local_random.shuffle(prog_bow_locs)
         found_bow = False
         found_bow_alt = False
@@ -2437,34 +2440,34 @@ def write_strings(rom, world, player):
             silverarrow_hint = (' %s?' % hint_text(bow_loc).replace('Ganon\'s', 'my'))
             tt[target] = 'Did you find the silver arrows%s' % silverarrow_hint
 
-    crystal5 = world.find_item('Crystal 5', player)
-    crystal6 = world.find_item('Crystal 6', player)
+    crystal5 = multiworld.find_item('Crystal 5', player)
+    crystal6 = multiworld.find_item('Crystal 6', player)
     tt['bomb_shop'] = 'Big Bomb?\nMy supply is blocked until you clear %s and %s.' % (
         crystal5.hint_text, crystal6.hint_text)
 
-    greenpendant = world.find_item('Green Pendant', player)
+    greenpendant = multiworld.find_item('Green Pendant', player)
     tt['sahasrahla_bring_courage'] = 'I lost my family heirloom in %s' % greenpendant.hint_text
 
-    if world.worlds[player].options.crystals_needed_for_gt == 1:
+    if multiworld.worlds[player].options.crystals_needed_for_gt == 1:
         tt['sign_ganons_tower'] = 'You need a crystal to enter.'
     else:
-        tt['sign_ganons_tower'] = f'You need {world.worlds[player].options.crystals_needed_for_gt} crystals to enter.'
+        tt['sign_ganons_tower'] = f'You need {multiworld.worlds[player].options.crystals_needed_for_gt} crystals to enter.'
 
-    if world.worlds[player].options.goal == 'bosses':
+    if multiworld.worlds[player].options.goal == 'bosses':
         tt['sign_ganon'] = 'You need to kill all bosses, Ganon last.'
-    elif world.worlds[player].options.goal == 'ganon_pedestal':
+    elif multiworld.worlds[player].options.goal == 'ganon_pedestal':
         tt['sign_ganon'] = 'You need to pull the pedestal to defeat Ganon.'
-    elif world.worlds[player].options.goal == "ganon":
-        if world.worlds[player].options.crystals_needed_for_ganon == 1:
+    elif multiworld.worlds[player].options.goal == "ganon":
+        if multiworld.worlds[player].options.crystals_needed_for_ganon == 1:
             tt['sign_ganon'] = 'You need a crystal to beat Ganon and have beaten Agahnim atop Ganons Tower.'
         else:
-            tt['sign_ganon'] = f'You need {world.worlds[player].options.crystals_needed_for_ganon} crystals to beat Ganon and ' \
+            tt['sign_ganon'] = f'You need {multiworld.worlds[player].options.crystals_needed_for_ganon} crystals to beat Ganon and ' \
                                f'have beaten Agahnim atop Ganons Tower'
     else:
-        if world.worlds[player].options.crystals_needed_for_ganon == 1:
+        if multiworld.worlds[player].options.crystals_needed_for_ganon == 1:
             tt['sign_ganon'] = 'You need a crystal to beat Ganon.'
         else:
-            tt['sign_ganon'] = f'You need {world.worlds[player].options.crystals_needed_for_ganon} crystals to beat Ganon.'
+            tt['sign_ganon'] = f'You need {multiworld.worlds[player].options.crystals_needed_for_ganon} crystals to beat Ganon.'
 
     tt['uncle_leaving_text'] = Uncle_texts[local_random.randint(0, len(Uncle_texts) - 1)]
     tt['end_triforce'] = "{NOBORDER}\n" + Triforce_texts[local_random.randint(0, len(Triforce_texts) - 1)]
@@ -2475,12 +2478,12 @@ def write_strings(rom, world, player):
     tt['blind_by_the_light'] = Blind_texts[local_random.randint(0, len(Blind_texts) - 1)]
 
     triforce_pieces_required = max(0, w.treasure_hunt_required -
-                                   sum(1 for item in world.precollected_items[player] if item.name == "Triforce Piece"))
+                                   sum(1 for item in multiworld.precollected_items[player] if item.name == "Triforce Piece"))
 
-    if world.worlds[player].options.goal in ['triforce_hunt', 'local_triforce_hunt']:
+    if multiworld.worlds[player].options.goal in ['triforce_hunt', 'local_triforce_hunt']:
         tt['ganon_fall_in_alt'] = 'Why are you even here?\n You can\'t even hurt me! Get the Triforce Pieces.'
         tt['ganon_phase_3_alt'] = 'Seriously? Go Away, I will not Die.'
-        if world.worlds[player].options.goal == 'triforce_hunt' and world.players > 1:
+        if multiworld.worlds[player].options.goal == 'triforce_hunt' and multiworld.players > 1:
             tt['sign_ganon'] = 'Go find the Triforce pieces with your friends... Ganon is invincible!'
         else:
             tt['sign_ganon'] = 'Go find the Triforce pieces... Ganon is invincible!'
@@ -2494,7 +2497,7 @@ def write_strings(rom, world, player):
                                "invisibility.\n\n\n\n… … …\n\nWait! you can see me? I knew I should have\n" \
                                "hidden in  a hollow tree. If you bring\n%d Triforce piece out of %d, I can reassemble it." % \
                                (triforce_pieces_required, w.treasure_hunt_total)
-    elif world.worlds[player].options.goal in ['pedestal']:
+    elif multiworld.worlds[player].options.goal in ['pedestal']:
         tt['ganon_fall_in_alt'] = 'Why are you even here?\n You can\'t even hurt me! Your goal is at the pedestal.'
         tt['ganon_phase_3_alt'] = 'Seriously? Go Away, I will not Die.'
         tt['sign_ganon'] = 'You need to get to the pedestal... Ganon is invincible!'
@@ -2503,44 +2506,44 @@ def write_strings(rom, world, player):
         tt['ganon_fall_in_alt'] = 'You cannot defeat me until you finish your goal!'
         tt['ganon_phase_3_alt'] = 'Got wax in\nyour ears?\nI can not die!'
         if triforce_pieces_required > 1:
-            if world.worlds[player].options.goal == 'ganon_triforce_hunt' and world.players > 1:
+            if multiworld.worlds[player].options.goal == 'ganon_triforce_hunt' and multiworld.players > 1:
                 tt['sign_ganon'] = 'You need to find %d Triforce pieces out of %d with your friends to defeat Ganon.' % \
                                    (triforce_pieces_required, w.treasure_hunt_total)
-            elif world.worlds[player].options.goal in ['ganon_triforce_hunt', 'local_ganon_triforce_hunt']:
+            elif multiworld.worlds[player].options.goal in ['ganon_triforce_hunt', 'local_ganon_triforce_hunt']:
                 tt['sign_ganon'] = 'You need to find %d Triforce pieces out of %d to defeat Ganon.' % \
                                    (triforce_pieces_required, w.treasure_hunt_total)
         else:
-            if world.worlds[player].options.goal == 'ganon_triforce_hunt' and world.players > 1:
+            if multiworld.worlds[player].options.goal == 'ganon_triforce_hunt' and multiworld.players > 1:
                 tt['sign_ganon'] = 'You need to find %d Triforce piece out of %d with your friends to defeat Ganon.' % \
                                    (triforce_pieces_required, w.treasure_hunt_total)
-            elif world.worlds[player].options.goal in ['ganon_triforce_hunt', 'local_ganon_triforce_hunt']:
+            elif multiworld.worlds[player].options.goal in ['ganon_triforce_hunt', 'local_ganon_triforce_hunt']:
                 tt['sign_ganon'] = 'You need to find %d Triforce piece out of %d to defeat Ganon.' % \
                                    (triforce_pieces_required, w.treasure_hunt_total)
 
     tt['kakariko_tavern_fisherman'] = TavernMan_texts[local_random.randint(0, len(TavernMan_texts) - 1)]
 
-    pedestalitem = world.get_location('Master Sword Pedestal', player).item
+    pedestalitem = multiworld.get_location('Master Sword Pedestal', player).item
     pedestal_text = 'Some Hot Air' if pedestalitem is None else hint_text(pedestalitem,
                                                                           True) if pedestalitem.pedestal_hint_text is not None else 'Unknown Item'
     tt['mastersword_pedestal_translated'] = pedestal_text
     pedestal_credit_text = 'and the Hot Air' if pedestalitem is None else \
         w.pedestal_credit_texts.get(pedestalitem.code, 'and the Unknown Item')
 
-    etheritem = world.get_location('Ether Tablet', player).item
+    etheritem = multiworld.get_location('Ether Tablet', player).item
     ether_text = 'Some Hot Air' if etheritem is None else hint_text(etheritem,
                                                                     True) if etheritem.pedestal_hint_text is not None else 'Unknown Item'
     tt['tablet_ether_book'] = ether_text
-    bombositem = world.get_location('Bombos Tablet', player).item
+    bombositem = multiworld.get_location('Bombos Tablet', player).item
     bombos_text = 'Some Hot Air' if bombositem is None else hint_text(bombositem,
                                                                       True) if bombositem.pedestal_hint_text is not None else 'Unknown Item'
     tt['tablet_bombos_book'] = bombos_text
 
     # inverted spawn menu changes
-    if world.worlds[player].options.mode == 'inverted':
+    if multiworld.worlds[player].options.mode == 'inverted':
         tt['menu_start_2'] = "{MENU}\n{SPEED0}\n≥@'s house\n Dark Chapel\n{CHOICE3}"
         tt['menu_start_3'] = "{MENU}\n{SPEED0}\n≥@'s house\n Dark Chapel\n Mountain Cave\n{CHOICE2}"
 
-    for at, text, _ in world.worlds[player].options.plando_texts:
+    for at, text, _ in multiworld.worlds[player].options.plando_texts:
 
         if at not in tt:
             raise Exception(f"No text target \"{at}\" found.")
@@ -2551,22 +2554,22 @@ def write_strings(rom, world, player):
 
     credits = Credits()
 
-    sickkiditem = world.get_location('Sick Kid', player).item
+    sickkiditem = multiworld.get_location('Sick Kid', player).item
     sickkiditem_text = local_random.choice(SickKid_texts) \
         if sickkiditem is None or sickkiditem.code not in w.sickkid_credit_texts \
         else w.sickkid_credit_texts[sickkiditem.code]
 
-    zoraitem = world.get_location('King Zora', player).item
+    zoraitem = multiworld.get_location('King Zora', player).item
     zoraitem_text = local_random.choice(Zora_texts) \
         if zoraitem is None or zoraitem.code not in w.zora_credit_texts \
         else w.zora_credit_texts[zoraitem.code]
 
-    magicshopitem = world.get_location('Potion Shop', player).item
+    magicshopitem = multiworld.get_location('Potion Shop', player).item
     magicshopitem_text = local_random.choice(MagicShop_texts) \
         if magicshopitem is None or magicshopitem.code not in w.magicshop_credit_texts \
         else w.magicshop_credit_texts[magicshopitem.code]
 
-    fluteboyitem = world.get_location('Flute Spot', player).item
+    fluteboyitem = multiworld.get_location('Flute Spot', player).item
     fluteboyitem_text = local_random.choice(FluteBoy_texts) \
         if fluteboyitem is None or fluteboyitem.code not in w.fluteboy_credit_texts \
         else w.fluteboy_credit_texts[fluteboyitem.code]
@@ -2595,7 +2598,7 @@ def write_strings(rom, world, player):
     rom.write_bytes(0x76CC0, [byte for p in pointers for byte in [p & 0xFF, p >> 8 & 0xFF]])
 
 
-def set_inverted_mode(world, player, rom):
+def set_inverted_mode(multiworld: MultiWorld, player: int, rom: LocalRom):
     rom.write_byte(snes_to_pc(0x0283E0), 0xF0)  # residual portals
     rom.write_byte(snes_to_pc(0x02B34D), 0xF0)
     rom.write_byte(snes_to_pc(0x06DB78), 0x8B)
@@ -2613,12 +2616,12 @@ def set_inverted_mode(world, player, rom):
     rom.write_byte(snes_to_pc(0x08D40C), 0xD0)  # morph proof
     # the following bytes should only be written in vanilla
     # or they'll overwrite the randomizer's shuffles
-    if world.worlds[player].options.entrance_shuffle == 'vanilla':
+    if multiworld.worlds[player].options.entrance_shuffle == 'vanilla':
         rom.write_byte(0xDBB73 + 0x23, 0x37)  # switch AT and GT
         rom.write_byte(0xDBB73 + 0x36, 0x24)
         rom.write_int16(0x15AEE + 2 * 0x38, 0x00E0)
         rom.write_int16(0x15AEE + 2 * 0x25, 0x000C)
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
         rom.write_byte(0x15B8C, 0x6C)
         rom.write_byte(0xDBB73 + 0x00, 0x53)  # switch bomb shop and links house
         rom.write_byte(0xDBB73 + 0x52, 0x01)
@@ -2676,7 +2679,7 @@ def set_inverted_mode(world, player, rom):
     rom.write_int16(snes_to_pc(0x02D9A6), 0x005A)
     rom.write_byte(snes_to_pc(0x02D9B3), 0x12)
     # keep the old man spawn point at old man house unless shuffle is vanilla
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_full', 'dungeons_simple', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_full', 'dungeons_simple', 'dungeons_crossed']:
         rom.write_bytes(snes_to_pc(0x308350), [0x00, 0x00, 0x01])
         rom.write_int16(snes_to_pc(0x02D8DE), 0x00F1)
         rom.write_bytes(snes_to_pc(0x02D910), [0x1F, 0x1E, 0x1F, 0x1F, 0x03, 0x02, 0x03, 0x03])
@@ -2739,7 +2742,7 @@ def set_inverted_mode(world, player, rom):
     rom.write_int16s(snes_to_pc(0x1bb836), [0x001B, 0x001B, 0x001B])
     rom.write_int16(snes_to_pc(0x308300), 0x0140)  # new pyramid hole entrance
     rom.write_int16(snes_to_pc(0x308320), 0x001B)
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
         rom.write_byte(snes_to_pc(0x308340), 0x7B)
     rom.write_int16(snes_to_pc(0x1af504), 0x148B)
     rom.write_int16(snes_to_pc(0x1af50c), 0x149B)
@@ -2776,10 +2779,10 @@ def set_inverted_mode(world, player, rom):
     rom.write_bytes(snes_to_pc(0x1BC85A), [0x50, 0x0F, 0x82])
     rom.write_int16(0xDB96F + 2 * 0x35, 0x001B)  # move pyramid exit door
     rom.write_int16(0xDBA71 + 2 * 0x35, 0x06A4)
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
         rom.write_byte(0xDBB73 + 0x35, 0x36)
     rom.write_byte(snes_to_pc(0x09D436), 0xF3)  # remove castle gate warp
-    if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+    if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
         rom.write_int16(0x15AEE + 2 * 0x37, 0x0010)  # pyramid exit to new hc area
         rom.write_byte(0x15B8C + 0x37, 0x1B)
         rom.write_int16(0x15BDB + 2 * 0x37, 0x0418)
diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index a5b14e0c2d..bce75a157b 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -1,9 +1,9 @@
 import collections
 import logging
-from typing import Iterator, Set
+from typing import Callable, Iterator, Set, TYPE_CHECKING
 
 from Options import ItemsAccessibility
-from BaseClasses import MultiWorld
+from BaseClasses import CollectionState, Item, Location, MultiWorld, Region
 from worlds.generic.Rules import (add_item_rule, add_rule, forbid_item,
                                   item_name_in_location_names, location_item_name, set_rule, allow_self_locking_items)
 
@@ -20,113 +20,117 @@ from .StateHelpers import (can_extend_magic, can_kill_most_things,
                            has_fire_source, has_hearts, has_melee_weapon,
                            has_misery_mire_medallion, has_sword, has_turtle_rock_medallion,
                            has_triforce_pieces, can_use_bombs, can_bomb_or_bonk,
-                           can_activate_crystal_switch)
+                           can_activate_crystal_switch, can_kill_standard_start)
+from .SubClasses import ALttPLocation
 from .UnderworldGlitchRules import underworld_glitches_rules
 
+if TYPE_CHECKING:
+    from . import ALTTPWorld
 
-def set_rules(world):
+
+def set_rules(world: "ALTTPWorld"):
     player = world.player
-    world = world.multiworld
-    if world.worlds[player].options.glitches_required == 'no_logic':
-        if player == next(player_id for player_id in world.get_game_players("A Link to the Past")
-                          if world.worlds[player_id].options.glitches_required == 'no_logic'):  # only warn one time
+    multiworld = world.multiworld
+    if world.options.glitches_required == 'no_logic':
+        if player == next(player_id for player_id in multiworld.get_game_players("A Link to the Past")
+                          if multiworld.worlds[player_id].options.glitches_required == 'no_logic'):  # only warn one time
             logging.info(
                 'WARNING! Seeds generated under this logic often require major glitches and may be impossible!')
 
-        if world.players == 1:
-            for exit in world.get_region('Menu', player).exits:
+        if multiworld.players == 1:
+            for exit in multiworld.get_region('Menu', player).exits:
                 exit.hide_path = True
             return
         else:
             # Set access rules according to max glitches for multiworld progression.
             # Set accessibility to none, and shuffle assuming the no logic players can always win
-            world.worlds[player].options.accessibility.value = ItemsAccessibility.option_minimal
-            world.worlds[player].options.progression_balancing.value = 0
+            world.options.accessibility.value = ItemsAccessibility.option_minimal
+            world.options.progression_balancing.value = 0
 
     else:
-        world.completion_condition[player] = lambda state: state.has('Triforce', player)
+        multiworld.completion_condition[player] = lambda state: state.has('Triforce', player)
 
-    dungeon_boss_rules(world, player)
-    global_rules(world, player)
+    dungeon_boss_rules(multiworld, player)
+    global_rules(multiworld, player)
 
-    if world.worlds[player].options.mode != 'inverted':
-        default_rules(world, player)
+    if world.options.mode != 'inverted':
+        default_rules(multiworld, player)
 
-    if world.worlds[player].options.mode == 'open':
-        open_rules(world, player)
-    elif world.worlds[player].options.mode == 'standard':
-        standard_rules(world, player)
-    elif world.worlds[player].options.mode == 'inverted':
-        open_rules(world, player)
-        inverted_rules(world, player)
+    if world.options.mode == 'open':
+        open_rules(multiworld, player)
+    elif world.options.mode == 'standard':
+        standard_rules(multiworld, player)
+    elif world.options.mode == 'inverted':
+        open_rules(multiworld, player)
+        inverted_rules(multiworld, player)
     else:
-        raise NotImplementedError(f'World state {world.worlds[player].options.mode} is not implemented yet')
+        raise NotImplementedError(f'World state {world.options.mode} is not implemented yet')
 
-    if world.worlds[player].options.glitches_required == 'no_glitches':
-        no_glitches_rules(world, player)
-        forbid_bomb_jump_requirements(world, player)
-    elif world.worlds[player].options.glitches_required == 'overworld_glitches':
+    if world.options.glitches_required == 'no_glitches':
+        no_glitches_rules(multiworld, player)
+        forbid_bomb_jump_requirements(multiworld, player)
+    elif world.options.glitches_required == 'overworld_glitches':
         # Initially setting no_glitches_rules to set the baseline rules for some
         # entrances. The overworld_glitches_rules set is primarily additive.
-        no_glitches_rules(world, player)
-        fake_flipper_rules(world, player)
-        overworld_glitches_rules(world, player)
-        forbid_bomb_jump_requirements(world, player)
-    elif world.worlds[player].options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
-        no_glitches_rules(world, player)
-        fake_flipper_rules(world, player)
-        overworld_glitches_rules(world, player)
-        underworld_glitches_rules(world, player)
-        bomb_jump_requirements(world, player)
-    elif world.worlds[player].options.glitches_required == 'minor_glitches':
-        no_glitches_rules(world, player)
-        fake_flipper_rules(world, player)
-        forbid_bomb_jump_requirements(world, player)
+        no_glitches_rules(multiworld, player)
+        fake_flipper_rules(multiworld, player)
+        overworld_glitches_rules(multiworld, player)
+        forbid_bomb_jump_requirements(multiworld, player)
+    elif world.options.glitches_required in ['hybrid_major_glitches', 'no_logic']:
+        no_glitches_rules(multiworld, player)
+        fake_flipper_rules(multiworld, player)
+        overworld_glitches_rules(multiworld, player)
+        underworld_glitches_rules(multiworld, player)
+        bomb_jump_requirements(multiworld, player)
+    elif world.options.glitches_required == 'minor_glitches':
+        no_glitches_rules(multiworld, player)
+        fake_flipper_rules(multiworld, player)
+        forbid_bomb_jump_requirements(multiworld, player)
     else:
-        raise NotImplementedError(f'Not implemented yet: Logic - {world.worlds[player].options.glitches_required}')
+        raise NotImplementedError(f'Not implemented yet: Logic - {world.options.glitches_required}')
 
-    if world.worlds[player].options.goal == 'bosses':
+    if world.options.goal == 'bosses':
         # require all bosses to beat ganon
-        add_rule(world.get_location('Ganon', player), lambda state: state.can_reach('Master Sword Pedestal', 'Location', player) and state.has('Beat Agahnim 1', player) and state.has('Beat Agahnim 2', player) and has_crystals(state, 7, player))
-    elif world.worlds[player].options.goal == 'ganon':
+        add_rule(multiworld.get_location('Ganon', player), lambda state: state.can_reach('Master Sword Pedestal', 'Location', player) and state.has('Beat Agahnim 1', player) and state.has('Beat Agahnim 2', player) and has_crystals(state, 7, player))
+    elif world.options.goal == 'ganon':
         # require aga2 to beat ganon
-        add_rule(world.get_location('Ganon', player), lambda state: state.has('Beat Agahnim 2', player))
+        add_rule(multiworld.get_location('Ganon', player), lambda state: state.has('Beat Agahnim 2', player))
 
-    if world.worlds[player].options.mode != 'inverted':
-        set_big_bomb_rules(world, player)
-        if world.worlds[player].options.glitches_required.current_key in {'overworld_glitches', 'hybrid_major_glitches', 'no_logic'} and world.worlds[player].options.entrance_shuffle.current_key not in {'insanity', 'insanity_legacy', 'madness'}:
-            path_to_courtyard = mirrorless_path_to_castle_courtyard(world, player)
-            add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.multiworld.get_entrance('Dark Death Mountain Offset Mirror', player).can_reach(state) and all(rule(state) for rule in path_to_courtyard), 'or')
+    if world.options.mode != 'inverted':
+        set_big_bomb_rules(multiworld, player)
+        if world.options.glitches_required.current_key in {'overworld_glitches', 'hybrid_major_glitches', 'no_logic'} and world.options.entrance_shuffle.current_key not in {'insanity', 'insanity_legacy', 'madness'}:
+            path_to_courtyard = mirrorless_path_to_castle_courtyard(multiworld, player)
+            add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.multiworld.get_entrance('Dark Death Mountain Offset Mirror', player).can_reach(state) and all(rule(state) for rule in path_to_courtyard), 'or')
     else:
-        set_inverted_big_bomb_rules(world, player)
+        set_inverted_big_bomb_rules(multiworld, player)
 
     # if swamp and dam have not been moved we require mirror for swamp palace
     # however there is mirrorless swamp in hybrid MG, so we don't necessarily want this. HMG handles this requirement itself. 
-    if not world.worlds[player].swamp_patch_required and world.worlds[player].options.glitches_required not in ['hybrid_major_glitches', 'no_logic']:
-        add_rule(world.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player))
+    if not multiworld.worlds[player].swamp_patch_required and world.options.glitches_required not in ['hybrid_major_glitches', 'no_logic']:
+        add_rule(multiworld.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player))
 
     # GT Entrance may be required for Turtle Rock for OWG and < 7 required
-    ganons_tower = world.get_entrance('Inverted Ganons Tower' if world.worlds[player].options.mode == 'inverted' else 'Ganons Tower', player)
-    if (world.worlds[player].options.crystals_needed_for_gt == 7
-            and not (world.worlds[player].options.glitches_required
+    ganons_tower = multiworld.get_entrance('Inverted Ganons Tower' if world.options.mode == 'inverted' else 'Ganons Tower', player)
+    if (world.options.crystals_needed_for_gt == 7
+            and not (world.options.glitches_required
                      in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']
-                     and world.worlds[player].options.mode != 'inverted')):
+                     and world.options.mode != 'inverted')):
         set_rule(ganons_tower, lambda state: False)
 
-    set_trock_key_rules(world, player)
+    set_trock_key_rules(multiworld, player)
 
-    set_rule(ganons_tower, lambda state: has_crystals(state, state.multiworld.worlds[player].options.crystals_needed_for_gt, player))
-    if world.worlds[player].options.mode != 'inverted' and world.worlds[player].options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
-        add_rule(world.get_entrance('Ganons Tower', player), lambda state: state.multiworld.get_entrance('Ganons Tower Ascent', player).can_reach(state), 'or')
+    set_rule(ganons_tower, lambda state: has_crystals(state, world.options.crystals_needed_for_gt.value, player))
+    if world.options.mode != 'inverted' and world.options.glitches_required in ['overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
+        add_rule(multiworld.get_entrance('Ganons Tower', player), lambda state: state.multiworld.get_entrance('Ganons Tower Ascent', player).can_reach(state), 'or')
 
-    set_bunny_rules(world, player, world.worlds[player].options.mode == 'inverted')
+    set_bunny_rules(multiworld, player, world.options.mode == 'inverted')
 
 
-def mirrorless_path_to_castle_courtyard(world, player):
+def mirrorless_path_to_castle_courtyard(multiworld: MultiWorld, player: int):
     # If Agahnim is defeated then the courtyard needs to be accessible without using the mirror for the mirror offset glitch.
     # Only considering the secret passage for now (in non-insanity shuffle).  Basically, if it's Ganon you need the master sword.
-    start = world.get_entrance('Hyrule Castle Secret Entrance Drop', player)
-    target = world.get_region('Hyrule Castle Courtyard', player)
+    start = multiworld.get_entrance('Hyrule Castle Secret Entrance Drop', player)
+    target = multiworld.get_region('Hyrule Castle Courtyard', player)
     seen = {start.parent_region, start.connected_region}
     queue = collections.deque([(start.connected_region, [])])
     while queue:
@@ -139,37 +143,37 @@ def mirrorless_path_to_castle_courtyard(world, player):
                 else:
                     queue.append((entrance.connected_region, new_path))
 
-    raise Exception(f"Could not find mirrorless path to castle courtyard for Player {player} ({world.get_player_name(player)})")
+    raise Exception(f"Could not find mirrorless path to castle courtyard for Player {player} ({multiworld.get_player_name(player)})")
 
 
-def set_defeat_dungeon_boss_rule(location):
+def set_defeat_dungeon_boss_rule(location: ALttPLocation):
     # Lambda required to defer evaluation of dungeon.boss since it will change later if boss shuffle is used
     add_rule(location, lambda state: location.parent_region.dungeon.boss.can_defeat(state))
 
 
-def set_always_allow(spot, rule):
+def set_always_allow(spot: Location, rule: Callable[[CollectionState, Item], bool]):
     spot.always_allow = rule
 
 
-def add_lamp_requirement(world: MultiWorld, spot, player: int, has_accessible_torch: bool = False):
-    if world.worlds[player].options.dark_room_logic == "lamp":
+def add_lamp_requirement(multiworld: MultiWorld, spot, player: int, has_accessible_torch: bool = False):
+    if multiworld.worlds[player].options.dark_room_logic == "lamp":
         add_rule(spot, lambda state: state.has('Lamp', player))
-    elif world.worlds[player].options.dark_room_logic == "torches":  # implicitly lamp as well
+    elif multiworld.worlds[player].options.dark_room_logic == "torches":  # implicitly lamp as well
         if has_accessible_torch:
             add_rule(spot, lambda state: state.has('Lamp', player) or state.has('Fire Rod', player))
         else:
             add_rule(spot, lambda state: state.has('Lamp', player))
-    elif world.worlds[player].options.dark_room_logic == "none":
+    elif multiworld.worlds[player].options.dark_room_logic == "none":
         pass
     else:
-        raise ValueError(f"Unknown Dark Room Logic: {world.worlds[player].options.dark_room_logic}")
+        raise ValueError(f"Unknown Dark Room Logic: {multiworld.worlds[player].options.dark_room_logic}")
 
 
 non_crossover_items = (item_name_groups["Small Keys"] | item_name_groups["Big Keys"] | progression_items) - {
     "Small Key (Universal)"}
 
 
-def dungeon_boss_rules(world, player):
+def dungeon_boss_rules(multiworld: MultiWorld, player: int):
     boss_locations = {
         'Agahnim 1',
         'Tower of Hera - Boss',
@@ -190,7 +194,7 @@ def dungeon_boss_rules(world, player):
         'Palace of Darkness - Prize',
     }
     for location in boss_locations:
-        set_defeat_dungeon_boss_rule(world.get_location(location, player))
+        set_defeat_dungeon_boss_rule(multiworld.get_location(location, player))
 
 
 def global_rules(multiworld: MultiWorld, player: int):
@@ -616,330 +620,332 @@ def global_rules(multiworld: MultiWorld, player: int):
     set_rule(multiworld.get_location('Flute Activation Spot', player), lambda state: state.has('Flute', player))
 
 
-def default_rules(world, player):
+def default_rules(multiworld: MultiWorld, player: int):
     """Default world rules when world state is not inverted."""
     # overworld requirements
 
-    set_rule(world.get_entrance('Light World Bomb Hut', player), lambda state: can_use_bombs(state, player))
-    set_rule(world.get_entrance('Light Hype Fairy', player), lambda state: can_use_bombs(state, player))
-    set_rule(world.get_entrance('Mini Moldorm Cave', player), lambda state: can_use_bombs(state, player))
-    set_rule(world.get_entrance('Ice Rod Cave', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Light World Bomb Hut', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Light Hype Fairy', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Mini Moldorm Cave', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Ice Rod Cave', player), lambda state: can_use_bombs(state, player))
 
-    set_rule(world.get_entrance('Kings Grave', player), lambda state: state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('Kings Grave Outer Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Kings Grave Inner Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Kings Grave Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Kings Grave', player), lambda state: state.has('Pegasus Boots', player))
+    set_rule(multiworld.get_entrance('Kings Grave Outer Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Kings Grave Inner Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Kings Grave Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
     # Caution: If king's grave is releaxed at all to account for reaching it via a two way cave's exit in insanity mode, then the bomb shop logic will need to be updated (that would involve create a small ledge-like Region for it)
-    set_rule(world.get_entrance('Bonk Fairy (Light)', player), lambda state: state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('Lumberjack Tree Tree', player), lambda state: state.has('Pegasus Boots', player) and state.has('Beat Agahnim 1', player))
-    set_rule(world.get_entrance('Bonk Rock Cave', player), lambda state: state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('Desert Palace Stairs', player), lambda state: state.has('Book of Mudora', player))
-    set_rule(world.get_entrance('Sanctuary Grave', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('20 Rupee Cave', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('50 Rupee Cave', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Death Mountain Entrance Rock', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Flute Spot 1', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('Lake Hylia Central Island Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Dark Desert Teleporter', player), lambda state: state.has('Activated Flute', player) and can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('East Hyrule Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
-    set_rule(world.get_entrance('South Hyrule Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
-    set_rule(world.get_entrance('Kakariko Teleporter', player), lambda state: ((state.has('Hammer', player) and can_lift_rocks(state, player)) or can_lift_heavy_rocks(state, player)) and state.has('Moon Pearl', player)) # bunny cannot lift bushes
-    set_rule(world.get_location('Flute Spot', player), lambda state: state.has('Shovel', player))
-    set_rule(world.get_entrance('Bat Cave Drop Ledge', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Bonk Fairy (Light)', player), lambda state: state.has('Pegasus Boots', player))
+    set_rule(multiworld.get_entrance('Lumberjack Tree Tree', player), lambda state: state.has('Pegasus Boots', player) and state.has('Beat Agahnim 1', player))
+    set_rule(multiworld.get_entrance('Bonk Rock Cave', player), lambda state: state.has('Pegasus Boots', player))
+    set_rule(multiworld.get_entrance('Desert Palace Stairs', player), lambda state: state.has('Book of Mudora', player))
+    set_rule(multiworld.get_entrance('Sanctuary Grave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('20 Rupee Cave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('50 Rupee Cave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Death Mountain Entrance Rock', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Flute Spot 1', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('Lake Hylia Central Island Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Dark Desert Teleporter', player), lambda state: state.has('Activated Flute', player) and can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('East Hyrule Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
+    set_rule(multiworld.get_entrance('South Hyrule Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
+    set_rule(multiworld.get_entrance('Kakariko Teleporter', player), lambda state: ((state.has('Hammer', player) and can_lift_rocks(state, player)) or can_lift_heavy_rocks(state, player)) and state.has('Moon Pearl', player)) # bunny cannot lift bushes
+    set_rule(multiworld.get_location('Flute Spot', player), lambda state: state.has('Shovel', player))
+    set_rule(multiworld.get_entrance('Bat Cave Drop Ledge', player), lambda state: state.has('Hammer', player))
 
-    set_rule(world.get_location('Zora\'s Ledge', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_entrance('Waterfall of Wishing', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_location('Frog', player), lambda state: can_lift_heavy_rocks(state, player)) # will get automatic moon pearl requirement
-    set_rule(world.get_location('Potion Shop', player), lambda state: state.has('Mushroom', player))
-    set_rule(world.get_entrance('Desert Palace Entrance (North) Rocks', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Desert Ledge Return Rocks', player), lambda state: can_lift_rocks(state, player))  # should we decide to place something that is not a dungeon end up there at some point
-    set_rule(world.get_entrance('Checkerboard Cave', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or has_beam_sword(state, player) or state.has('Beat Agahnim 1', player))  # barrier gets removed after killing agahnim, relevant for entrance shuffle
-    set_rule(world.get_entrance('Top of Pyramid', player), lambda state: state.has('Beat Agahnim 1', player))
-    set_rule(world.get_entrance('Old Man Cave Exit (West)', player), lambda state: False)  # drop cannot be climbed up
-    set_rule(world.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player))
-    set_rule(world.get_entrance('Broken Bridge (East)', player), lambda state: state.has('Hookshot', player))
-    set_rule(world.get_entrance('East Death Mountain Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Fairy Ascension Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: state.has('Mirror', player))  # can erase block
-    set_rule(world.get_entrance('Death Mountain (Top)', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Turtle Rock Teleporter', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Hammer', player))
-    set_rule(world.get_entrance('East Death Mountain (Top)', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_location('Zora\'s Ledge', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Waterfall of Wishing', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_location('Frog', player), lambda state: can_lift_heavy_rocks(state, player)) # will get automatic moon pearl requirement
+    set_rule(multiworld.get_location('Potion Shop', player), lambda state: state.has('Mushroom', player))
+    set_rule(multiworld.get_entrance('Desert Palace Entrance (North) Rocks', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Desert Ledge Return Rocks', player), lambda state: can_lift_rocks(state, player))  # should we decide to place something that is not a dungeon end up there at some point
+    set_rule(multiworld.get_entrance('Checkerboard Cave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or has_beam_sword(state, player) or state.has('Beat Agahnim 1', player))  # barrier gets removed after killing agahnim, relevant for entrance shuffle
+    set_rule(multiworld.get_entrance('Top of Pyramid', player), lambda state: state.has('Beat Agahnim 1', player))
+    set_rule(multiworld.get_entrance('Old Man Cave Exit (West)', player), lambda state: False)  # drop cannot be climbed up
+    set_rule(multiworld.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Broken Bridge (East)', player), lambda state: state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('East Death Mountain Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Fairy Ascension Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: state.has('Mirror', player))  # can erase block
+    set_rule(multiworld.get_entrance('Death Mountain (Top)', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Turtle Rock Teleporter', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('East Death Mountain (Top)', player), lambda state: state.has('Hammer', player))
 
-    set_rule(world.get_entrance('Catfish Exit Rock', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Catfish Entrance Rock', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Northeast Dark World Broken Bridge Pass', player), lambda state: state.has('Moon Pearl', player) and (can_lift_rocks(state, player) or state.has('Hammer', player) or state.has('Flippers', player)))
-    set_rule(world.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: state.has('Moon Pearl', player) and (can_lift_rocks(state, player) or state.has('Hammer', player)))
-    set_rule(world.get_entrance('South Dark World Bridge', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bonk Fairy (Dark)', player), lambda state: state.has('Moon Pearl', player) and state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('West Dark World Gap', player), lambda state: state.has('Moon Pearl', player) and state.has('Hookshot', player))
-    set_rule(world.get_entrance('Palace of Darkness', player), lambda state: state.has('Moon Pearl', player)) # kiki needs pearl
-    set_rule(world.get_entrance('Hyrule Castle Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Hyrule Castle Main Gate', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: (state.has('Moon Pearl', player) and state.has('Flippers', player) or state.has('Magic Mirror', player)))  # Overworld Bunny Revival
-    set_rule(world.get_location('Bombos Tablet', player), lambda state: can_retrieve_tablet(state, player))
-    set_rule(world.get_entrance('Dark Lake Hylia Drop (South)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # ToDo any fake flipper set up?
-    set_rule(world.get_entrance('Dark Lake Hylia Ledge Fairy', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Dark Lake Hylia Ledge Spike Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Village of Outcasts Heavy Rock', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Hype Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Brewery', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Thieves Town', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot pull
-    set_rule(world.get_entrance('Skull Woods First Section Hole (North)', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot lift bush
-    set_rule(world.get_entrance('Skull Woods Second Section Hole', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot lift bush
-    set_rule(world.get_entrance('Maze Race Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Cave 45 Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Bombos Tablet Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('East Dark World Bridge', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
-    set_rule(world.get_entrance('Lake Hylia Island Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player) and state.has('Flippers', player))
-    set_rule(world.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('East Dark World River Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
-    set_rule(world.get_entrance('Graveyard Ledge Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Bumper Cave Entrance Rock', player), lambda state: state.has('Moon Pearl', player) and can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Bat Cave Drop Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark World Hammer Peg Cave', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
-    set_rule(world.get_entrance('Village of Outcasts Eastern Rocks', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Peg Area Rocks', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Village of Outcasts Pegs', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
-    set_rule(world.get_entrance('Grassy Lawn Pegs', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
-    set_rule(world.get_entrance('Bumper Cave Exit (Top)', player), lambda state: state.has('Cape', player))
-    set_rule(world.get_entrance('Bumper Cave Exit (Bottom)', player), lambda state: state.has('Cape', player) or state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Catfish Exit Rock', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Catfish Entrance Rock', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Northeast Dark World Broken Bridge Pass', player), lambda state: state.has('Moon Pearl', player) and (can_lift_rocks(state, player) or state.has('Hammer', player) or state.has('Flippers', player)))
+    set_rule(multiworld.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: state.has('Moon Pearl', player) and (can_lift_rocks(state, player) or state.has('Hammer', player)))
+    set_rule(multiworld.get_entrance('South Dark World Bridge', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bonk Fairy (Dark)', player), lambda state: state.has('Moon Pearl', player) and state.has('Pegasus Boots', player))
+    set_rule(multiworld.get_entrance('West Dark World Gap', player), lambda state: state.has('Moon Pearl', player) and state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Palace of Darkness', player), lambda state: state.has('Moon Pearl', player)) # kiki needs pearl
+    set_rule(multiworld.get_entrance('Hyrule Castle Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Hyrule Castle Main Gate', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: (state.has('Moon Pearl', player) and state.has('Flippers', player) or state.has('Magic Mirror', player)))  # Overworld Bunny Revival
+    set_rule(multiworld.get_location('Bombos Tablet', player), lambda state: can_retrieve_tablet(state, player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (South)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # ToDo any fake flipper set up?
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Fairy', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Spike Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Heavy Rock', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Hype Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Brewery', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Thieves Town', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot pull
+    set_rule(multiworld.get_entrance('Skull Woods First Section Hole (North)', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot lift bush
+    set_rule(multiworld.get_entrance('Skull Woods Second Section Hole', player), lambda state: state.has('Moon Pearl', player)) # bunny cannot lift bush
+    set_rule(multiworld.get_entrance('Maze Race Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Cave 45 Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Bombos Tablet Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('East Dark World Bridge', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Lake Hylia Island Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player) and state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('East Dark World River Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Graveyard Ledge Mirror Spot', player), lambda state: state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Entrance Rock', player), lambda state: state.has('Moon Pearl', player) and can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Bat Cave Drop Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark World Hammer Peg Cave', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Eastern Rocks', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Peg Area Rocks', player), lambda state: state.has('Moon Pearl', player) and can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Pegs', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Grassy Lawn Pegs', player), lambda state: state.has('Moon Pearl', player) and state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Exit (Top)', player), lambda state: state.has('Cape', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Exit (Bottom)', player), lambda state: state.has('Cape', player) or state.has('Hookshot', player))
 
-    set_rule(world.get_entrance('Skull Woods Final Section', player), lambda state: state.has('Fire Rod', player) and state.has('Moon Pearl', player)) # bunny cannot use fire rod
-    set_rule(world.get_entrance('Misery Mire', player), lambda state: state.has('Moon Pearl', player) and has_sword(state, player) and has_misery_mire_medallion(state, player))  # sword required to cast magic (!)
-    set_rule(world.get_entrance('Desert Ledge (Northeast) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Skull Woods Final Section', player), lambda state: state.has('Fire Rod', player) and state.has('Moon Pearl', player)) # bunny cannot use fire rod
+    set_rule(multiworld.get_entrance('Misery Mire', player), lambda state: state.has('Moon Pearl', player) and has_sword(state, player) and has_misery_mire_medallion(state, player))  # sword required to cast magic (!)
+    set_rule(multiworld.get_entrance('Desert Ledge (Northeast) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
 
-    set_rule(world.get_entrance('Desert Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Desert Palace Stairs Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Desert Palace Entrance (North) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Spectacle Rock Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Hookshot Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Desert Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Desert Palace Stairs Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Desert Palace Entrance (North) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Spectacle Rock Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Hookshot Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
 
-    set_rule(world.get_entrance('East Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Mimic Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Spiral Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has('Magic Mirror', player) and state.has('Moon Pearl', player))  # need to lift flowers
-    set_rule(world.get_entrance('Isolated Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Superbunny Cave Exit (Bottom)', player), lambda state: False)  # Cannot get to bottom exit from top. Just exists for shuffling
-    set_rule(world.get_entrance('Floating Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Turtle Rock', player), lambda state: state.has('Moon Pearl', player) and has_sword(state, player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))  # sword required to cast magic (!)
+    set_rule(multiworld.get_entrance('East Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Mimic Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Spiral Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has('Magic Mirror', player) and state.has('Moon Pearl', player))  # need to lift flowers
+    set_rule(multiworld.get_entrance('Isolated Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Superbunny Cave Exit (Bottom)', player), lambda state: False)  # Cannot get to bottom exit from top. Just exists for shuffling
+    set_rule(multiworld.get_entrance('Floating Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Turtle Rock', player), lambda state: state.has('Moon Pearl', player) and has_sword(state, player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))  # sword required to cast magic (!)
 
-    set_rule(world.get_entrance('Pyramid Hole', player), lambda state: state.has('Beat Agahnim 2', player) or world.worlds[player].options.open_pyramid.to_bool(world, player))
+    set_rule(multiworld.get_entrance('Pyramid Hole', player), lambda state: state.has('Beat Agahnim 2', player) or multiworld.worlds[player].options.open_pyramid.to_bool(multiworld, player))
 
-    if world.worlds[player].options.swordless:
-        swordless_rules(world, player)
+    if multiworld.worlds[player].options.swordless:
+        swordless_rules(multiworld, player)
 
 
-def inverted_rules(world, player):
+def inverted_rules(multiworld: MultiWorld, player: int):
     # s&q regions.
-    set_rule(world.get_entrance('Castle Ledge S&Q', player), lambda state: state.has('Magic Mirror', player) and state.has('Beat Agahnim 1', player))
+    set_rule(multiworld.get_entrance('Castle Ledge S&Q', player), lambda state: state.has('Magic Mirror', player) and state.has('Beat Agahnim 1', player))
 
     # overworld requirements 
-    set_rule(world.get_location('Maze Race', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Mini Moldorm Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Ice Rod Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Light Hype Fairy', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('Potion Shop Pier', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Light World Pier', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Kings Grave', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Kings Grave Outer Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Kings Grave Inner Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Potion Shop Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Potion Shop Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Potion Shop Outer Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Potion Shop Inner Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Graveyard Cave Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Graveyard Cave Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Secret Passage Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Secret Passage Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bonk Fairy (Light)', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bat Cave Drop Ledge', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Lumberjack Tree Tree', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player) and state.has('Beat Agahnim 1', player))
-    set_rule(world.get_entrance('Bonk Rock Cave', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Desert Palace Stairs', player), lambda state: state.has('Book of Mudora', player))  # bunny can use book
-    set_rule(world.get_entrance('Sanctuary Grave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('20 Rupee Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('50 Rupee Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Death Mountain Entrance Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark Lake Hylia Central Island Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Dark Desert Teleporter', player), lambda state: state.has('Activated Flute', player) and can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('East Dark World Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
-    set_rule(world.get_entrance('South Dark World Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
-    set_rule(world.get_entrance('West Dark World Teleporter', player), lambda state: ((state.has('Hammer', player) and can_lift_rocks(state, player)) or can_lift_heavy_rocks(state, player)) and state.has('Moon Pearl', player))
-    set_rule(world.get_location('Flute Spot', player), lambda state: state.has('Shovel', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_location('Maze Race', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Mini Moldorm Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Ice Rod Cave', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Light Hype Fairy', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Potion Shop Pier', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Light World Pier', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Kings Grave', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Kings Grave Outer Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Kings Grave Inner Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Potion Shop Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Potion Shop Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Potion Shop Outer Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Potion Shop Inner Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Graveyard Cave Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Graveyard Cave Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Secret Passage Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Secret Passage Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bonk Fairy (Light)', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bat Cave Drop Ledge', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Lumberjack Tree Tree', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player) and state.has('Beat Agahnim 1', player))
+    set_rule(multiworld.get_entrance('Bonk Rock Cave', player), lambda state: state.has('Pegasus Boots', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Desert Palace Stairs', player), lambda state: state.has('Book of Mudora', player))  # bunny can use book
+    set_rule(multiworld.get_entrance('Sanctuary Grave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('20 Rupee Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('50 Rupee Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Death Mountain Entrance Rock', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Central Island Teleporter', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Dark Desert Teleporter', player), lambda state: state.has('Activated Flute', player) and can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('East Dark World Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
+    set_rule(multiworld.get_entrance('South Dark World Teleporter', player), lambda state: state.has('Hammer', player) and can_lift_rocks(state, player) and state.has('Moon Pearl', player)) # bunny cannot use hammer
+    set_rule(multiworld.get_entrance('West Dark World Teleporter', player), lambda state: ((state.has('Hammer', player) and can_lift_rocks(state, player)) or can_lift_heavy_rocks(state, player)) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_location('Flute Spot', player), lambda state: state.has('Shovel', player) and state.has('Moon Pearl', player))
 
-    set_rule(world.get_location('Zora\'s Ledge', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Waterfall of Wishing Cave', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Northeast Light World Return', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_location('Frog', player), lambda state: can_lift_heavy_rocks(state, player) and (state.has('Moon Pearl', player) or state.has('Beat Agahnim 1', player)) or (state.can_reach('Light World', 'Region', player) and state.has('Magic Mirror', player))) # Need LW access using Mirror or Portal
-    set_rule(world.get_location('Missing Smith', player), lambda state: state.has('Get Frog', player) and state.can_reach('Blacksmiths Hut', 'Region', player)) # Can't S&Q with smith
-    set_rule(world.get_location('Blacksmith', player), lambda state: state.has('Return Smith', player))
-    set_rule(world.get_location('Magic Bat', player), lambda state: state.has('Magic Powder', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_location('Sick Kid', player), lambda state: state.has_group("Bottles", player))
-    set_rule(world.get_location('Mushroom', player), lambda state: state.has('Moon Pearl', player)) # need pearl to pick up bushes
-    set_rule(world.get_entrance('Bush Covered Lawn Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Bush Covered Lawn Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bush Covered Lawn Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bomb Hut Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Bomb Hut Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Light World Bomb Hut', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
-    set_rule(world.get_entrance('North Fairy Cave Drop', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Lost Woods Hideout Drop', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_location('Potion Shop', player), lambda state: state.has('Mushroom', player) and (state.can_reach('Potion Shop Area', 'Region', player))) # new inverted region, need pearl for bushes or access to potion shop door/waterfall fairy
-    set_rule(world.get_entrance('Desert Palace Entrance (North) Rocks', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Desert Ledge Return Rocks', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))  # should we decide to place something that is not a dungeon end up there at some point
-    set_rule(world.get_entrance('Checkerboard Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Hyrule Castle Secret Entrance Drop', player), lambda state: state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Old Man Cave Exit (West)', player), lambda state: False)  # drop cannot be climbed up
-    set_rule(world.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Broken Bridge (East)', player), lambda state: state.has('Hookshot', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Dark Death Mountain Teleporter (East Bottom)', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Fairy Ascension Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: state.has('Mirror', player))  # can erase block
-    set_rule(world.get_entrance('Death Mountain (Top)', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
-    set_rule(world.get_entrance('Dark Death Mountain Teleporter (East)', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Hammer', player) and state.has('Moon Pearl', player))  # bunny cannot use hammer
-    set_rule(world.get_entrance('East Death Mountain (Top)', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))  # bunny can not use hammer
+    set_rule(multiworld.get_location('Zora\'s Ledge', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Waterfall of Wishing Cave', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Northeast Light World Return', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_location('Frog', player), lambda state: can_lift_heavy_rocks(state, player) and (state.has('Moon Pearl', player) or state.has('Beat Agahnim 1', player)) or (state.can_reach('Light World', 'Region', player) and state.has('Magic Mirror', player))) # Need LW access using Mirror or Portal
+    set_rule(multiworld.get_location('Missing Smith', player), lambda state: state.has('Get Frog', player) and state.can_reach('Blacksmiths Hut', 'Region', player)) # Can't S&Q with smith
+    set_rule(multiworld.get_location('Blacksmith', player), lambda state: state.has('Return Smith', player))
+    set_rule(multiworld.get_location('Magic Bat', player), lambda state: state.has('Magic Powder', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_location('Sick Kid', player), lambda state: state.has_group("Bottles", player))
+    set_rule(multiworld.get_location('Mushroom', player), lambda state: state.has('Moon Pearl', player)) # need pearl to pick up bushes
+    set_rule(multiworld.get_entrance('Bush Covered Lawn Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Bush Covered Lawn Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bush Covered Lawn Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bomb Hut Inner Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Bomb Hut Outer Bushes', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Light World Bomb Hut', player), lambda state: state.has('Moon Pearl', player) and can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('North Fairy Cave Drop', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Lost Woods Hideout Drop', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_location('Potion Shop', player), lambda state: state.has('Mushroom', player) and (state.can_reach('Potion Shop Area', 'Region', player))) # new inverted region, need pearl for bushes or access to potion shop door/waterfall fairy
+    set_rule(multiworld.get_entrance('Desert Palace Entrance (North) Rocks', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Desert Ledge Return Rocks', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))  # should we decide to place something that is not a dungeon end up there at some point
+    set_rule(multiworld.get_entrance('Checkerboard Cave', player), lambda state: can_lift_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Hyrule Castle Secret Entrance Drop', player), lambda state: state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Old Man Cave Exit (West)', player), lambda state: False)  # drop cannot be climbed up
+    set_rule(multiworld.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Broken Bridge (East)', player), lambda state: state.has('Hookshot', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Dark Death Mountain Teleporter (East Bottom)', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Fairy Ascension Rocks', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: state.has('Mirror', player))  # can erase block
+    set_rule(multiworld.get_entrance('Death Mountain (Top)', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))
+    set_rule(multiworld.get_entrance('Dark Death Mountain Teleporter (East)', player), lambda state: can_lift_heavy_rocks(state, player) and state.has('Hammer', player) and state.has('Moon Pearl', player))  # bunny cannot use hammer
+    set_rule(multiworld.get_entrance('East Death Mountain (Top)', player), lambda state: state.has('Hammer', player) and state.has('Moon Pearl', player))  # bunny can not use hammer
 
-    set_rule(world.get_entrance('Catfish Entrance Rock', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Northeast Dark World Broken Bridge Pass', player), lambda state: ((can_lift_rocks(state, player) or state.has('Hammer', player)) or state.has('Flippers', player)))
-    set_rule(world.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: (can_lift_rocks(state, player) or state.has('Hammer', player)))
-    set_rule(world.get_entrance('South Dark World Bridge', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Bonk Fairy (Dark)', player), lambda state: state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('West Dark World Gap', player), lambda state: state.has('Hookshot', player))
-    set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_location('Bombos Tablet', player), lambda state: can_retrieve_tablet(state, player))
-    set_rule(world.get_entrance('Dark Lake Hylia Drop (South)', player), lambda state: state.has('Flippers', player))  # ToDo any fake flipper set up?
-    set_rule(world.get_entrance('Dark Lake Hylia Ledge Pier', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_entrance('Dark Lake Hylia Ledge Spike Cave', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Flippers', player))  # Fake Flippers
-    set_rule(world.get_entrance('Dark Lake Hylia Shallows', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_entrance('Village of Outcasts Heavy Rock', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('East Dark World Bridge', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('East Dark World River Pier', player), lambda state: state.has('Flippers', player))
-    set_rule(world.get_entrance('Bumper Cave Entrance Rock', player), lambda state: can_lift_rocks(state, player))
-    set_rule(world.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Hammer Peg Area Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark World Hammer Peg Cave', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Village of Outcasts Eastern Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Peg Area Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
-    set_rule(world.get_entrance('Village of Outcasts Pegs', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Grassy Lawn Pegs', player), lambda state: state.has('Hammer', player))
-    set_rule(world.get_entrance('Bumper Cave Exit (Top)', player), lambda state: state.has('Cape', player))
-    set_rule(world.get_entrance('Bumper Cave Exit (Bottom)', player), lambda state: state.has('Cape', player) or state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Catfish Entrance Rock', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Northeast Dark World Broken Bridge Pass', player), lambda state: ((can_lift_rocks(state, player) or state.has('Hammer', player)) or state.has('Flippers', player)))
+    set_rule(multiworld.get_entrance('East Dark World Broken Bridge Pass', player), lambda state: (can_lift_rocks(state, player) or state.has('Hammer', player)))
+    set_rule(multiworld.get_entrance('South Dark World Bridge', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Bonk Fairy (Dark)', player), lambda state: state.has('Pegasus Boots', player))
+    set_rule(multiworld.get_entrance('West Dark World Gap', player), lambda state: state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_location('Bombos Tablet', player), lambda state: can_retrieve_tablet(state, player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (South)', player), lambda state: state.has('Flippers', player))  # ToDo any fake flipper set up?
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Pier', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Spike Cave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Flippers', player))  # Fake Flippers
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Shallows', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Heavy Rock', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('East Dark World Bridge', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Lake Hylia Central Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('East Dark World River Pier', player), lambda state: state.has('Flippers', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Entrance Rock', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Hammer Peg Area Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark World Hammer Peg Cave', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Eastern Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Peg Area Rocks', player), lambda state: can_lift_heavy_rocks(state, player))
+    set_rule(multiworld.get_entrance('Village of Outcasts Pegs', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Grassy Lawn Pegs', player), lambda state: state.has('Hammer', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Exit (Top)', player), lambda state: state.has('Cape', player))
+    set_rule(multiworld.get_entrance('Bumper Cave Exit (Bottom)', player), lambda state: state.has('Cape', player) or state.has('Hookshot', player))
 
-    set_rule(world.get_entrance('Hype Cave', player), lambda state: can_use_bombs(state, player))
-    set_rule(world.get_entrance('Brewery', player), lambda state: can_use_bombs(state, player))
-    set_rule(world.get_entrance('Dark Lake Hylia Ledge Fairy', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Hype Cave', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Brewery', player), lambda state: can_use_bombs(state, player))
+    set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Fairy', player), lambda state: can_use_bombs(state, player))
 
 
-    set_rule(world.get_entrance('Skull Woods Final Section', player), lambda state: state.has('Fire Rod', player))
-    set_rule(world.get_entrance('Misery Mire', player), lambda state: has_sword(state, player) and has_misery_mire_medallion(state, player))  # sword required to cast magic (!)
+    set_rule(multiworld.get_entrance('Skull Woods Final Section', player), lambda state: state.has('Fire Rod', player))
+    set_rule(multiworld.get_entrance('Misery Mire', player), lambda state: has_sword(state, player) and has_misery_mire_medallion(state, player))  # sword required to cast magic (!)
 
-    set_rule(world.get_entrance('Hookshot Cave', player), lambda state: can_lift_rocks(state, player))
+    set_rule(multiworld.get_entrance('Hookshot Cave', player), lambda state: can_lift_rocks(state, player))
 
-    set_rule(world.get_entrance('East Death Mountain Mirror Spot (Top)', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('East Death Mountain Mirror Spot (Top)', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
 
-    set_rule(world.get_entrance('East Death Mountain Mirror Spot (Bottom)', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark Death Mountain Ledge Mirror Spot (East)', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Dark Death Mountain Ledge Mirror Spot (West)', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Laser Bridge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Floating Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Turtle Rock', player), lambda state: has_sword(state, player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player)) # sword required to cast magic (!)
+    set_rule(multiworld.get_entrance('East Death Mountain Mirror Spot (Bottom)', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark Death Mountain Ledge Mirror Spot (East)', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Dark Death Mountain Ledge Mirror Spot (West)', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Laser Bridge Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Floating Island Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Turtle Rock', player), lambda state: has_sword(state, player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player)) # sword required to cast magic (!)
 
     # new inverted spots
-    set_rule(world.get_entrance('Post Aga Teleporter', player), lambda state: state.has('Beat Agahnim 1', player))
-    set_rule(world.get_entrance('Mire Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Desert Palace Stairs Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Death Mountain Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('East Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('West Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('South Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Catfish Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Potion Shop Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Shopping Mall Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Maze Race Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Desert Palace North Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Graveyard Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Bomb Hut Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
-    set_rule(world.get_entrance('Skull Woods Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Post Aga Teleporter', player), lambda state: state.has('Beat Agahnim 1', player))
+    set_rule(multiworld.get_entrance('Mire Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Desert Palace Stairs Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Death Mountain Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('East Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('West Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('South Dark World Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Catfish Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Potion Shop Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Shopping Mall Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Maze Race Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Desert Palace North Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Death Mountain (Top) Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Graveyard Cave Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Bomb Hut Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
+    set_rule(multiworld.get_entrance('Skull Woods Mirror Spot', player), lambda state: state.has('Magic Mirror', player))
 
     # inverted flute spots
 
-    set_rule(world.get_entrance('DDM Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('NEDW Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('WDW Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('SDW Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('EDW Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('DLHL Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('DD Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('EDDM Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('Dark Grassy Lawn Flute', player), lambda state: state.has('Activated Flute', player))
-    set_rule(world.get_entrance('Hammer Peg Area Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('DDM Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('NEDW Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('WDW Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('SDW Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('EDW Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('DLHL Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('DD Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('EDDM Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('Dark Grassy Lawn Flute', player), lambda state: state.has('Activated Flute', player))
+    set_rule(multiworld.get_entrance('Hammer Peg Area Flute', player), lambda state: state.has('Activated Flute', player))
 
-    set_rule(world.get_entrance('Inverted Pyramid Hole', player), lambda state: state.has('Beat Agahnim 2', player) or world.worlds[player].options.open_pyramid)
+    set_rule(multiworld.get_entrance('Inverted Pyramid Hole', player), lambda state: state.has('Beat Agahnim 2', player) or multiworld.worlds[player].options.open_pyramid)
 
-    if world.worlds[player].options.swordless:
-        swordless_rules(world, player)
+    if multiworld.worlds[player].options.swordless:
+        swordless_rules(multiworld, player)
 
-def no_glitches_rules(world, player):
+
+def no_glitches_rules(multiworld: MultiWorld, player: int):
     """"""
-    if world.worlds[player].options.mode == 'inverted':
-        set_rule(world.get_entrance('Zoras River', player), lambda state: state.has('Moon Pearl', player) and (state.has('Flippers', player) or can_lift_rocks(state, player)))
-        set_rule(world.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
-        set_rule(world.get_entrance('Lake Hylia Island Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
-        set_rule(world.get_entrance('Lake Hylia Warp', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
-        set_rule(world.get_entrance('Northeast Light World Warp', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
-        set_rule(world.get_entrance('Hobo Bridge', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Flippers', player))
-        set_rule(world.get_entrance('East Dark World Pier', player), lambda state: state.has('Flippers', player))
+    if multiworld.worlds[player].options.mode == 'inverted':
+        set_rule(multiworld.get_entrance('Zoras River', player), lambda state: state.has('Moon Pearl', player) and (state.has('Flippers', player) or can_lift_rocks(state, player)))
+        set_rule(multiworld.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(multiworld.get_entrance('Lake Hylia Island Pier', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(multiworld.get_entrance('Lake Hylia Warp', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(multiworld.get_entrance('Northeast Light World Warp', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))  # can be fake flippered to
+        set_rule(multiworld.get_entrance('Hobo Bridge', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('East Dark World Pier', player), lambda state: state.has('Flippers', player))
     else:
-        set_rule(world.get_entrance('Zoras River', player), lambda state: state.has('Flippers', player) or can_lift_rocks(state, player))
-        set_rule(world.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Flippers', player))  # can be fake flippered to
-        set_rule(world.get_entrance('Hobo Bridge', player), lambda state: state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Zoras River', player), lambda state: state.has('Flippers', player) or can_lift_rocks(state, player))
+        set_rule(multiworld.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Flippers', player))  # can be fake flippered to
+        set_rule(multiworld.get_entrance('Hobo Bridge', player), lambda state: state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
 
-    add_rule(world.get_entrance('Ganons Tower (Double Switch Room)', player), lambda state: state.has('Hookshot', player))
-    set_rule(world.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: False)  # no glitches does not require block override
-    add_conditional_lamps(world, player)
+    add_rule(multiworld.get_entrance('Ganons Tower (Double Switch Room)', player), lambda state: state.has('Hookshot', player))
+    set_rule(multiworld.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: False)  # no glitches does not require block override
+    add_conditional_lamps(multiworld, player)
 
-def fake_flipper_rules(world, player):
-    if world.worlds[player].options.mode == 'inverted':
-        set_rule(world.get_entrance('Zoras River', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Lake Hylia Island Pier', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Lake Hylia Warp', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Northeast Light World Warp', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Hobo Bridge', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: True)
-        set_rule(world.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: True)
-        set_rule(world.get_entrance('East Dark World Pier', player), lambda state: True)
+
+def fake_flipper_rules(multiworld: MultiWorld, player: int):
+    if multiworld.worlds[player].options.mode == 'inverted':
+        set_rule(multiworld.get_entrance('Zoras River', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Lake Hylia Central Island Pier', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Lake Hylia Island Pier', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Lake Hylia Warp', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Northeast Light World Warp', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Hobo Bridge', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: True)
+        set_rule(multiworld.get_entrance('East Dark World Pier', player), lambda state: True)
         #qirn jump
-        set_rule(world.get_entrance('East Dark World River Pier', player), lambda state: True)
+        set_rule(multiworld.get_entrance('East Dark World River Pier', player), lambda state: True)
     else:
-        set_rule(world.get_entrance('Zoras River', player), lambda state: True)
-        set_rule(world.get_entrance('Lake Hylia Central Island Pier', player), lambda state: True)
-        set_rule(world.get_entrance('Hobo Bridge', player), lambda state: True)
-        set_rule(world.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player))
-        set_rule(world.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Zoras River', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Lake Hylia Central Island Pier', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Hobo Bridge', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Drop (East)', player), lambda state: state.has('Moon Pearl', player) and state.has('Flippers', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Teleporter', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('Dark Lake Hylia Ledge Drop', player), lambda state: state.has('Moon Pearl', player))
         #qirn jump
-        set_rule(world.get_entrance('East Dark World River Pier', player), lambda state: state.has('Moon Pearl', player))
+        set_rule(multiworld.get_entrance('East Dark World River Pier', player), lambda state: state.has('Moon Pearl', player))
 
 
-def bomb_jump_requirements(multiworld, player):
+def bomb_jump_requirements(multiworld: MultiWorld, player: int):
     DMs_room_chests = ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right', 'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right']
     for location in DMs_room_chests:
         add_rule(multiworld.get_location(location, player), lambda state: can_use_bombs(state, player), combine="or")
@@ -947,7 +953,7 @@ def bomb_jump_requirements(multiworld, player):
     set_rule(multiworld.get_entrance('Skull Woods First Section Bomb Jump', player), lambda state: can_use_bombs(state, player))
 
 
-def forbid_bomb_jump_requirements(multiworld, player):
+def forbid_bomb_jump_requirements(multiworld: MultiWorld, player: int):
     DMs_room_chests = ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right', 'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right']
     for location in DMs_room_chests:
         add_rule(multiworld.get_location(location, player), lambda state: state.has('Hookshot', player))
@@ -972,14 +978,15 @@ DW_Entrances = ['Bumper Cave (Bottom)',
                 'Turtle Rock',
                 'Dark Death Mountain Ledge (West)']
 
-def check_is_dark_world(region):
+
+def check_is_dark_world(region: Region):
     for entrance in region.entrances:
         if entrance.name in DW_Entrances:
             return True
     return False
 
 
-def add_conditional_lamps(multiworld, player):
+def add_conditional_lamps(multiworld: MultiWorld, player: int):
     # Light cones in standard depend on which world we actually are in, not which one the location would normally be
     # We add Lamp requirements only to those locations which lie in the dark world (or everything if open
     local_world = multiworld.worlds[player]
@@ -1030,7 +1037,7 @@ def add_conditional_lamps(multiworld, player):
         add_lamp_requirement(multiworld, local_world.get_entrance("Throne Room"), player)
 
 
-def open_rules(world, player):
+def open_rules(multiworld: MultiWorld, player: int):
 
     def basement_key_rule(state):
         if location_item_name(state, 'Sewers - Key Rat Key Drop', player) == ("Small Key (Hyrule Castle)", player):
@@ -1038,95 +1045,95 @@ def open_rules(world, player):
         else:
             return state._lttp_has_key("Small Key (Hyrule Castle)", player, 3)
 
-    set_rule(world.get_location('Hyrule Castle - Boomerang Guard Key Drop', player),
+    set_rule(multiworld.get_location('Hyrule Castle - Boomerang Guard Key Drop', player),
              lambda state: basement_key_rule(state) and can_kill_most_things(state, player, 2))
-    set_rule(world.get_location('Hyrule Castle - Boomerang Chest', player), lambda state: basement_key_rule(state) and can_kill_most_things(state, player, 1))
+    set_rule(multiworld.get_location('Hyrule Castle - Boomerang Chest', player), lambda state: basement_key_rule(state) and can_kill_most_things(state, player, 1))
 
-    set_rule(world.get_location('Sewers - Key Rat Key Drop', player),
+    set_rule(multiworld.get_location('Sewers - Key Rat Key Drop', player),
              lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 3) and can_kill_most_things(state, player, 1))
 
-    set_rule(world.get_location('Hyrule Castle - Big Key Drop', player),
+    set_rule(multiworld.get_location('Hyrule Castle - Big Key Drop', player),
              lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4) and can_kill_most_things(state, player, 1))
-    set_rule(world.get_location('Hyrule Castle - Zelda\'s Chest', player),
+    set_rule(multiworld.get_location('Hyrule Castle - Zelda\'s Chest', player),
              lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4)
                            and state.has('Big Key (Hyrule Castle)', player)
-                           and (world.worlds[player].options.enemy_health in ("easy", "default")
+                           and (multiworld.worlds[player].options.enemy_health in ("easy", "default")
                                 or can_kill_most_things(state, player, 1)))
 
 
-def swordless_rules(world, player):
-    set_rule(world.get_entrance('Agahnim 1', player), lambda state: (state.has('Hammer', player) or state.has('Fire Rod', player) or can_shoot_arrows(state, player) or state.has('Cane of Somaria', player)) and state._lttp_has_key('Small Key (Agahnims Tower)', player, 2))
-    set_rule(world.get_entrance('Skull Woods Torch Room', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 3) and state.has('Fire Rod', player))  # no curtain
+def swordless_rules(multiworld: MultiWorld, player: int):
+    set_rule(multiworld.get_entrance('Agahnim 1', player), lambda state: (state.has('Hammer', player) or state.has('Fire Rod', player) or can_shoot_arrows(state, player) or state.has('Cane of Somaria', player)) and state._lttp_has_key('Small Key (Agahnims Tower)', player, 2))
+    set_rule(multiworld.get_entrance('Skull Woods Torch Room', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 3) and state.has('Fire Rod', player))  # no curtain
 
-    set_rule(world.get_location('Ice Palace - Jelly Key Drop', player), lambda state: state.has('Fire Rod', player) or state.has('Bombos', player))
-    set_rule(world.get_location('Ice Palace - Compass Chest', player), lambda state: (state.has('Fire Rod', player) or state.has('Bombos', player)) and state._lttp_has_key('Small Key (Ice Palace)', player))
-    set_rule(world.get_entrance('Ice Palace (Second Section)', player), lambda state: (state.has('Fire Rod', player) or state.has('Bombos', player)) and state._lttp_has_key('Small Key (Ice Palace)', player))
+    set_rule(multiworld.get_location('Ice Palace - Jelly Key Drop', player), lambda state: state.has('Fire Rod', player) or state.has('Bombos', player))
+    set_rule(multiworld.get_location('Ice Palace - Compass Chest', player), lambda state: (state.has('Fire Rod', player) or state.has('Bombos', player)) and state._lttp_has_key('Small Key (Ice Palace)', player))
+    set_rule(multiworld.get_entrance('Ice Palace (Second Section)', player), lambda state: (state.has('Fire Rod', player) or state.has('Bombos', player)) and state._lttp_has_key('Small Key (Ice Palace)', player))
 
-    set_rule(world.get_entrance('Ganon Drop', player), lambda state: state.has('Hammer', player))  # need to damage ganon to get tiles to drop
+    set_rule(multiworld.get_entrance('Ganon Drop', player), lambda state: state.has('Hammer', player))  # need to damage ganon to get tiles to drop
 
-    if world.worlds[player].options.mode != 'inverted':
-        set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player))  # barrier gets removed after killing agahnim, relevant for entrance shuffle
-        set_rule(world.get_entrance('Turtle Rock', player), lambda state: state.has('Moon Pearl', player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))   # sword not required to use medallion for opening in swordless (!)
-        set_rule(world.get_entrance('Misery Mire', player), lambda state: state.has('Moon Pearl', player) and has_misery_mire_medallion(state, player))  # sword not required to use medallion for opening in swordless (!)
+    if multiworld.worlds[player].options.mode != 'inverted':
+        set_rule(multiworld.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player))  # barrier gets removed after killing agahnim, relevant for entrance shuffle
+        set_rule(multiworld.get_entrance('Turtle Rock', player), lambda state: state.has('Moon Pearl', player) and has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))   # sword not required to use medallion for opening in swordless (!)
+        set_rule(multiworld.get_entrance('Misery Mire', player), lambda state: state.has('Moon Pearl', player) and has_misery_mire_medallion(state, player))  # sword not required to use medallion for opening in swordless (!)
     else:
         # only need ddm access for aga tower in inverted
-        set_rule(world.get_entrance('Turtle Rock', player), lambda state: has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))   # sword not required to use medallion for opening in swordless (!)
-        set_rule(world.get_entrance('Misery Mire', player), lambda state: has_misery_mire_medallion(state, player))  # sword not required to use medallion for opening in swordless (!)
+        set_rule(multiworld.get_entrance('Turtle Rock', player), lambda state: has_turtle_rock_medallion(state, player) and state.can_reach('Turtle Rock (Top)', 'Region', player))   # sword not required to use medallion for opening in swordless (!)
+        set_rule(multiworld.get_entrance('Misery Mire', player), lambda state: has_misery_mire_medallion(state, player))  # sword not required to use medallion for opening in swordless (!)
 
 
-def add_connection(parent_name, target_name, entrance_name, world, player):
-    parent = world.get_region(parent_name, player)
-    target = world.get_region(target_name, player)
+def add_connection(parent_name: str, target_name: str, entrance_name: str, multiworld: MultiWorld, player: int):
+    parent = multiworld.get_region(parent_name, player)
+    target = multiworld.get_region(target_name, player)
     parent.connect(target, entrance_name)
 
 
+def standard_rules(multiworld: MultiWorld, player: int):
+    add_connection('Menu', 'Hyrule Castle Secret Entrance', 'Uncle S&Q', multiworld, player)
+    multiworld.get_entrance('Uncle S&Q', player).hide_path = True
+    set_rule(multiworld.get_entrance('Throne Room', player), lambda state: state.can_reach('Hyrule Castle - Zelda\'s Chest', 'Location', player))
+    set_rule(multiworld.get_entrance('Hyrule Castle Exit (East)', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
+    set_rule(multiworld.get_entrance('Hyrule Castle Exit (West)', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
+    set_rule(multiworld.get_entrance('Links House S&Q', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
+    set_rule(multiworld.get_entrance('Sanctuary S&Q', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
 
-def standard_rules(world, player):
-    add_connection('Menu', 'Hyrule Castle Secret Entrance', 'Uncle S&Q', world, player)
-    world.get_entrance('Uncle S&Q', player).hide_path = True
-    set_rule(world.get_entrance('Throne Room', player), lambda state: state.can_reach('Hyrule Castle - Zelda\'s Chest', 'Location', player))
-    set_rule(world.get_entrance('Hyrule Castle Exit (East)', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
-    set_rule(world.get_entrance('Hyrule Castle Exit (West)', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
-    set_rule(world.get_entrance('Links House S&Q', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
-    set_rule(world.get_entrance('Sanctuary S&Q', player), lambda state: state.can_reach('Sanctuary', 'Region', player))
-
-    if world.worlds[player].options.small_key_shuffle != small_key_shuffle.option_universal:
-        set_rule(world.get_location('Hyrule Castle - Boomerang Guard Key Drop', player),
+    if multiworld.worlds[player].options.small_key_shuffle != small_key_shuffle.option_universal:
+        set_rule(multiworld.get_location('Hyrule Castle - Boomerang Guard Key Drop', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 1)
-                               and can_kill_most_things(state, player, 2))
-        set_rule(world.get_location('Hyrule Castle - Boomerang Chest', player),
+                               and can_kill_standard_start(state, player, 2))
+        set_rule(multiworld.get_location('Hyrule Castle - Boomerang Chest', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 1)
-                               and can_kill_most_things(state, player, 1))
-
-        set_rule(world.get_location('Hyrule Castle - Big Key Drop', player),
+                               and can_kill_standard_start(state, player, 1))
+        set_rule(multiworld.get_location('Hyrule Castle - Map Guard Key Drop', player),
+                 lambda state: can_kill_standard_start(state, player, 1))
+        set_rule(multiworld.get_location('Hyrule Castle - Big Key Drop', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 2))
-        set_rule(world.get_location('Hyrule Castle - Zelda\'s Chest', player),
+        set_rule(multiworld.get_location('Hyrule Castle - Zelda\'s Chest', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 2)
                                and state.has('Big Key (Hyrule Castle)', player)
-                               and (world.worlds[player].options.enemy_health in ("easy", "default")
-                                    or can_kill_most_things(state, player, 1)))
+                               and (multiworld.worlds[player].options.enemy_health in ("easy", "default")
+                                    or can_kill_standard_start(state, player, 1)))
 
-        set_rule(world.get_location('Sewers - Key Rat Key Drop', player),
+        set_rule(multiworld.get_location('Sewers - Key Rat Key Drop', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 3)
-                               and can_kill_most_things(state, player, 1))
+                               and can_kill_standard_start(state, player, 1))
     else:
-        set_rule(world.get_location('Hyrule Castle - Zelda\'s Chest', player),
+        set_rule(multiworld.get_location('Hyrule Castle - Zelda\'s Chest', player),
                  lambda state: state.has('Big Key (Hyrule Castle)', player))
 
 
-def toss_junk_item(world, player):
+def toss_junk_item(multiworld: MultiWorld, player: int):
     items = ['Rupees (20)', 'Bombs (3)', 'Arrows (10)', 'Rupees (5)', 'Rupee (1)', 'Bombs (10)',
              'Single Arrow', 'Rupees (50)', 'Rupees (100)', 'Single Bomb', 'Bee', 'Bee Trap',
              'Rupees (300)', 'Nothing']
     for item in items:
-        big20 = next((i for i in world.itempool if i.name == item and i.player == player), None)
+        big20 = next((i for i in multiworld.itempool if i.name == item and i.player == player), None)
         if big20:
-            world.itempool.remove(big20)
+            multiworld.itempool.remove(big20)
             return
     raise Exception("Unable to find a junk item to toss to make room for a TR small key")
 
 
-def set_trock_key_rules(multiworld, player):
+def set_trock_key_rules(multiworld: MultiWorld, player: int):
     # 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(multiworld.get_entrance(entrance, player), lambda state: False)
@@ -1227,9 +1234,9 @@ def set_trock_key_rules(multiworld, player):
                 and state.can_reach(state.multiworld.get_region('Turtle Rock (Second Section)', player)))
 
 
-def set_big_bomb_rules(world, player):
+def set_big_bomb_rules(multiworld: MultiWorld, player: int):
     # this is a mess
-    bombshop_entrance = world.get_region('Big Bomb Shop', player).entrances[0]
+    bombshop_entrance = multiworld.get_region('Big Bomb Shop', player).entrances[0]
     Normal_LW_entrances = ['Blinds Hideout',
                            'Bonk Fairy (Light)',
                            'Lake Hylia Fairy',
@@ -1344,7 +1351,7 @@ def set_big_bomb_rules(world, player):
                                          'Desert Palace Entrance (South)',
                                          'Checkerboard Cave']
 
-    set_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.can_reach('East Dark World', 'Region', player) and state.can_reach('Big Bomb Shop', 'Region', player) and state.has('Crystal 5', player) and state.has('Crystal 6', player))
+    set_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.can_reach('East Dark World', 'Region', player) and state.can_reach('Big Bomb Shop', 'Region', player) and state.has('Crystal 5', player) and state.has('Crystal 6', player))
 
     #crossing peg bridge starting from the southern dark world
     def cross_peg_bridge(state):
@@ -1371,96 +1378,96 @@ def set_big_bomb_rules(world, player):
         #1. basic routes
         #2. Can reach Eastern dark world some other way, mirror, get bomb, return to mirror spot, walk to pyramid: Needs mirror
         # -> M or BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: basic_routes(state) or state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: basic_routes(state) or state.has('Magic Mirror', player))
     elif bombshop_entrance.name in LW_walkable_entrances:
         #1. Mirror then basic routes
         # -> M and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and basic_routes(state))
     elif bombshop_entrance.name in Northern_DW_entrances:
         #1. Mirror and basic routes
         #2. Go to south DW and then cross peg bridge: Need Mitts and hammer and moon pearl
         # -> (Mitts and CPB) or (M and BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and cross_peg_bridge(state)) or (state.has('Magic Mirror', player) and basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and cross_peg_bridge(state)) or (state.has('Magic Mirror', player) and basic_routes(state)))
     elif bombshop_entrance.name == 'Bumper Cave (Bottom)':
         #1. Mirror and Lift rock and basic_routes
         #2. Mirror and Flute and basic routes (can make difference if accessed via insanity or w/ mirror from connector, and then via hyrule castle gate, because no gloves are needed in that case)
         #3. Go to south DW and then cross peg bridge: Need Mitts and hammer and moon pearl
         # -> (Mitts and CPB) or (((G or Flute) and M) and BR))
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and cross_peg_bridge(state)) or (((can_lift_rocks(state, player) or state.has('Flute', player)) and state.has('Magic Mirror', player)) and basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and cross_peg_bridge(state)) or (((can_lift_rocks(state, player) or state.has('Flute', player)) and state.has('Magic Mirror', player)) and basic_routes(state)))
     elif bombshop_entrance.name in Southern_DW_entrances:
         #1. Mirror and enter via gate: Need mirror and Aga1
         #2. cross peg bridge: Need hammer and moon pearl
         # -> CPB or (M and A)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: cross_peg_bridge(state) or (state.has('Magic Mirror', player) and state.has('Beat Agahnim 1', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: cross_peg_bridge(state) or (state.has('Magic Mirror', player) and state.has('Beat Agahnim 1', player)))
     elif bombshop_entrance.name in Isolated_DW_entrances:
         # 1. mirror then flute then basic routes
         # -> M and Flute and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and state.has('Activated Flute', player) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and state.has('Activated Flute', player) and basic_routes(state))
     elif bombshop_entrance.name in Isolated_LW_entrances:
         # 1. flute then basic routes
         # Prexisting mirror spot is not permitted, because mirror might have been needed to reach these isolated locations.
         # -> Flute and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and basic_routes(state))
     elif bombshop_entrance.name in West_LW_DM_entrances:
         # 1. flute then basic routes or mirror
         # Prexisting mirror spot is permitted, because flute can be used to reach west DM directly.
         # -> Flute and (M or BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and (state.has('Magic Mirror', player) or basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and (state.has('Magic Mirror', player) or basic_routes(state)))
     elif bombshop_entrance.name in East_LW_DM_entrances:
         # 1. flute then basic routes or mirror and hookshot
         # Prexisting mirror spot is permitted, because flute can be used to reach west DM directly and then east DM via Hookshot
         # -> Flute and ((M and Hookshot) or BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and ((state.has('Magic Mirror', player) and state.has('Hookshot', player)) or basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and ((state.has('Magic Mirror', player) and state.has('Hookshot', player)) or basic_routes(state)))
     elif bombshop_entrance.name == 'Fairy Ascension Cave (Bottom)':
         # Same as East_LW_DM_entrances except navigation without BR requires Mitts
         # -> Flute and ((M and Hookshot and Mitts) or BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and ((state.has('Magic Mirror', player) and state.has('Hookshot', player) and can_lift_heavy_rocks(state, player)) or basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and ((state.has('Magic Mirror', player) and state.has('Hookshot', player) and can_lift_heavy_rocks(state, player)) or basic_routes(state)))
     elif bombshop_entrance.name in Castle_ledge_entrances:
         # 1. mirror on pyramid to castle ledge, grab bomb, return through mirror spot: Needs mirror
         # 2. flute then basic routes
         # -> M or (Flute and BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) or (state.has('Activated Flute', player) and basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) or (state.has('Activated Flute', player) and basic_routes(state)))
     elif bombshop_entrance.name in Desert_mirrorable_ledge_entrances:
         # Cases when you have mire access: Mirror to reach locations, return via mirror spot, move to center of desert, mirror anagin and:
         # 1. Have mire access, Mirror to reach locations, return via mirror spot, move to center of desert, mirror again and then basic routes
         # 2. flute then basic routes
         # -> (Mire access and M) or Flute) and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: ((state.can_reach('Dark Desert', 'Region', player) and state.has('Magic Mirror', player)) or state.has('Activated Flute', player)) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: ((state.can_reach('Dark Desert', 'Region', player) and state.has('Magic Mirror', player)) or state.has('Activated Flute', player)) and basic_routes(state))
     elif bombshop_entrance.name == 'Old Man Cave (West)':
         # 1. Lift rock then basic_routes
         # 2. flute then basic_routes
         # -> (Flute or G) and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or can_lift_rocks(state, player)) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or can_lift_rocks(state, player)) and basic_routes(state))
     elif bombshop_entrance.name == 'Graveyard Cave':
         # 1. flute then basic routes
         # 2. (has west dark world access) use existing mirror spot (required Pearl), mirror again off ledge
         # -> (Flute or (M and P and West Dark World access) and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or (state.can_reach('West Dark World', 'Region', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or (state.can_reach('West Dark World', 'Region', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))) and basic_routes(state))
     elif bombshop_entrance.name in Mirror_from_SDW_entrances:
         # 1. flute then basic routes
         # 2. (has South dark world access) use existing mirror spot, mirror again off ledge
         # -> (Flute or (M and South Dark World access) and BR
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or (state.can_reach('South Dark World', 'Region', player) and state.has('Magic Mirror', player))) and basic_routes(state))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or (state.can_reach('South Dark World', 'Region', player) and state.has('Magic Mirror', player))) and basic_routes(state))
     elif bombshop_entrance.name == 'Dark World Potion Shop':
         # 1. walk down by lifting rock: needs gloves and pearl`
         # 2. walk down by hammering peg: needs hammer and pearl
         # 3. mirror and basic routes
         # -> (P and (H or Gloves)) or (M and BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Moon Pearl', player) and (state.has('Hammer', player) or can_lift_rocks(state, player))) or (state.has('Magic Mirror', player) and basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Moon Pearl', player) and (state.has('Hammer', player) or can_lift_rocks(state, player))) or (state.has('Magic Mirror', player) and basic_routes(state)))
     elif bombshop_entrance.name == 'Kings Grave':
         # same as the Normal_LW_entrances case except that the pre-existing mirror is only possible if you have mitts
         # (because otherwise mirror was used to reach the grave, so would cancel a pre-existing mirror spot)
         # to account for insanity, must consider a way to escape without a cave for basic_routes
         # -> (M and Mitts) or ((Mitts or Flute or (M and P and West Dark World access)) and BR)
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and state.has('Magic Mirror', player)) or ((can_lift_heavy_rocks(state, player) or state.has('Activated Flute', player) or (state.can_reach('West Dark World', 'Region', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))) and basic_routes(state)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (can_lift_heavy_rocks(state, player) and state.has('Magic Mirror', player)) or ((can_lift_heavy_rocks(state, player) or state.has('Activated Flute', player) or (state.can_reach('West Dark World', 'Region', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))) and basic_routes(state)))
     elif bombshop_entrance.name == 'Waterfall of Wishing':
         # same as the Normal_LW_entrances case except in insanity it's possible you could be here without Flippers which
         # means you need an escape route of either Flippers or Flute
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Flippers', player) or state.has('Activated Flute', player)) and (basic_routes(state) or state.has('Magic Mirror', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Flippers', player) or state.has('Activated Flute', player)) and (basic_routes(state) or state.has('Magic Mirror', player)))
 
 
-def set_inverted_big_bomb_rules(world, player):
-    bombshop_entrance = world.get_region('Inverted Big Bomb Shop', player).entrances[0]
+def set_inverted_big_bomb_rules(multiworld: MultiWorld, player: int):
+    bombshop_entrance = multiworld.get_region('Inverted Big Bomb Shop', player).entrances[0]
     Normal_LW_entrances = ['Blinds Hideout',
                            'Bonk Fairy (Light)',
                            'Lake Hylia Fairy',
@@ -1578,7 +1585,7 @@ def set_inverted_big_bomb_rules(world, player):
                                  'Spectacle Rock Cave',
                                  'Spectacle Rock Cave (Bottom)']
 
-    set_rule(world.get_entrance('Pyramid Fairy', player),
+    set_rule(multiworld.get_entrance('Pyramid Fairy', player),
              lambda state: state.can_reach('East Dark World', 'Region', player) and state.can_reach('Inverted Big Bomb Shop', 'Region', player) and state.has('Crystal 5', player) and state.has('Crystal 6', player))
 
     # Key for below abbreviations:
@@ -1592,64 +1599,64 @@ def set_inverted_big_bomb_rules(world, player):
         pass
     elif bombshop_entrance.name in Normal_LW_entrances:
         # Just walk to the castle and mirror.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player))
     elif bombshop_entrance.name in Isolated_LW_entrances:
         # For these entrances, you cannot walk to the castle/pyramid and thus must use Mirror and then Flute.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) and state.has('Magic Mirror', player))
     elif bombshop_entrance.name in Northern_DW_entrances:
         # You can just fly with the Flute, you can take a long walk with Mitts and Hammer,
         # or you can leave a Mirror portal nearby and then walk to the castle to Mirror again.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
     elif bombshop_entrance.name in Southern_DW_entrances:
         # This is the same as north DW without the Mitts rock present.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Hammer', player) or state.has('Activated Flute', player) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Hammer', player) or state.has('Activated Flute', player) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
     elif bombshop_entrance.name in Isolated_DW_entrances:
         # There's just no way to escape these places with the bomb and no Flute.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player))
     elif bombshop_entrance.name in LW_walkable_entrances:
         # You can fly with the flute, or leave a mirror portal and walk through the light world
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player)))
     elif bombshop_entrance.name in LW_bush_entrances:
         # These entrances are behind bushes in LW so you need either Pearl or the tools to solve NDW bomb shop locations.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and (state.has('Activated Flute', player) or state.has('Moon Pearl', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player))))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and (state.has('Activated Flute', player) or state.has('Moon Pearl', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player))))
     elif bombshop_entrance.name == 'Village of Outcasts Shop':
         # This is mostly the same as NDW but the Mirror path requires the Pearl, or using the Hammer
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player) and (state.has('Moon Pearl', player) or state.has('Hammer', player))))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and state.can_reach('Light World', 'Region', player) and (state.has('Moon Pearl', player) or state.has('Hammer', player))))
     elif bombshop_entrance.name == 'Bumper Cave (Bottom)':
         # This is mostly the same as NDW but the Mirror path requires being able to lift a rock.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and can_lift_rocks(state, player) and state.can_reach('Light World', 'Region', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or (can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (state.has('Magic Mirror', player) and can_lift_rocks(state, player) and state.can_reach('Light World', 'Region', player)))
     elif bombshop_entrance.name == 'Old Man Cave (West)':
         # The three paths back are Mirror and DW walk, Mirror and Flute, or LW walk and then Mirror.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and ((can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (can_lift_rocks(state, player) and state.has('Moon Pearl', player)) or state.has('Activated Flute', player)))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Magic Mirror', player) and ((can_lift_heavy_rocks(state, player) and state.has('Hammer', player)) or (can_lift_rocks(state, player) and state.has('Moon Pearl', player)) or state.has('Activated Flute', player)))
     elif bombshop_entrance.name == 'Dark World Potion Shop':
         # You either need to Flute to 5 or cross the rock/hammer choice pass to the south.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or state.has('Hammer', player) or can_lift_rocks(state, player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Activated Flute', player) or state.has('Hammer', player) or can_lift_rocks(state, player))
     elif bombshop_entrance.name == 'Kings Grave':
         # Either lift the rock and walk to the castle to Mirror or Mirror immediately and Flute.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or can_lift_heavy_rocks(state, player)) and state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or can_lift_heavy_rocks(state, player)) and state.has('Magic Mirror', player))
     elif bombshop_entrance.name == 'Waterfall of Wishing':
         # You absolutely must be able to swim to return it from here.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) and state.has('Moon Pearl', player) and state.has('Magic Mirror', player))
     elif bombshop_entrance.name == 'Ice Palace':
         # You can swim to the dock or use the Flute to get off the island.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) or state.has('Activated Flute', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: state.has('Flippers', player) or state.has('Activated Flute', player))
     elif bombshop_entrance.name == 'Capacity Upgrade':
         # You must Mirror but then can use either Ice Palace return path.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Flippers', player) or state.has('Activated Flute', player)) and state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Flippers', player) or state.has('Activated Flute', player)) and state.has('Magic Mirror', player))
     elif bombshop_entrance.name == 'Two Brothers House (West)':
         # First you must Mirror. Then you can either Flute, cross the peg bridge, or use the Agah 1 portal to Mirror again.
-        add_rule(world.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player)) and state.has('Magic Mirror', player))
+        add_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: (state.has('Activated Flute', player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player)) and state.has('Magic Mirror', player))
     elif bombshop_entrance.name in LW_inaccessible_entrances:
         # You can't get to the pyramid from these entrances without bomb duping.
         raise Exception('No valid path to open Pyramid Fairy. (Could not route from %s)' % bombshop_entrance.name)
     elif bombshop_entrance.name == 'Pyramid Fairy':
         # Self locking.  The shuffles don't put the bomb shop here, but doesn't lock anything important.
-        set_rule(world.get_entrance('Pyramid Fairy', player), lambda state: False)
+        set_rule(multiworld.get_entrance('Pyramid Fairy', player), lambda state: False)
     else:
         raise Exception('No logic found for routing from %s to the pyramid.' % bombshop_entrance.name)
 
 
-def set_bunny_rules(world: MultiWorld, player: int, inverted: bool):
+def set_bunny_rules(multiworld: MultiWorld, player: int, inverted: bool):
 
     # regions for the exits of multi-entrance caves/drops that bunny cannot pass
     # Note spiral cave and two brothers house are passable in superbunny state for glitch logic with extra requirements.
@@ -1689,7 +1696,7 @@ def set_bunny_rules(world: MultiWorld, player: int, inverted: bool):
     def get_rule_to_add(region, location = None, connecting_entrance = None):
         # In OWG, a location can potentially be superbunny-mirror accessible or
         # bunny revival accessible.
-        if world.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
+        if multiworld.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic']:
             if region.name == 'Swamp Palace (Entrance)':  # Need to 0hp revive - not in logic
                 return lambda state: state.has('Moon Pearl', player)
             if region.name == 'Tower of Hera (Bottom)':  # Need to hit the crystal switch
@@ -1729,7 +1736,7 @@ def set_bunny_rules(world: MultiWorld, player: int, inverted: bool):
                 seen.add(new_region)
                 if not is_link(new_region):
                     # For glitch rulesets, establish superbunny and revival rules.
-                    if world.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] and entrance.name not in OverworldGlitchRules.get_invalid_bunny_revival_dungeons():
+                    if multiworld.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] and entrance.name not in OverworldGlitchRules.get_invalid_bunny_revival_dungeons():
                         if region.name in OverworldGlitchRules.get_sword_required_superbunny_mirror_regions():
                             possible_options.append(lambda state: path_to_access_rule(new_path, entrance) and state.has('Magic Mirror', player) and has_sword(state, player))
                         elif (region.name in OverworldGlitchRules.get_boots_required_superbunny_mirror_regions()
@@ -1752,29 +1759,29 @@ def set_bunny_rules(world: MultiWorld, player: int, inverted: bool):
         return options_to_access_rule(possible_options)
 
     # Add requirements for bunny-impassible caves if link is a bunny in them
-    for region in (world.get_region(name, player) for name in bunny_impassable_caves):
+    for region in (multiworld.get_region(name, player) for name in bunny_impassable_caves):
         if not is_bunny(region):
             continue
         rule = get_rule_to_add(region)
         for region_exit in region.exits:
             add_rule(region_exit, rule)
 
-    paradox_shop = world.get_region('Light World Death Mountain Shop', player)
+    paradox_shop = multiworld.get_region('Light World Death Mountain Shop', player)
     if is_bunny(paradox_shop):
         add_rule(paradox_shop.entrances[0], get_rule_to_add(paradox_shop))
 
     # Add requirements for all locations that are actually in the dark world, except those available to the bunny, including dungeon revival
-    for entrance in world.get_entrances(player):
+    for entrance in multiworld.get_entrances(player):
         if is_bunny(entrance.connected_region):
-            if world.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] :
+            if multiworld.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] :
                 if entrance.connected_region.type == LTTPRegionType.Dungeon:
                     if entrance.parent_region.type != LTTPRegionType.Dungeon and entrance.connected_region.name in OverworldGlitchRules.get_invalid_bunny_revival_dungeons():
                         add_rule(entrance, get_rule_to_add(entrance.connected_region, None, entrance))
                     continue
                 if entrance.connected_region.name == 'Turtle Rock (Entrance)':
-                    add_rule(world.get_entrance('Turtle Rock Entrance Gap', player), get_rule_to_add(entrance.connected_region, None, entrance))
+                    add_rule(multiworld.get_entrance('Turtle Rock Entrance Gap', player), get_rule_to_add(entrance.connected_region, None, entrance))
             for location in entrance.connected_region.locations:
-                if world.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] and entrance.name in OverworldGlitchRules.get_invalid_mirror_bunny_entrances():
+                if multiworld.worlds[player].options.glitches_required in ['minor_glitches', 'overworld_glitches', 'hybrid_major_glitches', 'no_logic'] and entrance.name in OverworldGlitchRules.get_invalid_mirror_bunny_entrances():
                     continue
                 if location.name in bunny_accessible_locations:
                     continue
diff --git a/worlds/alttp/Shops.py b/worlds/alttp/Shops.py
index 89e43a1a04..182f25ddc2 100644
--- a/worlds/alttp/Shops.py
+++ b/worlds/alttp/Shops.py
@@ -7,7 +7,7 @@ from Utils import int16_as_bytes
 
 from worlds.generic.Rules import add_rule
 
-from BaseClasses import CollectionState
+from BaseClasses import CollectionState, Item, MultiWorld
 from .SubClasses import ALttPLocation
 
 from .Items import item_name_groups
@@ -159,7 +159,7 @@ shop_class_mapping = {ShopType.UpgradeShop: UpgradeShop,
                       ShopType.TakeAny: TakeAny}
 
 
-def push_shop_inventories(multiworld):
+def push_shop_inventories(multiworld: MultiWorld):
     all_shops =  []
     for world in multiworld.get_game_worlds(ALttPLocation.game):
         all_shops.extend(world.shops)
@@ -183,7 +183,7 @@ def push_shop_inventories(multiworld):
         world.pushed_shop_inventories.set()
 
 
-def create_shops(multiworld, player: int):
+def create_shops(multiworld: MultiWorld, player: int):
     from .Options import RandomizeShopInventories
     player_shop_table = shop_table.copy()
     if multiworld.worlds[player].options.include_witch_hut:
@@ -306,7 +306,7 @@ shop_generation_types = {
 }
 
 
-def set_up_shops(multiworld, player: int):
+def set_up_shops(multiworld: MultiWorld, player: int):
     from .Options import small_key_shuffle
     # TODO: move hard+ mode changes for shields here, utilizing the new shops
 
@@ -408,7 +408,7 @@ price_rate_display = {
 }
 
 
-def get_price_modifier(item) -> float:
+def get_price_modifier(item: Item) -> float:
     if item.game == "A Link to the Past":
         if any(x in item.name for x in
                ['Compass', 'Map', 'Single Bomb', 'Single Arrow', 'Piece of Heart']):
@@ -428,7 +428,7 @@ def get_price_modifier(item) -> float:
         return 0.25
 
 
-def get_price(multiworld, item, player: int, price_type=None):
+def get_price(multiworld: MultiWorld, item: Item, player: int, price_type=None):
     """Converts a raw Rupee price into a special price type"""
     from .Options import small_key_shuffle
     if price_type:
diff --git a/worlds/alttp/StateHelpers.py b/worlds/alttp/StateHelpers.py
index 98409c8a8d..2c1b5e2ab8 100644
--- a/worlds/alttp/StateHelpers.py
+++ b/worlds/alttp/StateHelpers.py
@@ -59,10 +59,11 @@ def has_hearts(state: CollectionState, player: int, count: int) -> int:
 
 def heart_count(state: CollectionState, player: int) -> int:
     # Warning: This only considers items that are marked as advancement items
-    diff = state.multiworld.worlds[player].difficulty_requirements
-    return min(state.count('Boss Heart Container', player), diff.boss_heart_container_limit) \
+    max_heart_pieces = state.multiworld.worlds[player].logical_heart_pieces
+    max_heart_containers = state.multiworld.worlds[player].logical_heart_containers
+    return min(state.count('Boss Heart Container', player), max_heart_containers) \
         + state.count('Sanctuary Heart Container', player) \
-        + min(state.count('Piece of Heart', player), diff.heart_piece_limit) // 4 \
+        + min(state.count('Piece of Heart', player), max_heart_pieces) // 4 \
         + 3  # starting hearts
 
 
@@ -139,6 +140,16 @@ def can_kill_most_things(state: CollectionState, player: int, enemies: int = 5)
                     and can_use_bombs(state, player, enemies * 4)))
 
 
+def can_kill_standard_start(state: CollectionState, player: int, enemies: int = 5) -> bool:
+    # Enemizer does not randomize standard start enemies
+        return (has_melee_weapon(state, player)
+                or state.has('Cane of Somaria', player)
+                or (state.has('Cane of Byrna', player) and (enemies < 6 or can_extend_magic(state, player)))
+                or state.has_any(["Bow", "Progressive Bow"], player)
+                or state.has('Fire Rod', player)
+                or can_use_bombs(state, player, enemies)) # Escape assist is set
+
+
 def can_get_good_bee(state: CollectionState, player: int) -> bool:
     cave = state.multiworld.get_region('Good Bee Cave', player)
     return (
diff --git a/worlds/alttp/UnderworldGlitchRules.py b/worlds/alttp/UnderworldGlitchRules.py
index 25511f320d..1b606a23af 100644
--- a/worlds/alttp/UnderworldGlitchRules.py
+++ b/worlds/alttp/UnderworldGlitchRules.py
@@ -1,3 +1,4 @@
+from BaseClasses import MultiWorld, CollectionState
 from worlds.generic.Rules import set_rule, add_rule
 from .StateHelpers import can_bomb_clip, has_sword, has_beam_sword, has_fire_source, can_melt_things, has_misery_mire_medallion
 from .SubClasses import LTTPEntrance
@@ -5,27 +6,27 @@ from .SubClasses import LTTPEntrance
 
 # We actually need the logic to properly "mark" these regions as Light or Dark world. 
 # Therefore we need to make these connections during the normal link_entrances stage, rather than during set_rules.
-def underworld_glitch_connections(world, player):
-    specrock = world.get_region('Spectacle Rock Cave (Bottom)', player)
-    mire = world.get_region('Misery Mire (West)', player)
+def underworld_glitch_connections(multiworld: MultiWorld, player: int):
+    specrock = multiworld.get_region('Spectacle Rock Cave (Bottom)', player)
+    mire = multiworld.get_region('Misery Mire (West)', player)
 
     kikiskip = specrock.create_exit('Kiki Skip')
     mire_to_hera = mire.create_exit('Mire to Hera Clip')
     mire_to_swamp = mire.create_exit('Hera to Swamp Clip')
 
-    if world.worlds[player].fix_fake_world:
-        kikiskip.connect(world.get_entrance('Palace of Darkness Exit', player).connected_region)
-        mire_to_hera.connect(world.get_entrance('Tower of Hera Exit', player).connected_region)
-        mire_to_swamp.connect(world.get_entrance('Swamp Palace Exit', player).connected_region)
+    if multiworld.worlds[player].fix_fake_world:
+        kikiskip.connect(multiworld.get_entrance('Palace of Darkness Exit', player).connected_region)
+        mire_to_hera.connect(multiworld.get_entrance('Tower of Hera Exit', player).connected_region)
+        mire_to_swamp.connect(multiworld.get_entrance('Swamp Palace Exit', player).connected_region)
     else:
-        kikiskip.connect(world.get_region('Palace of Darkness (Entrance)', player))
-        mire_to_hera.connect(world.get_region('Tower of Hera (Bottom)', player))
-        mire_to_swamp.connect(world.get_region('Swamp Palace (Entrance)', player))
+        kikiskip.connect(multiworld.get_region('Palace of Darkness (Entrance)', player))
+        mire_to_hera.connect(multiworld.get_region('Tower of Hera (Bottom)', player))
+        mire_to_swamp.connect(multiworld.get_region('Swamp Palace (Entrance)', player))
 
 
 # For some entrances, we need to fake having pearl, because we're in fake DW/LW. 
 # This creates a copy of the input state that has Moon Pearl. 
-def fake_pearl_state(state, player): 
+def fake_pearl_state(state: CollectionState, player: int):
     if state.has('Moon Pearl', player):
         return state
     fake_state = state.copy()
@@ -35,11 +36,11 @@ def fake_pearl_state(state, player):
 
 # Sets the rules on where we can actually go using this clip.
 # Behavior differs based on what type of ER shuffle we're playing. 
-def dungeon_reentry_rules(world, player, clip: LTTPEntrance, dungeon_region: str, dungeon_exit: str): 
-    fix_dungeon_exits = world.worlds[player].fix_palaceofdarkness_exit
-    fix_fake_worlds = world.worlds[player].fix_fake_world
+def dungeon_reentry_rules(multiworld: MultiWorld, player: int, clip: LTTPEntrance, dungeon_region: str, dungeon_exit: str):
+    fix_dungeon_exits = multiworld.worlds[player].fix_palaceofdarkness_exit
+    fix_fake_worlds = multiworld.worlds[player].fix_fake_world
 
-    dungeon_entrance = [r for r in world.get_region(dungeon_region, player).entrances if r.name != clip.name][0]
+    dungeon_entrance = [r for r in multiworld.get_region(dungeon_region, player).entrances if r.name != clip.name][0]
     if not fix_dungeon_exits: # vanilla, simple, restricted, dungeons_simple; should never have fake worlds fix
         # Dungeons are only shuffled among themselves. We need to check SW, MM, and AT because they can't be reentered trivially. 
         if dungeon_entrance.name == 'Skull Woods Final Section': 
@@ -49,64 +50,64 @@ def dungeon_reentry_rules(world, player, clip: LTTPEntrance, dungeon_region: str
         elif dungeon_entrance.name == 'Agahnims Tower': 
             add_rule(clip, lambda state: state.has('Cape', player) or has_beam_sword(state, player) or state.has('Beat Agahnim 1', player)) # kill/bypass barrier
         # Then we set a restriction on exiting the dungeon, so you can't leave unless you got in normally. 
-        add_rule(world.get_entrance(dungeon_exit, player), lambda state: dungeon_entrance.can_reach(state))
+        add_rule(multiworld.get_entrance(dungeon_exit, player), lambda state: dungeon_entrance.can_reach(state))
     elif not fix_fake_worlds:  # full, dungeons_full; fixed dungeon exits, but no fake worlds fix
         # Entry requires the entrance's requirements plus a fake pearl, but you don't gain logical access to the surrounding region. 
         add_rule(clip, lambda state: dungeon_entrance.access_rule(fake_pearl_state(state, player)))
         # exiting restriction
-        add_rule(world.get_entrance(dungeon_exit, player), lambda state: dungeon_entrance.can_reach(state))
+        add_rule(multiworld.get_entrance(dungeon_exit, player), lambda state: dungeon_entrance.can_reach(state))
     # Otherwise, the shuffle type is crossed, dungeons_crossed, or insanity; all of these do not need additional rules on where we can go, 
     # since the clip links directly to the exterior region. 
 
 
-def underworld_glitches_rules(world, player):
+def underworld_glitches_rules(multiworld: MultiWorld, player: int):
     # Ice Palace Entrance Clip
     # This is the easiest one since it's a simple internal clip.
     # Need to also add melting to freezor chest since it's otherwise assumed.
     # Also can pick up the first jelly key from behind.
-    add_rule(world.get_entrance('Ice Palace (Main)', player), lambda state: can_bomb_clip(state, world.get_region('Ice Palace (Entrance)', player), player), combine='or')
-    add_rule(world.get_location('Ice Palace - Freezor Chest', player), lambda state: can_melt_things(state, player))
-    add_rule(world.get_location('Ice Palace - Jelly Key Drop', player), lambda state: can_bomb_clip(state, world.get_region('Ice Palace (Entrance)', player), player), combine='or')
+    add_rule(multiworld.get_entrance('Ice Palace (Main)', player), lambda state: can_bomb_clip(state, multiworld.get_region('Ice Palace (Entrance)', player), player), combine='or')
+    add_rule(multiworld.get_location('Ice Palace - Freezor Chest', player), lambda state: can_melt_things(state, player))
+    add_rule(multiworld.get_location('Ice Palace - Jelly Key Drop', player), lambda state: can_bomb_clip(state, multiworld.get_region('Ice Palace (Entrance)', player), player), combine='or')
 
 
     # Kiki Skip
-    kikiskip = world.get_entrance('Kiki Skip', player)
+    kikiskip = multiworld.get_entrance('Kiki Skip', player)
     set_rule(kikiskip, lambda state: can_bomb_clip(state, kikiskip.parent_region, player))
-    dungeon_reentry_rules(world, player, kikiskip, 'Palace of Darkness (Entrance)', 'Palace of Darkness Exit')
+    dungeon_reentry_rules(multiworld, player, kikiskip, 'Palace of Darkness (Entrance)', 'Palace of Darkness Exit')
 
 
     # Mire -> Hera -> Swamp
     # Using mire keys on other dungeon doors
-    mire = world.get_region('Misery Mire (West)', player)
+    mire = multiworld.get_region('Misery Mire (West)', player)
     mire_clip = lambda state: state.can_reach('Misery Mire (West)', 'Region', player) and can_bomb_clip(state, mire, player) and has_fire_source(state, player)
-    hera_clip = lambda state: state.can_reach('Tower of Hera (Top)', 'Region', player) and can_bomb_clip(state, world.get_region('Tower of Hera (Top)', player), player)
-    add_rule(world.get_entrance('Tower of Hera Big Key Door', player), lambda state: mire_clip(state) and state.has('Big Key (Misery Mire)', player), combine='or')
-    add_rule(world.get_entrance('Swamp Palace Small Key Door', player), lambda state: mire_clip(state), combine='or')
-    add_rule(world.get_entrance('Swamp Palace (Center)', player), lambda state: mire_clip(state) or hera_clip(state), combine='or')
+    hera_clip = lambda state: state.can_reach('Tower of Hera (Top)', 'Region', player) and can_bomb_clip(state, multiworld.get_region('Tower of Hera (Top)', player), player)
+    add_rule(multiworld.get_entrance('Tower of Hera Big Key Door', player), lambda state: mire_clip(state) and state.has('Big Key (Misery Mire)', player), combine='or')
+    add_rule(multiworld.get_entrance('Swamp Palace Small Key Door', player), lambda state: mire_clip(state), combine='or')
+    add_rule(multiworld.get_entrance('Swamp Palace (Center)', player), lambda state: mire_clip(state) or hera_clip(state), combine='or')
 
     # Build the rule for SP moat. 
     # We need to be able to s+q to old man, then go to either Mire or Hera at either Hera or GT. 
     # First we require a certain type of entrance shuffle, then build the rule from its pieces. 
-    if not world.worlds[player].swamp_patch_required:
-        if world.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
+    if not multiworld.worlds[player].swamp_patch_required:
+        if multiworld.worlds[player].options.entrance_shuffle in ['vanilla', 'dungeons_simple', 'dungeons_full', 'dungeons_crossed']:
             rule_map = {
                 'Misery Mire (Entrance)': (lambda state: True),
                 'Tower of Hera (Bottom)': (lambda state: state.can_reach('Tower of Hera Big Key Door', 'Entrance', player))
             }
-            inverted = world.worlds[player].options.mode == 'inverted'
+            inverted = multiworld.worlds[player].options.mode == 'inverted'
             hera_rule = lambda state: (state.has('Moon Pearl', player) or not inverted) and \
-                                      rule_map.get(world.get_entrance('Tower of Hera', player).connected_region.name, lambda state: False)(state)
+                                      rule_map.get(multiworld.get_entrance('Tower of Hera', player).connected_region.name, lambda state: False)(state)
             gt_rule = lambda state: (state.has('Moon Pearl', player) or inverted) and \
-                                    rule_map.get(world.get_entrance(('Ganons Tower' if not inverted else 'Inverted Ganons Tower'), player).connected_region.name, lambda state: False)(state)
+                                    rule_map.get(multiworld.get_entrance(('Ganons Tower' if not inverted else 'Inverted Ganons Tower'), player).connected_region.name, lambda state: False)(state)
             mirrorless_moat_rule = lambda state: state.can_reach('Old Man S&Q', 'Entrance', player) and mire_clip(state) and (hera_rule(state) or gt_rule(state))
-            add_rule(world.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player) or mirrorless_moat_rule(state))
+            add_rule(multiworld.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player) or mirrorless_moat_rule(state))
         else: 
-            add_rule(world.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player))
+            add_rule(multiworld.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Magic Mirror', player))
 
     # Using the entrances for various ER types. Hera -> Swamp never matters because you can only logically traverse with the mire keys
-    mire_to_hera = world.get_entrance('Mire to Hera Clip', player)
-    mire_to_swamp = world.get_entrance('Hera to Swamp Clip', player)
+    mire_to_hera = multiworld.get_entrance('Mire to Hera Clip', player)
+    mire_to_swamp = multiworld.get_entrance('Hera to Swamp Clip', player)
     set_rule(mire_to_hera, mire_clip)
     set_rule(mire_to_swamp, lambda state: mire_clip(state) and state.has('Flippers', player))
-    dungeon_reentry_rules(world, player, mire_to_hera, 'Tower of Hera (Bottom)', 'Tower of Hera Exit')
-    dungeon_reentry_rules(world, player, mire_to_swamp, 'Swamp Palace (Entrance)', 'Swamp Palace Exit')
+    dungeon_reentry_rules(multiworld, player, mire_to_hera, 'Tower of Hera (Bottom)', 'Tower of Hera Exit')
+    dungeon_reentry_rules(multiworld, player, mire_to_swamp, 'Swamp Palace (Entrance)', 'Swamp Palace Exit')
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index 4ee5b9d266..2b99162837 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -305,6 +305,8 @@ class ALTTPWorld(World):
         self.required_medallions = ["Ether", "Quake"]
         self.escape_assist = []
         self.shops = []
+        self.logical_heart_containers = 10
+        self.logical_heart_pieces = 24
         super(ALTTPWorld, self).__init__(*args, **kwargs)
 
     @classmethod
@@ -384,6 +386,8 @@ class ALTTPWorld(World):
                     self.options.local_items.value |= self.dungeon_local_item_names
 
         self.difficulty_requirements = difficulties[self.options.item_pool.current_key]
+        self.logical_heart_pieces = self.difficulty_requirements.heart_piece_limit
+        self.logical_heart_containers = self.difficulty_requirements.boss_heart_container_limit
 
         # enforce pre-defined local items.
         if self.options.goal in ["local_triforce_hunt", "local_ganon_triforce_hunt"]:
diff --git a/worlds/alttp/archipelago.json b/worlds/alttp/archipelago.json
new file mode 100644
index 0000000000..19bbc03213
--- /dev/null
+++ b/worlds/alttp/archipelago.json
@@ -0,0 +1,6 @@
+{
+	"game": "A Link to the Past",
+	"minimum_ap_version": "0.6.6",
+	"world_version": "5.1.0",
+	"authors": ["Berserker"]
+}
diff --git a/worlds/apquest/!READ_FIRST!.txt b/worlds/apquest/!READ_FIRST!.txt
new file mode 100644
index 0000000000..ff3d5fe510
--- /dev/null
+++ b/worlds/apquest/!READ_FIRST!.txt
@@ -0,0 +1,46 @@
+This apworld is meant as a learning tool for new apworld devs.
+It is a completely standalone resource, but there will be links to additional resources when appropriate.
+
+#################
+# Prerequisites #
+#################
+
+APQuest will only explain how to write the generation-side code for your game, not how to write a client or mod for it.
+For a more zoomed out view of how to add a game to Archipelago, you can read this document:
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/adding%20games.md
+
+APQuest assumes you already vaguely know what an apworld is.
+If you don't know, read this first:
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/apworld%20specification.md
+
+To write an apworld, you need to be running Archipelago from source (Python) instead of using e.g. the .exe build.
+Here's an explanation for how to do that.
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/running%20from%20source.md
+
+#######################
+# How to read APQuest #
+#######################
+
+You'll want to start with __init__.py, then move to world.py.
+If you also want to learn how to write unit tests, go to test/__init__.py.
+
+You can ignore the game/ folder, it contains the actual game code, graphics and music.
+
+The client/ folder is NOT meant for teaching.
+While the client was written to the best of its author's ability, it does not meet the same standard as the world code.
+The client code is also lacking the explanatory comments.
+Copy from it at your own risk.
+
+###################
+# Further reading #
+###################
+
+APQuest is a very simple game, so not every edge case will be covered.
+The world API document goes a lot more in-depth on certain topics:
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/world%20api.md
+
+There is also the "APWorld dev FAQ" document with common emergent problems:
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/apworld_dev_faq.md
+
+In general, but especially if you want your apworld to be verified by core, you should follow our style guide:
+https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/style.md
diff --git a/worlds/apquest/__init__.py b/worlds/apquest/__init__.py
new file mode 100644
index 0000000000..6ef396ee90
--- /dev/null
+++ b/worlds/apquest/__init__.py
@@ -0,0 +1,12 @@
+# The first thing you should make for your world is an archipelago.json manifest file.
+# You can reference APQuest's, but you should change the "game" field (obviously),
+# and you should also change the "minimum_ap_version" - probably to the current value of Utils.__version__.
+
+# Apart from the regular apworld code that allows generating multiworld seeds with your game,
+# your apworld might have other "components" that should be launchable from the Archipelago Launcher.
+# You can ignore this for now. If you are specifically interested in components, you can read components.py.
+from . import components as components
+
+# The main thing we do in our __init__.py is importing our world class from our world.py to initialize it.
+# Obviously, this world class needs to exist first. For this, read world.py.
+from .world import APQuestWorld as APQuestWorld
diff --git a/worlds/apquest/archipelago.json b/worlds/apquest/archipelago.json
new file mode 100644
index 0000000000..6a6c3ddd02
--- /dev/null
+++ b/worlds/apquest/archipelago.json
@@ -0,0 +1,6 @@
+{
+	"game": "APQuest",
+	"minimum_ap_version": "0.6.4",
+	"world_version": "1.0.1",
+	"authors": ["NewSoupVi"]
+}
diff --git a/worlds/apquest/client/__init__.py b/worlds/apquest/client/__init__.py
new file mode 100644
index 0000000000..0cd1b86a49
--- /dev/null
+++ b/worlds/apquest/client/__init__.py
@@ -0,0 +1,5 @@
+# !!! IMPORTANT !!!
+# The client implementation is *not* meant for teaching.
+# Obviously, it is written to the best of its author's abilities,
+# but it is not to the same standard as the rest of the apworld.
+# Copy things from here at your own risk.
diff --git a/worlds/apquest/client/ap_quest_client.kv b/worlds/apquest/client/ap_quest_client.kv
new file mode 100644
index 0000000000..9f4024e62a
--- /dev/null
+++ b/worlds/apquest/client/ap_quest_client.kv
@@ -0,0 +1,56 @@
+<ConfettiView>:
+    size_hint: None, None
+    pos_hint: {"center_x": 0.5, "center_y": 0.5}
+    spacing: 0
+    padding: 0
+
+<APQuestGrid>:
+    cols: 12
+    rows: 11
+    spacing: 0
+    padding: 0
+    size_hint: None, None
+    pos_hint: {"center_x": 0.5, "center_y": 0.5}
+
+<APQuestGameView>:
+    RelativeLayout:
+        id: game_container
+
+<APQuestControlsView>:
+    Label:
+        markup: True
+        font_size: "20sp"
+        valign: "middle"
+        pos_hint: {"center_x": 0.5, "center_y": 0.5}
+        text:
+            """[b]Controls:[/b]
+
+            WASD or Arrow Keys to move
+            Space to attack or interact
+            C to fire available Confetti Cannons
+            Number Keys + Backspace for Math Trap\n
+
+            Rebinding controls might be added in the future :)"""
+
+<VolumeSliderView>:
+    orientation: "horizontal"
+    size_hint: 1, None
+    padding: 0
+    height: 50
+
+    Label:
+        size_hint: None, 1
+        text: "Volume:"
+
+    Slider:
+        id: volume_slider
+        size_hint: 1, 1
+        min: 0
+        max: 100
+        step: 1
+        value: 50
+        orientation: "horizontal"
+
+    Label:
+        size_hint: None, 1
+        text: str(int(volume_slider.value))
diff --git a/worlds/apquest/client/ap_quest_client.py b/worlds/apquest/client/ap_quest_client.py
new file mode 100644
index 0000000000..c1edc8edb4
--- /dev/null
+++ b/worlds/apquest/client/ap_quest_client.py
@@ -0,0 +1,290 @@
+import asyncio
+import sys
+from argparse import Namespace
+from enum import Enum
+from typing import TYPE_CHECKING, Any
+
+from CommonClient import CommonContext, gui_enabled, logger, server_loop
+from NetUtils import ClientStatus
+
+from ..game.events import ConfettiFired, LocationClearedEvent, MathProblemSolved, MathProblemStarted, VictoryEvent
+from ..game.game import Game
+from ..game.inputs import Input
+from ..game.items import Item
+from ..game.locations import Location
+from .game_manager import APQuestManager
+from .graphics import PlayerSprite
+from .item_quality import get_quality_for_network_item
+from .sounds import (
+    CONFETTI_CANNON,
+    ITEM_JINGLES,
+    MATH_PROBLEM_SOLVED_JINGLE,
+    MATH_PROBLEM_STARTED_JINGLE,
+    VICTORY_JINGLE,
+)
+
+if TYPE_CHECKING:
+    import kvui
+
+
+# !!! IMPORTANT !!!
+# The client implementation is *not* meant for teaching.
+# Obviously, it is written to the best of its author's abilities,
+# but it is not to the same standard as the rest of the apworld.
+# Copy things from here at your own risk.
+
+
+class ConnectionStatus(Enum):
+    NOT_CONNECTED = 0
+    SCOUTS_NOT_SENT = 1
+    SCOUTS_SENT = 2
+    GAME_RUNNING = 3
+
+
+class APQuestContext(CommonContext):
+    game = "APQuest"
+    items_handling = 0b111  # full remote
+
+    client_loop: asyncio.Task[None]
+
+    last_connected_slot: int | None = None
+
+    slot_data: dict[str, Any]
+
+    ap_quest_game: Game | None = None
+    hard_mode: bool = False
+    hammer: bool = False
+    extra_starting_chest: bool = False
+    player_sprite: PlayerSprite = PlayerSprite.HUMAN
+
+    connection_status: ConnectionStatus = ConnectionStatus.NOT_CONNECTED
+
+    highest_processed_item_index: int = 0
+    queued_locations: list[int]
+
+    delay_intro_song: bool
+
+    ui: APQuestManager
+
+    def __init__(
+        self, server_address: str | None = None, password: str | None = None, delay_intro_song: bool = False
+    ) -> None:
+        super().__init__(server_address, password)
+
+        self.queued_locations = []
+        self.slot_data = {}
+        self.delay_intro_song = delay_intro_song
+
+    async def server_auth(self, password_requested: bool = False) -> None:
+        if password_requested and not self.password:
+            self.ui.allow_intro_song()
+            await super().server_auth(password_requested)
+        await self.get_username()
+        await self.send_connect(game=self.game)
+
+    def handle_connection_loss(self, msg: str) -> None:
+        self.ui.allow_intro_song()
+        super().handle_connection_loss(msg)
+
+    async def connect(self, address: str | None = None) -> None:
+        self.ui.switch_to_regular_tab()
+        await super().connect(address)
+
+    async def apquest_loop(self) -> None:
+        while not self.exit_event.is_set():
+            if self.connection_status != ConnectionStatus.GAME_RUNNING:
+                if self.connection_status == ConnectionStatus.SCOUTS_NOT_SENT:
+                    await self.send_msgs([{"cmd": "LocationScouts", "locations": self.server_locations}])
+                    self.connection_status = ConnectionStatus.SCOUTS_SENT
+
+                await asyncio.sleep(0.1)
+                continue
+
+            if not self.ap_quest_game or not self.ap_quest_game.gameboard or not self.ap_quest_game.gameboard.ready:
+                await asyncio.sleep(0.1)
+                continue
+
+            try:
+                while self.queued_locations:
+                    location = self.queued_locations.pop(0)
+                    self.location_checked_side_effects(location)
+                    self.locations_checked.add(location)
+                    await self.check_locations({location})
+
+                rerender = False
+
+                new_items = self.items_received[self.highest_processed_item_index :]
+                for item in new_items:
+                    self.highest_processed_item_index += 1
+                    self.ap_quest_game.receive_item(item.item, item.location, item.player)
+                    rerender = True
+
+                for new_remotely_cleared_location in self.checked_locations - self.locations_checked:
+                    self.ap_quest_game.force_clear_location(new_remotely_cleared_location)
+                    rerender = True
+
+                if rerender:
+                    self.render()
+
+                if self.ap_quest_game.player.has_won and not self.finished_game:
+                    await self.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+                    self.finished_game = True
+            except Exception as e:
+                logger.exception(e)
+
+            await asyncio.sleep(0.1)
+
+    def on_package(self, cmd: str, args: dict[str, Any]) -> None:
+        if cmd == "ConnectionRefused":
+            self.ui.allow_intro_song()
+
+        if cmd == "Connected":
+            if self.connection_status == ConnectionStatus.GAME_RUNNING:
+                # In a connection loss -> auto reconnect scenario, we can seamlessly keep going
+                return
+
+            self.last_connected_slot = self.slot
+
+            self.connection_status = ConnectionStatus.NOT_CONNECTED  # for safety, it will get set again later
+
+            self.slot_data = args["slot_data"]
+            self.hard_mode = self.slot_data["hard_mode"]
+            self.hammer = self.slot_data["hammer"]
+            self.extra_starting_chest = self.slot_data["extra_starting_chest"]
+            try:
+                self.player_sprite = PlayerSprite(self.slot_data["player_sprite"])
+            except Exception as e:
+                logger.exception(e)
+                self.player_sprite = PlayerSprite.UNKNOWN
+
+            self.ap_quest_game = Game(self.hard_mode, self.hammer, self.extra_starting_chest)
+            self.highest_processed_item_index = 0
+            self.render()
+
+            self.connection_status = ConnectionStatus.SCOUTS_NOT_SENT
+        if cmd == "LocationInfo":
+            remote_item_graphic_overrides = {
+                Location(location): Item(network_item.item)
+                for location, network_item in self.locations_info.items()
+                if self.slot_info[network_item.player].game == self.game
+            }
+
+            assert self.ap_quest_game is not None
+            self.ap_quest_game.gameboard.fill_remote_location_content(remote_item_graphic_overrides)
+            self.render()
+            self.ui.game_view.bind_keyboard()
+
+            self.connection_status = ConnectionStatus.GAME_RUNNING
+            self.ui.game_started()
+
+    async def disconnect(self, *args: Any, **kwargs: Any) -> None:
+        self.finished_game = False
+        self.locations_checked = set()
+        self.connection_status = ConnectionStatus.NOT_CONNECTED
+        await super().disconnect(*args, **kwargs)
+
+    def render(self) -> None:
+        if self.ap_quest_game is None:
+            raise RuntimeError("Tried to render before self.ap_quest_game was initialized.")
+
+        self.ui.render(self.ap_quest_game, self.player_sprite)
+        self.handle_game_events()
+
+    def location_checked_side_effects(self, location: int) -> None:
+        network_item = self.locations_info[location]
+
+        if network_item.player == self.slot and network_item.item == Item.MATH_TRAP.value:
+            # In case of a local math trap, we only play the math trap trigger jingle
+            return
+
+        item_quality = get_quality_for_network_item(network_item)
+        self.play_jingle(ITEM_JINGLES[item_quality])
+
+    def play_jingle(self, audio_filename: str) -> None:
+        self.ui.play_jingle(audio_filename)
+
+    def handle_game_events(self) -> None:
+        if self.ap_quest_game is None:
+            return
+
+        while self.ap_quest_game.queued_events:
+            event = self.ap_quest_game.queued_events.pop(0)
+
+            if isinstance(event, LocationClearedEvent):
+                self.queued_locations.append(event.location_id)
+                continue
+
+            if isinstance(event, VictoryEvent):
+                self.play_jingle(VICTORY_JINGLE)
+                continue
+
+            if isinstance(event, ConfettiFired):
+                gameboard_x, gameboard_y = self.ap_quest_game.gameboard.size
+                gameboard_x += 1  # vertical item column
+                x = (event.x + 0.5) / gameboard_x
+                y = 1 - (event.y + 0.5) / gameboard_y  # Kivy's y is bottom to top (ew)
+
+                self.ui.play_jingle(CONFETTI_CANNON)
+                self.ui.add_confetti((x, y), (self.slot_data["confetti_explosiveness"] + 1) * 5)
+                continue
+
+            if isinstance(event, MathProblemStarted):
+                self.play_jingle(MATH_PROBLEM_STARTED_JINGLE)
+                continue
+
+            if isinstance(event, MathProblemSolved):
+                self.play_jingle(MATH_PROBLEM_SOLVED_JINGLE)
+                continue
+
+    def input_and_rerender(self, input_key: Input) -> None:
+        if self.ap_quest_game is None:
+            return
+        if not self.ap_quest_game.gameboard.ready:
+            return
+        self.ap_quest_game.input(input_key)
+        self.render()
+
+    def make_gui(self) -> "type[kvui.GameManager]":
+        self.load_kv()
+        return APQuestManager
+
+    def load_kv(self) -> None:
+        import pkgutil
+
+        from kivy.lang import Builder
+
+        data = pkgutil.get_data(__name__, "ap_quest_client.kv")
+        if data is None:
+            raise RuntimeError("ap_quest_client.kv could not be loaded.")
+
+        Builder.load_string(data.decode())
+
+
+async def main(args: Namespace) -> None:
+    if not gui_enabled:
+        raise RuntimeError("APQuest cannot be played without gui.")
+
+    # Assume we shouldn't play the intro song in the auto-connect scenario, because the game will instantly start.
+    delay_intro_song = args.connect and args.name
+
+    ctx = APQuestContext(args.connect, args.password, delay_intro_song=delay_intro_song)
+    ctx.auth = args.name
+    ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+
+    ctx.run_gui()
+    ctx.run_cli()
+
+    ctx.client_loop = asyncio.create_task(ctx.apquest_loop(), name="Client Loop")
+
+    await ctx.exit_event.wait()
+    await ctx.shutdown()
+
+
+def launch(*args: str) -> None:
+    from .launch import launch_ap_quest_client
+
+    launch_ap_quest_client(*args)
+
+
+if __name__ == "__main__":
+    launch(*sys.argv[1:])
diff --git a/worlds/apquest/client/custom_views.py b/worlds/apquest/client/custom_views.py
new file mode 100644
index 0000000000..4c1d28c732
--- /dev/null
+++ b/worlds/apquest/client/custom_views.py
@@ -0,0 +1,256 @@
+from collections.abc import Callable
+from dataclasses import dataclass
+from math import sqrt
+from random import choice, random
+from typing import Any
+
+from kivy.core.window import Keyboard, Window
+from kivy.graphics import Color, Triangle
+from kivy.graphics.instructions import Canvas
+from kivy.input import MotionEvent
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.gridlayout import GridLayout
+from kivymd.uix.recycleview import MDRecycleView
+
+from CommonClient import logger
+
+from ..game.inputs import Input
+
+
+INPUT_MAP = {
+    "up": Input.UP,
+    "w": Input.UP,
+    "down": Input.DOWN,
+    "s": Input.DOWN,
+    "right": Input.RIGHT,
+    "d": Input.RIGHT,
+    "left": Input.LEFT,
+    "a": Input.LEFT,
+    "spacebar": Input.ACTION,
+    "c": Input.CONFETTI,
+    "0": Input.ZERO,
+    "1": Input.ONE,
+    "2": Input.TWO,
+    "3": Input.THREE,
+    "4": Input.FOUR,
+    "5": Input.FIVE,
+    "6": Input.SIX,
+    "7": Input.SEVEN,
+    "8": Input.EIGHT,
+    "9": Input.NINE,
+    "backspace": Input.BACKSPACE,
+}
+
+
+class APQuestGameView(MDRecycleView):
+    _keyboard: Keyboard | None = None
+    input_function: Callable[[Input], None]
+
+    def __init__(self, input_function: Callable[[Input], None], **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self.input_function = input_function
+        self.bind_keyboard()
+
+    def on_touch_down(self, touch: MotionEvent) -> None:
+        self.bind_keyboard()
+
+    def bind_keyboard(self) -> None:
+        if self._keyboard is not None:
+            return
+        self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
+        self._keyboard.bind(on_key_down=self._on_keyboard_down)
+
+    def _keyboard_closed(self) -> None:
+        if self._keyboard is None:
+            return
+        self._keyboard.unbind(on_key_down=self._on_keyboard_down)
+        self._keyboard = None
+
+    def _on_keyboard_down(self, _: Any, keycode: tuple[int, str], _1: Any, _2: Any) -> bool:
+        if keycode[1] in INPUT_MAP:
+            self.input_function(INPUT_MAP[keycode[1]])
+        return True
+
+
+class APQuestGrid(GridLayout):
+    def check_resize(self, _: int, _1: int) -> None:
+        parent_width, parent_height = self.parent.size
+
+        self_width_according_to_parent_height = parent_height * 12 / 11
+        self_height_according_to_parent_width = parent_height * 11 / 12
+
+        if self_width_according_to_parent_height > parent_width:
+            self.size = parent_width, self_height_according_to_parent_width
+        else:
+            self.size = self_width_according_to_parent_height, parent_height
+
+
+CONFETTI_COLORS = [
+    (220 / 255, 0, 212 / 255),  # PINK
+    (0, 0, 252 / 255),  # BLUE
+    (252 / 255, 220 / 255, 0),  # YELLOW
+    (0, 184 / 255, 0),  # GREEN
+    (252 / 255, 56 / 255, 0),  # ORANGE
+]
+
+
+@dataclass
+class Confetti:
+    x_pos: float
+    y_pos: float
+    x_speed: float
+    y_speed: float
+    color: tuple[float, float, float]
+    life: float = 3
+
+    triangle1: Triangle | None = None
+    triangle2: Triangle | None = None
+    color_instruction: Color | None = None
+
+    def update_speed(self, dt: float) -> None:
+        if self.x_speed > 0:
+            self.x_speed -= 2.7 * dt
+            if self.x_speed < 0:
+                self.x_speed = 0
+        else:
+            self.x_speed += 2.7 * dt
+            if self.x_speed > 0:
+                self.x_speed = 0
+
+        if self.y_speed > -0.03:
+            self.y_speed -= 2.7 * dt
+            if self.y_speed < -0.03:
+                self.y_speed = -0.03
+        else:
+            self.y_speed += 2.7 * dt
+            if self.y_speed > -0.03:
+                self.y_speed = -0.03
+
+    def move(self, dt: float) -> None:
+        self.update_speed(dt)
+
+        if self.y_pos > 1:
+            self.y_pos = 1
+            self.y_speed = 0
+        if self.x_pos < 0.01:
+            self.x_pos = 0.01
+            self.x_speed = 0
+        if self.x_pos > 0.99:
+            self.x_pos = 0.99
+            self.x_speed = 0
+
+        self.x_pos += self.x_speed * dt
+        self.y_pos += self.y_speed * dt
+
+    def render(self, offset_x: float, offset_y: float, max_x: int, max_y: int) -> None:
+        if self.x_speed == 0 and self.y_speed == 0:
+            x_normalized, y_normalized = 0.0, 1.0
+        else:
+            speed_magnitude = sqrt(self.x_speed**2 + self.y_speed**2)
+            x_normalized, y_normalized = self.x_speed / speed_magnitude, self.y_speed / speed_magnitude
+
+        half_top_to_bottom = 0.006
+        half_left_to_right = 0.018
+
+        upwards_delta_x = x_normalized * half_top_to_bottom
+        upwards_delta_y = y_normalized * half_top_to_bottom
+        sideways_delta_x = y_normalized * half_left_to_right
+        sideways_delta_y = x_normalized * half_left_to_right
+
+        top_left_x, top_left_y = upwards_delta_x - sideways_delta_x, upwards_delta_y + sideways_delta_y
+        bottom_left_x, bottom_left_y = -upwards_delta_x - sideways_delta_x, -upwards_delta_y + sideways_delta_y
+        top_right_x, top_right_y = -bottom_left_x, -bottom_left_y
+        bottom_right_x, bottom_right_y = -top_left_x, -top_left_y
+
+        top_left_x, top_left_y = top_left_x + self.x_pos, top_left_y + self.y_pos
+        bottom_left_x, bottom_left_y = bottom_left_x + self.x_pos, bottom_left_y + self.y_pos
+        top_right_x, top_right_y = top_right_x + self.x_pos, top_right_y + self.y_pos
+        bottom_right_x, bottom_right_y = bottom_right_x + self.x_pos, bottom_right_y + self.y_pos
+
+        top_left_x, top_left_y = top_left_x * max_x + offset_x, top_left_y * max_y + offset_y
+        bottom_left_x, bottom_left_y = bottom_left_x * max_x + offset_x, bottom_left_y * max_y + offset_y
+        top_right_x, top_right_y = top_right_x * max_x + offset_x, top_right_y * max_y + offset_y
+        bottom_right_x, bottom_right_y = bottom_right_x * max_x + offset_x, bottom_right_y * max_y + offset_y
+
+        points1 = (top_left_x, top_left_y, top_right_x, top_right_y, bottom_left_x, bottom_left_y)
+        points2 = (bottom_right_x, bottom_right_y, top_right_x, top_right_y, bottom_left_x, bottom_left_y)
+
+        if self.color_instruction is None:
+            self.color_instruction = Color(*self.color)
+
+        if self.triangle1 is None:
+            self.triangle1 = Triangle(points=points1)
+        else:
+            self.triangle1.points = points1
+
+        if self.triangle2 is None:
+            self.triangle2 = Triangle(points=points2)
+        else:
+            self.triangle2.points = points2
+
+    def reduce_life(self, dt: float, canvas: Canvas) -> bool:
+        self.life -= dt
+
+        if self.life <= 0:
+            if self.color_instruction is not None:
+                canvas.remove(self.color_instruction)
+            if self.triangle1 is not None:
+                canvas.remove(self.triangle1)
+            if self.triangle2 is not None:
+                canvas.remove(self.triangle2)
+            return False
+
+        return True
+
+
+class ConfettiView(MDRecycleView):
+    confetti: list[Confetti]
+
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self.confetti = []
+
+    def check_resize(self, _: int, _1: int) -> None:
+        parent_width, parent_height = self.parent.size
+
+        self_width_according_to_parent_height = parent_height * 12 / 11
+        self_height_according_to_parent_width = parent_height * 11 / 12
+
+        if self_width_according_to_parent_height > parent_width:
+            self.size = parent_width, self_height_according_to_parent_width
+        else:
+            self.size = self_width_according_to_parent_height, parent_height
+
+    def redraw_confetti(self, dt: float) -> None:
+        try:
+            with self.canvas:
+                for confetti in self.confetti:
+                    confetti.move(dt)
+
+                self.confetti = [confetti for confetti in self.confetti if confetti.reduce_life(dt, self.canvas)]
+
+                for confetti in self.confetti:
+                    confetti.render(self.pos[0], self.pos[1], self.size[0], self.size[1])
+        except Exception as e:
+            logger.exception(e)
+
+    def add_confetti(self, initial_position: tuple[float, float], amount: int) -> None:
+        for i in range(amount):
+            self.confetti.append(
+                Confetti(
+                    initial_position[0],
+                    initial_position[1],
+                    random() * 3.2 - 1.6 - (initial_position[0] - 0.5) * 1.2,
+                    random() * 3.2 - 1.3 - (initial_position[1] - 0.5) * 1.2,
+                    choice(CONFETTI_COLORS),
+                    3 + i * 0.05,
+                )
+            )
+
+
+class VolumeSliderView(BoxLayout):
+    pass
+
+
+class APQuestControlsView(BoxLayout):
+    pass
diff --git a/worlds/apquest/client/game_manager.py b/worlds/apquest/client/game_manager.py
new file mode 100644
index 0000000000..86f4316d12
--- /dev/null
+++ b/worlds/apquest/client/game_manager.py
@@ -0,0 +1,200 @@
+from __future__ import annotations
+
+# isort: off
+from kvui import GameManager, MDNavigationItemBase
+
+# isort: on
+from typing import TYPE_CHECKING, Any
+
+from kivy.clock import Clock
+from kivy.uix.gridlayout import GridLayout
+from kivy.uix.image import Image
+from kivy.uix.layout import Layout
+from kivymd.uix.recycleview import MDRecycleView
+
+from ..game.game import Game
+from .custom_views import APQuestControlsView, APQuestGameView, APQuestGrid, ConfettiView, VolumeSliderView
+from .graphics import PlayerSprite, get_texture
+from .sounds import SoundManager
+
+if TYPE_CHECKING:
+    from .ap_quest_client import APQuestContext
+
+
+class APQuestManager(GameManager):
+    base_title = "APQuest for AP version"
+    ctx: APQuestContext
+
+    lower_game_grid: GridLayout
+    upper_game_grid: GridLayout
+
+    game_view: MDRecycleView
+    game_view_tab: MDNavigationItemBase
+
+    sound_manager: SoundManager
+
+    bottom_image_grid: list[list[Image]]
+    top_image_grid: list[list[Image]]
+    confetti_view: ConfettiView
+
+    bottom_grid_is_grass: bool
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.sound_manager = SoundManager()
+        self.sound_manager.allow_intro_to_play = not self.ctx.delay_intro_song
+        self.top_image_grid = []
+        self.bottom_image_grid = []
+        self.bottom_grid_is_grass = False
+
+    def allow_intro_song(self) -> None:
+        self.sound_manager.allow_intro_to_play = True
+
+    def add_confetti(self, position: tuple[float, float], amount: int) -> None:
+        self.confetti_view.add_confetti(position, amount)
+
+    def play_jingle(self, audio_filename: str) -> None:
+        self.sound_manager.play_jingle(audio_filename)
+
+    def switch_to_tab(self, desired_tab: MDNavigationItemBase) -> None:
+        if self.screens.current_tab == desired_tab:
+            return
+        self.screens.current_tab.active = False
+        self.screens.switch_screens(desired_tab)
+        desired_tab.active = True
+
+    def switch_to_game_tab(self) -> None:
+        self.switch_to_tab(self.game_view_tab)
+
+    def switch_to_regular_tab(self) -> None:
+        self.switch_to_tab(self.tabs.children[-1])
+
+    def game_started(self) -> None:
+        self.switch_to_game_tab()
+        self.sound_manager.game_started = True
+
+    def render(self, game: Game, player_sprite: PlayerSprite) -> None:
+        self.setup_game_grid_if_not_setup(game.gameboard.size)
+
+        # This calls game.render(), which needs to happen to update the state of math traps
+        self.render_gameboard(game, player_sprite)
+        # Only now can we check whether a math problem is active
+        self.render_background_game_grid(game.gameboard.size, game.active_math_problem is None)
+        self.sound_manager.math_trap_active = game.active_math_problem is not None
+
+        self.render_item_column(game)
+
+    def render_gameboard(self, game: Game, player_sprite: PlayerSprite) -> None:
+        rendered_gameboard = game.render()
+
+        for gameboard_row, image_row in zip(rendered_gameboard, self.top_image_grid, strict=False):
+            for graphic, image in zip(gameboard_row, image_row[:11], strict=False):
+                texture = get_texture(graphic, player_sprite)
+
+                if texture is None:
+                    image.opacity = 0
+                    image.texture = None
+                    continue
+
+                image.texture = texture
+                image.opacity = 1
+
+    def render_item_column(self, game: Game) -> None:
+        rendered_item_column = game.render_health_and_inventory(vertical=True)
+        for item_graphic, image_row in zip(rendered_item_column, self.top_image_grid, strict=False):
+            image = image_row[-1]
+
+            texture = get_texture(item_graphic)
+            if texture is None:
+                image.opacity = 0
+                image.texture = None
+                continue
+
+            image.texture = texture
+            image.opacity = 1
+
+    def render_background_game_grid(self, size: tuple[int, int], grass: bool) -> None:
+        if grass == self.bottom_grid_is_grass:
+            return
+
+        for row in range(size[1]):
+            for column in range(size[0]):
+                image = self.bottom_image_grid[row][column]
+
+                if not grass:
+                    image.color = (0.3, 0.3, 0.3)
+                    image.texture = None
+                    continue
+
+                boss_room = (row in (0, 1, 2) and (size[1] - column) in (1, 2, 3)) or (row, column) == (3, size[1] - 2)
+                if boss_room:
+                    image.color = (0.45, 0.35, 0.1)
+                    image.texture = None
+                    continue
+                image.texture = get_texture("Grass")
+                image.color = (1.0, 1.0, 1.0)
+
+        self.bottom_grid_is_grass = grass
+
+    def setup_game_grid_if_not_setup(self, size: tuple[int, int]) -> None:
+        if self.upper_game_grid.children:
+            return
+
+        self.top_image_grid = []
+        self.bottom_image_grid = []
+
+        for _row in range(size[1]):
+            self.top_image_grid.append([])
+            self.bottom_image_grid.append([])
+
+            for _column in range(size[0]):
+                bottom_image = Image(fit_mode="fill", color=(0.3, 0.3, 0.3))
+                self.lower_game_grid.add_widget(bottom_image)
+                self.bottom_image_grid[-1].append(bottom_image)
+
+                top_image = Image(fit_mode="fill")
+                self.upper_game_grid.add_widget(top_image)
+                self.top_image_grid[-1].append(top_image)
+
+            # Right side: Inventory
+            image = Image(fit_mode="fill", color=(0.3, 0.3, 0.3))
+            self.lower_game_grid.add_widget(image)
+
+            image2 = Image(fit_mode="fill", opacity=0)
+            self.upper_game_grid.add_widget(image2)
+
+            self.top_image_grid[-1].append(image2)
+
+    def build(self) -> Layout:
+        container = super().build()
+
+        self.game_view = APQuestGameView(self.ctx.input_and_rerender)
+
+        self.game_view_tab = self.add_client_tab("APQuest", self.game_view)
+
+        controls = APQuestControlsView()
+
+        self.add_client_tab("Controls", controls)
+
+        game_container = self.game_view.ids["game_container"]
+        self.lower_game_grid = APQuestGrid()
+        self.upper_game_grid = APQuestGrid()
+        self.confetti_view = ConfettiView()
+        game_container.add_widget(self.lower_game_grid)
+        game_container.add_widget(self.upper_game_grid)
+        game_container.add_widget(self.confetti_view)
+
+        game_container.bind(size=self.lower_game_grid.check_resize)
+        game_container.bind(size=self.upper_game_grid.check_resize)
+        game_container.bind(size=self.confetti_view.check_resize)
+
+        volume_slider_container = VolumeSliderView()
+        volume_slider = volume_slider_container.ids["volume_slider"]
+        volume_slider.value = self.sound_manager.volume_percentage
+        volume_slider.bind(value=lambda _, new_volume: self.sound_manager.set_volume_percentage(new_volume))
+
+        self.grid.add_widget(volume_slider_container, index=3)
+
+        Clock.schedule_interval(lambda dt: self.confetti_view.redraw_confetti(dt), 1 / 60)
+
+        return container
diff --git a/worlds/apquest/client/graphics.py b/worlds/apquest/client/graphics.py
new file mode 100644
index 0000000000..535bf84ee8
--- /dev/null
+++ b/worlds/apquest/client/graphics.py
@@ -0,0 +1,180 @@
+import pkgutil
+from collections.abc import Buffer
+from enum import Enum
+from io import BytesIO
+from typing import Literal, NamedTuple, Protocol, cast
+
+from kivy.uix.image import CoreImage
+
+from CommonClient import logger
+
+from .. import game
+from ..game.graphics import Graphic
+
+
+# The import "from kivy.graphics.texture import Texture" does not work correctly.
+# We never need the class directly, so we need to use a protocol.
+class Texture(Protocol):
+    mag_filter: Literal["nearest"]
+
+    def get_region(self, x: int, y: int, w: int, h: int) -> "Texture": ...
+
+
+class RelatedTexture(NamedTuple):
+    base_texture_file: str
+    x: int
+    y: int
+    width: int
+    height: int
+
+
+IMAGE_GRAPHICS: dict[Graphic, str | RelatedTexture] = {
+    Graphic.WALL: RelatedTexture("inanimates.png", 16, 32, 16, 16),
+    Graphic.BREAKABLE_BLOCK: RelatedTexture("inanimates.png", 32, 32, 16, 16),
+    Graphic.CHEST: RelatedTexture("inanimates.png", 0, 16, 16, 16),
+    Graphic.BUSH: RelatedTexture("inanimates.png", 16, 16, 16, 16),
+    Graphic.KEY_DOOR: RelatedTexture("inanimates.png", 32, 16, 16, 16),
+    Graphic.BUTTON_NOT_ACTIVATED: RelatedTexture("inanimates.png", 0, 0, 16, 16),
+    Graphic.BUTTON_ACTIVATED: RelatedTexture("inanimates.png", 16, 0, 16, 16),
+    Graphic.BUTTON_DOOR: RelatedTexture("inanimates.png", 32, 0, 16, 16),
+
+    Graphic.NORMAL_ENEMY_1_HEALTH: RelatedTexture("normal_enemy.png", 0, 0, 16, 16),
+    Graphic.NORMAL_ENEMY_2_HEALTH: RelatedTexture("normal_enemy.png", 16, 0, 16, 16),
+
+    Graphic.BOSS_5_HEALTH: RelatedTexture("boss.png", 16, 16, 16, 16),
+    Graphic.BOSS_4_HEALTH: RelatedTexture("boss.png", 0, 16, 16, 16),
+    Graphic.BOSS_3_HEALTH: RelatedTexture("boss.png", 32, 32, 16, 16),
+    Graphic.BOSS_2_HEALTH: RelatedTexture("boss.png", 16, 32, 16, 16),
+    Graphic.BOSS_1_HEALTH: RelatedTexture("boss.png", 0, 32, 16, 16),
+
+    Graphic.EMPTY_HEART: RelatedTexture("hearts.png", 0, 0, 16, 16),
+    Graphic.HEART: RelatedTexture("hearts.png", 16, 0, 16, 16),
+    Graphic.HALF_HEART: RelatedTexture("hearts.png", 32, 0, 16, 16),
+
+    Graphic.REMOTE_ITEM: RelatedTexture("items.png", 0, 16, 16, 16),
+    Graphic.CONFETTI_CANNON: RelatedTexture("items.png", 16, 16, 16, 16),
+    Graphic.HAMMER: RelatedTexture("items.png", 32, 16, 16, 16),
+    Graphic.KEY: RelatedTexture("items.png", 0, 0, 16, 16),
+    Graphic.SHIELD: RelatedTexture("items.png", 16, 0, 16, 16),
+    Graphic.SWORD: RelatedTexture("items.png", 32, 0, 16, 16),
+
+    Graphic.ITEMS_TEXT: "items_text.png",
+
+    Graphic.ZERO: RelatedTexture("numbers.png", 0, 16, 16, 16),
+    Graphic.ONE: RelatedTexture("numbers.png", 16, 16, 16, 16),
+    Graphic.TWO: RelatedTexture("numbers.png", 32, 16, 16, 16),
+    Graphic.THREE: RelatedTexture("numbers.png", 48, 16, 16, 16),
+    Graphic.FOUR: RelatedTexture("numbers.png", 64, 16, 16, 16),
+    Graphic.FIVE: RelatedTexture("numbers.png", 0, 0, 16, 16),
+    Graphic.SIX: RelatedTexture("numbers.png", 16, 0, 16, 16),
+    Graphic.SEVEN: RelatedTexture("numbers.png", 32, 0, 16, 16),
+    Graphic.EIGHT: RelatedTexture("numbers.png", 48, 0, 16, 16),
+    Graphic.NINE: RelatedTexture("numbers.png", 64, 0, 16, 16),
+
+    Graphic.LETTER_A: RelatedTexture("letters.png", 0, 16, 16, 16),
+    Graphic.LETTER_E: RelatedTexture("letters.png", 16, 16, 16, 16),
+    Graphic.LETTER_H: RelatedTexture("letters.png", 32, 16, 16, 16),
+    Graphic.LETTER_I: RelatedTexture("letters.png", 0, 0, 16, 16),
+    Graphic.LETTER_M: RelatedTexture("letters.png", 16, 0, 16, 16),
+    Graphic.LETTER_T: RelatedTexture("letters.png", 32, 0, 16, 16),
+
+    Graphic.DIVIDE: RelatedTexture("symbols.png", 0, 16, 16, 16),
+    Graphic.EQUALS: RelatedTexture("symbols.png", 16, 16, 16, 16),
+    Graphic.MINUS: RelatedTexture("symbols.png", 32, 16, 16, 16),
+    Graphic.PLUS: RelatedTexture("symbols.png", 0, 0, 16, 16),
+    Graphic.TIMES: RelatedTexture("symbols.png", 16, 0, 16, 16),
+    Graphic.NO: RelatedTexture("symbols.png", 32, 0, 16, 16),
+
+    Graphic.UNKNOWN: RelatedTexture("symbols.png", 32, 0, 16, 16),  # Same as "No"
+}
+
+BACKGROUND_TILE = RelatedTexture("inanimates.png", 0, 32, 16, 16)
+
+
+class PlayerSprite(Enum):
+    HUMAN = 0
+    DUCK = 1
+    HORSE = 2
+    CAT = 3
+    UNKNOWN = -1
+
+
+PLAYER_GRAPHICS = {
+    Graphic.PLAYER_DOWN: {
+        PlayerSprite.HUMAN: RelatedTexture("human.png", 0, 16, 16, 16),
+        PlayerSprite.DUCK: RelatedTexture("duck.png", 0, 16, 16, 16),
+        PlayerSprite.HORSE: RelatedTexture("horse.png", 0, 16, 16, 16),
+        PlayerSprite.CAT: RelatedTexture("cat.png", 0, 16, 16, 16),
+    },
+    Graphic.PLAYER_UP: {
+        PlayerSprite.HUMAN: RelatedTexture("human.png", 16, 0, 16, 16),
+        PlayerSprite.DUCK: RelatedTexture("duck.png", 16, 0, 16, 16),
+        PlayerSprite.HORSE: RelatedTexture("horse.png", 16, 0, 16, 16),
+        PlayerSprite.CAT: RelatedTexture("cat.png", 16, 0, 16, 16),
+    },
+    Graphic.PLAYER_LEFT: {
+        PlayerSprite.HUMAN: RelatedTexture("human.png", 16, 16, 16, 16),
+        PlayerSprite.DUCK: RelatedTexture("duck.png", 16, 16, 16, 16),
+        PlayerSprite.HORSE: RelatedTexture("horse.png", 16, 16, 16, 16),
+        PlayerSprite.CAT: RelatedTexture("cat.png", 16, 16, 16, 16),
+    },
+    Graphic.PLAYER_RIGHT: {
+        PlayerSprite.HUMAN: RelatedTexture("human.png", 0, 0, 16, 16),
+        PlayerSprite.DUCK: RelatedTexture("duck.png", 0, 0, 16, 16),
+        PlayerSprite.HORSE: RelatedTexture("horse.png", 0, 0, 16, 16),
+        PlayerSprite.CAT: RelatedTexture("cat.png", 0, 0, 16, 16),
+    },
+}
+
+ALL_GRAPHICS = [
+    BACKGROUND_TILE,
+    *IMAGE_GRAPHICS.values(),
+    *[graphic for sub_dict in PLAYER_GRAPHICS.values() for graphic in sub_dict.values()],
+]
+
+_textures: dict[str | RelatedTexture, Texture] = {}
+
+
+def get_texture_by_identifier(texture_identifier: str | RelatedTexture) -> Texture:
+    if texture_identifier in _textures:
+        return _textures[texture_identifier]
+
+    if isinstance(texture_identifier, str):
+        image_data = pkgutil.get_data(game.__name__, f"graphics/{texture_identifier}")
+        if image_data is None:
+            raise RuntimeError(f'Could not find file "graphics/{texture_identifier}" for texture {texture_identifier}')
+
+        image_bytes = BytesIO(cast(Buffer, image_data))
+        texture = cast(Texture, CoreImage(image_bytes, ext="png").texture)
+        texture.mag_filter = "nearest"
+        _textures[texture_identifier] = texture
+        return texture
+
+    base_texture_filename, x, y, w, h = texture_identifier
+
+    base_texture = get_texture_by_identifier(base_texture_filename)
+
+    sub_texture = base_texture.get_region(x, y, w, h)
+    sub_texture.mag_filter = "nearest"
+    _textures[texture_identifier] = sub_texture
+    return sub_texture
+
+
+def get_texture(graphic: Graphic | Literal["Grass"], player_sprite: PlayerSprite | None = None) -> Texture | None:
+    if graphic == Graphic.EMPTY:
+        return None
+
+    if graphic == "Grass":
+        return get_texture_by_identifier(BACKGROUND_TILE)
+
+    if graphic in IMAGE_GRAPHICS:
+        return get_texture_by_identifier(IMAGE_GRAPHICS[graphic])
+
+    if graphic in PLAYER_GRAPHICS:
+        if player_sprite is None:
+            raise ValueError("Tried to load a player graphic without specifying a player_sprite")
+
+        return get_texture_by_identifier(PLAYER_GRAPHICS[graphic][player_sprite])
+
+    logger.exception(f"Tried to load unknown graphic {graphic}.")
+    return get_texture(Graphic.UNKNOWN)
diff --git a/worlds/apquest/client/item_quality.py b/worlds/apquest/client/item_quality.py
new file mode 100644
index 0000000000..35a975d886
--- /dev/null
+++ b/worlds/apquest/client/item_quality.py
@@ -0,0 +1,25 @@
+from enum import Enum
+
+from BaseClasses import ItemClassification
+from NetUtils import NetworkItem
+
+
+class ItemQuality(Enum):
+    FILLER = 0
+    TRAP = 1
+    USEFUL = 2
+    PROGRESSION = 3
+    PROGUSEFUL = 4
+
+
+def get_quality_for_network_item(network_item: NetworkItem) -> ItemQuality:
+    flags = ItemClassification(network_item.flags)
+    if ItemClassification.progression in flags:
+        if ItemClassification.useful in flags:
+            return ItemQuality.PROGUSEFUL
+        return ItemQuality.PROGRESSION
+    if ItemClassification.useful in flags:
+        return ItemQuality.USEFUL
+    if ItemClassification.trap in flags:
+        return ItemQuality.TRAP
+    return ItemQuality.FILLER
diff --git a/worlds/apquest/client/launch.py b/worlds/apquest/client/launch.py
new file mode 100644
index 0000000000..515cf395be
--- /dev/null
+++ b/worlds/apquest/client/launch.py
@@ -0,0 +1,27 @@
+import asyncio
+from collections.abc import Sequence
+
+import colorama
+
+from CommonClient import get_base_parser, handle_url_arg
+
+# !!! IMPORTANT !!!
+# The client implementation is *not* meant for teaching.
+# Obviously, it is written to the best of its author's abilities,
+# but it is not to the same standard as the rest of the apworld.
+# Copy things from here at your own risk.
+
+
+def launch_ap_quest_client(*args: Sequence[str]) -> None:
+    from .ap_quest_client import main
+
+    parser = get_base_parser()
+    parser.add_argument("--name", default=None, help="Slot Name to connect as.")
+    parser.add_argument("url", nargs="?", help="Archipelago connection url")
+
+    launch_args = handle_url_arg(parser.parse_args(args))
+
+    colorama.just_fix_windows_console()
+
+    asyncio.run(main(launch_args))
+    colorama.deinit()
diff --git a/worlds/apquest/client/sounds.py b/worlds/apquest/client/sounds.py
new file mode 100644
index 0000000000..f4c4ab769d
--- /dev/null
+++ b/worlds/apquest/client/sounds.py
@@ -0,0 +1,249 @@
+import asyncio
+import pkgutil
+from asyncio import Task
+from collections.abc import Buffer
+from pathlib import Path
+from typing import cast
+
+from kivy import Config
+from kivy.core.audio import Sound, SoundLoader
+
+from CommonClient import logger
+
+from .. import game
+from .item_quality import ItemQuality
+from .utils import make_data_directory
+
+ITEM_JINGLES = {
+    ItemQuality.PROGUSEFUL: "8bit ProgUseful.ogg",
+    ItemQuality.PROGRESSION: "8bit Progression.ogg",
+    ItemQuality.USEFUL: "8bit Useful.ogg",
+    ItemQuality.TRAP: "8bit Trap.ogg",
+    ItemQuality.FILLER: "8bit Filler.ogg",
+}
+
+CONFETTI_CANNON = "APQuest Confetti Cannon.ogg"
+MATH_PROBLEM_STARTED_JINGLE = "APQuest Math Problem Starter Jingle.ogg"
+MATH_PROBLEM_SOLVED_JINGLE = "APQuest Math Problem Solved Jingle.ogg"
+VICTORY_JINGLE = "8bit Victory.ogg"
+
+ALL_JINGLES = [
+    MATH_PROBLEM_SOLVED_JINGLE,
+    MATH_PROBLEM_STARTED_JINGLE,
+    CONFETTI_CANNON,
+    VICTORY_JINGLE,
+    *ITEM_JINGLES.values(),
+]
+
+BACKGROUND_MUSIC_INTRO = "APQuest Intro.ogg"
+BACKGROUND_MUSIC = "APQuest BGM.ogg"
+MATH_TIME_BACKGROUND_MUSIC = "APQuest Math BGM.ogg"
+
+ALL_BGM = [
+    BACKGROUND_MUSIC_INTRO,
+    BACKGROUND_MUSIC,
+    MATH_TIME_BACKGROUND_MUSIC,
+]
+
+ALL_SOUNDS = [
+    *ALL_JINGLES,
+    *ALL_BGM,
+]
+
+
+class SoundManager:
+    sound_paths: dict[str, Path]
+
+    jingles: dict[str, Sound]
+    bgm_songs: dict[str, Sound]
+
+    active_bgm_song: str = BACKGROUND_MUSIC_INTRO
+
+    current_background_music_volume: float = 1.0
+    background_music_target_volume: float = 0.0
+
+    background_music_task: Task[None] | None = None
+    background_music_last_position: int = 0
+
+    volume_percentage: int = 0
+
+    game_started: bool
+    math_trap_active: bool
+    allow_intro_to_play: bool
+
+    def __init__(self) -> None:
+        self.extract_sounds()
+        self.populate_sounds()
+
+        self.game_started = False
+        self.allow_intro_to_play = False
+        self.math_trap_active = False
+
+        self.ensure_config()
+
+        self.background_music_task = asyncio.create_task(self.sound_manager_loop())
+
+    def ensure_config(self) -> None:
+        Config.adddefaultsection("APQuest")
+        Config.setdefault("APQuest", "volume", 50)
+        self.set_volume_percentage(Config.getint("APQuest", "volume"))
+
+    async def sound_manager_loop(self) -> None:
+        while True:
+            self.update_background_music()
+            self.do_fade()
+            await asyncio.sleep(0.02)
+
+    def extract_sounds(self) -> None:
+        # Kivy appears to have no good way of loading audio from bytes.
+        # So, we have to extract it out of the .apworld first
+
+        sound_paths = {}
+
+        sound_directory = make_data_directory("sounds")
+
+        for sound in ALL_SOUNDS:
+            sound_file_location = sound_directory / sound
+
+            sound_paths[sound] = sound_file_location
+
+            if sound_file_location.exists():
+                continue
+
+            with open(sound_file_location, "wb") as sound_file:
+                data = pkgutil.get_data(game.__name__, f"audio/{sound}")
+                if data is None:
+                    logger.exception(f"Unable to extract sound {sound} to Archipelago/data")
+                    continue
+                sound_file.write(cast(Buffer, data))
+
+        self.sound_paths = sound_paths
+
+    def load_audio(self, sound_filename: str) -> Sound:
+        audio_path = self.sound_paths[sound_filename]
+
+        sound_object = SoundLoader.load(str(audio_path.absolute()))
+        sound_object.seek(0)
+        return sound_object
+
+    def populate_sounds(self) -> None:
+        try:
+            self.jingles = {sound_filename: self.load_audio(sound_filename) for sound_filename in ALL_JINGLES}
+        except Exception as e:
+            logger.exception(e)
+
+        try:
+            self.bgm_songs = {sound_filename: self.load_audio(sound_filename) for sound_filename in ALL_BGM}
+            for bgm_song in self.bgm_songs.values():
+                bgm_song.loop = True
+                bgm_song.seek(0)
+        except Exception as e:
+            logger.exception(e)
+
+    def play_jingle(self, audio_filename: str) -> None:
+        higher_priority_sound_is_playing = False
+
+        for sound_name, sound in self.jingles.items():
+            if higher_priority_sound_is_playing:  # jingles are ordered by priority, lower priority gets eaten
+                sound.stop()
+                continue
+
+            if sound_name == audio_filename:
+                sound.play()
+                self.update_background_music()
+                higher_priority_sound_is_playing = True
+
+            elif sound.state == "play":
+                higher_priority_sound_is_playing = True
+
+    def update_background_music(self) -> None:
+        self.update_active_song()
+        if any(sound.state == "play" for sound in self.jingles.values()):
+            self.play_background_music(False)
+        else:
+            if self.math_trap_active:
+                # Don't fade math trap song, it ends up feeling better
+                self.play_background_music(True)
+            else:
+                self.fade_background_music(True)
+
+    def play_background_music(self, play: bool = True) -> None:
+        if play:
+            self.background_music_target_volume = 1
+            self.set_background_music_volume(1)
+        else:
+            self.background_music_target_volume = 0
+            self.set_background_music_volume(0)
+
+    def set_background_music_volume(self, volume: float) -> None:
+        self.current_background_music_volume = volume
+
+        for song_filename, song in self.bgm_songs.items():
+            if song_filename != self.active_bgm_song:
+                song.volume = 0
+                continue
+            song.volume = volume * self.volume_percentage / 100
+
+    def fade_background_music(self, fade_in: bool = True) -> None:
+        if fade_in:
+            self.background_music_target_volume = 1
+        else:
+            self.background_music_target_volume = 0
+
+    def set_volume_percentage(self, volume_percentage: float) -> None:
+        volume_percentage_int = int(volume_percentage)
+        if self.volume_percentage != volume_percentage:
+            self.volume_percentage = volume_percentage_int
+            Config.set("APQuest", "volume", volume_percentage_int)
+            Config.write()
+            self.set_background_music_volume(self.current_background_music_volume)
+
+            for jingle in self.jingles.values():
+                jingle.volume = self.volume_percentage / 100
+
+    def do_fade(self) -> None:
+        if self.current_background_music_volume > self.background_music_target_volume:
+            self.set_background_music_volume(max(0.0, self.current_background_music_volume - 0.02))
+        if self.current_background_music_volume < self.background_music_target_volume:
+            self.set_background_music_volume(min(1.0, self.current_background_music_volume + 0.02))
+
+        for song_filename, song in self.bgm_songs.items():
+            if song_filename != self.active_bgm_song:
+                if song_filename == BACKGROUND_MUSIC:
+                    # It ends up feeling better if this just always continues playing quietly after being started.
+                    # Even "fading in at a random spot" is better than restarting the song after a jingle / math trap.
+                    if self.game_started and song.state == "stop":
+                        song.play()
+                        song.seek(0)
+                    continue
+
+                song.stop()
+                song.seek(0)
+                continue
+
+            if self.active_bgm_song == BACKGROUND_MUSIC_INTRO and not self.allow_intro_to_play:
+                song.stop()
+                song.seek(0)
+                continue
+
+            if self.current_background_music_volume != 0:
+                if song.state == "stop":
+                    song.play()
+                    song.seek(0)
+
+    def update_active_song(self) -> None:
+        new_active_song = self.determine_correct_song()
+        if new_active_song == self.active_bgm_song:
+            return
+        self.active_bgm_song = new_active_song
+        # reevaluate song volumes
+        self.set_background_music_volume(self.current_background_music_volume)
+
+    def determine_correct_song(self) -> str:
+        if not self.game_started:
+            return BACKGROUND_MUSIC_INTRO
+
+        if self.math_trap_active:
+            return MATH_TIME_BACKGROUND_MUSIC
+
+        return BACKGROUND_MUSIC
diff --git a/worlds/apquest/client/utils.py b/worlds/apquest/client/utils.py
new file mode 100644
index 0000000000..ad8c854d4e
--- /dev/null
+++ b/worlds/apquest/client/utils.py
@@ -0,0 +1,21 @@
+from pathlib import Path
+
+from Utils import user_path
+
+
+def make_data_directory(dir_name: str) -> Path:
+    root_directory = Path(user_path())
+    if not root_directory.exists():
+        raise FileNotFoundError(f"Unable to find AP directory {root_directory.absolute()}.")
+
+    data_directory = root_directory / "data"
+
+    specific_data_directory = data_directory / "apquest" / dir_name
+    specific_data_directory.mkdir(parents=True, exist_ok=True)
+
+    gitignore = specific_data_directory / ".gitignore"
+
+    with open(gitignore, "w") as f:
+        f.write("*\n")
+
+    return specific_data_directory
diff --git a/worlds/apquest/components.py b/worlds/apquest/components.py
new file mode 100644
index 0000000000..b50b5d0dcf
--- /dev/null
+++ b/worlds/apquest/components.py
@@ -0,0 +1,51 @@
+from worlds.LauncherComponents import Component, Type, components, launch
+
+
+# The most common type of component is a client, but there are other components, such as sprite/palette adjusters.
+# (Note: Some worlds distribute their clients as separate, standalone programs,
+#  while others include them in the apworld itself. Standalone clients are not an apworld component,
+#  although you could make a component that e.g. auto-installs and launches the standalone client for the user.)
+# APQuest has a Python client inside the apworld that contains the entire game. This is a component.
+# APQuest will not teach you how to make a client or any other type of component.
+# However, let's quickly talk about how you register a component to be launchable from the Archipelago Launcher.
+# First, you'll need a function that takes a list of args (e.g. from the command line) that launches your component.
+def run_client(*args: str) -> None:
+    # Ideally, you should lazily import your component code so that it doesn't have to be loaded until necessary.
+    from .client.launch import launch_ap_quest_client
+
+    # Also, if your component has its own lifecycle, like if it is its own window that can be interacted with,
+    # you should use the LauncherComponents.launch helper (which itself calls launch_subprocess).
+    # This will create a subprocess for your component, launching it in a separate window from the Archipelago Launcher.
+    launch(launch_ap_quest_client, name="APQuest Client", args=args)
+
+
+# You then add this function as a component by appending a Component instance to LauncherComponents.components.
+# Now, it will show up in the Launcher with its display name,
+# and when the user clicks on the "Open" button, your function will be run.
+components.append(
+    Component(
+        "APQuest Client",
+        func=run_client,
+        game_name="APQuest",
+        component_type=Type.CLIENT,
+        supports_uri=True,
+    )
+)
+
+# There are two optional parameters that are worth drawing attention to here: "game_name" and "supports_uri".
+# As you might know, on a room page on WebHost, clicking a slot name opens your locally installed Launcher
+# and asks you if you want to open a Text Client.
+# If you have "game_name" set on your Component, your user also gets the option to open that instead.
+# Furthermore, if you have "supports_uri" set to True, your Component will be passed a uri as an arg.
+# This uri contains the room url + port, the slot name, and the password.
+# You can process this uri arg to automatically connect the user to their slot without having to type anything.
+
+# As you can see above, the APQuest client has both of these parameters set.
+# This means a user can click on the slot name of an APQuest slot on WebHost,
+# then click "APQuest Client" instead of "Text Client" in the Launcher popup, and after a few seconds,
+# they will be connected and playing the game without having to touch their keyboard once.
+
+# Since a Component is just Python code, this doesn't just work with CommonClient-derived clients.
+# You could forward this uri arg to your standalone C++/Java/.NET/whatever client as well,
+# meaning just about every client can support this "Click on slot name -> Everything happens automatically" action.
+# The author would like to see more clients be aware of this feature and try to support it.
diff --git a/worlds/apquest/docs/de_APQuest.md b/worlds/apquest/docs/de_APQuest.md
new file mode 100644
index 0000000000..82e383fa16
--- /dev/null
+++ b/worlds/apquest/docs/de_APQuest.md
@@ -0,0 +1,78 @@
+# APQuest
+
+## Wo ist die Seite für die Einstellungen?
+
+Die [Seite für die Spielereinstellungen dieses Spiels](../player-options) enthält alle Optionen die man benötigt, um
+eine YAML-Datei zu konfigurieren und zu exportieren.
+
+## Was ist APQuest?
+
+APQuest ist ein Spiel, welches von NewSoupVi für Archipelago entwickelt wurde.  
+Es ist ein minimalistisches 8bit-inspiriertes Abenteuerspiel mit gitterförmiger Bewegungssteuerung.  
+APQuest ist ungefähr 20 Sekunden lang. Der Client kann aber nahtlos zwischen mehreren APQuest-Slots wechseln.
+Wenn du 10 APQuest-Slots in einer Multiworld haben willst, sollte das also problemlos möglich sein.if you want to have 10 of them, that should work pretty well.
+
+Ausschlaggebend ist bei APQuest, dass das gesamte Spiel in der .apworld enthalten ist.  
+Wenn du also die .apworld in deine 
+[Archipelago-Installation](https://github.com/ArchipelagoMW/Archipelago/releases/latest) installiert hast,
+kannst du APQuest spielen.
+
+## Warum existiert APQuest?
+
+APQuest ist als Beispiel-.apworld geschrieben, mit welchem neue .apworld-Entwickler lernen können, wie man eine
+.apworld schreibt.  
+Der [APQuest-Quellcode](https://github.com/NewSoupVi/Archipelago/tree/apquest/worlds/apquest) enthält unzählige Kommentare und Beispiele, die erklären,
+wie jeder Teil der World-API funktioniert.  
+Dabei nutzt er nur die modernsten API-Funktionen (Stand: 2025-08-24).
+
+Das sekundäre Ziel von APQuest ist, eine semi-minimale, generische .apworld zu sein, die Archipelago selbst gehört.  
+Damit kann sie für Archipelagos Unit-Tests benutzt werden,
+ohne dass sich die Archipelago-Entwickler davor fürchten müssen, dass APQuest irgendwann gelöscht wird.
+
+Das dritte Ziel von APQuest ist, das erste "Spiel in einer .apworld" zu sein,
+wobei das ganze Spiel in Python und Kivy programmiert ist
+und innerhalb seines CommonClient-basierten Clients spielbar ist.  
+Ich bin mir nicht ganz sicher, dass es wirklich das erste Spiel dieser Art ist, aber ich kenne bis jetzt keine anderen.
+
+## Wenn ich mich im APQuest-Client angemeldet habe, wie spiele ich dann das Spiel?
+
+WASD oder Pfeiltasten zum Bewegen.  
+Leertaste, um dein Schwert zu schwingen (wenn du es hast) und um mit Objekten zu interagieren.  
+C, um die Konfettikanone zu feuern.
+
+Öffne Kisten, zerhacke Büsche, öffne Türen, aktiviere Knöpfe, besiege Gegner.  
+Sobald du den Drachen im oberen rechten Raum bezwingst, gewinnst du das Spiel.  
+Das ist alles! Viel Spaß!
+
+## Ein Statement zum Besitz von APQuest
+
+APQuest ist mit der [MIT-Lizenz](https://opensource.org/license/mit) lizenziert,  
+was heißt, dass es von jedem für jeden Zweck modifiziert und verbreitet werden kann.  
+Archipelago hat jedoch seine eigenen Besitztumsstrukturen, die über der MIT-Lizenz stehen.  
+Diese Strukturen machen es unklar,
+ob eine .apworld-Implementierung überhaupt permanent verlässlich in Archipelago bleibt.
+
+Im Zusammenhang mit diesen unverbindlichen, nicht gesetzlich verpflichtenden Besitztumsstrukturen
+mache ich die folgende Aussage.
+
+Ich, NewSoupVi, verzichte hiermit auf alle Rechte, APQuest aus Archipelago zu entfernen.  
+Dies bezieht sich auf alle Teile von APQuest mit der Ausnahme der Musik und der Soundeffekte.  
+Wenn ich die Töne entfernt haben möchte, muss ich dafür selbst einen PR öffnen.  
+Dieser PR darf nur die Töne entfernen und muss APQuest intakt und spielbar halten.
+
+Solang ich der Maintainer von APQuest bin, möchte ich als solcher agieren.  
+Das heißt, dass jegliche Änderungen an APQuest zuerst von mir genehmigt werden müssen.
+
+Wenn ich jedoch aufhöre, der Maintainer von APQuest zu sein,
+egal ob es mein eigener Wunsch war oder ich meinen Maintainer-Verantwortungen nicht mehr nachkomme,
+dann wird APQuest automatisch Eigentum der Core-Maintainer von Archipelago,
+die dann frei entscheiden können, was mit APQuest passieren soll.  
+Es wäre mein Wunsch, dass wenn APQuest an eine andere Einzelperson übergeben wird,
+diese Person sich an ähnliche Eigentumsregelungen hält wie ich.
+
+Hoffentlich stellt dieses Statement sicher, dass APQuest für immer eine .apworld sein kann,
+auf die Archipelago sich verlassen kann.  
+Wenn die Besitztumsstrukturen von Archipelago geändert werden,
+vertraue ich den Core-Maintainern (bzw. den Eigentümern von Archipelago generell) damit,
+angemessene Entscheidungen darüber zu treffen,
+wie dieses Statement im Kontext der neuen Regeln interpretiert werden sollte.
diff --git a/worlds/apquest/docs/en_APQuest.md b/worlds/apquest/docs/en_APQuest.md
new file mode 100644
index 0000000000..64eb1fa35a
--- /dev/null
+++ b/worlds/apquest/docs/en_APQuest.md
@@ -0,0 +1,69 @@
+# APQuest
+
+## 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 is APQuest?
+
+APQuest is an original game made entirely by NewSoupVi.  
+It is a minimal 8bit-era inspired adventure game with grid-like movement.  
+It is about 20 seconds long. However, the client can seamlessly switch between different slots,
+so if you want to have 10 of them, that should work pretty well.
+
+Crucially, this game is entirely integrated into the client sitting inside its .apworld.  
+If you have the .apworld installed into your [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
+install, you can play APQuest.
+
+## Why does APQuest exist?
+
+APQuest is implemented to be an example .apworld that can be used as a learning tool for new .apworld developers.  
+Its [source code](https://github.com/NewSoupVi/Archipelago/tree/apquest/worlds/apquest)
+contains countless comments explaining how each part of the World API works.
+Also, as of the writing of this setup guide (2025-08-24), it is up to date with all the modern Archipelago APIs.
+
+The secondary goal of APQuest is to be a semi-minimal generic world that is owned by Archipelago.  
+This means it can be used for Archipelago's unit tests without fear of eventual removal.
+
+Finally, APQuest was designed to be the first ever "game inside an .apworld",
+where the entire game is coded in Python and Kivy and is playable from within its CommonClient-based Client.  
+I'm not actually sure if it's the first, but I'm not aware of any others.
+
+## Once I'm inside the APQuest client, how do I actually play APQuest?
+
+WASD or Arrow Keys for movement.  
+Space to swing your sword (if you have it) or interact with objects.  
+C to fire the Confetti Cannon.
+
+Open chests, slash bushes, open doors, press buttons, defeat enemies.  
+Once you beat the dragon in the top right room, you win.  
+That's all there is! Have fun!
+
+## A statement on the ownership over APQuest
+
+APQuest is licensed using the [MIT license](https://opensource.org/license/mit),
+meaning it can be modified and redistributed by anyone for any purpose.  
+However, Archipelago has its own ownership structures built ontop of the license.  
+These ownership structures call into question whether any world implementation can permanently be relied on.
+
+In terms of these non-binding, non-legal Archipelago ownership structures, I will make the following statement.
+
+I, NewSoupVi, hereby relinquish any and all rights to remove APQuest from Archipelago.  
+This applies to all parts of APQuest with the sole exception of the music and sounds.
+If I want the sounds to be removed, I must do so via a PR to the Archipelago repository myself.
+Said PR must keep APQuest intact and playable, just with the music removed.
+
+As long as I am the maintainer of APQuest, I wish to act as such.  
+This means that any updates to APQuest must go through me.
+
+However, if I ever cease to be the maintainer of APQuest,
+due to my own wishes or because I fail to uphold the maintainership "contract",
+the maintainership of APQuest will go to the Core Maintainers of Archipelago, who may then decide what to do with it.  
+They can decide freely, but if the maintainership goes to another singular person,
+it is my wish that this person adheres to a similar set of rules that I've laid out here for myself.
+
+Hopefully, this set of commitments should ensure that APQuest will forever be an apworld that can be relied on in Core.  
+If the ownership structures of Archipelago change,
+I trust the Core Maintainers (or the owners in general) of Archipelago to make reasonable assumptions
+about how this statement should be reinterpreted to fit the new rules.
diff --git a/worlds/apquest/docs/setup_de.md b/worlds/apquest/docs/setup_de.md
new file mode 100644
index 0000000000..425d57d9e7
--- /dev/null
+++ b/worlds/apquest/docs/setup_de.md
@@ -0,0 +1,43 @@
+# APQuest Randomizer Setup-Anleitung
+
+## Benötigte Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
+- Die [APQuest-apworld](https://github.com/NewSoupVi/Archipelago/releases), 
+  falls diese nicht mit deiner Version von Archipelago gebündelt ist.
+
+## Wie man spielt
+
+Zuerst brauchst du einen Raum, mit dem du dich verbinden kannst.
+Dafür musst du oder jemand den du kennst ein Spiel generieren.  
+Dieser Schritt wird hier nicht erklärt, aber du kannst den
+[Archipelago Setup Guide](/tutorial/Archipelago/setup_en#generating-a-game) lesen.
+
+Du musst außerdem [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest) installiert haben
+und die [APQuest apworld](https://github.com/NewSoupVi/Archipelago/releases) darin installieren.
+
+Von hier ist es einfach, dich mit deinem Slot zu verbinden.
+
+### Webhost-Raum
+
+Wenn dein Raum auf einem WebHost läuft (z.B. [archipelago.gg](https://archipelago.gg))
+kannst du einfach auf deinen Namen in der Spielerliste klicken.  
+Dies öffnet den Archipelago Launcher, welcher dich dann fragt,
+ob du den Text Client oder den APQuest Client öffnen willst.  
+Wähle hier den APQuest Client. Der Rest sollte automatisch passieren, sodass du APQuest direkt spielen kannst.
+
+### Lokaler Server
+
+Falls für deinen Raum keine WebHost-Raumseite verfügbar ist, kannst du APQuest manuell starten.
+
+Öffne den Archipelago Launcher und finde den APQuest Client in der Komponentenliste. Klicke auf "Open".
+Nach einer kurzen Wartezeit sollte sich der APQuest Client öffnen.  
+Tippe in der oberen Zeile die Server-Adresse ein und klicke dann auf "Connect".  
+Gib deinen Spielernamen ein. Wenn ein Passwort existiert, tippe dieses auch ein.  
+Du solltest jetzt verbunden sein und kannst APQuest spielen.
+
+## Slotwechsel
+
+Der APQuest Client kann zwischen verschiedenen Slots wechseln, ohne neugestartet werden zu müssen, 
+
+Klicke einfach den "Disconnect"-Knopf. Dann verbinde dich mit dem anderen Raum / Slot.
diff --git a/worlds/apquest/docs/setup_en.md b/worlds/apquest/docs/setup_en.md
new file mode 100644
index 0000000000..2b66fa93b8
--- /dev/null
+++ b/worlds/apquest/docs/setup_en.md
@@ -0,0 +1,42 @@
+# APQuest Randomizer Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
+- [The APQuest apworld](https://github.com/NewSoupVi/Archipelago/releases), 
+  if not bundled with your version of Archipelago
+
+## How to play
+
+First, you need a room to connect to. For this, you or someone you know has to generate a game.  
+This will not be explained here,
+but you can check the [Archipelago Setup Guide](/tutorial/Archipelago/setup_en#generating-a-game).
+
+You also need to have [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest) installed
+and the [The APQuest apworld](https://github.com/NewSoupVi/Archipelago/releases) installed into Archipelago.
+
+From here, connecting to your APQuest slot is easy. There are two scenarios.
+
+### Webhost Room
+
+If your room is hosted on a WebHost (e.g. [archipelago.gg](https://archipelago.gg)),
+you should be able to simply click on your name in the player list.  
+This will open the Archipelago Launcher
+and ask you whether you want to connect with the Text Client or the APQuest Client.  
+Choose "APQuest Client". The rest should happen completely automatically and you should be able to play APQuest.
+
+### Locally hosted room
+
+If your room does not have a WebHost room page available, you can launch APQuest manually.  
+
+Open the Archipelago Launcher, and then select the APQuest Client from the list.  
+After a short while, the APQuest client should open.  
+Enter the server address at the top and click "Connect".  
+Then, enter your name. If a password exists, enter the password.  
+You should now be connected and able to play APQuest.
+
+## Switching Rooms
+
+The APQuest Client can seamlessly switch rooms without restarting.
+
+Simply click the "Disconnect" button, then connect to a different slot/room.
diff --git a/worlds/apquest/game/__init__.py b/worlds/apquest/game/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/apquest/game/audio/8bit Filler.ogg b/worlds/apquest/game/audio/8bit Filler.ogg
new file mode 100644
index 0000000000..d16cfc7aba
Binary files /dev/null and b/worlds/apquest/game/audio/8bit Filler.ogg differ
diff --git a/worlds/apquest/game/audio/8bit ProgUseful.ogg b/worlds/apquest/game/audio/8bit ProgUseful.ogg
new file mode 100644
index 0000000000..bc092f771a
Binary files /dev/null and b/worlds/apquest/game/audio/8bit ProgUseful.ogg differ
diff --git a/worlds/apquest/game/audio/8bit Progression.ogg b/worlds/apquest/game/audio/8bit Progression.ogg
new file mode 100644
index 0000000000..a4d7ba8711
Binary files /dev/null and b/worlds/apquest/game/audio/8bit Progression.ogg differ
diff --git a/worlds/apquest/game/audio/8bit Trap.ogg b/worlds/apquest/game/audio/8bit Trap.ogg
new file mode 100644
index 0000000000..783f5fd3d3
Binary files /dev/null and b/worlds/apquest/game/audio/8bit Trap.ogg differ
diff --git a/worlds/apquest/game/audio/8bit Useful.ogg b/worlds/apquest/game/audio/8bit Useful.ogg
new file mode 100644
index 0000000000..ed333e9d93
Binary files /dev/null and b/worlds/apquest/game/audio/8bit Useful.ogg differ
diff --git a/worlds/apquest/game/audio/8bit Victory.ogg b/worlds/apquest/game/audio/8bit Victory.ogg
new file mode 100644
index 0000000000..5153af11ce
Binary files /dev/null and b/worlds/apquest/game/audio/8bit Victory.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest BGM.ogg b/worlds/apquest/game/audio/APQuest BGM.ogg
new file mode 100644
index 0000000000..8a6e542891
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest BGM.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest Confetti Cannon.ogg b/worlds/apquest/game/audio/APQuest Confetti Cannon.ogg
new file mode 100644
index 0000000000..4eafe62a73
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest Confetti Cannon.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest Intro.ogg b/worlds/apquest/game/audio/APQuest Intro.ogg
new file mode 100644
index 0000000000..52c1fa89ad
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest Intro.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest Math BGM.ogg b/worlds/apquest/game/audio/APQuest Math BGM.ogg
new file mode 100644
index 0000000000..5708f9cafb
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest Math BGM.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest Math Problem Solved Jingle.ogg b/worlds/apquest/game/audio/APQuest Math Problem Solved Jingle.ogg
new file mode 100644
index 0000000000..f20e7a909e
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest Math Problem Solved Jingle.ogg differ
diff --git a/worlds/apquest/game/audio/APQuest Math Problem Starter Jingle.ogg b/worlds/apquest/game/audio/APQuest Math Problem Starter Jingle.ogg
new file mode 100644
index 0000000000..7af05ee2a8
Binary files /dev/null and b/worlds/apquest/game/audio/APQuest Math Problem Starter Jingle.ogg differ
diff --git a/worlds/apquest/game/entities.py b/worlds/apquest/game/entities.py
new file mode 100644
index 0000000000..64b89206f6
--- /dev/null
+++ b/worlds/apquest/game/entities.py
@@ -0,0 +1,312 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+from typing import TYPE_CHECKING, ClassVar
+
+from .graphics import Graphic
+from .items import ITEM_TO_GRAPHIC, Item
+from .locations import Location
+
+if TYPE_CHECKING:
+    from .player import Player
+
+
+class Entity:
+    solid: bool
+    graphic: Graphic
+
+
+class InteractableMixin:
+    @abstractmethod
+    def interact(self, player: Player) -> None:
+        pass
+
+
+class ActivatableMixin:
+    @abstractmethod
+    def activate(self, player: Player) -> None:
+        pass
+
+
+class LocationMixin:
+    location: Location
+    content: Item | None = None
+    remote: bool = False
+    has_given_content: bool = False
+
+    def force_clear(self) -> None:
+        if self.has_given_content:
+            return
+
+        self.has_given_content = True
+        self.content_success()
+
+    def give_content(self, player: Player) -> None:
+        if self.has_given_content:
+            return
+
+        if self.content is None:
+            self.content_failure()
+            return
+
+        if self.remote:
+            player.location_cleared(self.location.value)
+        else:
+            player.receive_item(self.content)
+
+        self.has_given_content = True
+        self.content_success()
+
+    def content_success(self) -> None:
+        pass
+
+    def content_failure(self) -> None:
+        pass
+
+
+class Empty(Entity):
+    solid = False
+    graphic = Graphic.EMPTY
+
+
+class Wall(Entity):
+    solid = True
+    graphic = Graphic.WALL
+
+
+class Chest(Entity, InteractableMixin, LocationMixin):
+    solid = True
+
+    is_open: bool = False
+
+    def __init__(self, location: Location) -> None:
+        self.location = location
+
+    def update_solidity(self) -> None:
+        self.solid = not self.has_given_content
+
+    def open(self) -> None:
+        self.is_open = True
+        self.update_solidity()
+
+    def interact(self, player: Player) -> None:
+        if self.has_given_content:
+            return
+
+        if self.is_open:
+            self.give_content(player)
+            return
+
+        self.open()
+
+    def content_success(self) -> None:
+        self.update_solidity()
+
+    def content_failure(self) -> None:
+        self.update_solidity()
+
+    @property
+    def graphic(self) -> Graphic:
+        if self.has_given_content:
+            return Graphic.EMPTY
+        if self.is_open:
+            if self.content is None:
+                return Graphic.EMPTY
+            return ITEM_TO_GRAPHIC[self.content]
+        return Graphic.CHEST
+
+
+class Door(Entity):
+    solid = True
+
+    is_open: bool = False
+
+    closed_graphic: ClassVar[Graphic]
+
+    def open(self) -> None:
+        self.is_open = True
+        self.solid = False
+
+    @property
+    def graphic(self) -> Graphic:
+        if self.is_open:
+            return Graphic.EMPTY
+        return self.closed_graphic
+
+
+class KeyDoor(Door, InteractableMixin):
+    closed_graphic = Graphic.KEY_DOOR
+
+    def interact(self, player: Player) -> None:
+        if self.is_open:
+            return
+
+        if not player.has_item(Item.KEY):
+            return
+
+        player.remove_item(Item.KEY)
+
+        self.open()
+
+
+class BreakableBlock(Door, InteractableMixin):
+    closed_graphic = Graphic.BREAKABLE_BLOCK
+
+    def interact(self, player: Player) -> None:
+        if self.is_open:
+            return
+
+        if not player.has_item(Item.HAMMER):
+            return
+
+        player.remove_item(Item.HAMMER)
+
+        self.open()
+
+
+class Bush(Door, InteractableMixin):
+    closed_graphic = Graphic.BUSH
+
+    def interact(self, player: Player) -> None:
+        if self.is_open:
+            return
+
+        if not player.has_item(Item.SWORD):
+            return
+
+        self.open()
+
+
+class Button(Entity, InteractableMixin):
+    solid = True
+
+    activates: ActivatableMixin
+    activated = False
+
+    def __init__(self, activates: ActivatableMixin) -> None:
+        self.activates = activates
+
+    def interact(self, player: Player) -> None:
+        if self.activated:
+            return
+
+        self.activated = True
+        self.activates.activate(player)
+
+    @property
+    def graphic(self) -> Graphic:
+        if self.activated:
+            return Graphic.BUTTON_ACTIVATED
+        return Graphic.BUTTON_NOT_ACTIVATED
+
+
+class ButtonDoor(Door, ActivatableMixin):
+    closed_graphic = Graphic.BUTTON_DOOR
+
+    def activate(self, player: Player) -> None:
+        self.is_open = True
+        self.solid = False
+
+
+class Enemy(Entity, InteractableMixin):
+    solid = True
+
+    current_health: int
+    max_health: int
+
+    dead: bool = False
+
+    enemy_graphic_by_health: ClassVar[dict[int, Graphic]] = {
+        2: Graphic.NORMAL_ENEMY_2_HEALTH,
+        1: Graphic.NORMAL_ENEMY_1_HEALTH,
+    }
+    enemy_default_graphic = Graphic.NORMAL_ENEMY_1_HEALTH
+
+    def __init__(self, max_health: int) -> None:
+        self.max_health = max_health
+        self.respawn()
+
+    def die(self) -> None:
+        self.dead = True
+        self.solid = False
+
+    def respawn(self) -> None:
+        self.dead = False
+        self.solid = True
+        self.heal_if_not_dead()
+
+    def heal_if_not_dead(self) -> None:
+        if self.dead:
+            return
+        self.current_health = self.max_health
+
+    def interact(self, player: Player) -> None:
+        if self.dead:
+            return
+
+        if player.has_item(Item.SWORD):
+            self.current_health = max(0, self.current_health - 1)
+
+            if self.current_health == 0:
+                if not self.dead:
+                    self.die()
+                return
+
+        player.damage(2)
+
+    @property
+    def graphic(self) -> Graphic:
+        if self.dead:
+            return Graphic.EMPTY
+        return self.enemy_graphic_by_health.get(self.current_health, self.enemy_default_graphic)
+
+
+class EnemyWithLoot(Enemy, LocationMixin):
+    def __init__(self, max_health: int, location: Location) -> None:
+        super().__init__(max_health)
+        self.location = location
+
+    def die(self) -> None:
+        self.dead = True
+        self.solid = not self.has_given_content
+
+    def interact(self, player: Player) -> None:
+        if self.dead:
+            if not self.has_given_content:
+                self.give_content(player)
+            return
+
+        super().interact(player)
+
+    @property
+    def graphic(self) -> Graphic:
+        if self.dead and not self.has_given_content:
+            if self.content is None:
+                return Graphic.EMPTY
+            return ITEM_TO_GRAPHIC[self.content]
+        return super().graphic
+
+    def content_success(self) -> None:
+        self.die()
+
+    def content_failure(self) -> None:
+        self.die()
+
+
+class FinalBoss(Enemy):
+    enemy_graphic_by_health: ClassVar[dict[int, Graphic]] = {
+        5: Graphic.BOSS_5_HEALTH,
+        4: Graphic.BOSS_4_HEALTH,
+        3: Graphic.BOSS_3_HEALTH,
+        2: Graphic.BOSS_2_HEALTH,
+        1: Graphic.BOSS_1_HEALTH,
+    }
+    enemy_default_graphic = Graphic.BOSS_1_HEALTH
+
+    def interact(self, player: Player) -> None:
+        dead_before = self.dead
+
+        super().interact(player)
+
+        if not dead_before and self.dead:
+            player.victory()
diff --git a/worlds/apquest/game/events.py b/worlds/apquest/game/events.py
new file mode 100644
index 0000000000..0517abc69b
--- /dev/null
+++ b/worlds/apquest/game/events.py
@@ -0,0 +1,37 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Event:
+    pass
+
+
+@dataclass
+class LocationClearedEvent(Event):
+    location_id: int
+
+
+@dataclass
+class MathProblemStarted(Event):
+    pass
+
+
+@dataclass
+class MathProblemSolved(Event):
+    pass
+
+
+@dataclass
+class VictoryEvent(Event):
+    pass
+
+
+@dataclass
+class LocationalEvent(Event):
+    x: int
+    y: int
+
+
+@dataclass
+class ConfettiFired(LocationalEvent):
+    pass
diff --git a/worlds/apquest/game/game.py b/worlds/apquest/game/game.py
new file mode 100644
index 0000000000..709e74850a
--- /dev/null
+++ b/worlds/apquest/game/game.py
@@ -0,0 +1,203 @@
+from math import ceil
+from random import Random
+
+from .entities import InteractableMixin
+from .events import ConfettiFired, Event, MathProblemSolved, MathProblemStarted
+from .gameboard import Gameboard, create_gameboard
+from .generate_math_problem import MathProblem, generate_math_problem
+from .graphics import Graphic
+from .inputs import DIGIT_INPUTS_TO_DIGITS, Direction, Input
+from .items import ITEM_TO_GRAPHIC, Item, RemotelyReceivedItem
+from .locations import Location
+from .player import Player
+
+
+class Game:
+    player: Player
+    gameboard: Gameboard
+
+    random: Random
+
+    queued_events: list[Event]
+
+    active_math_problem: MathProblem | None
+    active_math_problem_input: list[int] | None
+
+    remotely_received_items: set[tuple[int, int, int]]
+
+    def __init__(
+        self, hard_mode: bool, hammer_exists: bool, extra_chest: bool, random_object: Random | None = None
+    ) -> None:
+        self.queued_events = []
+        self.gameboard = create_gameboard(hard_mode, hammer_exists, extra_chest)
+        self.player = Player(self.gameboard, self.queued_events.append)
+        self.active_math_problem = None
+        self.remotely_received_items = set()
+
+        if random_object is None:
+            self.random = Random()
+        else:
+            self.random = random_object
+
+    def render(self) -> tuple[tuple[Graphic, ...], ...]:
+        if self.active_math_problem is None and self.player.inventory[Item.MATH_TRAP]:
+            self.active_math_problem = generate_math_problem(self.random)
+            self.active_math_problem_input = []
+            self.player.remove_item(Item.MATH_TRAP)
+            self.queued_events.append(MathProblemStarted())
+            return self.gameboard.render_math_problem(
+                self.active_math_problem,
+                self.active_math_problem_input,
+                self.currently_typed_in_math_result,
+            )
+
+        if self.active_math_problem is not None and self.active_math_problem_input is not None:
+            return self.gameboard.render_math_problem(
+                self.active_math_problem, self.active_math_problem_input, self.currently_typed_in_math_result
+            )
+
+        return self.gameboard.render(self.player)
+
+    def render_health_and_inventory(self, vertical: bool = False) -> tuple[Graphic, ...]:
+        size = self.gameboard.size[1] if vertical else self.gameboard.size[0]
+
+        graphics_array = [Graphic.EMPTY] * size
+
+        item_back_index = size - 1
+        for item, amount in sorted(self.player.inventory.items(), key=lambda sort_item: sort_item[0].value):
+            for _ in range(amount):
+                if item_back_index == 3:
+                    break
+                if item == Item.HEALTH_UPGRADE:
+                    continue
+                if item == Item.MATH_TRAP:
+                    continue
+
+                graphics_array[item_back_index] = ITEM_TO_GRAPHIC[item]
+                item_back_index -= 1
+            else:
+                continue
+            break
+
+        remaining_health = self.player.current_health
+        for i in range(min(item_back_index, ceil(self.player.max_health / 2))):
+            new_remaining_health = max(0, remaining_health - 2)
+            change = remaining_health - new_remaining_health
+            remaining_health = new_remaining_health
+
+            if change == 2:
+                graphics_array[i] = Graphic.HEART
+            elif change == 1:
+                graphics_array[i] = Graphic.HALF_HEART
+            elif change == 0:
+                graphics_array[i] = Graphic.EMPTY_HEART
+
+        return tuple(graphics_array)
+
+    def attempt_player_movement(self, direction: Direction) -> None:
+        self.player.facing = direction
+
+        delta_x, delta_y = direction.value
+        new_x, new_y = self.player.current_x + delta_x, self.player.current_y + delta_y
+
+        if not self.gameboard.get_entity_at(new_x, new_y).solid:
+            self.player.current_x = new_x
+            self.player.current_y = new_y
+
+    def attempt_interact(self) -> None:
+        delta_x, delta_y = self.player.facing.value
+        entity_x, entity_y = self.player.current_x + delta_x, self.player.current_y + delta_y
+
+        entity = self.gameboard.get_entity_at(entity_x, entity_y)
+
+        if isinstance(entity, InteractableMixin):
+            entity.interact(self.player)
+
+    def attempt_fire_confetti_cannon(self) -> None:
+        if self.player.has_item(Item.CONFETTI_CANNON):
+            self.player.remove_item(Item.CONFETTI_CANNON)
+            self.queued_events.append(ConfettiFired(self.player.current_x, self.player.current_y))
+
+    def math_problem_success(self) -> None:
+        self.active_math_problem = None
+        self.active_math_problem_input = None
+        self.queued_events.append(MathProblemSolved())
+
+    @property
+    def currently_typed_in_math_result(self) -> int | None:
+        if not self.active_math_problem_input:
+            return None
+
+        number = self.active_math_problem_input[-1]
+        if len(self.active_math_problem_input) == 2:
+            number += self.active_math_problem_input[0] * 10
+
+        return number
+
+    def check_math_problem_result(self) -> None:
+        if self.active_math_problem is None:
+            return
+
+        if self.currently_typed_in_math_result == self.active_math_problem.result:
+            self.math_problem_success()
+
+    def math_problem_input(self, input: int) -> None:
+        if self.active_math_problem_input is None or len(self.active_math_problem_input) >= 2:
+            return
+
+        self.active_math_problem_input.append(input)
+        self.check_math_problem_result()
+
+    def math_problem_delete(self) -> None:
+        if self.active_math_problem_input is None or len(self.active_math_problem_input) == 0:
+            return
+        self.active_math_problem_input.pop()
+        self.check_math_problem_result()
+
+    def input(self, input_key: Input) -> None:
+        if not self.gameboard.ready:
+            return
+
+        if input_key in DIGIT_INPUTS_TO_DIGITS:
+            self.math_problem_input(DIGIT_INPUTS_TO_DIGITS[input_key])
+            return
+        if input_key == Input.BACKSPACE:
+            self.math_problem_delete()
+            return
+
+        if input_key == Input.LEFT:
+            self.attempt_player_movement(Direction.LEFT)
+            return
+
+        if input_key == Input.UP:
+            self.attempt_player_movement(Direction.UP)
+            return
+
+        if input_key == Input.RIGHT:
+            self.attempt_player_movement(Direction.RIGHT)
+            return
+
+        if input_key == Input.DOWN:
+            self.attempt_player_movement(Direction.DOWN)
+            return
+
+        if input_key == Input.ACTION:
+            self.attempt_interact()
+            return
+
+        if input_key == Input.CONFETTI:
+            self.attempt_fire_confetti_cannon()
+            return
+
+        raise ValueError(f"Don't know input {input_key}")
+
+    def receive_item(self, remote_item_id: int, remote_location_id: int, remote_location_player: int) -> None:
+        remotely_received_item = RemotelyReceivedItem(remote_item_id, remote_location_id, remote_location_player)
+        if remotely_received_item in self.remotely_received_items:
+            return
+
+        self.player.receive_item(Item(remote_item_id))
+
+    def force_clear_location(self, location_id: int) -> None:
+        location = Location(location_id)
+        self.gameboard.force_clear_location(location)
diff --git a/worlds/apquest/game/gameboard.py b/worlds/apquest/game/gameboard.py
new file mode 100644
index 0000000000..ec97491c87
--- /dev/null
+++ b/worlds/apquest/game/gameboard.py
@@ -0,0 +1,267 @@
+from __future__ import annotations
+
+import random
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
+
+from .entities import (
+    BreakableBlock,
+    Bush,
+    Button,
+    ButtonDoor,
+    Chest,
+    Empty,
+    Enemy,
+    EnemyWithLoot,
+    Entity,
+    FinalBoss,
+    KeyDoor,
+    LocationMixin,
+    Wall,
+)
+from .generate_math_problem import MathProblem
+from .graphics import DIGIT_TO_GRAPHIC, DIGIT_TO_GRAPHIC_ZERO_EMPTY, MATH_PROBLEM_TYPE_TO_GRAPHIC, Graphic
+from .items import Item
+from .locations import DEFAULT_CONTENT, Location
+
+if TYPE_CHECKING:
+    from .player import Player
+
+
+class Gameboard:
+    gameboard: tuple[tuple[Entity, ...], ...]
+
+    hammer_exists: bool
+    content_filled: bool
+
+    remote_entity_by_location_id: dict[Location, LocationMixin]
+
+    def __init__(self, gameboard: tuple[tuple[Entity, ...], ...], hammer_exists: bool) -> None:
+        assert gameboard, "Gameboard is empty"
+        assert all(len(row) == len(gameboard[0]) for row in gameboard), "Not all rows have the same size"
+
+        self.gameboard = gameboard
+        self.hammer_exists = hammer_exists
+        self.content_filled = False
+        self.remote_entity_by_location_id = {}
+
+    def fill_default_location_content(self, trap_percentage: int = 0) -> None:
+        for entity in self.iterate_entities():
+            if isinstance(entity, LocationMixin):
+                if entity.location in DEFAULT_CONTENT:
+                    content = DEFAULT_CONTENT[entity.location]
+                    if content == Item.HAMMER and not self.hammer_exists:
+                        content = Item.CONFETTI_CANNON
+
+                    if content == Item.CONFETTI_CANNON:
+                        if random.randrange(100) < trap_percentage:
+                            content = Item.MATH_TRAP
+
+                    entity.content = content
+
+        self.content_filled = True
+
+    def fill_remote_location_content(self, graphic_overrides: dict[Location, Item]) -> None:
+        for entity in self.iterate_entities():
+            if isinstance(entity, LocationMixin):
+                entity.content = graphic_overrides.get(entity.location, Item.REMOTE_ITEM)
+                entity.remote = True
+                self.remote_entity_by_location_id[entity.location] = entity
+
+        self.content_filled = True
+
+    def get_entity_at(self, x: int, y: int) -> Entity:
+        if x < 0 or x >= len(self.gameboard[0]):
+            return Wall()
+        if y < 0 or y >= len(self.gameboard):
+            return Wall()
+
+        return self.gameboard[y][x]
+
+    def iterate_entities(self) -> Iterable[Entity]:
+        for row in self.gameboard:
+            yield from row
+
+    def respawn_final_boss(self) -> None:
+        for entity in self.iterate_entities():
+            if isinstance(entity, FinalBoss):
+                entity.respawn()
+
+    def heal_alive_enemies(self) -> None:
+        for entity in self.iterate_entities():
+            if isinstance(entity, Enemy):
+                entity.heal_if_not_dead()
+
+    def render(self, player: Player) -> tuple[tuple[Graphic, ...], ...]:
+        graphics = []
+
+        for y, row in enumerate(self.gameboard):
+            graphics_row = []
+            for x, entity in enumerate(row):
+                if player.current_x == x and player.current_y == y:
+                    graphics_row.append(player.render())
+                else:
+                    graphics_row.append(entity.graphic)
+
+            graphics.append(tuple(graphics_row))
+
+        return tuple(graphics)
+
+    def render_math_problem(
+        self, problem: MathProblem, current_input_digits: list[int], current_input_int: int | None
+    ) -> tuple[tuple[Graphic, ...], ...]:
+        rows = len(self.gameboard)
+        columns = len(self.gameboard[0])
+
+        def pad_row(row: list[Graphic]) -> tuple[Graphic, ...]:
+            row = row.copy()
+            while len(row) < columns:
+                row = [Graphic.EMPTY, *row, Graphic.EMPTY]
+            while len(row) > columns:
+                row.pop()
+
+            return tuple(row)
+
+        empty_row = tuple([Graphic.EMPTY] * columns)
+
+        math_time_row = pad_row(
+            [
+                Graphic.LETTER_M,
+                Graphic.LETTER_A,
+                Graphic.LETTER_T,
+                Graphic.LETTER_H,
+                Graphic.EMPTY,
+                Graphic.LETTER_T,
+                Graphic.LETTER_I,
+                Graphic.LETTER_M,
+                Graphic.LETTER_E,
+            ]
+        )
+
+        num_1_first_digit = problem.num_1 // 10
+        num_1_second_digit = problem.num_1 % 10
+        num_2_first_digit = problem.num_2 // 10
+        num_2_second_digit = problem.num_2 % 10
+
+        math_problem_row = pad_row(
+            [
+                DIGIT_TO_GRAPHIC_ZERO_EMPTY[num_1_first_digit],
+                DIGIT_TO_GRAPHIC[num_1_second_digit],
+                Graphic.EMPTY,
+                MATH_PROBLEM_TYPE_TO_GRAPHIC[problem.problem_type],
+                Graphic.EMPTY,
+                DIGIT_TO_GRAPHIC_ZERO_EMPTY[num_2_first_digit],
+                DIGIT_TO_GRAPHIC[num_2_second_digit],
+            ]
+        )
+
+        display_digit_1 = None
+        display_digit_2 = None
+        if current_input_digits:
+            display_digit_1 = current_input_digits[0]
+        if len(current_input_digits) == 2:
+            display_digit_2 = current_input_digits[1]
+
+        result_row = pad_row(
+            [
+                Graphic.EQUALS,
+                Graphic.EMPTY,
+                DIGIT_TO_GRAPHIC[display_digit_1],
+                DIGIT_TO_GRAPHIC[display_digit_2],
+                Graphic.EMPTY,
+                Graphic.NO if len(current_input_digits) == 2 and current_input_int != problem.result else Graphic.EMPTY,
+            ]
+        )
+
+        output = [math_time_row, empty_row, math_problem_row, result_row]
+
+        while len(output) < rows:
+            output = [empty_row, *output, empty_row]
+        while len(output) > columns:
+            output.pop(0)
+
+        return tuple(output)
+
+    def force_clear_location(self, location: Location) -> None:
+        entity = self.remote_entity_by_location_id[location]
+        entity.force_clear()
+
+    @property
+    def ready(self) -> bool:
+        return self.content_filled
+
+    @property
+    def size(self) -> tuple[int, int]:
+        return len(self.gameboard[0]), len(self.gameboard)
+
+
+def create_gameboard(hard_mode: bool, hammer_exists: bool, extra_chest: bool) -> Gameboard:
+    boss_door = ButtonDoor()
+    boss_door_button = Button(boss_door)
+
+    key_door = KeyDoor()
+
+    top_middle_chest = Chest(Location.TOP_MIDDLE_CHEST)
+    left_room_chest = Chest(Location.TOP_LEFT_CHEST)
+    bottom_left_chest = Chest(Location.BOTTOM_LEFT_CHEST)
+    bottom_right_room_left_chest = Chest(Location.BOTTOM_RIGHT_ROOM_LEFT_CHEST)
+    bottom_right_room_right_chest = Chest(Location.BOTTOM_RIGHT_ROOM_RIGHT_CHEST)
+
+    bottom_left_extra_chest = Chest(Location.BOTTOM_LEFT_EXTRA_CHEST) if extra_chest else Empty()
+    wall_if_hammer = Wall() if hammer_exists else Empty()
+    breakable_block = BreakableBlock() if hammer_exists else Empty()
+
+    normal_enemy = EnemyWithLoot(2 if hard_mode else 1, Location.ENEMY_DROP)
+    boss = FinalBoss(5 if hard_mode else 3)
+
+    gameboard = (
+        (Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty()),
+        (
+            Empty(),
+            boss_door_button,
+            Empty(),
+            Wall(),
+            Empty(),
+            top_middle_chest,
+            Empty(),
+            Wall(),
+            Empty(),
+            boss,
+            Empty(),
+        ),
+        (Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty()),
+        (
+            Empty(),
+            left_room_chest,
+            Empty(),
+            Wall(),
+            wall_if_hammer,
+            breakable_block,
+            wall_if_hammer,
+            Wall(),
+            Wall(),
+            boss_door,
+            Wall(),
+        ),
+        (Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty()),
+        (Wall(), key_door, Wall(), Wall(), Empty(), Empty(), Empty(), Empty(), Empty(), normal_enemy, Empty()),
+        (Empty(), Empty(), Empty(), Empty(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty()),
+        (Empty(), bottom_left_extra_chest, Empty(), Empty(), Empty(), Empty(), Wall(), Wall(), Wall(), Wall(), Wall()),
+        (Empty(), Empty(), Empty(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty(), Empty()),
+        (
+            Empty(),
+            bottom_left_chest,
+            Empty(),
+            Empty(),
+            Empty(),
+            Empty(),
+            Bush(),
+            Empty(),
+            bottom_right_room_left_chest,
+            bottom_right_room_right_chest,
+            Empty(),
+        ),
+        (Empty(), Empty(), Empty(), Empty(), Empty(), Empty(), Wall(), Empty(), Empty(), Empty(), Empty()),
+    )
+
+    return Gameboard(gameboard, hammer_exists)
diff --git a/worlds/apquest/game/generate_math_problem.py b/worlds/apquest/game/generate_math_problem.py
new file mode 100644
index 0000000000..eb8ff0f01e
--- /dev/null
+++ b/worlds/apquest/game/generate_math_problem.py
@@ -0,0 +1,63 @@
+import random
+from collections.abc import Callable
+from enum import Enum
+from operator import add, mul, sub, truediv
+from typing import NamedTuple
+
+_random = random.Random()
+
+class NumberChoiceConstraints(NamedTuple):
+    num_1_min: int
+    num_1_max: int
+    num_2_min: int
+    num_2_max: int
+    commutative: bool
+    operator: Callable[[int, int], int | float]
+
+
+class MathProblemType(Enum):
+    PLUS = 1
+    MINUS = 2
+    TIMES = 3
+    DIVIDE = 4
+
+
+MATH_PROBLEM_CONSTRAINTS = {
+    MathProblemType.PLUS: NumberChoiceConstraints(1, 99, 1, 99, True, add),
+    MathProblemType.MINUS: NumberChoiceConstraints(2, 99, 1, 99, False, sub),
+    MathProblemType.TIMES: NumberChoiceConstraints(2, 10, 2, 50, True, mul),
+    MathProblemType.DIVIDE: NumberChoiceConstraints(4, 99, 2, 50, False, truediv),
+}
+
+
+class MathProblem(NamedTuple):
+    problem_type: MathProblemType
+    num_1: int
+    num_2: int
+    result: int
+
+
+def generate_math_problem(random_object: random.Random = _random) -> MathProblem:
+    problem_type: MathProblemType = random_object.choice(list(MathProblemType))
+    number_choice_constraints = MATH_PROBLEM_CONSTRAINTS[problem_type]
+
+    for _ in range(10000):
+        num_1 = random.randint(number_choice_constraints.num_1_min, number_choice_constraints.num_1_max)
+        num_2 = random.randint(number_choice_constraints.num_2_min, number_choice_constraints.num_2_max)
+
+        result = number_choice_constraints.operator(num_1, num_2)
+
+        result_int = int(result)
+        if not result_int == result:
+            continue
+
+        if result_int < 2 or result_int > 99:
+            continue
+
+        if number_choice_constraints.commutative:
+            if random.randint(0, 1):
+                num_1, num_2 = num_2, num_1
+
+        return MathProblem(problem_type, num_1, num_2, result_int)
+
+    return MathProblem(MathProblemType.PLUS, 1, 1, 2)
diff --git a/worlds/apquest/game/graphics.py b/worlds/apquest/game/graphics.py
new file mode 100644
index 0000000000..9279c6c7b4
--- /dev/null
+++ b/worlds/apquest/game/graphics.py
@@ -0,0 +1,99 @@
+from enum import Enum
+
+from .generate_math_problem import MathProblemType
+
+
+class Graphic(Enum):
+    EMPTY = 0
+    WALL = 1
+    BUTTON_NOT_ACTIVATED = 2
+    BUTTON_ACTIVATED = 3
+    KEY_DOOR = 4
+    BUTTON_DOOR = 5
+    CHEST = 6
+    BUSH = 7
+    BREAKABLE_BLOCK = 8
+
+    NORMAL_ENEMY_1_HEALTH = 10
+    NORMAL_ENEMY_2_HEALTH = 11
+
+    BOSS_1_HEALTH = 20
+    BOSS_2_HEALTH = 21
+    BOSS_3_HEALTH = 22
+    BOSS_4_HEALTH = 23
+    BOSS_5_HEALTH = 24
+
+    PLAYER_DOWN = 30
+    PLAYER_UP = 31
+    PLAYER_LEFT = 32
+    PLAYER_RIGHT = 33
+
+    KEY = 41
+    SWORD = 42
+    SHIELD = 43
+    HAMMER = 44
+
+    HEART = 50
+    HALF_HEART = 51
+    EMPTY_HEART = 52
+
+    CONFETTI_CANNON = 60
+
+    REMOTE_ITEM = 70
+
+    ITEMS_TEXT = 80
+
+    MATH_TRAP = CONFETTI_CANNON
+
+    ZERO = 1000
+    ONE = 1001
+    TWO = 1002
+    THREE = 1003
+    FOUR = 1004
+    FIVE = 1005
+    SIX = 1006
+    SEVEN = 1007
+    EIGHT = 1008
+    NINE = 1009
+
+    PLUS = 1100
+    MINUS = 1101
+    TIMES = 1102
+    DIVIDE = 1103
+
+    LETTER_A = 2000
+    LETTER_E = 2005
+    LETTER_H = 2008
+    LETTER_I = 2009
+    LETTER_M = 2013
+    LETTER_T = 2019
+
+    EQUALS = 2050
+    NO = 2060
+
+    UNKNOWN = -1
+
+
+DIGIT_TO_GRAPHIC = {
+    None: Graphic.EMPTY,
+    0: Graphic.ZERO,
+    1: Graphic.ONE,
+    2: Graphic.TWO,
+    3: Graphic.THREE,
+    4: Graphic.FOUR,
+    5: Graphic.FIVE,
+    6: Graphic.SIX,
+    7: Graphic.SEVEN,
+    8: Graphic.EIGHT,
+    9: Graphic.NINE,
+}
+
+DIGIT_TO_GRAPHIC_ZERO_EMPTY = DIGIT_TO_GRAPHIC.copy()
+DIGIT_TO_GRAPHIC_ZERO_EMPTY[0] = Graphic.EMPTY
+
+MATH_PROBLEM_TYPE_TO_GRAPHIC = {
+    MathProblemType.PLUS: Graphic.PLUS,
+    MathProblemType.MINUS: Graphic.MINUS,
+    MathProblemType.TIMES: Graphic.TIMES,
+    MathProblemType.DIVIDE: Graphic.DIVIDE,
+}
diff --git a/worlds/apquest/game/graphics/boss.png b/worlds/apquest/game/graphics/boss.png
new file mode 100644
index 0000000000..dbcda31048
Binary files /dev/null and b/worlds/apquest/game/graphics/boss.png differ
diff --git a/worlds/apquest/game/graphics/cat.png b/worlds/apquest/game/graphics/cat.png
new file mode 100644
index 0000000000..aa5e854753
Binary files /dev/null and b/worlds/apquest/game/graphics/cat.png differ
diff --git a/worlds/apquest/game/graphics/duck.png b/worlds/apquest/game/graphics/duck.png
new file mode 100644
index 0000000000..5e07b70dfc
Binary files /dev/null and b/worlds/apquest/game/graphics/duck.png differ
diff --git a/worlds/apquest/game/graphics/hearts.png b/worlds/apquest/game/graphics/hearts.png
new file mode 100644
index 0000000000..0ab344898f
Binary files /dev/null and b/worlds/apquest/game/graphics/hearts.png differ
diff --git a/worlds/apquest/game/graphics/horse.png b/worlds/apquest/game/graphics/horse.png
new file mode 100644
index 0000000000..349c256688
Binary files /dev/null and b/worlds/apquest/game/graphics/horse.png differ
diff --git a/worlds/apquest/game/graphics/human.png b/worlds/apquest/game/graphics/human.png
new file mode 100644
index 0000000000..6978bf0ac5
Binary files /dev/null and b/worlds/apquest/game/graphics/human.png differ
diff --git a/worlds/apquest/game/graphics/inanimates.png b/worlds/apquest/game/graphics/inanimates.png
new file mode 100644
index 0000000000..ba7c143b98
Binary files /dev/null and b/worlds/apquest/game/graphics/inanimates.png differ
diff --git a/worlds/apquest/game/graphics/items.png b/worlds/apquest/game/graphics/items.png
new file mode 100644
index 0000000000..ce66feda77
Binary files /dev/null and b/worlds/apquest/game/graphics/items.png differ
diff --git a/worlds/apquest/game/graphics/items_text.png b/worlds/apquest/game/graphics/items_text.png
new file mode 100644
index 0000000000..4b5a4f30de
Binary files /dev/null and b/worlds/apquest/game/graphics/items_text.png differ
diff --git a/worlds/apquest/game/graphics/letters.png b/worlds/apquest/game/graphics/letters.png
new file mode 100644
index 0000000000..8ec3bae065
Binary files /dev/null and b/worlds/apquest/game/graphics/letters.png differ
diff --git a/worlds/apquest/game/graphics/normal_enemy.png b/worlds/apquest/game/graphics/normal_enemy.png
new file mode 100644
index 0000000000..baed65d8cc
Binary files /dev/null and b/worlds/apquest/game/graphics/normal_enemy.png differ
diff --git a/worlds/apquest/game/graphics/numbers.png b/worlds/apquest/game/graphics/numbers.png
new file mode 100644
index 0000000000..97e19bea85
Binary files /dev/null and b/worlds/apquest/game/graphics/numbers.png differ
diff --git a/worlds/apquest/game/graphics/symbols.png b/worlds/apquest/game/graphics/symbols.png
new file mode 100644
index 0000000000..6f9e043699
Binary files /dev/null and b/worlds/apquest/game/graphics/symbols.png differ
diff --git a/worlds/apquest/game/inputs.py b/worlds/apquest/game/inputs.py
new file mode 100644
index 0000000000..eb736a606f
--- /dev/null
+++ b/worlds/apquest/game/inputs.py
@@ -0,0 +1,44 @@
+from enum import Enum
+
+
+class Direction(Enum):
+    LEFT = (-1, 0)
+    UP = (0, -1)
+    RIGHT = (1, 0)
+    DOWN = (0, 1)
+
+
+class Input(Enum):
+    LEFT = 1
+    UP = 2
+    RIGHT = 3
+    DOWN = 4
+    ACTION = 5
+    CONFETTI = 6
+
+    ZERO = 1000
+    ONE = 1001
+    TWO = 1002
+    THREE = 1003
+    FOUR = 1004
+    FIVE = 1005
+    SIX = 1006
+    SEVEN = 1007
+    EIGHT = 1008
+    NINE = 1009
+
+    BACKSPACE = 2000
+
+
+DIGIT_INPUTS_TO_DIGITS = {
+    Input.ZERO: 0,
+    Input.ONE: 1,
+    Input.TWO: 2,
+    Input.THREE: 3,
+    Input.FOUR: 4,
+    Input.FIVE: 5,
+    Input.SIX: 6,
+    Input.SEVEN: 7,
+    Input.EIGHT: 8,
+    Input.NINE: 9,
+}
diff --git a/worlds/apquest/game/items.py b/worlds/apquest/game/items.py
new file mode 100644
index 0000000000..a37d0e654f
--- /dev/null
+++ b/worlds/apquest/game/items.py
@@ -0,0 +1,38 @@
+from collections import defaultdict
+from enum import Enum
+from typing import NamedTuple
+
+from ..items import ITEM_NAME_TO_ID
+from .graphics import Graphic
+
+
+class Item(Enum):
+    KEY = ITEM_NAME_TO_ID["Key"]
+    SWORD = ITEM_NAME_TO_ID["Sword"]
+    SHIELD = ITEM_NAME_TO_ID["Shield"]
+    HAMMER = ITEM_NAME_TO_ID["Hammer"]
+    HEALTH_UPGRADE = ITEM_NAME_TO_ID["Health Upgrade"]
+    CONFETTI_CANNON = ITEM_NAME_TO_ID["Confetti Cannon"]
+    MATH_TRAP = ITEM_NAME_TO_ID["Math Trap"]
+    REMOTE_ITEM = -1
+
+
+class RemotelyReceivedItem(NamedTuple):
+    remote_item_id: int
+    remote_location_id: int
+    remote_location_player: int
+
+
+ITEM_TO_GRAPHIC = defaultdict(
+    lambda: Graphic.UNKNOWN,
+    {
+        Item.KEY: Graphic.KEY,
+        Item.SWORD: Graphic.SWORD,
+        Item.SHIELD: Graphic.SHIELD,
+        Item.HAMMER: Graphic.HAMMER,
+        Item.HEALTH_UPGRADE: Graphic.HEART,
+        Item.CONFETTI_CANNON: Graphic.CONFETTI_CANNON,
+        Item.REMOTE_ITEM: Graphic.REMOTE_ITEM,
+        Item.MATH_TRAP: Graphic.MATH_TRAP,
+    },
+)
diff --git a/worlds/apquest/game/locations.py b/worlds/apquest/game/locations.py
new file mode 100644
index 0000000000..b8aaa77e7c
--- /dev/null
+++ b/worlds/apquest/game/locations.py
@@ -0,0 +1,25 @@
+from enum import Enum
+
+from ..locations import LOCATION_NAME_TO_ID
+from .items import Item
+
+
+class Location(Enum):
+    TOP_LEFT_CHEST = LOCATION_NAME_TO_ID["Top Left Room Chest"]
+    TOP_MIDDLE_CHEST = LOCATION_NAME_TO_ID["Top Middle Chest"]
+    BOTTOM_LEFT_CHEST = LOCATION_NAME_TO_ID["Bottom Left Chest"]
+    BOTTOM_LEFT_EXTRA_CHEST = LOCATION_NAME_TO_ID["Bottom Left Extra Chest"]
+    BOTTOM_RIGHT_ROOM_LEFT_CHEST = LOCATION_NAME_TO_ID["Bottom Right Room Left Chest"]
+    BOTTOM_RIGHT_ROOM_RIGHT_CHEST = LOCATION_NAME_TO_ID["Bottom Right Room Right Chest"]
+    ENEMY_DROP = LOCATION_NAME_TO_ID["Right Room Enemy Drop"]
+
+
+DEFAULT_CONTENT = {
+    Location.TOP_LEFT_CHEST: Item.HEALTH_UPGRADE,
+    Location.TOP_MIDDLE_CHEST: Item.HEALTH_UPGRADE,
+    Location.BOTTOM_LEFT_CHEST: Item.SWORD,
+    Location.BOTTOM_LEFT_EXTRA_CHEST: Item.CONFETTI_CANNON,
+    Location.BOTTOM_RIGHT_ROOM_LEFT_CHEST: Item.SHIELD,
+    Location.BOTTOM_RIGHT_ROOM_RIGHT_CHEST: Item.HAMMER,
+    Location.ENEMY_DROP: Item.KEY,
+}
diff --git a/worlds/apquest/game/play_in_console.py b/worlds/apquest/game/play_in_console.py
new file mode 100644
index 0000000000..9e07896f65
--- /dev/null
+++ b/worlds/apquest/game/play_in_console.py
@@ -0,0 +1,143 @@
+from .events import ConfettiFired, MathProblemSolved
+
+try:
+    from pynput import keyboard
+    from pynput.keyboard import Key, KeyCode
+except ImportError as e:
+    raise ImportError("In order to play APQuest from console, you have to install pynput.") from e
+
+from .game import Game
+from .graphics import Graphic
+from .inputs import Input
+from .items import ITEM_TO_GRAPHIC
+
+graphic_to_char = {
+    Graphic.EMPTY: " ",
+    Graphic.WALL: "W",
+    Graphic.BUTTON_NOT_ACTIVATED: "B",
+    Graphic.BUTTON_ACTIVATED: "A",
+    Graphic.KEY_DOOR: "D",
+    Graphic.BUTTON_DOOR: "?",
+    Graphic.CHEST: "C",
+    Graphic.BUSH: "T",
+    Graphic.BREAKABLE_BLOCK: "~",
+    Graphic.NORMAL_ENEMY_2_HEALTH: "2",
+    Graphic.NORMAL_ENEMY_1_HEALTH: "1",
+    Graphic.BOSS_5_HEALTH: "5",
+    Graphic.BOSS_4_HEALTH: "4",
+    Graphic.BOSS_3_HEALTH: "3",
+    Graphic.BOSS_2_HEALTH: "2",
+    Graphic.BOSS_1_HEALTH: "1",
+    Graphic.PLAYER_DOWN: "v",
+    Graphic.PLAYER_UP: "^",
+    Graphic.PLAYER_LEFT: "<",
+    Graphic.PLAYER_RIGHT: ">",
+    Graphic.KEY: "K",
+    Graphic.SHIELD: "X",
+    Graphic.SWORD: "S",
+    Graphic.HAMMER: "H",
+    Graphic.HEART: "♡",
+    Graphic.CONFETTI_CANNON: "?",
+    Graphic.REMOTE_ITEM: "I",
+    Graphic.UNKNOWN: "ß",
+    Graphic.ZERO: "0",
+    Graphic.ONE: "1",
+    Graphic.TWO: "2",
+    Graphic.THREE: "3",
+    Graphic.FOUR: "4",
+    Graphic.FIVE: "5",
+    Graphic.SIX: "6",
+    Graphic.SEVEN: "7",
+    Graphic.EIGHT: "8",
+    Graphic.NINE: "9",
+    Graphic.PLUS: "+",
+    Graphic.MINUS: "-",
+    Graphic.TIMES: "x",
+    Graphic.DIVIDE: "/",
+    Graphic.LETTER_A: "A",
+    Graphic.LETTER_E: "E",
+    Graphic.LETTER_H: "H",
+    Graphic.LETTER_I: "I",
+    Graphic.LETTER_M: "M",
+    Graphic.LETTER_T: "T",
+    Graphic.EQUALS: "=",
+    Graphic.NO: "X",
+}
+
+KEY_CONVERSION = {
+    keyboard.KeyCode.from_char("w"): Input.UP,
+    Key.up: Input.UP,
+    keyboard.KeyCode.from_char("s"): Input.DOWN,
+    Key.down: Input.DOWN,
+    keyboard.KeyCode.from_char("a"): Input.LEFT,
+    Key.left: Input.LEFT,
+    keyboard.KeyCode.from_char("d"): Input.RIGHT,
+    Key.right: Input.RIGHT,
+    Key.space: Input.ACTION,
+    keyboard.KeyCode.from_char("c"): Input.CONFETTI,
+    keyboard.KeyCode.from_char("0"): Input.ZERO,
+    keyboard.KeyCode.from_char("1"): Input.ONE,
+    keyboard.KeyCode.from_char("2"): Input.TWO,
+    keyboard.KeyCode.from_char("3"): Input.THREE,
+    keyboard.KeyCode.from_char("4"): Input.FOUR,
+    keyboard.KeyCode.from_char("5"): Input.FIVE,
+    keyboard.KeyCode.from_char("6"): Input.SIX,
+    keyboard.KeyCode.from_char("7"): Input.SEVEN,
+    keyboard.KeyCode.from_char("8"): Input.EIGHT,
+    keyboard.KeyCode.from_char("9"): Input.NINE,
+    Key.backspace: Input.BACKSPACE,
+}
+
+
+def render_to_text(game: Game) -> str:
+    player = game.player
+    rendered_graphics = game.render()
+
+    output_string = f"Health: {player.current_health}/{player.max_health}\n"
+
+    inventory = []
+    for item, count in player.inventory.items():
+        inventory += [graphic_to_char[ITEM_TO_GRAPHIC[item]] for _ in range(count)]
+    inventory.sort()
+
+    output_string += f"Inventory: {', '.join(inventory)}\n"
+
+    if player.has_won:
+        output_string += "VICTORY!!!\n"
+
+    while game.queued_events:
+        next_event = game.queued_events.pop(0)
+        if isinstance(next_event, ConfettiFired):
+            output_string += "Confetti fired! You feel motivated :)\n"
+        if isinstance(next_event, MathProblemSolved):
+            output_string += "Math problem solved!\n"
+
+    for row in rendered_graphics:
+        output_string += " ".join(graphic_to_char[graphic] for graphic in row)
+        output_string += "\n"
+
+    return output_string
+
+
+if __name__ == "__main__":
+    hard_mode = input("Do you want to play hard mode? (Y/N)").lower().strip() in ("y", "yes")
+    hammer_exists = input("Do you want the hammer to exist in the game? (Y/N)").lower().strip() in ("y", "yes")
+    extra_chest = input("Do you want the extra starting chest to exist in the game?").lower().strip() in ("y", "yes")
+    math_trap_percentage = int(input("What should the percentage of math traps be?"))
+
+    game = Game(hard_mode, hammer_exists, extra_chest)
+    game.gameboard.fill_default_location_content(math_trap_percentage)
+
+    def input_and_rerender(input_key: Input) -> None:
+        game.input(input_key)
+        print(render_to_text(game))
+
+    def on_press(key: Key | KeyCode | None) -> None:
+        if key in KEY_CONVERSION:
+            input_and_rerender(KEY_CONVERSION[key])
+
+    print(render_to_text(game))
+
+    with keyboard.Listener(on_press=on_press) as listener:
+        while True:
+            listener.join()
diff --git a/worlds/apquest/game/player.py b/worlds/apquest/game/player.py
new file mode 100644
index 0000000000..ff0f45b367
--- /dev/null
+++ b/worlds/apquest/game/player.py
@@ -0,0 +1,87 @@
+from collections import Counter
+from collections.abc import Callable
+
+from .events import Event, LocationClearedEvent, VictoryEvent
+from .gameboard import Gameboard
+from .graphics import Graphic
+from .inputs import Direction
+from .items import Item
+
+
+class Player:
+    current_x: int
+    current_y: int
+    current_health: int
+
+    has_won: bool = False
+
+    facing: Direction
+
+    inventory: Counter[Item]
+
+    gameboard: Gameboard
+    push_event: Callable[[Event], None]
+
+    def __init__(self, gameboard: Gameboard, push_event: Callable[[Event], None]) -> None:
+        self.gameboard = gameboard
+        self.inventory = Counter()
+        self.push_event = push_event
+        self.respawn()
+
+    def respawn(self) -> None:
+        self.current_x = 4
+        self.current_y = 9
+        self.current_health = self.max_health
+        self.facing = Direction.DOWN
+
+    @property
+    def max_health(self) -> int:
+        return 2 + 2 * self.inventory[Item.HEALTH_UPGRADE]
+
+    def render(self) -> Graphic:
+        if not self.gameboard.ready:
+            return Graphic.EMPTY
+
+        if self.facing == Direction.LEFT:
+            return Graphic.PLAYER_LEFT
+        if self.facing == Direction.UP:
+            return Graphic.PLAYER_UP
+        if self.facing == Direction.RIGHT:
+            return Graphic.PLAYER_RIGHT
+        return Graphic.PLAYER_DOWN
+
+    def receive_item(self, item: Item) -> None:
+        assert item != Item.REMOTE_ITEM, "Player should not directly receive the remote item"
+
+        self.inventory[item] += 1
+        if item == Item.HEALTH_UPGRADE:
+            self.current_health += 2
+
+    def has_item(self, item: Item) -> bool:
+        return self.inventory[item] > 0
+
+    def remove_item(self, item: Item) -> None:
+        self.inventory[item] -= 1
+
+    def damage(self, damage: int) -> None:
+        if self.has_item(Item.SHIELD):
+            damage = damage // 2
+
+        self.current_health = max(0, self.current_health - damage)
+
+        if self.current_health <= 0:
+            self.die()
+
+    def die(self) -> None:
+        self.respawn()
+        self.gameboard.respawn_final_boss()
+        self.gameboard.heal_alive_enemies()
+
+    def location_cleared(self, location_id: int) -> None:
+        event = LocationClearedEvent(location_id)
+        self.push_event(event)
+
+    def victory(self) -> None:
+        self.has_won = True
+        event = VictoryEvent()
+        self.push_event(event)
diff --git a/worlds/apquest/items.py b/worlds/apquest/items.py
new file mode 100644
index 0000000000..abe3dda70b
--- /dev/null
+++ b/worlds/apquest/items.py
@@ -0,0 +1,166 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from BaseClasses import Item, ItemClassification
+
+if TYPE_CHECKING:
+    from .world import APQuestWorld
+
+# Every item must have a unique integer ID associated with it.
+# We will have a lookup from item name to ID here that, in world.py, we will import and bind to the world class.
+# Even if an item doesn't exist on specific options, it must be present in this lookup.
+ITEM_NAME_TO_ID = {
+    "Key": 1,
+    "Sword": 2,
+    "Shield": 3,
+    "Hammer": 4,
+    "Health Upgrade": 5,
+    "Confetti Cannon": 6,
+    "Math Trap": 7,
+}
+
+# Items should have a defined default classification.
+# In our case, we will make a dictionary from item name to classification.
+DEFAULT_ITEM_CLASSIFICATIONS = {
+    "Key": ItemClassification.progression,
+    "Sword": ItemClassification.progression | ItemClassification.useful,  # Items can have multiple classifications.
+    "Shield": ItemClassification.progression,
+    "Hammer": ItemClassification.progression,
+    "Health Upgrade": ItemClassification.useful,
+    "Confetti Cannon": ItemClassification.filler,
+    "Math Trap": ItemClassification.trap,
+}
+
+
+# Each Item instance must correctly report the "game" it belongs to.
+# To make this simple, it is common practice to subclass the basic Item class and override the "game" field.
+class APQuestItem(Item):
+    game = "APQuest"
+
+
+# Ontop of our regular itempool, our world must be able to create arbitrary amounts of filler as requested by core.
+# To do this, it must define a function called world.get_filler_item_name(), which we will define in world.py later.
+# For now, let's make a function that returns the name of a random filler item here in items.py.
+def get_random_filler_item_name(world: APQuestWorld) -> str:
+    # APQuest has an option called "trap_chance".
+    # This is the percentage chance that each filler item is a Math Trap instead of a Confetti Cannon.
+    # For this purpose, we need to use a random generator.
+
+    # IMPORTANT: Whenever you need to use a random generator, you must use world.random.
+    # This ensures that generating with the same generator seed twice yields the same output.
+    # DO NOT use a bare random object from Python's built-in random module.
+    if world.random.randint(0, 99) < world.options.trap_chance:
+        return "Math Trap"
+    return "Confetti Cannon"
+
+
+def create_item_with_correct_classification(world: APQuestWorld, name: str) -> APQuestItem:
+    # Our world class must have a create_item() function that can create any of our items by name at any time.
+    # So, we make this helper function that creates the item by name with the correct classification.
+    # Note: This function's content could just be the contents of world.create_item in world.py directly,
+    # but it seemed nicer to have it in its own function over here in items.py.
+    classification = DEFAULT_ITEM_CLASSIFICATIONS[name]
+
+    # It is perfectly normal and valid for an item's classification to differ based on the player's options.
+    # In our case, Health Upgrades are only relevant to logic (and thus labeled as "progression") in hard mode.
+    if name == "Health Upgrade" and world.options.hard_mode:
+        classification = ItemClassification.progression
+
+    return APQuestItem(name, classification, ITEM_NAME_TO_ID[name], world.player)
+
+
+# With those two helper functions defined, let's now get to actually creating and submitting our itempool.
+def create_all_items(world: APQuestWorld) -> None:
+    # This is the function in which we will create all the items that this world submits to the multiworld item pool.
+    # There must be exactly as many items as there are locations.
+    # In our case, there are either six or seven locations.
+    # We must make sure that when there are six locations, there are six items,
+    # and when there are seven locations, there are seven items.
+
+    # Creating items should generally be done via the world's create_item method.
+    # First, we create a list containing all the items that always exist.
+
+    itempool: list[Item] = [
+        world.create_item("Key"),
+        world.create_item("Sword"),
+        world.create_item("Shield"),
+        world.create_item("Health Upgrade"),
+        world.create_item("Health Upgrade"),
+    ]
+
+    # Some items may only exist if the player enables certain options.
+    # In our case, If the hammer option is enabled, the sixth item is the Hammer.
+    # Otherwise, we add a filler Confetti Cannon.
+    if world.options.hammer:
+        # Once again, it is important to stress that even though the Hammer doesn't always exist,
+        # it must be present in the worlds item_name_to_id.
+        # Whether it is actually in the itempool is determined purely by whether we create and add the item here.
+        itempool.append(world.create_item("Hammer"))
+
+    # Archipelago requires that each world submits as many locations as it submits items.
+    # This is where we can use our filler and trap items.
+    # APQuest has two of these: The Confetti Cannon and the Math Trap.
+    # (Unfortunately, Archipelago is a bit ambiguous about its terminology here:
+    #  "filler" is an ItemClassification separate from "trap", but in a lot of its functions,
+    #  Archipelago will use "filler" to just mean "an additional item created to fill out the itempool".
+    #  "Filler" in this sense can technically have any ItemClassification,
+    #  but most commonly ItemClassification.filler or ItemClassification.trap.
+    #  Starting here, the word "filler" will be used to collectively refer to APQuest's Confetti Cannon and Math Trap,
+    #  which are ItemClassification.filler and ItemClassification.trap respectively.)
+    # Creating filler items works the same as any other item. But there is a question:
+    # How many filler items do we actually need to create?
+    # In regions.py, we created either six or seven locations depending on the "extra_starting_chest" option.
+    # In this function, we have created five or six items depending on whether the "hammer" option is enabled.
+    # We *could* have a really complicated if-else tree checking the options again, but there is a better way.
+    # We can compare the size of our itempool so far to the number of locations in our world.
+
+    # The length of our itempool is easy to determine, since we have it as a list.
+    number_of_items = len(itempool)
+
+    # The number of locations is also easy to determine, but we have to be careful.
+    # Just calling len(world.get_locations()) would report an incorrect number, because of our *event locations*.
+    # What we actually want is the number of *unfilled* locations. Luckily, there is a helper method for this:
+    number_of_unfilled_locations = len(world.multiworld.get_unfilled_locations(world.player))
+
+    # Now, we just subtract the number of items from the number of locations to get the number of empty item slots.
+    needed_number_of_filler_items = number_of_unfilled_locations - number_of_items
+
+    # Finally, we create that many filler items and add them to the itempool.
+    # To create our filler, we could just use world.create_item("Confetti Cannon").
+    # But there is an alternative that works even better for most worlds, including APQuest.
+    # As discussed above, our world must have a get_filler_item_name() function defined,
+    # which must return the name of an infinitely repeatable filler item.
+    # Defining this function enables the use of a helper function called world.create_filler().
+    # You can just use this function directly to create as many filler items as you need to complete your itempool.
+    itempool += [world.create_filler() for _ in range(needed_number_of_filler_items)]
+
+    # But... is that the right option for your game? Let's explore that.
+    # For some games, the concepts of "regular itempool filler" and "additionally created filler" are different.
+    # These games might want / require specific amounts of specific filler items in their regular pool.
+    # To achieve this, they will have to intentionally create the correct quantities using world.create_item().
+    # They may still use world.create_filler() to fill up the rest of their itempool with "repeatable filler",
+    # after creating their "specific quantity" filler and still having room left over.
+
+    # But there are many other games which *only* have infinitely repeatable filler items.
+    # They don't care about specific amounts of specific filler items, instead only caring about the proportions.
+    # In this case, world.create_filler() can just be used for the entire filler itempool.
+    # APQuest is one of these games:
+    # Regardless of whether it's filler for the regular itempool or additional filler for item links / etc.,
+    # we always just want a Confetti Cannon or a Math Trap depending on the "trap_chance" option.
+    # We defined this behavior in our get_random_filler_item_name() function, which in world.py,
+    # we'll bind to world.get_filler_item_name(). So, we can just use world.create_filler() for all of our filler.
+
+    # Anyway. With our world's itempool finalized, we now need to submit it to the multiworld itempool.
+    # This is how the generator actually knows about the existence of our items.
+    world.multiworld.itempool += itempool
+
+    # Sometimes, you might want the player to start with certain items already in their inventory.
+    # These items are called "precollected items".
+    # They will be sent as soon as they connect for the first time (depending on your client's item handling flag).
+    # Players can add precollected items themselves via the generic "start_inventory" option.
+    # If you want to add your own precollected items, you can do so via world.push_precollected().
+    if world.options.start_with_one_confetti_cannon:
+        # We're adding a filler item, but you can also add progression items to the player's precollected inventory.
+        starting_confetti_cannon = world.create_item("Confetti Cannon")
+        world.push_precollected(starting_confetti_cannon)
diff --git a/worlds/apquest/locations.py b/worlds/apquest/locations.py
new file mode 100644
index 0000000000..553519fa6c
--- /dev/null
+++ b/worlds/apquest/locations.py
@@ -0,0 +1,136 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from BaseClasses import ItemClassification, Location
+
+from . import items
+
+if TYPE_CHECKING:
+    from .world import APQuestWorld
+
+# Every location must have a unique integer ID associated with it.
+# We will have a lookup from location name to ID here that, in world.py, we will import and bind to the world class.
+# Even if a location doesn't exist on specific options, it must be present in this lookup.
+LOCATION_NAME_TO_ID = {
+    "Top Left Room Chest": 1,
+    "Top Middle Chest": 2,
+    "Bottom Left Chest": 3,
+    "Bottom Left Extra Chest": 4,
+    "Bottom Right Room Left Chest": 5,
+    "Bottom Right Room Right Chest": 6,
+    # Location IDs don't need to be sequential, as long as they're unique and greater than 0.
+    "Right Room Enemy Drop": 10,
+}
+
+
+# Each Location instance must correctly report the "game" it belongs to.
+# To make this simple, it is common practice to subclass the basic Location class and override the "game" field.
+class APQuestLocation(Location):
+    game = "APQuest"
+
+
+# Let's make one more helper method before we begin actually creating locations.
+# Later on in the code, we'll want specific subsections of LOCATION_NAME_TO_ID.
+# To reduce the chance of copy-paste errors writing something like {"Chest": LOCATION_NAME_TO_ID["Chest"]},
+# let's make a helper method that takes a list of location names and returns them as a dict with their IDs.
+# Note: There is a minor typing quirk here. Some functions want location addresses to be an "int | None",
+# so while our function here only ever returns dict[str, int], we annotate it as dict[str, int | None].
+def get_location_names_with_ids(location_names: list[str]) -> dict[str, int | None]:
+    return {location_name: LOCATION_NAME_TO_ID[location_name] for location_name in location_names}
+
+
+def create_all_locations(world: APQuestWorld) -> None:
+    create_regular_locations(world)
+    create_events(world)
+
+
+def create_regular_locations(world: APQuestWorld) -> None:
+    # Finally, we need to put the Locations ("checks") into their regions.
+    # Once again, before we do anything, we can grab our regions we created by using world.get_region()
+    overworld = world.get_region("Overworld")
+    top_left_room = world.get_region("Top Left Room")
+    bottom_right_room = world.get_region("Bottom Right Room")
+    right_room = world.get_region("Right Room")
+
+    # One way to create locations is by just creating them directly via their constructor.
+    bottom_left_chest = APQuestLocation(
+        world.player, "Bottom Left Chest", world.location_name_to_id["Bottom Left Chest"], overworld
+    )
+
+    # You can then add them to the region.
+    overworld.locations.append(bottom_left_chest)
+
+    # A simpler way to do this is by using the region.add_locations helper.
+    # For this, you need to have a dict of location names to their IDs (i.e. a subset of location_name_to_id)
+    # Aha! So that's why we made that "get_location_names_with_ids" helper method earlier.
+    # You also need to pass your overridden Location class.
+    bottom_right_room_locations = get_location_names_with_ids(
+        ["Bottom Right Room Left Chest", "Bottom Right Room Right Chest"]
+    )
+    bottom_right_room.add_locations(bottom_right_room_locations, APQuestLocation)
+
+    top_left_room_locations = get_location_names_with_ids(["Top Left Room Chest"])
+    top_left_room.add_locations(top_left_room_locations, APQuestLocation)
+
+    right_room_locations = get_location_names_with_ids(["Right Room Enemy Drop"])
+    right_room.add_locations(right_room_locations, APQuestLocation)
+
+    # Locations may be in different regions depending on the player's options.
+    # In our case, the hammer option puts the Top Middle Chest into its own room called Top Middle Room.
+    top_middle_room_locations = get_location_names_with_ids(["Top Middle Chest"])
+    if world.options.hammer:
+        top_middle_room = world.get_region("Top Middle Room")
+        top_middle_room.add_locations(top_middle_room_locations, APQuestLocation)
+    else:
+        overworld.add_locations(top_middle_room_locations, APQuestLocation)
+
+    # Locations may exist only if the player enables certain options.
+    # In our case, the extra_starting_chest option adds the Bottom Left Extra Chest location.
+    if world.options.extra_starting_chest:
+        # Once again, it is important to stress that even though the Bottom Left Extra Chest location doesn't always
+        # exist, it must still always be present in the world's location_name_to_id.
+        # Whether the location actually exists in the seed is purely determined by whether we create and add it here.
+        bottom_left_extra_chest = get_location_names_with_ids(["Bottom Left Extra Chest"])
+        overworld.add_locations(bottom_left_extra_chest, APQuestLocation)
+
+
+def create_events(world: APQuestWorld) -> None:
+    # Sometimes, the player may perform in-game actions that allow them to progress which are not related to Items.
+    # In our case, the player must press a button in the top left room to open the final boss door.
+    # AP has something for this purpose: "Event locations" and "Event items".
+    # An event location is no different than a regular location, except it has the address "None".
+    # It is treated during generation like any other location, but then it is discarded.
+    # This location cannot be "sent" and its item cannot be "received", but the item can be used in logic rules.
+    # Since we are creating more locations and adding them to regions, we need to grab those regions again first.
+    top_left_room = world.get_region("Top Left Room")
+    final_boss_room = world.get_region("Final Boss Room")
+
+    # One way to create an event is simply to use one of the normal methods of creating a location.
+    button_in_top_left_room = APQuestLocation(world.player, "Top Left Room Button", None, top_left_room)
+    top_left_room.locations.append(button_in_top_left_room)
+
+    # We then need to put an event item onto the location.
+    # An event item is an item whose code is "None" (same as the event location's address),
+    # and whose classification is "progression". Item creation will be discussed more in items.py.
+    # Note: Usually, items are created in world.create_items(), which for us happens in items.py.
+    # However, when the location of an item is known ahead of time (as is the case with an event location/item pair),
+    # it is common practice to create the item when creating the location.
+    # Since locations also have to be finalized after world.create_regions(), which runs before world.create_items(),
+    # we'll create both the event location and the event item in our locations.py code.
+    button_item = items.APQuestItem("Top Left Room Button Pressed", ItemClassification.progression, None, world.player)
+    button_in_top_left_room.place_locked_item(button_item)
+
+    # A way simpler way to do create an event location/item pair is by using the region.create_event helper.
+    # Luckily, we have another event we want to create: The Victory event.
+    # We will use this event to track whether the player can win the game.
+    # The Victory event is a completely optional abstraction - This will be discussed more in set_rules().
+    final_boss_room.add_event(
+        "Final Boss Defeated", "Victory", location_type=APQuestLocation, item_type=items.APQuestItem
+    )
+
+    # If you create all your regions and locations line-by-line like this,
+    # the length of your create_regions might get out of hand.
+    # Many worlds use more data-driven approaches using dataclasses or NamedTuples.
+    # However, it is worth understanding how the actual creation of regions and locations works,
+    # That way, we're not just mindlessly copy-pasting! :)
diff --git a/worlds/apquest/options.py b/worlds/apquest/options.py
new file mode 100644
index 0000000000..00fe9ed34e
--- /dev/null
+++ b/worlds/apquest/options.py
@@ -0,0 +1,152 @@
+from dataclasses import dataclass
+
+from Options import Choice, OptionGroup, PerGameCommonOptions, Range, Toggle
+
+# In this file, we define the options the player can pick.
+# The most common types of options are Toggle, Range and Choice.
+
+# Options will be in the game's template yaml.
+# They will be represented by checkboxes, sliders etc. on the game's options page on the website.
+# (Note: Options can also be made invisible from either of these places by overriding Option.visibility.
+#  APQuest doesn't have an example of this, but this can be used for secret / hidden / advanced options.)
+
+# For further reading on options, you can also read the Options API Document:
+# https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/options%20api.md
+
+
+# The first type of Option we'll discuss is the Toggle.
+# A toggle is an option that can either be on or off. This will be represented by a checkbox on the website.
+# The default for a toggle is "off".
+# If you want a toggle to be on by default, you can use the "DefaultOnToggle" class instead of the "Toggle" class.
+class HardMode(Toggle):
+    """
+    In hard mode, the basic enemy and the final boss will have more health.
+    The Health Upgrades become progression, as they are now required to beat the final boss.
+    """
+
+    # The docstring of an option is used as the description on the website and in the template yaml.
+
+    # You'll also want to set a display name, which will determine what the option is called on the website.
+    display_name = "Hard Mode"
+
+
+class Hammer(Toggle):
+    """
+    Adds another item to the itempool: The Hammer.
+    The top middle chest will now be locked behind a breakable wall, requiring the Hammer.
+    """
+
+    display_name = "Hammer"
+
+
+class ExtraStartingChest(Toggle):
+    """
+    Adds an extra chest in the bottom left, making room for an extra Confetti Cannon.
+    """
+
+    display_name = "Extra Starting Chest"
+
+
+class TrapChance(Range):
+    """
+    Percentage chance that any given Confetti Cannon will be replaced by a Math Trap.
+    """
+
+    display_name = "Trap Chance"
+
+    range_start = 0
+    range_end = 100
+    default = 0
+
+
+class StartWithOneConfettiCannon(Toggle):
+    """
+    Start with a confetti cannon already in your inventory.
+    Why? Because you deserve it. You get to celebrate yourself without doing any work first.
+    """
+
+    display_name = "Start With One Confetti Cannon"
+
+
+# A Range is a numeric option with a min and max value. This will be represented by a slider on the website.
+class ConfettiExplosiveness(Range):
+    """
+    How much confetti each use of a confetti cannon will fire.
+    """
+
+    display_name = "Confetti Explosiveness"
+
+    range_start = 0
+    range_end = 10
+
+    # Range options must define an explicit default value.
+    default = 3
+
+
+# A Choice is an option with multiple discrete choices. This will be represented by a dropdown on the website.
+class PlayerSprite(Choice):
+    """
+    The sprite that the player will have.
+    """
+
+    display_name = "Player Sprite"
+
+    option_human = 0
+    option_duck = 1
+    option_horse = 2
+    option_cat = 3
+
+    # Choice options must define an explicit default value.
+    default = option_human
+
+    # For choices, you can also define aliases.
+    # For example, we could make it so "player_sprite: kitty" resolves to "player_sprite: cat" like this:
+    alias_kitty = option_cat
+
+
+# We must now define a dataclass inheriting from PerGameCommonOptions that we put all our options in.
+# This is in the format "option_name_in_snake_case: OptionClassName".
+@dataclass
+class APQuestOptions(PerGameCommonOptions):
+    hard_mode: HardMode
+    hammer: Hammer
+    extra_starting_chest: ExtraStartingChest
+    start_with_one_confetti_cannon: StartWithOneConfettiCannon
+    trap_chance: TrapChance
+    confetti_explosiveness: ConfettiExplosiveness
+    player_sprite: PlayerSprite
+
+
+# If we want to group our options by similar type, we can do so as well. This looks nice on the website.
+option_groups = [
+    OptionGroup(
+        "Gameplay Options",
+        [HardMode, Hammer, ExtraStartingChest, StartWithOneConfettiCannon, TrapChance],
+    ),
+    OptionGroup(
+        "Aesthetic Options",
+        [ConfettiExplosiveness, PlayerSprite],
+    ),
+]
+
+# Finally, we can define some option presets if we want the player to be able to quickly choose a specific "mode".
+option_presets = {
+    "boring": {
+        "hard_mode": False,
+        "hammer": False,
+        "extra_starting_chest": False,
+        "start_with_one_confetti_cannon": False,
+        "trap_chance": 0,
+        "confetti_explosiveness": ConfettiExplosiveness.range_start,
+        "player_sprite": PlayerSprite.option_human,
+    },
+    "the true way to play": {
+        "hard_mode": True,
+        "hammer": True,
+        "extra_starting_chest": True,
+        "start_with_one_confetti_cannon": True,
+        "trap_chance": 50,
+        "confetti_explosiveness": ConfettiExplosiveness.range_end,
+        "player_sprite": PlayerSprite.option_duck,
+    },
+}
diff --git a/worlds/apquest/regions.py b/worlds/apquest/regions.py
new file mode 100644
index 0000000000..b002f551ff
--- /dev/null
+++ b/worlds/apquest/regions.py
@@ -0,0 +1,79 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from BaseClasses import Entrance, Region
+
+if TYPE_CHECKING:
+    from .world import APQuestWorld
+
+# A region is a container for locations ("checks"), which connects to other regions via "Entrance" objects.
+# Many games will model their Regions after physical in-game places, but you can also have more abstract regions.
+# For a location to be in logic, its containing region must be reachable.
+# The Entrances connecting regions can have rules - more on that in rules.py.
+# This makes regions especially useful for traversal logic ("Can the player reach this part of the map?")
+
+# Every location must be inside a region, and you must have at least one region.
+# This is why we create regions first, and then later we create the locations (in locations.py).
+
+
+def create_and_connect_regions(world: APQuestWorld) -> None:
+    create_all_regions(world)
+    connect_regions(world)
+
+
+def create_all_regions(world: APQuestWorld) -> None:
+    # Creating a region is as simple as calling the constructor of the Region class.
+    overworld = Region("Overworld", world.player, world.multiworld)
+    top_left_room = Region("Top Left Room", world.player, world.multiworld)
+    bottom_right_room = Region("Bottom Right Room", world.player, world.multiworld)
+    right_room = Region("Right Room", world.player, world.multiworld)
+    final_boss_room = Region("Final Boss Room", world.player, world.multiworld)
+
+    # Let's put all these regions in a list.
+    regions = [overworld, top_left_room, bottom_right_room, right_room, final_boss_room]
+
+    # Some regions may only exist if the player enables certain options.
+    # In our case, the Hammer locks the top middle chest in its own room if the hammer option is enabled.
+    if world.options.hammer:
+        top_middle_room = Region("Top Middle Room", world.player, world.multiworld)
+        regions.append(top_middle_room)
+
+    # We now need to add these regions to multiworld.regions so that AP knows about their existence.
+    world.multiworld.regions += regions
+
+
+def connect_regions(world: APQuestWorld) -> None:
+    # We have regions now, but still need to connect them to each other.
+    # But wait, we no longer have access to the region variables we created in create_all_regions()!
+    # Luckily, once you've submitted your regions to multiworld.regions,
+    # you can get them at any time using world.get_region(...).
+    overworld = world.get_region("Overworld")
+    top_left_room = world.get_region("Top Left Room")
+    bottom_right_room = world.get_region("Bottom Right Room")
+    right_room = world.get_region("Right Room")
+    final_boss_room = world.get_region("Final Boss Room")
+
+    # Okay, now we can get connecting. For this, we need to create Entrances.
+    # Entrances are inherently one-way, but crucially, AP assumes you can always return to the origin region.
+    # One way to create an Entrance is by calling the Entrance constructor.
+    overworld_to_bottom_right_room = Entrance(world.player, "Overworld to Bottom Right Room", parent=overworld)
+    overworld.exits.append(overworld_to_bottom_right_room)
+
+    # You can then connect the Entrance to the target region.
+    overworld_to_bottom_right_room.connect(bottom_right_room)
+
+    # An even easier way is to use the region.connect helper.
+    overworld.connect(right_room, "Overworld to Right Room")
+    right_room.connect(final_boss_room, "Right Room to Final Boss Room")
+
+    # The region.connect helper even allows adding a rule immediately.
+    # We'll talk more about rule creation in the set_all_rules() function in rules.py.
+    overworld.connect(top_left_room, "Overworld to Top Left Room", lambda state: state.has("Key", world.player))
+
+    # Some Entrances may only exist if the player enables certain options.
+    # In our case, the Hammer locks the top middle chest in its own room if the hammer option is enabled.
+    # In this case, we previously created an extra "Top Middle Room" region that we now need to connect to Overworld.
+    if world.options.hammer:
+        top_middle_room = world.get_region("Top Middle Room")
+        overworld.connect(top_middle_room, "Overworld to Top Middle Room")
diff --git a/worlds/apquest/rules.py b/worlds/apquest/rules.py
new file mode 100644
index 0000000000..533c33d5ea
--- /dev/null
+++ b/worlds/apquest/rules.py
@@ -0,0 +1,131 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from BaseClasses import CollectionState
+from worlds.generic.Rules import add_rule, set_rule
+
+if TYPE_CHECKING:
+    from .world import APQuestWorld
+
+
+def set_all_rules(world: APQuestWorld) -> None:
+    # In order for AP to generate an item layout that is actually possible for the player to complete,
+    # we need to define rules for our Entrances and Locations.
+    # Note: Regions do not have rules, the Entrances connecting them do!
+    # We'll do entrances first, then locations, and then finally we set our victory condition.
+
+    set_all_entrance_rules(world)
+    set_all_location_rules(world)
+    set_completion_condition(world)
+
+
+def set_all_entrance_rules(world: APQuestWorld) -> None:
+    # First, we need to actually grab our entrances. Luckily, there is a helper method for this.
+    overworld_to_bottom_right_room = world.get_entrance("Overworld to Bottom Right Room")
+    overworld_to_top_left_room = world.get_entrance("Overworld to Top Left Room")
+    right_room_to_final_boss_room = world.get_entrance("Right Room to Final Boss Room")
+
+    # An access rule is a function. We can define this function like any other function.
+    # This function must accept exactly one parameter: A "CollectionState".
+    # A CollectionState describes the current progress of the players in the multiworld, i.e. what items they have,
+    # which regions they've reached, etc.
+    # In an access rule, we can ask whether the player has a collected a certain item.
+    # We can do this via the state.has(...) function.
+    # This function takes an item name, a player number, and an optional count parameter (more on that below)
+    # Since a rule only takes a CollectionState parameter, but we also need the player number in the state.has call,
+    # our function needs to be locally defined so that it has access to the player number from the outer scope.
+    # In our case, we are inside a function that has access to the "world" parameter, so we can use world.player.
+    def can_destroy_bush(state: CollectionState) -> bool:
+        return state.has("Sword", world.player)
+
+    # Now we can set our "can_destroy_bush" rule to our entrance which requires slashing a bush to clear the path.
+    # One way to set rules is via the set_rule() function, which works on both Entrances and Locations.
+    set_rule(overworld_to_bottom_right_room, can_destroy_bush)
+
+    # Because the function has to be defined locally, most worlds prefer the lambda syntax.
+    set_rule(overworld_to_top_left_room, lambda state: state.has("Key", world.player))
+
+    # Conditions can depend on event items.
+    set_rule(right_room_to_final_boss_room, lambda state: state.has("Top Left Room Button Pressed", world.player))
+
+    # Some entrance rules may only apply if the player enabled certain options.
+    # In our case, if the hammer option is enabled, we need to add the Hammer requirement to the Entrance from
+    # Overworld to the Top Middle Room.
+    if world.options.hammer:
+        overworld_to_top_middle_room = world.get_entrance("Overworld to Top Middle Room")
+        set_rule(overworld_to_top_middle_room, lambda state: state.has("Hammer", world.player))
+
+
+def set_all_location_rules(world: APQuestWorld) -> None:
+    # Location rules work no differently from Entrance rules.
+    # Most of our locations are chests that can simply be opened by walking up to them.
+    # Thus, their logical requirements are covered by the Entrance rules of the Entrances that were required to
+    # reach the region that the chest sits in.
+    # However, our two enemies work differently.
+    # Entering the room with the enemy is not enough, you also need to have enough combat items to be able to defeat it.
+    # So, we need to set requirements on the Locations themselves.
+    # Since combat is a bit more complicated, we'll use this chance to cover some advanced access rule concepts.
+
+    # Sometimes, you may want to have different rules depending on the player's chosen options.
+    # There is a wrong way to do this, and a right way to do this. Let's do the wrong way first.
+    right_room_enemy = world.get_location("Right Room Enemy Drop")
+
+    # DON'T DO THIS!!!!
+    set_rule(
+        right_room_enemy,
+        lambda state: (
+            state.has("Sword", world.player)
+            and (not world.options.hard_mode or state.has_any(("Shield", "Health Upgrade"), world.player))
+        ),
+    )
+    # DON'T DO THIS!!!!
+
+    # Now, what's actually wrong with this? It works perfectly fine, right?
+    # If hard mode disabled, Sword is enough. If hard mode is enabled, we also need a Shield or a Health Upgrade.
+    # The access rule we just wrote does this correctly, so what's the problem?
+    # The problem is performance.
+    # Most of your world code doesn't need to be perfectly performant, since it just runs once per slot.
+    # However, access rules in particular are by far the hottest code path in Archipelago.
+    # An access rule will potentially be called thousands or even millions of times over the course of one generation.
+    # As a result, access rules are the one place where it's really worth putting in some effort to optimize.
+    # What's the performance problem here?
+    # Every time our access rule is called, it has to evaluate whether world.options.hard_mode is True or False.
+    # Wouldn't it be better if in easy mode, the access rule only checked for Sword to begin with?
+    # Wouldn't it also be better if in hard mode, it already knew it had to check Shield and Health Upgrade as well?
+    # Well, we can achieve this by doing the "if world.options.hard_mode" check outside the set_rule call,
+    # and instead having two *different* set_rule calls depending on which case we're in.
+
+    if world.options.hard_mode:
+        # If you have multiple conditions, you can obviously chain them via "or" or "and".
+        # However, there are also the nice helper functions "state.has_any" and "state.has_all".
+        set_rule(
+            right_room_enemy,
+            lambda state: (
+                state.has("Sword", world.player) and state.has_any(("Shield", "Health Upgrade"), world.player)
+            ),
+        )
+    else:
+        set_rule(right_room_enemy, lambda state: state.has("Sword", world.player))
+
+    # Another way to chain multiple conditions is via the add_rule function.
+    # This makes the access rules a bit slower though, so it should only be used if your structure justifies it.
+    # In our case, it's pretty useful because hard mode and easy mode have different requirements.
+    final_boss = world.get_location("Final Boss Defeated")
+
+    # For the "known" requirements, it's still better to chain them using a normal "and" condition.
+    add_rule(final_boss, lambda state: state.has_all(("Sword", "Shield"), world.player))
+
+    if world.options.hard_mode:
+        # You can check for multiple copies of an item by using the optional count parameter of state.has().
+        add_rule(final_boss, lambda state: state.has("Health Upgrade", world.player, 2))
+
+
+def set_completion_condition(world: APQuestWorld) -> None:
+    # Finally, we need to set a completion condition for our world, defining what the player needs to win the game.
+    # You can just set a completion condition directly like any other condition, referencing items the player receives:
+    world.multiworld.completion_condition[world.player] = lambda state: state.has_all(("Sword", "Shield"), world.player)
+
+    # In our case, we went for the Victory event design pattern (see create_events() in locations.py).
+    # So lets undo what we just did, and instead set the completion condition to:
+    world.multiworld.completion_condition[world.player] = lambda state: state.has("Victory", world.player)
diff --git a/worlds/apquest/test/__init__.py b/worlds/apquest/test/__init__.py
new file mode 100644
index 0000000000..b2e5d0d383
--- /dev/null
+++ b/worlds/apquest/test/__init__.py
@@ -0,0 +1,7 @@
+# The __init__.py file of the test directory should be empty.
+# (Before you say it: Comments are fine, smart*ss ;D)
+
+# You'll want to start with reading bases.py.
+
+# If you want to read more about tests, there is also the "Tests" section of the World API document:
+# https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/world%20api.md#tests
diff --git a/worlds/apquest/test/bases.py b/worlds/apquest/test/bases.py
new file mode 100644
index 0000000000..641a85e2d9
--- /dev/null
+++ b/worlds/apquest/test/bases.py
@@ -0,0 +1,26 @@
+from test.bases import WorldTestBase
+
+from ..world import APQuestWorld
+
+# Tests are a big topic.
+# The testing API and the core code in general empower you to test all kinds of complicated custom behavior.
+# However, for APQuest, we'll stick to some of the more basic tests.
+
+
+# Most of your testing will probably be done using the generic WorldTestBase.
+# WorldTestBase is a class that performs a set of generic tests on your world using a given set of options.
+# It also enables you to write custom tests with a slew of generic helper functions.
+# The first thing you'll want to do is subclass it. You'll want to override "game" And "world" like this.
+class APQuestTestBase(WorldTestBase):
+    game = "APQuest"
+    world: APQuestWorld
+
+
+# The actual tests you write should be in files whose names start with "test_".
+# Ideally, you should group similar tests together in one file, where each file has some overarching significance.
+
+# The best order to read these tests in is:
+# 1. test_easy_mode.py
+# 2. test_hard_mode.py
+# 3. test_extra_starting_chest.py
+# 4. test_hammer.py
diff --git a/worlds/apquest/test/test_easy_mode.py b/worlds/apquest/test/test_easy_mode.py
new file mode 100644
index 0000000000..baf3055bbc
--- /dev/null
+++ b/worlds/apquest/test/test_easy_mode.py
@@ -0,0 +1,106 @@
+from .bases import APQuestTestBase
+
+
+# When writing a test, you'll first need to subclass unittest.TestCase.
+# In our case, we'll subclass the APQuestTestBase we defined in bases.py.
+class TestEasyModeLogic(APQuestTestBase):
+    # Our test base is a subclass of WorldTestBase.
+    # WorldTestBase takes a dict of options and sets up a multiworld for you with a single world of your game.
+    # The world will have the options you specified.
+    options = {
+        "hard_mode": False,
+        # Options you don't specify will use their default values.
+        # It is good practice to specify every option that has an impact on your test, even when it's the default value.
+        # As such, we'll spell out that hard_mode is meant to be False.
+        # All other options in APQuest are cosmetic, so we don't need to list them.
+    }
+
+    # At this point, we could stop, and a few default tests would be run on our world.
+    # At the time of writing (2025-09-04), this includes the following tests:
+    # - If you have every item, every location can be reached
+    # - If you have no items, you can still reach something ("Sphere 1" is not empty)
+    # - The world successfully generates (Fill does not crash)
+
+    # This is already useful, but we also want to do our own tests.
+    # A test is a function whose name starts with "test".
+    def test_easy_mode_access(self) -> None:
+        # Inside a test, we can manually collect items, check access rules, etc.
+        # For example, we could check that the two early chests are already accessible despite us having no items.
+        # For the sake of structure, let's have every test item in its own subtest.
+        with self.subTest("Test checks accessible with nothing"):
+            bottom_left_chest = self.world.get_location("Bottom Left Chest")
+            top_middle_chest = self.world.get_location("Top Middle Chest")
+
+            # Since access rules have a "state" argument, we must pass our current CollectionState.
+            # Helpfully, since we're in a WorldTestBase, we can just use "self.multiworld.state".
+            self.assertTrue(bottom_left_chest.can_reach(self.multiworld.state))
+            self.assertTrue(top_middle_chest.can_reach(self.multiworld.state))
+
+        # Next, let's test that the top left room location requires the key to unlock the door.
+        with self.subTest("Test key is required to get top left chest"):
+            top_left_room_chest = self.world.get_location("Top Left Room Chest")
+
+            # Right now, this location should *not* be accessible, as we don't have the key yet.
+            self.assertFalse(top_left_room_chest.can_reach(self.multiworld.state))
+
+            # Now, let's collect the Key.
+            # For this, there is a handy helper function to collect items from the itempool.
+            # Keep in mind that while test functions are sectioned off from one another, subtests are not.
+            # Collecting this here means that the state will have the Key for all future subtests in this function.
+            self.collect_by_name("Key")
+
+            # The top left room chest should now be accessible.
+            self.assertTrue(top_left_room_chest.can_reach(self.multiworld.state))
+
+        # Next, let's test that you need the sword to access locations that require it (bush room and enemies).
+        with self.subTest("Test sword is required for enemy and bush locations"):
+            # Manually checking the dependency in the previous function was a bit of a hassle, wasn't it?
+            # Now we are checking four locations. It would be even longer as a result.
+            # Well, there is another option. It's the assertAccessDependency function of WorldTestBase.
+            self.assertAccessDependency(
+                [
+                    "Bottom Right Room Right Chest",
+                    "Bottom Right Room Left Chest",
+                    "Right Room Enemy Drop",
+                    "Final Boss Defeated",  # Reminder: APQuest's victory condition uses this event location
+                ],
+                [["Sword"]],
+            )
+
+            # The assertAccessDependency function is a bit complicated, so let's discuss what it does.
+            # By default, the locations argument must contain *every* location that *hard-depends* on the items.
+            # So, in our case: If every item except Sword is collected, *exactly* these four locations are unreachable.
+
+            # The possible_items argument is initially more intuitive, but has some complexity as well.
+            # In our case, we only care about one item. But sometimes, we care about multiple items at once.
+            # This is why we pass a list of lists. We'll discuss this more when we test hard mode logic.
+
+        # Let's do one more test: That the key is required for the Button.
+        with self.subTest("Test that the Key is required to activate the Button"):
+            # The Button is not the only thing that depends on the Key.
+            # As explained above, the locations list must be exhaustive.
+            # Thus, we would have to add the "Top Left Room Chest" as well.
+            # However, we can set "only_check_listed" if we only want the Top Left Room Button location to be checked.
+            self.assertAccessDependency(
+                ["Top Left Room Button"],
+                [["Key"]],
+                only_check_listed=True,
+            )
+
+    def test_easy_mode_health_upgrades(self) -> None:
+        # For our second test, let's make sure that we have two Health Upgrades with the correct classification.
+
+        # We can find the Health Upgrades in the itempool like this:
+        health_upgrades = self.get_items_by_name("Health Upgrade")
+
+        # First, let's verify there's two of them.
+        with self.subTest("Test that there are two Health Upgrades in the pool"):
+            self.assertEqual(len(health_upgrades), 2)
+
+        # Then, let's verify that they have the useful classification and NOT the progression classification.
+        with self.subTest("Test that the Health Upgrades in the pool are useful, but not progression."):
+            # To check whether an item has a certain classification, you can use the following helper properties:
+            # item.filler, item.trap, item.useful and... item.advancement. No, not item.progression...
+            # (Just go with it, AP is old and has had many name changes over the years :D)
+            self.assertTrue(all(health_upgrade.useful for health_upgrade in health_upgrades))
+            self.assertFalse(any(health_upgrade.advancement for health_upgrade in health_upgrades))
diff --git a/worlds/apquest/test/test_extra_starting_chest.py b/worlds/apquest/test/test_extra_starting_chest.py
new file mode 100644
index 0000000000..22c01620b0
--- /dev/null
+++ b/worlds/apquest/test/test_extra_starting_chest.py
@@ -0,0 +1,39 @@
+from .bases import APQuestTestBase
+
+
+# Sometimes, you might want to test something with a specific option disabled, then with it enabled.
+# For this purpose, we'll just have two different TestCase classes.
+class TestExtraStartingChestOff(APQuestTestBase):
+    options = {
+        "extra_starting_chest": False,
+    }
+
+    # Hmm... This is just default options again.
+    # This would run all the default WorldTestBase tests a second time on default options. That's a bit wasteful.
+    # Luckily, there is a way to turn off the default tests for a WorldTestBase subclass:
+    run_default_tests = False
+
+    # Since the extra_starting_chest option is False, we'll verify that the Extra Starting Chest location doesn't exist.
+    def test_extra_starting_chest_doesnt_exit(self) -> None:
+        # Currently, the best way to check for the existence of a location is to try using get_location,
+        # then watch for the KeyError that is raised if the location doesn't exist.
+        # In a testing context, we can do this with TestCase.assertRaises.
+        self.assertRaises(KeyError, self.world.get_location, "Bottom Left Extra Chest")
+
+
+class TestExtraStartingChestOn(APQuestTestBase):
+    options = {
+        "extra_starting_chest": True,
+    }
+
+    # In this case, running the default tests is acceptable, since this is a unique options combination.
+
+    # Since the extra_starting_chest option is True, we'll verify that the Extra Starting Chest location exists.
+    def test_extra_starting_chest_exists(self) -> None:
+        # In this case, the location *should* exist, so world.get_location() should *not* KeyError.
+        # This is a bit awkward, because unittest.TestCase doesn't have an "assertNotRaises".
+        # So, we'll catch the KeyError ourselves, and then fail in the catch block with a custom message.
+        try:
+            self.world.get_location("Bottom Left Extra Chest")
+        except KeyError:
+            self.fail("Bottom Left Extra Chest should exist, but it doesn't.")
diff --git a/worlds/apquest/test/test_hammer.py b/worlds/apquest/test/test_hammer.py
new file mode 100644
index 0000000000..4bf55523b6
--- /dev/null
+++ b/worlds/apquest/test/test_hammer.py
@@ -0,0 +1,64 @@
+from .bases import APQuestTestBase
+
+
+class TestHammerOff(APQuestTestBase):
+    options = {
+        "hammer": False,
+    }
+
+    # Once again, this is just default settings, so running the default tests would be wasteful.
+    run_default_tests = False
+
+    # The hammer option adds the Hammer item to the itempool.
+    # Since the hammer option is off in this TestCase, we have to verify that the Hammer is *not* in the itempool.
+    def test_hammer_doesnt_exist(self) -> None:
+        # An easy way to verify that an item is or is not in the itempool is by using WorldTestBase.get_items_by_name().
+        # This will return a list of all matching items, which we can check for its length.
+        hammers_in_itempool = self.get_items_by_name("Hammer")
+        self.assertEqual(len(hammers_in_itempool), 0)
+
+    # If the hammer option is not enabled, the Top Middle Chest should just be accessible with nothing.
+    def test_hammer_is_not_required_for_top_middle_chest(self) -> None:
+        # To check whether an item is required for a location, we would use self.assertAccessDependency.
+        # However, in this case, we want to check that the Hammer *isn't* required for the Top Middle Chest location.
+        # The robust way to do this is to collect every item into the state except for the Hammer,
+        # then assert that the location is reachable.
+        # Luckily, there is a helper for this: "collect_all_but".
+        self.collect_all_but("Hammer")
+
+        # Now, we manually check that the location is accessible using location.can_reach(state):
+        top_middle_chest_player_one = self.world.get_location("Top Middle Chest")
+        self.assertTrue(top_middle_chest_player_one.can_reach(self.multiworld.state))
+
+
+class TestHammerOn(APQuestTestBase):
+    options = {
+        "hammer": True,
+    }
+
+    # When the hammer option is on, the Hammer should exist in the itempool. Let's verify that.
+    def test_hammer_exists(self) -> None:
+        # Nothing new to say here, but I do want to take this opportunity to teach you some Python magic. :D
+        # In Python, when you check for the truth value of something that isn't a bool,
+        # it will be implicitly converted to a bool automatically.
+        # Which instances of a class convert to "False" and which convert to "True" is class-specific.
+        # In the case of lists (or containers in general), empty means False, and not-empty means True.
+        # bool([]) -> False
+        # bool([1, 2, 3]) -> True
+        # So, after grabbing all instances of the Hammer item from the itempool as a list ...
+        hammers_in_itempool = self.get_items_by_name("Hammer")
+
+        # ... instead of checking that the len() is 1, we can run this absolutely beautiful statement instead:
+        self.assertTrue(hammers_in_itempool)
+
+        # I love Python <3
+
+    # When the hammer option is on, the Hammer is required for the Top Middle Chest.
+    def test_hammer_is_required_for_top_middle_chest(self) -> None:
+        # This case is simple again: Just run self.assertAccessDependency()
+        self.assertAccessDependency(["Top Middle Chest"], [["Hammer"]])
+
+        # This unit test genuinely found an error in the world code when it was first written!
+        # The Hammer logic was not actually being correctly applied even if the hammer option was enabled,
+        # and the generator thought Top Middle Chest was considered accessible without the Hammer.
+        # This is why testing can be extremely valuable.
diff --git a/worlds/apquest/test/test_hard_mode.py b/worlds/apquest/test/test_hard_mode.py
new file mode 100644
index 0000000000..fc2f7acdf2
--- /dev/null
+++ b/worlds/apquest/test/test_hard_mode.py
@@ -0,0 +1,117 @@
+from .bases import APQuestTestBase
+
+
+class TestHardMode(APQuestTestBase):
+    options = {
+        "hard_mode": True,
+    }
+
+    def test_hard_mode_access(self) -> None:
+        # For the sake of brevity, we won't repeat anything we tested in easy mode.
+        # Instead, let's use this opportunity to talk a bit more about assertAccessDependency.
+
+        # Let's take the Enemy Drop location.
+        # In hard mode, the Enemy has two health. One swipe of the Sword does not kill it.
+        # This means that the Enemy has a chance to attack you back.
+        # If you only have the Sword, this attack kills you. After respawning, the Enemy has full health again.
+        # However, if you have a Shield, you can block the attack (resulting in half damage).
+        # Alternatively, if you have found a Health Upgrade, you can tank an extra hit.
+
+        # Why is this important?
+        # If we called assertAccessDependency with ["Right Room Enemy Drop"] and [["Shield"]], it would actually *fail*.
+        # This is because "Right Room Enemy Drop" is beatable without "Shield" - You can use "Health Upgrade" instead.
+        # However, we can call assertAccessDependency with *both* items like this:
+
+        with self.subTest("Test that you need either Shield or Health Upgrade to beat the Right Room Enemy"):
+            self.assertAccessDependency(
+                ["Right Room Enemy Drop"],
+                [["Shield"], ["Health Upgrade"]],
+                only_check_listed=True,
+            )
+
+        # This tests that:
+        # 1. No Shield & No Health Upgrades   ->   Right Room Enemy Drop is not reachable.
+        # 2. Shield & No Health Upgrades      ->   Right Room Enemy Drop is reachable.
+        # 3. No Shield & All Health Upgrades  ->   Right Room Enemy Drop is reachable.
+
+        # Note: Every other item that isn't the Shield nor a Health Upgrade is collected into state.
+        # This even includes pre-placed items, which notably includes any event location/item pairs you created.
+        # In our case, it means we don't have to mention the Sword. By omitting it, it's assumed that we have it.
+
+        # This explains why the possible_items parameter is a list, but not why it's a list of lists.
+        # Let's look at the Final Boss Location. This location requires Sword, Shield, and both Health Upgrades.
+        # We could implement it like this:
+        with self.subTest("Test that the final boss isn't beatable without Sword, Shield, and both Health Upgrades"):
+            self.assertAccessDependency(
+                ["Final Boss Defeated"],
+                [["Sword", "Shield", "Health Upgrade"]],
+                only_check_listed=True,
+            )
+
+        # This would now test the following:
+        # 1. Without Sword, nor Shield, nor any Health Upgrades, the final boss is not beatable.
+        # 2. With Sword, Shield, and all Health Upgrades, the final boss is beatable.
+
+        # But, it's not really advisable to do this.
+        # Think about it: If we implemented our logic incorrectly and forgot to add the Shield requirement,
+        # this call would still pass. We'd rather make sure that each item individually is required:
+        for item in ["Sword", "Shield", "Health Upgrade"]:
+            with self.subTest(f"Test that the final boss requires {item}"):
+                self.assertAccessDependency(
+                    ["Final Boss Defeated"],
+                    [[item]],
+                    only_check_listed=True,
+                )
+
+        # This now tests that:
+        # 1. Without Sword, you can't beat the Final Boss
+        # 2. With Sword, you can beat the Final Boss (if you have everything else)
+        # 3. Without Shield, you can't beat the Final Boss
+        # 4. With Shield, you can beat the Final Boss (if you have everything else)
+        # 5. Without Health Upgrades, you can't beat the Final Boss
+        # 6. With all Health Upgrades, you can beat the Final Boss (if you have everything else)
+
+        # 2., 4., and 6. are the exact same check, so it is a bit redundant.
+        # But crucially, we are ensuring that all three items are actually required.
+
+        # So that's not really why the inner elements are lists.
+        # So we ask again: Why are they lists? When is it ever useful?
+        # Fair warning: This is probably where you should stop reading this and skip to test_hard_mode_health_upgrades.
+        # But if you really want to know why:
+
+        # Having multiple elements in the inner lists is something that only comes up in more complex scenarios.
+        # APQuest doesn't have any of these scenarios, but let's imagine one for completeness' sake.
+        # Currently, the Enemy can be beaten with these item combinations:
+        # 1. Sword and Shield
+        # 2. Sword and Health Upgrade
+        # Let's say there was also a "Shield Bash". When using the Shield Bash, you cannot use the Shield to defend.
+        # This would mean there is a third valid combination:
+        # 3. Shield + Health Upgrade
+        # We have set up a scenario where none of the three items are enough on their own,
+        # but any combination of two items works.
+        # The best way to test this would be to call assertAccessDependency with:
+        # [["Sword", "Shield"], ["Sword", "Health Upgrade"], ["Shield", "Health Upgrade"]]
+        # If we omitted any item from any of the three sub-lists, the check would fail.
+        # This is because the item is still *mentioned* in one of the other two conditions,
+        # meaning it is not collected into state.
+        # Thus, this term cannot be simplified any further without testing something different to what we want to test.
+
+        # You can kinda think of assertAccessDependency as an OR(AND(item_list_1), AND(item_list_2), ...).
+        # Except this "AND" is a special "AND" which allows reducing each list to a single representative item.
+        # And also, the "OR" is special as well in that has to be exhaustive,
+        # where the set of completely unmentioned items must *not* be able to reach the location collectively.
+        # And *also*, each "AND" must be enough to access the location *out of the mentioned items*.
+        # ... I'm not sure this explanation helps anyone, but most of the time, you really don't have to think about it.
+
+    def test_hard_mode_health_upgrades(self) -> None:
+        # We'll also repeat our Health Upgrade test from the Easy Mode test case, but modified for Hard Mode.
+        # This will not be explained again here.
+
+        health_upgrades = self.get_items_by_name("Health Upgrade")
+
+        with self.subTest("Test that there are two Health Upgrades in the pool"):
+            self.assertEqual(len(health_upgrades), 2)
+
+        with self.subTest("Test that the Health Upgrades in the pool are progression, but not useful."):
+            self.assertFalse(any(health_upgrade.useful for health_upgrade in health_upgrades))
+            self.assertTrue(all(health_upgrade.advancement for health_upgrade in health_upgrades))
diff --git a/worlds/apquest/web_world.py b/worlds/apquest/web_world.py
new file mode 100644
index 0000000000..20a9a9ff18
--- /dev/null
+++ b/worlds/apquest/web_world.py
@@ -0,0 +1,49 @@
+from BaseClasses import Tutorial
+from worlds.AutoWorld import WebWorld
+
+from .options import option_groups, option_presets
+
+
+# For our game to display correctly on the website, we need to define a WebWorld subclass.
+class APQuestWebWorld(WebWorld):
+    # We need to override the "game" field of the WebWorld superclass.
+    # This must be the same string as the regular World class.
+    game = "APQuest"
+
+    # Your game pages will have a visual theme (affecting e.g. the background image).
+    # You can choose between dirt, grass, grassFlowers, ice, jungle, ocean, partyTime, and stone.
+    theme = "grassFlowers"
+
+    # A WebWorld can have any number of tutorials, but should always have at least an English setup guide.
+    # Many WebWorlds just have one setup guide, but some have multiple, e.g. for different languages.
+    # We need to create a Tutorial object for every setup guide.
+    # In order, we need to provide a title, a description, a language, a filepath, a link, and authors.
+    # The filepath is relative to a "/docs/" directory in the root folder of your apworld.
+    # The "link" parameter is unused, but we still need to provide it.
+    setup_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up APQuest for MultiWorld.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["NewSoupVi"],
+    )
+    # Let's have our setup guide in German as well.
+    # Do not translate the title and description!
+    # WebHost needs them to be the same to identify that it is the same tutorial.
+    # This lets it display the tutorials more compactly.
+    setup_de = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up APQuest for MultiWorld.",
+        "German",
+        "setup_de.md",
+        "setup/de",
+        ["NewSoupVi"],
+    )
+
+    # We add these tutorials to our WebWorld by overriding the "tutorials" field.
+    tutorials = [setup_en, setup_de]
+
+    # If we have option groups and/or option presets, we need to specify these here as well.
+    option_groups = option_groups
+    options_presets = option_presets
diff --git a/worlds/apquest/world.py b/worlds/apquest/world.py
new file mode 100644
index 0000000000..4e89efc35e
--- /dev/null
+++ b/worlds/apquest/world.py
@@ -0,0 +1,86 @@
+from collections.abc import Mapping
+from typing import Any
+
+# Imports of base Archipelago modules must be absolute.
+from worlds.AutoWorld import World
+
+# Imports of your world's files must be relative.
+from . import items, locations, regions, rules, web_world
+from . import options as apquest_options  # rename due to a name conflict with World.options
+
+# APQuest will go through all the parts of the world api one step at a time,
+# with many examples and comments across multiple files.
+# If you'd rather read one continuous document, or just like reading multiple sources,
+# we also have this document specifying the entire world api:
+# https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/world%20api.md
+
+
+# The world class is the heart and soul of an apworld implementation.
+# It holds all the data and functions required to build the world and submit it to the multiworld generator.
+# You could have all your world code in just this one class, but for readability and better structure,
+# it is common to split up world functionality into multiple files.
+# This implementation in particular has the following additional files, each covering one topic:
+# regions.py, locations.py, rules.py, items.py, options.py and web_world.py.
+# It is recommended that you read these in that specific order, then come back to the world class.
+class APQuestWorld(World):
+    """
+    APQuest is a minimal 8bit-era inspired adventure game with grid-like movement.
+    Good games don't need more than six checks.
+    """
+
+    # The docstring should contain a description of the game, to be displayed on the WebHost.
+
+    # You must override the "game" field to say the name of the game.
+    game = "APQuest"
+
+    # The WebWorld is a definition class that governs how this world will be displayed on the website.
+    web = web_world.APQuestWebWorld()
+
+    # This is how we associate the options defined in our options.py with our world.
+    # (Note: options.py has been imported as "apquest_options" at the top of this file to avoid a name conflict)
+    options_dataclass = apquest_options.APQuestOptions
+    options: apquest_options.APQuestOptions  # Common mistake: This has to be a colon (:), not an equals sign (=).
+
+    # Our world class must have a static location_name_to_id and item_name_to_id defined.
+    # We define these in regions.py and items.py respectively, so we just set them here.
+    location_name_to_id = locations.LOCATION_NAME_TO_ID
+    item_name_to_id = items.ITEM_NAME_TO_ID
+
+    # There is always one region that the generator starts from & assumes you can always go back to.
+    # This defaults to "Menu", but you can change it by overriding origin_region_name.
+    origin_region_name = "Overworld"
+
+    # Our world class must have certain functions ("steps") that get called during generation.
+    # The main ones are: create_regions, set_rules, create_items.
+    # For better structure and readability, we put each of these in their own file.
+    def create_regions(self) -> None:
+        regions.create_and_connect_regions(self)
+        locations.create_all_locations(self)
+
+    def set_rules(self) -> None:
+        rules.set_all_rules(self)
+
+    def create_items(self) -> None:
+        items.create_all_items(self)
+
+    # Our world class must also have a create_item function that can create any one of our items by name at any time.
+    # We also put this in a different file, the same one that create_items is in.
+    def create_item(self, name: str) -> items.APQuestItem:
+        return items.create_item_with_correct_classification(self, name)
+
+    # For features such as item links and panic-method start inventory, AP may ask your world to create extra filler.
+    # The way it does this is by calling get_filler_item_name.
+    # For this purpose, your world *must* have at least one infinitely repeatable item (usually filler).
+    # You must override this function and return this infinitely repeatable item's name.
+    # In our case, we defined a function called get_random_filler_item_name for this purpose in our items.py.
+    def get_filler_item_name(self) -> str:
+        return items.get_random_filler_item_name(self)
+
+    # There may be data that the game client will need to modify the behavior of the game.
+    # This is what slot_data exists for. Upon every client connection, the slot's slot_data is sent to the client.
+    # slot_data is just a dictionary using basic types, that will be converted to json when sent to the client.
+    def fill_slot_data(self) -> Mapping[str, Any]:
+        # If you need access to the player's chosen options on the client side, there is a helper for that.
+        return self.options.as_dict(
+            "hard_mode", "hammer", "extra_starting_chest", "confetti_explosiveness", "player_sprite"
+        )
diff --git a/worlds/apsudoku/__init__.py b/worlds/apsudoku/__init__.py
deleted file mode 100644
index 04422ddb23..0000000000
--- a/worlds/apsudoku/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from typing import Dict
-
-from BaseClasses import Tutorial
-from ..AutoWorld import WebWorld, World
-
-class AP_SudokuWebWorld(WebWorld):
-    options_page = False
-    theme = 'partyTime'
-
-    setup_en = Tutorial(
-        tutorial_name='Setup Guide',
-        description='A guide to playing APSudoku',
-        language='English',
-        file_name='setup_en.md',
-        link='setup/en',
-        authors=['EmilyV']
-    )
-    
-    tutorials = [setup_en]
-
-class AP_SudokuWorld(World):
-    """
-    Play a little Sudoku while you're in BK mode to maybe get some useful hints
-    """
-    game = "Sudoku"
-    web = AP_SudokuWebWorld()
-
-    item_name_to_id: Dict[str, int] = {}
-    location_name_to_id: Dict[str, int] = {}
-
-    @classmethod
-    def stage_assert_generate(cls, multiworld):
-        raise Exception("APSudoku cannot be used for generating worlds, the client can instead connect to any slot from any world")
-
diff --git a/worlds/apsudoku/docs/en_Sudoku.md b/worlds/apsudoku/docs/en_Sudoku.md
deleted file mode 100644
index e81f773e02..0000000000
--- a/worlds/apsudoku/docs/en_Sudoku.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# APSudoku
-
-## Hint Games
-
-HintGames do not need to be added at the start of a seed, and do not create a 'slot'- instead, you connect the HintGame client to a different game's slot. By playing a HintGame, you can earn hints for the connected slot.
-
-## What is this game?
-
-Play Sudoku puzzles of varying difficulties, earning a hint for each puzzle correctly solved. Harder puzzles are more likely to grant a hint towards a Progression item, though otherwise what hint is granted is random.
-
-## Where is the options page?
-
-There is no options page; this game cannot be used in your .yamls. Instead, the client can connect to any slot in a multiworld.
diff --git a/worlds/apsudoku/docs/setup_en.md b/worlds/apsudoku/docs/setup_en.md
deleted file mode 100644
index ef5a87e0b0..0000000000
--- a/worlds/apsudoku/docs/setup_en.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# APSudoku Setup Guide
-
-## Required Software
-- [APSudoku](https://github.com/APSudoku/APSudoku)
-
-## General Concept
-
-This is a HintGame client, which can connect to any multiworld slot, allowing you to play Sudoku to unlock random hints for that slot's locations.
-
-Does not need to be added at the start of a seed, as it does not create any slots of its own, nor does it have any YAML files.
-
-## Installation Procedures
-
-Go to the latest release from the [APSudoku Releases page](https://github.com/APSudoku/APSudoku/releases/latest). Download and extract the appropriate file for your platform.
-
-## Joining a MultiWorld Game
-
-1. Run the APSudoku executable.
-2. Under `Settings` &rarr; `Connection` at the top-right:
-	- Enter the server address and port number
-	- Enter the name of the slot you wish to connect to
-	- Enter the room password (optional)
-	- Select DeathLink related settings (optional)
-	- Press `Connect`
-4. Under the `Sudoku` tab
-	- Choose puzzle difficulty
-	- Click `Start` to generate a puzzle
-5. Try to solve the Sudoku. Click `Check` when done
-	- A correct solution rewards you with 1 hint for a location in the world you are connected to
-	- An incorrect solution has no penalty, unless DeathLink is enabled (see below)
-
-Info:
-- You can set various settings under `Settings` &rarr; `Sudoku`, and can change the colors used under `Settings` &rarr; `Theme`.
-- While connected, you can view the `Console` and `Hints` tabs for standard TextClient-like features
-- You can also use the `Tracking` tab to view either a basic tracker or a valid [GodotAP tracker pack](https://github.com/EmilyV99/GodotAP/blob/main/tracker_packs/GET_PACKS.md)
-- While connected, the number of "unhinted" locations for your slot is shown in the upper-left of the the `Sudoku` tab. (If this reads 0, no further hints can be earned for this slot, as every locations is already hinted)
-- Click the various `?` buttons for information on controls/how to play
-## DeathLink Support
-
-If `DeathLink` is enabled when you click `Connect`:
-- Lose a life if you check an incorrect puzzle (not an _incomplete_ puzzle- if any cells are empty, you get off with a warning), or if you quit a puzzle without solving it (including disconnecting).
-- Your life count is customizable (default 0). Dying with 0 lives left kills linked players AND resets your puzzle.
-- On receiving a DeathLink from another player, your puzzle resets. 
diff --git a/worlds/aquaria/Items.py b/worlds/aquaria/Items.py
index 88ac7c76e0..3365c1fa59 100644
--- a/worlds/aquaria/Items.py
+++ b/worlds/aquaria/Items.py
@@ -29,6 +29,7 @@ class ItemGroup(Enum):
     UTILITY = 4
     SONG = 5
     TURTLE = 6
+    DOOR = 7
 
 
 class AquariaItem(Item):
@@ -211,6 +212,7 @@ class ItemNames:
     TRANSTURTLE_BODY = "Transturtle Final Boss"
     TRANSTURTLE_SIMON_SAYS = "Transturtle Simon Says"
     TRANSTURTLE_ARNASSI_RUINS = "Transturtle Arnassi Ruins"
+    DOOR_TO_CATHEDRAL = "Door to the Cathedral opened"
     # Events name
     BODY_TONGUE_CLEARED = "Body Tongue cleared"
     HAS_SUN_CRYSTAL = "Has Sun Crystal"
@@ -240,7 +242,7 @@ item_table = {
     ItemNames.BIG_SEED: ItemData(698002, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_big_seed
     ItemNames.GLOWING_SEED: ItemData(698003, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_bio_seed
     ItemNames.BLACK_PEARL: ItemData(698004, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_blackpearl
-    ItemNames.BABY_BLASTER: ItemData(698005, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_blaster
+    ItemNames.BABY_BLASTER: ItemData(698005, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_blaster
     ItemNames.CRAB_ARMOR: ItemData(698006, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_crab_costume
     ItemNames.BABY_DUMBO: ItemData(698007, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_dumbo
     ItemNames.TOOTH: ItemData(698008, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_boss
@@ -256,8 +258,8 @@ item_table = {
     ItemNames.MITHALAS_BANNER: ItemData(698018, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_banner
     ItemNames.MITHALAS_POT: ItemData(698019, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_pot
     ItemNames.MUTANT_COSTUME: ItemData(698020, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mutant_costume
-    ItemNames.BABY_NAUTILUS: ItemData(698021, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_nautilus
-    ItemNames.BABY_PIRANHA: ItemData(698022, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_piranha
+    ItemNames.BABY_NAUTILUS: ItemData(698021, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_nautilus
+    ItemNames.BABY_PIRANHA: ItemData(698022, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_piranha
     ItemNames.ARNASSI_ARMOR: ItemData(698023, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_seahorse_costume
     ItemNames.SEED_BAG: ItemData(698024, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_seed_bag
     ItemNames.KING_S_SKULL: ItemData(698025, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_skull
@@ -371,4 +373,20 @@ item_table = {
     ItemNames.TRANSTURTLE_BODY: ItemData(698131, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_finalboss
     ItemNames.TRANSTURTLE_SIMON_SAYS: ItemData(698132, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_forest05
     ItemNames.TRANSTURTLE_ARNASSI_RUINS: ItemData(698133, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_seahorse
+    ItemNames.DOOR_TO_CATHEDRAL: ItemData(698134, 1, ItemType.PROGRESSION, ItemGroup.DOOR),  # door_to_cathedral
 }
+
+
+four_gods_excludes = [ItemNames.ANEMONE, ItemNames.ARNASSI_STATUE, ItemNames.BIG_SEED, ItemNames.GLOWING_SEED,
+                      ItemNames.BLACK_PEARL, ItemNames.TOOTH, ItemNames.ENERGY_STATUE, ItemNames.KROTITE_ARMOR,
+                      ItemNames.GOLDEN_STARFISH, ItemNames.GOLDEN_GEAR, ItemNames.JELLY_BEACON,
+                      ItemNames.JELLY_PLANT, ItemNames.MITHALAS_DOLL, ItemNames.MITHALAN_DRESS,
+                      ItemNames.MITHALAS_BANNER, ItemNames.MITHALAS_POT, ItemNames.MUTANT_COSTUME, ItemNames.SEED_BAG,
+                      ItemNames.KING_S_SKULL, ItemNames.SONG_PLANT_SPORE, ItemNames.STONE_HEAD, ItemNames.SUN_KEY,
+                      ItemNames.GIRL_COSTUME, ItemNames.ODD_CONTAINER, ItemNames.TRIDENT, ItemNames.TURTLE_EGG,
+                      ItemNames.JELLY_EGG, ItemNames.URCHIN_COSTUME, ItemNames.BABY_WALKER,
+                      ItemNames.RAINBOW_MUSHROOM, ItemNames.RAINBOW_MUSHROOM, ItemNames.RAINBOW_MUSHROOM,
+                      ItemNames.LEAF_POULTICE, ItemNames.LEAF_POULTICE, ItemNames.LEAF_POULTICE,
+                      ItemNames.LEECHING_POULTICE, ItemNames.LEECHING_POULTICE, ItemNames.ARCANE_POULTICE,
+                      ItemNames.ROTTEN_MEAT, ItemNames.ROTTEN_MEAT, ItemNames.ROTTEN_MEAT, ItemNames.ROTTEN_MEAT,
+                      ItemNames.SEA_LOAF_X_2, ItemNames.SMALL_EGG]
\ No newline at end of file
diff --git a/worlds/aquaria/Locations.py b/worlds/aquaria/Locations.py
index 832d22f4ac..1a65452069 100644
--- a/worlds/aquaria/Locations.py
+++ b/worlds/aquaria/Locations.py
@@ -233,7 +233,7 @@ class AquariaLocationNames:
     SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM = "Sun Temple, bulb at the top of the high dark room"
     SUN_TEMPLE_GOLDEN_GEAR = "Sun Temple, Golden Gear"
     SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE = "Sun Temple, first bulb of the temple"
-    SUN_TEMPLE_BULB_ON_THE_RIGHT_PART = "Sun Temple, bulb on the right part"
+    SUN_TEMPLE_BULB_ON_THE_RIGHT_PART = "Sun Temple, bulb in the right part"
     SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART = "Sun Temple, bulb in the hidden room of the right part"
     SUN_TEMPLE_SUN_KEY = "Sun Temple, Sun Key"
     SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB = "Sun Temple boss path, first path bulb"
@@ -306,6 +306,7 @@ class AquariaLocationNames:
     BEATING_CRABBIUS_MAXIMUS = "Beating Crabbius Maximus"
     BEATING_MANTIS_SHRIMP_PRIME = "Beating Mantis Shrimp Prime"
     BEATING_KING_JELLYFISH_GOD_PRIME = "Beating King Jellyfish God Prime"
+    SITTING_ON_THRONE = "Mithalas City Castle, sitting on the sealed throne"
     FIRST_SECRET = "First Secret"
     SECOND_SECRET = "Second Secret"
     THIRD_SECRET = "Third Secret"
@@ -497,6 +498,7 @@ class AquariaLocations:
     locations_mithalas_castle = {
         AquariaLocationNames.MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE: 698042,
         AquariaLocationNames.MITHALAS_CITY_CASTLE_BLUE_BANNER: 698165,
+        AquariaLocationNames.SITTING_ON_THRONE: 698218,
     }
 
     locations_mithalas_castle_urns = {
@@ -803,6 +805,10 @@ class AquariaLocations:
         AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE: 698215,
     }
 
+    locations_final_boss_tube_transturtle_only = {
+        AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE: 698215,
+    }
+
     locations_final_boss = {
         AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM: 698106,
     }
diff --git a/worlds/aquaria/Options.py b/worlds/aquaria/Options.py
index c73c108a95..de6beea553 100644
--- a/worlds/aquaria/Options.py
+++ b/worlds/aquaria/Options.py
@@ -11,9 +11,11 @@ from Options import Toggle, Choice, Range, PerGameCommonOptions, DefaultOnToggle
 class IngredientRandomizer(Choice):
     """
     Select if the simple ingredients (that do not have a recipe) should be randomized.
+
     If "Common Ingredients" is selected, the randomization will exclude the "Red Bulb", "Special Bulb" and "Rukh Egg".
     """
     display_name = "Randomize Ingredients"
+    rich_text_doc = True
     option_off = 0
     alias_false = 0
     option_common_ingredients = 1
@@ -26,11 +28,17 @@ class IngredientRandomizer(Choice):
 class DishRandomizer(Toggle):
     """Randomize the drop of Dishes (Ingredients with recipe)."""
     display_name = "Dish Randomizer"
+    rich_text_doc = True
 
 
 class TurtleRandomizer(Choice):
-    """Randomize the transportation turtle."""
+    """
+    Randomize the transportation turtle.
+
+    If the objective is "killing the four gods" or "Gods and Creator", the abyss and body turtle will not be randomized.
+    """
     display_name = "Turtle Randomizer"
+    rich_text_doc = True
     option_none = 0
     alias_off = 0
     alias_false = 0
@@ -47,6 +55,7 @@ class EarlyBindSong(Choice):
     selected).
     """
     display_name = "Early Bind song"
+    rich_text_doc = True
     option_off = 0
     alias_false = 0
     option_early = 1
@@ -62,6 +71,7 @@ class EarlyEnergyForm(Choice):
     selected).
     """
     display_name = "Early Energy form"
+    rich_text_doc = True
     option_off = 0
     alias_false = 0
     option_early = 1
@@ -74,14 +84,19 @@ class EarlyEnergyForm(Choice):
 class AquarianTranslation(Toggle):
     """Translate the Aquarian scripture in the game into English."""
     display_name = "Translate Aquarian"
+    rich_text_doc = True
 
 
 class BigBossesToBeat(Range):
     """
-    The number of big bosses to beat before having access to the creator (the final boss). The big bosses are
-    "Fallen God", "Mithalan God", "Drunian God", "Lumerean God" and "The Golem".
+    The number of big bosses to beat before having access to the creator (the final boss).
+
+    The big bosses are "Fallen God", "Mithalan God", "Drunian God", "Lumerean God" and "The Golem".
+
+    Has no effect if the objective is "killing the four gods" or "Gods and Creator".
     """
     display_name = "Big bosses to beat"
+    rich_text_doc = True
     range_start = 0
     range_end = 5
     default = 0
@@ -89,12 +104,18 @@ class BigBossesToBeat(Range):
 
 class MiniBossesToBeat(Range):
     """
-    The number of minibosses to beat before having access to the creator (the final boss). The minibosses are
-    "Nautilus Prime", "Blaster Peg Prime", "Mergog", "Mithalan priests", "Octopus Prime", "Crabbius Maximus",
-    "Mantis Shrimp Prime" and "King Jellyfish God Prime".
-    Note that the Energy Statue and Simon Says are not minibosses.
+    The number of minibosses to beat before having access to the goal.
+
+    The minibosses are "Nautilus Prime", "Blaster Peg Prime", "Mergog", "Mithalan priests", "Octopus Prime",
+    "Crabbius Maximus", "Mantis Shrimp Prime" and "King Jellyfish God Prime".
+
+    Note that the "Energy Statue" and "Simon Says" are not minibosses.
+
+    Also note that if the objective is "killing the four enemy gods" or "Gods and creator", it might be needed to go in the abyss and
+    bubble cave to kill "King Jellyfish God Prime" and "Mantis Shrimp Prime".
     """
     display_name = "Minibosses to beat"
+    rich_text_doc = True
     range_start = 0
     range_end = 8
     default = 0
@@ -102,38 +123,48 @@ class MiniBossesToBeat(Range):
 
 class Objective(Choice):
     """
-    The game objective can be to kill the creator or to kill the creator after obtaining all three secret memories.
+    **Kill the Creator:** Get to the final boss (the Creator) and beat all it's forms.
+
+    **Obtain secrets and kill the Creator:** like the "Kill the Creator", but need to find all three secret memories
+    before getting to the Creator.
+
+    **Killing the four gods:**, Beat all four enemy gods ("Fallen God", "Mithalan God", "Drunian God", "Lumerean God").
+
+    **Gods and Creator:** like "Killing the four gods" but you also have to beat the creator.
     """
     display_name = "Objective"
+    rich_text_doc = True
     option_kill_the_creator = 0
     option_obtain_secrets_and_kill_the_creator = 1
+    option_killing_the_four_gods = 2
+    option_gods_and_creator = 3
     default = 0
 
 
 class SkipFirstVision(Toggle):
     """
-    The first vision in the game, where Naija transforms into Energy Form and gets flooded by enemies, is quite cool but
-    can be quite long when you already know what is going on. This option can be used to skip this vision.
+    Skip the first vision in the game, where Naija transforms into Energy Form and gets flooded by enemies.
     """
     display_name = "Skip Naija's first vision"
+    rich_text_doc = True
 
 
-class NoProgressionHardOrHiddenLocation(Toggle):
-    """
-    Make sure that there are no progression items at hard-to-reach or hard-to-find locations.
-    Those locations are very High locations (that need beast form, soup and skill to get),
-    every location in the bubble cave, locations where need you to cross a false wall without any indication,
-    the Arnassi race, bosses and minibosses. Useful for those that want a more casual run.
-    """
-    display_name = "No progression in hard or hidden locations"
-
-
-class LightNeededToGetToDarkPlaces(DefaultOnToggle):
+class LightNeededToGetToDarkPlaces(Choice):
     """
     Make sure that the sun form or the dumbo pet can be acquired before getting to dark places.
+
     Be aware that navigating in dark places without light is extremely difficult.
+
+    You can also force the sun form to be accessible by using the "sun form" option.
     """
     display_name = "Light needed to get to dark places"
+    rich_text_doc = True
+    option_off = 0
+    alias_false = 0
+    option_on = 1
+    alias_true = 1
+    option_sun_form = 2
+    default = 1
 
 
 class BindSongNeededToGetUnderRockBulb(DefaultOnToggle):
@@ -141,23 +172,83 @@ class BindSongNeededToGetUnderRockBulb(DefaultOnToggle):
     Make sure that the bind song can be acquired before having to obtain sing bulbs under rocks.
     """
     display_name = "Bind song needed to get sing bulbs under rocks"
+    rich_text_doc = True
 
 
 class BlindGoal(Toggle):
     """
-    Hide the goal's requirements from the help page so that you have to go to the last boss door to know
-    what is needed to access the boss.
+    Hide the goal's requirements from the help page so that you don't know what is needed to goal.
+
+    Note that when you get to the final boss door (or you beat the last gods when the "Killing the four gods"
+    is selected) you can then see the requirements in the help page.
     """
     display_name = "Hide the goal's requirements"
+    rich_text_doc = True
+
+
+class InfiniteHotSoup(DefaultOnToggle):
+    """
+    As soon as a "hot soup" is received, the user will never run out of this dish.
+
+    This option is recommended if using Ingredient randomization since "hot soup" ingredients may become hard to get
+    and the "hot soup" is necessary to get to some locations.
+    """
+    display_name = "Infinite Hot Soup"
+    rich_text_doc = True
+
+
+class SaveHealing(DefaultOnToggle):
+    """
+    When you save, Naija is healed back to full health. If disabled, saving won't heal Naija.
+
+    Note that Naija can still heal by sleeping in some beds in the game (including in her home).
+    """
+    display_name = "Save heal Naija"
+    rich_text_doc = True
+
+
+class OpenBodyTongue(Toggle):
+    """
+    Remove the body tongue making the body accessible without going in the sunken city
+    """
+    display_name = "Open the body tongue"
+    rich_text_doc = True
+
+
+class SkipFinalBoss3rdForm(Toggle):
+    """
+    The Final boss third form (the hide and seek form) can be easy and quite long. So, this option can be used
+    to skip this form.
+
+    Note that you will still need to deliver the final blow to the 3rd form in order to activate the 4th form animation.
+    """
+    display_name = "Skip final boss third form"
+
+
+class MaximumIngredientAmount(Range):
+    """
+    The maximum number of the same ingredients that can be stacked on the ingredient inventory.
+    """
+    display_name = "Maximum ingredient amount"
+    rich_text_doc = True
+    range_start = 2
+    range_end = 20
+    default = 8
 
 
 class UnconfineHomeWater(Choice):
     """
     Open the way out of the Home Waters area so that Naija can go to open water and beyond without the bind song.
+
+    **Via energy door:** Open the energy door between the home waters and the open waters
+
+    **Via transturtle:** Remove the rock blocking the home water transturtle.
+
     Note that if you turn this option off, it is recommended to turn on the Early Energy form and Early Bind Song
     options.
     """
     display_name = "Unconfine Home Waters Area"
+    rich_text_doc = True
     option_off = 0
     alias_false = 0
     option_via_energy_door = 1
@@ -168,6 +259,134 @@ class UnconfineHomeWater(Choice):
     default = 0
 
 
+class ThroneAsLocation(Toggle):
+    """
+    If enabled, sitting on the Mithalas City Castle throne (with the seal on it) will be a location and opening the
+    door to the Mithalas Cathedral will be an item.
+    """
+    display_name = "Throne as a location"
+    rich_text_doc = True
+
+
+class NoProgressionHardOrHiddenLocation(Toggle):
+    """
+    Make sure that there are no progression items at hard-to-reach or hard-to-find locations.
+
+    Those locations are very High locations (that need beast form, soup and skill to get), every location in the
+    bubble cave, locations where need you to cross a false wall without any indication, the Arnassi race,
+    bosses and minibosses.
+
+    Useful for those that want a more casual run.
+    """
+    display_name = "No progression in hard or hidden locations"
+    rich_text_doc = True
+
+
+class NoProgressionSimonSays(Toggle):
+    """
+    Make sure that there are no progression items in the says area.
+    """
+    display_name = "No progression in Simon says area"
+    rich_text_doc = True
+
+
+class NoProgressionKelpForest(Toggle):
+    """
+    Make sure that there are no progression items in Kelp Forest (excluding Simon says area).
+
+    Can be useful to get smaller runs.
+    """
+    display_name = "No progression in Kelp Forest"
+
+
+class NoProgressionVeil(Toggle):
+    """
+    Make sure that there are no progression items in the Veil.
+
+    Can be useful to get smaller runs.
+    """
+    display_name = "No progression in the Veil"
+    rich_text_doc = True
+
+
+class NoProgressionMithalas(Toggle):
+    """
+    Make sure that there are no progression items in the Mithalas (city, castle and cathedral).
+
+    Can be useful to get smaller runs.
+    """
+    display_name = "No progression in Mithalas"
+    rich_text_doc = True
+
+
+class NoProgressionEnergyTemple(Toggle):
+    """
+    Make sure that there are no progression items in the Energy Temple.
+
+    Can be useful to get smaller runs.
+    """
+    display_name = "No progression in the Energy Temple"
+    rich_text_doc = True
+
+
+class NoProgressionArnassiRuins(Toggle):
+    """
+    Make sure that there are no progression items in the Arnassi Ruins.
+
+    Can be useful to get smaller runs.
+
+    Note that if the Transportation turtle are not randomize, this include Simon Says area.
+    """
+    display_name = "No progression in Arnassi Ruins"
+    rich_text_doc = True
+
+
+class NoProgressionFrozenVeil(Toggle):
+    """
+    Make sure that there are no progression items in the Frozen Veil (including Ice Cavern and Bubble Cave).
+
+    Can be useful to get smaller runs.
+    """
+    display_name = "No progression in the Frozen Veil"
+    rich_text_doc = True
+
+
+class NoProgressionAbyss(Toggle):
+    """
+    Make sure that there are no progression items in the Abyss.
+
+    Can be useful to get smaller runs.
+
+    Has no effect if the objective is "killing the four gods".
+    """
+    display_name = "No progression in the Abyss"
+    rich_text_doc = True
+
+
+class NoProgressionSunkenCity(Toggle):
+    """
+    Make sure that there are no progression items in the Sunken City.
+
+    Can be useful to get smaller runs.
+
+    Has no effect if the objective is "killing the four gods".
+    """
+    display_name = "No progression in the Sunken City"
+    rich_text_doc = True
+
+
+class NoProgressionBody(Toggle):
+    """
+    Make sure that there are no progression items in the Body (including the before-boss transturtle room
+    and the boss location).
+
+    Can be useful to get smaller runs.
+
+    Has no effect if the objective is "killing the four gods".
+    """
+    display_name = "No progression in the Body"
+    rich_text_doc = True
+
 @dataclass
 class AquariaOptions(PerGameCommonOptions):
     """
@@ -183,9 +402,25 @@ class AquariaOptions(PerGameCommonOptions):
     light_needed_to_get_to_dark_places: LightNeededToGetToDarkPlaces
     bind_song_needed_to_get_under_rock_bulb: BindSongNeededToGetUnderRockBulb
     unconfine_home_water: UnconfineHomeWater
-    no_progression_hard_or_hidden_locations: NoProgressionHardOrHiddenLocation
     ingredient_randomizer: IngredientRandomizer
     dish_randomizer: DishRandomizer
     aquarian_translation: AquarianTranslation
     skip_first_vision: SkipFirstVision
     blind_goal: BlindGoal
+    infinite_hot_soup: InfiniteHotSoup
+    open_body_tongue: OpenBodyTongue
+    maximum_ingredient_amount: MaximumIngredientAmount
+    skip_final_boss_3rd_form: SkipFinalBoss3rdForm
+    save_healing: SaveHealing
+    throne_as_location: ThroneAsLocation
+    no_progression_hard_or_hidden_locations: NoProgressionHardOrHiddenLocation
+    no_progression_simon_says: NoProgressionSimonSays
+    no_progression_kelp_forest: NoProgressionKelpForest
+    no_progression_veil: NoProgressionVeil
+    no_progression_mithalas: NoProgressionMithalas
+    no_progression_energy_temple: NoProgressionEnergyTemple
+    no_progression_arnassi_ruins: NoProgressionArnassiRuins
+    no_progression_frozen_veil: NoProgressionFrozenVeil
+    no_progression_abyss: NoProgressionAbyss
+    no_progression_sunken_city: NoProgressionSunkenCity
+    no_progression_body: NoProgressionBody
diff --git a/worlds/aquaria/Regions.py b/worlds/aquaria/Regions.py
index 3436374ac7..781d06e09f 100755
--- a/worlds/aquaria/Regions.py
+++ b/worlds/aquaria/Regions.py
@@ -8,7 +8,7 @@ from typing import Dict, Optional, Iterable
 from BaseClasses import MultiWorld, Region, Entrance, Item, ItemClassification, CollectionState
 from .Items import AquariaItem, ItemNames
 from .Locations import AquariaLocations, AquariaLocation, AquariaLocationNames
-from .Options import AquariaOptions, UnconfineHomeWater
+from .Options import AquariaOptions, UnconfineHomeWater, LightNeededToGetToDarkPlaces, Objective
 from worlds.generic.Rules import add_rule, set_rule
 
 
@@ -116,14 +116,27 @@ def _has_big_bosses(state: CollectionState, player: int) -> bool:
                           ItemNames.LUMEREAN_GOD_BEATED, ItemNames.THE_GOLEM_BEATED}, player)
 
 
-def _has_mini_bosses(state: CollectionState, player: int) -> bool:
+def _has_four_gods_beated(state: CollectionState, player: int) -> bool:
     """`player` in `state` has beated every big bosses"""
+    return state.has_all({ItemNames.FALLEN_GOD_BEATED, ItemNames.MITHALAN_GOD_BEATED, ItemNames.DRUNIAN_GOD_BEATED,
+                          ItemNames.LUMEREAN_GOD_BEATED}, player)
+
+
+def _has_mini_bosses(state: CollectionState, player: int) -> bool:
+    """`player` in `state` has beated every mini bosses"""
     return state.has_all({ItemNames.NAUTILUS_PRIME_BEATED, ItemNames.BLASTER_PEG_PRIME_BEATED, ItemNames.MERGOG_BEATED,
                           ItemNames.MITHALAN_PRIESTS_BEATED, ItemNames.OCTOPUS_PRIME_BEATED,
                           ItemNames.CRABBIUS_MAXIMUS_BEATED, ItemNames.MANTIS_SHRIMP_PRIME_BEATED,
                           ItemNames.KING_JELLYFISH_GOD_PRIME_BEATED}, player)
 
 
+def _has_mini_bosses_four_gods(state: CollectionState, player: int) -> bool:
+    """`player` in `state` has beated every mini bosses other than the ones in the abyss and in the bubble cave"""
+    return state.has_all({ItemNames.NAUTILUS_PRIME_BEATED, ItemNames.BLASTER_PEG_PRIME_BEATED, ItemNames.MERGOG_BEATED,
+                          ItemNames.MITHALAN_PRIESTS_BEATED, ItemNames.OCTOPUS_PRIME_BEATED,
+                          ItemNames.CRABBIUS_MAXIMUS_BEATED}, player)
+
+
 def _has_secrets(state: CollectionState, player: int) -> bool:
     """The secrets have been acquired in the `state` of the `player`"""
     return state.has_all({ItemNames.FIRST_SECRET_OBTAINED, ItemNames.SECOND_SECRET_OBTAINED,
@@ -133,6 +146,11 @@ def _item_not_advancement(item: Item):
     """The `item` is not an advancement item"""
     return not item.advancement
 
+def _is_cathedral_door_opened(state: CollectionState, player: int) -> bool:
+    """The door to Mithalas Cathedral has been opened in the `state` of the `player`"""
+    return state.has(ItemNames.DOOR_TO_CATHEDRAL, player)
+
+
 class AquariaRegions:
     """
     Class used to create regions of the Aquaria game
@@ -236,10 +254,11 @@ class AquariaRegions:
     body_rt: Region
     body_rb: Region
     body_b: Region
-    final_boss_loby: Region
+    final_boss_lobby: Region
     final_boss_tube: Region
     final_boss: Region
     final_boss_end: Region
+    four_gods_end: Region
     """
     Every Region of the game
     """
@@ -254,6 +273,11 @@ class AquariaRegions:
     The ID of the player
     """
 
+    is_four_gods: bool
+    """
+    True if the player has an objective that implies killing the four gods
+    """
+
     def __add_region(self, hint: str,
                      locations: Optional[Dict[str, int]]) -> Region:
         """
@@ -439,65 +463,82 @@ class AquariaRegions:
         self.sun_temple_boss = self.__add_region("Sun Temple boss area",
                                                  AquariaLocations.locations_sun_temple_boss)
 
-    def __create_abyss(self) -> None:
+    def __create_abyss(self, add_locations: bool) -> None:
         """
         Create the `abyss_*`, `ice_cave`, `king_jellyfish_cave` and `whale`
         regions
         """
         self.abyss_l = self.__add_region("Abyss left area",
-                                         AquariaLocations.locations_abyss_l)
-        self.abyss_lb = self.__add_region("Abyss left bottom area", AquariaLocations.locations_abyss_lb)
-        self.abyss_r = self.__add_region("Abyss right area", AquariaLocations.locations_abyss_r)
+                                         AquariaLocations.locations_abyss_l if add_locations else None)
+        self.abyss_lb = self.__add_region("Abyss left bottom area",
+                                          AquariaLocations.locations_abyss_lb if add_locations else None)
+        self.abyss_r = self.__add_region("Abyss right area",
+                                         AquariaLocations.locations_abyss_r if add_locations else None)
         self.abyss_r_transturtle = self.__add_region("Abyss right area, transturtle",
                                                      AquariaLocations.locations_abyss_r_transturtle)
         self.abyss_r_whale = self.__add_region("Abyss right area, outside the whale",
-                                               AquariaLocations.locations_abyss_r_whale)
-        self.ice_cave = self.__add_region("Ice Cavern", AquariaLocations.locations_ice_cave)
+                                               AquariaLocations.locations_abyss_r_whale if add_locations else None)
+        self.ice_cave = self.__add_region("Ice Cavern",
+                                          AquariaLocations.locations_ice_cave if add_locations else None)
         self.frozen_feil = self.__add_region("Frozen Veil", None)
-        self.bubble_cave = self.__add_region("Bubble Cave", AquariaLocations.locations_bubble_cave)
-        self.bubble_cave_boss = self.__add_region("Bubble Cave boss area", AquariaLocations.locations_bubble_cave_boss)
+        self.bubble_cave = self.__add_region("Bubble Cave",
+                                             AquariaLocations.locations_bubble_cave if add_locations else None)
+        self.bubble_cave_boss = self.__add_region("Bubble Cave boss area",
+                                                  AquariaLocations.locations_bubble_cave_boss
+                                                  if add_locations else None)
         self.king_jellyfish_cave = self.__add_region("Abyss left area, King jellyfish cave",
-                                                     AquariaLocations.locations_king_jellyfish_cave)
-        self.whale = self.__add_region("Inside the whale", AquariaLocations.locations_whale)
+                                                     AquariaLocations.locations_king_jellyfish_cave
+                                                     if add_locations else None)
+        self.whale = self.__add_region("Inside the whale",
+                                       AquariaLocations.locations_whale if add_locations else None)
+
         self.first_secret = self.__add_region("First Secret area", None)
 
-    def __create_sunken_city(self) -> None:
+    def __create_sunken_city(self, add_locations: bool) -> None:
         """
         Create the `sunken_city_*` regions
         """
         self.sunken_city_l = self.__add_region("Sunken City left area", None)
         self.sunken_city_l_crates = self.__add_region("Sunken City left area",
-                                                      AquariaLocations.locations_sunken_city_l)
+                                                      AquariaLocations.locations_sunken_city_l
+                                                      if add_locations else None)
         self.sunken_city_l_bedroom = self.__add_region("Sunken City left area, bedroom",
-                                                       AquariaLocations.locations_sunken_city_l_bedroom)
+                                                       AquariaLocations.locations_sunken_city_l_bedroom
+                                                       if add_locations else None)
         self.sunken_city_r = self.__add_region("Sunken City right area", None)
         self.sunken_city_r_crates = self.__add_region("Sunken City right area crates",
-                                                      AquariaLocations.locations_sunken_city_r)
+                                                      AquariaLocations.locations_sunken_city_r
+                                                      if add_locations else None)
         self.sunken_city_boss = self.__add_region("Sunken City boss area",
-                                                  AquariaLocations.locations_sunken_city_boss)
+                                                  AquariaLocations.locations_sunken_city_boss
+                                                  if add_locations else None)
 
-    def __create_body(self) -> None:
+    def __create_body(self, add_locations: bool) -> None:
         """
         Create the `body_*` and `final_boss* regions
         """
         self.body_c = self.__add_region("The Body center area",
-                                        AquariaLocations.locations_body_c)
+                                        AquariaLocations.locations_body_c if add_locations else None)
         self.body_l = self.__add_region("The Body left area",
-                                        AquariaLocations.locations_body_l)
+                                        AquariaLocations.locations_body_l if add_locations else None)
         self.body_rt = self.__add_region("The Body right area, top path",
-                                         AquariaLocations.locations_body_rt)
+                                         AquariaLocations.locations_body_rt if add_locations else None)
         self.body_rb = self.__add_region("The Body right area, bottom path",
-                                         AquariaLocations.locations_body_rb)
+                                         AquariaLocations.locations_body_rb if add_locations else None)
         self.body_b = self.__add_region("The Body bottom area",
-                                        AquariaLocations.locations_body_b)
-        self.final_boss_loby = self.__add_region("The Body, before final boss", None)
+                                        AquariaLocations.locations_body_b if add_locations else None)
+        self.final_boss_lobby = self.__add_region("The Body, before final boss", None)
         self.final_boss_tube = self.__add_region("The Body, final boss area turtle room",
-                                                 AquariaLocations.locations_final_boss_tube)
+                                                 AquariaLocations.locations_final_boss_tube
+                                                 if add_locations else
+                                                 AquariaLocations.locations_final_boss_tube_transturtle_only)
         self.final_boss = self.__add_region("The Body, final boss",
-                                            AquariaLocations.locations_final_boss)
+                                            AquariaLocations.locations_final_boss if add_locations else None)
         self.final_boss_end = self.__add_region("The Body, final boss area", None)
 
-    def get_entrance_name(self, from_region: Region, to_region: Region):
+    @staticmethod
+    def get_entrance_name(from_region: Region, to_region: Region):
+
         """
         Return the name of an entrance between `from_region` and `to_region`
         """
@@ -510,6 +551,7 @@ class AquariaRegions:
         entrance = Entrance(self.player, self.get_entrance_name(source_region, destination_region), source_region)
         source_region.exits.append(entrance)
         entrance.connect(destination_region)
+
         if rule is not None:
             set_rule(entrance, rule)
 
@@ -633,8 +675,8 @@ class AquariaRegions:
                                        lambda state: _has_beast_form(state, self.player))
         self.__connect_regions(self.mithalas_castle, self.cathedral_underground,
                                lambda state: _has_beast_form(state, self.player))
-        self.__connect_one_way_regions(self.mithalas_castle, self.cathedral_top_start,
-                                       lambda state: _has_bind_song(state, self.player))
+        self.__connect_regions(self.mithalas_castle, self.cathedral_top_start,
+                               lambda state: _is_cathedral_door_opened(state, self.player))
         self.__connect_one_way_regions(self.cathedral_top_start, self.cathedral_top_start_urns,
                                        lambda state: _has_damaging_item(state, self.player))
         self.__connect_regions(self.cathedral_top_start, self.cathedral_top_end,
@@ -708,16 +750,14 @@ class AquariaRegions:
         self.__connect_regions(self.veil_tl, self.turtle_cave)
         self.__connect_regions(self.turtle_cave, self.turtle_cave_bubble)
         self.__connect_regions(self.veil_tr_r, self.sun_temple_r)
-
         self.__connect_one_way_regions(self.sun_temple_r, self.sun_temple_l_entrance,
-                                       lambda state: _has_bind_song(state, self.player) or
+                                       lambda state: _has_sun_crystal(state, self.player) or
                                                      _has_light(state, self.player))
         self.__connect_one_way_regions(self.sun_temple_l_entrance, self.sun_temple_r,
                                        lambda state: _has_light(state, self.player))
         self.__connect_regions(self.sun_temple_l_entrance, self.veil_tr_l)
         self.__connect_regions(self.sun_temple_l, self.sun_temple_l_entrance)
-        self.__connect_one_way_regions(self.sun_temple_l, self.sun_temple_boss_path)
-        self.__connect_one_way_regions(self.sun_temple_boss_path, self.sun_temple_l)
+        self.__connect_regions(self.sun_temple_l, self.sun_temple_boss_path)
         self.__connect_regions(self.sun_temple_boss_path, self.sun_temple_boss,
                                lambda state: _has_energy_attack_item(state, self.player))
         self.__connect_one_way_regions(self.sun_temple_boss, self.veil_tr_l)
@@ -800,17 +840,31 @@ class AquariaRegions:
         self.__connect_one_way_regions(self.body_rb, self.body_c)
         self.__connect_regions(self.body_c, self.body_b,
                                lambda state: _has_dual_form(state, self.player))
-        self.__connect_regions(self.body_b, self.final_boss_loby,
+        self.__connect_regions(self.body_b, self.final_boss_lobby,
                                lambda state: _has_dual_form(state, self.player))
-        self.__connect_regions(self.final_boss_loby, self.final_boss_tube,
+        self.__connect_regions(self.final_boss_lobby, self.final_boss_tube,
                                lambda state: _has_nature_form(state, self.player))
-        self.__connect_one_way_regions(self.final_boss_loby, self.final_boss,
+        self.__connect_one_way_regions(self.final_boss_lobby, self.final_boss,
                                        lambda state: _has_energy_form(state, self.player) and
                                                      _has_dual_form(state, self.player) and
                                                      _has_sun_form(state, self.player) and
                                                      _has_bind_song(state, self.player))
         self.__connect_one_way_regions(self.final_boss, self.final_boss_end)
 
+    def __connect_four_gods_end(self, options: AquariaOptions) -> None:
+        """
+        Connect an entrance for the four gods objective ending
+        """
+        if options.mini_bosses_to_beat.value > 6:
+            victory_lambda = lambda state: (_has_four_gods_beated(state, self.player) and
+                                            _has_mini_bosses(state, self.player))
+        elif options.big_bosses_to_beat.value > 0:
+            victory_lambda = lambda state: (_has_four_gods_beated(state, self.player) and
+                                            _has_mini_bosses_four_gods(state, self.player))
+        else:
+            victory_lambda = lambda state: _has_four_gods_beated(state, self.player)
+        self.__connect_one_way_regions(self.menu, self.four_gods_end, victory_lambda)
+
     def __connect_transturtle(self, item_target: str, region_source: Region, region_target: Region) -> None:
         """Connect a single transturtle to another one"""
         if region_source != region_target:
@@ -824,10 +878,10 @@ class AquariaRegions:
         self.__connect_transturtle(ItemNames.TRANSTURTLE_OPEN_WATERS, region, self.openwater_tr_turtle)
         self.__connect_transturtle(ItemNames.TRANSTURTLE_KELP_FOREST, region, self.forest_bl)
         self.__connect_transturtle(ItemNames.TRANSTURTLE_HOME_WATERS, region, self.home_water_transturtle)
-        self.__connect_transturtle(ItemNames.TRANSTURTLE_ABYSS, region, self.abyss_r_transturtle)
-        self.__connect_transturtle(ItemNames.TRANSTURTLE_BODY, region, self.final_boss_tube)
         self.__connect_transturtle(ItemNames.TRANSTURTLE_SIMON_SAYS, region, self.simon)
         self.__connect_transturtle(ItemNames.TRANSTURTLE_ARNASSI_RUINS, region, self.arnassi_cave_transturtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_ABYSS, region, self.abyss_r_transturtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_BODY, region, self.final_boss_tube)
 
     def __connect_transturtles(self) -> None:
         """Connect every transturtle with others"""
@@ -836,12 +890,12 @@ class AquariaRegions:
         self._connect_transturtle_to_other(self.openwater_tr_turtle)
         self._connect_transturtle_to_other(self.forest_bl)
         self._connect_transturtle_to_other(self.home_water_transturtle)
-        self._connect_transturtle_to_other(self.abyss_r_transturtle)
-        self._connect_transturtle_to_other(self.final_boss_tube)
         self._connect_transturtle_to_other(self.simon)
         self._connect_transturtle_to_other(self.arnassi_cave_transturtle)
+        self._connect_transturtle_to_other(self.abyss_r_transturtle)
+        self._connect_transturtle_to_other(self.final_boss_tube)
 
-    def connect_regions(self) -> None:
+    def connect_regions(self, options: AquariaOptions) -> None:
         """
         Connect every region (entrances and exits)
         """
@@ -853,6 +907,8 @@ class AquariaRegions:
         self.__connect_abyss_regions()
         self.__connect_sunken_city_regions()
         self.__connect_body_regions()
+        if self.is_four_gods:
+            self.__connect_four_gods_end(options)
         self.__connect_transturtles()
 
     def __add_event_location(self, region: Region, name: str, event_name: str) -> None:
@@ -934,21 +990,25 @@ class AquariaRegions:
                                   AquariaLocationNames.THIRD_SECRET,
                                   ItemNames.THIRD_SECRET_OBTAINED)
 
-    def add_event_locations(self) -> None:
+    def add_event_locations(self, options: AquariaOptions) -> None:
         """
         Add every event (locations and items) to the `world`
         """
         self.__add_event_mini_bosses()
-        self.__add_event_big_bosses()
-        self.__add_event_secrets()
-        self.__add_event_location(self.sunken_city_boss,
-                                  AquariaLocationNames.SUNKEN_CITY_CLEARED,
-                                  ItemNames.BODY_TONGUE_CLEARED)
         self.__add_event_location(self.sun_temple_r,
                                   AquariaLocationNames.SUN_CRYSTAL,
                                   ItemNames.HAS_SUN_CRYSTAL)
-        self.__add_event_location(self.final_boss_end, AquariaLocationNames.OBJECTIVE_COMPLETE,
-                                  ItemNames.VICTORY)
+        self.__add_event_big_bosses()
+        self.__add_event_location(self.sunken_city_boss,
+                                  AquariaLocationNames.SUNKEN_CITY_CLEARED,
+                                  ItemNames.BODY_TONGUE_CLEARED)
+        if self.is_four_gods:
+            self.__add_event_location(self.four_gods_end, AquariaLocationNames.OBJECTIVE_COMPLETE,
+                                      ItemNames.VICTORY)
+        else:
+            self.__add_event_secrets()
+            self.__add_event_location(self.final_boss_end, AquariaLocationNames.OBJECTIVE_COMPLETE,
+                                      ItemNames.VICTORY)
 
     def __adjusting_soup_rules(self) -> None:
         """
@@ -958,16 +1018,16 @@ class AquariaRegions:
                  lambda state: _has_hot_soup(state, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB, self.player),
                  lambda state: _has_beast_and_soup_form(state, self.player) or
-                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player), combine="or")
+                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB, self.player),
                  lambda state: _has_beast_and_soup_form(state, self.player) or
-                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player), combine="or")
+                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player))
         add_rule(
             self.multiworld.get_location(AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
                                          self.player),
             lambda state: _has_beast_and_soup_form(state, self.player))
 
-    def __adjusting_under_rock_location(self) -> None:
+    def __adjusting_under_rock_location(self, options: AquariaOptions) -> None:
         """
         Modify rules implying bind song needed for bulb under rocks
         """
@@ -999,21 +1059,29 @@ class AquariaRegions:
         add_rule(self.multiworld.get_location(
             AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
             self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(
-            self.multiworld.get_location(AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
-                                         self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH,
-                                              self.player), lambda state: _has_bind_song(state, self.player))
         add_rule(self.multiworld.get_location(
             AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
             self.player), lambda state: _has_bind_song(state, self.player))
+        if not self.is_four_gods:
+            add_rule(self.multiworld.get_location(
+                    AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+                    self.player), lambda state: _has_bind_song(state, self.player))
+            add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH,
+                                                  self.player), lambda state: _has_bind_song(state, self.player))
 
-    def __adjusting_light_in_dark_place_rules(self) -> None:
+    def __adjusting_light_in_dark_place_rules(self, light_option: LightNeededToGetToDarkPlaces) -> None:
+        """
+        Modify rules implying that the player needs a light to go in dark places
+        """
+        if light_option == LightNeededToGetToDarkPlaces.option_sun_form:
+            light_lambda = _has_sun_form
+        else:
+            light_lambda = _has_light
         add_rule(self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL, self.player),
-                 lambda state: _has_light(state, self.player))
+                 lambda state: light_lambda(state, self.player))
         add_rule(
             self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER, self.player),
-            lambda state: _has_light(state, self.player))
+            lambda state: light_lambda(state, self.player))
         add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.sun_temple_l_entrance, self.sun_temple_l),
                                               self.player), lambda state: _has_light(state, self.player) or
                                                                           _has_sun_crystal(state, self.player))
@@ -1022,15 +1090,15 @@ class AquariaRegions:
                                                                           _has_sun_crystal(state, self.player))
         add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.abyss_r_transturtle, self.abyss_r),
                                               self.player),
-                 lambda state: _has_light(state, self.player))
+                 lambda state: light_lambda(state, self.player))
         add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.body_c, self.abyss_lb), self.player),
-                 lambda state: _has_light(state, self.player))
+                 lambda state: light_lambda(state, self.player))
         add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.openwater_br, self.abyss_r), self.player),
-                 lambda state: _has_light(state, self.player))
+                 lambda state: light_lambda(state, self.player))
         add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.openwater_bl, self.abyss_l), self.player),
-                 lambda state: _has_light(state, self.player))
+                 lambda state: light_lambda(state, self.player))
 
-    def __adjusting_manual_rules(self) -> None:
+    def __adjusting_manual_rules(self, options: AquariaOptions) -> None:
         add_rule(self.multiworld.get_location(AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS, self.player),
                  lambda state: _has_beast_form(state, self.player))
         add_rule(self.multiworld.get_location(
@@ -1045,9 +1113,6 @@ class AquariaRegions:
             lambda state: _has_bind_song(state, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG, self.player),
                  lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
-                                              self.player),
-                 lambda state: _has_fish_form(state, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.SONG_CAVE_ANEMONE_SEED, self.player),
                  lambda state: _has_nature_form(state, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.SONG_CAVE_VERSE_EGG, self.player),
@@ -1076,19 +1141,21 @@ class AquariaRegions:
         ), lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
         add_rule(self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG, self.player),
                  lambda state: _has_beast_form(state, self.player))
-        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB, self.player),
-                 lambda state: state.has("Sun God beated", self.player))
-        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB, self.player),
-                 lambda state: state.has("Sun God beated", self.player))
-        add_rule(
-            self.multiworld.get_location(AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE, self.player),
-            lambda state: _has_tongue_cleared(state, self.player))
         add_rule(self.multiworld.get_location(
             AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS,
             self.player), lambda state: _has_bind_song(state, self.player)
         )
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SITTING_ON_THRONE, self.player),
+                 lambda state: _has_bind_song(state, self.player))
+        if not self.is_four_gods:
+            add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
+                                                  self.player),
+                     lambda state: _has_fish_form(state, self.player))
+            add_rule(
+                self.multiworld.get_location(AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE, self.player),
+                lambda state: _has_tongue_cleared(state, self.player))
 
-    def __no_progression_hard_or_hidden_location(self) -> None:
+    def __no_progression_hard_or_hidden_location(self, options: AquariaOptions) -> None:
         self.multiworld.get_location(AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
@@ -1097,8 +1164,6 @@ class AquariaRegions:
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
                                      self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
-                                     self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
@@ -1109,25 +1174,12 @@ class AquariaRegions:
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
                                      self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
-                                     self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
-                                     self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
-                                     self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
                                      self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
-                                     self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(
-            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
-            self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
-                                     self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(
             AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
             self.player).item_rule = _item_not_advancement
@@ -1135,33 +1187,183 @@ class AquariaRegions:
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
                                      self.player).item_rule = _item_not_advancement
-        self.multiworld.get_location(AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
-                                     self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
                                      self.player).item_rule = _item_not_advancement
         self.multiworld.get_location(AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
                                      self.player).item_rule = _item_not_advancement
+        if not self.is_four_gods:
+            self.multiworld.get_location(AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+                                         self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+                                         self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+                                         self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(
+                AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+                self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+                                         self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+                                         self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(
+                AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+                self.player).item_rule = _item_not_advancement
+            self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+                                         self.player).item_rule = _item_not_advancement
+
+    def __no_progression_area(self, area: dict) -> None:
+        """Be sure to not put any progression items in location of an `area`"""
+        for location in area:
+            self.multiworld.get_location(location, self.player).item_rule = _item_not_advancement
+
+    def __no_progression_kelp_forest(self) -> None:
+        """Be sure to not put any progression items in Kelp forest"""
+        self.__no_progression_area(AquariaLocations.locations_forest_tl)
+        self.__no_progression_area(AquariaLocations.locations_forest_tl_verse_egg_room)
+        self.__no_progression_area(AquariaLocations.locations_forest_tr)
+        self.__no_progression_area(AquariaLocations.locations_forest_tr_fp)
+        self.__no_progression_area(AquariaLocations.locations_forest_bl)
+        self.__no_progression_area(AquariaLocations.locations_forest_bl_sc)
+        self.__no_progression_area(AquariaLocations.locations_forest_br)
+        self.__no_progression_area(AquariaLocations.locations_forest_boss)
+        self.__no_progression_area(AquariaLocations.locations_forest_boss_entrance)
+        self.__no_progression_area(AquariaLocations.locations_forest_fish_cave)
+        self.__no_progression_area(AquariaLocations.locations_sprite_cave)
+        self.__no_progression_area(AquariaLocations.locations_sprite_cave_tube)
+        self.__no_progression_area(AquariaLocations.locations_mermog_cave)
+        self.__no_progression_area(AquariaLocations.locations_mermog_boss)
+
+    def __no_progression_veil(self) -> None:
+        """Be sure to not put any progression items in The Veil"""
+        self.__no_progression_area(AquariaLocations.locations_veil_tl)
+        self.__no_progression_area(AquariaLocations.locations_veil_tl_fp)
+        self.__no_progression_area(AquariaLocations.locations_turtle_cave)
+        self.__no_progression_area(AquariaLocations.locations_turtle_cave_bubble)
+        self.__no_progression_area(AquariaLocations.locations_veil_tr_r)
+        self.__no_progression_area(AquariaLocations.locations_veil_tr_l)
+        self.__no_progression_area(AquariaLocations.locations_veil_b)
+        self.__no_progression_area(AquariaLocations.locations_veil_b_sc)
+        self.__no_progression_area(AquariaLocations.locations_veil_b_fp)
+        self.__no_progression_area(AquariaLocations.locations_veil_br)
+        self.__no_progression_area(AquariaLocations.locations_octo_cave_t)
+        self.__no_progression_area(AquariaLocations.locations_octo_cave_b)
+        self.__no_progression_area(AquariaLocations.locations_sun_temple_l)
+        self.__no_progression_area(AquariaLocations.locations_sun_temple_r)
+        self.__no_progression_area(AquariaLocations.locations_sun_temple_boss_path)
+        self.__no_progression_area(AquariaLocations.locations_sun_temple_boss)
+
+    def __no_progression_mithalas(self) -> None:
+        """Be sure to not put any progression items in Mithalas"""
+        self.__no_progression_area(AquariaLocations.locations_mithalas_city)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_city_urns)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_city_top_path)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_city_fishpass)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_castle)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_castle_urns)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_castle_tube)
+        self.__no_progression_area(AquariaLocations.locations_mithalas_castle_sc)
+        self.__no_progression_area(AquariaLocations.locations_cathedral_top_start)
+        self.__no_progression_area(AquariaLocations.locations_cathedral_top_start_urns)
+        self.__no_progression_area(AquariaLocations.locations_cathedral_top_end)
+        self.__no_progression_area(AquariaLocations.locations_cathedral_underground)
+        self.__no_progression_area(AquariaLocations.locations_cathedral_boss)
+
+    def __no_progression_energy_temple(self) -> None:
+        """Be sure to not put any progression items in the Energy Temple"""
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_1)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_idol)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_2)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_altar)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_3)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_boss)
+        self.__no_progression_area(AquariaLocations.locations_energy_temple_blaster_room)
+
+    def __no_progression_arnassi_ruins(self, options: AquariaOptions) -> None:
+        """Be sure to not put any progression items in the Arnassi ruins"""
+        self.__no_progression_area(AquariaLocations.locations_arnassi)
+        self.__no_progression_area(AquariaLocations.locations_arnassi_cave)
+        self.__no_progression_area(AquariaLocations.locations_arnassi_cave_transturtle)
+        self.__no_progression_area(AquariaLocations.locations_arnassi_crab_boss)
+        if options.turtle_randomizer == 0:
+            self.__no_progression_area(AquariaLocations.locations_simon)
+
+    def __no_progression_frozen_veil(self) -> None:
+        """Be sure to not put any progression items in the Frozen Veil"""
+        self.__no_progression_area(AquariaLocations.locations_ice_cave)
+        self.__no_progression_area(AquariaLocations.locations_bubble_cave)
+        self.__no_progression_area(AquariaLocations.locations_bubble_cave_boss)
+
+    def __no_progression_abyss(self) -> None:
+        """Be sure to not put any progression items in the Abyss"""
+        self.__no_progression_area(AquariaLocations.locations_abyss_l)
+        self.__no_progression_area(AquariaLocations.locations_abyss_lb)
+        self.__no_progression_area(AquariaLocations.locations_abyss_r)
+        self.__no_progression_area(AquariaLocations.locations_abyss_r_whale)
+        self.__no_progression_area(AquariaLocations.locations_abyss_r_transturtle)
+        self.__no_progression_area(AquariaLocations.locations_king_jellyfish_cave)
+
+    def __no_progression_sunken_city(self) -> None:
+        """Be sure to not put any progression items in the Sunken City"""
+        self.__no_progression_area(AquariaLocations.locations_sunken_city_r)
+        self.__no_progression_area(AquariaLocations.locations_sunken_city_l)
+        self.__no_progression_area(AquariaLocations.locations_sunken_city_l_bedroom)
+        self.__no_progression_area(AquariaLocations.locations_sunken_city_boss)
+
+    def __no_progression_body(self) -> None:
+        """Be sure to not put any progression items in the Body"""
+        self.__no_progression_area(AquariaLocations.locations_body_c)
+        self.__no_progression_area(AquariaLocations.locations_body_l)
+        self.__no_progression_area(AquariaLocations.locations_body_rt)
+        self.__no_progression_area(AquariaLocations.locations_body_rb)
+        self.__no_progression_area(AquariaLocations.locations_body_b)
+        self.__no_progression_area(AquariaLocations.locations_final_boss_tube)
+        self.__no_progression_area(AquariaLocations.locations_final_boss)
+
+    def __no_progression_areas(self, options: AquariaOptions) -> None:
+        """Manage options that remove progression items from areas around the Aquaria world"""
+        if options.no_progression_simon_says:
+            self.__no_progression_area(AquariaLocations.locations_simon)
+        if options.no_progression_kelp_forest:
+            self.__no_progression_kelp_forest()
+        if options.no_progression_veil:
+            self.__no_progression_veil()
+        if options.no_progression_mithalas:
+            self.__no_progression_mithalas()
+        if options.no_progression_energy_temple:
+            self.__no_progression_energy_temple()
+        if options.no_progression_arnassi_ruins:
+            self.__no_progression_arnassi_ruins(options)
+        if not self.is_four_gods:
+            if options.no_progression_frozen_veil:
+                self.__no_progression_frozen_veil()
+            if options.no_progression_abyss:
+                self.__no_progression_abyss()
+            if options.no_progression_sunken_city:
+                self.__no_progression_sunken_city()
+            if options.no_progression_body:
+                self.__no_progression_body()
 
     def adjusting_rules(self, options: AquariaOptions) -> None:
         """
         Modify rules for single location or optional rules
         """
-        self.__adjusting_manual_rules()
+        self.__adjusting_manual_rules(options)
         self.__adjusting_soup_rules()
-        if options.light_needed_to_get_to_dark_places:
-            self.__adjusting_light_in_dark_place_rules()
+        self.__no_progression_areas(options)
+        if options.light_needed_to_get_to_dark_places != LightNeededToGetToDarkPlaces.option_off:
+            self.__adjusting_light_in_dark_place_rules(options.light_needed_to_get_to_dark_places)
         if options.bind_song_needed_to_get_under_rock_bulb:
-            self.__adjusting_under_rock_location()
-
-        if options.mini_bosses_to_beat.value > 0:
-            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
-                                                  self.player), lambda state: _has_mini_bosses(state, self.player))
-        if options.big_bosses_to_beat.value > 0:
-            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
-                                                  self.player), lambda state: _has_big_bosses(state, self.player))
-        if options.objective.value == options.objective.option_obtain_secrets_and_kill_the_creator:
-            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
-                                                  self.player), lambda state: _has_secrets(state, self.player))
+            self.__adjusting_under_rock_location(options)
+        if not self.is_four_gods:
+            if options.mini_bosses_to_beat.value > 0:
+                add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_lobby, self.final_boss),
+                                                      self.player), lambda state: _has_mini_bosses(state, self.player))
+            if options.big_bosses_to_beat.value > 0:
+                add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_lobby, self.final_boss),
+                                                      self.player), lambda state: _has_big_bosses(state, self.player))
+            if options.objective.value == options.objective.option_obtain_secrets_and_kill_the_creator:
+                add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_lobby, self.final_boss),
+                                                      self.player), lambda state: _has_secrets(state, self.player))
         if (options.unconfine_home_water.value == UnconfineHomeWater.option_via_energy_door or
                 options.unconfine_home_water.value == UnconfineHomeWater.option_off):
             add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.home_water, self.home_water_transturtle),
@@ -1173,7 +1375,7 @@ class AquariaRegions:
                      lambda state: _has_bind_song(state, self.player) and
                                    _has_energy_attack_item(state, self.player))
         if options.no_progression_hard_or_hidden_locations:
-            self.__no_progression_hard_or_hidden_location()
+            self.__no_progression_hard_or_hidden_location(options)
 
     def __add_home_water_regions_to_world(self) -> None:
         """
@@ -1298,12 +1500,12 @@ class AquariaRegions:
         self.multiworld.regions.append(self.body_rt)
         self.multiworld.regions.append(self.body_rb)
         self.multiworld.regions.append(self.body_b)
-        self.multiworld.regions.append(self.final_boss_loby)
+        self.multiworld.regions.append(self.final_boss_lobby)
         self.multiworld.regions.append(self.final_boss_tube)
         self.multiworld.regions.append(self.final_boss)
         self.multiworld.regions.append(self.final_boss_end)
 
-    def add_regions_to_world(self) -> None:
+    def add_regions_to_world(self, options: AquariaOptions) -> None:
         """
         Add every region to the `world`
         """
@@ -1314,13 +1516,17 @@ class AquariaRegions:
         self.__add_veil_regions_to_world()
         self.__add_abyss_regions_to_world()
         self.__add_body_regions_to_world()
+        if self.is_four_gods:
+            self.multiworld.regions.append(self.four_gods_end)
 
-    def __init__(self, multiworld: MultiWorld, player: int):
+    def __init__(self, multiworld: MultiWorld, player: int, options: AquariaOptions):
         """
         Initialisation of the regions
         """
         self.multiworld = multiworld
         self.player = player
+        self.is_four_gods = (options.objective.value == Objective.option_killing_the_four_gods or
+            options.objective.value == Objective.option_gods_and_creator)
         self.__create_home_water_area()
         self.__create_energy_temple()
         self.__create_openwater()
@@ -1328,6 +1534,8 @@ class AquariaRegions:
         self.__create_forest()
         self.__create_veil()
         self.__create_sun_temple()
-        self.__create_abyss()
-        self.__create_sunken_city()
-        self.__create_body()
+        self.__create_abyss(not self.is_four_gods)
+        self.__create_sunken_city(not self.is_four_gods)
+        self.__create_body(not self.is_four_gods)
+        if self.is_four_gods:
+            self.four_gods_end = self.__add_region("Four gods ending", None)
diff --git a/worlds/aquaria/__init__.py b/worlds/aquaria/__init__.py
index 084d31444f..2997f21d04 100644
--- a/worlds/aquaria/__init__.py
+++ b/worlds/aquaria/__init__.py
@@ -7,12 +7,14 @@ Description: Main module for Aquaria game multiworld randomizer
 from typing import List, Dict, ClassVar, Any
 from worlds.AutoWorld import World, WebWorld
 from BaseClasses import Tutorial, MultiWorld, ItemClassification
-from .Items import item_table, AquariaItem, ItemType, ItemGroup, ItemNames
+from .Items import item_table, AquariaItem, ItemType, ItemGroup, ItemNames, four_gods_excludes
 from .Locations import location_table, AquariaLocationNames
 from .Options import (AquariaOptions, IngredientRandomizer, TurtleRandomizer, EarlyBindSong, EarlyEnergyForm,
                       UnconfineHomeWater, Objective)
 from .Regions import AquariaRegions
 
+CLIENT_MINIMAL_COMPATIBILITY = [1, 4, 1]
+
 
 class AquariaWeb(WebWorld):
     """
@@ -98,6 +100,7 @@ class AquariaWorld(World):
     "Used to manage Regions"
 
     exclude: List[str]
+    "The items that should not be added to the multiworld item pool"
 
     def __init__(self, multiworld: MultiWorld, player: int):
         """Initialisation of the Aquaria World"""
@@ -111,15 +114,15 @@ class AquariaWorld(World):
         Run before any general steps of the MultiWorld other than options. Useful for getting and adjusting option
         results and determining layouts for entrance rando etc. start inventory gets pushed after this step.
         """
-        self.regions = AquariaRegions(self.multiworld, self.player)
+        self.regions = AquariaRegions(self.multiworld, self.player, self.options)
 
     def create_regions(self) -> None:
         """
         Create every Region in `regions`
         """
-        self.regions.add_regions_to_world()
-        self.regions.connect_regions()
-        self.regions.add_event_locations()
+        self.regions.add_regions_to_world(self.options)
+        self.regions.connect_regions(self.options)
+        self.regions.add_event_locations(self.options)
 
     def create_item(self, name: str) -> AquariaItem:
         """
@@ -157,8 +160,17 @@ class AquariaWorld(World):
     def create_items(self) -> None:
         """Create every item in the world"""
         precollected = [item.name for item in self.multiworld.precollected_items[self.player]]
+        if (self.options.objective.value == Objective.option_killing_the_four_gods or
+                self.options.objective.value == Objective.option_gods_and_creator):
+            self.exclude.extend(four_gods_excludes)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_ABYSS, AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE,
+                                 precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
+                                 precollected)
         if self.options.turtle_randomizer.value != TurtleRandomizer.option_none:
-            if self.options.turtle_randomizer.value == TurtleRandomizer.option_all_except_final:
+            if (self.options.turtle_randomizer.value == TurtleRandomizer.option_all_except_final and
+                    self.options.objective.value != Objective.option_killing_the_four_gods and
+                    self.options.objective.value != Objective.option_gods_and_creator):
                 self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
                                      precollected)
         else:
@@ -167,25 +179,29 @@ class AquariaWorld(World):
             self.__pre_fill_item(ItemNames.TRANSTURTLE_VEIL_TOP_RIGHT,
                                  AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE, precollected)
             self.__pre_fill_item(ItemNames.TRANSTURTLE_OPEN_WATERS,
-                                 AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE,
-                                 precollected)
+                                 AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE, precollected)
             self.__pre_fill_item(ItemNames.TRANSTURTLE_KELP_FOREST,
-                                 AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
-                                 precollected)
-            self.__pre_fill_item(ItemNames.TRANSTURTLE_HOME_WATERS, AquariaLocationNames.HOME_WATERS_TRANSTURTLE,
-                                 precollected)
-            self.__pre_fill_item(ItemNames.TRANSTURTLE_ABYSS, AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE,
-                                 precollected)
-            self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
-                                 precollected)
+                                 AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE, precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_HOME_WATERS, AquariaLocationNames.HOME_WATERS_TRANSTURTLE, precollected)
+            if (self.options.objective.value != Objective.option_killing_the_four_gods and
+                    self.options.objective.value != Objective.option_gods_and_creator):
+                self.__pre_fill_item(ItemNames.TRANSTURTLE_ABYSS, AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE,
+                                     precollected)
+                self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
+                                     precollected)
             # The last two are inverted because in the original game, they are special turtle that communicate directly
             self.__pre_fill_item(ItemNames.TRANSTURTLE_SIMON_SAYS, AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
                                  precollected, ItemClassification.progression)
             self.__pre_fill_item(ItemNames.TRANSTURTLE_ARNASSI_RUINS, AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
                                  precollected)
+        if not self.options.throne_as_location:
+            self.__pre_fill_item(ItemNames.DOOR_TO_CATHEDRAL, AquariaLocationNames.SITTING_ON_THRONE,
+                                 precollected, ItemClassification.progression)
         for name, data in item_table.items():
-            if name not in self.exclude:
-                for i in range(data.count):
+            for i in range(data.count):
+                if name in self.exclude:
+                    self.exclude.remove(name)
+                else:
                     item = self.create_item(name)
                     self.multiworld.itempool.append(item)
 
@@ -227,22 +243,41 @@ class AquariaWorld(World):
         self.ingredients_substitution.extend(dishes_substitution)
 
     def fill_slot_data(self) -> Dict[str, Any]:
+        """
+        Send some useful information to the client.
+        """
         return {"ingredientReplacement": self.ingredients_substitution,
                 "aquarian_translate": bool(self.options.aquarian_translation.value),
                 "blind_goal": bool(self.options.blind_goal.value),
-                "secret_needed":
-                    self.options.objective.value == Objective.option_obtain_secrets_and_kill_the_creator,
+                "goal": self.options.objective.value,
                 "minibosses_to_kill": self.options.mini_bosses_to_beat.value,
                 "bigbosses_to_kill": self.options.big_bosses_to_beat.value,
                 "skip_first_vision": bool(self.options.skip_first_vision.value),
+                "skip_final_boss_3rd_form": bool(self.options.skip_final_boss_3rd_form.value),
+                "infinite_hot_soup": bool(self.options.infinite_hot_soup.value),
+                "open_body_tongue": bool(self.options.open_body_tongue.value),
                 "unconfine_home_water_energy_door":
                     self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_energy_door
                     or self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_both,
                 "unconfine_home_water_transturtle":
                     self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_transturtle
                     or self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_both,
+                "maximum_ingredient_amount": self.options.maximum_ingredient_amount.value,
                 "bind_song_needed_to_get_under_rock_bulb": bool(self.options.bind_song_needed_to_get_under_rock_bulb),
                 "no_progression_hard_or_hidden_locations": bool(self.options.no_progression_hard_or_hidden_locations),
                 "light_needed_to_get_to_dark_places": bool(self.options.light_needed_to_get_to_dark_places),
-                "turtle_randomizer": self.options.turtle_randomizer.value
+                "turtle_randomizer": self.options.turtle_randomizer.value,
+                "no_progression_simon_says": bool(self.options.no_progression_simon_says),
+                "no_progression_kelp_forest": bool(self.options.no_progression_kelp_forest),
+                "no_progression_veil": bool(self.options.no_progression_veil),
+                "no_progression_mithalas": bool(self.options.no_progression_mithalas),
+                "no_progression_energy_temple": bool(self.options.no_progression_energy_temple),
+                "no_progression_arnassi_ruins": bool(self.options.no_progression_arnassi_ruins),
+                "no_progression_frozen_veil": bool(self.options.no_progression_frozen_veil),
+                "no_progression_abyss": bool(self.options.no_progression_abyss),
+                "no_progression_sunken_city": bool(self.options.no_progression_sunken_city),
+                "no_progression_body": bool(self.options.no_progression_body),
+                "save_healing": bool(self.options.save_healing),
+                "throne_as_location": bool(self.options.throne_as_location),
+                "required_client_version": CLIENT_MINIMAL_COMPATIBILITY,
                 }
diff --git a/worlds/aquaria/test/test_access_four_gods.py b/worlds/aquaria/test/test_access_four_gods.py
new file mode 100644
index 0000000000..7bcf47ef22
--- /dev/null
+++ b/worlds/aquaria/test/test_access_four_gods.py
@@ -0,0 +1,185 @@
+"""
+Author: Louis M
+Date: Thu, 18 Apr 2024 18:45:56 +0000
+Description: Unit test used to test accessibility of locations with the goal four gods
+"""
+
+from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import UnconfineHomeWater, Objective, BindSongNeededToGetUnderRockBulb
+
+
+class FourGodsAccessTest(AquariaTestBase):
+    """Unit test used to test accessibility of locations with the goal four gods"""
+    options = {
+        "objective": Objective.option_killing_the_four_gods,
+        "bind_song_needed_to_get_under_rock_bulb": BindSongNeededToGetUnderRockBulb.option_true
+    }
+
+
+    def test_locations(self) -> None:
+        """Test locations with the goal four gods"""
+        locations = [
+            AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BIG_SEED,
+            AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_UNDER_THE_ROCK_AT_THE_END_OF_THE_PATH,
+            AquariaLocationNames.HOME_WATERS_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH_FROM_THE_VERSE_CAVE,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_PATH_BELOW_NAUTILUS_PRIME,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_BOTTOM_LEFT_ROOM,
+            AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+            AquariaLocationNames.HOME_WATERS_TRANSTURTLE,
+            AquariaLocationNames.NAIJA_S_HOME_BULB_AFTER_THE_ENERGY_DOOR,
+            AquariaLocationNames.NAIJA_S_HOME_BULB_UNDER_THE_ROCK_AT_THE_RIGHT_OF_THE_MAIN_PATH,
+            AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_IN_THE_PATH_TO_THE_SINGING_STATUES,
+            AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_CLOSE_TO_THE_SONG_DOOR,
+            AquariaLocationNames.SONG_CAVE_VERSE_EGG,
+            AquariaLocationNames.SONG_CAVE_ANEMONE_SEED,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+            AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+            AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+            AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+            AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+            AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+            AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH,
+            AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_TO_THE_RIGHT_OF_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_PATH_FROM_THE_LEFT_ENTRANCE,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_CLEARING_CLOSE_TO_THE_BOTTOM_EXIT,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_TO_THE_TOP_EXIT,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_TURTLE_ROOM,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_FIRST_URN_IN_THE_MITHALAS_EXIT,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_SECOND_URN_IN_THE_MITHALAS_EXIT,
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_THIRD_URN_IN_THE_MITHALAS_EXIT,
+            AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_BEHIND_THE_CHOMPER_FISH,
+            AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS,
+            AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_CLOSE_TO_THE_RIGHT_EXIT,
+            AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_BEHIND_THE_CHOMPER_FISH,
+            AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_KING_SKULL,
+            AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART,
+            AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_LEFT_PART,
+            AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_CENTER_PART,
+            AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE,
+            AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
+            AquariaLocationNames.ARNASSI_RUINS_ARNASSI_STATUE,
+            AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
+            AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR,
+            AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS,
+            AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_THE_LEFT_CITY_PART,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_THE_LEFT_CITY_PART,
+            AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_RIGHT_PART,
+            AquariaLocationNames.MITHALAS_CITY_BULB_AT_THE_TOP_OF_THE_CITY,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_A_BROKEN_HOME,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_A_BROKEN_HOME,
+            AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_BOTTOM_LEFT_PART,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_ONE_OF_THE_HOMES,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_ONE_OF_THE_HOMES,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_ONE_OF_THE_HOMES,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_ONE_OF_THE_HOMES,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_THE_CITY_RESERVE,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_THE_CITY_RESERVE,
+            AquariaLocationNames.MITHALAS_CITY_THIRD_URN_IN_THE_CITY_RESERVE,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_MITHALAS_POT,
+            AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE,
+            AquariaLocationNames.MITHALAS_CITY_DOLL,
+            AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BLUE_BANNER,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BEDROOM,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_OF_THE_SINGLE_LAMP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_OF_THE_SINGLE_LAMP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BOTTOM_ROOM,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_ON_THE_ENTRANCE_PATH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_ON_THE_ENTRANCE_PATH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_TRIDENT_HEAD,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_BULB_IN_THE_FLESH_ROOM_WITH_FLEAS,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_TOP_RIGHT_ROOM,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_TOP_RIGHT_ROOM,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_TOP_RIGHT_ROOM,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BEHIND_THE_FLESH_VEIN,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_URN_IN_THE_TOP_LEFT_EYES_BOSS_ROOM,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_FOURTH_URN_IN_THE_TOP_RIGHT_ROOM,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BELOW_THE_LEFT_ENTRANCE,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_BOTTOM_RIGHT_PATH,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_BOTTOM_RIGHT_PATH,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_CENTER_PART,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_FIRST_BULB_IN_THE_TOP_LEFT_PART,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_SECOND_BULB_IN_THE_TOP_LEFT_PART,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_THIRD_BULB_IN_THE_TOP_LEFT_PART,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_BOTTOM_RIGHT_PATH,
+            AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER,
+            AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+            AquariaLocationNames.KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA,
+            AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS,
+            AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM,
+            AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG,
+            AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE,
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE,
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK,
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE,
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS,
+            AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG,
+            AquariaLocationNames.TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF,
+            AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE,
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH,
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH,
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG,
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_STONE_HEAD,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH,
+            AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART,
+            AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART,
+            AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM,
+            AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR,
+            AquariaLocationNames.SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE,
+            AquariaLocationNames.SUN_TEMPLE_BULB_ON_THE_RIGHT_PART,
+            AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+            AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+        ]
+        items = [[ItemNames.ENERGY_FORM, ItemNames.SUN_FORM, ItemNames.BEAST_FORM, ItemNames.SPIRIT_FORM,
+                  ItemNames.FISH_FORM, ItemNames.HOT_SOUP, ItemNames.BIND_SONG, ItemNames.NATURE_FORM,
+                  ItemNames.DUAL_FORM]]
+        self.assertAccessDependency(locations, items, True)
diff --git a/worlds/aquaria/test/test_beast_or_soup_access.py b/worlds/aquaria/test/test_beast_or_soup_access.py
new file mode 100644
index 0000000000..c7053bc071
--- /dev/null
+++ b/worlds/aquaria/test/test_beast_or_soup_access.py
@@ -0,0 +1,35 @@
+"""
+Author: Louis M
+Date: Thu, 18 Apr 2024 18:45:56 +0000
+Description: Unit test used to test accessibility of locations with and without the beast form or hot soup
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+from ..Items import ItemNames
+
+
+class BeastOrSoupAccessTest(AquariaTestBase):
+    """Unit test used to test accessibility of locations with and without the beast form or hot soup"""
+
+    def test_beast_or_soup_location(self) -> None:
+        """Test locations that require beast form or hot soup"""
+        locations = [
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+            AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+            AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+            AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.BEATING_MERGOG,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED
+        ]
+        items = [[ItemNames.BEAST_FORM, ItemNames.HOT_SOUP, ItemNames.HOT_SOUP_X_2]]
+        self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_bind_song_access.py b/worlds/aquaria/test/test_bind_song_access.py
index 689f487c64..7a2aa785c0 100644
--- a/worlds/aquaria/test/test_bind_song_access.py
+++ b/worlds/aquaria/test/test_bind_song_access.py
@@ -35,6 +35,7 @@ class BindSongAccessTest(AquariaTestBase):
             AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
             AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
             AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+            AquariaLocationNames.SITTING_ON_THRONE,
             *after_home_water_locations
         ]
         items = [[ItemNames.BIND_SONG]]
diff --git a/worlds/aquaria/test/test_bind_song_option_access.py b/worlds/aquaria/test/test_bind_song_option_access.py
index 74dfa2ed70..ee477c88be 100644
--- a/worlds/aquaria/test/test_bind_song_option_access.py
+++ b/worlds/aquaria/test/test_bind_song_option_access.py
@@ -38,6 +38,7 @@ class BindSongOptionAccessTest(AquariaTestBase):
             AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
             AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
             AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+            AquariaLocationNames.SITTING_ON_THRONE,
             *after_home_water_locations
         ]
         items = [[ItemNames.BIND_SONG]]
diff --git a/worlds/aquaria/test/test_no_progression_arnassi_ruins.py b/worlds/aquaria/test/test_no_progression_arnassi_ruins.py
new file mode 100644
index 0000000000..3780596d53
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_arnassi_ruins.py
@@ -0,0 +1,44 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Arnassi Ruins when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionArnassiRuinsTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Arnassi Ruins when option enabled"""
+    options = {
+        "no_progression_arnassi_ruins": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_LEFT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_CENTER_PART,
+        AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_STATUE,
+        AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
+        AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR,
+    ]
+
+    def test_no_progression_arnassi_ruins(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Arnassi Ruins when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_energy_temple.py b/worlds/aquaria/test/test_no_progression_energy_temple.py
new file mode 100644
index 0000000000..c287cc5811
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_energy_temple.py
@@ -0,0 +1,44 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Energy Temple when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionEnergyTempleTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Energy Temple when option enabled"""
+    options = {
+        "no_progression_energy_temple": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE,
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+        AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+        AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+        AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+        AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+        AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+        AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+    ]
+
+    def test_no_progression_energy_temple(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Energy Temple when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_frozen_veil.py b/worlds/aquaria/test/test_no_progression_frozen_veil.py
new file mode 100644
index 0000000000..5d2806f4b4
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_frozen_veil.py
@@ -0,0 +1,44 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Frozen Veil when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionFrozenVeilTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Frozen Veil when option enabled"""
+    options = {
+        "no_progression_frozen_veil": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT,
+        AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+        AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+    ]
+
+    def test_no_progression_frozen_veil(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Frozen Veil when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
index 65139088f2..ce45810203 100644
--- a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
+++ b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
@@ -9,7 +9,7 @@ from BaseClasses import ItemClassification
 from ..Locations import AquariaLocationNames
 
 
-class UNoProgressionHardHiddenTest(AquariaTestBase):
+class NoProgressionHardHiddenTest(AquariaTestBase):
     """Unit test used to test that no progression items can be put in hard or hidden locations when option enabled"""
     options = {
         "no_progression_hard_or_hidden_locations": True
@@ -43,7 +43,7 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
         AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
     ]
 
-    def test_unconfine_home_water_both_location_fillable(self) -> None:
+    def test_no_progression_hard_or_hidden(self) -> None:
         """
             Unit test used to test that no progression items can be put in hard or hidden locations when option enabled
         """
diff --git a/worlds/aquaria/test/test_no_progression_kelp_forest.py b/worlds/aquaria/test/test_no_progression_kelp_forest.py
new file mode 100644
index 0000000000..58df12147e
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_kelp_forest.py
@@ -0,0 +1,61 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Kelp Forest when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionKelpForestTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Kelp Forest when option enabled"""
+    options = {
+        "no_progression_kelp_forest": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER,
+        AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+        AquariaLocationNames.KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG,
+        AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE,
+        AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+    ]
+
+    def test_no_progression_kelp_forest(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Kelp Forest when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_mithalas.py b/worlds/aquaria/test/test_no_progression_mithalas.py
new file mode 100644
index 0000000000..270e3f4082
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_mithalas.py
@@ -0,0 +1,88 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Mithalas when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionMithalasTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Mithalas when option enabled"""
+    options = {
+        "no_progression_mithalas": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_THE_LEFT_CITY_PART,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_THE_LEFT_CITY_PART,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_RIGHT_PART,
+        AquariaLocationNames.MITHALAS_CITY_BULB_AT_THE_TOP_OF_THE_CITY,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_A_BROKEN_HOME,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_A_BROKEN_HOME,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_BOTTOM_LEFT_PART,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_ONE_OF_THE_HOMES,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_ONE_OF_THE_HOMES,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_ONE_OF_THE_HOMES,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_ONE_OF_THE_HOMES,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_THE_CITY_RESERVE,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_THE_CITY_RESERVE,
+        AquariaLocationNames.MITHALAS_CITY_THIRD_URN_IN_THE_CITY_RESERVE,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_TOP_PATH,
+        AquariaLocationNames.MITHALAS_CITY_MITHALAS_POT,
+        AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE,
+        AquariaLocationNames.MITHALAS_CITY_DOLL,
+        AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BLUE_BANNER,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BEDROOM,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_OF_THE_SINGLE_LAMP_PATH,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_OF_THE_SINGLE_LAMP_PATH,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BOTTOM_ROOM,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_ON_THE_ENTRANCE_PATH,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_ON_THE_ENTRANCE_PATH,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_TRIDENT_HEAD,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_TOP_RIGHT_ROOM,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_TOP_RIGHT_ROOM,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_TOP_RIGHT_ROOM,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_BULB_IN_THE_FLESH_ROOM_WITH_FLEAS,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_BOTTOM_RIGHT_PATH,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_BOTTOM_RIGHT_PATH,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BEHIND_THE_FLESH_VEIN,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_IN_THE_TOP_LEFT_EYES_BOSS_ROOM,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FOURTH_URN_IN_THE_TOP_RIGHT_ROOM,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BELOW_THE_LEFT_ENTRANCE,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_CENTER_PART,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_FIRST_BULB_IN_THE_TOP_LEFT_PART,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_SECOND_BULB_IN_THE_TOP_LEFT_PART,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_THIRD_BULB_IN_THE_TOP_LEFT_PART,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_CLOSE_TO_THE_SAVE_CRYSTAL,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_BOTTOM_RIGHT_PATH,
+        AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+    ]
+
+    def test_no_progression_mithalas(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Mithalas when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_simon_says.py b/worlds/aquaria/test/test_no_progression_simon_says.py
new file mode 100644
index 0000000000..b2b3587ede
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_simon_says.py
@@ -0,0 +1,38 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in Simon says when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionSimonSaysTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in Simon says when option enabled"""
+    options = {
+        "no_progression_simon_says": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS,
+        AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+    ]
+
+    def test_no_progression_simon_says(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in Simon says when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_no_progression_veil.py b/worlds/aquaria/test/test_no_progression_veil.py
new file mode 100644
index 0000000000..0288c69f2c
--- /dev/null
+++ b/worlds/aquaria/test/test_no_progression_veil.py
@@ -0,0 +1,67 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that no progression items can be put in the Veil when option enabled
+"""
+
+from . import AquariaTestBase
+from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
+
+
+class NoProgressionVeilTest(AquariaTestBase):
+    """Unit test used to test that no progression items can be put in the Veil when option enabled"""
+    options = {
+        "no_progression_veil": True
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS,
+        AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG,
+        AquariaLocationNames.TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF,
+        AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_STONE_HEAD,
+        AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+        AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM,
+        AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR,
+        AquariaLocationNames.SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE,
+        AquariaLocationNames.SUN_TEMPLE_BULB_ON_THE_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+    ]
+
+    def test_no_progression_veil(self) -> None:
+        """
+            Unit test used to test that no progression items can be put in the Veil when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                if item.classification == ItemClassification.progression:
+                    self.assertFalse(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" can be filled with \"" + item_name + "\"")
+                else:
+                    self.assertTrue(
+                        self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                        "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
+
diff --git a/worlds/aquaria/test/test_progression_arnassi_ruins.py b/worlds/aquaria/test/test_progression_arnassi_ruins.py
new file mode 100644
index 0000000000..4f8ca9f248
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_arnassi_ruins.py
@@ -0,0 +1,37 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Arnassi Ruins area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionArnassiRuinsTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Arnassi Ruins area when option enabled"""
+    options = {
+        "no_progression_arnassi_ruins": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_LEFT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_CENTER_PART,
+        AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_STATUE,
+        AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
+        AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR,
+    ]
+
+    def test_progression_arnassi_ruins(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Arnassi Ruins area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_energy_temple.py b/worlds/aquaria/test/test_progression_energy_temple.py
new file mode 100644
index 0000000000..f881d590e4
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_energy_temple.py
@@ -0,0 +1,37 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Energy Temple area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionEnergyTempleTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Energy Temple area when option enabled"""
+    options = {
+        "no_progression_energy_temple": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE,
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+        AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+        AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+        AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+        AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+        AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+        AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+    ]
+
+    def test_progression_energy_temple(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Energy Temple area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_frozen_veil.py b/worlds/aquaria/test/test_progression_frozen_veil.py
new file mode 100644
index 0000000000..95d659189d
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_frozen_veil.py
@@ -0,0 +1,37 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Frozen Veil area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionFrozenVeilTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Frozen Veil area when option enabled"""
+    options = {
+        "no_progression_frozen_veil": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT,
+        AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM,
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+        AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+    ]
+
+    def test_progression_frozen_veil(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Frozen Veil area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_hard_hidden_locations.py b/worlds/aquaria/test/test_progression_hard_hidden_locations.py
index f6ac8e0e17..dc3c89b9c9 100644
--- a/worlds/aquaria/test/test_progression_hard_hidden_locations.py
+++ b/worlds/aquaria/test/test_progression_hard_hidden_locations.py
@@ -8,7 +8,7 @@ from . import AquariaTestBase
 from ..Locations import AquariaLocationNames
 
 
-class UNoProgressionHardHiddenTest(AquariaTestBase):
+class ProgressionHardHiddenTest(AquariaTestBase):
     """Unit test used to test that no progression items can be put in hard or hidden locations when option disabled"""
     options = {
         "no_progression_hard_or_hidden_locations": False
@@ -42,7 +42,7 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
         AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
     ]
 
-    def test_unconfine_home_water_both_location_fillable(self) -> None:
+    def test_progression_hard_or_hidden(self) -> None:
         """Unit test used to test that progression items can be put in hard or hidden locations when option disabled"""
         for location in self.unfillable_locations:
             for item_name in self.world.item_names:
diff --git a/worlds/aquaria/test/test_progression_kelp_forest.py b/worlds/aquaria/test/test_progression_kelp_forest.py
new file mode 100644
index 0000000000..4bc8f76200
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_kelp_forest.py
@@ -0,0 +1,54 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Kelp Forest when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionKelpForestTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Kelp Forest when option enabled"""
+    options = {
+        "no_progression_kelp_forest": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER,
+        AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+        AquariaLocationNames.KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG,
+        AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE,
+        AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+    ]
+
+    def test_progression_kelp_forest(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Kelp Forest when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_mithalas.py b/worlds/aquaria/test/test_progression_mithalas.py
new file mode 100644
index 0000000000..81adb6ae9a
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_mithalas.py
@@ -0,0 +1,31 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Mithalas area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionMithalasTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Mithalas area when option enabled"""
+    options = {
+        "no_progression_mithalas": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS,
+        AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+    ]
+
+    def test_progression_mithalas(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Mithalas area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_simon_says.py b/worlds/aquaria/test/test_progression_simon_says.py
new file mode 100644
index 0000000000..56f8f23c0c
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_simon_says.py
@@ -0,0 +1,31 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in Simon says area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionSimonSaysTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in Simon says area when option enabled"""
+    options = {
+        "no_progression_simon_says": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS,
+        AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+    ]
+
+    def test_progression_simon_says(self) -> None:
+        """
+            Unit test used to test that progression items can be put in Simon says area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
\ No newline at end of file
diff --git a/worlds/aquaria/test/test_progression_veil.py b/worlds/aquaria/test/test_progression_veil.py
new file mode 100644
index 0000000000..fd186e4d3e
--- /dev/null
+++ b/worlds/aquaria/test/test_progression_veil.py
@@ -0,0 +1,60 @@
+"""
+Author: Louis M
+Date: Fri, 03 May 2024 14:07:35 +0000
+Description: Unit test used to test that progression items can be put in the Veil area when option enabled
+"""
+
+from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
+
+
+class ProgressionVeilTest(AquariaTestBase):
+    """Unit test used to test that progression items can be put in the Veil area when option enabled"""
+    options = {
+        "no_progression_veil": False
+    }
+
+    unfillable_locations = [
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS,
+        AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG,
+        AquariaLocationNames.TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF,
+        AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_STONE_HEAD,
+        AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+        AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM,
+        AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR,
+        AquariaLocationNames.SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE,
+        AquariaLocationNames.SUN_TEMPLE_BULB_ON_THE_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+        AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+    ]
+
+    def test_progression_veil(self) -> None:
+        """
+            Unit test used to test that progression items can be put in the Veil area when option enabled
+        """
+        for location in self.unfillable_locations:
+            for item_name in self.world.item_names:
+                item = self.get_item_by_name(item_name)
+                self.assertTrue(
+                    self.world.get_location(location).can_fill(self.multiworld.state, item, False),
+                    "The location \"" + location + "\" cannot be filled with \"" + item_name + "\"")
diff --git a/worlds/aquaria/test/test_sun_form_access_four_gods.py b/worlds/aquaria/test/test_sun_form_access_four_gods.py
new file mode 100644
index 0000000000..11e76cbd31
--- /dev/null
+++ b/worlds/aquaria/test/test_sun_form_access_four_gods.py
@@ -0,0 +1,30 @@
+"""
+Author: Louis M
+Date: Thu, 18 Apr 2024 18:45:56 +0000
+Description: Unit test used to test accessibility of locations with and without the sun form with the goal four gods
+"""
+
+from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import UnconfineHomeWater, Objective
+
+
+class SunFormFourGodsAccessTest(AquariaTestBase):
+    """Unit test used to test accessibility of locations with and without the sun form with the goal four gods"""
+    options = {
+        "unconfine_home_water": UnconfineHomeWater.option_via_energy_door,
+        "objective": Objective.option_killing_the_four_gods
+    }
+
+
+    def test_sun_form_location(self) -> None:
+        """Test locations that require sun form with the goal four gods"""
+        locations = [
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED
+        ]
+        items = [[ItemNames.SUN_FORM]]
+        self.assertAccessDependency(locations, items, True)
diff --git a/worlds/aquaria/test/test_sun_temple_cliffs.py b/worlds/aquaria/test/test_sun_temple_cliffs.py
new file mode 100644
index 0000000000..dcc41e4789
--- /dev/null
+++ b/worlds/aquaria/test/test_sun_temple_cliffs.py
@@ -0,0 +1,29 @@
+"""
+Author: Louis M
+Date: Sun, 06 Apr 2025 14:00:32 +0000
+Description: Unit test used to test Sun Temple cliffs access
+"""
+from BaseClasses import CollectionState
+from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Options import UnconfineHomeWater
+from ..Locations import AquariaLocationNames
+
+
+class SunTempleCliffAccessTest(AquariaTestBase):
+    """Unit test used to test Sun Temple cliffs access"""
+    options = {
+        "unconfine_home_water": UnconfineHomeWater.option_via_energy_door
+    }
+
+    def test_sun_temple_cliff_access(self) -> None:
+        """test Sun Temple cliffs access"""
+        state = CollectionState(self.multiworld)
+        state.collect(self.get_item_by_name(ItemNames.BEAST_FORM))
+        state.collect(self.get_item_by_name(ItemNames.SUN_FORM))
+        first_cliff_location = self.multiworld.get_location(
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB, 1)
+        self.assertFalse(first_cliff_location.can_reach(state))
+        second_cliff_location = self.multiworld.get_location(
+            AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB, 1)
+        self.assertFalse(second_cliff_location.can_reach(state))
\ No newline at end of file
diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index 6d40c0172d..0888d8a850 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -4,7 +4,7 @@ from .Options import CCCharlesOptions
 from .Rules import set_rules
 from .Regions import create_regions
 from BaseClasses import Tutorial, ItemClassification
-from worlds.AutoWorld import World, WebWorld
+from worlds.AutoWorld import InvalidItemError, World, WebWorld
 
 
 class CCCharlesWeb(WebWorld):
@@ -157,7 +157,7 @@ class CCCharlesWorld(World):
             case "Bug Spray":
                 classification = ItemClassification.progression
             case _: # Should not occur
-                raise Exception("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
+                raise InvalidItemError("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
 
         return CCCharlesItem(name, classification, item_id, self.player)
 
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index 1daccf474d..f5ab842570 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -19,7 +19,7 @@ The Mod can be installed and played by following these steps (see the [Mod Downl
 2. Launch the game, if "OFFLINE" is visible in the upper-right corner of the screen, the Mod is working
 
 ### Create a Config (.yaml) File
-The purpose of a YAML file is described in the [Basic Multiworld Setup Guide](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game).
+The purpose of a YAML file is described in the [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en#generating-a-game).
 
 The [Player Options page](/games/Choo-Choo%20Charles/player-options) allows to configure personal options and export a config YAML file.
 
@@ -38,7 +38,7 @@ Follow these steps to host a remote multiplayer or a local single-player session
 1. Double-click the **cccharles.apworld** to automatically install the world randomization logic
 2. Put the **CCCharles.yaml** to **Archipelago/Players/** with the YAML of each player to host
 3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAMLs in **Archipelago/output/**
-4. For a multiplayer session, go to the [Archipelago HOST GAME page](https://archipelago.gg/uploads)
+4. For a multiplayer session, go to the [Archipelago HOST GAME page](/uploads)
 5. Click "Upload File" and select the generated **AP_\<seed\>.zip** in **Archipelago/output/**
 6. Send the generated room page to each player
 
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index d613e0d1ef..6ffd0bda6a 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -19,7 +19,7 @@ Le Mod peut être installé et joué en suivant les étapes suivantes (voir la s
 2. Lancer le jeu, si "OFFLINE" est visible dans le coin en haut à droite de l'écran, le Mod est actif
 
 ### Créer un Fichier de Configuration (.yaml)
-L'objectif d'un fichier YAML est décrit dans le [Guide d'Installation Basique du Multiworld](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
+L'objectif d'un fichier YAML est décrit dans le [Guide d'Installation Basique du Multiworld](/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
 
 La [page d'Options Joueur](/games/Choo-Choo%20Charles/player-options) permet de configurer des options personnelles et exporter un fichier de configuration YAML.
 
@@ -38,7 +38,7 @@ Suivre ces étapes pour héberger une session multijoueur à distance ou locale
 1. Double-cliquer sur **cccharles.apworld** pour installer automatiquement la logique de randomisation du monde
 2. Placer le **CCCharles.yaml** dans **Archipelago/Players/** avec le YAML de chaque joueur à héberger
 3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec les YAML dans **Archipelago/output/**
-4. Pour une session multijoueur, aller à la [page Archipelago HOST GAME](https://archipelago.gg/uploads)
+4. Pour une session multijoueur, aller à la [page Archipelago HOST GAME](/uploads)
 5. Cliquer sur "Upload File" et sélectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
 6. Envoyer la page de la partie générée à chaque joueur
 
diff --git a/worlds/celeste_open_world/Items.py b/worlds/celeste_open_world/Items.py
index 51df6e91f1..5d82a3c68f 100644
--- a/worlds/celeste_open_world/Items.py
+++ b/worlds/celeste_open_world/Items.py
@@ -84,7 +84,7 @@ celeste_base_id: int = 0xCA10000
 
 
 class CelesteItem(Item):
-    game = "Celeste"
+    game = "Celeste (Open World)"
 
 
 class CelesteItemData(NamedTuple):
@@ -259,6 +259,7 @@ def generate_item_groups() -> dict[str, list[str]]:
         "Blue Bubbles":   [ItemName.blue_boosters],
         "Red Bubbles":    [ItemName.red_boosters],
         "Touch Switches": [ItemName.coins],
+        "Shields":        [ItemName.coins],
     }
 
     return item_groups
diff --git a/worlds/celeste_open_world/Locations.py b/worlds/celeste_open_world/Locations.py
index 01ce533666..074a8cf045 100644
--- a/worlds/celeste_open_world/Locations.py
+++ b/worlds/celeste_open_world/Locations.py
@@ -16,7 +16,7 @@ celeste_base_id: int = 0xCA10000
 
 
 class CelesteLocation(Location):
-    game = "Celeste"
+    game = "Celeste (Open World)"
 
 
 class CelesteLocationData(NamedTuple):
diff --git a/worlds/celeste_open_world/__init__.py b/worlds/celeste_open_world/__init__.py
index c0661b5593..5bc4b56679 100644
--- a/worlds/celeste_open_world/__init__.py
+++ b/worlds/celeste_open_world/__init__.py
@@ -42,7 +42,7 @@ class CelesteOpenWorld(World):
     options_dataclass = CelesteOptions
     options: CelesteOptions
 
-    apworld_version = 10005
+    apworld_version = 10007
 
     level_data: dict[str, Level] = load_logic_data()
 
diff --git a/worlds/celeste_open_world/archipelago.json b/worlds/celeste_open_world/archipelago.json
index 12e1f288a4..5178e07734 100644
--- a/worlds/celeste_open_world/archipelago.json
+++ b/worlds/celeste_open_world/archipelago.json
@@ -2,5 +2,5 @@
     "game": "Celeste (Open World)",
 	"authors": [ "PoryGone" ],
     "minimum_ap_version": "0.6.3",
-    "world_version": "1.0.5"
+    "world_version": "1.0.7"
 }
\ No newline at end of file
diff --git a/worlds/celeste_open_world/data/CelesteLevelData.json b/worlds/celeste_open_world/data/CelesteLevelData.json
index 9d63696045..5a88aef3c4 100644
--- a/worlds/celeste_open_world/data/CelesteLevelData.json
+++ b/worlds/celeste_open_world/data/CelesteLevelData.json
@@ -5413,13 +5413,13 @@
                             "name": "north-west",
                             "direction": "left",
                             "blocked": false,
-                            "closes_behind": true
+                            "closes_behind": false
                         },
                         {
                             "name": "west",
                             "direction": "left",
                             "blocked": false,
-                            "closes_behind": true
+                            "closes_behind": false
                         },
                         {
                             "name": "east",
@@ -14326,7 +14326,7 @@
                                     "name": "golden",
                                     "display_name": "Golden Strawberry",
                                     "type": "golden_strawberry",
-                                    "rule": [ [ "blue_clouds", "pink_clouds", "blue_boosters", "move_blocks", "dash_refills", "springs", "coins" ] ]
+                                    "rule": [ [ "blue_clouds", "pink_clouds", "blue_boosters", "move_blocks", "moving_platforms", "dash_refills", "springs", "coins" ] ]
                                 }
                             ]
                         }
@@ -16985,7 +16985,7 @@
                                     "name": "strawberry",
                                     "display_name": "Strawberry",
                                     "type": "strawberry",
-                                    "rule": [ [ "red_boosters" ] ]
+                                    "rule": []
                                 }
                             ]
                         }
@@ -17577,7 +17577,7 @@
                                     "name": "strawberry",
                                     "display_name": "Strawberry",
                                     "type": "strawberry",
-                                    "rule": [ [ "red_boosters" ] ]
+                                    "rule": []
                                 }
                             ]
                         }
@@ -19953,7 +19953,7 @@
                                     "name": "golden",
                                     "display_name": "Golden Strawberry",
                                     "type": "golden_strawberry",
-                                    "rule": [ [ "red_boosters", "swap_blocks", "dash_switches", "Entrance Key", "Depths Key", "Search Key 1", "Search Key 2", "seekers", "coins", "theo_crystal" ] ]
+                                    "rule": [ [ "red_boosters", "swap_blocks", "dash_switches", "dash_refills", "Entrance Key", "Depths Key", "Search Key 1", "Search Key 2", "seekers", "coins", "theo_crystal" ] ]
                                 }
                             ]
                         }
@@ -23479,7 +23479,7 @@
                             "name": "west",
                             "direction": "left",
                             "blocked": false,
-                            "closes_behind": true
+                            "closes_behind": false
                         },
                         {
                             "name": "top",
@@ -25250,7 +25250,7 @@
                             "name": "west",
                             "direction": "left",
                             "blocked": false,
-                            "closes_behind": true
+                            "closes_behind": false
                         },
                         {
                             "name": "east",
@@ -37237,13 +37237,13 @@
                                     "name": "binoculars",
                                     "display_name": "Binoculars",
                                     "type": "binoculars",
-                                    "rule": [ [ "breaker_boxes" ] ]
+                                    "rule": [ [ "breaker_boxes", "double_dash_refills", "dash_switches" ] ]
                                 },
                                 {
                                     "name": "key_2",
                                     "display_name": "Power Source Key 2",
                                     "type": "key",
-                                    "rule": [ [ "breaker_boxes", "double_dash_refills", "jellyfish" ] ]
+                                    "rule": [ [ "breaker_boxes", "double_dash_refills", "dash_switches", "jellyfish" ] ]
                                 }
                             ]
                         }
diff --git a/worlds/celeste_open_world/data/CelesteLevelData.py b/worlds/celeste_open_world/data/CelesteLevelData.py
index 6ba43fc34d..0a309cb73e 100644
--- a/worlds/celeste_open_world/data/CelesteLevelData.py
+++ b/worlds/celeste_open_world/data/CelesteLevelData.py
@@ -2,6 +2,7 @@
 
 from ..Levels import Level, Room, PreRegion, LevelLocation, RegionConnection, RoomConnection, Door, DoorDirection, LocationType
 from ..Names import ItemName
+from collections import defaultdict
 
 all_doors: dict[str, Door] = {
     "0a_-1_east": Door("0a_-1_east", "0a_-1", DoorDirection.right, False, False),
@@ -329,8 +330,8 @@ all_doors: dict[str, Door] = {
     "2a_end_2_north-east": Door("2a_end_2_north-east", "2a_end_2", DoorDirection.right, False, False),
     "2a_end_2_east": Door("2a_end_2_east", "2a_end_2", DoorDirection.right, False, False),
 
-    "2a_end_3_north-west": Door("2a_end_3_north-west", "2a_end_3", DoorDirection.left, False, True),
-    "2a_end_3_west": Door("2a_end_3_west", "2a_end_3", DoorDirection.left, False, True),
+    "2a_end_3_north-west": Door("2a_end_3_north-west", "2a_end_3", DoorDirection.left, False, False),
+    "2a_end_3_west": Door("2a_end_3_west", "2a_end_3", DoorDirection.left, False, False),
     "2a_end_3_east": Door("2a_end_3_east", "2a_end_3", DoorDirection.right, False, False),
 
     "2a_end_4_west": Door("2a_end_4_west", "2a_end_4", DoorDirection.left, False, False),
@@ -1433,7 +1434,7 @@ all_doors: dict[str, Door] = {
     "6a_20_west": Door("6a_20_west", "6a_20", DoorDirection.left, False, False),
     "6a_20_east": Door("6a_20_east", "6a_20", DoorDirection.right, False, False),
 
-    "6a_b-00_west": Door("6a_b-00_west", "6a_b-00", DoorDirection.left, False, True),
+    "6a_b-00_west": Door("6a_b-00_west", "6a_b-00", DoorDirection.left, False, False),
     "6a_b-00_top": Door("6a_b-00_top", "6a_b-00", DoorDirection.up, False, False),
     "6a_b-00_east": Door("6a_b-00_east", "6a_b-00", DoorDirection.right, False, False),
 
@@ -1542,7 +1543,7 @@ all_doors: dict[str, Door] = {
     "6b_a-06_west": Door("6b_a-06_west", "6b_a-06", DoorDirection.left, False, False),
     "6b_a-06_east": Door("6b_a-06_east", "6b_a-06", DoorDirection.right, False, False),
 
-    "6b_b-00_west": Door("6b_b-00_west", "6b_b-00", DoorDirection.left, False, True),
+    "6b_b-00_west": Door("6b_b-00_west", "6b_b-00", DoorDirection.left, False, False),
     "6b_b-00_east": Door("6b_b-00_east", "6b_b-00", DoorDirection.down, False, False),
 
     "6b_b-01_top": Door("6b_b-01_top", "6b_b-01", DoorDirection.up, False, False),
@@ -5126,7 +5127,7 @@ all_locations: dict[str, LevelLocation] = {
     "4a_d-07_strawberry": LevelLocation("4a_d-07_strawberry", "Golden Ridge A - Room d-07 Strawberry", "4a_d-07_west", LocationType.strawberry, [[ItemName.blue_boosters, ], ]),
     "4a_d-09_strawberry": LevelLocation("4a_d-09_strawberry", "Golden Ridge A - Room d-09 Strawberry", "4a_d-09_west", LocationType.strawberry, [[ItemName.blue_boosters, ], ]),
     "4a_d-10_clear": LevelLocation("4a_d-10_clear", "Golden Ridge A - Level Clear", "4a_d-10_goal", LocationType.level_clear, []),
-    "4a_d-10_golden": LevelLocation("4a_d-10_golden", "Golden Ridge A - Golden Strawberry", "4a_d-10_goal", LocationType.golden_strawberry, [[ItemName.blue_clouds, ItemName.pink_clouds, ItemName.blue_boosters, ItemName.move_blocks, ItemName.dash_refills, ItemName.springs, ItemName.coins, ], ]),
+    "4a_d-10_golden": LevelLocation("4a_d-10_golden", "Golden Ridge A - Golden Strawberry", "4a_d-10_goal", LocationType.golden_strawberry, [[ItemName.blue_clouds, ItemName.pink_clouds, ItemName.blue_boosters, ItemName.move_blocks, ItemName.moving_platforms, ItemName.dash_refills, ItemName.springs, ItemName.coins, ], ]),
 
     "4b_b-02_binoculars": LevelLocation("4b_b-02_binoculars", "Golden Ridge B - Room b-02 Binoculars", "4b_b-02_bottom", LocationType.binoculars, []),
     "4b_c-03_binoculars": LevelLocation("4b_c-03_binoculars", "Golden Ridge B - Room c-03 Binoculars", "4b_c-03_bottom", LocationType.binoculars, []),
@@ -5154,14 +5155,14 @@ all_locations: dict[str, LevelLocation] = {
     "5a_a-15_strawberry": LevelLocation("5a_a-15_strawberry", "Mirror Temple A - Room a-15 Strawberry", "5a_a-15_south", LocationType.strawberry, [[ItemName.coins, ItemName.red_boosters, ], ]),
     "5a_a-14_strawberry": LevelLocation("5a_a-14_strawberry", "Mirror Temple A - Room a-14 Strawberry", "5a_a-14_south", LocationType.strawberry, [[ItemName.swap_blocks, ItemName.dash_refills, ], ]),
     "5a_b-18_strawberry": LevelLocation("5a_b-18_strawberry", "Mirror Temple A - Room b-18 Strawberry", "5a_b-18_south", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
-    "5a_b-01c_strawberry": LevelLocation("5a_b-01c_strawberry", "Mirror Temple A - Room b-01c Strawberry", "5a_b-01c_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
+    "5a_b-01c_strawberry": LevelLocation("5a_b-01c_strawberry", "Mirror Temple A - Room b-01c Strawberry", "5a_b-01c_east", LocationType.strawberry, []),
     "5a_b-20_strawberry_1": LevelLocation("5a_b-20_strawberry_1", "Mirror Temple A - Room b-20 Strawberry 1", "5a_b-20_south", LocationType.strawberry, []),
     "5a_b-20_strawberry_2": LevelLocation("5a_b-20_strawberry_2", "Mirror Temple A - Room b-20 Strawberry 2", "5a_b-20_east", LocationType.strawberry, [[ItemName.swap_blocks, ], ]),
     "5a_b-21_strawberry": LevelLocation("5a_b-21_strawberry", "Mirror Temple A - Room b-21 Strawberry", "5a_b-21_east", LocationType.strawberry, [[ItemName.red_boosters, ItemName.dash_refills, ], ]),
     "5a_b-03_strawberry": LevelLocation("5a_b-03_strawberry", "Mirror Temple A - Room b-03 Strawberry", "5a_b-03_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
     "5a_b-05_strawberry": LevelLocation("5a_b-05_strawberry", "Mirror Temple A - Room b-05 Strawberry", "5a_b-05_west", LocationType.strawberry, [[ItemName.red_boosters, ItemName.dash_refills, ], ]),
     "5a_b-04_key_2": LevelLocation("5a_b-04_key_2", "Mirror Temple A - Depths Key", "5a_b-04_east", LocationType.key, []),
-    "5a_b-10_strawberry": LevelLocation("5a_b-10_strawberry", "Mirror Temple A - Room b-10 Strawberry", "5a_b-10_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
+    "5a_b-10_strawberry": LevelLocation("5a_b-10_strawberry", "Mirror Temple A - Room b-10 Strawberry", "5a_b-10_east", LocationType.strawberry, []),
     "5a_b-12_strawberry": LevelLocation("5a_b-12_strawberry", "Mirror Temple A - Room b-12 Strawberry", "5a_b-12_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
     "5a_b-17_strawberry_2": LevelLocation("5a_b-17_strawberry_2", "Mirror Temple A - Room b-17 Strawberry 2", "5a_b-17_west", LocationType.strawberry, [[ItemName.strawberry_seeds, ItemName.springs, ], ]),
     "5a_b-17_strawberry_1": LevelLocation("5a_b-17_strawberry_1", "Mirror Temple A - Room b-17 Strawberry 1", "5a_b-17_north-west", LocationType.strawberry, []),
@@ -5180,7 +5181,7 @@ all_locations: dict[str, LevelLocation] = {
     "5a_d-19_strawberry": LevelLocation("5a_d-19_strawberry", "Mirror Temple A - Room d-19 Strawberry", "5a_d-19_east", LocationType.strawberry, [["Mirror Temple A - Search Key 3", ], ]),
     "5a_e-06_strawberry": LevelLocation("5a_e-06_strawberry", "Mirror Temple A - Room e-06 Strawberry", "5a_e-06_east", LocationType.strawberry, [[ItemName.dash_switches, ], ]),
     "5a_e-11_clear": LevelLocation("5a_e-11_clear", "Mirror Temple A - Level Clear", "5a_e-11_goal", LocationType.level_clear, []),
-    "5a_e-11_golden": LevelLocation("5a_e-11_golden", "Mirror Temple A - Golden Strawberry", "5a_e-11_goal", LocationType.golden_strawberry, [[ItemName.red_boosters, ItemName.swap_blocks, ItemName.dash_switches, "Mirror Temple A - Entrance Key", "Mirror Temple A - Depths Key", "Mirror Temple A - Search Key 1", "Mirror Temple A - Search Key 2", ItemName.seekers, ItemName.coins, ItemName.theo_crystal, ], ]),
+    "5a_e-11_golden": LevelLocation("5a_e-11_golden", "Mirror Temple A - Golden Strawberry", "5a_e-11_goal", LocationType.golden_strawberry, [[ItemName.red_boosters, ItemName.swap_blocks, ItemName.dash_switches, ItemName.dash_refills, "Mirror Temple A - Entrance Key", "Mirror Temple A - Depths Key", "Mirror Temple A - Search Key 1", "Mirror Temple A - Search Key 2", ItemName.seekers, ItemName.coins, ItemName.theo_crystal, ], ]),
 
     "5b_b-02_key_1": LevelLocation("5b_b-02_key_1", "Mirror Temple B - Central Chamber Key 1", "5b_b-02_south-west", LocationType.key, []),
     "5b_b-02_key_2": LevelLocation("5b_b-02_key_2", "Mirror Temple B - Central Chamber Key 2", "5b_b-02_south-east", LocationType.key, []),
@@ -5309,8 +5310,8 @@ all_locations: dict[str, LevelLocation] = {
     "10a_d-00_binoculars": LevelLocation("10a_d-00_binoculars", "Farewell - Room d-00 Binoculars", "10a_d-00_south", LocationType.binoculars, []),
     "10a_d-04_binoculars": LevelLocation("10a_d-04_binoculars", "Farewell - Room d-04 Binoculars", "10a_d-04_west", LocationType.binoculars, []),
     "10a_d-04_key_1": LevelLocation("10a_d-04_key_1", "Farewell - Power Source Key 1", "10a_d-04_west", LocationType.key, [[ItemName.double_dash_refills, ItemName.jellyfish, ], ]),
-    "10a_d-03_binoculars": LevelLocation("10a_d-03_binoculars", "Farewell - Room d-03 Binoculars", "10a_d-03_west", LocationType.binoculars, [[ItemName.breaker_boxes, ], ]),
-    "10a_d-03_key_2": LevelLocation("10a_d-03_key_2", "Farewell - Power Source Key 2", "10a_d-03_west", LocationType.key, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.jellyfish, ], ]),
+    "10a_d-03_binoculars": LevelLocation("10a_d-03_binoculars", "Farewell - Room d-03 Binoculars", "10a_d-03_west", LocationType.binoculars, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.dash_switches, ], ]),
+    "10a_d-03_key_2": LevelLocation("10a_d-03_key_2", "Farewell - Power Source Key 2", "10a_d-03_west", LocationType.key, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.dash_switches, ItemName.jellyfish, ], ]),
     "10a_d-01_binoculars": LevelLocation("10a_d-01_binoculars", "Farewell - Room d-01 Binoculars", "10a_d-01_east", LocationType.binoculars, []),
     "10a_d-01_key_3": LevelLocation("10a_d-01_key_3", "Farewell - Power Source Key 3", "10a_d-01_east", LocationType.key, [[ItemName.dash_refills, ItemName.dash_switches, ItemName.jellyfish, ], ]),
     "10a_d-02_binoculars": LevelLocation("10a_d-02_binoculars", "Farewell - Room d-02 Binoculars", "10a_d-02_bottom", LocationType.binoculars, [[ItemName.breaker_boxes, ], ]),
@@ -5360,2652 +5361,2661 @@ all_locations: dict[str, LevelLocation] = {
 
 }
 
+connections_by_region: defaultdict[str, list[RegionConnection]] = defaultdict(lambda: [])
+locations_by_region: defaultdict[str, list[LevelLocation]] = defaultdict(lambda: [])
+
+for _, connection in all_region_connections.items():
+    connections_by_region[connection.source_name].append(connection)
+
+for _, location in all_locations.items():
+    locations_by_region[location.region_name].append(location)
+
 all_regions: dict[str, PreRegion] = {
-    "0a_-1_main": PreRegion("0a_-1_main", "0a_-1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_-1_main"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_-1_main"]),
-    "0a_-1_east": PreRegion("0a_-1_east", "0a_-1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_-1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_-1_east"]),
+    "0a_-1_main": PreRegion("0a_-1_main", "0a_-1", connections_by_region["0a_-1_main"], locations_by_region["0a_-1_main"]),
+    "0a_-1_east": PreRegion("0a_-1_east", "0a_-1", connections_by_region["0a_-1_east"], locations_by_region["0a_-1_east"]),
 
-    "0a_0_west": PreRegion("0a_0_west", "0a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_0_west"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_0_west"]),
-    "0a_0_main": PreRegion("0a_0_main", "0a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_0_main"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_0_main"]),
-    "0a_0_north": PreRegion("0a_0_north", "0a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_0_north"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_0_north"]),
-    "0a_0_east": PreRegion("0a_0_east", "0a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_0_east"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_0_east"]),
+    "0a_0_west": PreRegion("0a_0_west", "0a_0", connections_by_region["0a_0_west"], locations_by_region["0a_0_west"]),
+    "0a_0_main": PreRegion("0a_0_main", "0a_0", connections_by_region["0a_0_main"], locations_by_region["0a_0_main"]),
+    "0a_0_north": PreRegion("0a_0_north", "0a_0", connections_by_region["0a_0_north"], locations_by_region["0a_0_north"]),
+    "0a_0_east": PreRegion("0a_0_east", "0a_0", connections_by_region["0a_0_east"], locations_by_region["0a_0_east"]),
 
-    "0a_0b_south": PreRegion("0a_0b_south", "0a_0b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_0b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_0b_south"]),
+    "0a_0b_south": PreRegion("0a_0b_south", "0a_0b", connections_by_region["0a_0b_south"], locations_by_region["0a_0b_south"]),
 
-    "0a_1_west": PreRegion("0a_1_west", "0a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_1_west"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_1_west"]),
-    "0a_1_main": PreRegion("0a_1_main", "0a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_1_main"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_1_main"]),
-    "0a_1_east": PreRegion("0a_1_east", "0a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_1_east"]),
+    "0a_1_west": PreRegion("0a_1_west", "0a_1", connections_by_region["0a_1_west"], locations_by_region["0a_1_west"]),
+    "0a_1_main": PreRegion("0a_1_main", "0a_1", connections_by_region["0a_1_main"], locations_by_region["0a_1_main"]),
+    "0a_1_east": PreRegion("0a_1_east", "0a_1", connections_by_region["0a_1_east"], locations_by_region["0a_1_east"]),
 
-    "0a_2_west": PreRegion("0a_2_west", "0a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_2_west"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_2_west"]),
-    "0a_2_main": PreRegion("0a_2_main", "0a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_2_main"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_2_main"]),
-    "0a_2_east": PreRegion("0a_2_east", "0a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_2_east"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_2_east"]),
+    "0a_2_west": PreRegion("0a_2_west", "0a_2", connections_by_region["0a_2_west"], locations_by_region["0a_2_west"]),
+    "0a_2_main": PreRegion("0a_2_main", "0a_2", connections_by_region["0a_2_main"], locations_by_region["0a_2_main"]),
+    "0a_2_east": PreRegion("0a_2_east", "0a_2", connections_by_region["0a_2_east"], locations_by_region["0a_2_east"]),
 
-    "0a_3_west": PreRegion("0a_3_west", "0a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_3_west"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_3_west"]),
-    "0a_3_main": PreRegion("0a_3_main", "0a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_3_main"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_3_main"]),
-    "0a_3_east": PreRegion("0a_3_east", "0a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "0a_3_east"], [loc for _, loc in all_locations.items() if loc.region_name == "0a_3_east"]),
+    "0a_3_west": PreRegion("0a_3_west", "0a_3", connections_by_region["0a_3_west"], locations_by_region["0a_3_west"]),
+    "0a_3_main": PreRegion("0a_3_main", "0a_3", connections_by_region["0a_3_main"], locations_by_region["0a_3_main"]),
+    "0a_3_east": PreRegion("0a_3_east", "0a_3", connections_by_region["0a_3_east"], locations_by_region["0a_3_east"]),
 
-    "1a_1_main": PreRegion("1a_1_main", "1a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_1_main"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_1_main"]),
-    "1a_1_east": PreRegion("1a_1_east", "1a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_1_east"]),
+    "1a_1_main": PreRegion("1a_1_main", "1a_1", connections_by_region["1a_1_main"], locations_by_region["1a_1_main"]),
+    "1a_1_east": PreRegion("1a_1_east", "1a_1", connections_by_region["1a_1_east"], locations_by_region["1a_1_east"]),
 
-    "1a_2_west": PreRegion("1a_2_west", "1a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_2_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_2_west"]),
-    "1a_2_east": PreRegion("1a_2_east", "1a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_2_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_2_east"]),
+    "1a_2_west": PreRegion("1a_2_west", "1a_2", connections_by_region["1a_2_west"], locations_by_region["1a_2_west"]),
+    "1a_2_east": PreRegion("1a_2_east", "1a_2", connections_by_region["1a_2_east"], locations_by_region["1a_2_east"]),
 
-    "1a_3_west": PreRegion("1a_3_west", "1a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_3_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_3_west"]),
-    "1a_3_east": PreRegion("1a_3_east", "1a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_3_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_3_east"]),
+    "1a_3_west": PreRegion("1a_3_west", "1a_3", connections_by_region["1a_3_west"], locations_by_region["1a_3_west"]),
+    "1a_3_east": PreRegion("1a_3_east", "1a_3", connections_by_region["1a_3_east"], locations_by_region["1a_3_east"]),
 
-    "1a_4_west": PreRegion("1a_4_west", "1a_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_4_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_4_west"]),
-    "1a_4_east": PreRegion("1a_4_east", "1a_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_4_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_4_east"]),
+    "1a_4_west": PreRegion("1a_4_west", "1a_4", connections_by_region["1a_4_west"], locations_by_region["1a_4_west"]),
+    "1a_4_east": PreRegion("1a_4_east", "1a_4", connections_by_region["1a_4_east"], locations_by_region["1a_4_east"]),
 
-    "1a_3b_west": PreRegion("1a_3b_west", "1a_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_3b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_3b_west"]),
-    "1a_3b_east": PreRegion("1a_3b_east", "1a_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_3b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_3b_east"]),
-    "1a_3b_top": PreRegion("1a_3b_top", "1a_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_3b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_3b_top"]),
+    "1a_3b_west": PreRegion("1a_3b_west", "1a_3b", connections_by_region["1a_3b_west"], locations_by_region["1a_3b_west"]),
+    "1a_3b_east": PreRegion("1a_3b_east", "1a_3b", connections_by_region["1a_3b_east"], locations_by_region["1a_3b_east"]),
+    "1a_3b_top": PreRegion("1a_3b_top", "1a_3b", connections_by_region["1a_3b_top"], locations_by_region["1a_3b_top"]),
 
-    "1a_5_bottom": PreRegion("1a_5_bottom", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_bottom"]),
-    "1a_5_west": PreRegion("1a_5_west", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_west"]),
-    "1a_5_north-west": PreRegion("1a_5_north-west", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_north-west"]),
-    "1a_5_center": PreRegion("1a_5_center", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_center"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_center"]),
-    "1a_5_south-east": PreRegion("1a_5_south-east", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_south-east"]),
-    "1a_5_north-east": PreRegion("1a_5_north-east", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_north-east"]),
-    "1a_5_top": PreRegion("1a_5_top", "1a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5_top"]),
+    "1a_5_bottom": PreRegion("1a_5_bottom", "1a_5", connections_by_region["1a_5_bottom"], locations_by_region["1a_5_bottom"]),
+    "1a_5_west": PreRegion("1a_5_west", "1a_5", connections_by_region["1a_5_west"], locations_by_region["1a_5_west"]),
+    "1a_5_north-west": PreRegion("1a_5_north-west", "1a_5", connections_by_region["1a_5_north-west"], locations_by_region["1a_5_north-west"]),
+    "1a_5_center": PreRegion("1a_5_center", "1a_5", connections_by_region["1a_5_center"], locations_by_region["1a_5_center"]),
+    "1a_5_south-east": PreRegion("1a_5_south-east", "1a_5", connections_by_region["1a_5_south-east"], locations_by_region["1a_5_south-east"]),
+    "1a_5_north-east": PreRegion("1a_5_north-east", "1a_5", connections_by_region["1a_5_north-east"], locations_by_region["1a_5_north-east"]),
+    "1a_5_top": PreRegion("1a_5_top", "1a_5", connections_by_region["1a_5_top"], locations_by_region["1a_5_top"]),
 
-    "1a_5z_east": PreRegion("1a_5z_east", "1a_5z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5z_east"]),
+    "1a_5z_east": PreRegion("1a_5z_east", "1a_5z", connections_by_region["1a_5z_east"], locations_by_region["1a_5z_east"]),
 
-    "1a_5a_west": PreRegion("1a_5a_west", "1a_5a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_5a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_5a_west"]),
+    "1a_5a_west": PreRegion("1a_5a_west", "1a_5a", connections_by_region["1a_5a_west"], locations_by_region["1a_5a_west"]),
 
-    "1a_6_south-west": PreRegion("1a_6_south-west", "1a_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6_south-west"]),
-    "1a_6_west": PreRegion("1a_6_west", "1a_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6_west"]),
-    "1a_6_east": PreRegion("1a_6_east", "1a_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6_east"]),
+    "1a_6_south-west": PreRegion("1a_6_south-west", "1a_6", connections_by_region["1a_6_south-west"], locations_by_region["1a_6_south-west"]),
+    "1a_6_west": PreRegion("1a_6_west", "1a_6", connections_by_region["1a_6_west"], locations_by_region["1a_6_west"]),
+    "1a_6_east": PreRegion("1a_6_east", "1a_6", connections_by_region["1a_6_east"], locations_by_region["1a_6_east"]),
 
-    "1a_6z_north-west": PreRegion("1a_6z_north-west", "1a_6z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6z_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6z_north-west"]),
-    "1a_6z_west": PreRegion("1a_6z_west", "1a_6z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6z_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6z_west"]),
-    "1a_6z_east": PreRegion("1a_6z_east", "1a_6z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6z_east"]),
+    "1a_6z_north-west": PreRegion("1a_6z_north-west", "1a_6z", connections_by_region["1a_6z_north-west"], locations_by_region["1a_6z_north-west"]),
+    "1a_6z_west": PreRegion("1a_6z_west", "1a_6z", connections_by_region["1a_6z_west"], locations_by_region["1a_6z_west"]),
+    "1a_6z_east": PreRegion("1a_6z_east", "1a_6z", connections_by_region["1a_6z_east"], locations_by_region["1a_6z_east"]),
 
-    "1a_6zb_north-west": PreRegion("1a_6zb_north-west", "1a_6zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6zb_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6zb_north-west"]),
-    "1a_6zb_main": PreRegion("1a_6zb_main", "1a_6zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6zb_main"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6zb_main"]),
-    "1a_6zb_east": PreRegion("1a_6zb_east", "1a_6zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6zb_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6zb_east"]),
+    "1a_6zb_north-west": PreRegion("1a_6zb_north-west", "1a_6zb", connections_by_region["1a_6zb_north-west"], locations_by_region["1a_6zb_north-west"]),
+    "1a_6zb_main": PreRegion("1a_6zb_main", "1a_6zb", connections_by_region["1a_6zb_main"], locations_by_region["1a_6zb_main"]),
+    "1a_6zb_east": PreRegion("1a_6zb_east", "1a_6zb", connections_by_region["1a_6zb_east"], locations_by_region["1a_6zb_east"]),
 
-    "1a_7zb_west": PreRegion("1a_7zb_west", "1a_7zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7zb_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7zb_west"]),
-    "1a_7zb_east": PreRegion("1a_7zb_east", "1a_7zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7zb_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7zb_east"]),
+    "1a_7zb_west": PreRegion("1a_7zb_west", "1a_7zb", connections_by_region["1a_7zb_west"], locations_by_region["1a_7zb_west"]),
+    "1a_7zb_east": PreRegion("1a_7zb_east", "1a_7zb", connections_by_region["1a_7zb_east"], locations_by_region["1a_7zb_east"]),
 
-    "1a_6a_west": PreRegion("1a_6a_west", "1a_6a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6a_west"]),
-    "1a_6a_east": PreRegion("1a_6a_east", "1a_6a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6a_east"]),
+    "1a_6a_west": PreRegion("1a_6a_west", "1a_6a", connections_by_region["1a_6a_west"], locations_by_region["1a_6a_west"]),
+    "1a_6a_east": PreRegion("1a_6a_east", "1a_6a", connections_by_region["1a_6a_east"], locations_by_region["1a_6a_east"]),
 
-    "1a_6b_south-west": PreRegion("1a_6b_south-west", "1a_6b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6b_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6b_south-west"]),
-    "1a_6b_north-west": PreRegion("1a_6b_north-west", "1a_6b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6b_north-west"]),
-    "1a_6b_north-east": PreRegion("1a_6b_north-east", "1a_6b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6b_north-east"]),
+    "1a_6b_south-west": PreRegion("1a_6b_south-west", "1a_6b", connections_by_region["1a_6b_south-west"], locations_by_region["1a_6b_south-west"]),
+    "1a_6b_north-west": PreRegion("1a_6b_north-west", "1a_6b", connections_by_region["1a_6b_north-west"], locations_by_region["1a_6b_north-west"]),
+    "1a_6b_north-east": PreRegion("1a_6b_north-east", "1a_6b", connections_by_region["1a_6b_north-east"], locations_by_region["1a_6b_north-east"]),
 
-    "1a_s0_west": PreRegion("1a_s0_west", "1a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_s0_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_s0_west"]),
-    "1a_s0_east": PreRegion("1a_s0_east", "1a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_s0_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_s0_east"]),
+    "1a_s0_west": PreRegion("1a_s0_west", "1a_s0", connections_by_region["1a_s0_west"], locations_by_region["1a_s0_west"]),
+    "1a_s0_east": PreRegion("1a_s0_east", "1a_s0", connections_by_region["1a_s0_east"], locations_by_region["1a_s0_east"]),
 
-    "1a_s1_east": PreRegion("1a_s1_east", "1a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_s1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_s1_east"]),
+    "1a_s1_east": PreRegion("1a_s1_east", "1a_s1", connections_by_region["1a_s1_east"], locations_by_region["1a_s1_east"]),
 
-    "1a_6c_south-west": PreRegion("1a_6c_south-west", "1a_6c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6c_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6c_south-west"]),
-    "1a_6c_north-west": PreRegion("1a_6c_north-west", "1a_6c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6c_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6c_north-west"]),
-    "1a_6c_north-east": PreRegion("1a_6c_north-east", "1a_6c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_6c_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_6c_north-east"]),
+    "1a_6c_south-west": PreRegion("1a_6c_south-west", "1a_6c", connections_by_region["1a_6c_south-west"], locations_by_region["1a_6c_south-west"]),
+    "1a_6c_north-west": PreRegion("1a_6c_north-west", "1a_6c", connections_by_region["1a_6c_north-west"], locations_by_region["1a_6c_north-west"]),
+    "1a_6c_north-east": PreRegion("1a_6c_north-east", "1a_6c", connections_by_region["1a_6c_north-east"], locations_by_region["1a_6c_north-east"]),
 
-    "1a_7_west": PreRegion("1a_7_west", "1a_7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7_west"]),
-    "1a_7_east": PreRegion("1a_7_east", "1a_7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7_east"]),
+    "1a_7_west": PreRegion("1a_7_west", "1a_7", connections_by_region["1a_7_west"], locations_by_region["1a_7_west"]),
+    "1a_7_east": PreRegion("1a_7_east", "1a_7", connections_by_region["1a_7_east"], locations_by_region["1a_7_east"]),
 
-    "1a_7z_bottom": PreRegion("1a_7z_bottom", "1a_7z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7z_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7z_bottom"]),
-    "1a_7z_top": PreRegion("1a_7z_top", "1a_7z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7z_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7z_top"]),
+    "1a_7z_bottom": PreRegion("1a_7z_bottom", "1a_7z", connections_by_region["1a_7z_bottom"], locations_by_region["1a_7z_bottom"]),
+    "1a_7z_top": PreRegion("1a_7z_top", "1a_7z", connections_by_region["1a_7z_top"], locations_by_region["1a_7z_top"]),
 
-    "1a_8z_bottom": PreRegion("1a_8z_bottom", "1a_8z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8z_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8z_bottom"]),
-    "1a_8z_top": PreRegion("1a_8z_top", "1a_8z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8z_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8z_top"]),
+    "1a_8z_bottom": PreRegion("1a_8z_bottom", "1a_8z", connections_by_region["1a_8z_bottom"], locations_by_region["1a_8z_bottom"]),
+    "1a_8z_top": PreRegion("1a_8z_top", "1a_8z", connections_by_region["1a_8z_top"], locations_by_region["1a_8z_top"]),
 
-    "1a_8zb_west": PreRegion("1a_8zb_west", "1a_8zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8zb_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8zb_west"]),
-    "1a_8zb_east": PreRegion("1a_8zb_east", "1a_8zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8zb_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8zb_east"]),
+    "1a_8zb_west": PreRegion("1a_8zb_west", "1a_8zb", connections_by_region["1a_8zb_west"], locations_by_region["1a_8zb_west"]),
+    "1a_8zb_east": PreRegion("1a_8zb_east", "1a_8zb", connections_by_region["1a_8zb_east"], locations_by_region["1a_8zb_east"]),
 
-    "1a_8_south-west": PreRegion("1a_8_south-west", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_south-west"]),
-    "1a_8_west": PreRegion("1a_8_west", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_west"]),
-    "1a_8_south": PreRegion("1a_8_south", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_south"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_south"]),
-    "1a_8_south-east": PreRegion("1a_8_south-east", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_south-east"]),
-    "1a_8_north": PreRegion("1a_8_north", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_north"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_north"]),
-    "1a_8_north-east": PreRegion("1a_8_north-east", "1a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8_north-east"]),
+    "1a_8_south-west": PreRegion("1a_8_south-west", "1a_8", connections_by_region["1a_8_south-west"], locations_by_region["1a_8_south-west"]),
+    "1a_8_west": PreRegion("1a_8_west", "1a_8", connections_by_region["1a_8_west"], locations_by_region["1a_8_west"]),
+    "1a_8_south": PreRegion("1a_8_south", "1a_8", connections_by_region["1a_8_south"], locations_by_region["1a_8_south"]),
+    "1a_8_south-east": PreRegion("1a_8_south-east", "1a_8", connections_by_region["1a_8_south-east"], locations_by_region["1a_8_south-east"]),
+    "1a_8_north": PreRegion("1a_8_north", "1a_8", connections_by_region["1a_8_north"], locations_by_region["1a_8_north"]),
+    "1a_8_north-east": PreRegion("1a_8_north-east", "1a_8", connections_by_region["1a_8_north-east"], locations_by_region["1a_8_north-east"]),
 
-    "1a_7a_east": PreRegion("1a_7a_east", "1a_7a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7a_east"]),
-    "1a_7a_west": PreRegion("1a_7a_west", "1a_7a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_7a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_7a_west"]),
+    "1a_7a_east": PreRegion("1a_7a_east", "1a_7a", connections_by_region["1a_7a_east"], locations_by_region["1a_7a_east"]),
+    "1a_7a_west": PreRegion("1a_7a_west", "1a_7a", connections_by_region["1a_7a_west"], locations_by_region["1a_7a_west"]),
 
-    "1a_9z_east": PreRegion("1a_9z_east", "1a_9z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9z_east"]),
+    "1a_9z_east": PreRegion("1a_9z_east", "1a_9z", connections_by_region["1a_9z_east"], locations_by_region["1a_9z_east"]),
 
-    "1a_8b_east": PreRegion("1a_8b_east", "1a_8b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8b_east"]),
-    "1a_8b_west": PreRegion("1a_8b_west", "1a_8b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_8b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_8b_west"]),
+    "1a_8b_east": PreRegion("1a_8b_east", "1a_8b", connections_by_region["1a_8b_east"], locations_by_region["1a_8b_east"]),
+    "1a_8b_west": PreRegion("1a_8b_west", "1a_8b", connections_by_region["1a_8b_west"], locations_by_region["1a_8b_west"]),
 
-    "1a_9_east": PreRegion("1a_9_east", "1a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9_east"]),
-    "1a_9_west": PreRegion("1a_9_west", "1a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9_west"]),
+    "1a_9_east": PreRegion("1a_9_east", "1a_9", connections_by_region["1a_9_east"], locations_by_region["1a_9_east"]),
+    "1a_9_west": PreRegion("1a_9_west", "1a_9", connections_by_region["1a_9_west"], locations_by_region["1a_9_west"]),
 
-    "1a_9b_east": PreRegion("1a_9b_east", "1a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9b_east"]),
-    "1a_9b_north-east": PreRegion("1a_9b_north-east", "1a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9b_north-east"]),
-    "1a_9b_west": PreRegion("1a_9b_west", "1a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9b_west"]),
-    "1a_9b_north-west": PreRegion("1a_9b_north-west", "1a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9b_north-west"]),
+    "1a_9b_east": PreRegion("1a_9b_east", "1a_9b", connections_by_region["1a_9b_east"], locations_by_region["1a_9b_east"]),
+    "1a_9b_north-east": PreRegion("1a_9b_north-east", "1a_9b", connections_by_region["1a_9b_north-east"], locations_by_region["1a_9b_north-east"]),
+    "1a_9b_west": PreRegion("1a_9b_west", "1a_9b", connections_by_region["1a_9b_west"], locations_by_region["1a_9b_west"]),
+    "1a_9b_north-west": PreRegion("1a_9b_north-west", "1a_9b", connections_by_region["1a_9b_north-west"], locations_by_region["1a_9b_north-west"]),
 
-    "1a_9c_west": PreRegion("1a_9c_west", "1a_9c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_9c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_9c_west"]),
+    "1a_9c_west": PreRegion("1a_9c_west", "1a_9c", connections_by_region["1a_9c_west"], locations_by_region["1a_9c_west"]),
 
-    "1a_10_south-east": PreRegion("1a_10_south-east", "1a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10_south-east"]),
-    "1a_10_south-west": PreRegion("1a_10_south-west", "1a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10_south-west"]),
-    "1a_10_north-west": PreRegion("1a_10_north-west", "1a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10_north-west"]),
-    "1a_10_north-east": PreRegion("1a_10_north-east", "1a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10_north-east"]),
+    "1a_10_south-east": PreRegion("1a_10_south-east", "1a_10", connections_by_region["1a_10_south-east"], locations_by_region["1a_10_south-east"]),
+    "1a_10_south-west": PreRegion("1a_10_south-west", "1a_10", connections_by_region["1a_10_south-west"], locations_by_region["1a_10_south-west"]),
+    "1a_10_north-west": PreRegion("1a_10_north-west", "1a_10", connections_by_region["1a_10_north-west"], locations_by_region["1a_10_north-west"]),
+    "1a_10_north-east": PreRegion("1a_10_north-east", "1a_10", connections_by_region["1a_10_north-east"], locations_by_region["1a_10_north-east"]),
 
-    "1a_10z_west": PreRegion("1a_10z_west", "1a_10z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10z_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10z_west"]),
-    "1a_10z_east": PreRegion("1a_10z_east", "1a_10z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10z_east"]),
+    "1a_10z_west": PreRegion("1a_10z_west", "1a_10z", connections_by_region["1a_10z_west"], locations_by_region["1a_10z_west"]),
+    "1a_10z_east": PreRegion("1a_10z_east", "1a_10z", connections_by_region["1a_10z_east"], locations_by_region["1a_10z_east"]),
 
-    "1a_10zb_east": PreRegion("1a_10zb_east", "1a_10zb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10zb_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10zb_east"]),
+    "1a_10zb_east": PreRegion("1a_10zb_east", "1a_10zb", connections_by_region["1a_10zb_east"], locations_by_region["1a_10zb_east"]),
 
-    "1a_11_south-east": PreRegion("1a_11_south-east", "1a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11_south-east"]),
-    "1a_11_south-west": PreRegion("1a_11_south-west", "1a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11_south-west"]),
-    "1a_11_north": PreRegion("1a_11_north", "1a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11_north"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11_north"]),
-    "1a_11_west": PreRegion("1a_11_west", "1a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11_west"]),
-    "1a_11_south": PreRegion("1a_11_south", "1a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11_south"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11_south"]),
+    "1a_11_south-east": PreRegion("1a_11_south-east", "1a_11", connections_by_region["1a_11_south-east"], locations_by_region["1a_11_south-east"]),
+    "1a_11_south-west": PreRegion("1a_11_south-west", "1a_11", connections_by_region["1a_11_south-west"], locations_by_region["1a_11_south-west"]),
+    "1a_11_north": PreRegion("1a_11_north", "1a_11", connections_by_region["1a_11_north"], locations_by_region["1a_11_north"]),
+    "1a_11_west": PreRegion("1a_11_west", "1a_11", connections_by_region["1a_11_west"], locations_by_region["1a_11_west"]),
+    "1a_11_south": PreRegion("1a_11_south", "1a_11", connections_by_region["1a_11_south"], locations_by_region["1a_11_south"]),
 
-    "1a_11z_east": PreRegion("1a_11z_east", "1a_11z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_11z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_11z_east"]),
+    "1a_11z_east": PreRegion("1a_11z_east", "1a_11z", connections_by_region["1a_11z_east"], locations_by_region["1a_11z_east"]),
 
-    "1a_10a_bottom": PreRegion("1a_10a_bottom", "1a_10a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10a_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10a_bottom"]),
-    "1a_10a_top": PreRegion("1a_10a_top", "1a_10a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_10a_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_10a_top"]),
+    "1a_10a_bottom": PreRegion("1a_10a_bottom", "1a_10a", connections_by_region["1a_10a_bottom"], locations_by_region["1a_10a_bottom"]),
+    "1a_10a_top": PreRegion("1a_10a_top", "1a_10a", connections_by_region["1a_10a_top"], locations_by_region["1a_10a_top"]),
 
-    "1a_12_south-west": PreRegion("1a_12_south-west", "1a_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12_south-west"]),
-    "1a_12_north-west": PreRegion("1a_12_north-west", "1a_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12_north-west"]),
-    "1a_12_east": PreRegion("1a_12_east", "1a_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12_east"]),
+    "1a_12_south-west": PreRegion("1a_12_south-west", "1a_12", connections_by_region["1a_12_south-west"], locations_by_region["1a_12_south-west"]),
+    "1a_12_north-west": PreRegion("1a_12_north-west", "1a_12", connections_by_region["1a_12_north-west"], locations_by_region["1a_12_north-west"]),
+    "1a_12_east": PreRegion("1a_12_east", "1a_12", connections_by_region["1a_12_east"], locations_by_region["1a_12_east"]),
 
-    "1a_12z_east": PreRegion("1a_12z_east", "1a_12z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12z_east"]),
+    "1a_12z_east": PreRegion("1a_12z_east", "1a_12z", connections_by_region["1a_12z_east"], locations_by_region["1a_12z_east"]),
 
-    "1a_12a_bottom": PreRegion("1a_12a_bottom", "1a_12a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12a_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12a_bottom"]),
-    "1a_12a_top": PreRegion("1a_12a_top", "1a_12a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_12a_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_12a_top"]),
+    "1a_12a_bottom": PreRegion("1a_12a_bottom", "1a_12a", connections_by_region["1a_12a_bottom"], locations_by_region["1a_12a_bottom"]),
+    "1a_12a_top": PreRegion("1a_12a_top", "1a_12a", connections_by_region["1a_12a_top"], locations_by_region["1a_12a_top"]),
 
-    "1a_end_south": PreRegion("1a_end_south", "1a_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_end_south"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_end_south"]),
-    "1a_end_main": PreRegion("1a_end_main", "1a_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1a_end_main"], [loc for _, loc in all_locations.items() if loc.region_name == "1a_end_main"]),
+    "1a_end_south": PreRegion("1a_end_south", "1a_end", connections_by_region["1a_end_south"], locations_by_region["1a_end_south"]),
+    "1a_end_main": PreRegion("1a_end_main", "1a_end", connections_by_region["1a_end_main"], locations_by_region["1a_end_main"]),
 
-    "1b_00_west": PreRegion("1b_00_west", "1b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_00_west"]),
-    "1b_00_east": PreRegion("1b_00_east", "1b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_00_east"]),
+    "1b_00_west": PreRegion("1b_00_west", "1b_00", connections_by_region["1b_00_west"], locations_by_region["1b_00_west"]),
+    "1b_00_east": PreRegion("1b_00_east", "1b_00", connections_by_region["1b_00_east"], locations_by_region["1b_00_east"]),
 
-    "1b_01_west": PreRegion("1b_01_west", "1b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_01_west"]),
-    "1b_01_east": PreRegion("1b_01_east", "1b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_01_east"]),
+    "1b_01_west": PreRegion("1b_01_west", "1b_01", connections_by_region["1b_01_west"], locations_by_region["1b_01_west"]),
+    "1b_01_east": PreRegion("1b_01_east", "1b_01", connections_by_region["1b_01_east"], locations_by_region["1b_01_east"]),
 
-    "1b_02_west": PreRegion("1b_02_west", "1b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_02_west"]),
-    "1b_02_east": PreRegion("1b_02_east", "1b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_02_east"]),
+    "1b_02_west": PreRegion("1b_02_west", "1b_02", connections_by_region["1b_02_west"], locations_by_region["1b_02_west"]),
+    "1b_02_east": PreRegion("1b_02_east", "1b_02", connections_by_region["1b_02_east"], locations_by_region["1b_02_east"]),
 
-    "1b_02b_west": PreRegion("1b_02b_west", "1b_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_02b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_02b_west"]),
-    "1b_02b_east": PreRegion("1b_02b_east", "1b_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_02b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_02b_east"]),
+    "1b_02b_west": PreRegion("1b_02b_west", "1b_02b", connections_by_region["1b_02b_west"], locations_by_region["1b_02b_west"]),
+    "1b_02b_east": PreRegion("1b_02b_east", "1b_02b", connections_by_region["1b_02b_east"], locations_by_region["1b_02b_east"]),
 
-    "1b_03_west": PreRegion("1b_03_west", "1b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_03_west"]),
-    "1b_03_east": PreRegion("1b_03_east", "1b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_03_east"]),
+    "1b_03_west": PreRegion("1b_03_west", "1b_03", connections_by_region["1b_03_west"], locations_by_region["1b_03_west"]),
+    "1b_03_east": PreRegion("1b_03_east", "1b_03", connections_by_region["1b_03_east"], locations_by_region["1b_03_east"]),
 
-    "1b_04_west": PreRegion("1b_04_west", "1b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_04_west"]),
-    "1b_04_east": PreRegion("1b_04_east", "1b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_04_east"]),
+    "1b_04_west": PreRegion("1b_04_west", "1b_04", connections_by_region["1b_04_west"], locations_by_region["1b_04_west"]),
+    "1b_04_east": PreRegion("1b_04_east", "1b_04", connections_by_region["1b_04_east"], locations_by_region["1b_04_east"]),
 
-    "1b_05_west": PreRegion("1b_05_west", "1b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_05_west"]),
-    "1b_05_east": PreRegion("1b_05_east", "1b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_05_east"]),
+    "1b_05_west": PreRegion("1b_05_west", "1b_05", connections_by_region["1b_05_west"], locations_by_region["1b_05_west"]),
+    "1b_05_east": PreRegion("1b_05_east", "1b_05", connections_by_region["1b_05_east"], locations_by_region["1b_05_east"]),
 
-    "1b_05b_west": PreRegion("1b_05b_west", "1b_05b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_05b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_05b_west"]),
-    "1b_05b_east": PreRegion("1b_05b_east", "1b_05b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_05b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_05b_east"]),
+    "1b_05b_west": PreRegion("1b_05b_west", "1b_05b", connections_by_region["1b_05b_west"], locations_by_region["1b_05b_west"]),
+    "1b_05b_east": PreRegion("1b_05b_east", "1b_05b", connections_by_region["1b_05b_east"], locations_by_region["1b_05b_east"]),
 
-    "1b_06_west": PreRegion("1b_06_west", "1b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_06_west"]),
-    "1b_06_east": PreRegion("1b_06_east", "1b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_06_east"]),
+    "1b_06_west": PreRegion("1b_06_west", "1b_06", connections_by_region["1b_06_west"], locations_by_region["1b_06_west"]),
+    "1b_06_east": PreRegion("1b_06_east", "1b_06", connections_by_region["1b_06_east"], locations_by_region["1b_06_east"]),
 
-    "1b_07_bottom": PreRegion("1b_07_bottom", "1b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_07_bottom"]),
-    "1b_07_top": PreRegion("1b_07_top", "1b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_07_top"]),
+    "1b_07_bottom": PreRegion("1b_07_bottom", "1b_07", connections_by_region["1b_07_bottom"], locations_by_region["1b_07_bottom"]),
+    "1b_07_top": PreRegion("1b_07_top", "1b_07", connections_by_region["1b_07_top"], locations_by_region["1b_07_top"]),
 
-    "1b_08_west": PreRegion("1b_08_west", "1b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_08_west"]),
-    "1b_08_east": PreRegion("1b_08_east", "1b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_08_east"]),
+    "1b_08_west": PreRegion("1b_08_west", "1b_08", connections_by_region["1b_08_west"], locations_by_region["1b_08_west"]),
+    "1b_08_east": PreRegion("1b_08_east", "1b_08", connections_by_region["1b_08_east"], locations_by_region["1b_08_east"]),
 
-    "1b_08b_west": PreRegion("1b_08b_west", "1b_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_08b_west"]),
-    "1b_08b_east": PreRegion("1b_08b_east", "1b_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_08b_east"]),
+    "1b_08b_west": PreRegion("1b_08b_west", "1b_08b", connections_by_region["1b_08b_west"], locations_by_region["1b_08b_west"]),
+    "1b_08b_east": PreRegion("1b_08b_east", "1b_08b", connections_by_region["1b_08b_east"], locations_by_region["1b_08b_east"]),
 
-    "1b_09_west": PreRegion("1b_09_west", "1b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_09_west"]),
-    "1b_09_east": PreRegion("1b_09_east", "1b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_09_east"]),
+    "1b_09_west": PreRegion("1b_09_west", "1b_09", connections_by_region["1b_09_west"], locations_by_region["1b_09_west"]),
+    "1b_09_east": PreRegion("1b_09_east", "1b_09", connections_by_region["1b_09_east"], locations_by_region["1b_09_east"]),
 
-    "1b_10_west": PreRegion("1b_10_west", "1b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_10_west"]),
-    "1b_10_east": PreRegion("1b_10_east", "1b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_10_east"]),
+    "1b_10_west": PreRegion("1b_10_west", "1b_10", connections_by_region["1b_10_west"], locations_by_region["1b_10_west"]),
+    "1b_10_east": PreRegion("1b_10_east", "1b_10", connections_by_region["1b_10_east"], locations_by_region["1b_10_east"]),
 
-    "1b_11_bottom": PreRegion("1b_11_bottom", "1b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_11_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_11_bottom"]),
-    "1b_11_top": PreRegion("1b_11_top", "1b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_11_top"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_11_top"]),
+    "1b_11_bottom": PreRegion("1b_11_bottom", "1b_11", connections_by_region["1b_11_bottom"], locations_by_region["1b_11_bottom"]),
+    "1b_11_top": PreRegion("1b_11_top", "1b_11", connections_by_region["1b_11_top"], locations_by_region["1b_11_top"]),
 
-    "1b_end_west": PreRegion("1b_end_west", "1b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_end_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_end_west"]),
-    "1b_end_goal": PreRegion("1b_end_goal", "1b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1b_end_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "1b_end_goal"]),
+    "1b_end_west": PreRegion("1b_end_west", "1b_end", connections_by_region["1b_end_west"], locations_by_region["1b_end_west"]),
+    "1b_end_goal": PreRegion("1b_end_goal", "1b_end", connections_by_region["1b_end_goal"], locations_by_region["1b_end_goal"]),
 
-    "1c_00_west": PreRegion("1c_00_west", "1c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_00_west"]),
-    "1c_00_east": PreRegion("1c_00_east", "1c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_00_east"]),
+    "1c_00_west": PreRegion("1c_00_west", "1c_00", connections_by_region["1c_00_west"], locations_by_region["1c_00_west"]),
+    "1c_00_east": PreRegion("1c_00_east", "1c_00", connections_by_region["1c_00_east"], locations_by_region["1c_00_east"]),
 
-    "1c_01_west": PreRegion("1c_01_west", "1c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_01_west"]),
-    "1c_01_east": PreRegion("1c_01_east", "1c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_01_east"]),
+    "1c_01_west": PreRegion("1c_01_west", "1c_01", connections_by_region["1c_01_west"], locations_by_region["1c_01_west"]),
+    "1c_01_east": PreRegion("1c_01_east", "1c_01", connections_by_region["1c_01_east"], locations_by_region["1c_01_east"]),
 
-    "1c_02_west": PreRegion("1c_02_west", "1c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_02_west"]),
-    "1c_02_goal": PreRegion("1c_02_goal", "1c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "1c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "1c_02_goal"]),
+    "1c_02_west": PreRegion("1c_02_west", "1c_02", connections_by_region["1c_02_west"], locations_by_region["1c_02_west"]),
+    "1c_02_goal": PreRegion("1c_02_goal", "1c_02", connections_by_region["1c_02_goal"], locations_by_region["1c_02_goal"]),
 
-    "2a_start_main": PreRegion("2a_start_main", "2a_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_start_main"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_start_main"]),
-    "2a_start_top": PreRegion("2a_start_top", "2a_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_start_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_start_top"]),
-    "2a_start_east": PreRegion("2a_start_east", "2a_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_start_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_start_east"]),
+    "2a_start_main": PreRegion("2a_start_main", "2a_start", connections_by_region["2a_start_main"], locations_by_region["2a_start_main"]),
+    "2a_start_top": PreRegion("2a_start_top", "2a_start", connections_by_region["2a_start_top"], locations_by_region["2a_start_top"]),
+    "2a_start_east": PreRegion("2a_start_east", "2a_start", connections_by_region["2a_start_east"], locations_by_region["2a_start_east"]),
 
-    "2a_s0_bottom": PreRegion("2a_s0_bottom", "2a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_s0_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_s0_bottom"]),
-    "2a_s0_top": PreRegion("2a_s0_top", "2a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_s0_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_s0_top"]),
+    "2a_s0_bottom": PreRegion("2a_s0_bottom", "2a_s0", connections_by_region["2a_s0_bottom"], locations_by_region["2a_s0_bottom"]),
+    "2a_s0_top": PreRegion("2a_s0_top", "2a_s0", connections_by_region["2a_s0_top"], locations_by_region["2a_s0_top"]),
 
-    "2a_s1_bottom": PreRegion("2a_s1_bottom", "2a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_s1_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_s1_bottom"]),
-    "2a_s1_top": PreRegion("2a_s1_top", "2a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_s1_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_s1_top"]),
+    "2a_s1_bottom": PreRegion("2a_s1_bottom", "2a_s1", connections_by_region["2a_s1_bottom"], locations_by_region["2a_s1_bottom"]),
+    "2a_s1_top": PreRegion("2a_s1_top", "2a_s1", connections_by_region["2a_s1_top"], locations_by_region["2a_s1_top"]),
 
-    "2a_s2_bottom": PreRegion("2a_s2_bottom", "2a_s2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_s2_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_s2_bottom"]),
+    "2a_s2_bottom": PreRegion("2a_s2_bottom", "2a_s2", connections_by_region["2a_s2_bottom"], locations_by_region["2a_s2_bottom"]),
 
-    "2a_0_south-west": PreRegion("2a_0_south-west", "2a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_0_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_0_south-west"]),
-    "2a_0_south-east": PreRegion("2a_0_south-east", "2a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_0_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_0_south-east"]),
-    "2a_0_north-west": PreRegion("2a_0_north-west", "2a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_0_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_0_north-west"]),
-    "2a_0_north-east": PreRegion("2a_0_north-east", "2a_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_0_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_0_north-east"]),
+    "2a_0_south-west": PreRegion("2a_0_south-west", "2a_0", connections_by_region["2a_0_south-west"], locations_by_region["2a_0_south-west"]),
+    "2a_0_south-east": PreRegion("2a_0_south-east", "2a_0", connections_by_region["2a_0_south-east"], locations_by_region["2a_0_south-east"]),
+    "2a_0_north-west": PreRegion("2a_0_north-west", "2a_0", connections_by_region["2a_0_north-west"], locations_by_region["2a_0_north-west"]),
+    "2a_0_north-east": PreRegion("2a_0_north-east", "2a_0", connections_by_region["2a_0_north-east"], locations_by_region["2a_0_north-east"]),
 
-    "2a_1_south-west": PreRegion("2a_1_south-west", "2a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_1_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_1_south-west"]),
-    "2a_1_south": PreRegion("2a_1_south", "2a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_1_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_1_south"]),
-    "2a_1_south-east": PreRegion("2a_1_south-east", "2a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_1_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_1_south-east"]),
-    "2a_1_north-west": PreRegion("2a_1_north-west", "2a_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_1_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_1_north-west"]),
+    "2a_1_south-west": PreRegion("2a_1_south-west", "2a_1", connections_by_region["2a_1_south-west"], locations_by_region["2a_1_south-west"]),
+    "2a_1_south": PreRegion("2a_1_south", "2a_1", connections_by_region["2a_1_south"], locations_by_region["2a_1_south"]),
+    "2a_1_south-east": PreRegion("2a_1_south-east", "2a_1", connections_by_region["2a_1_south-east"], locations_by_region["2a_1_south-east"]),
+    "2a_1_north-west": PreRegion("2a_1_north-west", "2a_1", connections_by_region["2a_1_north-west"], locations_by_region["2a_1_north-west"]),
 
-    "2a_d0_north": PreRegion("2a_d0_north", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_north"]),
-    "2a_d0_north-west": PreRegion("2a_d0_north-west", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_north-west"]),
-    "2a_d0_west": PreRegion("2a_d0_west", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_west"]),
-    "2a_d0_south-west": PreRegion("2a_d0_south-west", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_south-west"]),
-    "2a_d0_south": PreRegion("2a_d0_south", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_south"]),
-    "2a_d0_south-east": PreRegion("2a_d0_south-east", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_south-east"]),
-    "2a_d0_east": PreRegion("2a_d0_east", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_east"]),
-    "2a_d0_north-east": PreRegion("2a_d0_north-east", "2a_d0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d0_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d0_north-east"]),
+    "2a_d0_north": PreRegion("2a_d0_north", "2a_d0", connections_by_region["2a_d0_north"], locations_by_region["2a_d0_north"]),
+    "2a_d0_north-west": PreRegion("2a_d0_north-west", "2a_d0", connections_by_region["2a_d0_north-west"], locations_by_region["2a_d0_north-west"]),
+    "2a_d0_west": PreRegion("2a_d0_west", "2a_d0", connections_by_region["2a_d0_west"], locations_by_region["2a_d0_west"]),
+    "2a_d0_south-west": PreRegion("2a_d0_south-west", "2a_d0", connections_by_region["2a_d0_south-west"], locations_by_region["2a_d0_south-west"]),
+    "2a_d0_south": PreRegion("2a_d0_south", "2a_d0", connections_by_region["2a_d0_south"], locations_by_region["2a_d0_south"]),
+    "2a_d0_south-east": PreRegion("2a_d0_south-east", "2a_d0", connections_by_region["2a_d0_south-east"], locations_by_region["2a_d0_south-east"]),
+    "2a_d0_east": PreRegion("2a_d0_east", "2a_d0", connections_by_region["2a_d0_east"], locations_by_region["2a_d0_east"]),
+    "2a_d0_north-east": PreRegion("2a_d0_north-east", "2a_d0", connections_by_region["2a_d0_north-east"], locations_by_region["2a_d0_north-east"]),
 
-    "2a_d7_west": PreRegion("2a_d7_west", "2a_d7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d7_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d7_west"]),
-    "2a_d7_east": PreRegion("2a_d7_east", "2a_d7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d7_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d7_east"]),
+    "2a_d7_west": PreRegion("2a_d7_west", "2a_d7", connections_by_region["2a_d7_west"], locations_by_region["2a_d7_west"]),
+    "2a_d7_east": PreRegion("2a_d7_east", "2a_d7", connections_by_region["2a_d7_east"], locations_by_region["2a_d7_east"]),
 
-    "2a_d8_west": PreRegion("2a_d8_west", "2a_d8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d8_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d8_west"]),
-    "2a_d8_south-east": PreRegion("2a_d8_south-east", "2a_d8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d8_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d8_south-east"]),
-    "2a_d8_north-east": PreRegion("2a_d8_north-east", "2a_d8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d8_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d8_north-east"]),
+    "2a_d8_west": PreRegion("2a_d8_west", "2a_d8", connections_by_region["2a_d8_west"], locations_by_region["2a_d8_west"]),
+    "2a_d8_south-east": PreRegion("2a_d8_south-east", "2a_d8", connections_by_region["2a_d8_south-east"], locations_by_region["2a_d8_south-east"]),
+    "2a_d8_north-east": PreRegion("2a_d8_north-east", "2a_d8", connections_by_region["2a_d8_north-east"], locations_by_region["2a_d8_north-east"]),
 
-    "2a_d3_west": PreRegion("2a_d3_west", "2a_d3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d3_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d3_west"]),
-    "2a_d3_north": PreRegion("2a_d3_north", "2a_d3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d3_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d3_north"]),
-    "2a_d3_south": PreRegion("2a_d3_south", "2a_d3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d3_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d3_south"]),
+    "2a_d3_west": PreRegion("2a_d3_west", "2a_d3", connections_by_region["2a_d3_west"], locations_by_region["2a_d3_west"]),
+    "2a_d3_north": PreRegion("2a_d3_north", "2a_d3", connections_by_region["2a_d3_north"], locations_by_region["2a_d3_north"]),
+    "2a_d3_south": PreRegion("2a_d3_south", "2a_d3", connections_by_region["2a_d3_south"], locations_by_region["2a_d3_south"]),
 
-    "2a_d2_west": PreRegion("2a_d2_west", "2a_d2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d2_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d2_west"]),
-    "2a_d2_north-west": PreRegion("2a_d2_north-west", "2a_d2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d2_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d2_north-west"]),
-    "2a_d2_east": PreRegion("2a_d2_east", "2a_d2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d2_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d2_east"]),
+    "2a_d2_west": PreRegion("2a_d2_west", "2a_d2", connections_by_region["2a_d2_west"], locations_by_region["2a_d2_west"]),
+    "2a_d2_north-west": PreRegion("2a_d2_north-west", "2a_d2", connections_by_region["2a_d2_north-west"], locations_by_region["2a_d2_north-west"]),
+    "2a_d2_east": PreRegion("2a_d2_east", "2a_d2", connections_by_region["2a_d2_east"], locations_by_region["2a_d2_east"]),
 
-    "2a_d9_north-west": PreRegion("2a_d9_north-west", "2a_d9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d9_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d9_north-west"]),
+    "2a_d9_north-west": PreRegion("2a_d9_north-west", "2a_d9", connections_by_region["2a_d9_north-west"], locations_by_region["2a_d9_north-west"]),
 
-    "2a_d1_south-west": PreRegion("2a_d1_south-west", "2a_d1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d1_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d1_south-west"]),
-    "2a_d1_south-east": PreRegion("2a_d1_south-east", "2a_d1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d1_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d1_south-east"]),
-    "2a_d1_north-east": PreRegion("2a_d1_north-east", "2a_d1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d1_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d1_north-east"]),
+    "2a_d1_south-west": PreRegion("2a_d1_south-west", "2a_d1", connections_by_region["2a_d1_south-west"], locations_by_region["2a_d1_south-west"]),
+    "2a_d1_south-east": PreRegion("2a_d1_south-east", "2a_d1", connections_by_region["2a_d1_south-east"], locations_by_region["2a_d1_south-east"]),
+    "2a_d1_north-east": PreRegion("2a_d1_north-east", "2a_d1", connections_by_region["2a_d1_north-east"], locations_by_region["2a_d1_north-east"]),
 
-    "2a_d6_west": PreRegion("2a_d6_west", "2a_d6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d6_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d6_west"]),
-    "2a_d6_east": PreRegion("2a_d6_east", "2a_d6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d6_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d6_east"]),
+    "2a_d6_west": PreRegion("2a_d6_west", "2a_d6", connections_by_region["2a_d6_west"], locations_by_region["2a_d6_west"]),
+    "2a_d6_east": PreRegion("2a_d6_east", "2a_d6", connections_by_region["2a_d6_east"], locations_by_region["2a_d6_east"]),
 
-    "2a_d4_west": PreRegion("2a_d4_west", "2a_d4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d4_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d4_west"]),
-    "2a_d4_east": PreRegion("2a_d4_east", "2a_d4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d4_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d4_east"]),
-    "2a_d4_south": PreRegion("2a_d4_south", "2a_d4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d4_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d4_south"]),
+    "2a_d4_west": PreRegion("2a_d4_west", "2a_d4", connections_by_region["2a_d4_west"], locations_by_region["2a_d4_west"]),
+    "2a_d4_east": PreRegion("2a_d4_east", "2a_d4", connections_by_region["2a_d4_east"], locations_by_region["2a_d4_east"]),
+    "2a_d4_south": PreRegion("2a_d4_south", "2a_d4", connections_by_region["2a_d4_south"], locations_by_region["2a_d4_south"]),
 
-    "2a_d5_west": PreRegion("2a_d5_west", "2a_d5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_d5_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_d5_west"]),
+    "2a_d5_west": PreRegion("2a_d5_west", "2a_d5", connections_by_region["2a_d5_west"], locations_by_region["2a_d5_west"]),
 
-    "2a_3x_bottom": PreRegion("2a_3x_bottom", "2a_3x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_3x_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_3x_bottom"]),
-    "2a_3x_top": PreRegion("2a_3x_top", "2a_3x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_3x_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_3x_top"]),
+    "2a_3x_bottom": PreRegion("2a_3x_bottom", "2a_3x", connections_by_region["2a_3x_bottom"], locations_by_region["2a_3x_bottom"]),
+    "2a_3x_top": PreRegion("2a_3x_top", "2a_3x", connections_by_region["2a_3x_top"], locations_by_region["2a_3x_top"]),
 
-    "2a_3_bottom": PreRegion("2a_3_bottom", "2a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_3_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_3_bottom"]),
-    "2a_3_top": PreRegion("2a_3_top", "2a_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_3_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_3_top"]),
+    "2a_3_bottom": PreRegion("2a_3_bottom", "2a_3", connections_by_region["2a_3_bottom"], locations_by_region["2a_3_bottom"]),
+    "2a_3_top": PreRegion("2a_3_top", "2a_3", connections_by_region["2a_3_top"], locations_by_region["2a_3_top"]),
 
-    "2a_4_bottom": PreRegion("2a_4_bottom", "2a_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_4_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_4_bottom"]),
-    "2a_4_top": PreRegion("2a_4_top", "2a_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_4_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_4_top"]),
+    "2a_4_bottom": PreRegion("2a_4_bottom", "2a_4", connections_by_region["2a_4_bottom"], locations_by_region["2a_4_bottom"]),
+    "2a_4_top": PreRegion("2a_4_top", "2a_4", connections_by_region["2a_4_top"], locations_by_region["2a_4_top"]),
 
-    "2a_5_bottom": PreRegion("2a_5_bottom", "2a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_5_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_5_bottom"]),
-    "2a_5_top": PreRegion("2a_5_top", "2a_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_5_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_5_top"]),
+    "2a_5_bottom": PreRegion("2a_5_bottom", "2a_5", connections_by_region["2a_5_bottom"], locations_by_region["2a_5_bottom"]),
+    "2a_5_top": PreRegion("2a_5_top", "2a_5", connections_by_region["2a_5_top"], locations_by_region["2a_5_top"]),
 
-    "2a_6_bottom": PreRegion("2a_6_bottom", "2a_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_6_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_6_bottom"]),
-    "2a_6_top": PreRegion("2a_6_top", "2a_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_6_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_6_top"]),
+    "2a_6_bottom": PreRegion("2a_6_bottom", "2a_6", connections_by_region["2a_6_bottom"], locations_by_region["2a_6_bottom"]),
+    "2a_6_top": PreRegion("2a_6_top", "2a_6", connections_by_region["2a_6_top"], locations_by_region["2a_6_top"]),
 
-    "2a_7_bottom": PreRegion("2a_7_bottom", "2a_7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_7_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_7_bottom"]),
-    "2a_7_top": PreRegion("2a_7_top", "2a_7", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_7_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_7_top"]),
+    "2a_7_bottom": PreRegion("2a_7_bottom", "2a_7", connections_by_region["2a_7_bottom"], locations_by_region["2a_7_bottom"]),
+    "2a_7_top": PreRegion("2a_7_top", "2a_7", connections_by_region["2a_7_top"], locations_by_region["2a_7_top"]),
 
-    "2a_8_bottom": PreRegion("2a_8_bottom", "2a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_8_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_8_bottom"]),
-    "2a_8_top": PreRegion("2a_8_top", "2a_8", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_8_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_8_top"]),
+    "2a_8_bottom": PreRegion("2a_8_bottom", "2a_8", connections_by_region["2a_8_bottom"], locations_by_region["2a_8_bottom"]),
+    "2a_8_top": PreRegion("2a_8_top", "2a_8", connections_by_region["2a_8_top"], locations_by_region["2a_8_top"]),
 
-    "2a_9_west": PreRegion("2a_9_west", "2a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9_west"]),
-    "2a_9_north": PreRegion("2a_9_north", "2a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9_north"]),
-    "2a_9_north-west": PreRegion("2a_9_north-west", "2a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9_north-west"]),
-    "2a_9_south": PreRegion("2a_9_south", "2a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9_south"]),
-    "2a_9_south-east": PreRegion("2a_9_south-east", "2a_9", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9_south-east"]),
+    "2a_9_west": PreRegion("2a_9_west", "2a_9", connections_by_region["2a_9_west"], locations_by_region["2a_9_west"]),
+    "2a_9_north": PreRegion("2a_9_north", "2a_9", connections_by_region["2a_9_north"], locations_by_region["2a_9_north"]),
+    "2a_9_north-west": PreRegion("2a_9_north-west", "2a_9", connections_by_region["2a_9_north-west"], locations_by_region["2a_9_north-west"]),
+    "2a_9_south": PreRegion("2a_9_south", "2a_9", connections_by_region["2a_9_south"], locations_by_region["2a_9_south"]),
+    "2a_9_south-east": PreRegion("2a_9_south-east", "2a_9", connections_by_region["2a_9_south-east"], locations_by_region["2a_9_south-east"]),
 
-    "2a_9b_east": PreRegion("2a_9b_east", "2a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9b_east"]),
-    "2a_9b_west": PreRegion("2a_9b_west", "2a_9b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_9b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_9b_west"]),
+    "2a_9b_east": PreRegion("2a_9b_east", "2a_9b", connections_by_region["2a_9b_east"], locations_by_region["2a_9b_east"]),
+    "2a_9b_west": PreRegion("2a_9b_west", "2a_9b", connections_by_region["2a_9b_west"], locations_by_region["2a_9b_west"]),
 
-    "2a_10_top": PreRegion("2a_10_top", "2a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_10_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_10_top"]),
-    "2a_10_bottom": PreRegion("2a_10_bottom", "2a_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_10_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_10_bottom"]),
+    "2a_10_top": PreRegion("2a_10_top", "2a_10", connections_by_region["2a_10_top"], locations_by_region["2a_10_top"]),
+    "2a_10_bottom": PreRegion("2a_10_bottom", "2a_10", connections_by_region["2a_10_bottom"], locations_by_region["2a_10_bottom"]),
 
-    "2a_2_north-west": PreRegion("2a_2_north-west", "2a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_2_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_2_north-west"]),
-    "2a_2_south-west": PreRegion("2a_2_south-west", "2a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_2_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_2_south-west"]),
-    "2a_2_south-east": PreRegion("2a_2_south-east", "2a_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_2_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_2_south-east"]),
+    "2a_2_north-west": PreRegion("2a_2_north-west", "2a_2", connections_by_region["2a_2_north-west"], locations_by_region["2a_2_north-west"]),
+    "2a_2_south-west": PreRegion("2a_2_south-west", "2a_2", connections_by_region["2a_2_south-west"], locations_by_region["2a_2_south-west"]),
+    "2a_2_south-east": PreRegion("2a_2_south-east", "2a_2", connections_by_region["2a_2_south-east"], locations_by_region["2a_2_south-east"]),
 
-    "2a_11_west": PreRegion("2a_11_west", "2a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_11_west"]),
-    "2a_11_east": PreRegion("2a_11_east", "2a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_11_east"]),
+    "2a_11_west": PreRegion("2a_11_west", "2a_11", connections_by_region["2a_11_west"], locations_by_region["2a_11_west"]),
+    "2a_11_east": PreRegion("2a_11_east", "2a_11", connections_by_region["2a_11_east"], locations_by_region["2a_11_east"]),
 
-    "2a_12b_west": PreRegion("2a_12b_west", "2a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12b_west"]),
-    "2a_12b_north": PreRegion("2a_12b_north", "2a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12b_north"]),
-    "2a_12b_south": PreRegion("2a_12b_south", "2a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12b_south"]),
-    "2a_12b_east": PreRegion("2a_12b_east", "2a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12b_east"]),
-    "2a_12b_south-east": PreRegion("2a_12b_south-east", "2a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12b_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12b_south-east"]),
+    "2a_12b_west": PreRegion("2a_12b_west", "2a_12b", connections_by_region["2a_12b_west"], locations_by_region["2a_12b_west"]),
+    "2a_12b_north": PreRegion("2a_12b_north", "2a_12b", connections_by_region["2a_12b_north"], locations_by_region["2a_12b_north"]),
+    "2a_12b_south": PreRegion("2a_12b_south", "2a_12b", connections_by_region["2a_12b_south"], locations_by_region["2a_12b_south"]),
+    "2a_12b_east": PreRegion("2a_12b_east", "2a_12b", connections_by_region["2a_12b_east"], locations_by_region["2a_12b_east"]),
+    "2a_12b_south-east": PreRegion("2a_12b_south-east", "2a_12b", connections_by_region["2a_12b_south-east"], locations_by_region["2a_12b_south-east"]),
 
-    "2a_12c_south": PreRegion("2a_12c_south", "2a_12c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12c_south"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12c_south"]),
+    "2a_12c_south": PreRegion("2a_12c_south", "2a_12c", connections_by_region["2a_12c_south"], locations_by_region["2a_12c_south"]),
 
-    "2a_12d_north-west": PreRegion("2a_12d_north-west", "2a_12d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12d_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12d_north-west"]),
-    "2a_12d_north": PreRegion("2a_12d_north", "2a_12d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12d_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12d_north"]),
+    "2a_12d_north-west": PreRegion("2a_12d_north-west", "2a_12d", connections_by_region["2a_12d_north-west"], locations_by_region["2a_12d_north-west"]),
+    "2a_12d_north": PreRegion("2a_12d_north", "2a_12d", connections_by_region["2a_12d_north"], locations_by_region["2a_12d_north"]),
 
-    "2a_12_west": PreRegion("2a_12_west", "2a_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12_west"]),
-    "2a_12_east": PreRegion("2a_12_east", "2a_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_12_east"]),
+    "2a_12_west": PreRegion("2a_12_west", "2a_12", connections_by_region["2a_12_west"], locations_by_region["2a_12_west"]),
+    "2a_12_east": PreRegion("2a_12_east", "2a_12", connections_by_region["2a_12_east"], locations_by_region["2a_12_east"]),
 
-    "2a_13_west": PreRegion("2a_13_west", "2a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_13_west"]),
-    "2a_13_phone": PreRegion("2a_13_phone", "2a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_13_phone"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_13_phone"]),
+    "2a_13_west": PreRegion("2a_13_west", "2a_13", connections_by_region["2a_13_west"], locations_by_region["2a_13_west"]),
+    "2a_13_phone": PreRegion("2a_13_phone", "2a_13", connections_by_region["2a_13_phone"], locations_by_region["2a_13_phone"]),
 
-    "2a_end_0_main": PreRegion("2a_end_0_main", "2a_end_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_0_main"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_0_main"]),
-    "2a_end_0_top": PreRegion("2a_end_0_top", "2a_end_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_0_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_0_top"]),
-    "2a_end_0_east": PreRegion("2a_end_0_east", "2a_end_0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_0_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_0_east"]),
+    "2a_end_0_main": PreRegion("2a_end_0_main", "2a_end_0", connections_by_region["2a_end_0_main"], locations_by_region["2a_end_0_main"]),
+    "2a_end_0_top": PreRegion("2a_end_0_top", "2a_end_0", connections_by_region["2a_end_0_top"], locations_by_region["2a_end_0_top"]),
+    "2a_end_0_east": PreRegion("2a_end_0_east", "2a_end_0", connections_by_region["2a_end_0_east"], locations_by_region["2a_end_0_east"]),
 
-    "2a_end_s0_bottom": PreRegion("2a_end_s0_bottom", "2a_end_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_s0_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_s0_bottom"]),
-    "2a_end_s0_top": PreRegion("2a_end_s0_top", "2a_end_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_s0_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_s0_top"]),
+    "2a_end_s0_bottom": PreRegion("2a_end_s0_bottom", "2a_end_s0", connections_by_region["2a_end_s0_bottom"], locations_by_region["2a_end_s0_bottom"]),
+    "2a_end_s0_top": PreRegion("2a_end_s0_top", "2a_end_s0", connections_by_region["2a_end_s0_top"], locations_by_region["2a_end_s0_top"]),
 
-    "2a_end_s1_bottom": PreRegion("2a_end_s1_bottom", "2a_end_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_s1_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_s1_bottom"]),
+    "2a_end_s1_bottom": PreRegion("2a_end_s1_bottom", "2a_end_s1", connections_by_region["2a_end_s1_bottom"], locations_by_region["2a_end_s1_bottom"]),
 
-    "2a_end_1_west": PreRegion("2a_end_1_west", "2a_end_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_1_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_1_west"]),
-    "2a_end_1_north-east": PreRegion("2a_end_1_north-east", "2a_end_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_1_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_1_north-east"]),
-    "2a_end_1_east": PreRegion("2a_end_1_east", "2a_end_1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_1_east"]),
+    "2a_end_1_west": PreRegion("2a_end_1_west", "2a_end_1", connections_by_region["2a_end_1_west"], locations_by_region["2a_end_1_west"]),
+    "2a_end_1_north-east": PreRegion("2a_end_1_north-east", "2a_end_1", connections_by_region["2a_end_1_north-east"], locations_by_region["2a_end_1_north-east"]),
+    "2a_end_1_east": PreRegion("2a_end_1_east", "2a_end_1", connections_by_region["2a_end_1_east"], locations_by_region["2a_end_1_east"]),
 
-    "2a_end_2_north-west": PreRegion("2a_end_2_north-west", "2a_end_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_2_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_2_north-west"]),
-    "2a_end_2_west": PreRegion("2a_end_2_west", "2a_end_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_2_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_2_west"]),
-    "2a_end_2_north-east": PreRegion("2a_end_2_north-east", "2a_end_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_2_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_2_north-east"]),
-    "2a_end_2_east": PreRegion("2a_end_2_east", "2a_end_2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_2_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_2_east"]),
+    "2a_end_2_north-west": PreRegion("2a_end_2_north-west", "2a_end_2", connections_by_region["2a_end_2_north-west"], locations_by_region["2a_end_2_north-west"]),
+    "2a_end_2_west": PreRegion("2a_end_2_west", "2a_end_2", connections_by_region["2a_end_2_west"], locations_by_region["2a_end_2_west"]),
+    "2a_end_2_north-east": PreRegion("2a_end_2_north-east", "2a_end_2", connections_by_region["2a_end_2_north-east"], locations_by_region["2a_end_2_north-east"]),
+    "2a_end_2_east": PreRegion("2a_end_2_east", "2a_end_2", connections_by_region["2a_end_2_east"], locations_by_region["2a_end_2_east"]),
 
-    "2a_end_3_north-west": PreRegion("2a_end_3_north-west", "2a_end_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3_north-west"]),
-    "2a_end_3_west": PreRegion("2a_end_3_west", "2a_end_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3_west"]),
-    "2a_end_3_east": PreRegion("2a_end_3_east", "2a_end_3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3_east"]),
+    "2a_end_3_north-west": PreRegion("2a_end_3_north-west", "2a_end_3", connections_by_region["2a_end_3_north-west"], locations_by_region["2a_end_3_north-west"]),
+    "2a_end_3_west": PreRegion("2a_end_3_west", "2a_end_3", connections_by_region["2a_end_3_west"], locations_by_region["2a_end_3_west"]),
+    "2a_end_3_east": PreRegion("2a_end_3_east", "2a_end_3", connections_by_region["2a_end_3_east"], locations_by_region["2a_end_3_east"]),
 
-    "2a_end_4_west": PreRegion("2a_end_4_west", "2a_end_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_4_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_4_west"]),
-    "2a_end_4_east": PreRegion("2a_end_4_east", "2a_end_4", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_4_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_4_east"]),
+    "2a_end_4_west": PreRegion("2a_end_4_west", "2a_end_4", connections_by_region["2a_end_4_west"], locations_by_region["2a_end_4_west"]),
+    "2a_end_4_east": PreRegion("2a_end_4_east", "2a_end_4", connections_by_region["2a_end_4_east"], locations_by_region["2a_end_4_east"]),
 
-    "2a_end_3b_west": PreRegion("2a_end_3b_west", "2a_end_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3b_west"]),
-    "2a_end_3b_north": PreRegion("2a_end_3b_north", "2a_end_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3b_north"]),
-    "2a_end_3b_east": PreRegion("2a_end_3b_east", "2a_end_3b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3b_east"]),
+    "2a_end_3b_west": PreRegion("2a_end_3b_west", "2a_end_3b", connections_by_region["2a_end_3b_west"], locations_by_region["2a_end_3b_west"]),
+    "2a_end_3b_north": PreRegion("2a_end_3b_north", "2a_end_3b", connections_by_region["2a_end_3b_north"], locations_by_region["2a_end_3b_north"]),
+    "2a_end_3b_east": PreRegion("2a_end_3b_east", "2a_end_3b", connections_by_region["2a_end_3b_east"], locations_by_region["2a_end_3b_east"]),
 
-    "2a_end_3cb_bottom": PreRegion("2a_end_3cb_bottom", "2a_end_3cb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3cb_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3cb_bottom"]),
-    "2a_end_3cb_top": PreRegion("2a_end_3cb_top", "2a_end_3cb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3cb_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3cb_top"]),
+    "2a_end_3cb_bottom": PreRegion("2a_end_3cb_bottom", "2a_end_3cb", connections_by_region["2a_end_3cb_bottom"], locations_by_region["2a_end_3cb_bottom"]),
+    "2a_end_3cb_top": PreRegion("2a_end_3cb_top", "2a_end_3cb", connections_by_region["2a_end_3cb_top"], locations_by_region["2a_end_3cb_top"]),
 
-    "2a_end_3c_bottom": PreRegion("2a_end_3c_bottom", "2a_end_3c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_3c_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_3c_bottom"]),
+    "2a_end_3c_bottom": PreRegion("2a_end_3c_bottom", "2a_end_3c", connections_by_region["2a_end_3c_bottom"], locations_by_region["2a_end_3c_bottom"]),
 
-    "2a_end_5_west": PreRegion("2a_end_5_west", "2a_end_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_5_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_5_west"]),
-    "2a_end_5_east": PreRegion("2a_end_5_east", "2a_end_5", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_5_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_5_east"]),
+    "2a_end_5_west": PreRegion("2a_end_5_west", "2a_end_5", connections_by_region["2a_end_5_west"], locations_by_region["2a_end_5_west"]),
+    "2a_end_5_east": PreRegion("2a_end_5_east", "2a_end_5", connections_by_region["2a_end_5_east"], locations_by_region["2a_end_5_east"]),
 
-    "2a_end_6_west": PreRegion("2a_end_6_west", "2a_end_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_6_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_6_west"]),
-    "2a_end_6_main": PreRegion("2a_end_6_main", "2a_end_6", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2a_end_6_main"], [loc for _, loc in all_locations.items() if loc.region_name == "2a_end_6_main"]),
+    "2a_end_6_west": PreRegion("2a_end_6_west", "2a_end_6", connections_by_region["2a_end_6_west"], locations_by_region["2a_end_6_west"]),
+    "2a_end_6_main": PreRegion("2a_end_6_main", "2a_end_6", connections_by_region["2a_end_6_main"], locations_by_region["2a_end_6_main"]),
 
-    "2b_start_west": PreRegion("2b_start_west", "2b_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_start_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_start_west"]),
-    "2b_start_east": PreRegion("2b_start_east", "2b_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_start_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_start_east"]),
+    "2b_start_west": PreRegion("2b_start_west", "2b_start", connections_by_region["2b_start_west"], locations_by_region["2b_start_west"]),
+    "2b_start_east": PreRegion("2b_start_east", "2b_start", connections_by_region["2b_start_east"], locations_by_region["2b_start_east"]),
 
-    "2b_00_west": PreRegion("2b_00_west", "2b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_00_west"]),
-    "2b_00_east": PreRegion("2b_00_east", "2b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_00_east"]),
+    "2b_00_west": PreRegion("2b_00_west", "2b_00", connections_by_region["2b_00_west"], locations_by_region["2b_00_west"]),
+    "2b_00_east": PreRegion("2b_00_east", "2b_00", connections_by_region["2b_00_east"], locations_by_region["2b_00_east"]),
 
-    "2b_01_west": PreRegion("2b_01_west", "2b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_01_west"]),
-    "2b_01_east": PreRegion("2b_01_east", "2b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_01_east"]),
+    "2b_01_west": PreRegion("2b_01_west", "2b_01", connections_by_region["2b_01_west"], locations_by_region["2b_01_west"]),
+    "2b_01_east": PreRegion("2b_01_east", "2b_01", connections_by_region["2b_01_east"], locations_by_region["2b_01_east"]),
 
-    "2b_01b_west": PreRegion("2b_01b_west", "2b_01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_01b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_01b_west"]),
-    "2b_01b_east": PreRegion("2b_01b_east", "2b_01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_01b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_01b_east"]),
+    "2b_01b_west": PreRegion("2b_01b_west", "2b_01b", connections_by_region["2b_01b_west"], locations_by_region["2b_01b_west"]),
+    "2b_01b_east": PreRegion("2b_01b_east", "2b_01b", connections_by_region["2b_01b_east"], locations_by_region["2b_01b_east"]),
 
-    "2b_02b_west": PreRegion("2b_02b_west", "2b_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_02b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_02b_west"]),
-    "2b_02b_east": PreRegion("2b_02b_east", "2b_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_02b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_02b_east"]),
+    "2b_02b_west": PreRegion("2b_02b_west", "2b_02b", connections_by_region["2b_02b_west"], locations_by_region["2b_02b_west"]),
+    "2b_02b_east": PreRegion("2b_02b_east", "2b_02b", connections_by_region["2b_02b_east"], locations_by_region["2b_02b_east"]),
 
-    "2b_02_west": PreRegion("2b_02_west", "2b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_02_west"]),
-    "2b_02_east": PreRegion("2b_02_east", "2b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_02_east"]),
+    "2b_02_west": PreRegion("2b_02_west", "2b_02", connections_by_region["2b_02_west"], locations_by_region["2b_02_west"]),
+    "2b_02_east": PreRegion("2b_02_east", "2b_02", connections_by_region["2b_02_east"], locations_by_region["2b_02_east"]),
 
-    "2b_03_west": PreRegion("2b_03_west", "2b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_03_west"]),
-    "2b_03_east": PreRegion("2b_03_east", "2b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_03_east"]),
+    "2b_03_west": PreRegion("2b_03_west", "2b_03", connections_by_region["2b_03_west"], locations_by_region["2b_03_west"]),
+    "2b_03_east": PreRegion("2b_03_east", "2b_03", connections_by_region["2b_03_east"], locations_by_region["2b_03_east"]),
 
-    "2b_04_bottom": PreRegion("2b_04_bottom", "2b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_04_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_04_bottom"]),
-    "2b_04_top": PreRegion("2b_04_top", "2b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_04_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_04_top"]),
+    "2b_04_bottom": PreRegion("2b_04_bottom", "2b_04", connections_by_region["2b_04_bottom"], locations_by_region["2b_04_bottom"]),
+    "2b_04_top": PreRegion("2b_04_top", "2b_04", connections_by_region["2b_04_top"], locations_by_region["2b_04_top"]),
 
-    "2b_05_bottom": PreRegion("2b_05_bottom", "2b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_05_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_05_bottom"]),
-    "2b_05_top": PreRegion("2b_05_top", "2b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_05_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_05_top"]),
+    "2b_05_bottom": PreRegion("2b_05_bottom", "2b_05", connections_by_region["2b_05_bottom"], locations_by_region["2b_05_bottom"]),
+    "2b_05_top": PreRegion("2b_05_top", "2b_05", connections_by_region["2b_05_top"], locations_by_region["2b_05_top"]),
 
-    "2b_06_west": PreRegion("2b_06_west", "2b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_06_west"]),
-    "2b_06_east": PreRegion("2b_06_east", "2b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_06_east"]),
+    "2b_06_west": PreRegion("2b_06_west", "2b_06", connections_by_region["2b_06_west"], locations_by_region["2b_06_west"]),
+    "2b_06_east": PreRegion("2b_06_east", "2b_06", connections_by_region["2b_06_east"], locations_by_region["2b_06_east"]),
 
-    "2b_07_bottom": PreRegion("2b_07_bottom", "2b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_07_bottom"]),
-    "2b_07_top": PreRegion("2b_07_top", "2b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_07_top"]),
+    "2b_07_bottom": PreRegion("2b_07_bottom", "2b_07", connections_by_region["2b_07_bottom"], locations_by_region["2b_07_bottom"]),
+    "2b_07_top": PreRegion("2b_07_top", "2b_07", connections_by_region["2b_07_top"], locations_by_region["2b_07_top"]),
 
-    "2b_08b_west": PreRegion("2b_08b_west", "2b_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_08b_west"]),
-    "2b_08b_east": PreRegion("2b_08b_east", "2b_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_08b_east"]),
+    "2b_08b_west": PreRegion("2b_08b_west", "2b_08b", connections_by_region["2b_08b_west"], locations_by_region["2b_08b_west"]),
+    "2b_08b_east": PreRegion("2b_08b_east", "2b_08b", connections_by_region["2b_08b_east"], locations_by_region["2b_08b_east"]),
 
-    "2b_08_west": PreRegion("2b_08_west", "2b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_08_west"]),
-    "2b_08_east": PreRegion("2b_08_east", "2b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_08_east"]),
+    "2b_08_west": PreRegion("2b_08_west", "2b_08", connections_by_region["2b_08_west"], locations_by_region["2b_08_west"]),
+    "2b_08_east": PreRegion("2b_08_east", "2b_08", connections_by_region["2b_08_east"], locations_by_region["2b_08_east"]),
 
-    "2b_09_west": PreRegion("2b_09_west", "2b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_09_west"]),
-    "2b_09_east": PreRegion("2b_09_east", "2b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_09_east"]),
+    "2b_09_west": PreRegion("2b_09_west", "2b_09", connections_by_region["2b_09_west"], locations_by_region["2b_09_west"]),
+    "2b_09_east": PreRegion("2b_09_east", "2b_09", connections_by_region["2b_09_east"], locations_by_region["2b_09_east"]),
 
-    "2b_10_west": PreRegion("2b_10_west", "2b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_10_west"]),
-    "2b_10_east": PreRegion("2b_10_east", "2b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_10_east"]),
+    "2b_10_west": PreRegion("2b_10_west", "2b_10", connections_by_region["2b_10_west"], locations_by_region["2b_10_west"]),
+    "2b_10_east": PreRegion("2b_10_east", "2b_10", connections_by_region["2b_10_east"], locations_by_region["2b_10_east"]),
 
-    "2b_11_bottom": PreRegion("2b_11_bottom", "2b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_11_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_11_bottom"]),
-    "2b_11_top": PreRegion("2b_11_top", "2b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_11_top"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_11_top"]),
+    "2b_11_bottom": PreRegion("2b_11_bottom", "2b_11", connections_by_region["2b_11_bottom"], locations_by_region["2b_11_bottom"]),
+    "2b_11_top": PreRegion("2b_11_top", "2b_11", connections_by_region["2b_11_top"], locations_by_region["2b_11_top"]),
 
-    "2b_end_west": PreRegion("2b_end_west", "2b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_end_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_end_west"]),
-    "2b_end_goal": PreRegion("2b_end_goal", "2b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2b_end_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "2b_end_goal"]),
+    "2b_end_west": PreRegion("2b_end_west", "2b_end", connections_by_region["2b_end_west"], locations_by_region["2b_end_west"]),
+    "2b_end_goal": PreRegion("2b_end_goal", "2b_end", connections_by_region["2b_end_goal"], locations_by_region["2b_end_goal"]),
 
-    "2c_00_west": PreRegion("2c_00_west", "2c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_00_west"]),
-    "2c_00_east": PreRegion("2c_00_east", "2c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_00_east"]),
+    "2c_00_west": PreRegion("2c_00_west", "2c_00", connections_by_region["2c_00_west"], locations_by_region["2c_00_west"]),
+    "2c_00_east": PreRegion("2c_00_east", "2c_00", connections_by_region["2c_00_east"], locations_by_region["2c_00_east"]),
 
-    "2c_01_west": PreRegion("2c_01_west", "2c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_01_west"]),
-    "2c_01_east": PreRegion("2c_01_east", "2c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_01_east"]),
+    "2c_01_west": PreRegion("2c_01_west", "2c_01", connections_by_region["2c_01_west"], locations_by_region["2c_01_west"]),
+    "2c_01_east": PreRegion("2c_01_east", "2c_01", connections_by_region["2c_01_east"], locations_by_region["2c_01_east"]),
 
-    "2c_02_west": PreRegion("2c_02_west", "2c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_02_west"]),
-    "2c_02_goal": PreRegion("2c_02_goal", "2c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "2c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "2c_02_goal"]),
+    "2c_02_west": PreRegion("2c_02_west", "2c_02", connections_by_region["2c_02_west"], locations_by_region["2c_02_west"]),
+    "2c_02_goal": PreRegion("2c_02_goal", "2c_02", connections_by_region["2c_02_goal"], locations_by_region["2c_02_goal"]),
 
-    "3a_s0_main": PreRegion("3a_s0_main", "3a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s0_main"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s0_main"]),
-    "3a_s0_east": PreRegion("3a_s0_east", "3a_s0", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s0_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s0_east"]),
+    "3a_s0_main": PreRegion("3a_s0_main", "3a_s0", connections_by_region["3a_s0_main"], locations_by_region["3a_s0_main"]),
+    "3a_s0_east": PreRegion("3a_s0_east", "3a_s0", connections_by_region["3a_s0_east"], locations_by_region["3a_s0_east"]),
 
-    "3a_s1_west": PreRegion("3a_s1_west", "3a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s1_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s1_west"]),
-    "3a_s1_east": PreRegion("3a_s1_east", "3a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s1_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s1_east"]),
-    "3a_s1_north-east": PreRegion("3a_s1_north-east", "3a_s1", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s1_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s1_north-east"]),
+    "3a_s1_west": PreRegion("3a_s1_west", "3a_s1", connections_by_region["3a_s1_west"], locations_by_region["3a_s1_west"]),
+    "3a_s1_east": PreRegion("3a_s1_east", "3a_s1", connections_by_region["3a_s1_east"], locations_by_region["3a_s1_east"]),
+    "3a_s1_north-east": PreRegion("3a_s1_north-east", "3a_s1", connections_by_region["3a_s1_north-east"], locations_by_region["3a_s1_north-east"]),
 
-    "3a_s2_west": PreRegion("3a_s2_west", "3a_s2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s2_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s2_west"]),
-    "3a_s2_north-west": PreRegion("3a_s2_north-west", "3a_s2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s2_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s2_north-west"]),
-    "3a_s2_east": PreRegion("3a_s2_east", "3a_s2", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s2_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s2_east"]),
+    "3a_s2_west": PreRegion("3a_s2_west", "3a_s2", connections_by_region["3a_s2_west"], locations_by_region["3a_s2_west"]),
+    "3a_s2_north-west": PreRegion("3a_s2_north-west", "3a_s2", connections_by_region["3a_s2_north-west"], locations_by_region["3a_s2_north-west"]),
+    "3a_s2_east": PreRegion("3a_s2_east", "3a_s2", connections_by_region["3a_s2_east"], locations_by_region["3a_s2_east"]),
 
-    "3a_s3_west": PreRegion("3a_s3_west", "3a_s3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s3_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s3_west"]),
-    "3a_s3_north": PreRegion("3a_s3_north", "3a_s3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s3_north"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s3_north"]),
-    "3a_s3_east": PreRegion("3a_s3_east", "3a_s3", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_s3_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_s3_east"]),
+    "3a_s3_west": PreRegion("3a_s3_west", "3a_s3", connections_by_region["3a_s3_west"], locations_by_region["3a_s3_west"]),
+    "3a_s3_north": PreRegion("3a_s3_north", "3a_s3", connections_by_region["3a_s3_north"], locations_by_region["3a_s3_north"]),
+    "3a_s3_east": PreRegion("3a_s3_east", "3a_s3", connections_by_region["3a_s3_east"], locations_by_region["3a_s3_east"]),
 
-    "3a_0x-a_west": PreRegion("3a_0x-a_west", "3a_0x-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_0x-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_0x-a_west"]),
-    "3a_0x-a_east": PreRegion("3a_0x-a_east", "3a_0x-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_0x-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_0x-a_east"]),
+    "3a_0x-a_west": PreRegion("3a_0x-a_west", "3a_0x-a", connections_by_region["3a_0x-a_west"], locations_by_region["3a_0x-a_west"]),
+    "3a_0x-a_east": PreRegion("3a_0x-a_east", "3a_0x-a", connections_by_region["3a_0x-a_east"], locations_by_region["3a_0x-a_east"]),
 
-    "3a_00-a_west": PreRegion("3a_00-a_west", "3a_00-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-a_west"]),
-    "3a_00-a_east": PreRegion("3a_00-a_east", "3a_00-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-a_east"]),
+    "3a_00-a_west": PreRegion("3a_00-a_west", "3a_00-a", connections_by_region["3a_00-a_west"], locations_by_region["3a_00-a_west"]),
+    "3a_00-a_east": PreRegion("3a_00-a_east", "3a_00-a", connections_by_region["3a_00-a_east"], locations_by_region["3a_00-a_east"]),
 
-    "3a_02-a_west": PreRegion("3a_02-a_west", "3a_02-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-a_west"]),
-    "3a_02-a_top": PreRegion("3a_02-a_top", "3a_02-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-a_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-a_top"]),
-    "3a_02-a_main": PreRegion("3a_02-a_main", "3a_02-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-a_main"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-a_main"]),
-    "3a_02-a_east": PreRegion("3a_02-a_east", "3a_02-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-a_east"]),
+    "3a_02-a_west": PreRegion("3a_02-a_west", "3a_02-a", connections_by_region["3a_02-a_west"], locations_by_region["3a_02-a_west"]),
+    "3a_02-a_top": PreRegion("3a_02-a_top", "3a_02-a", connections_by_region["3a_02-a_top"], locations_by_region["3a_02-a_top"]),
+    "3a_02-a_main": PreRegion("3a_02-a_main", "3a_02-a", connections_by_region["3a_02-a_main"], locations_by_region["3a_02-a_main"]),
+    "3a_02-a_east": PreRegion("3a_02-a_east", "3a_02-a", connections_by_region["3a_02-a_east"], locations_by_region["3a_02-a_east"]),
 
-    "3a_02-b_west": PreRegion("3a_02-b_west", "3a_02-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-b_west"]),
-    "3a_02-b_east": PreRegion("3a_02-b_east", "3a_02-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-b_east"]),
-    "3a_02-b_far-east": PreRegion("3a_02-b_far-east", "3a_02-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-b_far-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-b_far-east"]),
+    "3a_02-b_west": PreRegion("3a_02-b_west", "3a_02-b", connections_by_region["3a_02-b_west"], locations_by_region["3a_02-b_west"]),
+    "3a_02-b_east": PreRegion("3a_02-b_east", "3a_02-b", connections_by_region["3a_02-b_east"], locations_by_region["3a_02-b_east"]),
+    "3a_02-b_far-east": PreRegion("3a_02-b_far-east", "3a_02-b", connections_by_region["3a_02-b_far-east"], locations_by_region["3a_02-b_far-east"]),
 
-    "3a_01-b_west": PreRegion("3a_01-b_west", "3a_01-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_01-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_01-b_west"]),
-    "3a_01-b_north-west": PreRegion("3a_01-b_north-west", "3a_01-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_01-b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_01-b_north-west"]),
-    "3a_01-b_east": PreRegion("3a_01-b_east", "3a_01-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_01-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_01-b_east"]),
+    "3a_01-b_west": PreRegion("3a_01-b_west", "3a_01-b", connections_by_region["3a_01-b_west"], locations_by_region["3a_01-b_west"]),
+    "3a_01-b_north-west": PreRegion("3a_01-b_north-west", "3a_01-b", connections_by_region["3a_01-b_north-west"], locations_by_region["3a_01-b_north-west"]),
+    "3a_01-b_east": PreRegion("3a_01-b_east", "3a_01-b", connections_by_region["3a_01-b_east"], locations_by_region["3a_01-b_east"]),
 
-    "3a_00-b_south-west": PreRegion("3a_00-b_south-west", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_south-west"]),
-    "3a_00-b_south-east": PreRegion("3a_00-b_south-east", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_south-east"]),
-    "3a_00-b_west": PreRegion("3a_00-b_west", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_west"]),
-    "3a_00-b_north-west": PreRegion("3a_00-b_north-west", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_north-west"]),
-    "3a_00-b_east": PreRegion("3a_00-b_east", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_east"]),
-    "3a_00-b_north": PreRegion("3a_00-b_north", "3a_00-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-b_north"]),
+    "3a_00-b_south-west": PreRegion("3a_00-b_south-west", "3a_00-b", connections_by_region["3a_00-b_south-west"], locations_by_region["3a_00-b_south-west"]),
+    "3a_00-b_south-east": PreRegion("3a_00-b_south-east", "3a_00-b", connections_by_region["3a_00-b_south-east"], locations_by_region["3a_00-b_south-east"]),
+    "3a_00-b_west": PreRegion("3a_00-b_west", "3a_00-b", connections_by_region["3a_00-b_west"], locations_by_region["3a_00-b_west"]),
+    "3a_00-b_north-west": PreRegion("3a_00-b_north-west", "3a_00-b", connections_by_region["3a_00-b_north-west"], locations_by_region["3a_00-b_north-west"]),
+    "3a_00-b_east": PreRegion("3a_00-b_east", "3a_00-b", connections_by_region["3a_00-b_east"], locations_by_region["3a_00-b_east"]),
+    "3a_00-b_north": PreRegion("3a_00-b_north", "3a_00-b", connections_by_region["3a_00-b_north"], locations_by_region["3a_00-b_north"]),
 
-    "3a_00-c_south-west": PreRegion("3a_00-c_south-west", "3a_00-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-c_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-c_south-west"]),
-    "3a_00-c_south-east": PreRegion("3a_00-c_south-east", "3a_00-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-c_south-east"]),
-    "3a_00-c_north-east": PreRegion("3a_00-c_north-east", "3a_00-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-c_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-c_north-east"]),
+    "3a_00-c_south-west": PreRegion("3a_00-c_south-west", "3a_00-c", connections_by_region["3a_00-c_south-west"], locations_by_region["3a_00-c_south-west"]),
+    "3a_00-c_south-east": PreRegion("3a_00-c_south-east", "3a_00-c", connections_by_region["3a_00-c_south-east"], locations_by_region["3a_00-c_south-east"]),
+    "3a_00-c_north-east": PreRegion("3a_00-c_north-east", "3a_00-c", connections_by_region["3a_00-c_north-east"], locations_by_region["3a_00-c_north-east"]),
 
-    "3a_0x-b_west": PreRegion("3a_0x-b_west", "3a_0x-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_0x-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_0x-b_west"]),
-    "3a_0x-b_south-east": PreRegion("3a_0x-b_south-east", "3a_0x-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_0x-b_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_0x-b_south-east"]),
-    "3a_0x-b_north-east": PreRegion("3a_0x-b_north-east", "3a_0x-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_0x-b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_0x-b_north-east"]),
+    "3a_0x-b_west": PreRegion("3a_0x-b_west", "3a_0x-b", connections_by_region["3a_0x-b_west"], locations_by_region["3a_0x-b_west"]),
+    "3a_0x-b_south-east": PreRegion("3a_0x-b_south-east", "3a_0x-b", connections_by_region["3a_0x-b_south-east"], locations_by_region["3a_0x-b_south-east"]),
+    "3a_0x-b_north-east": PreRegion("3a_0x-b_north-east", "3a_0x-b", connections_by_region["3a_0x-b_north-east"], locations_by_region["3a_0x-b_north-east"]),
 
-    "3a_03-a_west": PreRegion("3a_03-a_west", "3a_03-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-a_west"]),
-    "3a_03-a_top": PreRegion("3a_03-a_top", "3a_03-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-a_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-a_top"]),
-    "3a_03-a_east": PreRegion("3a_03-a_east", "3a_03-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-a_east"]),
+    "3a_03-a_west": PreRegion("3a_03-a_west", "3a_03-a", connections_by_region["3a_03-a_west"], locations_by_region["3a_03-a_west"]),
+    "3a_03-a_top": PreRegion("3a_03-a_top", "3a_03-a", connections_by_region["3a_03-a_top"], locations_by_region["3a_03-a_top"]),
+    "3a_03-a_east": PreRegion("3a_03-a_east", "3a_03-a", connections_by_region["3a_03-a_east"], locations_by_region["3a_03-a_east"]),
 
-    "3a_04-b_west": PreRegion("3a_04-b_west", "3a_04-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-b_west"]),
-    "3a_04-b_east": PreRegion("3a_04-b_east", "3a_04-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-b_east"]),
+    "3a_04-b_west": PreRegion("3a_04-b_west", "3a_04-b", connections_by_region["3a_04-b_west"], locations_by_region["3a_04-b_west"]),
+    "3a_04-b_east": PreRegion("3a_04-b_east", "3a_04-b", connections_by_region["3a_04-b_east"], locations_by_region["3a_04-b_east"]),
 
-    "3a_05-a_west": PreRegion("3a_05-a_west", "3a_05-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_05-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_05-a_west"]),
-    "3a_05-a_east": PreRegion("3a_05-a_east", "3a_05-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_05-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_05-a_east"]),
+    "3a_05-a_west": PreRegion("3a_05-a_west", "3a_05-a", connections_by_region["3a_05-a_west"], locations_by_region["3a_05-a_west"]),
+    "3a_05-a_east": PreRegion("3a_05-a_east", "3a_05-a", connections_by_region["3a_05-a_east"], locations_by_region["3a_05-a_east"]),
 
-    "3a_06-a_west": PreRegion("3a_06-a_west", "3a_06-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-a_west"]),
-    "3a_06-a_east": PreRegion("3a_06-a_east", "3a_06-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-a_east"]),
+    "3a_06-a_west": PreRegion("3a_06-a_west", "3a_06-a", connections_by_region["3a_06-a_west"], locations_by_region["3a_06-a_west"]),
+    "3a_06-a_east": PreRegion("3a_06-a_east", "3a_06-a", connections_by_region["3a_06-a_east"], locations_by_region["3a_06-a_east"]),
 
-    "3a_07-a_west": PreRegion("3a_07-a_west", "3a_07-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-a_west"]),
-    "3a_07-a_top": PreRegion("3a_07-a_top", "3a_07-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-a_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-a_top"]),
-    "3a_07-a_east": PreRegion("3a_07-a_east", "3a_07-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-a_east"]),
+    "3a_07-a_west": PreRegion("3a_07-a_west", "3a_07-a", connections_by_region["3a_07-a_west"], locations_by_region["3a_07-a_west"]),
+    "3a_07-a_top": PreRegion("3a_07-a_top", "3a_07-a", connections_by_region["3a_07-a_top"], locations_by_region["3a_07-a_top"]),
+    "3a_07-a_east": PreRegion("3a_07-a_east", "3a_07-a", connections_by_region["3a_07-a_east"], locations_by_region["3a_07-a_east"]),
 
-    "3a_07-b_bottom": PreRegion("3a_07-b_bottom", "3a_07-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-b_bottom"]),
-    "3a_07-b_west": PreRegion("3a_07-b_west", "3a_07-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-b_west"]),
-    "3a_07-b_top": PreRegion("3a_07-b_top", "3a_07-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-b_top"]),
-    "3a_07-b_east": PreRegion("3a_07-b_east", "3a_07-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_07-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_07-b_east"]),
+    "3a_07-b_bottom": PreRegion("3a_07-b_bottom", "3a_07-b", connections_by_region["3a_07-b_bottom"], locations_by_region["3a_07-b_bottom"]),
+    "3a_07-b_west": PreRegion("3a_07-b_west", "3a_07-b", connections_by_region["3a_07-b_west"], locations_by_region["3a_07-b_west"]),
+    "3a_07-b_top": PreRegion("3a_07-b_top", "3a_07-b", connections_by_region["3a_07-b_top"], locations_by_region["3a_07-b_top"]),
+    "3a_07-b_east": PreRegion("3a_07-b_east", "3a_07-b", connections_by_region["3a_07-b_east"], locations_by_region["3a_07-b_east"]),
 
-    "3a_06-b_west": PreRegion("3a_06-b_west", "3a_06-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-b_west"]),
-    "3a_06-b_east": PreRegion("3a_06-b_east", "3a_06-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-b_east"]),
+    "3a_06-b_west": PreRegion("3a_06-b_west", "3a_06-b", connections_by_region["3a_06-b_west"], locations_by_region["3a_06-b_west"]),
+    "3a_06-b_east": PreRegion("3a_06-b_east", "3a_06-b", connections_by_region["3a_06-b_east"], locations_by_region["3a_06-b_east"]),
 
-    "3a_06-c_south-west": PreRegion("3a_06-c_south-west", "3a_06-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-c_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-c_south-west"]),
-    "3a_06-c_north-west": PreRegion("3a_06-c_north-west", "3a_06-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-c_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-c_north-west"]),
-    "3a_06-c_south-east": PreRegion("3a_06-c_south-east", "3a_06-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-c_south-east"]),
-    "3a_06-c_east": PreRegion("3a_06-c_east", "3a_06-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-c_east"]),
+    "3a_06-c_south-west": PreRegion("3a_06-c_south-west", "3a_06-c", connections_by_region["3a_06-c_south-west"], locations_by_region["3a_06-c_south-west"]),
+    "3a_06-c_north-west": PreRegion("3a_06-c_north-west", "3a_06-c", connections_by_region["3a_06-c_north-west"], locations_by_region["3a_06-c_north-west"]),
+    "3a_06-c_south-east": PreRegion("3a_06-c_south-east", "3a_06-c", connections_by_region["3a_06-c_south-east"], locations_by_region["3a_06-c_south-east"]),
+    "3a_06-c_east": PreRegion("3a_06-c_east", "3a_06-c", connections_by_region["3a_06-c_east"], locations_by_region["3a_06-c_east"]),
 
-    "3a_05-c_east": PreRegion("3a_05-c_east", "3a_05-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_05-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_05-c_east"]),
+    "3a_05-c_east": PreRegion("3a_05-c_east", "3a_05-c", connections_by_region["3a_05-c_east"], locations_by_region["3a_05-c_east"]),
 
-    "3a_08-c_west": PreRegion("3a_08-c_west", "3a_08-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-c_west"]),
-    "3a_08-c_east": PreRegion("3a_08-c_east", "3a_08-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-c_east"]),
+    "3a_08-c_west": PreRegion("3a_08-c_west", "3a_08-c", connections_by_region["3a_08-c_west"], locations_by_region["3a_08-c_west"]),
+    "3a_08-c_east": PreRegion("3a_08-c_east", "3a_08-c", connections_by_region["3a_08-c_east"], locations_by_region["3a_08-c_east"]),
 
-    "3a_08-b_west": PreRegion("3a_08-b_west", "3a_08-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-b_west"]),
-    "3a_08-b_east": PreRegion("3a_08-b_east", "3a_08-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-b_east"]),
+    "3a_08-b_west": PreRegion("3a_08-b_west", "3a_08-b", connections_by_region["3a_08-b_west"], locations_by_region["3a_08-b_west"]),
+    "3a_08-b_east": PreRegion("3a_08-b_east", "3a_08-b", connections_by_region["3a_08-b_east"], locations_by_region["3a_08-b_east"]),
 
-    "3a_08-a_west": PreRegion("3a_08-a_west", "3a_08-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-a_west"]),
-    "3a_08-a_bottom": PreRegion("3a_08-a_bottom", "3a_08-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-a_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-a_bottom"]),
-    "3a_08-a_east": PreRegion("3a_08-a_east", "3a_08-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-a_east"]),
+    "3a_08-a_west": PreRegion("3a_08-a_west", "3a_08-a", connections_by_region["3a_08-a_west"], locations_by_region["3a_08-a_west"]),
+    "3a_08-a_bottom": PreRegion("3a_08-a_bottom", "3a_08-a", connections_by_region["3a_08-a_bottom"], locations_by_region["3a_08-a_bottom"]),
+    "3a_08-a_east": PreRegion("3a_08-a_east", "3a_08-a", connections_by_region["3a_08-a_east"], locations_by_region["3a_08-a_east"]),
 
-    "3a_09-b_west": PreRegion("3a_09-b_west", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_west"]),
-    "3a_09-b_north-west": PreRegion("3a_09-b_north-west", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_north-west"]),
-    "3a_09-b_center": PreRegion("3a_09-b_center", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_center"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_center"]),
-    "3a_09-b_south-west": PreRegion("3a_09-b_south-west", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_south-west"]),
-    "3a_09-b_south": PreRegion("3a_09-b_south", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_south"]),
-    "3a_09-b_south-east": PreRegion("3a_09-b_south-east", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_south-east"]),
-    "3a_09-b_east": PreRegion("3a_09-b_east", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_east"]),
-    "3a_09-b_north-east-right": PreRegion("3a_09-b_north-east-right", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_north-east-right"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_north-east-right"]),
-    "3a_09-b_north-east-top": PreRegion("3a_09-b_north-east-top", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_north-east-top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_north-east-top"]),
-    "3a_09-b_north": PreRegion("3a_09-b_north", "3a_09-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-b_north"]),
+    "3a_09-b_west": PreRegion("3a_09-b_west", "3a_09-b", connections_by_region["3a_09-b_west"], locations_by_region["3a_09-b_west"]),
+    "3a_09-b_north-west": PreRegion("3a_09-b_north-west", "3a_09-b", connections_by_region["3a_09-b_north-west"], locations_by_region["3a_09-b_north-west"]),
+    "3a_09-b_center": PreRegion("3a_09-b_center", "3a_09-b", connections_by_region["3a_09-b_center"], locations_by_region["3a_09-b_center"]),
+    "3a_09-b_south-west": PreRegion("3a_09-b_south-west", "3a_09-b", connections_by_region["3a_09-b_south-west"], locations_by_region["3a_09-b_south-west"]),
+    "3a_09-b_south": PreRegion("3a_09-b_south", "3a_09-b", connections_by_region["3a_09-b_south"], locations_by_region["3a_09-b_south"]),
+    "3a_09-b_south-east": PreRegion("3a_09-b_south-east", "3a_09-b", connections_by_region["3a_09-b_south-east"], locations_by_region["3a_09-b_south-east"]),
+    "3a_09-b_east": PreRegion("3a_09-b_east", "3a_09-b", connections_by_region["3a_09-b_east"], locations_by_region["3a_09-b_east"]),
+    "3a_09-b_north-east-right": PreRegion("3a_09-b_north-east-right", "3a_09-b", connections_by_region["3a_09-b_north-east-right"], locations_by_region["3a_09-b_north-east-right"]),
+    "3a_09-b_north-east-top": PreRegion("3a_09-b_north-east-top", "3a_09-b", connections_by_region["3a_09-b_north-east-top"], locations_by_region["3a_09-b_north-east-top"]),
+    "3a_09-b_north": PreRegion("3a_09-b_north", "3a_09-b", connections_by_region["3a_09-b_north"], locations_by_region["3a_09-b_north"]),
 
-    "3a_10-x_west": PreRegion("3a_10-x_west", "3a_10-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-x_west"]),
-    "3a_10-x_south-east": PreRegion("3a_10-x_south-east", "3a_10-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-x_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-x_south-east"]),
-    "3a_10-x_north-east-top": PreRegion("3a_10-x_north-east-top", "3a_10-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-x_north-east-top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-x_north-east-top"]),
-    "3a_10-x_north-east-right": PreRegion("3a_10-x_north-east-right", "3a_10-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-x_north-east-right"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-x_north-east-right"]),
+    "3a_10-x_west": PreRegion("3a_10-x_west", "3a_10-x", connections_by_region["3a_10-x_west"], locations_by_region["3a_10-x_west"]),
+    "3a_10-x_south-east": PreRegion("3a_10-x_south-east", "3a_10-x", connections_by_region["3a_10-x_south-east"], locations_by_region["3a_10-x_south-east"]),
+    "3a_10-x_north-east-top": PreRegion("3a_10-x_north-east-top", "3a_10-x", connections_by_region["3a_10-x_north-east-top"], locations_by_region["3a_10-x_north-east-top"]),
+    "3a_10-x_north-east-right": PreRegion("3a_10-x_north-east-right", "3a_10-x", connections_by_region["3a_10-x_north-east-right"], locations_by_region["3a_10-x_north-east-right"]),
 
-    "3a_11-x_west": PreRegion("3a_11-x_west", "3a_11-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-x_west"]),
-    "3a_11-x_south": PreRegion("3a_11-x_south", "3a_11-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-x_south"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-x_south"]),
+    "3a_11-x_west": PreRegion("3a_11-x_west", "3a_11-x", connections_by_region["3a_11-x_west"], locations_by_region["3a_11-x_west"]),
+    "3a_11-x_south": PreRegion("3a_11-x_south", "3a_11-x", connections_by_region["3a_11-x_south"], locations_by_region["3a_11-x_south"]),
 
-    "3a_11-y_west": PreRegion("3a_11-y_west", "3a_11-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-y_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-y_west"]),
-    "3a_11-y_east": PreRegion("3a_11-y_east", "3a_11-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-y_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-y_east"]),
-    "3a_11-y_south": PreRegion("3a_11-y_south", "3a_11-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-y_south"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-y_south"]),
+    "3a_11-y_west": PreRegion("3a_11-y_west", "3a_11-y", connections_by_region["3a_11-y_west"], locations_by_region["3a_11-y_west"]),
+    "3a_11-y_east": PreRegion("3a_11-y_east", "3a_11-y", connections_by_region["3a_11-y_east"], locations_by_region["3a_11-y_east"]),
+    "3a_11-y_south": PreRegion("3a_11-y_south", "3a_11-y", connections_by_region["3a_11-y_south"], locations_by_region["3a_11-y_south"]),
 
-    "3a_12-y_west": PreRegion("3a_12-y_west", "3a_12-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-y_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-y_west"]),
+    "3a_12-y_west": PreRegion("3a_12-y_west", "3a_12-y", connections_by_region["3a_12-y_west"], locations_by_region["3a_12-y_west"]),
 
-    "3a_11-z_west": PreRegion("3a_11-z_west", "3a_11-z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-z_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-z_west"]),
-    "3a_11-z_east": PreRegion("3a_11-z_east", "3a_11-z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-z_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-z_east"]),
+    "3a_11-z_west": PreRegion("3a_11-z_west", "3a_11-z", connections_by_region["3a_11-z_west"], locations_by_region["3a_11-z_west"]),
+    "3a_11-z_east": PreRegion("3a_11-z_east", "3a_11-z", connections_by_region["3a_11-z_east"], locations_by_region["3a_11-z_east"]),
 
-    "3a_10-z_bottom": PreRegion("3a_10-z_bottom", "3a_10-z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-z_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-z_bottom"]),
-    "3a_10-z_top": PreRegion("3a_10-z_top", "3a_10-z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-z_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-z_top"]),
+    "3a_10-z_bottom": PreRegion("3a_10-z_bottom", "3a_10-z", connections_by_region["3a_10-z_bottom"], locations_by_region["3a_10-z_bottom"]),
+    "3a_10-z_top": PreRegion("3a_10-z_top", "3a_10-z", connections_by_region["3a_10-z_top"], locations_by_region["3a_10-z_top"]),
 
-    "3a_10-y_bottom": PreRegion("3a_10-y_bottom", "3a_10-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-y_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-y_bottom"]),
-    "3a_10-y_top": PreRegion("3a_10-y_top", "3a_10-y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-y_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-y_top"]),
+    "3a_10-y_bottom": PreRegion("3a_10-y_bottom", "3a_10-y", connections_by_region["3a_10-y_bottom"], locations_by_region["3a_10-y_bottom"]),
+    "3a_10-y_top": PreRegion("3a_10-y_top", "3a_10-y", connections_by_region["3a_10-y_top"], locations_by_region["3a_10-y_top"]),
 
-    "3a_10-c_south-east": PreRegion("3a_10-c_south-east", "3a_10-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-c_south-east"]),
-    "3a_10-c_north-east": PreRegion("3a_10-c_north-east", "3a_10-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-c_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-c_north-east"]),
-    "3a_10-c_north-west": PreRegion("3a_10-c_north-west", "3a_10-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-c_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-c_north-west"]),
-    "3a_10-c_south-west": PreRegion("3a_10-c_south-west", "3a_10-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-c_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-c_south-west"]),
+    "3a_10-c_south-east": PreRegion("3a_10-c_south-east", "3a_10-c", connections_by_region["3a_10-c_south-east"], locations_by_region["3a_10-c_south-east"]),
+    "3a_10-c_north-east": PreRegion("3a_10-c_north-east", "3a_10-c", connections_by_region["3a_10-c_north-east"], locations_by_region["3a_10-c_north-east"]),
+    "3a_10-c_north-west": PreRegion("3a_10-c_north-west", "3a_10-c", connections_by_region["3a_10-c_north-west"], locations_by_region["3a_10-c_north-west"]),
+    "3a_10-c_south-west": PreRegion("3a_10-c_south-west", "3a_10-c", connections_by_region["3a_10-c_south-west"], locations_by_region["3a_10-c_south-west"]),
 
-    "3a_11-c_west": PreRegion("3a_11-c_west", "3a_11-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-c_west"]),
-    "3a_11-c_east": PreRegion("3a_11-c_east", "3a_11-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-c_east"]),
-    "3a_11-c_south-east": PreRegion("3a_11-c_south-east", "3a_11-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-c_south-east"]),
-    "3a_11-c_south-west": PreRegion("3a_11-c_south-west", "3a_11-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-c_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-c_south-west"]),
+    "3a_11-c_west": PreRegion("3a_11-c_west", "3a_11-c", connections_by_region["3a_11-c_west"], locations_by_region["3a_11-c_west"]),
+    "3a_11-c_east": PreRegion("3a_11-c_east", "3a_11-c", connections_by_region["3a_11-c_east"], locations_by_region["3a_11-c_east"]),
+    "3a_11-c_south-east": PreRegion("3a_11-c_south-east", "3a_11-c", connections_by_region["3a_11-c_south-east"], locations_by_region["3a_11-c_south-east"]),
+    "3a_11-c_south-west": PreRegion("3a_11-c_south-west", "3a_11-c", connections_by_region["3a_11-c_south-west"], locations_by_region["3a_11-c_south-west"]),
 
-    "3a_12-c_west": PreRegion("3a_12-c_west", "3a_12-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-c_west"]),
-    "3a_12-c_top": PreRegion("3a_12-c_top", "3a_12-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-c_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-c_top"]),
+    "3a_12-c_west": PreRegion("3a_12-c_west", "3a_12-c", connections_by_region["3a_12-c_west"], locations_by_region["3a_12-c_west"]),
+    "3a_12-c_top": PreRegion("3a_12-c_top", "3a_12-c", connections_by_region["3a_12-c_top"], locations_by_region["3a_12-c_top"]),
 
-    "3a_12-d_bottom": PreRegion("3a_12-d_bottom", "3a_12-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-d_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-d_bottom"]),
-    "3a_12-d_top": PreRegion("3a_12-d_top", "3a_12-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-d_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-d_top"]),
+    "3a_12-d_bottom": PreRegion("3a_12-d_bottom", "3a_12-d", connections_by_region["3a_12-d_bottom"], locations_by_region["3a_12-d_bottom"]),
+    "3a_12-d_top": PreRegion("3a_12-d_top", "3a_12-d", connections_by_region["3a_12-d_top"], locations_by_region["3a_12-d_top"]),
 
-    "3a_11-d_west": PreRegion("3a_11-d_west", "3a_11-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-d_west"]),
-    "3a_11-d_east": PreRegion("3a_11-d_east", "3a_11-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-d_east"]),
+    "3a_11-d_west": PreRegion("3a_11-d_west", "3a_11-d", connections_by_region["3a_11-d_west"], locations_by_region["3a_11-d_west"]),
+    "3a_11-d_east": PreRegion("3a_11-d_east", "3a_11-d", connections_by_region["3a_11-d_east"], locations_by_region["3a_11-d_east"]),
 
-    "3a_10-d_west": PreRegion("3a_10-d_west", "3a_10-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-d_west"]),
-    "3a_10-d_main": PreRegion("3a_10-d_main", "3a_10-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-d_main"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-d_main"]),
-    "3a_10-d_east": PreRegion("3a_10-d_east", "3a_10-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_10-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_10-d_east"]),
+    "3a_10-d_west": PreRegion("3a_10-d_west", "3a_10-d", connections_by_region["3a_10-d_west"], locations_by_region["3a_10-d_west"]),
+    "3a_10-d_main": PreRegion("3a_10-d_main", "3a_10-d", connections_by_region["3a_10-d_main"], locations_by_region["3a_10-d_main"]),
+    "3a_10-d_east": PreRegion("3a_10-d_east", "3a_10-d", connections_by_region["3a_10-d_east"], locations_by_region["3a_10-d_east"]),
 
-    "3a_11-b_west": PreRegion("3a_11-b_west", "3a_11-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-b_west"]),
-    "3a_11-b_north-west": PreRegion("3a_11-b_north-west", "3a_11-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-b_north-west"]),
-    "3a_11-b_east": PreRegion("3a_11-b_east", "3a_11-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-b_east"]),
-    "3a_11-b_north-east": PreRegion("3a_11-b_north-east", "3a_11-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-b_north-east"]),
+    "3a_11-b_west": PreRegion("3a_11-b_west", "3a_11-b", connections_by_region["3a_11-b_west"], locations_by_region["3a_11-b_west"]),
+    "3a_11-b_north-west": PreRegion("3a_11-b_north-west", "3a_11-b", connections_by_region["3a_11-b_north-west"], locations_by_region["3a_11-b_north-west"]),
+    "3a_11-b_east": PreRegion("3a_11-b_east", "3a_11-b", connections_by_region["3a_11-b_east"], locations_by_region["3a_11-b_east"]),
+    "3a_11-b_north-east": PreRegion("3a_11-b_north-east", "3a_11-b", connections_by_region["3a_11-b_north-east"], locations_by_region["3a_11-b_north-east"]),
 
-    "3a_12-b_west": PreRegion("3a_12-b_west", "3a_12-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-b_west"]),
-    "3a_12-b_east": PreRegion("3a_12-b_east", "3a_12-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-b_east"]),
+    "3a_12-b_west": PreRegion("3a_12-b_west", "3a_12-b", connections_by_region["3a_12-b_west"], locations_by_region["3a_12-b_west"]),
+    "3a_12-b_east": PreRegion("3a_12-b_east", "3a_12-b", connections_by_region["3a_12-b_east"], locations_by_region["3a_12-b_east"]),
 
-    "3a_13-b_top": PreRegion("3a_13-b_top", "3a_13-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-b_top"]),
-    "3a_13-b_bottom": PreRegion("3a_13-b_bottom", "3a_13-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-b_bottom"]),
+    "3a_13-b_top": PreRegion("3a_13-b_top", "3a_13-b", connections_by_region["3a_13-b_top"], locations_by_region["3a_13-b_top"]),
+    "3a_13-b_bottom": PreRegion("3a_13-b_bottom", "3a_13-b", connections_by_region["3a_13-b_bottom"], locations_by_region["3a_13-b_bottom"]),
 
-    "3a_13-a_west": PreRegion("3a_13-a_west", "3a_13-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-a_west"]),
-    "3a_13-a_south-west": PreRegion("3a_13-a_south-west", "3a_13-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-a_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-a_south-west"]),
-    "3a_13-a_east": PreRegion("3a_13-a_east", "3a_13-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-a_east"]),
+    "3a_13-a_west": PreRegion("3a_13-a_west", "3a_13-a", connections_by_region["3a_13-a_west"], locations_by_region["3a_13-a_west"]),
+    "3a_13-a_south-west": PreRegion("3a_13-a_south-west", "3a_13-a", connections_by_region["3a_13-a_south-west"], locations_by_region["3a_13-a_south-west"]),
+    "3a_13-a_east": PreRegion("3a_13-a_east", "3a_13-a", connections_by_region["3a_13-a_east"], locations_by_region["3a_13-a_east"]),
 
-    "3a_13-x_west": PreRegion("3a_13-x_west", "3a_13-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-x_west"]),
-    "3a_13-x_east": PreRegion("3a_13-x_east", "3a_13-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_13-x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_13-x_east"]),
+    "3a_13-x_west": PreRegion("3a_13-x_west", "3a_13-x", connections_by_region["3a_13-x_west"], locations_by_region["3a_13-x_west"]),
+    "3a_13-x_east": PreRegion("3a_13-x_east", "3a_13-x", connections_by_region["3a_13-x_east"], locations_by_region["3a_13-x_east"]),
 
-    "3a_12-x_west": PreRegion("3a_12-x_west", "3a_12-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-x_west"]),
-    "3a_12-x_north-east": PreRegion("3a_12-x_north-east", "3a_12-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-x_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-x_north-east"]),
-    "3a_12-x_east": PreRegion("3a_12-x_east", "3a_12-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_12-x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_12-x_east"]),
+    "3a_12-x_west": PreRegion("3a_12-x_west", "3a_12-x", connections_by_region["3a_12-x_west"], locations_by_region["3a_12-x_west"]),
+    "3a_12-x_north-east": PreRegion("3a_12-x_north-east", "3a_12-x", connections_by_region["3a_12-x_north-east"], locations_by_region["3a_12-x_north-east"]),
+    "3a_12-x_east": PreRegion("3a_12-x_east", "3a_12-x", connections_by_region["3a_12-x_east"], locations_by_region["3a_12-x_east"]),
 
-    "3a_11-a_west": PreRegion("3a_11-a_west", "3a_11-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-a_west"]),
-    "3a_11-a_south": PreRegion("3a_11-a_south", "3a_11-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-a_south"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-a_south"]),
-    "3a_11-a_south-east-bottom": PreRegion("3a_11-a_south-east-bottom", "3a_11-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-a_south-east-bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-a_south-east-bottom"]),
-    "3a_11-a_south-east-right": PreRegion("3a_11-a_south-east-right", "3a_11-a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_11-a_south-east-right"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_11-a_south-east-right"]),
+    "3a_11-a_west": PreRegion("3a_11-a_west", "3a_11-a", connections_by_region["3a_11-a_west"], locations_by_region["3a_11-a_west"]),
+    "3a_11-a_south": PreRegion("3a_11-a_south", "3a_11-a", connections_by_region["3a_11-a_south"], locations_by_region["3a_11-a_south"]),
+    "3a_11-a_south-east-bottom": PreRegion("3a_11-a_south-east-bottom", "3a_11-a", connections_by_region["3a_11-a_south-east-bottom"], locations_by_region["3a_11-a_south-east-bottom"]),
+    "3a_11-a_south-east-right": PreRegion("3a_11-a_south-east-right", "3a_11-a", connections_by_region["3a_11-a_south-east-right"], locations_by_region["3a_11-a_south-east-right"]),
 
-    "3a_08-x_west": PreRegion("3a_08-x_west", "3a_08-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-x_west"]),
-    "3a_08-x_east": PreRegion("3a_08-x_east", "3a_08-x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-x_east"]),
+    "3a_08-x_west": PreRegion("3a_08-x_west", "3a_08-x", connections_by_region["3a_08-x_west"], locations_by_region["3a_08-x_west"]),
+    "3a_08-x_east": PreRegion("3a_08-x_east", "3a_08-x", connections_by_region["3a_08-x_east"], locations_by_region["3a_08-x_east"]),
 
-    "3a_09-d_bottom": PreRegion("3a_09-d_bottom", "3a_09-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-d_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-d_bottom"]),
-    "3a_09-d_top": PreRegion("3a_09-d_top", "3a_09-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_09-d_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_09-d_top"]),
+    "3a_09-d_bottom": PreRegion("3a_09-d_bottom", "3a_09-d", connections_by_region["3a_09-d_bottom"], locations_by_region["3a_09-d_bottom"]),
+    "3a_09-d_top": PreRegion("3a_09-d_top", "3a_09-d", connections_by_region["3a_09-d_top"], locations_by_region["3a_09-d_top"]),
 
-    "3a_08-d_west": PreRegion("3a_08-d_west", "3a_08-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-d_west"]),
-    "3a_08-d_east": PreRegion("3a_08-d_east", "3a_08-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_08-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_08-d_east"]),
+    "3a_08-d_west": PreRegion("3a_08-d_west", "3a_08-d", connections_by_region["3a_08-d_west"], locations_by_region["3a_08-d_west"]),
+    "3a_08-d_east": PreRegion("3a_08-d_east", "3a_08-d", connections_by_region["3a_08-d_east"], locations_by_region["3a_08-d_east"]),
 
-    "3a_06-d_west": PreRegion("3a_06-d_west", "3a_06-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-d_west"]),
-    "3a_06-d_east": PreRegion("3a_06-d_east", "3a_06-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_06-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_06-d_east"]),
+    "3a_06-d_west": PreRegion("3a_06-d_west", "3a_06-d", connections_by_region["3a_06-d_west"], locations_by_region["3a_06-d_west"]),
+    "3a_06-d_east": PreRegion("3a_06-d_east", "3a_06-d", connections_by_region["3a_06-d_east"], locations_by_region["3a_06-d_east"]),
 
-    "3a_04-d_west": PreRegion("3a_04-d_west", "3a_04-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-d_west"]),
-    "3a_04-d_south-west": PreRegion("3a_04-d_south-west", "3a_04-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-d_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-d_south-west"]),
-    "3a_04-d_south": PreRegion("3a_04-d_south", "3a_04-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-d_south"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-d_south"]),
-    "3a_04-d_east": PreRegion("3a_04-d_east", "3a_04-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-d_east"]),
+    "3a_04-d_west": PreRegion("3a_04-d_west", "3a_04-d", connections_by_region["3a_04-d_west"], locations_by_region["3a_04-d_west"]),
+    "3a_04-d_south-west": PreRegion("3a_04-d_south-west", "3a_04-d", connections_by_region["3a_04-d_south-west"], locations_by_region["3a_04-d_south-west"]),
+    "3a_04-d_south": PreRegion("3a_04-d_south", "3a_04-d", connections_by_region["3a_04-d_south"], locations_by_region["3a_04-d_south"]),
+    "3a_04-d_east": PreRegion("3a_04-d_east", "3a_04-d", connections_by_region["3a_04-d_east"], locations_by_region["3a_04-d_east"]),
 
-    "3a_04-c_west": PreRegion("3a_04-c_west", "3a_04-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-c_west"]),
-    "3a_04-c_north-west": PreRegion("3a_04-c_north-west", "3a_04-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-c_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-c_north-west"]),
-    "3a_04-c_east": PreRegion("3a_04-c_east", "3a_04-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_04-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_04-c_east"]),
+    "3a_04-c_west": PreRegion("3a_04-c_west", "3a_04-c", connections_by_region["3a_04-c_west"], locations_by_region["3a_04-c_west"]),
+    "3a_04-c_north-west": PreRegion("3a_04-c_north-west", "3a_04-c", connections_by_region["3a_04-c_north-west"], locations_by_region["3a_04-c_north-west"]),
+    "3a_04-c_east": PreRegion("3a_04-c_east", "3a_04-c", connections_by_region["3a_04-c_east"], locations_by_region["3a_04-c_east"]),
 
-    "3a_02-c_west": PreRegion("3a_02-c_west", "3a_02-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-c_west"]),
-    "3a_02-c_east": PreRegion("3a_02-c_east", "3a_02-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-c_east"]),
-    "3a_02-c_south-east": PreRegion("3a_02-c_south-east", "3a_02-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-c_south-east"]),
+    "3a_02-c_west": PreRegion("3a_02-c_west", "3a_02-c", connections_by_region["3a_02-c_west"], locations_by_region["3a_02-c_west"]),
+    "3a_02-c_east": PreRegion("3a_02-c_east", "3a_02-c", connections_by_region["3a_02-c_east"], locations_by_region["3a_02-c_east"]),
+    "3a_02-c_south-east": PreRegion("3a_02-c_south-east", "3a_02-c", connections_by_region["3a_02-c_south-east"], locations_by_region["3a_02-c_south-east"]),
 
-    "3a_03-b_west": PreRegion("3a_03-b_west", "3a_03-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-b_west"]),
-    "3a_03-b_east": PreRegion("3a_03-b_east", "3a_03-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-b_east"]),
-    "3a_03-b_north": PreRegion("3a_03-b_north", "3a_03-b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_03-b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_03-b_north"]),
+    "3a_03-b_west": PreRegion("3a_03-b_west", "3a_03-b", connections_by_region["3a_03-b_west"], locations_by_region["3a_03-b_west"]),
+    "3a_03-b_east": PreRegion("3a_03-b_east", "3a_03-b", connections_by_region["3a_03-b_east"], locations_by_region["3a_03-b_east"]),
+    "3a_03-b_north": PreRegion("3a_03-b_north", "3a_03-b", connections_by_region["3a_03-b_north"], locations_by_region["3a_03-b_north"]),
 
-    "3a_01-c_west": PreRegion("3a_01-c_west", "3a_01-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_01-c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_01-c_west"]),
-    "3a_01-c_east": PreRegion("3a_01-c_east", "3a_01-c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_01-c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_01-c_east"]),
+    "3a_01-c_west": PreRegion("3a_01-c_west", "3a_01-c", connections_by_region["3a_01-c_west"], locations_by_region["3a_01-c_west"]),
+    "3a_01-c_east": PreRegion("3a_01-c_east", "3a_01-c", connections_by_region["3a_01-c_east"], locations_by_region["3a_01-c_east"]),
 
-    "3a_02-d_west": PreRegion("3a_02-d_west", "3a_02-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-d_west"]),
-    "3a_02-d_east": PreRegion("3a_02-d_east", "3a_02-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_02-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_02-d_east"]),
+    "3a_02-d_west": PreRegion("3a_02-d_west", "3a_02-d", connections_by_region["3a_02-d_west"], locations_by_region["3a_02-d_west"]),
+    "3a_02-d_east": PreRegion("3a_02-d_east", "3a_02-d", connections_by_region["3a_02-d_east"], locations_by_region["3a_02-d_east"]),
 
-    "3a_00-d_west": PreRegion("3a_00-d_west", "3a_00-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-d_west"]),
-    "3a_00-d_east": PreRegion("3a_00-d_east", "3a_00-d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_00-d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_00-d_east"]),
+    "3a_00-d_west": PreRegion("3a_00-d_west", "3a_00-d", connections_by_region["3a_00-d_west"], locations_by_region["3a_00-d_west"]),
+    "3a_00-d_east": PreRegion("3a_00-d_east", "3a_00-d", connections_by_region["3a_00-d_east"], locations_by_region["3a_00-d_east"]),
 
-    "3a_roof00_west": PreRegion("3a_roof00_west", "3a_roof00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof00_west"]),
-    "3a_roof00_east": PreRegion("3a_roof00_east", "3a_roof00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof00_east"]),
+    "3a_roof00_west": PreRegion("3a_roof00_west", "3a_roof00", connections_by_region["3a_roof00_west"], locations_by_region["3a_roof00_west"]),
+    "3a_roof00_east": PreRegion("3a_roof00_east", "3a_roof00", connections_by_region["3a_roof00_east"], locations_by_region["3a_roof00_east"]),
 
-    "3a_roof01_west": PreRegion("3a_roof01_west", "3a_roof01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof01_west"]),
-    "3a_roof01_east": PreRegion("3a_roof01_east", "3a_roof01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof01_east"]),
+    "3a_roof01_west": PreRegion("3a_roof01_west", "3a_roof01", connections_by_region["3a_roof01_west"], locations_by_region["3a_roof01_west"]),
+    "3a_roof01_east": PreRegion("3a_roof01_east", "3a_roof01", connections_by_region["3a_roof01_east"], locations_by_region["3a_roof01_east"]),
 
-    "3a_roof02_west": PreRegion("3a_roof02_west", "3a_roof02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof02_west"]),
-    "3a_roof02_east": PreRegion("3a_roof02_east", "3a_roof02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof02_east"]),
+    "3a_roof02_west": PreRegion("3a_roof02_west", "3a_roof02", connections_by_region["3a_roof02_west"], locations_by_region["3a_roof02_west"]),
+    "3a_roof02_east": PreRegion("3a_roof02_east", "3a_roof02", connections_by_region["3a_roof02_east"], locations_by_region["3a_roof02_east"]),
 
-    "3a_roof03_west": PreRegion("3a_roof03_west", "3a_roof03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof03_west"]),
-    "3a_roof03_east": PreRegion("3a_roof03_east", "3a_roof03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof03_east"]),
+    "3a_roof03_west": PreRegion("3a_roof03_west", "3a_roof03", connections_by_region["3a_roof03_west"], locations_by_region["3a_roof03_west"]),
+    "3a_roof03_east": PreRegion("3a_roof03_east", "3a_roof03", connections_by_region["3a_roof03_east"], locations_by_region["3a_roof03_east"]),
 
-    "3a_roof04_west": PreRegion("3a_roof04_west", "3a_roof04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof04_west"]),
-    "3a_roof04_east": PreRegion("3a_roof04_east", "3a_roof04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof04_east"]),
+    "3a_roof04_west": PreRegion("3a_roof04_west", "3a_roof04", connections_by_region["3a_roof04_west"], locations_by_region["3a_roof04_west"]),
+    "3a_roof04_east": PreRegion("3a_roof04_east", "3a_roof04", connections_by_region["3a_roof04_east"], locations_by_region["3a_roof04_east"]),
 
-    "3a_roof05_west": PreRegion("3a_roof05_west", "3a_roof05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof05_west"]),
-    "3a_roof05_east": PreRegion("3a_roof05_east", "3a_roof05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof05_east"]),
+    "3a_roof05_west": PreRegion("3a_roof05_west", "3a_roof05", connections_by_region["3a_roof05_west"], locations_by_region["3a_roof05_west"]),
+    "3a_roof05_east": PreRegion("3a_roof05_east", "3a_roof05", connections_by_region["3a_roof05_east"], locations_by_region["3a_roof05_east"]),
 
-    "3a_roof06b_west": PreRegion("3a_roof06b_west", "3a_roof06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof06b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof06b_west"]),
-    "3a_roof06b_east": PreRegion("3a_roof06b_east", "3a_roof06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof06b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof06b_east"]),
+    "3a_roof06b_west": PreRegion("3a_roof06b_west", "3a_roof06b", connections_by_region["3a_roof06b_west"], locations_by_region["3a_roof06b_west"]),
+    "3a_roof06b_east": PreRegion("3a_roof06b_east", "3a_roof06b", connections_by_region["3a_roof06b_east"], locations_by_region["3a_roof06b_east"]),
 
-    "3a_roof06_west": PreRegion("3a_roof06_west", "3a_roof06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof06_west"]),
-    "3a_roof06_east": PreRegion("3a_roof06_east", "3a_roof06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof06_east"]),
+    "3a_roof06_west": PreRegion("3a_roof06_west", "3a_roof06", connections_by_region["3a_roof06_west"], locations_by_region["3a_roof06_west"]),
+    "3a_roof06_east": PreRegion("3a_roof06_east", "3a_roof06", connections_by_region["3a_roof06_east"], locations_by_region["3a_roof06_east"]),
 
-    "3a_roof07_west": PreRegion("3a_roof07_west", "3a_roof07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof07_west"]),
-    "3a_roof07_main": PreRegion("3a_roof07_main", "3a_roof07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3a_roof07_main"], [loc for _, loc in all_locations.items() if loc.region_name == "3a_roof07_main"]),
+    "3a_roof07_west": PreRegion("3a_roof07_west", "3a_roof07", connections_by_region["3a_roof07_west"], locations_by_region["3a_roof07_west"]),
+    "3a_roof07_main": PreRegion("3a_roof07_main", "3a_roof07", connections_by_region["3a_roof07_main"], locations_by_region["3a_roof07_main"]),
 
-    "3b_00_west": PreRegion("3b_00_west", "3b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_00_west"]),
-    "3b_00_east": PreRegion("3b_00_east", "3b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_00_east"]),
+    "3b_00_west": PreRegion("3b_00_west", "3b_00", connections_by_region["3b_00_west"], locations_by_region["3b_00_west"]),
+    "3b_00_east": PreRegion("3b_00_east", "3b_00", connections_by_region["3b_00_east"], locations_by_region["3b_00_east"]),
 
-    "3b_back_east": PreRegion("3b_back_east", "3b_back", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_back_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_back_east"]),
+    "3b_back_east": PreRegion("3b_back_east", "3b_back", connections_by_region["3b_back_east"], locations_by_region["3b_back_east"]),
 
-    "3b_01_west": PreRegion("3b_01_west", "3b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_01_west"]),
-    "3b_01_east": PreRegion("3b_01_east", "3b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_01_east"]),
+    "3b_01_west": PreRegion("3b_01_west", "3b_01", connections_by_region["3b_01_west"], locations_by_region["3b_01_west"]),
+    "3b_01_east": PreRegion("3b_01_east", "3b_01", connections_by_region["3b_01_east"], locations_by_region["3b_01_east"]),
 
-    "3b_02_west": PreRegion("3b_02_west", "3b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_02_west"]),
-    "3b_02_east": PreRegion("3b_02_east", "3b_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_02_east"]),
+    "3b_02_west": PreRegion("3b_02_west", "3b_02", connections_by_region["3b_02_west"], locations_by_region["3b_02_west"]),
+    "3b_02_east": PreRegion("3b_02_east", "3b_02", connections_by_region["3b_02_east"], locations_by_region["3b_02_east"]),
 
-    "3b_03_west": PreRegion("3b_03_west", "3b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_03_west"]),
-    "3b_03_east": PreRegion("3b_03_east", "3b_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_03_east"]),
+    "3b_03_west": PreRegion("3b_03_west", "3b_03", connections_by_region["3b_03_west"], locations_by_region["3b_03_west"]),
+    "3b_03_east": PreRegion("3b_03_east", "3b_03", connections_by_region["3b_03_east"], locations_by_region["3b_03_east"]),
 
-    "3b_04_west": PreRegion("3b_04_west", "3b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_04_west"]),
-    "3b_04_east": PreRegion("3b_04_east", "3b_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_04_east"]),
+    "3b_04_west": PreRegion("3b_04_west", "3b_04", connections_by_region["3b_04_west"], locations_by_region["3b_04_west"]),
+    "3b_04_east": PreRegion("3b_04_east", "3b_04", connections_by_region["3b_04_east"], locations_by_region["3b_04_east"]),
 
-    "3b_05_west": PreRegion("3b_05_west", "3b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_05_west"]),
-    "3b_05_east": PreRegion("3b_05_east", "3b_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_05_east"]),
+    "3b_05_west": PreRegion("3b_05_west", "3b_05", connections_by_region["3b_05_west"], locations_by_region["3b_05_west"]),
+    "3b_05_east": PreRegion("3b_05_east", "3b_05", connections_by_region["3b_05_east"], locations_by_region["3b_05_east"]),
 
-    "3b_06_west": PreRegion("3b_06_west", "3b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_06_west"]),
-    "3b_06_east": PreRegion("3b_06_east", "3b_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_06_east"]),
+    "3b_06_west": PreRegion("3b_06_west", "3b_06", connections_by_region["3b_06_west"], locations_by_region["3b_06_west"]),
+    "3b_06_east": PreRegion("3b_06_east", "3b_06", connections_by_region["3b_06_east"], locations_by_region["3b_06_east"]),
 
-    "3b_07_west": PreRegion("3b_07_west", "3b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_07_west"]),
-    "3b_07_east": PreRegion("3b_07_east", "3b_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_07_east"]),
+    "3b_07_west": PreRegion("3b_07_west", "3b_07", connections_by_region["3b_07_west"], locations_by_region["3b_07_west"]),
+    "3b_07_east": PreRegion("3b_07_east", "3b_07", connections_by_region["3b_07_east"], locations_by_region["3b_07_east"]),
 
-    "3b_08_bottom": PreRegion("3b_08_bottom", "3b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_08_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_08_bottom"]),
-    "3b_08_top": PreRegion("3b_08_top", "3b_08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_08_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_08_top"]),
+    "3b_08_bottom": PreRegion("3b_08_bottom", "3b_08", connections_by_region["3b_08_bottom"], locations_by_region["3b_08_bottom"]),
+    "3b_08_top": PreRegion("3b_08_top", "3b_08", connections_by_region["3b_08_top"], locations_by_region["3b_08_top"]),
 
-    "3b_09_west": PreRegion("3b_09_west", "3b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_09_west"]),
-    "3b_09_east": PreRegion("3b_09_east", "3b_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_09_east"]),
+    "3b_09_west": PreRegion("3b_09_west", "3b_09", connections_by_region["3b_09_west"], locations_by_region["3b_09_west"]),
+    "3b_09_east": PreRegion("3b_09_east", "3b_09", connections_by_region["3b_09_east"], locations_by_region["3b_09_east"]),
 
-    "3b_10_west": PreRegion("3b_10_west", "3b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_10_west"]),
-    "3b_10_east": PreRegion("3b_10_east", "3b_10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_10_east"]),
+    "3b_10_west": PreRegion("3b_10_west", "3b_10", connections_by_region["3b_10_west"], locations_by_region["3b_10_west"]),
+    "3b_10_east": PreRegion("3b_10_east", "3b_10", connections_by_region["3b_10_east"], locations_by_region["3b_10_east"]),
 
-    "3b_11_west": PreRegion("3b_11_west", "3b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_11_west"]),
-    "3b_11_east": PreRegion("3b_11_east", "3b_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_11_east"]),
+    "3b_11_west": PreRegion("3b_11_west", "3b_11", connections_by_region["3b_11_west"], locations_by_region["3b_11_west"]),
+    "3b_11_east": PreRegion("3b_11_east", "3b_11", connections_by_region["3b_11_east"], locations_by_region["3b_11_east"]),
 
-    "3b_13_west": PreRegion("3b_13_west", "3b_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_13_west"]),
-    "3b_13_east": PreRegion("3b_13_east", "3b_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_13_east"]),
+    "3b_13_west": PreRegion("3b_13_west", "3b_13", connections_by_region["3b_13_west"], locations_by_region["3b_13_west"]),
+    "3b_13_east": PreRegion("3b_13_east", "3b_13", connections_by_region["3b_13_east"], locations_by_region["3b_13_east"]),
 
-    "3b_14_west": PreRegion("3b_14_west", "3b_14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_14_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_14_west"]),
-    "3b_14_east": PreRegion("3b_14_east", "3b_14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_14_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_14_east"]),
+    "3b_14_west": PreRegion("3b_14_west", "3b_14", connections_by_region["3b_14_west"], locations_by_region["3b_14_west"]),
+    "3b_14_east": PreRegion("3b_14_east", "3b_14", connections_by_region["3b_14_east"], locations_by_region["3b_14_east"]),
 
-    "3b_15_west": PreRegion("3b_15_west", "3b_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_15_west"]),
-    "3b_15_east": PreRegion("3b_15_east", "3b_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_15_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_15_east"]),
+    "3b_15_west": PreRegion("3b_15_west", "3b_15", connections_by_region["3b_15_west"], locations_by_region["3b_15_west"]),
+    "3b_15_east": PreRegion("3b_15_east", "3b_15", connections_by_region["3b_15_east"], locations_by_region["3b_15_east"]),
 
-    "3b_12_west": PreRegion("3b_12_west", "3b_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_12_west"]),
-    "3b_12_east": PreRegion("3b_12_east", "3b_12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_12_east"]),
+    "3b_12_west": PreRegion("3b_12_west", "3b_12", connections_by_region["3b_12_west"], locations_by_region["3b_12_west"]),
+    "3b_12_east": PreRegion("3b_12_east", "3b_12", connections_by_region["3b_12_east"], locations_by_region["3b_12_east"]),
 
-    "3b_16_west": PreRegion("3b_16_west", "3b_16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_16_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_16_west"]),
-    "3b_16_top": PreRegion("3b_16_top", "3b_16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_16_top"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_16_top"]),
+    "3b_16_west": PreRegion("3b_16_west", "3b_16", connections_by_region["3b_16_west"], locations_by_region["3b_16_west"]),
+    "3b_16_top": PreRegion("3b_16_top", "3b_16", connections_by_region["3b_16_top"], locations_by_region["3b_16_top"]),
 
-    "3b_17_west": PreRegion("3b_17_west", "3b_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_17_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_17_west"]),
-    "3b_17_east": PreRegion("3b_17_east", "3b_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_17_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_17_east"]),
+    "3b_17_west": PreRegion("3b_17_west", "3b_17", connections_by_region["3b_17_west"], locations_by_region["3b_17_west"]),
+    "3b_17_east": PreRegion("3b_17_east", "3b_17", connections_by_region["3b_17_east"], locations_by_region["3b_17_east"]),
 
-    "3b_18_west": PreRegion("3b_18_west", "3b_18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_18_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_18_west"]),
-    "3b_18_east": PreRegion("3b_18_east", "3b_18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_18_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_18_east"]),
+    "3b_18_west": PreRegion("3b_18_west", "3b_18", connections_by_region["3b_18_west"], locations_by_region["3b_18_west"]),
+    "3b_18_east": PreRegion("3b_18_east", "3b_18", connections_by_region["3b_18_east"], locations_by_region["3b_18_east"]),
 
-    "3b_19_west": PreRegion("3b_19_west", "3b_19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_19_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_19_west"]),
-    "3b_19_east": PreRegion("3b_19_east", "3b_19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_19_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_19_east"]),
+    "3b_19_west": PreRegion("3b_19_west", "3b_19", connections_by_region["3b_19_west"], locations_by_region["3b_19_west"]),
+    "3b_19_east": PreRegion("3b_19_east", "3b_19", connections_by_region["3b_19_east"], locations_by_region["3b_19_east"]),
 
-    "3b_21_west": PreRegion("3b_21_west", "3b_21", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_21_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_21_west"]),
-    "3b_21_east": PreRegion("3b_21_east", "3b_21", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_21_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_21_east"]),
+    "3b_21_west": PreRegion("3b_21_west", "3b_21", connections_by_region["3b_21_west"], locations_by_region["3b_21_west"]),
+    "3b_21_east": PreRegion("3b_21_east", "3b_21", connections_by_region["3b_21_east"], locations_by_region["3b_21_east"]),
 
-    "3b_20_west": PreRegion("3b_20_west", "3b_20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_20_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_20_west"]),
-    "3b_20_east": PreRegion("3b_20_east", "3b_20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_20_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_20_east"]),
+    "3b_20_west": PreRegion("3b_20_west", "3b_20", connections_by_region["3b_20_west"], locations_by_region["3b_20_west"]),
+    "3b_20_east": PreRegion("3b_20_east", "3b_20", connections_by_region["3b_20_east"], locations_by_region["3b_20_east"]),
 
-    "3b_end_west": PreRegion("3b_end_west", "3b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_end_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_end_west"]),
-    "3b_end_goal": PreRegion("3b_end_goal", "3b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3b_end_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "3b_end_goal"]),
+    "3b_end_west": PreRegion("3b_end_west", "3b_end", connections_by_region["3b_end_west"], locations_by_region["3b_end_west"]),
+    "3b_end_goal": PreRegion("3b_end_goal", "3b_end", connections_by_region["3b_end_goal"], locations_by_region["3b_end_goal"]),
 
-    "3c_00_west": PreRegion("3c_00_west", "3c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_00_west"]),
-    "3c_00_east": PreRegion("3c_00_east", "3c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_00_east"]),
+    "3c_00_west": PreRegion("3c_00_west", "3c_00", connections_by_region["3c_00_west"], locations_by_region["3c_00_west"]),
+    "3c_00_east": PreRegion("3c_00_east", "3c_00", connections_by_region["3c_00_east"], locations_by_region["3c_00_east"]),
 
-    "3c_01_west": PreRegion("3c_01_west", "3c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_01_west"]),
-    "3c_01_east": PreRegion("3c_01_east", "3c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_01_east"]),
+    "3c_01_west": PreRegion("3c_01_west", "3c_01", connections_by_region["3c_01_west"], locations_by_region["3c_01_west"]),
+    "3c_01_east": PreRegion("3c_01_east", "3c_01", connections_by_region["3c_01_east"], locations_by_region["3c_01_east"]),
 
-    "3c_02_west": PreRegion("3c_02_west", "3c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_02_west"]),
-    "3c_02_goal": PreRegion("3c_02_goal", "3c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "3c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "3c_02_goal"]),
+    "3c_02_west": PreRegion("3c_02_west", "3c_02", connections_by_region["3c_02_west"], locations_by_region["3c_02_west"]),
+    "3c_02_goal": PreRegion("3c_02_goal", "3c_02", connections_by_region["3c_02_goal"], locations_by_region["3c_02_goal"]),
 
-    "4a_a-00_west": PreRegion("4a_a-00_west", "4a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-00_west"]),
-    "4a_a-00_east": PreRegion("4a_a-00_east", "4a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-00_east"]),
+    "4a_a-00_west": PreRegion("4a_a-00_west", "4a_a-00", connections_by_region["4a_a-00_west"], locations_by_region["4a_a-00_west"]),
+    "4a_a-00_east": PreRegion("4a_a-00_east", "4a_a-00", connections_by_region["4a_a-00_east"], locations_by_region["4a_a-00_east"]),
 
-    "4a_a-01_west": PreRegion("4a_a-01_west", "4a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-01_west"]),
-    "4a_a-01_east": PreRegion("4a_a-01_east", "4a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-01_east"]),
+    "4a_a-01_west": PreRegion("4a_a-01_west", "4a_a-01", connections_by_region["4a_a-01_west"], locations_by_region["4a_a-01_west"]),
+    "4a_a-01_east": PreRegion("4a_a-01_east", "4a_a-01", connections_by_region["4a_a-01_east"], locations_by_region["4a_a-01_east"]),
 
-    "4a_a-01x_west": PreRegion("4a_a-01x_west", "4a_a-01x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-01x_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-01x_west"]),
-    "4a_a-01x_east": PreRegion("4a_a-01x_east", "4a_a-01x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-01x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-01x_east"]),
+    "4a_a-01x_west": PreRegion("4a_a-01x_west", "4a_a-01x", connections_by_region["4a_a-01x_west"], locations_by_region["4a_a-01x_west"]),
+    "4a_a-01x_east": PreRegion("4a_a-01x_east", "4a_a-01x", connections_by_region["4a_a-01x_east"], locations_by_region["4a_a-01x_east"]),
 
-    "4a_a-02_west": PreRegion("4a_a-02_west", "4a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-02_west"]),
-    "4a_a-02_east": PreRegion("4a_a-02_east", "4a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-02_east"]),
+    "4a_a-02_west": PreRegion("4a_a-02_west", "4a_a-02", connections_by_region["4a_a-02_west"], locations_by_region["4a_a-02_west"]),
+    "4a_a-02_east": PreRegion("4a_a-02_east", "4a_a-02", connections_by_region["4a_a-02_east"], locations_by_region["4a_a-02_east"]),
 
-    "4a_a-03_west": PreRegion("4a_a-03_west", "4a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-03_west"]),
-    "4a_a-03_east": PreRegion("4a_a-03_east", "4a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-03_east"]),
+    "4a_a-03_west": PreRegion("4a_a-03_west", "4a_a-03", connections_by_region["4a_a-03_west"], locations_by_region["4a_a-03_west"]),
+    "4a_a-03_east": PreRegion("4a_a-03_east", "4a_a-03", connections_by_region["4a_a-03_east"], locations_by_region["4a_a-03_east"]),
 
-    "4a_a-04_west": PreRegion("4a_a-04_west", "4a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-04_west"]),
-    "4a_a-04_east": PreRegion("4a_a-04_east", "4a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-04_east"]),
+    "4a_a-04_west": PreRegion("4a_a-04_west", "4a_a-04", connections_by_region["4a_a-04_west"], locations_by_region["4a_a-04_west"]),
+    "4a_a-04_east": PreRegion("4a_a-04_east", "4a_a-04", connections_by_region["4a_a-04_east"], locations_by_region["4a_a-04_east"]),
 
-    "4a_a-05_west": PreRegion("4a_a-05_west", "4a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-05_west"]),
-    "4a_a-05_east": PreRegion("4a_a-05_east", "4a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-05_east"]),
+    "4a_a-05_west": PreRegion("4a_a-05_west", "4a_a-05", connections_by_region["4a_a-05_west"], locations_by_region["4a_a-05_west"]),
+    "4a_a-05_east": PreRegion("4a_a-05_east", "4a_a-05", connections_by_region["4a_a-05_east"], locations_by_region["4a_a-05_east"]),
 
-    "4a_a-06_west": PreRegion("4a_a-06_west", "4a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-06_west"]),
-    "4a_a-06_east": PreRegion("4a_a-06_east", "4a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-06_east"]),
+    "4a_a-06_west": PreRegion("4a_a-06_west", "4a_a-06", connections_by_region["4a_a-06_west"], locations_by_region["4a_a-06_west"]),
+    "4a_a-06_east": PreRegion("4a_a-06_east", "4a_a-06", connections_by_region["4a_a-06_east"], locations_by_region["4a_a-06_east"]),
 
-    "4a_a-07_west": PreRegion("4a_a-07_west", "4a_a-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-07_west"]),
-    "4a_a-07_east": PreRegion("4a_a-07_east", "4a_a-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-07_east"]),
+    "4a_a-07_west": PreRegion("4a_a-07_west", "4a_a-07", connections_by_region["4a_a-07_west"], locations_by_region["4a_a-07_west"]),
+    "4a_a-07_east": PreRegion("4a_a-07_east", "4a_a-07", connections_by_region["4a_a-07_east"], locations_by_region["4a_a-07_east"]),
 
-    "4a_a-08_west": PreRegion("4a_a-08_west", "4a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-08_west"]),
-    "4a_a-08_north-west": PreRegion("4a_a-08_north-west", "4a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-08_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-08_north-west"]),
-    "4a_a-08_east": PreRegion("4a_a-08_east", "4a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-08_east"]),
+    "4a_a-08_west": PreRegion("4a_a-08_west", "4a_a-08", connections_by_region["4a_a-08_west"], locations_by_region["4a_a-08_west"]),
+    "4a_a-08_north-west": PreRegion("4a_a-08_north-west", "4a_a-08", connections_by_region["4a_a-08_north-west"], locations_by_region["4a_a-08_north-west"]),
+    "4a_a-08_east": PreRegion("4a_a-08_east", "4a_a-08", connections_by_region["4a_a-08_east"], locations_by_region["4a_a-08_east"]),
 
-    "4a_a-10_west": PreRegion("4a_a-10_west", "4a_a-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-10_west"]),
-    "4a_a-10_east": PreRegion("4a_a-10_east", "4a_a-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-10_east"]),
+    "4a_a-10_west": PreRegion("4a_a-10_west", "4a_a-10", connections_by_region["4a_a-10_west"], locations_by_region["4a_a-10_west"]),
+    "4a_a-10_east": PreRegion("4a_a-10_east", "4a_a-10", connections_by_region["4a_a-10_east"], locations_by_region["4a_a-10_east"]),
 
-    "4a_a-11_east": PreRegion("4a_a-11_east", "4a_a-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-11_east"]),
+    "4a_a-11_east": PreRegion("4a_a-11_east", "4a_a-11", connections_by_region["4a_a-11_east"], locations_by_region["4a_a-11_east"]),
 
-    "4a_a-09_bottom": PreRegion("4a_a-09_bottom", "4a_a-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-09_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-09_bottom"]),
-    "4a_a-09_top": PreRegion("4a_a-09_top", "4a_a-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_a-09_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_a-09_top"]),
+    "4a_a-09_bottom": PreRegion("4a_a-09_bottom", "4a_a-09", connections_by_region["4a_a-09_bottom"], locations_by_region["4a_a-09_bottom"]),
+    "4a_a-09_top": PreRegion("4a_a-09_top", "4a_a-09", connections_by_region["4a_a-09_top"], locations_by_region["4a_a-09_top"]),
 
-    "4a_b-00_south": PreRegion("4a_b-00_south", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_south"]),
-    "4a_b-00_south-east": PreRegion("4a_b-00_south-east", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_south-east"]),
-    "4a_b-00_east": PreRegion("4a_b-00_east", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_east"]),
-    "4a_b-00_west": PreRegion("4a_b-00_west", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_west"]),
-    "4a_b-00_north-east": PreRegion("4a_b-00_north-east", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_north-east"]),
-    "4a_b-00_north-west": PreRegion("4a_b-00_north-west", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_north-west"]),
-    "4a_b-00_north": PreRegion("4a_b-00_north", "4a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-00_north"]),
+    "4a_b-00_south": PreRegion("4a_b-00_south", "4a_b-00", connections_by_region["4a_b-00_south"], locations_by_region["4a_b-00_south"]),
+    "4a_b-00_south-east": PreRegion("4a_b-00_south-east", "4a_b-00", connections_by_region["4a_b-00_south-east"], locations_by_region["4a_b-00_south-east"]),
+    "4a_b-00_east": PreRegion("4a_b-00_east", "4a_b-00", connections_by_region["4a_b-00_east"], locations_by_region["4a_b-00_east"]),
+    "4a_b-00_west": PreRegion("4a_b-00_west", "4a_b-00", connections_by_region["4a_b-00_west"], locations_by_region["4a_b-00_west"]),
+    "4a_b-00_north-east": PreRegion("4a_b-00_north-east", "4a_b-00", connections_by_region["4a_b-00_north-east"], locations_by_region["4a_b-00_north-east"]),
+    "4a_b-00_north-west": PreRegion("4a_b-00_north-west", "4a_b-00", connections_by_region["4a_b-00_north-west"], locations_by_region["4a_b-00_north-west"]),
+    "4a_b-00_north": PreRegion("4a_b-00_north", "4a_b-00", connections_by_region["4a_b-00_north"], locations_by_region["4a_b-00_north"]),
 
-    "4a_b-01_west": PreRegion("4a_b-01_west", "4a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-01_west"]),
+    "4a_b-01_west": PreRegion("4a_b-01_west", "4a_b-01", connections_by_region["4a_b-01_west"], locations_by_region["4a_b-01_west"]),
 
-    "4a_b-04_west": PreRegion("4a_b-04_west", "4a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-04_west"]),
-    "4a_b-04_north-west": PreRegion("4a_b-04_north-west", "4a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-04_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-04_north-west"]),
-    "4a_b-04_east": PreRegion("4a_b-04_east", "4a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-04_east"]),
+    "4a_b-04_west": PreRegion("4a_b-04_west", "4a_b-04", connections_by_region["4a_b-04_west"], locations_by_region["4a_b-04_west"]),
+    "4a_b-04_north-west": PreRegion("4a_b-04_north-west", "4a_b-04", connections_by_region["4a_b-04_north-west"], locations_by_region["4a_b-04_north-west"]),
+    "4a_b-04_east": PreRegion("4a_b-04_east", "4a_b-04", connections_by_region["4a_b-04_east"], locations_by_region["4a_b-04_east"]),
 
-    "4a_b-06_west": PreRegion("4a_b-06_west", "4a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-06_west"]),
-    "4a_b-06_east": PreRegion("4a_b-06_east", "4a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-06_east"]),
+    "4a_b-06_west": PreRegion("4a_b-06_west", "4a_b-06", connections_by_region["4a_b-06_west"], locations_by_region["4a_b-06_west"]),
+    "4a_b-06_east": PreRegion("4a_b-06_east", "4a_b-06", connections_by_region["4a_b-06_east"], locations_by_region["4a_b-06_east"]),
 
-    "4a_b-07_west": PreRegion("4a_b-07_west", "4a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-07_west"]),
-    "4a_b-07_east": PreRegion("4a_b-07_east", "4a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-07_east"]),
+    "4a_b-07_west": PreRegion("4a_b-07_west", "4a_b-07", connections_by_region["4a_b-07_west"], locations_by_region["4a_b-07_west"]),
+    "4a_b-07_east": PreRegion("4a_b-07_east", "4a_b-07", connections_by_region["4a_b-07_east"], locations_by_region["4a_b-07_east"]),
 
-    "4a_b-03_west": PreRegion("4a_b-03_west", "4a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-03_west"]),
-    "4a_b-03_east": PreRegion("4a_b-03_east", "4a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-03_east"]),
+    "4a_b-03_west": PreRegion("4a_b-03_west", "4a_b-03", connections_by_region["4a_b-03_west"], locations_by_region["4a_b-03_west"]),
+    "4a_b-03_east": PreRegion("4a_b-03_east", "4a_b-03", connections_by_region["4a_b-03_east"], locations_by_region["4a_b-03_east"]),
 
-    "4a_b-02_south-west": PreRegion("4a_b-02_south-west", "4a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-02_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-02_south-west"]),
-    "4a_b-02_north-west": PreRegion("4a_b-02_north-west", "4a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-02_north-west"]),
-    "4a_b-02_north-east": PreRegion("4a_b-02_north-east", "4a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-02_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-02_north-east"]),
-    "4a_b-02_north": PreRegion("4a_b-02_north", "4a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-02_north"]),
+    "4a_b-02_south-west": PreRegion("4a_b-02_south-west", "4a_b-02", connections_by_region["4a_b-02_south-west"], locations_by_region["4a_b-02_south-west"]),
+    "4a_b-02_north-west": PreRegion("4a_b-02_north-west", "4a_b-02", connections_by_region["4a_b-02_north-west"], locations_by_region["4a_b-02_north-west"]),
+    "4a_b-02_north-east": PreRegion("4a_b-02_north-east", "4a_b-02", connections_by_region["4a_b-02_north-east"], locations_by_region["4a_b-02_north-east"]),
+    "4a_b-02_north": PreRegion("4a_b-02_north", "4a_b-02", connections_by_region["4a_b-02_north"], locations_by_region["4a_b-02_north"]),
 
-    "4a_b-sec_west": PreRegion("4a_b-sec_west", "4a_b-sec", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-sec_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-sec_west"]),
-    "4a_b-sec_east": PreRegion("4a_b-sec_east", "4a_b-sec", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-sec_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-sec_east"]),
+    "4a_b-sec_west": PreRegion("4a_b-sec_west", "4a_b-sec", connections_by_region["4a_b-sec_west"], locations_by_region["4a_b-sec_west"]),
+    "4a_b-sec_east": PreRegion("4a_b-sec_east", "4a_b-sec", connections_by_region["4a_b-sec_east"], locations_by_region["4a_b-sec_east"]),
 
-    "4a_b-secb_west": PreRegion("4a_b-secb_west", "4a_b-secb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-secb_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-secb_west"]),
+    "4a_b-secb_west": PreRegion("4a_b-secb_west", "4a_b-secb", connections_by_region["4a_b-secb_west"], locations_by_region["4a_b-secb_west"]),
 
-    "4a_b-05_center": PreRegion("4a_b-05_center", "4a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-05_center"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-05_center"]),
-    "4a_b-05_west": PreRegion("4a_b-05_west", "4a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-05_west"]),
-    "4a_b-05_north-east": PreRegion("4a_b-05_north-east", "4a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-05_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-05_north-east"]),
-    "4a_b-05_east": PreRegion("4a_b-05_east", "4a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-05_east"]),
+    "4a_b-05_center": PreRegion("4a_b-05_center", "4a_b-05", connections_by_region["4a_b-05_center"], locations_by_region["4a_b-05_center"]),
+    "4a_b-05_west": PreRegion("4a_b-05_west", "4a_b-05", connections_by_region["4a_b-05_west"], locations_by_region["4a_b-05_west"]),
+    "4a_b-05_north-east": PreRegion("4a_b-05_north-east", "4a_b-05", connections_by_region["4a_b-05_north-east"], locations_by_region["4a_b-05_north-east"]),
+    "4a_b-05_east": PreRegion("4a_b-05_east", "4a_b-05", connections_by_region["4a_b-05_east"], locations_by_region["4a_b-05_east"]),
 
-    "4a_b-08b_west": PreRegion("4a_b-08b_west", "4a_b-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-08b_west"]),
-    "4a_b-08b_east": PreRegion("4a_b-08b_east", "4a_b-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-08b_east"]),
+    "4a_b-08b_west": PreRegion("4a_b-08b_west", "4a_b-08b", connections_by_region["4a_b-08b_west"], locations_by_region["4a_b-08b_west"]),
+    "4a_b-08b_east": PreRegion("4a_b-08b_east", "4a_b-08b", connections_by_region["4a_b-08b_east"], locations_by_region["4a_b-08b_east"]),
 
-    "4a_b-08_west": PreRegion("4a_b-08_west", "4a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-08_west"]),
-    "4a_b-08_east": PreRegion("4a_b-08_east", "4a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_b-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_b-08_east"]),
+    "4a_b-08_west": PreRegion("4a_b-08_west", "4a_b-08", connections_by_region["4a_b-08_west"], locations_by_region["4a_b-08_west"]),
+    "4a_b-08_east": PreRegion("4a_b-08_east", "4a_b-08", connections_by_region["4a_b-08_east"], locations_by_region["4a_b-08_east"]),
 
-    "4a_c-00_west": PreRegion("4a_c-00_west", "4a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-00_west"]),
-    "4a_c-00_east": PreRegion("4a_c-00_east", "4a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-00_east"]),
-    "4a_c-00_north-west": PreRegion("4a_c-00_north-west", "4a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-00_north-west"]),
+    "4a_c-00_west": PreRegion("4a_c-00_west", "4a_c-00", connections_by_region["4a_c-00_west"], locations_by_region["4a_c-00_west"]),
+    "4a_c-00_east": PreRegion("4a_c-00_east", "4a_c-00", connections_by_region["4a_c-00_east"], locations_by_region["4a_c-00_east"]),
+    "4a_c-00_north-west": PreRegion("4a_c-00_north-west", "4a_c-00", connections_by_region["4a_c-00_north-west"], locations_by_region["4a_c-00_north-west"]),
 
-    "4a_c-01_east": PreRegion("4a_c-01_east", "4a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-01_east"]),
+    "4a_c-01_east": PreRegion("4a_c-01_east", "4a_c-01", connections_by_region["4a_c-01_east"], locations_by_region["4a_c-01_east"]),
 
-    "4a_c-02_west": PreRegion("4a_c-02_west", "4a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-02_west"]),
-    "4a_c-02_east": PreRegion("4a_c-02_east", "4a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-02_east"]),
+    "4a_c-02_west": PreRegion("4a_c-02_west", "4a_c-02", connections_by_region["4a_c-02_west"], locations_by_region["4a_c-02_west"]),
+    "4a_c-02_east": PreRegion("4a_c-02_east", "4a_c-02", connections_by_region["4a_c-02_east"], locations_by_region["4a_c-02_east"]),
 
-    "4a_c-04_west": PreRegion("4a_c-04_west", "4a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-04_west"]),
-    "4a_c-04_east": PreRegion("4a_c-04_east", "4a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-04_east"]),
+    "4a_c-04_west": PreRegion("4a_c-04_west", "4a_c-04", connections_by_region["4a_c-04_west"], locations_by_region["4a_c-04_west"]),
+    "4a_c-04_east": PreRegion("4a_c-04_east", "4a_c-04", connections_by_region["4a_c-04_east"], locations_by_region["4a_c-04_east"]),
 
-    "4a_c-05_west": PreRegion("4a_c-05_west", "4a_c-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-05_west"]),
-    "4a_c-05_east": PreRegion("4a_c-05_east", "4a_c-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-05_east"]),
+    "4a_c-05_west": PreRegion("4a_c-05_west", "4a_c-05", connections_by_region["4a_c-05_west"], locations_by_region["4a_c-05_west"]),
+    "4a_c-05_east": PreRegion("4a_c-05_east", "4a_c-05", connections_by_region["4a_c-05_east"], locations_by_region["4a_c-05_east"]),
 
-    "4a_c-06_bottom": PreRegion("4a_c-06_bottom", "4a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-06_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-06_bottom"]),
-    "4a_c-06_west": PreRegion("4a_c-06_west", "4a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-06_west"]),
-    "4a_c-06_top": PreRegion("4a_c-06_top", "4a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-06_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-06_top"]),
+    "4a_c-06_bottom": PreRegion("4a_c-06_bottom", "4a_c-06", connections_by_region["4a_c-06_bottom"], locations_by_region["4a_c-06_bottom"]),
+    "4a_c-06_west": PreRegion("4a_c-06_west", "4a_c-06", connections_by_region["4a_c-06_west"], locations_by_region["4a_c-06_west"]),
+    "4a_c-06_top": PreRegion("4a_c-06_top", "4a_c-06", connections_by_region["4a_c-06_top"], locations_by_region["4a_c-06_top"]),
 
-    "4a_c-06b_east": PreRegion("4a_c-06b_east", "4a_c-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-06b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-06b_east"]),
+    "4a_c-06b_east": PreRegion("4a_c-06b_east", "4a_c-06b", connections_by_region["4a_c-06b_east"], locations_by_region["4a_c-06b_east"]),
 
-    "4a_c-09_west": PreRegion("4a_c-09_west", "4a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-09_west"]),
-    "4a_c-09_east": PreRegion("4a_c-09_east", "4a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-09_east"]),
+    "4a_c-09_west": PreRegion("4a_c-09_west", "4a_c-09", connections_by_region["4a_c-09_west"], locations_by_region["4a_c-09_west"]),
+    "4a_c-09_east": PreRegion("4a_c-09_east", "4a_c-09", connections_by_region["4a_c-09_east"], locations_by_region["4a_c-09_east"]),
 
-    "4a_c-07_west": PreRegion("4a_c-07_west", "4a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-07_west"]),
-    "4a_c-07_east": PreRegion("4a_c-07_east", "4a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-07_east"]),
+    "4a_c-07_west": PreRegion("4a_c-07_west", "4a_c-07", connections_by_region["4a_c-07_west"], locations_by_region["4a_c-07_west"]),
+    "4a_c-07_east": PreRegion("4a_c-07_east", "4a_c-07", connections_by_region["4a_c-07_east"], locations_by_region["4a_c-07_east"]),
 
-    "4a_c-08_bottom": PreRegion("4a_c-08_bottom", "4a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-08_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-08_bottom"]),
-    "4a_c-08_east": PreRegion("4a_c-08_east", "4a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-08_east"]),
-    "4a_c-08_top": PreRegion("4a_c-08_top", "4a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-08_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-08_top"]),
+    "4a_c-08_bottom": PreRegion("4a_c-08_bottom", "4a_c-08", connections_by_region["4a_c-08_bottom"], locations_by_region["4a_c-08_bottom"]),
+    "4a_c-08_east": PreRegion("4a_c-08_east", "4a_c-08", connections_by_region["4a_c-08_east"], locations_by_region["4a_c-08_east"]),
+    "4a_c-08_top": PreRegion("4a_c-08_top", "4a_c-08", connections_by_region["4a_c-08_top"], locations_by_region["4a_c-08_top"]),
 
-    "4a_c-10_bottom": PreRegion("4a_c-10_bottom", "4a_c-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-10_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-10_bottom"]),
-    "4a_c-10_top": PreRegion("4a_c-10_top", "4a_c-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_c-10_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_c-10_top"]),
+    "4a_c-10_bottom": PreRegion("4a_c-10_bottom", "4a_c-10", connections_by_region["4a_c-10_bottom"], locations_by_region["4a_c-10_bottom"]),
+    "4a_c-10_top": PreRegion("4a_c-10_top", "4a_c-10", connections_by_region["4a_c-10_top"], locations_by_region["4a_c-10_top"]),
 
-    "4a_d-00_west": PreRegion("4a_d-00_west", "4a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-00_west"]),
-    "4a_d-00_south": PreRegion("4a_d-00_south", "4a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-00_south"]),
-    "4a_d-00_east": PreRegion("4a_d-00_east", "4a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-00_east"]),
-    "4a_d-00_north-west": PreRegion("4a_d-00_north-west", "4a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-00_north-west"]),
+    "4a_d-00_west": PreRegion("4a_d-00_west", "4a_d-00", connections_by_region["4a_d-00_west"], locations_by_region["4a_d-00_west"]),
+    "4a_d-00_south": PreRegion("4a_d-00_south", "4a_d-00", connections_by_region["4a_d-00_south"], locations_by_region["4a_d-00_south"]),
+    "4a_d-00_east": PreRegion("4a_d-00_east", "4a_d-00", connections_by_region["4a_d-00_east"], locations_by_region["4a_d-00_east"]),
+    "4a_d-00_north-west": PreRegion("4a_d-00_north-west", "4a_d-00", connections_by_region["4a_d-00_north-west"], locations_by_region["4a_d-00_north-west"]),
 
-    "4a_d-00b_east": PreRegion("4a_d-00b_east", "4a_d-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-00b_east"]),
+    "4a_d-00b_east": PreRegion("4a_d-00b_east", "4a_d-00b", connections_by_region["4a_d-00b_east"], locations_by_region["4a_d-00b_east"]),
 
-    "4a_d-01_west": PreRegion("4a_d-01_west", "4a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-01_west"]),
-    "4a_d-01_east": PreRegion("4a_d-01_east", "4a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-01_east"]),
+    "4a_d-01_west": PreRegion("4a_d-01_west", "4a_d-01", connections_by_region["4a_d-01_west"], locations_by_region["4a_d-01_west"]),
+    "4a_d-01_east": PreRegion("4a_d-01_east", "4a_d-01", connections_by_region["4a_d-01_east"], locations_by_region["4a_d-01_east"]),
 
-    "4a_d-02_west": PreRegion("4a_d-02_west", "4a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-02_west"]),
-    "4a_d-02_east": PreRegion("4a_d-02_east", "4a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-02_east"]),
+    "4a_d-02_west": PreRegion("4a_d-02_west", "4a_d-02", connections_by_region["4a_d-02_west"], locations_by_region["4a_d-02_west"]),
+    "4a_d-02_east": PreRegion("4a_d-02_east", "4a_d-02", connections_by_region["4a_d-02_east"], locations_by_region["4a_d-02_east"]),
 
-    "4a_d-03_west": PreRegion("4a_d-03_west", "4a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-03_west"]),
-    "4a_d-03_east": PreRegion("4a_d-03_east", "4a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-03_east"]),
+    "4a_d-03_west": PreRegion("4a_d-03_west", "4a_d-03", connections_by_region["4a_d-03_west"], locations_by_region["4a_d-03_west"]),
+    "4a_d-03_east": PreRegion("4a_d-03_east", "4a_d-03", connections_by_region["4a_d-03_east"], locations_by_region["4a_d-03_east"]),
 
-    "4a_d-04_west": PreRegion("4a_d-04_west", "4a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-04_west"]),
-    "4a_d-04_east": PreRegion("4a_d-04_east", "4a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-04_east"]),
+    "4a_d-04_west": PreRegion("4a_d-04_west", "4a_d-04", connections_by_region["4a_d-04_west"], locations_by_region["4a_d-04_west"]),
+    "4a_d-04_east": PreRegion("4a_d-04_east", "4a_d-04", connections_by_region["4a_d-04_east"], locations_by_region["4a_d-04_east"]),
 
-    "4a_d-05_west": PreRegion("4a_d-05_west", "4a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-05_west"]),
-    "4a_d-05_east": PreRegion("4a_d-05_east", "4a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-05_east"]),
+    "4a_d-05_west": PreRegion("4a_d-05_west", "4a_d-05", connections_by_region["4a_d-05_west"], locations_by_region["4a_d-05_west"]),
+    "4a_d-05_east": PreRegion("4a_d-05_east", "4a_d-05", connections_by_region["4a_d-05_east"], locations_by_region["4a_d-05_east"]),
 
-    "4a_d-06_west": PreRegion("4a_d-06_west", "4a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-06_west"]),
-    "4a_d-06_east": PreRegion("4a_d-06_east", "4a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-06_east"]),
+    "4a_d-06_west": PreRegion("4a_d-06_west", "4a_d-06", connections_by_region["4a_d-06_west"], locations_by_region["4a_d-06_west"]),
+    "4a_d-06_east": PreRegion("4a_d-06_east", "4a_d-06", connections_by_region["4a_d-06_east"], locations_by_region["4a_d-06_east"]),
 
-    "4a_d-07_west": PreRegion("4a_d-07_west", "4a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-07_west"]),
-    "4a_d-07_east": PreRegion("4a_d-07_east", "4a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-07_east"]),
+    "4a_d-07_west": PreRegion("4a_d-07_west", "4a_d-07", connections_by_region["4a_d-07_west"], locations_by_region["4a_d-07_west"]),
+    "4a_d-07_east": PreRegion("4a_d-07_east", "4a_d-07", connections_by_region["4a_d-07_east"], locations_by_region["4a_d-07_east"]),
 
-    "4a_d-08_west": PreRegion("4a_d-08_west", "4a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-08_west"]),
-    "4a_d-08_east": PreRegion("4a_d-08_east", "4a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-08_east"]),
+    "4a_d-08_west": PreRegion("4a_d-08_west", "4a_d-08", connections_by_region["4a_d-08_west"], locations_by_region["4a_d-08_west"]),
+    "4a_d-08_east": PreRegion("4a_d-08_east", "4a_d-08", connections_by_region["4a_d-08_east"], locations_by_region["4a_d-08_east"]),
 
-    "4a_d-09_west": PreRegion("4a_d-09_west", "4a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-09_west"]),
-    "4a_d-09_east": PreRegion("4a_d-09_east", "4a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-09_east"]),
+    "4a_d-09_west": PreRegion("4a_d-09_west", "4a_d-09", connections_by_region["4a_d-09_west"], locations_by_region["4a_d-09_west"]),
+    "4a_d-09_east": PreRegion("4a_d-09_east", "4a_d-09", connections_by_region["4a_d-09_east"], locations_by_region["4a_d-09_east"]),
 
-    "4a_d-10_west": PreRegion("4a_d-10_west", "4a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-10_west"]),
-    "4a_d-10_goal": PreRegion("4a_d-10_goal", "4a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4a_d-10_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "4a_d-10_goal"]),
+    "4a_d-10_west": PreRegion("4a_d-10_west", "4a_d-10", connections_by_region["4a_d-10_west"], locations_by_region["4a_d-10_west"]),
+    "4a_d-10_goal": PreRegion("4a_d-10_goal", "4a_d-10", connections_by_region["4a_d-10_goal"], locations_by_region["4a_d-10_goal"]),
 
-    "4b_a-00_west": PreRegion("4b_a-00_west", "4b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-00_west"]),
-    "4b_a-00_east": PreRegion("4b_a-00_east", "4b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-00_east"]),
+    "4b_a-00_west": PreRegion("4b_a-00_west", "4b_a-00", connections_by_region["4b_a-00_west"], locations_by_region["4b_a-00_west"]),
+    "4b_a-00_east": PreRegion("4b_a-00_east", "4b_a-00", connections_by_region["4b_a-00_east"], locations_by_region["4b_a-00_east"]),
 
-    "4b_a-01_west": PreRegion("4b_a-01_west", "4b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-01_west"]),
-    "4b_a-01_east": PreRegion("4b_a-01_east", "4b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-01_east"]),
+    "4b_a-01_west": PreRegion("4b_a-01_west", "4b_a-01", connections_by_region["4b_a-01_west"], locations_by_region["4b_a-01_west"]),
+    "4b_a-01_east": PreRegion("4b_a-01_east", "4b_a-01", connections_by_region["4b_a-01_east"], locations_by_region["4b_a-01_east"]),
 
-    "4b_a-02_west": PreRegion("4b_a-02_west", "4b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-02_west"]),
-    "4b_a-02_east": PreRegion("4b_a-02_east", "4b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-02_east"]),
+    "4b_a-02_west": PreRegion("4b_a-02_west", "4b_a-02", connections_by_region["4b_a-02_west"], locations_by_region["4b_a-02_west"]),
+    "4b_a-02_east": PreRegion("4b_a-02_east", "4b_a-02", connections_by_region["4b_a-02_east"], locations_by_region["4b_a-02_east"]),
 
-    "4b_a-03_west": PreRegion("4b_a-03_west", "4b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-03_west"]),
-    "4b_a-03_east": PreRegion("4b_a-03_east", "4b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-03_east"]),
+    "4b_a-03_west": PreRegion("4b_a-03_west", "4b_a-03", connections_by_region["4b_a-03_west"], locations_by_region["4b_a-03_west"]),
+    "4b_a-03_east": PreRegion("4b_a-03_east", "4b_a-03", connections_by_region["4b_a-03_east"], locations_by_region["4b_a-03_east"]),
 
-    "4b_a-04_west": PreRegion("4b_a-04_west", "4b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-04_west"]),
-    "4b_a-04_east": PreRegion("4b_a-04_east", "4b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_a-04_east"]),
+    "4b_a-04_west": PreRegion("4b_a-04_west", "4b_a-04", connections_by_region["4b_a-04_west"], locations_by_region["4b_a-04_west"]),
+    "4b_a-04_east": PreRegion("4b_a-04_east", "4b_a-04", connections_by_region["4b_a-04_east"], locations_by_region["4b_a-04_east"]),
 
-    "4b_b-00_west": PreRegion("4b_b-00_west", "4b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-00_west"]),
-    "4b_b-00_east": PreRegion("4b_b-00_east", "4b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-00_east"]),
+    "4b_b-00_west": PreRegion("4b_b-00_west", "4b_b-00", connections_by_region["4b_b-00_west"], locations_by_region["4b_b-00_west"]),
+    "4b_b-00_east": PreRegion("4b_b-00_east", "4b_b-00", connections_by_region["4b_b-00_east"], locations_by_region["4b_b-00_east"]),
 
-    "4b_b-01_west": PreRegion("4b_b-01_west", "4b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-01_west"]),
-    "4b_b-01_east": PreRegion("4b_b-01_east", "4b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-01_east"]),
+    "4b_b-01_west": PreRegion("4b_b-01_west", "4b_b-01", connections_by_region["4b_b-01_west"], locations_by_region["4b_b-01_west"]),
+    "4b_b-01_east": PreRegion("4b_b-01_east", "4b_b-01", connections_by_region["4b_b-01_east"], locations_by_region["4b_b-01_east"]),
 
-    "4b_b-02_bottom": PreRegion("4b_b-02_bottom", "4b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-02_bottom"]),
-    "4b_b-02_top": PreRegion("4b_b-02_top", "4b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-02_top"]),
+    "4b_b-02_bottom": PreRegion("4b_b-02_bottom", "4b_b-02", connections_by_region["4b_b-02_bottom"], locations_by_region["4b_b-02_bottom"]),
+    "4b_b-02_top": PreRegion("4b_b-02_top", "4b_b-02", connections_by_region["4b_b-02_top"], locations_by_region["4b_b-02_top"]),
 
-    "4b_b-03_west": PreRegion("4b_b-03_west", "4b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-03_west"]),
-    "4b_b-03_east": PreRegion("4b_b-03_east", "4b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-03_east"]),
+    "4b_b-03_west": PreRegion("4b_b-03_west", "4b_b-03", connections_by_region["4b_b-03_west"], locations_by_region["4b_b-03_west"]),
+    "4b_b-03_east": PreRegion("4b_b-03_east", "4b_b-03", connections_by_region["4b_b-03_east"], locations_by_region["4b_b-03_east"]),
 
-    "4b_b-04_west": PreRegion("4b_b-04_west", "4b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-04_west"]),
-    "4b_b-04_east": PreRegion("4b_b-04_east", "4b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_b-04_east"]),
+    "4b_b-04_west": PreRegion("4b_b-04_west", "4b_b-04", connections_by_region["4b_b-04_west"], locations_by_region["4b_b-04_west"]),
+    "4b_b-04_east": PreRegion("4b_b-04_east", "4b_b-04", connections_by_region["4b_b-04_east"], locations_by_region["4b_b-04_east"]),
 
-    "4b_c-00_west": PreRegion("4b_c-00_west", "4b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-00_west"]),
-    "4b_c-00_east": PreRegion("4b_c-00_east", "4b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-00_east"]),
+    "4b_c-00_west": PreRegion("4b_c-00_west", "4b_c-00", connections_by_region["4b_c-00_west"], locations_by_region["4b_c-00_west"]),
+    "4b_c-00_east": PreRegion("4b_c-00_east", "4b_c-00", connections_by_region["4b_c-00_east"], locations_by_region["4b_c-00_east"]),
 
-    "4b_c-01_west": PreRegion("4b_c-01_west", "4b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-01_west"]),
-    "4b_c-01_east": PreRegion("4b_c-01_east", "4b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-01_east"]),
+    "4b_c-01_west": PreRegion("4b_c-01_west", "4b_c-01", connections_by_region["4b_c-01_west"], locations_by_region["4b_c-01_west"]),
+    "4b_c-01_east": PreRegion("4b_c-01_east", "4b_c-01", connections_by_region["4b_c-01_east"], locations_by_region["4b_c-01_east"]),
 
-    "4b_c-02_west": PreRegion("4b_c-02_west", "4b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-02_west"]),
-    "4b_c-02_east": PreRegion("4b_c-02_east", "4b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-02_east"]),
+    "4b_c-02_west": PreRegion("4b_c-02_west", "4b_c-02", connections_by_region["4b_c-02_west"], locations_by_region["4b_c-02_west"]),
+    "4b_c-02_east": PreRegion("4b_c-02_east", "4b_c-02", connections_by_region["4b_c-02_east"], locations_by_region["4b_c-02_east"]),
 
-    "4b_c-03_bottom": PreRegion("4b_c-03_bottom", "4b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-03_bottom"]),
-    "4b_c-03_top": PreRegion("4b_c-03_top", "4b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-03_top"]),
+    "4b_c-03_bottom": PreRegion("4b_c-03_bottom", "4b_c-03", connections_by_region["4b_c-03_bottom"], locations_by_region["4b_c-03_bottom"]),
+    "4b_c-03_top": PreRegion("4b_c-03_top", "4b_c-03", connections_by_region["4b_c-03_top"], locations_by_region["4b_c-03_top"]),
 
-    "4b_c-04_west": PreRegion("4b_c-04_west", "4b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-04_west"]),
-    "4b_c-04_east": PreRegion("4b_c-04_east", "4b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_c-04_east"]),
+    "4b_c-04_west": PreRegion("4b_c-04_west", "4b_c-04", connections_by_region["4b_c-04_west"], locations_by_region["4b_c-04_west"]),
+    "4b_c-04_east": PreRegion("4b_c-04_east", "4b_c-04", connections_by_region["4b_c-04_east"], locations_by_region["4b_c-04_east"]),
 
-    "4b_d-00_west": PreRegion("4b_d-00_west", "4b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-00_west"]),
-    "4b_d-00_east": PreRegion("4b_d-00_east", "4b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-00_east"]),
+    "4b_d-00_west": PreRegion("4b_d-00_west", "4b_d-00", connections_by_region["4b_d-00_west"], locations_by_region["4b_d-00_west"]),
+    "4b_d-00_east": PreRegion("4b_d-00_east", "4b_d-00", connections_by_region["4b_d-00_east"], locations_by_region["4b_d-00_east"]),
 
-    "4b_d-01_west": PreRegion("4b_d-01_west", "4b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-01_west"]),
-    "4b_d-01_east": PreRegion("4b_d-01_east", "4b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-01_east"]),
+    "4b_d-01_west": PreRegion("4b_d-01_west", "4b_d-01", connections_by_region["4b_d-01_west"], locations_by_region["4b_d-01_west"]),
+    "4b_d-01_east": PreRegion("4b_d-01_east", "4b_d-01", connections_by_region["4b_d-01_east"], locations_by_region["4b_d-01_east"]),
 
-    "4b_d-02_west": PreRegion("4b_d-02_west", "4b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-02_west"]),
-    "4b_d-02_east": PreRegion("4b_d-02_east", "4b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-02_east"]),
+    "4b_d-02_west": PreRegion("4b_d-02_west", "4b_d-02", connections_by_region["4b_d-02_west"], locations_by_region["4b_d-02_west"]),
+    "4b_d-02_east": PreRegion("4b_d-02_east", "4b_d-02", connections_by_region["4b_d-02_east"], locations_by_region["4b_d-02_east"]),
 
-    "4b_d-03_west": PreRegion("4b_d-03_west", "4b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-03_west"]),
-    "4b_d-03_east": PreRegion("4b_d-03_east", "4b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_d-03_east"]),
+    "4b_d-03_west": PreRegion("4b_d-03_west", "4b_d-03", connections_by_region["4b_d-03_west"], locations_by_region["4b_d-03_west"]),
+    "4b_d-03_east": PreRegion("4b_d-03_east", "4b_d-03", connections_by_region["4b_d-03_east"], locations_by_region["4b_d-03_east"]),
 
-    "4b_end_west": PreRegion("4b_end_west", "4b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_end_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_end_west"]),
-    "4b_end_goal": PreRegion("4b_end_goal", "4b_end", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4b_end_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "4b_end_goal"]),
+    "4b_end_west": PreRegion("4b_end_west", "4b_end", connections_by_region["4b_end_west"], locations_by_region["4b_end_west"]),
+    "4b_end_goal": PreRegion("4b_end_goal", "4b_end", connections_by_region["4b_end_goal"], locations_by_region["4b_end_goal"]),
 
-    "4c_00_west": PreRegion("4c_00_west", "4c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_00_west"]),
-    "4c_00_east": PreRegion("4c_00_east", "4c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_00_east"]),
+    "4c_00_west": PreRegion("4c_00_west", "4c_00", connections_by_region["4c_00_west"], locations_by_region["4c_00_west"]),
+    "4c_00_east": PreRegion("4c_00_east", "4c_00", connections_by_region["4c_00_east"], locations_by_region["4c_00_east"]),
 
-    "4c_01_west": PreRegion("4c_01_west", "4c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_01_west"]),
-    "4c_01_east": PreRegion("4c_01_east", "4c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_01_east"]),
+    "4c_01_west": PreRegion("4c_01_west", "4c_01", connections_by_region["4c_01_west"], locations_by_region["4c_01_west"]),
+    "4c_01_east": PreRegion("4c_01_east", "4c_01", connections_by_region["4c_01_east"], locations_by_region["4c_01_east"]),
 
-    "4c_02_west": PreRegion("4c_02_west", "4c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_02_west"]),
-    "4c_02_goal": PreRegion("4c_02_goal", "4c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "4c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "4c_02_goal"]),
+    "4c_02_west": PreRegion("4c_02_west", "4c_02", connections_by_region["4c_02_west"], locations_by_region["4c_02_west"]),
+    "4c_02_goal": PreRegion("4c_02_goal", "4c_02", connections_by_region["4c_02_goal"], locations_by_region["4c_02_goal"]),
 
-    "5a_a-00b_west": PreRegion("5a_a-00b_west", "5a_a-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00b_west"]),
-    "5a_a-00b_east": PreRegion("5a_a-00b_east", "5a_a-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00b_east"]),
+    "5a_a-00b_west": PreRegion("5a_a-00b_west", "5a_a-00b", connections_by_region["5a_a-00b_west"], locations_by_region["5a_a-00b_west"]),
+    "5a_a-00b_east": PreRegion("5a_a-00b_east", "5a_a-00b", connections_by_region["5a_a-00b_east"], locations_by_region["5a_a-00b_east"]),
 
-    "5a_a-00x_east": PreRegion("5a_a-00x_east", "5a_a-00x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00x_east"]),
+    "5a_a-00x_east": PreRegion("5a_a-00x_east", "5a_a-00x", connections_by_region["5a_a-00x_east"], locations_by_region["5a_a-00x_east"]),
 
-    "5a_a-00d_west": PreRegion("5a_a-00d_west", "5a_a-00d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00d_west"]),
-    "5a_a-00d_east": PreRegion("5a_a-00d_east", "5a_a-00d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00d_east"]),
+    "5a_a-00d_west": PreRegion("5a_a-00d_west", "5a_a-00d", connections_by_region["5a_a-00d_west"], locations_by_region["5a_a-00d_west"]),
+    "5a_a-00d_east": PreRegion("5a_a-00d_east", "5a_a-00d", connections_by_region["5a_a-00d_east"], locations_by_region["5a_a-00d_east"]),
 
-    "5a_a-00c_west": PreRegion("5a_a-00c_west", "5a_a-00c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00c_west"]),
-    "5a_a-00c_east": PreRegion("5a_a-00c_east", "5a_a-00c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00c_east"]),
+    "5a_a-00c_west": PreRegion("5a_a-00c_west", "5a_a-00c", connections_by_region["5a_a-00c_west"], locations_by_region["5a_a-00c_west"]),
+    "5a_a-00c_east": PreRegion("5a_a-00c_east", "5a_a-00c", connections_by_region["5a_a-00c_east"], locations_by_region["5a_a-00c_east"]),
 
-    "5a_a-00_west": PreRegion("5a_a-00_west", "5a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00_west"]),
-    "5a_a-00_east": PreRegion("5a_a-00_east", "5a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-00_east"]),
+    "5a_a-00_west": PreRegion("5a_a-00_west", "5a_a-00", connections_by_region["5a_a-00_west"], locations_by_region["5a_a-00_west"]),
+    "5a_a-00_east": PreRegion("5a_a-00_east", "5a_a-00", connections_by_region["5a_a-00_east"], locations_by_region["5a_a-00_east"]),
 
-    "5a_a-01_west": PreRegion("5a_a-01_west", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_west"]),
-    "5a_a-01_center": PreRegion("5a_a-01_center", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_center"]),
-    "5a_a-01_east": PreRegion("5a_a-01_east", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_east"]),
-    "5a_a-01_south-west": PreRegion("5a_a-01_south-west", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_south-west"]),
-    "5a_a-01_south-east": PreRegion("5a_a-01_south-east", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_south-east"]),
-    "5a_a-01_north": PreRegion("5a_a-01_north", "5a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-01_north"]),
+    "5a_a-01_west": PreRegion("5a_a-01_west", "5a_a-01", connections_by_region["5a_a-01_west"], locations_by_region["5a_a-01_west"]),
+    "5a_a-01_center": PreRegion("5a_a-01_center", "5a_a-01", connections_by_region["5a_a-01_center"], locations_by_region["5a_a-01_center"]),
+    "5a_a-01_east": PreRegion("5a_a-01_east", "5a_a-01", connections_by_region["5a_a-01_east"], locations_by_region["5a_a-01_east"]),
+    "5a_a-01_south-west": PreRegion("5a_a-01_south-west", "5a_a-01", connections_by_region["5a_a-01_south-west"], locations_by_region["5a_a-01_south-west"]),
+    "5a_a-01_south-east": PreRegion("5a_a-01_south-east", "5a_a-01", connections_by_region["5a_a-01_south-east"], locations_by_region["5a_a-01_south-east"]),
+    "5a_a-01_north": PreRegion("5a_a-01_north", "5a_a-01", connections_by_region["5a_a-01_north"], locations_by_region["5a_a-01_north"]),
 
-    "5a_a-02_west": PreRegion("5a_a-02_west", "5a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-02_west"]),
-    "5a_a-02_north": PreRegion("5a_a-02_north", "5a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-02_north"]),
-    "5a_a-02_south": PreRegion("5a_a-02_south", "5a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-02_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-02_south"]),
+    "5a_a-02_west": PreRegion("5a_a-02_west", "5a_a-02", connections_by_region["5a_a-02_west"], locations_by_region["5a_a-02_west"]),
+    "5a_a-02_north": PreRegion("5a_a-02_north", "5a_a-02", connections_by_region["5a_a-02_north"], locations_by_region["5a_a-02_north"]),
+    "5a_a-02_south": PreRegion("5a_a-02_south", "5a_a-02", connections_by_region["5a_a-02_south"], locations_by_region["5a_a-02_south"]),
 
-    "5a_a-03_west": PreRegion("5a_a-03_west", "5a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-03_west"]),
-    "5a_a-03_east": PreRegion("5a_a-03_east", "5a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-03_east"]),
+    "5a_a-03_west": PreRegion("5a_a-03_west", "5a_a-03", connections_by_region["5a_a-03_west"], locations_by_region["5a_a-03_west"]),
+    "5a_a-03_east": PreRegion("5a_a-03_east", "5a_a-03", connections_by_region["5a_a-03_east"], locations_by_region["5a_a-03_east"]),
 
-    "5a_a-04_east": PreRegion("5a_a-04_east", "5a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-04_east"]),
-    "5a_a-04_north": PreRegion("5a_a-04_north", "5a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-04_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-04_north"]),
-    "5a_a-04_south": PreRegion("5a_a-04_south", "5a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-04_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-04_south"]),
+    "5a_a-04_east": PreRegion("5a_a-04_east", "5a_a-04", connections_by_region["5a_a-04_east"], locations_by_region["5a_a-04_east"]),
+    "5a_a-04_north": PreRegion("5a_a-04_north", "5a_a-04", connections_by_region["5a_a-04_north"], locations_by_region["5a_a-04_north"]),
+    "5a_a-04_south": PreRegion("5a_a-04_south", "5a_a-04", connections_by_region["5a_a-04_south"], locations_by_region["5a_a-04_south"]),
 
-    "5a_a-05_north-west": PreRegion("5a_a-05_north-west", "5a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-05_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-05_north-west"]),
-    "5a_a-05_center": PreRegion("5a_a-05_center", "5a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-05_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-05_center"]),
-    "5a_a-05_north-east": PreRegion("5a_a-05_north-east", "5a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-05_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-05_north-east"]),
-    "5a_a-05_south-west": PreRegion("5a_a-05_south-west", "5a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-05_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-05_south-west"]),
-    "5a_a-05_south-east": PreRegion("5a_a-05_south-east", "5a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-05_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-05_south-east"]),
+    "5a_a-05_north-west": PreRegion("5a_a-05_north-west", "5a_a-05", connections_by_region["5a_a-05_north-west"], locations_by_region["5a_a-05_north-west"]),
+    "5a_a-05_center": PreRegion("5a_a-05_center", "5a_a-05", connections_by_region["5a_a-05_center"], locations_by_region["5a_a-05_center"]),
+    "5a_a-05_north-east": PreRegion("5a_a-05_north-east", "5a_a-05", connections_by_region["5a_a-05_north-east"], locations_by_region["5a_a-05_north-east"]),
+    "5a_a-05_south-west": PreRegion("5a_a-05_south-west", "5a_a-05", connections_by_region["5a_a-05_south-west"], locations_by_region["5a_a-05_south-west"]),
+    "5a_a-05_south-east": PreRegion("5a_a-05_south-east", "5a_a-05", connections_by_region["5a_a-05_south-east"], locations_by_region["5a_a-05_south-east"]),
 
-    "5a_a-06_west": PreRegion("5a_a-06_west", "5a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-06_west"]),
+    "5a_a-06_west": PreRegion("5a_a-06_west", "5a_a-06", connections_by_region["5a_a-06_west"], locations_by_region["5a_a-06_west"]),
 
-    "5a_a-07_east": PreRegion("5a_a-07_east", "5a_a-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-07_east"]),
+    "5a_a-07_east": PreRegion("5a_a-07_east", "5a_a-07", connections_by_region["5a_a-07_east"], locations_by_region["5a_a-07_east"]),
 
-    "5a_a-08_west": PreRegion("5a_a-08_west", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_west"]),
-    "5a_a-08_center": PreRegion("5a_a-08_center", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_center"]),
-    "5a_a-08_east": PreRegion("5a_a-08_east", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_east"]),
-    "5a_a-08_south": PreRegion("5a_a-08_south", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_south"]),
-    "5a_a-08_south-east": PreRegion("5a_a-08_south-east", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_south-east"]),
-    "5a_a-08_north-east": PreRegion("5a_a-08_north-east", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_north-east"]),
-    "5a_a-08_north": PreRegion("5a_a-08_north", "5a_a-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-08_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-08_north"]),
+    "5a_a-08_west": PreRegion("5a_a-08_west", "5a_a-08", connections_by_region["5a_a-08_west"], locations_by_region["5a_a-08_west"]),
+    "5a_a-08_center": PreRegion("5a_a-08_center", "5a_a-08", connections_by_region["5a_a-08_center"], locations_by_region["5a_a-08_center"]),
+    "5a_a-08_east": PreRegion("5a_a-08_east", "5a_a-08", connections_by_region["5a_a-08_east"], locations_by_region["5a_a-08_east"]),
+    "5a_a-08_south": PreRegion("5a_a-08_south", "5a_a-08", connections_by_region["5a_a-08_south"], locations_by_region["5a_a-08_south"]),
+    "5a_a-08_south-east": PreRegion("5a_a-08_south-east", "5a_a-08", connections_by_region["5a_a-08_south-east"], locations_by_region["5a_a-08_south-east"]),
+    "5a_a-08_north-east": PreRegion("5a_a-08_north-east", "5a_a-08", connections_by_region["5a_a-08_north-east"], locations_by_region["5a_a-08_north-east"]),
+    "5a_a-08_north": PreRegion("5a_a-08_north", "5a_a-08", connections_by_region["5a_a-08_north"], locations_by_region["5a_a-08_north"]),
 
-    "5a_a-10_west": PreRegion("5a_a-10_west", "5a_a-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-10_west"]),
-    "5a_a-10_east": PreRegion("5a_a-10_east", "5a_a-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-10_east"]),
+    "5a_a-10_west": PreRegion("5a_a-10_west", "5a_a-10", connections_by_region["5a_a-10_west"], locations_by_region["5a_a-10_west"]),
+    "5a_a-10_east": PreRegion("5a_a-10_east", "5a_a-10", connections_by_region["5a_a-10_east"], locations_by_region["5a_a-10_east"]),
 
-    "5a_a-09_west": PreRegion("5a_a-09_west", "5a_a-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-09_west"]),
-    "5a_a-09_east": PreRegion("5a_a-09_east", "5a_a-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-09_east"]),
+    "5a_a-09_west": PreRegion("5a_a-09_west", "5a_a-09", connections_by_region["5a_a-09_west"], locations_by_region["5a_a-09_west"]),
+    "5a_a-09_east": PreRegion("5a_a-09_east", "5a_a-09", connections_by_region["5a_a-09_east"], locations_by_region["5a_a-09_east"]),
 
-    "5a_a-11_east": PreRegion("5a_a-11_east", "5a_a-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-11_east"]),
+    "5a_a-11_east": PreRegion("5a_a-11_east", "5a_a-11", connections_by_region["5a_a-11_east"], locations_by_region["5a_a-11_east"]),
 
-    "5a_a-12_north-west": PreRegion("5a_a-12_north-west", "5a_a-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-12_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-12_north-west"]),
-    "5a_a-12_west": PreRegion("5a_a-12_west", "5a_a-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-12_west"]),
-    "5a_a-12_south-west": PreRegion("5a_a-12_south-west", "5a_a-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-12_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-12_south-west"]),
-    "5a_a-12_east": PreRegion("5a_a-12_east", "5a_a-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-12_east"]),
+    "5a_a-12_north-west": PreRegion("5a_a-12_north-west", "5a_a-12", connections_by_region["5a_a-12_north-west"], locations_by_region["5a_a-12_north-west"]),
+    "5a_a-12_west": PreRegion("5a_a-12_west", "5a_a-12", connections_by_region["5a_a-12_west"], locations_by_region["5a_a-12_west"]),
+    "5a_a-12_south-west": PreRegion("5a_a-12_south-west", "5a_a-12", connections_by_region["5a_a-12_south-west"], locations_by_region["5a_a-12_south-west"]),
+    "5a_a-12_east": PreRegion("5a_a-12_east", "5a_a-12", connections_by_region["5a_a-12_east"], locations_by_region["5a_a-12_east"]),
 
-    "5a_a-15_south": PreRegion("5a_a-15_south", "5a_a-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-15_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-15_south"]),
+    "5a_a-15_south": PreRegion("5a_a-15_south", "5a_a-15", connections_by_region["5a_a-15_south"], locations_by_region["5a_a-15_south"]),
 
-    "5a_a-14_south": PreRegion("5a_a-14_south", "5a_a-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-14_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-14_south"]),
+    "5a_a-14_south": PreRegion("5a_a-14_south", "5a_a-14", connections_by_region["5a_a-14_south"], locations_by_region["5a_a-14_south"]),
 
-    "5a_a-13_west": PreRegion("5a_a-13_west", "5a_a-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-13_west"]),
-    "5a_a-13_east": PreRegion("5a_a-13_east", "5a_a-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_a-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_a-13_east"]),
+    "5a_a-13_west": PreRegion("5a_a-13_west", "5a_a-13", connections_by_region["5a_a-13_west"], locations_by_region["5a_a-13_west"]),
+    "5a_a-13_east": PreRegion("5a_a-13_east", "5a_a-13", connections_by_region["5a_a-13_east"], locations_by_region["5a_a-13_east"]),
 
-    "5a_b-00_west": PreRegion("5a_b-00_west", "5a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-00_west"]),
-    "5a_b-00_north-west": PreRegion("5a_b-00_north-west", "5a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-00_north-west"]),
-    "5a_b-00_east": PreRegion("5a_b-00_east", "5a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-00_east"]),
+    "5a_b-00_west": PreRegion("5a_b-00_west", "5a_b-00", connections_by_region["5a_b-00_west"], locations_by_region["5a_b-00_west"]),
+    "5a_b-00_north-west": PreRegion("5a_b-00_north-west", "5a_b-00", connections_by_region["5a_b-00_north-west"], locations_by_region["5a_b-00_north-west"]),
+    "5a_b-00_east": PreRegion("5a_b-00_east", "5a_b-00", connections_by_region["5a_b-00_east"], locations_by_region["5a_b-00_east"]),
 
-    "5a_b-18_south": PreRegion("5a_b-18_south", "5a_b-18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-18_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-18_south"]),
+    "5a_b-18_south": PreRegion("5a_b-18_south", "5a_b-18", connections_by_region["5a_b-18_south"], locations_by_region["5a_b-18_south"]),
 
-    "5a_b-01_south-west": PreRegion("5a_b-01_south-west", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_south-west"]),
-    "5a_b-01_center": PreRegion("5a_b-01_center", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_center"]),
-    "5a_b-01_west": PreRegion("5a_b-01_west", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_west"]),
-    "5a_b-01_north-west": PreRegion("5a_b-01_north-west", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_north-west"]),
-    "5a_b-01_north": PreRegion("5a_b-01_north", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_north"]),
-    "5a_b-01_north-east": PreRegion("5a_b-01_north-east", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_north-east"]),
-    "5a_b-01_east": PreRegion("5a_b-01_east", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_east"]),
-    "5a_b-01_south-east": PreRegion("5a_b-01_south-east", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_south-east"]),
-    "5a_b-01_south": PreRegion("5a_b-01_south", "5a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01_south"]),
+    "5a_b-01_south-west": PreRegion("5a_b-01_south-west", "5a_b-01", connections_by_region["5a_b-01_south-west"], locations_by_region["5a_b-01_south-west"]),
+    "5a_b-01_center": PreRegion("5a_b-01_center", "5a_b-01", connections_by_region["5a_b-01_center"], locations_by_region["5a_b-01_center"]),
+    "5a_b-01_west": PreRegion("5a_b-01_west", "5a_b-01", connections_by_region["5a_b-01_west"], locations_by_region["5a_b-01_west"]),
+    "5a_b-01_north-west": PreRegion("5a_b-01_north-west", "5a_b-01", connections_by_region["5a_b-01_north-west"], locations_by_region["5a_b-01_north-west"]),
+    "5a_b-01_north": PreRegion("5a_b-01_north", "5a_b-01", connections_by_region["5a_b-01_north"], locations_by_region["5a_b-01_north"]),
+    "5a_b-01_north-east": PreRegion("5a_b-01_north-east", "5a_b-01", connections_by_region["5a_b-01_north-east"], locations_by_region["5a_b-01_north-east"]),
+    "5a_b-01_east": PreRegion("5a_b-01_east", "5a_b-01", connections_by_region["5a_b-01_east"], locations_by_region["5a_b-01_east"]),
+    "5a_b-01_south-east": PreRegion("5a_b-01_south-east", "5a_b-01", connections_by_region["5a_b-01_south-east"], locations_by_region["5a_b-01_south-east"]),
+    "5a_b-01_south": PreRegion("5a_b-01_south", "5a_b-01", connections_by_region["5a_b-01_south"], locations_by_region["5a_b-01_south"]),
 
-    "5a_b-01c_west": PreRegion("5a_b-01c_west", "5a_b-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01c_west"]),
-    "5a_b-01c_east": PreRegion("5a_b-01c_east", "5a_b-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01c_east"]),
+    "5a_b-01c_west": PreRegion("5a_b-01c_west", "5a_b-01c", connections_by_region["5a_b-01c_west"], locations_by_region["5a_b-01c_west"]),
+    "5a_b-01c_east": PreRegion("5a_b-01c_east", "5a_b-01c", connections_by_region["5a_b-01c_east"], locations_by_region["5a_b-01c_east"]),
 
-    "5a_b-20_north-west": PreRegion("5a_b-20_north-west", "5a_b-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-20_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-20_north-west"]),
-    "5a_b-20_west": PreRegion("5a_b-20_west", "5a_b-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-20_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-20_west"]),
-    "5a_b-20_south-west": PreRegion("5a_b-20_south-west", "5a_b-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-20_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-20_south-west"]),
-    "5a_b-20_south": PreRegion("5a_b-20_south", "5a_b-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-20_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-20_south"]),
-    "5a_b-20_east": PreRegion("5a_b-20_east", "5a_b-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-20_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-20_east"]),
+    "5a_b-20_north-west": PreRegion("5a_b-20_north-west", "5a_b-20", connections_by_region["5a_b-20_north-west"], locations_by_region["5a_b-20_north-west"]),
+    "5a_b-20_west": PreRegion("5a_b-20_west", "5a_b-20", connections_by_region["5a_b-20_west"], locations_by_region["5a_b-20_west"]),
+    "5a_b-20_south-west": PreRegion("5a_b-20_south-west", "5a_b-20", connections_by_region["5a_b-20_south-west"], locations_by_region["5a_b-20_south-west"]),
+    "5a_b-20_south": PreRegion("5a_b-20_south", "5a_b-20", connections_by_region["5a_b-20_south"], locations_by_region["5a_b-20_south"]),
+    "5a_b-20_east": PreRegion("5a_b-20_east", "5a_b-20", connections_by_region["5a_b-20_east"], locations_by_region["5a_b-20_east"]),
 
-    "5a_b-21_east": PreRegion("5a_b-21_east", "5a_b-21", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-21_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-21_east"]),
+    "5a_b-21_east": PreRegion("5a_b-21_east", "5a_b-21", connections_by_region["5a_b-21_east"], locations_by_region["5a_b-21_east"]),
 
-    "5a_b-01b_west": PreRegion("5a_b-01b_west", "5a_b-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01b_west"]),
-    "5a_b-01b_east": PreRegion("5a_b-01b_east", "5a_b-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-01b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-01b_east"]),
+    "5a_b-01b_west": PreRegion("5a_b-01b_west", "5a_b-01b", connections_by_region["5a_b-01b_west"], locations_by_region["5a_b-01b_west"]),
+    "5a_b-01b_east": PreRegion("5a_b-01b_east", "5a_b-01b", connections_by_region["5a_b-01b_east"], locations_by_region["5a_b-01b_east"]),
 
-    "5a_b-02_center": PreRegion("5a_b-02_center", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_center"]),
-    "5a_b-02_west": PreRegion("5a_b-02_west", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_west"]),
-    "5a_b-02_north-west": PreRegion("5a_b-02_north-west", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_north-west"]),
-    "5a_b-02_north": PreRegion("5a_b-02_north", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_north"]),
-    "5a_b-02_north-east": PreRegion("5a_b-02_north-east", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_north-east"]),
-    "5a_b-02_east-upper": PreRegion("5a_b-02_east-upper", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_east-upper"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_east-upper"]),
-    "5a_b-02_east-lower": PreRegion("5a_b-02_east-lower", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_east-lower"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_east-lower"]),
-    "5a_b-02_south-east": PreRegion("5a_b-02_south-east", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_south-east"]),
-    "5a_b-02_south": PreRegion("5a_b-02_south", "5a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-02_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-02_south"]),
+    "5a_b-02_center": PreRegion("5a_b-02_center", "5a_b-02", connections_by_region["5a_b-02_center"], locations_by_region["5a_b-02_center"]),
+    "5a_b-02_west": PreRegion("5a_b-02_west", "5a_b-02", connections_by_region["5a_b-02_west"], locations_by_region["5a_b-02_west"]),
+    "5a_b-02_north-west": PreRegion("5a_b-02_north-west", "5a_b-02", connections_by_region["5a_b-02_north-west"], locations_by_region["5a_b-02_north-west"]),
+    "5a_b-02_north": PreRegion("5a_b-02_north", "5a_b-02", connections_by_region["5a_b-02_north"], locations_by_region["5a_b-02_north"]),
+    "5a_b-02_north-east": PreRegion("5a_b-02_north-east", "5a_b-02", connections_by_region["5a_b-02_north-east"], locations_by_region["5a_b-02_north-east"]),
+    "5a_b-02_east-upper": PreRegion("5a_b-02_east-upper", "5a_b-02", connections_by_region["5a_b-02_east-upper"], locations_by_region["5a_b-02_east-upper"]),
+    "5a_b-02_east-lower": PreRegion("5a_b-02_east-lower", "5a_b-02", connections_by_region["5a_b-02_east-lower"], locations_by_region["5a_b-02_east-lower"]),
+    "5a_b-02_south-east": PreRegion("5a_b-02_south-east", "5a_b-02", connections_by_region["5a_b-02_south-east"], locations_by_region["5a_b-02_south-east"]),
+    "5a_b-02_south": PreRegion("5a_b-02_south", "5a_b-02", connections_by_region["5a_b-02_south"], locations_by_region["5a_b-02_south"]),
 
-    "5a_b-03_east": PreRegion("5a_b-03_east", "5a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-03_east"]),
+    "5a_b-03_east": PreRegion("5a_b-03_east", "5a_b-03", connections_by_region["5a_b-03_east"], locations_by_region["5a_b-03_east"]),
 
-    "5a_b-05_west": PreRegion("5a_b-05_west", "5a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-05_west"]),
+    "5a_b-05_west": PreRegion("5a_b-05_west", "5a_b-05", connections_by_region["5a_b-05_west"], locations_by_region["5a_b-05_west"]),
 
-    "5a_b-04_west": PreRegion("5a_b-04_west", "5a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-04_west"]),
-    "5a_b-04_east": PreRegion("5a_b-04_east", "5a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-04_east"]),
-    "5a_b-04_south": PreRegion("5a_b-04_south", "5a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-04_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-04_south"]),
+    "5a_b-04_west": PreRegion("5a_b-04_west", "5a_b-04", connections_by_region["5a_b-04_west"], locations_by_region["5a_b-04_west"]),
+    "5a_b-04_east": PreRegion("5a_b-04_east", "5a_b-04", connections_by_region["5a_b-04_east"], locations_by_region["5a_b-04_east"]),
+    "5a_b-04_south": PreRegion("5a_b-04_south", "5a_b-04", connections_by_region["5a_b-04_south"], locations_by_region["5a_b-04_south"]),
 
-    "5a_b-07_north": PreRegion("5a_b-07_north", "5a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-07_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-07_north"]),
-    "5a_b-07_south": PreRegion("5a_b-07_south", "5a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-07_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-07_south"]),
+    "5a_b-07_north": PreRegion("5a_b-07_north", "5a_b-07", connections_by_region["5a_b-07_north"], locations_by_region["5a_b-07_north"]),
+    "5a_b-07_south": PreRegion("5a_b-07_south", "5a_b-07", connections_by_region["5a_b-07_south"], locations_by_region["5a_b-07_south"]),
 
-    "5a_b-08_west": PreRegion("5a_b-08_west", "5a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-08_west"]),
-    "5a_b-08_east": PreRegion("5a_b-08_east", "5a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-08_east"]),
+    "5a_b-08_west": PreRegion("5a_b-08_west", "5a_b-08", connections_by_region["5a_b-08_west"], locations_by_region["5a_b-08_west"]),
+    "5a_b-08_east": PreRegion("5a_b-08_east", "5a_b-08", connections_by_region["5a_b-08_east"], locations_by_region["5a_b-08_east"]),
 
-    "5a_b-09_north": PreRegion("5a_b-09_north", "5a_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-09_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-09_north"]),
-    "5a_b-09_south": PreRegion("5a_b-09_south", "5a_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-09_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-09_south"]),
+    "5a_b-09_north": PreRegion("5a_b-09_north", "5a_b-09", connections_by_region["5a_b-09_north"], locations_by_region["5a_b-09_north"]),
+    "5a_b-09_south": PreRegion("5a_b-09_south", "5a_b-09", connections_by_region["5a_b-09_south"], locations_by_region["5a_b-09_south"]),
 
-    "5a_b-10_east": PreRegion("5a_b-10_east", "5a_b-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-10_east"]),
+    "5a_b-10_east": PreRegion("5a_b-10_east", "5a_b-10", connections_by_region["5a_b-10_east"], locations_by_region["5a_b-10_east"]),
 
-    "5a_b-11_north-west": PreRegion("5a_b-11_north-west", "5a_b-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-11_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-11_north-west"]),
-    "5a_b-11_west": PreRegion("5a_b-11_west", "5a_b-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-11_west"]),
-    "5a_b-11_south-west": PreRegion("5a_b-11_south-west", "5a_b-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-11_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-11_south-west"]),
-    "5a_b-11_south-east": PreRegion("5a_b-11_south-east", "5a_b-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-11_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-11_south-east"]),
-    "5a_b-11_east": PreRegion("5a_b-11_east", "5a_b-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-11_east"]),
+    "5a_b-11_north-west": PreRegion("5a_b-11_north-west", "5a_b-11", connections_by_region["5a_b-11_north-west"], locations_by_region["5a_b-11_north-west"]),
+    "5a_b-11_west": PreRegion("5a_b-11_west", "5a_b-11", connections_by_region["5a_b-11_west"], locations_by_region["5a_b-11_west"]),
+    "5a_b-11_south-west": PreRegion("5a_b-11_south-west", "5a_b-11", connections_by_region["5a_b-11_south-west"], locations_by_region["5a_b-11_south-west"]),
+    "5a_b-11_south-east": PreRegion("5a_b-11_south-east", "5a_b-11", connections_by_region["5a_b-11_south-east"], locations_by_region["5a_b-11_south-east"]),
+    "5a_b-11_east": PreRegion("5a_b-11_east", "5a_b-11", connections_by_region["5a_b-11_east"], locations_by_region["5a_b-11_east"]),
 
-    "5a_b-12_west": PreRegion("5a_b-12_west", "5a_b-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-12_west"]),
-    "5a_b-12_east": PreRegion("5a_b-12_east", "5a_b-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-12_east"]),
+    "5a_b-12_west": PreRegion("5a_b-12_west", "5a_b-12", connections_by_region["5a_b-12_west"], locations_by_region["5a_b-12_west"]),
+    "5a_b-12_east": PreRegion("5a_b-12_east", "5a_b-12", connections_by_region["5a_b-12_east"], locations_by_region["5a_b-12_east"]),
 
-    "5a_b-13_west": PreRegion("5a_b-13_west", "5a_b-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-13_west"]),
-    "5a_b-13_east": PreRegion("5a_b-13_east", "5a_b-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-13_east"]),
-    "5a_b-13_north-east": PreRegion("5a_b-13_north-east", "5a_b-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-13_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-13_north-east"]),
+    "5a_b-13_west": PreRegion("5a_b-13_west", "5a_b-13", connections_by_region["5a_b-13_west"], locations_by_region["5a_b-13_west"]),
+    "5a_b-13_east": PreRegion("5a_b-13_east", "5a_b-13", connections_by_region["5a_b-13_east"], locations_by_region["5a_b-13_east"]),
+    "5a_b-13_north-east": PreRegion("5a_b-13_north-east", "5a_b-13", connections_by_region["5a_b-13_north-east"], locations_by_region["5a_b-13_north-east"]),
 
-    "5a_b-17_west": PreRegion("5a_b-17_west", "5a_b-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-17_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-17_west"]),
-    "5a_b-17_east": PreRegion("5a_b-17_east", "5a_b-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-17_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-17_east"]),
-    "5a_b-17_north-west": PreRegion("5a_b-17_north-west", "5a_b-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-17_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-17_north-west"]),
+    "5a_b-17_west": PreRegion("5a_b-17_west", "5a_b-17", connections_by_region["5a_b-17_west"], locations_by_region["5a_b-17_west"]),
+    "5a_b-17_east": PreRegion("5a_b-17_east", "5a_b-17", connections_by_region["5a_b-17_east"], locations_by_region["5a_b-17_east"]),
+    "5a_b-17_north-west": PreRegion("5a_b-17_north-west", "5a_b-17", connections_by_region["5a_b-17_north-west"], locations_by_region["5a_b-17_north-west"]),
 
-    "5a_b-22_west": PreRegion("5a_b-22_west", "5a_b-22", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-22_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-22_west"]),
+    "5a_b-22_west": PreRegion("5a_b-22_west", "5a_b-22", connections_by_region["5a_b-22_west"], locations_by_region["5a_b-22_west"]),
 
-    "5a_b-06_west": PreRegion("5a_b-06_west", "5a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-06_west"]),
-    "5a_b-06_east": PreRegion("5a_b-06_east", "5a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-06_east"]),
-    "5a_b-06_north-east": PreRegion("5a_b-06_north-east", "5a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-06_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-06_north-east"]),
+    "5a_b-06_west": PreRegion("5a_b-06_west", "5a_b-06", connections_by_region["5a_b-06_west"], locations_by_region["5a_b-06_west"]),
+    "5a_b-06_east": PreRegion("5a_b-06_east", "5a_b-06", connections_by_region["5a_b-06_east"], locations_by_region["5a_b-06_east"]),
+    "5a_b-06_north-east": PreRegion("5a_b-06_north-east", "5a_b-06", connections_by_region["5a_b-06_north-east"], locations_by_region["5a_b-06_north-east"]),
 
-    "5a_b-19_west": PreRegion("5a_b-19_west", "5a_b-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-19_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-19_west"]),
-    "5a_b-19_east": PreRegion("5a_b-19_east", "5a_b-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-19_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-19_east"]),
-    "5a_b-19_north-west": PreRegion("5a_b-19_north-west", "5a_b-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-19_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-19_north-west"]),
+    "5a_b-19_west": PreRegion("5a_b-19_west", "5a_b-19", connections_by_region["5a_b-19_west"], locations_by_region["5a_b-19_west"]),
+    "5a_b-19_east": PreRegion("5a_b-19_east", "5a_b-19", connections_by_region["5a_b-19_east"], locations_by_region["5a_b-19_east"]),
+    "5a_b-19_north-west": PreRegion("5a_b-19_north-west", "5a_b-19", connections_by_region["5a_b-19_north-west"], locations_by_region["5a_b-19_north-west"]),
 
-    "5a_b-14_west": PreRegion("5a_b-14_west", "5a_b-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-14_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-14_west"]),
-    "5a_b-14_south": PreRegion("5a_b-14_south", "5a_b-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-14_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-14_south"]),
-    "5a_b-14_north": PreRegion("5a_b-14_north", "5a_b-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-14_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-14_north"]),
+    "5a_b-14_west": PreRegion("5a_b-14_west", "5a_b-14", connections_by_region["5a_b-14_west"], locations_by_region["5a_b-14_west"]),
+    "5a_b-14_south": PreRegion("5a_b-14_south", "5a_b-14", connections_by_region["5a_b-14_south"], locations_by_region["5a_b-14_south"]),
+    "5a_b-14_north": PreRegion("5a_b-14_north", "5a_b-14", connections_by_region["5a_b-14_north"], locations_by_region["5a_b-14_north"]),
 
-    "5a_b-15_west": PreRegion("5a_b-15_west", "5a_b-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-15_west"]),
+    "5a_b-15_west": PreRegion("5a_b-15_west", "5a_b-15", connections_by_region["5a_b-15_west"], locations_by_region["5a_b-15_west"]),
 
-    "5a_b-16_bottom": PreRegion("5a_b-16_bottom", "5a_b-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-16_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-16_bottom"]),
-    "5a_b-16_mirror": PreRegion("5a_b-16_mirror", "5a_b-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_b-16_mirror"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_b-16_mirror"]),
+    "5a_b-16_bottom": PreRegion("5a_b-16_bottom", "5a_b-16", connections_by_region["5a_b-16_bottom"], locations_by_region["5a_b-16_bottom"]),
+    "5a_b-16_mirror": PreRegion("5a_b-16_mirror", "5a_b-16", connections_by_region["5a_b-16_mirror"], locations_by_region["5a_b-16_mirror"]),
 
-    "5a_void_east": PreRegion("5a_void_east", "5a_void", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_void_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_void_east"]),
-    "5a_void_west": PreRegion("5a_void_west", "5a_void", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_void_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_void_west"]),
+    "5a_void_east": PreRegion("5a_void_east", "5a_void", connections_by_region["5a_void_east"], locations_by_region["5a_void_east"]),
+    "5a_void_west": PreRegion("5a_void_west", "5a_void", connections_by_region["5a_void_west"], locations_by_region["5a_void_west"]),
 
-    "5a_c-00_bottom": PreRegion("5a_c-00_bottom", "5a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-00_bottom"]),
-    "5a_c-00_top": PreRegion("5a_c-00_top", "5a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-00_top"]),
+    "5a_c-00_bottom": PreRegion("5a_c-00_bottom", "5a_c-00", connections_by_region["5a_c-00_bottom"], locations_by_region["5a_c-00_bottom"]),
+    "5a_c-00_top": PreRegion("5a_c-00_top", "5a_c-00", connections_by_region["5a_c-00_top"], locations_by_region["5a_c-00_top"]),
 
-    "5a_c-01_west": PreRegion("5a_c-01_west", "5a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01_west"]),
-    "5a_c-01_east": PreRegion("5a_c-01_east", "5a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01_east"]),
+    "5a_c-01_west": PreRegion("5a_c-01_west", "5a_c-01", connections_by_region["5a_c-01_west"], locations_by_region["5a_c-01_west"]),
+    "5a_c-01_east": PreRegion("5a_c-01_east", "5a_c-01", connections_by_region["5a_c-01_east"], locations_by_region["5a_c-01_east"]),
 
-    "5a_c-01b_west": PreRegion("5a_c-01b_west", "5a_c-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01b_west"]),
-    "5a_c-01b_east": PreRegion("5a_c-01b_east", "5a_c-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01b_east"]),
+    "5a_c-01b_west": PreRegion("5a_c-01b_west", "5a_c-01b", connections_by_region["5a_c-01b_west"], locations_by_region["5a_c-01b_west"]),
+    "5a_c-01b_east": PreRegion("5a_c-01b_east", "5a_c-01b", connections_by_region["5a_c-01b_east"], locations_by_region["5a_c-01b_east"]),
 
-    "5a_c-01c_west": PreRegion("5a_c-01c_west", "5a_c-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01c_west"]),
-    "5a_c-01c_east": PreRegion("5a_c-01c_east", "5a_c-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-01c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-01c_east"]),
+    "5a_c-01c_west": PreRegion("5a_c-01c_west", "5a_c-01c", connections_by_region["5a_c-01c_west"], locations_by_region["5a_c-01c_west"]),
+    "5a_c-01c_east": PreRegion("5a_c-01c_east", "5a_c-01c", connections_by_region["5a_c-01c_east"], locations_by_region["5a_c-01c_east"]),
 
-    "5a_c-08b_west": PreRegion("5a_c-08b_west", "5a_c-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-08b_west"]),
-    "5a_c-08b_east": PreRegion("5a_c-08b_east", "5a_c-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-08b_east"]),
+    "5a_c-08b_west": PreRegion("5a_c-08b_west", "5a_c-08b", connections_by_region["5a_c-08b_west"], locations_by_region["5a_c-08b_west"]),
+    "5a_c-08b_east": PreRegion("5a_c-08b_east", "5a_c-08b", connections_by_region["5a_c-08b_east"], locations_by_region["5a_c-08b_east"]),
 
-    "5a_c-08_west": PreRegion("5a_c-08_west", "5a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-08_west"]),
-    "5a_c-08_east": PreRegion("5a_c-08_east", "5a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-08_east"]),
+    "5a_c-08_west": PreRegion("5a_c-08_west", "5a_c-08", connections_by_region["5a_c-08_west"], locations_by_region["5a_c-08_west"]),
+    "5a_c-08_east": PreRegion("5a_c-08_east", "5a_c-08", connections_by_region["5a_c-08_east"], locations_by_region["5a_c-08_east"]),
 
-    "5a_c-10_west": PreRegion("5a_c-10_west", "5a_c-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-10_west"]),
-    "5a_c-10_east": PreRegion("5a_c-10_east", "5a_c-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-10_east"]),
+    "5a_c-10_west": PreRegion("5a_c-10_west", "5a_c-10", connections_by_region["5a_c-10_west"], locations_by_region["5a_c-10_west"]),
+    "5a_c-10_east": PreRegion("5a_c-10_east", "5a_c-10", connections_by_region["5a_c-10_east"], locations_by_region["5a_c-10_east"]),
 
-    "5a_c-12_west": PreRegion("5a_c-12_west", "5a_c-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-12_west"]),
-    "5a_c-12_east": PreRegion("5a_c-12_east", "5a_c-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-12_east"]),
+    "5a_c-12_west": PreRegion("5a_c-12_west", "5a_c-12", connections_by_region["5a_c-12_west"], locations_by_region["5a_c-12_west"]),
+    "5a_c-12_east": PreRegion("5a_c-12_east", "5a_c-12", connections_by_region["5a_c-12_east"], locations_by_region["5a_c-12_east"]),
 
-    "5a_c-07_west": PreRegion("5a_c-07_west", "5a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-07_west"]),
-    "5a_c-07_east": PreRegion("5a_c-07_east", "5a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-07_east"]),
+    "5a_c-07_west": PreRegion("5a_c-07_west", "5a_c-07", connections_by_region["5a_c-07_west"], locations_by_region["5a_c-07_west"]),
+    "5a_c-07_east": PreRegion("5a_c-07_east", "5a_c-07", connections_by_region["5a_c-07_east"], locations_by_region["5a_c-07_east"]),
 
-    "5a_c-11_west": PreRegion("5a_c-11_west", "5a_c-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-11_west"]),
-    "5a_c-11_east": PreRegion("5a_c-11_east", "5a_c-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-11_east"]),
+    "5a_c-11_west": PreRegion("5a_c-11_west", "5a_c-11", connections_by_region["5a_c-11_west"], locations_by_region["5a_c-11_west"]),
+    "5a_c-11_east": PreRegion("5a_c-11_east", "5a_c-11", connections_by_region["5a_c-11_east"], locations_by_region["5a_c-11_east"]),
 
-    "5a_c-09_west": PreRegion("5a_c-09_west", "5a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-09_west"]),
-    "5a_c-09_east": PreRegion("5a_c-09_east", "5a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-09_east"]),
+    "5a_c-09_west": PreRegion("5a_c-09_west", "5a_c-09", connections_by_region["5a_c-09_west"], locations_by_region["5a_c-09_west"]),
+    "5a_c-09_east": PreRegion("5a_c-09_east", "5a_c-09", connections_by_region["5a_c-09_east"], locations_by_region["5a_c-09_east"]),
 
-    "5a_c-13_west": PreRegion("5a_c-13_west", "5a_c-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-13_west"]),
-    "5a_c-13_east": PreRegion("5a_c-13_east", "5a_c-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_c-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_c-13_east"]),
+    "5a_c-13_west": PreRegion("5a_c-13_west", "5a_c-13", connections_by_region["5a_c-13_west"], locations_by_region["5a_c-13_west"]),
+    "5a_c-13_east": PreRegion("5a_c-13_east", "5a_c-13", connections_by_region["5a_c-13_east"], locations_by_region["5a_c-13_east"]),
 
-    "5a_d-00_south": PreRegion("5a_d-00_south", "5a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-00_south"]),
-    "5a_d-00_north": PreRegion("5a_d-00_north", "5a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-00_north"]),
-    "5a_d-00_west": PreRegion("5a_d-00_west", "5a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-00_west"]),
-    "5a_d-00_east": PreRegion("5a_d-00_east", "5a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-00_east"]),
+    "5a_d-00_south": PreRegion("5a_d-00_south", "5a_d-00", connections_by_region["5a_d-00_south"], locations_by_region["5a_d-00_south"]),
+    "5a_d-00_north": PreRegion("5a_d-00_north", "5a_d-00", connections_by_region["5a_d-00_north"], locations_by_region["5a_d-00_north"]),
+    "5a_d-00_west": PreRegion("5a_d-00_west", "5a_d-00", connections_by_region["5a_d-00_west"], locations_by_region["5a_d-00_west"]),
+    "5a_d-00_east": PreRegion("5a_d-00_east", "5a_d-00", connections_by_region["5a_d-00_east"], locations_by_region["5a_d-00_east"]),
 
-    "5a_d-01_south": PreRegion("5a_d-01_south", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_south"]),
-    "5a_d-01_center": PreRegion("5a_d-01_center", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_center"]),
-    "5a_d-01_south-west-left": PreRegion("5a_d-01_south-west-left", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_south-west-left"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_south-west-left"]),
-    "5a_d-01_south-west-down": PreRegion("5a_d-01_south-west-down", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_south-west-down"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_south-west-down"]),
-    "5a_d-01_south-east-right": PreRegion("5a_d-01_south-east-right", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_south-east-right"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_south-east-right"]),
-    "5a_d-01_south-east-down": PreRegion("5a_d-01_south-east-down", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_south-east-down"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_south-east-down"]),
-    "5a_d-01_west": PreRegion("5a_d-01_west", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_west"]),
-    "5a_d-01_east": PreRegion("5a_d-01_east", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_east"]),
-    "5a_d-01_north-west": PreRegion("5a_d-01_north-west", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_north-west"]),
-    "5a_d-01_north-east": PreRegion("5a_d-01_north-east", "5a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-01_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-01_north-east"]),
+    "5a_d-01_south": PreRegion("5a_d-01_south", "5a_d-01", connections_by_region["5a_d-01_south"], locations_by_region["5a_d-01_south"]),
+    "5a_d-01_center": PreRegion("5a_d-01_center", "5a_d-01", connections_by_region["5a_d-01_center"], locations_by_region["5a_d-01_center"]),
+    "5a_d-01_south-west-left": PreRegion("5a_d-01_south-west-left", "5a_d-01", connections_by_region["5a_d-01_south-west-left"], locations_by_region["5a_d-01_south-west-left"]),
+    "5a_d-01_south-west-down": PreRegion("5a_d-01_south-west-down", "5a_d-01", connections_by_region["5a_d-01_south-west-down"], locations_by_region["5a_d-01_south-west-down"]),
+    "5a_d-01_south-east-right": PreRegion("5a_d-01_south-east-right", "5a_d-01", connections_by_region["5a_d-01_south-east-right"], locations_by_region["5a_d-01_south-east-right"]),
+    "5a_d-01_south-east-down": PreRegion("5a_d-01_south-east-down", "5a_d-01", connections_by_region["5a_d-01_south-east-down"], locations_by_region["5a_d-01_south-east-down"]),
+    "5a_d-01_west": PreRegion("5a_d-01_west", "5a_d-01", connections_by_region["5a_d-01_west"], locations_by_region["5a_d-01_west"]),
+    "5a_d-01_east": PreRegion("5a_d-01_east", "5a_d-01", connections_by_region["5a_d-01_east"], locations_by_region["5a_d-01_east"]),
+    "5a_d-01_north-west": PreRegion("5a_d-01_north-west", "5a_d-01", connections_by_region["5a_d-01_north-west"], locations_by_region["5a_d-01_north-west"]),
+    "5a_d-01_north-east": PreRegion("5a_d-01_north-east", "5a_d-01", connections_by_region["5a_d-01_north-east"], locations_by_region["5a_d-01_north-east"]),
 
-    "5a_d-09_east": PreRegion("5a_d-09_east", "5a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-09_east"]),
-    "5a_d-09_west": PreRegion("5a_d-09_west", "5a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-09_west"]),
+    "5a_d-09_east": PreRegion("5a_d-09_east", "5a_d-09", connections_by_region["5a_d-09_east"], locations_by_region["5a_d-09_east"]),
+    "5a_d-09_west": PreRegion("5a_d-09_west", "5a_d-09", connections_by_region["5a_d-09_west"], locations_by_region["5a_d-09_west"]),
 
-    "5a_d-04_east": PreRegion("5a_d-04_east", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_east"]),
-    "5a_d-04_west": PreRegion("5a_d-04_west", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_west"]),
-    "5a_d-04_south-west-left": PreRegion("5a_d-04_south-west-left", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_south-west-left"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_south-west-left"]),
-    "5a_d-04_south-west-right": PreRegion("5a_d-04_south-west-right", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_south-west-right"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_south-west-right"]),
-    "5a_d-04_south-east": PreRegion("5a_d-04_south-east", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_south-east"]),
-    "5a_d-04_north": PreRegion("5a_d-04_north", "5a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-04_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-04_north"]),
+    "5a_d-04_east": PreRegion("5a_d-04_east", "5a_d-04", connections_by_region["5a_d-04_east"], locations_by_region["5a_d-04_east"]),
+    "5a_d-04_west": PreRegion("5a_d-04_west", "5a_d-04", connections_by_region["5a_d-04_west"], locations_by_region["5a_d-04_west"]),
+    "5a_d-04_south-west-left": PreRegion("5a_d-04_south-west-left", "5a_d-04", connections_by_region["5a_d-04_south-west-left"], locations_by_region["5a_d-04_south-west-left"]),
+    "5a_d-04_south-west-right": PreRegion("5a_d-04_south-west-right", "5a_d-04", connections_by_region["5a_d-04_south-west-right"], locations_by_region["5a_d-04_south-west-right"]),
+    "5a_d-04_south-east": PreRegion("5a_d-04_south-east", "5a_d-04", connections_by_region["5a_d-04_south-east"], locations_by_region["5a_d-04_south-east"]),
+    "5a_d-04_north": PreRegion("5a_d-04_north", "5a_d-04", connections_by_region["5a_d-04_north"], locations_by_region["5a_d-04_north"]),
 
-    "5a_d-05_north": PreRegion("5a_d-05_north", "5a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-05_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-05_north"]),
-    "5a_d-05_east": PreRegion("5a_d-05_east", "5a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-05_east"]),
-    "5a_d-05_south": PreRegion("5a_d-05_south", "5a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-05_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-05_south"]),
-    "5a_d-05_west": PreRegion("5a_d-05_west", "5a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-05_west"]),
+    "5a_d-05_north": PreRegion("5a_d-05_north", "5a_d-05", connections_by_region["5a_d-05_north"], locations_by_region["5a_d-05_north"]),
+    "5a_d-05_east": PreRegion("5a_d-05_east", "5a_d-05", connections_by_region["5a_d-05_east"], locations_by_region["5a_d-05_east"]),
+    "5a_d-05_south": PreRegion("5a_d-05_south", "5a_d-05", connections_by_region["5a_d-05_south"], locations_by_region["5a_d-05_south"]),
+    "5a_d-05_west": PreRegion("5a_d-05_west", "5a_d-05", connections_by_region["5a_d-05_west"], locations_by_region["5a_d-05_west"]),
 
-    "5a_d-06_north-east": PreRegion("5a_d-06_north-east", "5a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-06_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-06_north-east"]),
-    "5a_d-06_south-east": PreRegion("5a_d-06_south-east", "5a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-06_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-06_south-east"]),
-    "5a_d-06_south-west": PreRegion("5a_d-06_south-west", "5a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-06_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-06_south-west"]),
-    "5a_d-06_north-west": PreRegion("5a_d-06_north-west", "5a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-06_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-06_north-west"]),
+    "5a_d-06_north-east": PreRegion("5a_d-06_north-east", "5a_d-06", connections_by_region["5a_d-06_north-east"], locations_by_region["5a_d-06_north-east"]),
+    "5a_d-06_south-east": PreRegion("5a_d-06_south-east", "5a_d-06", connections_by_region["5a_d-06_south-east"], locations_by_region["5a_d-06_south-east"]),
+    "5a_d-06_south-west": PreRegion("5a_d-06_south-west", "5a_d-06", connections_by_region["5a_d-06_south-west"], locations_by_region["5a_d-06_south-west"]),
+    "5a_d-06_north-west": PreRegion("5a_d-06_north-west", "5a_d-06", connections_by_region["5a_d-06_north-west"], locations_by_region["5a_d-06_north-west"]),
 
-    "5a_d-07_west": PreRegion("5a_d-07_west", "5a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-07_west"]),
-    "5a_d-07_north": PreRegion("5a_d-07_north", "5a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-07_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-07_north"]),
+    "5a_d-07_west": PreRegion("5a_d-07_west", "5a_d-07", connections_by_region["5a_d-07_west"], locations_by_region["5a_d-07_west"]),
+    "5a_d-07_north": PreRegion("5a_d-07_north", "5a_d-07", connections_by_region["5a_d-07_north"], locations_by_region["5a_d-07_north"]),
 
-    "5a_d-02_east": PreRegion("5a_d-02_east", "5a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-02_east"]),
-    "5a_d-02_west": PreRegion("5a_d-02_west", "5a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-02_west"]),
+    "5a_d-02_east": PreRegion("5a_d-02_east", "5a_d-02", connections_by_region["5a_d-02_east"], locations_by_region["5a_d-02_east"]),
+    "5a_d-02_west": PreRegion("5a_d-02_west", "5a_d-02", connections_by_region["5a_d-02_west"], locations_by_region["5a_d-02_west"]),
 
-    "5a_d-03_east": PreRegion("5a_d-03_east", "5a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-03_east"]),
-    "5a_d-03_west": PreRegion("5a_d-03_west", "5a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-03_west"]),
+    "5a_d-03_east": PreRegion("5a_d-03_east", "5a_d-03", connections_by_region["5a_d-03_east"], locations_by_region["5a_d-03_east"]),
+    "5a_d-03_west": PreRegion("5a_d-03_west", "5a_d-03", connections_by_region["5a_d-03_west"], locations_by_region["5a_d-03_west"]),
 
-    "5a_d-15_north-west": PreRegion("5a_d-15_north-west", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_north-west"]),
-    "5a_d-15_center": PreRegion("5a_d-15_center", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_center"]),
-    "5a_d-15_west": PreRegion("5a_d-15_west", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_west"]),
-    "5a_d-15_south-west": PreRegion("5a_d-15_south-west", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_south-west"]),
-    "5a_d-15_south": PreRegion("5a_d-15_south", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_south"]),
-    "5a_d-15_south-east": PreRegion("5a_d-15_south-east", "5a_d-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-15_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-15_south-east"]),
+    "5a_d-15_north-west": PreRegion("5a_d-15_north-west", "5a_d-15", connections_by_region["5a_d-15_north-west"], locations_by_region["5a_d-15_north-west"]),
+    "5a_d-15_center": PreRegion("5a_d-15_center", "5a_d-15", connections_by_region["5a_d-15_center"], locations_by_region["5a_d-15_center"]),
+    "5a_d-15_west": PreRegion("5a_d-15_west", "5a_d-15", connections_by_region["5a_d-15_west"], locations_by_region["5a_d-15_west"]),
+    "5a_d-15_south-west": PreRegion("5a_d-15_south-west", "5a_d-15", connections_by_region["5a_d-15_south-west"], locations_by_region["5a_d-15_south-west"]),
+    "5a_d-15_south": PreRegion("5a_d-15_south", "5a_d-15", connections_by_region["5a_d-15_south"], locations_by_region["5a_d-15_south"]),
+    "5a_d-15_south-east": PreRegion("5a_d-15_south-east", "5a_d-15", connections_by_region["5a_d-15_south-east"], locations_by_region["5a_d-15_south-east"]),
 
-    "5a_d-13_east": PreRegion("5a_d-13_east", "5a_d-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-13_east"]),
-    "5a_d-13_west": PreRegion("5a_d-13_west", "5a_d-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-13_west"]),
+    "5a_d-13_east": PreRegion("5a_d-13_east", "5a_d-13", connections_by_region["5a_d-13_east"], locations_by_region["5a_d-13_east"]),
+    "5a_d-13_west": PreRegion("5a_d-13_west", "5a_d-13", connections_by_region["5a_d-13_west"], locations_by_region["5a_d-13_west"]),
 
-    "5a_d-19b_south-east-right": PreRegion("5a_d-19b_south-east-right", "5a_d-19b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19b_south-east-right"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19b_south-east-right"]),
-    "5a_d-19b_south-east-down": PreRegion("5a_d-19b_south-east-down", "5a_d-19b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19b_south-east-down"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19b_south-east-down"]),
-    "5a_d-19b_south-west": PreRegion("5a_d-19b_south-west", "5a_d-19b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19b_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19b_south-west"]),
-    "5a_d-19b_north-east": PreRegion("5a_d-19b_north-east", "5a_d-19b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19b_north-east"]),
+    "5a_d-19b_south-east-right": PreRegion("5a_d-19b_south-east-right", "5a_d-19b", connections_by_region["5a_d-19b_south-east-right"], locations_by_region["5a_d-19b_south-east-right"]),
+    "5a_d-19b_south-east-down": PreRegion("5a_d-19b_south-east-down", "5a_d-19b", connections_by_region["5a_d-19b_south-east-down"], locations_by_region["5a_d-19b_south-east-down"]),
+    "5a_d-19b_south-west": PreRegion("5a_d-19b_south-west", "5a_d-19b", connections_by_region["5a_d-19b_south-west"], locations_by_region["5a_d-19b_south-west"]),
+    "5a_d-19b_north-east": PreRegion("5a_d-19b_north-east", "5a_d-19b", connections_by_region["5a_d-19b_north-east"], locations_by_region["5a_d-19b_north-east"]),
 
-    "5a_d-19_east": PreRegion("5a_d-19_east", "5a_d-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19_east"]),
-    "5a_d-19_west": PreRegion("5a_d-19_west", "5a_d-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-19_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-19_west"]),
+    "5a_d-19_east": PreRegion("5a_d-19_east", "5a_d-19", connections_by_region["5a_d-19_east"], locations_by_region["5a_d-19_east"]),
+    "5a_d-19_west": PreRegion("5a_d-19_west", "5a_d-19", connections_by_region["5a_d-19_west"], locations_by_region["5a_d-19_west"]),
 
-    "5a_d-10_west": PreRegion("5a_d-10_west", "5a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-10_west"]),
-    "5a_d-10_east": PreRegion("5a_d-10_east", "5a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-10_east"]),
+    "5a_d-10_west": PreRegion("5a_d-10_west", "5a_d-10", connections_by_region["5a_d-10_west"], locations_by_region["5a_d-10_west"]),
+    "5a_d-10_east": PreRegion("5a_d-10_east", "5a_d-10", connections_by_region["5a_d-10_east"], locations_by_region["5a_d-10_east"]),
 
-    "5a_d-20_west": PreRegion("5a_d-20_west", "5a_d-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-20_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-20_west"]),
-    "5a_d-20_east": PreRegion("5a_d-20_east", "5a_d-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_d-20_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_d-20_east"]),
+    "5a_d-20_west": PreRegion("5a_d-20_west", "5a_d-20", connections_by_region["5a_d-20_west"], locations_by_region["5a_d-20_west"]),
+    "5a_d-20_east": PreRegion("5a_d-20_east", "5a_d-20", connections_by_region["5a_d-20_east"], locations_by_region["5a_d-20_east"]),
 
-    "5a_e-00_west": PreRegion("5a_e-00_west", "5a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-00_west"]),
-    "5a_e-00_east": PreRegion("5a_e-00_east", "5a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-00_east"]),
+    "5a_e-00_west": PreRegion("5a_e-00_west", "5a_e-00", connections_by_region["5a_e-00_west"], locations_by_region["5a_e-00_west"]),
+    "5a_e-00_east": PreRegion("5a_e-00_east", "5a_e-00", connections_by_region["5a_e-00_east"], locations_by_region["5a_e-00_east"]),
 
-    "5a_e-01_west": PreRegion("5a_e-01_west", "5a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-01_west"]),
-    "5a_e-01_east": PreRegion("5a_e-01_east", "5a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-01_east"]),
+    "5a_e-01_west": PreRegion("5a_e-01_west", "5a_e-01", connections_by_region["5a_e-01_west"], locations_by_region["5a_e-01_west"]),
+    "5a_e-01_east": PreRegion("5a_e-01_east", "5a_e-01", connections_by_region["5a_e-01_east"], locations_by_region["5a_e-01_east"]),
 
-    "5a_e-02_west": PreRegion("5a_e-02_west", "5a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-02_west"]),
-    "5a_e-02_east": PreRegion("5a_e-02_east", "5a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-02_east"]),
+    "5a_e-02_west": PreRegion("5a_e-02_west", "5a_e-02", connections_by_region["5a_e-02_west"], locations_by_region["5a_e-02_west"]),
+    "5a_e-02_east": PreRegion("5a_e-02_east", "5a_e-02", connections_by_region["5a_e-02_east"], locations_by_region["5a_e-02_east"]),
 
-    "5a_e-03_west": PreRegion("5a_e-03_west", "5a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-03_west"]),
-    "5a_e-03_east": PreRegion("5a_e-03_east", "5a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-03_east"]),
+    "5a_e-03_west": PreRegion("5a_e-03_west", "5a_e-03", connections_by_region["5a_e-03_west"], locations_by_region["5a_e-03_west"]),
+    "5a_e-03_east": PreRegion("5a_e-03_east", "5a_e-03", connections_by_region["5a_e-03_east"], locations_by_region["5a_e-03_east"]),
 
-    "5a_e-04_west": PreRegion("5a_e-04_west", "5a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-04_west"]),
-    "5a_e-04_east": PreRegion("5a_e-04_east", "5a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-04_east"]),
+    "5a_e-04_west": PreRegion("5a_e-04_west", "5a_e-04", connections_by_region["5a_e-04_west"], locations_by_region["5a_e-04_west"]),
+    "5a_e-04_east": PreRegion("5a_e-04_east", "5a_e-04", connections_by_region["5a_e-04_east"], locations_by_region["5a_e-04_east"]),
 
-    "5a_e-06_west": PreRegion("5a_e-06_west", "5a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-06_west"]),
-    "5a_e-06_east": PreRegion("5a_e-06_east", "5a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-06_east"]),
+    "5a_e-06_west": PreRegion("5a_e-06_west", "5a_e-06", connections_by_region["5a_e-06_west"], locations_by_region["5a_e-06_west"]),
+    "5a_e-06_east": PreRegion("5a_e-06_east", "5a_e-06", connections_by_region["5a_e-06_east"], locations_by_region["5a_e-06_east"]),
 
-    "5a_e-05_west": PreRegion("5a_e-05_west", "5a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-05_west"]),
-    "5a_e-05_east": PreRegion("5a_e-05_east", "5a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-05_east"]),
+    "5a_e-05_west": PreRegion("5a_e-05_west", "5a_e-05", connections_by_region["5a_e-05_west"], locations_by_region["5a_e-05_west"]),
+    "5a_e-05_east": PreRegion("5a_e-05_east", "5a_e-05", connections_by_region["5a_e-05_east"], locations_by_region["5a_e-05_east"]),
 
-    "5a_e-07_west": PreRegion("5a_e-07_west", "5a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-07_west"]),
-    "5a_e-07_east": PreRegion("5a_e-07_east", "5a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-07_east"]),
+    "5a_e-07_west": PreRegion("5a_e-07_west", "5a_e-07", connections_by_region["5a_e-07_west"], locations_by_region["5a_e-07_west"]),
+    "5a_e-07_east": PreRegion("5a_e-07_east", "5a_e-07", connections_by_region["5a_e-07_east"], locations_by_region["5a_e-07_east"]),
 
-    "5a_e-08_west": PreRegion("5a_e-08_west", "5a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-08_west"]),
-    "5a_e-08_east": PreRegion("5a_e-08_east", "5a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-08_east"]),
+    "5a_e-08_west": PreRegion("5a_e-08_west", "5a_e-08", connections_by_region["5a_e-08_west"], locations_by_region["5a_e-08_west"]),
+    "5a_e-08_east": PreRegion("5a_e-08_east", "5a_e-08", connections_by_region["5a_e-08_east"], locations_by_region["5a_e-08_east"]),
 
-    "5a_e-09_west": PreRegion("5a_e-09_west", "5a_e-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-09_west"]),
-    "5a_e-09_east": PreRegion("5a_e-09_east", "5a_e-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-09_east"]),
+    "5a_e-09_west": PreRegion("5a_e-09_west", "5a_e-09", connections_by_region["5a_e-09_west"], locations_by_region["5a_e-09_west"]),
+    "5a_e-09_east": PreRegion("5a_e-09_east", "5a_e-09", connections_by_region["5a_e-09_east"], locations_by_region["5a_e-09_east"]),
 
-    "5a_e-10_west": PreRegion("5a_e-10_west", "5a_e-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-10_west"]),
-    "5a_e-10_east": PreRegion("5a_e-10_east", "5a_e-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-10_east"]),
+    "5a_e-10_west": PreRegion("5a_e-10_west", "5a_e-10", connections_by_region["5a_e-10_west"], locations_by_region["5a_e-10_west"]),
+    "5a_e-10_east": PreRegion("5a_e-10_east", "5a_e-10", connections_by_region["5a_e-10_east"], locations_by_region["5a_e-10_east"]),
 
-    "5a_e-11_west": PreRegion("5a_e-11_west", "5a_e-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-11_west"]),
-    "5a_e-11_goal": PreRegion("5a_e-11_goal", "5a_e-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5a_e-11_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "5a_e-11_goal"]),
+    "5a_e-11_west": PreRegion("5a_e-11_west", "5a_e-11", connections_by_region["5a_e-11_west"], locations_by_region["5a_e-11_west"]),
+    "5a_e-11_goal": PreRegion("5a_e-11_goal", "5a_e-11", connections_by_region["5a_e-11_goal"], locations_by_region["5a_e-11_goal"]),
 
-    "5b_start_west": PreRegion("5b_start_west", "5b_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_start_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_start_west"]),
-    "5b_start_east": PreRegion("5b_start_east", "5b_start", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_start_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_start_east"]),
+    "5b_start_west": PreRegion("5b_start_west", "5b_start", connections_by_region["5b_start_west"], locations_by_region["5b_start_west"]),
+    "5b_start_east": PreRegion("5b_start_east", "5b_start", connections_by_region["5b_start_east"], locations_by_region["5b_start_east"]),
 
-    "5b_a-00_west": PreRegion("5b_a-00_west", "5b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-00_west"]),
-    "5b_a-00_east": PreRegion("5b_a-00_east", "5b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-00_east"]),
+    "5b_a-00_west": PreRegion("5b_a-00_west", "5b_a-00", connections_by_region["5b_a-00_west"], locations_by_region["5b_a-00_west"]),
+    "5b_a-00_east": PreRegion("5b_a-00_east", "5b_a-00", connections_by_region["5b_a-00_east"], locations_by_region["5b_a-00_east"]),
 
-    "5b_a-01_west": PreRegion("5b_a-01_west", "5b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-01_west"]),
-    "5b_a-01_east": PreRegion("5b_a-01_east", "5b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-01_east"]),
+    "5b_a-01_west": PreRegion("5b_a-01_west", "5b_a-01", connections_by_region["5b_a-01_west"], locations_by_region["5b_a-01_west"]),
+    "5b_a-01_east": PreRegion("5b_a-01_east", "5b_a-01", connections_by_region["5b_a-01_east"], locations_by_region["5b_a-01_east"]),
 
-    "5b_a-02_west": PreRegion("5b_a-02_west", "5b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-02_west"]),
-    "5b_a-02_east": PreRegion("5b_a-02_east", "5b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_a-02_east"]),
+    "5b_a-02_west": PreRegion("5b_a-02_west", "5b_a-02", connections_by_region["5b_a-02_west"], locations_by_region["5b_a-02_west"]),
+    "5b_a-02_east": PreRegion("5b_a-02_east", "5b_a-02", connections_by_region["5b_a-02_east"], locations_by_region["5b_a-02_east"]),
 
-    "5b_b-00_south": PreRegion("5b_b-00_south", "5b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-00_south"]),
-    "5b_b-00_west": PreRegion("5b_b-00_west", "5b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-00_west"]),
-    "5b_b-00_north": PreRegion("5b_b-00_north", "5b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-00_north"]),
-    "5b_b-00_east": PreRegion("5b_b-00_east", "5b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-00_east"]),
+    "5b_b-00_south": PreRegion("5b_b-00_south", "5b_b-00", connections_by_region["5b_b-00_south"], locations_by_region["5b_b-00_south"]),
+    "5b_b-00_west": PreRegion("5b_b-00_west", "5b_b-00", connections_by_region["5b_b-00_west"], locations_by_region["5b_b-00_west"]),
+    "5b_b-00_north": PreRegion("5b_b-00_north", "5b_b-00", connections_by_region["5b_b-00_north"], locations_by_region["5b_b-00_north"]),
+    "5b_b-00_east": PreRegion("5b_b-00_east", "5b_b-00", connections_by_region["5b_b-00_east"], locations_by_region["5b_b-00_east"]),
 
-    "5b_b-01_west": PreRegion("5b_b-01_west", "5b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-01_west"]),
-    "5b_b-01_north": PreRegion("5b_b-01_north", "5b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-01_north"]),
-    "5b_b-01_east": PreRegion("5b_b-01_east", "5b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-01_east"]),
+    "5b_b-01_west": PreRegion("5b_b-01_west", "5b_b-01", connections_by_region["5b_b-01_west"], locations_by_region["5b_b-01_west"]),
+    "5b_b-01_north": PreRegion("5b_b-01_north", "5b_b-01", connections_by_region["5b_b-01_north"], locations_by_region["5b_b-01_north"]),
+    "5b_b-01_east": PreRegion("5b_b-01_east", "5b_b-01", connections_by_region["5b_b-01_east"], locations_by_region["5b_b-01_east"]),
 
-    "5b_b-04_east": PreRegion("5b_b-04_east", "5b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-04_east"]),
-    "5b_b-04_west": PreRegion("5b_b-04_west", "5b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-04_west"]),
+    "5b_b-04_east": PreRegion("5b_b-04_east", "5b_b-04", connections_by_region["5b_b-04_east"], locations_by_region["5b_b-04_east"]),
+    "5b_b-04_west": PreRegion("5b_b-04_west", "5b_b-04", connections_by_region["5b_b-04_west"], locations_by_region["5b_b-04_west"]),
 
-    "5b_b-02_south": PreRegion("5b_b-02_south", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_south"]),
-    "5b_b-02_center": PreRegion("5b_b-02_center", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_center"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_center"]),
-    "5b_b-02_north-west": PreRegion("5b_b-02_north-west", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_north-west"]),
-    "5b_b-02_north-east": PreRegion("5b_b-02_north-east", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_north-east"]),
-    "5b_b-02_north": PreRegion("5b_b-02_north", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_north"]),
-    "5b_b-02_south-west": PreRegion("5b_b-02_south-west", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_south-west"]),
-    "5b_b-02_south-east": PreRegion("5b_b-02_south-east", "5b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-02_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-02_south-east"]),
+    "5b_b-02_south": PreRegion("5b_b-02_south", "5b_b-02", connections_by_region["5b_b-02_south"], locations_by_region["5b_b-02_south"]),
+    "5b_b-02_center": PreRegion("5b_b-02_center", "5b_b-02", connections_by_region["5b_b-02_center"], locations_by_region["5b_b-02_center"]),
+    "5b_b-02_north-west": PreRegion("5b_b-02_north-west", "5b_b-02", connections_by_region["5b_b-02_north-west"], locations_by_region["5b_b-02_north-west"]),
+    "5b_b-02_north-east": PreRegion("5b_b-02_north-east", "5b_b-02", connections_by_region["5b_b-02_north-east"], locations_by_region["5b_b-02_north-east"]),
+    "5b_b-02_north": PreRegion("5b_b-02_north", "5b_b-02", connections_by_region["5b_b-02_north"], locations_by_region["5b_b-02_north"]),
+    "5b_b-02_south-west": PreRegion("5b_b-02_south-west", "5b_b-02", connections_by_region["5b_b-02_south-west"], locations_by_region["5b_b-02_south-west"]),
+    "5b_b-02_south-east": PreRegion("5b_b-02_south-east", "5b_b-02", connections_by_region["5b_b-02_south-east"], locations_by_region["5b_b-02_south-east"]),
 
-    "5b_b-05_north": PreRegion("5b_b-05_north", "5b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-05_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-05_north"]),
-    "5b_b-05_south": PreRegion("5b_b-05_south", "5b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-05_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-05_south"]),
+    "5b_b-05_north": PreRegion("5b_b-05_north", "5b_b-05", connections_by_region["5b_b-05_north"], locations_by_region["5b_b-05_north"]),
+    "5b_b-05_south": PreRegion("5b_b-05_south", "5b_b-05", connections_by_region["5b_b-05_south"], locations_by_region["5b_b-05_south"]),
 
-    "5b_b-06_east": PreRegion("5b_b-06_east", "5b_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-06_east"]),
+    "5b_b-06_east": PreRegion("5b_b-06_east", "5b_b-06", connections_by_region["5b_b-06_east"], locations_by_region["5b_b-06_east"]),
 
-    "5b_b-07_north": PreRegion("5b_b-07_north", "5b_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-07_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-07_north"]),
-    "5b_b-07_south": PreRegion("5b_b-07_south", "5b_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-07_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-07_south"]),
+    "5b_b-07_north": PreRegion("5b_b-07_north", "5b_b-07", connections_by_region["5b_b-07_north"], locations_by_region["5b_b-07_north"]),
+    "5b_b-07_south": PreRegion("5b_b-07_south", "5b_b-07", connections_by_region["5b_b-07_south"], locations_by_region["5b_b-07_south"]),
 
-    "5b_b-03_west": PreRegion("5b_b-03_west", "5b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-03_west"]),
-    "5b_b-03_main": PreRegion("5b_b-03_main", "5b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-03_main"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-03_main"]),
-    "5b_b-03_north": PreRegion("5b_b-03_north", "5b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-03_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-03_north"]),
-    "5b_b-03_east": PreRegion("5b_b-03_east", "5b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-03_east"]),
+    "5b_b-03_west": PreRegion("5b_b-03_west", "5b_b-03", connections_by_region["5b_b-03_west"], locations_by_region["5b_b-03_west"]),
+    "5b_b-03_main": PreRegion("5b_b-03_main", "5b_b-03", connections_by_region["5b_b-03_main"], locations_by_region["5b_b-03_main"]),
+    "5b_b-03_north": PreRegion("5b_b-03_north", "5b_b-03", connections_by_region["5b_b-03_north"], locations_by_region["5b_b-03_north"]),
+    "5b_b-03_east": PreRegion("5b_b-03_east", "5b_b-03", connections_by_region["5b_b-03_east"], locations_by_region["5b_b-03_east"]),
 
-    "5b_b-08_south": PreRegion("5b_b-08_south", "5b_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-08_south"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-08_south"]),
-    "5b_b-08_north": PreRegion("5b_b-08_north", "5b_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-08_north"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-08_north"]),
-    "5b_b-08_east": PreRegion("5b_b-08_east", "5b_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-08_east"]),
+    "5b_b-08_south": PreRegion("5b_b-08_south", "5b_b-08", connections_by_region["5b_b-08_south"], locations_by_region["5b_b-08_south"]),
+    "5b_b-08_north": PreRegion("5b_b-08_north", "5b_b-08", connections_by_region["5b_b-08_north"], locations_by_region["5b_b-08_north"]),
+    "5b_b-08_east": PreRegion("5b_b-08_east", "5b_b-08", connections_by_region["5b_b-08_east"], locations_by_region["5b_b-08_east"]),
 
-    "5b_b-09_bottom": PreRegion("5b_b-09_bottom", "5b_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-09_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-09_bottom"]),
-    "5b_b-09_mirror": PreRegion("5b_b-09_mirror", "5b_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_b-09_mirror"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_b-09_mirror"]),
+    "5b_b-09_bottom": PreRegion("5b_b-09_bottom", "5b_b-09", connections_by_region["5b_b-09_bottom"], locations_by_region["5b_b-09_bottom"]),
+    "5b_b-09_mirror": PreRegion("5b_b-09_mirror", "5b_b-09", connections_by_region["5b_b-09_mirror"], locations_by_region["5b_b-09_mirror"]),
 
-    "5b_c-00_bottom": PreRegion("5b_c-00_bottom", "5b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-00_bottom"]),
-    "5b_c-00_mirror": PreRegion("5b_c-00_mirror", "5b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-00_mirror"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-00_mirror"]),
+    "5b_c-00_bottom": PreRegion("5b_c-00_bottom", "5b_c-00", connections_by_region["5b_c-00_bottom"], locations_by_region["5b_c-00_bottom"]),
+    "5b_c-00_mirror": PreRegion("5b_c-00_mirror", "5b_c-00", connections_by_region["5b_c-00_mirror"], locations_by_region["5b_c-00_mirror"]),
 
-    "5b_c-01_west": PreRegion("5b_c-01_west", "5b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-01_west"]),
-    "5b_c-01_east": PreRegion("5b_c-01_east", "5b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-01_east"]),
+    "5b_c-01_west": PreRegion("5b_c-01_west", "5b_c-01", connections_by_region["5b_c-01_west"], locations_by_region["5b_c-01_west"]),
+    "5b_c-01_east": PreRegion("5b_c-01_east", "5b_c-01", connections_by_region["5b_c-01_east"], locations_by_region["5b_c-01_east"]),
 
-    "5b_c-02_west": PreRegion("5b_c-02_west", "5b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-02_west"]),
-    "5b_c-02_east": PreRegion("5b_c-02_east", "5b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-02_east"]),
+    "5b_c-02_west": PreRegion("5b_c-02_west", "5b_c-02", connections_by_region["5b_c-02_west"], locations_by_region["5b_c-02_west"]),
+    "5b_c-02_east": PreRegion("5b_c-02_east", "5b_c-02", connections_by_region["5b_c-02_east"], locations_by_region["5b_c-02_east"]),
 
-    "5b_c-03_west": PreRegion("5b_c-03_west", "5b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-03_west"]),
-    "5b_c-03_east": PreRegion("5b_c-03_east", "5b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-03_east"]),
+    "5b_c-03_west": PreRegion("5b_c-03_west", "5b_c-03", connections_by_region["5b_c-03_west"], locations_by_region["5b_c-03_west"]),
+    "5b_c-03_east": PreRegion("5b_c-03_east", "5b_c-03", connections_by_region["5b_c-03_east"], locations_by_region["5b_c-03_east"]),
 
-    "5b_c-04_west": PreRegion("5b_c-04_west", "5b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-04_west"]),
-    "5b_c-04_east": PreRegion("5b_c-04_east", "5b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_c-04_east"]),
+    "5b_c-04_west": PreRegion("5b_c-04_west", "5b_c-04", connections_by_region["5b_c-04_west"], locations_by_region["5b_c-04_west"]),
+    "5b_c-04_east": PreRegion("5b_c-04_east", "5b_c-04", connections_by_region["5b_c-04_east"], locations_by_region["5b_c-04_east"]),
 
-    "5b_d-00_west": PreRegion("5b_d-00_west", "5b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-00_west"]),
-    "5b_d-00_east": PreRegion("5b_d-00_east", "5b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-00_east"]),
+    "5b_d-00_west": PreRegion("5b_d-00_west", "5b_d-00", connections_by_region["5b_d-00_west"], locations_by_region["5b_d-00_west"]),
+    "5b_d-00_east": PreRegion("5b_d-00_east", "5b_d-00", connections_by_region["5b_d-00_east"], locations_by_region["5b_d-00_east"]),
 
-    "5b_d-01_west": PreRegion("5b_d-01_west", "5b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-01_west"]),
-    "5b_d-01_east": PreRegion("5b_d-01_east", "5b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-01_east"]),
+    "5b_d-01_west": PreRegion("5b_d-01_west", "5b_d-01", connections_by_region["5b_d-01_west"], locations_by_region["5b_d-01_west"]),
+    "5b_d-01_east": PreRegion("5b_d-01_east", "5b_d-01", connections_by_region["5b_d-01_east"], locations_by_region["5b_d-01_east"]),
 
-    "5b_d-02_west": PreRegion("5b_d-02_west", "5b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-02_west"]),
-    "5b_d-02_east": PreRegion("5b_d-02_east", "5b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-02_east"]),
+    "5b_d-02_west": PreRegion("5b_d-02_west", "5b_d-02", connections_by_region["5b_d-02_west"], locations_by_region["5b_d-02_west"]),
+    "5b_d-02_east": PreRegion("5b_d-02_east", "5b_d-02", connections_by_region["5b_d-02_east"], locations_by_region["5b_d-02_east"]),
 
-    "5b_d-03_west": PreRegion("5b_d-03_west", "5b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-03_west"]),
-    "5b_d-03_east": PreRegion("5b_d-03_east", "5b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-03_east"]),
+    "5b_d-03_west": PreRegion("5b_d-03_west", "5b_d-03", connections_by_region["5b_d-03_west"], locations_by_region["5b_d-03_west"]),
+    "5b_d-03_east": PreRegion("5b_d-03_east", "5b_d-03", connections_by_region["5b_d-03_east"], locations_by_region["5b_d-03_east"]),
 
-    "5b_d-04_west": PreRegion("5b_d-04_west", "5b_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-04_west"]),
-    "5b_d-04_east": PreRegion("5b_d-04_east", "5b_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-04_east"]),
+    "5b_d-04_west": PreRegion("5b_d-04_west", "5b_d-04", connections_by_region["5b_d-04_west"], locations_by_region["5b_d-04_west"]),
+    "5b_d-04_east": PreRegion("5b_d-04_east", "5b_d-04", connections_by_region["5b_d-04_east"], locations_by_region["5b_d-04_east"]),
 
-    "5b_d-05_west": PreRegion("5b_d-05_west", "5b_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-05_west"]),
-    "5b_d-05_goal": PreRegion("5b_d-05_goal", "5b_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5b_d-05_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "5b_d-05_goal"]),
+    "5b_d-05_west": PreRegion("5b_d-05_west", "5b_d-05", connections_by_region["5b_d-05_west"], locations_by_region["5b_d-05_west"]),
+    "5b_d-05_goal": PreRegion("5b_d-05_goal", "5b_d-05", connections_by_region["5b_d-05_goal"], locations_by_region["5b_d-05_goal"]),
 
-    "5c_00_west": PreRegion("5c_00_west", "5c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_00_west"]),
-    "5c_00_east": PreRegion("5c_00_east", "5c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_00_east"]),
+    "5c_00_west": PreRegion("5c_00_west", "5c_00", connections_by_region["5c_00_west"], locations_by_region["5c_00_west"]),
+    "5c_00_east": PreRegion("5c_00_east", "5c_00", connections_by_region["5c_00_east"], locations_by_region["5c_00_east"]),
 
-    "5c_01_west": PreRegion("5c_01_west", "5c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_01_west"]),
-    "5c_01_east": PreRegion("5c_01_east", "5c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_01_east"]),
+    "5c_01_west": PreRegion("5c_01_west", "5c_01", connections_by_region["5c_01_west"], locations_by_region["5c_01_west"]),
+    "5c_01_east": PreRegion("5c_01_east", "5c_01", connections_by_region["5c_01_east"], locations_by_region["5c_01_east"]),
 
-    "5c_02_west": PreRegion("5c_02_west", "5c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_02_west"]),
-    "5c_02_goal": PreRegion("5c_02_goal", "5c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "5c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "5c_02_goal"]),
+    "5c_02_west": PreRegion("5c_02_west", "5c_02", connections_by_region["5c_02_west"], locations_by_region["5c_02_west"]),
+    "5c_02_goal": PreRegion("5c_02_goal", "5c_02", connections_by_region["5c_02_goal"], locations_by_region["5c_02_goal"]),
 
-    "6a_00_west": PreRegion("6a_00_west", "6a_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_00_west"]),
-    "6a_00_east": PreRegion("6a_00_east", "6a_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_00_east"]),
+    "6a_00_west": PreRegion("6a_00_west", "6a_00", connections_by_region["6a_00_west"], locations_by_region["6a_00_west"]),
+    "6a_00_east": PreRegion("6a_00_east", "6a_00", connections_by_region["6a_00_east"], locations_by_region["6a_00_east"]),
 
-    "6a_01_bottom": PreRegion("6a_01_bottom", "6a_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_01_bottom"]),
-    "6a_01_top": PreRegion("6a_01_top", "6a_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_01_top"]),
+    "6a_01_bottom": PreRegion("6a_01_bottom", "6a_01", connections_by_region["6a_01_bottom"], locations_by_region["6a_01_bottom"]),
+    "6a_01_top": PreRegion("6a_01_top", "6a_01", connections_by_region["6a_01_top"], locations_by_region["6a_01_top"]),
 
-    "6a_02_bottom": PreRegion("6a_02_bottom", "6a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02_bottom"]),
-    "6a_02_bottom-west": PreRegion("6a_02_bottom-west", "6a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02_bottom-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02_bottom-west"]),
-    "6a_02_top-west": PreRegion("6a_02_top-west", "6a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02_top-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02_top-west"]),
-    "6a_02_top": PreRegion("6a_02_top", "6a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02_top"]),
+    "6a_02_bottom": PreRegion("6a_02_bottom", "6a_02", connections_by_region["6a_02_bottom"], locations_by_region["6a_02_bottom"]),
+    "6a_02_bottom-west": PreRegion("6a_02_bottom-west", "6a_02", connections_by_region["6a_02_bottom-west"], locations_by_region["6a_02_bottom-west"]),
+    "6a_02_top-west": PreRegion("6a_02_top-west", "6a_02", connections_by_region["6a_02_top-west"], locations_by_region["6a_02_top-west"]),
+    "6a_02_top": PreRegion("6a_02_top", "6a_02", connections_by_region["6a_02_top"], locations_by_region["6a_02_top"]),
 
-    "6a_03_bottom": PreRegion("6a_03_bottom", "6a_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_03_bottom"]),
-    "6a_03_top": PreRegion("6a_03_top", "6a_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_03_top"]),
+    "6a_03_bottom": PreRegion("6a_03_bottom", "6a_03", connections_by_region["6a_03_bottom"], locations_by_region["6a_03_bottom"]),
+    "6a_03_top": PreRegion("6a_03_top", "6a_03", connections_by_region["6a_03_top"], locations_by_region["6a_03_top"]),
 
-    "6a_02b_bottom": PreRegion("6a_02b_bottom", "6a_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02b_bottom"]),
-    "6a_02b_top": PreRegion("6a_02b_top", "6a_02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_02b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_02b_top"]),
+    "6a_02b_bottom": PreRegion("6a_02b_bottom", "6a_02b", connections_by_region["6a_02b_bottom"], locations_by_region["6a_02b_bottom"]),
+    "6a_02b_top": PreRegion("6a_02b_top", "6a_02b", connections_by_region["6a_02b_top"], locations_by_region["6a_02b_top"]),
 
-    "6a_04_south": PreRegion("6a_04_south", "6a_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04_south"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04_south"]),
-    "6a_04_south-west": PreRegion("6a_04_south-west", "6a_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04_south-west"]),
-    "6a_04_south-east": PreRegion("6a_04_south-east", "6a_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04_south-east"]),
-    "6a_04_east": PreRegion("6a_04_east", "6a_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04_east"]),
-    "6a_04_north-west": PreRegion("6a_04_north-west", "6a_04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04_north-west"]),
+    "6a_04_south": PreRegion("6a_04_south", "6a_04", connections_by_region["6a_04_south"], locations_by_region["6a_04_south"]),
+    "6a_04_south-west": PreRegion("6a_04_south-west", "6a_04", connections_by_region["6a_04_south-west"], locations_by_region["6a_04_south-west"]),
+    "6a_04_south-east": PreRegion("6a_04_south-east", "6a_04", connections_by_region["6a_04_south-east"], locations_by_region["6a_04_south-east"]),
+    "6a_04_east": PreRegion("6a_04_east", "6a_04", connections_by_region["6a_04_east"], locations_by_region["6a_04_east"]),
+    "6a_04_north-west": PreRegion("6a_04_north-west", "6a_04", connections_by_region["6a_04_north-west"], locations_by_region["6a_04_north-west"]),
 
-    "6a_04b_west": PreRegion("6a_04b_west", "6a_04b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04b_west"]),
-    "6a_04b_east": PreRegion("6a_04b_east", "6a_04b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04b_east"]),
+    "6a_04b_west": PreRegion("6a_04b_west", "6a_04b", connections_by_region["6a_04b_west"], locations_by_region["6a_04b_west"]),
+    "6a_04b_east": PreRegion("6a_04b_east", "6a_04b", connections_by_region["6a_04b_east"], locations_by_region["6a_04b_east"]),
 
-    "6a_04c_east": PreRegion("6a_04c_east", "6a_04c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04c_east"]),
+    "6a_04c_east": PreRegion("6a_04c_east", "6a_04c", connections_by_region["6a_04c_east"], locations_by_region["6a_04c_east"]),
 
-    "6a_04d_west": PreRegion("6a_04d_west", "6a_04d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04d_west"]),
+    "6a_04d_west": PreRegion("6a_04d_west", "6a_04d", connections_by_region["6a_04d_west"], locations_by_region["6a_04d_west"]),
 
-    "6a_04e_east": PreRegion("6a_04e_east", "6a_04e", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_04e_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_04e_east"]),
+    "6a_04e_east": PreRegion("6a_04e_east", "6a_04e", connections_by_region["6a_04e_east"], locations_by_region["6a_04e_east"]),
 
-    "6a_05_west": PreRegion("6a_05_west", "6a_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_05_west"]),
-    "6a_05_east": PreRegion("6a_05_east", "6a_05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_05_east"]),
+    "6a_05_west": PreRegion("6a_05_west", "6a_05", connections_by_region["6a_05_west"], locations_by_region["6a_05_west"]),
+    "6a_05_east": PreRegion("6a_05_east", "6a_05", connections_by_region["6a_05_east"], locations_by_region["6a_05_east"]),
 
-    "6a_06_west": PreRegion("6a_06_west", "6a_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_06_west"]),
-    "6a_06_east": PreRegion("6a_06_east", "6a_06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_06_east"]),
+    "6a_06_west": PreRegion("6a_06_west", "6a_06", connections_by_region["6a_06_west"], locations_by_region["6a_06_west"]),
+    "6a_06_east": PreRegion("6a_06_east", "6a_06", connections_by_region["6a_06_east"], locations_by_region["6a_06_east"]),
 
-    "6a_07_west": PreRegion("6a_07_west", "6a_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_07_west"]),
-    "6a_07_east": PreRegion("6a_07_east", "6a_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_07_east"]),
-    "6a_07_north-east": PreRegion("6a_07_north-east", "6a_07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_07_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_07_north-east"]),
+    "6a_07_west": PreRegion("6a_07_west", "6a_07", connections_by_region["6a_07_west"], locations_by_region["6a_07_west"]),
+    "6a_07_east": PreRegion("6a_07_east", "6a_07", connections_by_region["6a_07_east"], locations_by_region["6a_07_east"]),
+    "6a_07_north-east": PreRegion("6a_07_north-east", "6a_07", connections_by_region["6a_07_north-east"], locations_by_region["6a_07_north-east"]),
 
-    "6a_08a_west": PreRegion("6a_08a_west", "6a_08a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_08a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_08a_west"]),
-    "6a_08a_east": PreRegion("6a_08a_east", "6a_08a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_08a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_08a_east"]),
+    "6a_08a_west": PreRegion("6a_08a_west", "6a_08a", connections_by_region["6a_08a_west"], locations_by_region["6a_08a_west"]),
+    "6a_08a_east": PreRegion("6a_08a_east", "6a_08a", connections_by_region["6a_08a_east"], locations_by_region["6a_08a_east"]),
 
-    "6a_08b_west": PreRegion("6a_08b_west", "6a_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_08b_west"]),
-    "6a_08b_east": PreRegion("6a_08b_east", "6a_08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_08b_east"]),
+    "6a_08b_west": PreRegion("6a_08b_west", "6a_08b", connections_by_region["6a_08b_west"], locations_by_region["6a_08b_west"]),
+    "6a_08b_east": PreRegion("6a_08b_east", "6a_08b", connections_by_region["6a_08b_east"], locations_by_region["6a_08b_east"]),
 
-    "6a_09_west": PreRegion("6a_09_west", "6a_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_09_west"]),
-    "6a_09_north-west": PreRegion("6a_09_north-west", "6a_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_09_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_09_north-west"]),
-    "6a_09_east": PreRegion("6a_09_east", "6a_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_09_east"]),
-    "6a_09_north-east": PreRegion("6a_09_north-east", "6a_09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_09_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_09_north-east"]),
+    "6a_09_west": PreRegion("6a_09_west", "6a_09", connections_by_region["6a_09_west"], locations_by_region["6a_09_west"]),
+    "6a_09_north-west": PreRegion("6a_09_north-west", "6a_09", connections_by_region["6a_09_north-west"], locations_by_region["6a_09_north-west"]),
+    "6a_09_east": PreRegion("6a_09_east", "6a_09", connections_by_region["6a_09_east"], locations_by_region["6a_09_east"]),
+    "6a_09_north-east": PreRegion("6a_09_north-east", "6a_09", connections_by_region["6a_09_north-east"], locations_by_region["6a_09_north-east"]),
 
-    "6a_10a_west": PreRegion("6a_10a_west", "6a_10a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_10a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_10a_west"]),
-    "6a_10a_east": PreRegion("6a_10a_east", "6a_10a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_10a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_10a_east"]),
+    "6a_10a_west": PreRegion("6a_10a_west", "6a_10a", connections_by_region["6a_10a_west"], locations_by_region["6a_10a_west"]),
+    "6a_10a_east": PreRegion("6a_10a_east", "6a_10a", connections_by_region["6a_10a_east"], locations_by_region["6a_10a_east"]),
 
-    "6a_10b_west": PreRegion("6a_10b_west", "6a_10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_10b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_10b_west"]),
-    "6a_10b_east": PreRegion("6a_10b_east", "6a_10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_10b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_10b_east"]),
+    "6a_10b_west": PreRegion("6a_10b_west", "6a_10b", connections_by_region["6a_10b_west"], locations_by_region["6a_10b_west"]),
+    "6a_10b_east": PreRegion("6a_10b_east", "6a_10b", connections_by_region["6a_10b_east"], locations_by_region["6a_10b_east"]),
 
-    "6a_11_west": PreRegion("6a_11_west", "6a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_11_west"]),
-    "6a_11_north-west": PreRegion("6a_11_north-west", "6a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_11_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_11_north-west"]),
-    "6a_11_east": PreRegion("6a_11_east", "6a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_11_east"]),
-    "6a_11_north-east": PreRegion("6a_11_north-east", "6a_11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_11_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_11_north-east"]),
+    "6a_11_west": PreRegion("6a_11_west", "6a_11", connections_by_region["6a_11_west"], locations_by_region["6a_11_west"]),
+    "6a_11_north-west": PreRegion("6a_11_north-west", "6a_11", connections_by_region["6a_11_north-west"], locations_by_region["6a_11_north-west"]),
+    "6a_11_east": PreRegion("6a_11_east", "6a_11", connections_by_region["6a_11_east"], locations_by_region["6a_11_east"]),
+    "6a_11_north-east": PreRegion("6a_11_north-east", "6a_11", connections_by_region["6a_11_north-east"], locations_by_region["6a_11_north-east"]),
 
-    "6a_12a_west": PreRegion("6a_12a_west", "6a_12a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_12a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_12a_west"]),
-    "6a_12a_east": PreRegion("6a_12a_east", "6a_12a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_12a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_12a_east"]),
+    "6a_12a_west": PreRegion("6a_12a_west", "6a_12a", connections_by_region["6a_12a_west"], locations_by_region["6a_12a_west"]),
+    "6a_12a_east": PreRegion("6a_12a_east", "6a_12a", connections_by_region["6a_12a_east"], locations_by_region["6a_12a_east"]),
 
-    "6a_12b_west": PreRegion("6a_12b_west", "6a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_12b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_12b_west"]),
-    "6a_12b_east": PreRegion("6a_12b_east", "6a_12b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_12b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_12b_east"]),
+    "6a_12b_west": PreRegion("6a_12b_west", "6a_12b", connections_by_region["6a_12b_west"], locations_by_region["6a_12b_west"]),
+    "6a_12b_east": PreRegion("6a_12b_east", "6a_12b", connections_by_region["6a_12b_east"], locations_by_region["6a_12b_east"]),
 
-    "6a_13_west": PreRegion("6a_13_west", "6a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_13_west"]),
-    "6a_13_north-west": PreRegion("6a_13_north-west", "6a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_13_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_13_north-west"]),
-    "6a_13_east": PreRegion("6a_13_east", "6a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_13_east"]),
-    "6a_13_north-east": PreRegion("6a_13_north-east", "6a_13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_13_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_13_north-east"]),
+    "6a_13_west": PreRegion("6a_13_west", "6a_13", connections_by_region["6a_13_west"], locations_by_region["6a_13_west"]),
+    "6a_13_north-west": PreRegion("6a_13_north-west", "6a_13", connections_by_region["6a_13_north-west"], locations_by_region["6a_13_north-west"]),
+    "6a_13_east": PreRegion("6a_13_east", "6a_13", connections_by_region["6a_13_east"], locations_by_region["6a_13_east"]),
+    "6a_13_north-east": PreRegion("6a_13_north-east", "6a_13", connections_by_region["6a_13_north-east"], locations_by_region["6a_13_north-east"]),
 
-    "6a_14a_west": PreRegion("6a_14a_west", "6a_14a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_14a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_14a_west"]),
-    "6a_14a_east": PreRegion("6a_14a_east", "6a_14a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_14a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_14a_east"]),
+    "6a_14a_west": PreRegion("6a_14a_west", "6a_14a", connections_by_region["6a_14a_west"], locations_by_region["6a_14a_west"]),
+    "6a_14a_east": PreRegion("6a_14a_east", "6a_14a", connections_by_region["6a_14a_east"], locations_by_region["6a_14a_east"]),
 
-    "6a_14b_west": PreRegion("6a_14b_west", "6a_14b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_14b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_14b_west"]),
-    "6a_14b_east": PreRegion("6a_14b_east", "6a_14b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_14b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_14b_east"]),
+    "6a_14b_west": PreRegion("6a_14b_west", "6a_14b", connections_by_region["6a_14b_west"], locations_by_region["6a_14b_west"]),
+    "6a_14b_east": PreRegion("6a_14b_east", "6a_14b", connections_by_region["6a_14b_east"], locations_by_region["6a_14b_east"]),
 
-    "6a_15_west": PreRegion("6a_15_west", "6a_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_15_west"]),
-    "6a_15_north-west": PreRegion("6a_15_north-west", "6a_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_15_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_15_north-west"]),
-    "6a_15_east": PreRegion("6a_15_east", "6a_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_15_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_15_east"]),
-    "6a_15_north-east": PreRegion("6a_15_north-east", "6a_15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_15_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_15_north-east"]),
+    "6a_15_west": PreRegion("6a_15_west", "6a_15", connections_by_region["6a_15_west"], locations_by_region["6a_15_west"]),
+    "6a_15_north-west": PreRegion("6a_15_north-west", "6a_15", connections_by_region["6a_15_north-west"], locations_by_region["6a_15_north-west"]),
+    "6a_15_east": PreRegion("6a_15_east", "6a_15", connections_by_region["6a_15_east"], locations_by_region["6a_15_east"]),
+    "6a_15_north-east": PreRegion("6a_15_north-east", "6a_15", connections_by_region["6a_15_north-east"], locations_by_region["6a_15_north-east"]),
 
-    "6a_16a_west": PreRegion("6a_16a_west", "6a_16a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_16a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_16a_west"]),
-    "6a_16a_east": PreRegion("6a_16a_east", "6a_16a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_16a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_16a_east"]),
+    "6a_16a_west": PreRegion("6a_16a_west", "6a_16a", connections_by_region["6a_16a_west"], locations_by_region["6a_16a_west"]),
+    "6a_16a_east": PreRegion("6a_16a_east", "6a_16a", connections_by_region["6a_16a_east"], locations_by_region["6a_16a_east"]),
 
-    "6a_16b_west": PreRegion("6a_16b_west", "6a_16b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_16b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_16b_west"]),
-    "6a_16b_east": PreRegion("6a_16b_east", "6a_16b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_16b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_16b_east"]),
+    "6a_16b_west": PreRegion("6a_16b_west", "6a_16b", connections_by_region["6a_16b_west"], locations_by_region["6a_16b_west"]),
+    "6a_16b_east": PreRegion("6a_16b_east", "6a_16b", connections_by_region["6a_16b_east"], locations_by_region["6a_16b_east"]),
 
-    "6a_17_west": PreRegion("6a_17_west", "6a_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_17_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_17_west"]),
-    "6a_17_north-west": PreRegion("6a_17_north-west", "6a_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_17_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_17_north-west"]),
-    "6a_17_east": PreRegion("6a_17_east", "6a_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_17_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_17_east"]),
-    "6a_17_north-east": PreRegion("6a_17_north-east", "6a_17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_17_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_17_north-east"]),
+    "6a_17_west": PreRegion("6a_17_west", "6a_17", connections_by_region["6a_17_west"], locations_by_region["6a_17_west"]),
+    "6a_17_north-west": PreRegion("6a_17_north-west", "6a_17", connections_by_region["6a_17_north-west"], locations_by_region["6a_17_north-west"]),
+    "6a_17_east": PreRegion("6a_17_east", "6a_17", connections_by_region["6a_17_east"], locations_by_region["6a_17_east"]),
+    "6a_17_north-east": PreRegion("6a_17_north-east", "6a_17", connections_by_region["6a_17_north-east"], locations_by_region["6a_17_north-east"]),
 
-    "6a_18a_west": PreRegion("6a_18a_west", "6a_18a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_18a_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_18a_west"]),
-    "6a_18a_east": PreRegion("6a_18a_east", "6a_18a", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_18a_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_18a_east"]),
+    "6a_18a_west": PreRegion("6a_18a_west", "6a_18a", connections_by_region["6a_18a_west"], locations_by_region["6a_18a_west"]),
+    "6a_18a_east": PreRegion("6a_18a_east", "6a_18a", connections_by_region["6a_18a_east"], locations_by_region["6a_18a_east"]),
 
-    "6a_18b_west": PreRegion("6a_18b_west", "6a_18b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_18b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_18b_west"]),
-    "6a_18b_east": PreRegion("6a_18b_east", "6a_18b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_18b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_18b_east"]),
+    "6a_18b_west": PreRegion("6a_18b_west", "6a_18b", connections_by_region["6a_18b_west"], locations_by_region["6a_18b_west"]),
+    "6a_18b_east": PreRegion("6a_18b_east", "6a_18b", connections_by_region["6a_18b_east"], locations_by_region["6a_18b_east"]),
 
-    "6a_19_west": PreRegion("6a_19_west", "6a_19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_19_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_19_west"]),
-    "6a_19_north-west": PreRegion("6a_19_north-west", "6a_19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_19_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_19_north-west"]),
-    "6a_19_east": PreRegion("6a_19_east", "6a_19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_19_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_19_east"]),
+    "6a_19_west": PreRegion("6a_19_west", "6a_19", connections_by_region["6a_19_west"], locations_by_region["6a_19_west"]),
+    "6a_19_north-west": PreRegion("6a_19_north-west", "6a_19", connections_by_region["6a_19_north-west"], locations_by_region["6a_19_north-west"]),
+    "6a_19_east": PreRegion("6a_19_east", "6a_19", connections_by_region["6a_19_east"], locations_by_region["6a_19_east"]),
 
-    "6a_20_west": PreRegion("6a_20_west", "6a_20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_20_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_20_west"]),
-    "6a_20_east": PreRegion("6a_20_east", "6a_20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_20_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_20_east"]),
+    "6a_20_west": PreRegion("6a_20_west", "6a_20", connections_by_region["6a_20_west"], locations_by_region["6a_20_west"]),
+    "6a_20_east": PreRegion("6a_20_east", "6a_20", connections_by_region["6a_20_east"], locations_by_region["6a_20_east"]),
 
-    "6a_b-00_west": PreRegion("6a_b-00_west", "6a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00_west"]),
-    "6a_b-00_east": PreRegion("6a_b-00_east", "6a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00_east"]),
-    "6a_b-00_top": PreRegion("6a_b-00_top", "6a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00_top"]),
+    "6a_b-00_west": PreRegion("6a_b-00_west", "6a_b-00", connections_by_region["6a_b-00_west"], locations_by_region["6a_b-00_west"]),
+    "6a_b-00_east": PreRegion("6a_b-00_east", "6a_b-00", connections_by_region["6a_b-00_east"], locations_by_region["6a_b-00_east"]),
+    "6a_b-00_top": PreRegion("6a_b-00_top", "6a_b-00", connections_by_region["6a_b-00_top"], locations_by_region["6a_b-00_top"]),
 
-    "6a_b-00b_bottom": PreRegion("6a_b-00b_bottom", "6a_b-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00b_bottom"]),
-    "6a_b-00b_top": PreRegion("6a_b-00b_top", "6a_b-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00b_top"]),
+    "6a_b-00b_bottom": PreRegion("6a_b-00b_bottom", "6a_b-00b", connections_by_region["6a_b-00b_bottom"], locations_by_region["6a_b-00b_bottom"]),
+    "6a_b-00b_top": PreRegion("6a_b-00b_top", "6a_b-00b", connections_by_region["6a_b-00b_top"], locations_by_region["6a_b-00b_top"]),
 
-    "6a_b-00c_east": PreRegion("6a_b-00c_east", "6a_b-00c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-00c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-00c_east"]),
+    "6a_b-00c_east": PreRegion("6a_b-00c_east", "6a_b-00c", connections_by_region["6a_b-00c_east"], locations_by_region["6a_b-00c_east"]),
 
-    "6a_b-01_west": PreRegion("6a_b-01_west", "6a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-01_west"]),
-    "6a_b-01_east": PreRegion("6a_b-01_east", "6a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-01_east"]),
+    "6a_b-01_west": PreRegion("6a_b-01_west", "6a_b-01", connections_by_region["6a_b-01_west"], locations_by_region["6a_b-01_west"]),
+    "6a_b-01_east": PreRegion("6a_b-01_east", "6a_b-01", connections_by_region["6a_b-01_east"], locations_by_region["6a_b-01_east"]),
 
-    "6a_b-02_top": PreRegion("6a_b-02_top", "6a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-02_top"]),
-    "6a_b-02_bottom": PreRegion("6a_b-02_bottom", "6a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-02_bottom"]),
+    "6a_b-02_top": PreRegion("6a_b-02_top", "6a_b-02", connections_by_region["6a_b-02_top"], locations_by_region["6a_b-02_top"]),
+    "6a_b-02_bottom": PreRegion("6a_b-02_bottom", "6a_b-02", connections_by_region["6a_b-02_bottom"], locations_by_region["6a_b-02_bottom"]),
 
-    "6a_b-02b_top": PreRegion("6a_b-02b_top", "6a_b-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-02b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-02b_top"]),
-    "6a_b-02b_bottom": PreRegion("6a_b-02b_bottom", "6a_b-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-02b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-02b_bottom"]),
+    "6a_b-02b_top": PreRegion("6a_b-02b_top", "6a_b-02b", connections_by_region["6a_b-02b_top"], locations_by_region["6a_b-02b_top"]),
+    "6a_b-02b_bottom": PreRegion("6a_b-02b_bottom", "6a_b-02b", connections_by_region["6a_b-02b_bottom"], locations_by_region["6a_b-02b_bottom"]),
 
-    "6a_b-03_west": PreRegion("6a_b-03_west", "6a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-03_west"]),
-    "6a_b-03_east": PreRegion("6a_b-03_east", "6a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_b-03_east"]),
+    "6a_b-03_west": PreRegion("6a_b-03_west", "6a_b-03", connections_by_region["6a_b-03_west"], locations_by_region["6a_b-03_west"]),
+    "6a_b-03_east": PreRegion("6a_b-03_east", "6a_b-03", connections_by_region["6a_b-03_east"], locations_by_region["6a_b-03_east"]),
 
-    "6a_boss-00_west": PreRegion("6a_boss-00_west", "6a_boss-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-00_west"]),
-    "6a_boss-00_east": PreRegion("6a_boss-00_east", "6a_boss-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-00_east"]),
+    "6a_boss-00_west": PreRegion("6a_boss-00_west", "6a_boss-00", connections_by_region["6a_boss-00_west"], locations_by_region["6a_boss-00_west"]),
+    "6a_boss-00_east": PreRegion("6a_boss-00_east", "6a_boss-00", connections_by_region["6a_boss-00_east"], locations_by_region["6a_boss-00_east"]),
 
-    "6a_boss-01_west": PreRegion("6a_boss-01_west", "6a_boss-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-01_west"]),
-    "6a_boss-01_east": PreRegion("6a_boss-01_east", "6a_boss-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-01_east"]),
+    "6a_boss-01_west": PreRegion("6a_boss-01_west", "6a_boss-01", connections_by_region["6a_boss-01_west"], locations_by_region["6a_boss-01_west"]),
+    "6a_boss-01_east": PreRegion("6a_boss-01_east", "6a_boss-01", connections_by_region["6a_boss-01_east"], locations_by_region["6a_boss-01_east"]),
 
-    "6a_boss-02_west": PreRegion("6a_boss-02_west", "6a_boss-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-02_west"]),
-    "6a_boss-02_east": PreRegion("6a_boss-02_east", "6a_boss-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-02_east"]),
+    "6a_boss-02_west": PreRegion("6a_boss-02_west", "6a_boss-02", connections_by_region["6a_boss-02_west"], locations_by_region["6a_boss-02_west"]),
+    "6a_boss-02_east": PreRegion("6a_boss-02_east", "6a_boss-02", connections_by_region["6a_boss-02_east"], locations_by_region["6a_boss-02_east"]),
 
-    "6a_boss-03_west": PreRegion("6a_boss-03_west", "6a_boss-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-03_west"]),
-    "6a_boss-03_east": PreRegion("6a_boss-03_east", "6a_boss-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-03_east"]),
+    "6a_boss-03_west": PreRegion("6a_boss-03_west", "6a_boss-03", connections_by_region["6a_boss-03_west"], locations_by_region["6a_boss-03_west"]),
+    "6a_boss-03_east": PreRegion("6a_boss-03_east", "6a_boss-03", connections_by_region["6a_boss-03_east"], locations_by_region["6a_boss-03_east"]),
 
-    "6a_boss-04_west": PreRegion("6a_boss-04_west", "6a_boss-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-04_west"]),
-    "6a_boss-04_east": PreRegion("6a_boss-04_east", "6a_boss-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-04_east"]),
+    "6a_boss-04_west": PreRegion("6a_boss-04_west", "6a_boss-04", connections_by_region["6a_boss-04_west"], locations_by_region["6a_boss-04_west"]),
+    "6a_boss-04_east": PreRegion("6a_boss-04_east", "6a_boss-04", connections_by_region["6a_boss-04_east"], locations_by_region["6a_boss-04_east"]),
 
-    "6a_boss-05_west": PreRegion("6a_boss-05_west", "6a_boss-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-05_west"]),
-    "6a_boss-05_east": PreRegion("6a_boss-05_east", "6a_boss-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-05_east"]),
+    "6a_boss-05_west": PreRegion("6a_boss-05_west", "6a_boss-05", connections_by_region["6a_boss-05_west"], locations_by_region["6a_boss-05_west"]),
+    "6a_boss-05_east": PreRegion("6a_boss-05_east", "6a_boss-05", connections_by_region["6a_boss-05_east"], locations_by_region["6a_boss-05_east"]),
 
-    "6a_boss-06_west": PreRegion("6a_boss-06_west", "6a_boss-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-06_west"]),
-    "6a_boss-06_east": PreRegion("6a_boss-06_east", "6a_boss-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-06_east"]),
+    "6a_boss-06_west": PreRegion("6a_boss-06_west", "6a_boss-06", connections_by_region["6a_boss-06_west"], locations_by_region["6a_boss-06_west"]),
+    "6a_boss-06_east": PreRegion("6a_boss-06_east", "6a_boss-06", connections_by_region["6a_boss-06_east"], locations_by_region["6a_boss-06_east"]),
 
-    "6a_boss-07_west": PreRegion("6a_boss-07_west", "6a_boss-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-07_west"]),
-    "6a_boss-07_east": PreRegion("6a_boss-07_east", "6a_boss-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-07_east"]),
+    "6a_boss-07_west": PreRegion("6a_boss-07_west", "6a_boss-07", connections_by_region["6a_boss-07_west"], locations_by_region["6a_boss-07_west"]),
+    "6a_boss-07_east": PreRegion("6a_boss-07_east", "6a_boss-07", connections_by_region["6a_boss-07_east"], locations_by_region["6a_boss-07_east"]),
 
-    "6a_boss-08_west": PreRegion("6a_boss-08_west", "6a_boss-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-08_west"]),
-    "6a_boss-08_east": PreRegion("6a_boss-08_east", "6a_boss-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-08_east"]),
+    "6a_boss-08_west": PreRegion("6a_boss-08_west", "6a_boss-08", connections_by_region["6a_boss-08_west"], locations_by_region["6a_boss-08_west"]),
+    "6a_boss-08_east": PreRegion("6a_boss-08_east", "6a_boss-08", connections_by_region["6a_boss-08_east"], locations_by_region["6a_boss-08_east"]),
 
-    "6a_boss-09_west": PreRegion("6a_boss-09_west", "6a_boss-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-09_west"]),
-    "6a_boss-09_east": PreRegion("6a_boss-09_east", "6a_boss-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-09_east"]),
+    "6a_boss-09_west": PreRegion("6a_boss-09_west", "6a_boss-09", connections_by_region["6a_boss-09_west"], locations_by_region["6a_boss-09_west"]),
+    "6a_boss-09_east": PreRegion("6a_boss-09_east", "6a_boss-09", connections_by_region["6a_boss-09_east"], locations_by_region["6a_boss-09_east"]),
 
-    "6a_boss-10_west": PreRegion("6a_boss-10_west", "6a_boss-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-10_west"]),
-    "6a_boss-10_east": PreRegion("6a_boss-10_east", "6a_boss-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-10_east"]),
+    "6a_boss-10_west": PreRegion("6a_boss-10_west", "6a_boss-10", connections_by_region["6a_boss-10_west"], locations_by_region["6a_boss-10_west"]),
+    "6a_boss-10_east": PreRegion("6a_boss-10_east", "6a_boss-10", connections_by_region["6a_boss-10_east"], locations_by_region["6a_boss-10_east"]),
 
-    "6a_boss-11_west": PreRegion("6a_boss-11_west", "6a_boss-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-11_west"]),
-    "6a_boss-11_east": PreRegion("6a_boss-11_east", "6a_boss-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-11_east"]),
+    "6a_boss-11_west": PreRegion("6a_boss-11_west", "6a_boss-11", connections_by_region["6a_boss-11_west"], locations_by_region["6a_boss-11_west"]),
+    "6a_boss-11_east": PreRegion("6a_boss-11_east", "6a_boss-11", connections_by_region["6a_boss-11_east"], locations_by_region["6a_boss-11_east"]),
 
-    "6a_boss-12_west": PreRegion("6a_boss-12_west", "6a_boss-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-12_west"]),
-    "6a_boss-12_east": PreRegion("6a_boss-12_east", "6a_boss-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-12_east"]),
+    "6a_boss-12_west": PreRegion("6a_boss-12_west", "6a_boss-12", connections_by_region["6a_boss-12_west"], locations_by_region["6a_boss-12_west"]),
+    "6a_boss-12_east": PreRegion("6a_boss-12_east", "6a_boss-12", connections_by_region["6a_boss-12_east"], locations_by_region["6a_boss-12_east"]),
 
-    "6a_boss-13_west": PreRegion("6a_boss-13_west", "6a_boss-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-13_west"]),
-    "6a_boss-13_east": PreRegion("6a_boss-13_east", "6a_boss-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-13_east"]),
+    "6a_boss-13_west": PreRegion("6a_boss-13_west", "6a_boss-13", connections_by_region["6a_boss-13_west"], locations_by_region["6a_boss-13_west"]),
+    "6a_boss-13_east": PreRegion("6a_boss-13_east", "6a_boss-13", connections_by_region["6a_boss-13_east"], locations_by_region["6a_boss-13_east"]),
 
-    "6a_boss-14_west": PreRegion("6a_boss-14_west", "6a_boss-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-14_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-14_west"]),
-    "6a_boss-14_east": PreRegion("6a_boss-14_east", "6a_boss-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-14_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-14_east"]),
+    "6a_boss-14_west": PreRegion("6a_boss-14_west", "6a_boss-14", connections_by_region["6a_boss-14_west"], locations_by_region["6a_boss-14_west"]),
+    "6a_boss-14_east": PreRegion("6a_boss-14_east", "6a_boss-14", connections_by_region["6a_boss-14_east"], locations_by_region["6a_boss-14_east"]),
 
-    "6a_boss-15_west": PreRegion("6a_boss-15_west", "6a_boss-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-15_west"]),
-    "6a_boss-15_east": PreRegion("6a_boss-15_east", "6a_boss-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-15_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-15_east"]),
+    "6a_boss-15_west": PreRegion("6a_boss-15_west", "6a_boss-15", connections_by_region["6a_boss-15_west"], locations_by_region["6a_boss-15_west"]),
+    "6a_boss-15_east": PreRegion("6a_boss-15_east", "6a_boss-15", connections_by_region["6a_boss-15_east"], locations_by_region["6a_boss-15_east"]),
 
-    "6a_boss-16_west": PreRegion("6a_boss-16_west", "6a_boss-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-16_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-16_west"]),
-    "6a_boss-16_east": PreRegion("6a_boss-16_east", "6a_boss-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-16_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-16_east"]),
+    "6a_boss-16_west": PreRegion("6a_boss-16_west", "6a_boss-16", connections_by_region["6a_boss-16_west"], locations_by_region["6a_boss-16_west"]),
+    "6a_boss-16_east": PreRegion("6a_boss-16_east", "6a_boss-16", connections_by_region["6a_boss-16_east"], locations_by_region["6a_boss-16_east"]),
 
-    "6a_boss-17_west": PreRegion("6a_boss-17_west", "6a_boss-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-17_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-17_west"]),
-    "6a_boss-17_east": PreRegion("6a_boss-17_east", "6a_boss-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-17_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-17_east"]),
+    "6a_boss-17_west": PreRegion("6a_boss-17_west", "6a_boss-17", connections_by_region["6a_boss-17_west"], locations_by_region["6a_boss-17_west"]),
+    "6a_boss-17_east": PreRegion("6a_boss-17_east", "6a_boss-17", connections_by_region["6a_boss-17_east"], locations_by_region["6a_boss-17_east"]),
 
-    "6a_boss-18_west": PreRegion("6a_boss-18_west", "6a_boss-18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-18_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-18_west"]),
-    "6a_boss-18_east": PreRegion("6a_boss-18_east", "6a_boss-18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-18_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-18_east"]),
+    "6a_boss-18_west": PreRegion("6a_boss-18_west", "6a_boss-18", connections_by_region["6a_boss-18_west"], locations_by_region["6a_boss-18_west"]),
+    "6a_boss-18_east": PreRegion("6a_boss-18_east", "6a_boss-18", connections_by_region["6a_boss-18_east"], locations_by_region["6a_boss-18_east"]),
 
-    "6a_boss-19_west": PreRegion("6a_boss-19_west", "6a_boss-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-19_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-19_west"]),
-    "6a_boss-19_east": PreRegion("6a_boss-19_east", "6a_boss-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-19_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-19_east"]),
+    "6a_boss-19_west": PreRegion("6a_boss-19_west", "6a_boss-19", connections_by_region["6a_boss-19_west"], locations_by_region["6a_boss-19_west"]),
+    "6a_boss-19_east": PreRegion("6a_boss-19_east", "6a_boss-19", connections_by_region["6a_boss-19_east"], locations_by_region["6a_boss-19_east"]),
 
-    "6a_boss-20_west": PreRegion("6a_boss-20_west", "6a_boss-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-20_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-20_west"]),
-    "6a_boss-20_east": PreRegion("6a_boss-20_east", "6a_boss-20", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_boss-20_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_boss-20_east"]),
+    "6a_boss-20_west": PreRegion("6a_boss-20_west", "6a_boss-20", connections_by_region["6a_boss-20_west"], locations_by_region["6a_boss-20_west"]),
+    "6a_boss-20_east": PreRegion("6a_boss-20_east", "6a_boss-20", connections_by_region["6a_boss-20_east"], locations_by_region["6a_boss-20_east"]),
 
-    "6a_after-00_bottom": PreRegion("6a_after-00_bottom", "6a_after-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_after-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_after-00_bottom"]),
-    "6a_after-00_top": PreRegion("6a_after-00_top", "6a_after-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_after-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_after-00_top"]),
+    "6a_after-00_bottom": PreRegion("6a_after-00_bottom", "6a_after-00", connections_by_region["6a_after-00_bottom"], locations_by_region["6a_after-00_bottom"]),
+    "6a_after-00_top": PreRegion("6a_after-00_top", "6a_after-00", connections_by_region["6a_after-00_top"], locations_by_region["6a_after-00_top"]),
 
-    "6a_after-01_bottom": PreRegion("6a_after-01_bottom", "6a_after-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_after-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_after-01_bottom"]),
-    "6a_after-01_goal": PreRegion("6a_after-01_goal", "6a_after-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6a_after-01_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "6a_after-01_goal"]),
+    "6a_after-01_bottom": PreRegion("6a_after-01_bottom", "6a_after-01", connections_by_region["6a_after-01_bottom"], locations_by_region["6a_after-01_bottom"]),
+    "6a_after-01_goal": PreRegion("6a_after-01_goal", "6a_after-01", connections_by_region["6a_after-01_goal"], locations_by_region["6a_after-01_goal"]),
 
-    "6b_a-00_bottom": PreRegion("6b_a-00_bottom", "6b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-00_bottom"]),
-    "6b_a-00_top": PreRegion("6b_a-00_top", "6b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-00_top"]),
+    "6b_a-00_bottom": PreRegion("6b_a-00_bottom", "6b_a-00", connections_by_region["6b_a-00_bottom"], locations_by_region["6b_a-00_bottom"]),
+    "6b_a-00_top": PreRegion("6b_a-00_top", "6b_a-00", connections_by_region["6b_a-00_top"], locations_by_region["6b_a-00_top"]),
 
-    "6b_a-01_bottom": PreRegion("6b_a-01_bottom", "6b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-01_bottom"]),
-    "6b_a-01_top": PreRegion("6b_a-01_top", "6b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-01_top"]),
+    "6b_a-01_bottom": PreRegion("6b_a-01_bottom", "6b_a-01", connections_by_region["6b_a-01_bottom"], locations_by_region["6b_a-01_bottom"]),
+    "6b_a-01_top": PreRegion("6b_a-01_top", "6b_a-01", connections_by_region["6b_a-01_top"], locations_by_region["6b_a-01_top"]),
 
-    "6b_a-02_bottom": PreRegion("6b_a-02_bottom", "6b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-02_bottom"]),
-    "6b_a-02_top": PreRegion("6b_a-02_top", "6b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-02_top"]),
+    "6b_a-02_bottom": PreRegion("6b_a-02_bottom", "6b_a-02", connections_by_region["6b_a-02_bottom"], locations_by_region["6b_a-02_bottom"]),
+    "6b_a-02_top": PreRegion("6b_a-02_top", "6b_a-02", connections_by_region["6b_a-02_top"], locations_by_region["6b_a-02_top"]),
 
-    "6b_a-03_west": PreRegion("6b_a-03_west", "6b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-03_west"]),
-    "6b_a-03_east": PreRegion("6b_a-03_east", "6b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-03_east"]),
+    "6b_a-03_west": PreRegion("6b_a-03_west", "6b_a-03", connections_by_region["6b_a-03_west"], locations_by_region["6b_a-03_west"]),
+    "6b_a-03_east": PreRegion("6b_a-03_east", "6b_a-03", connections_by_region["6b_a-03_east"], locations_by_region["6b_a-03_east"]),
 
-    "6b_a-04_west": PreRegion("6b_a-04_west", "6b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-04_west"]),
-    "6b_a-04_east": PreRegion("6b_a-04_east", "6b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-04_east"]),
+    "6b_a-04_west": PreRegion("6b_a-04_west", "6b_a-04", connections_by_region["6b_a-04_west"], locations_by_region["6b_a-04_west"]),
+    "6b_a-04_east": PreRegion("6b_a-04_east", "6b_a-04", connections_by_region["6b_a-04_east"], locations_by_region["6b_a-04_east"]),
 
-    "6b_a-05_west": PreRegion("6b_a-05_west", "6b_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-05_west"]),
-    "6b_a-05_east": PreRegion("6b_a-05_east", "6b_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-05_east"]),
+    "6b_a-05_west": PreRegion("6b_a-05_west", "6b_a-05", connections_by_region["6b_a-05_west"], locations_by_region["6b_a-05_west"]),
+    "6b_a-05_east": PreRegion("6b_a-05_east", "6b_a-05", connections_by_region["6b_a-05_east"], locations_by_region["6b_a-05_east"]),
 
-    "6b_a-06_west": PreRegion("6b_a-06_west", "6b_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-06_west"]),
-    "6b_a-06_east": PreRegion("6b_a-06_east", "6b_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_a-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_a-06_east"]),
+    "6b_a-06_west": PreRegion("6b_a-06_west", "6b_a-06", connections_by_region["6b_a-06_west"], locations_by_region["6b_a-06_west"]),
+    "6b_a-06_east": PreRegion("6b_a-06_east", "6b_a-06", connections_by_region["6b_a-06_east"], locations_by_region["6b_a-06_east"]),
 
-    "6b_b-00_west": PreRegion("6b_b-00_west", "6b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-00_west"]),
-    "6b_b-00_east": PreRegion("6b_b-00_east", "6b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-00_east"]),
+    "6b_b-00_west": PreRegion("6b_b-00_west", "6b_b-00", connections_by_region["6b_b-00_west"], locations_by_region["6b_b-00_west"]),
+    "6b_b-00_east": PreRegion("6b_b-00_east", "6b_b-00", connections_by_region["6b_b-00_east"], locations_by_region["6b_b-00_east"]),
 
-    "6b_b-01_top": PreRegion("6b_b-01_top", "6b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-01_top"]),
-    "6b_b-01_bottom": PreRegion("6b_b-01_bottom", "6b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-01_bottom"]),
+    "6b_b-01_top": PreRegion("6b_b-01_top", "6b_b-01", connections_by_region["6b_b-01_top"], locations_by_region["6b_b-01_top"]),
+    "6b_b-01_bottom": PreRegion("6b_b-01_bottom", "6b_b-01", connections_by_region["6b_b-01_bottom"], locations_by_region["6b_b-01_bottom"]),
 
-    "6b_b-02_top": PreRegion("6b_b-02_top", "6b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-02_top"]),
-    "6b_b-02_bottom": PreRegion("6b_b-02_bottom", "6b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-02_bottom"]),
+    "6b_b-02_top": PreRegion("6b_b-02_top", "6b_b-02", connections_by_region["6b_b-02_top"], locations_by_region["6b_b-02_top"]),
+    "6b_b-02_bottom": PreRegion("6b_b-02_bottom", "6b_b-02", connections_by_region["6b_b-02_bottom"], locations_by_region["6b_b-02_bottom"]),
 
-    "6b_b-03_top": PreRegion("6b_b-03_top", "6b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-03_top"]),
-    "6b_b-03_bottom": PreRegion("6b_b-03_bottom", "6b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-03_bottom"]),
+    "6b_b-03_top": PreRegion("6b_b-03_top", "6b_b-03", connections_by_region["6b_b-03_top"], locations_by_region["6b_b-03_top"]),
+    "6b_b-03_bottom": PreRegion("6b_b-03_bottom", "6b_b-03", connections_by_region["6b_b-03_bottom"], locations_by_region["6b_b-03_bottom"]),
 
-    "6b_b-04_top": PreRegion("6b_b-04_top", "6b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-04_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-04_top"]),
-    "6b_b-04_bottom": PreRegion("6b_b-04_bottom", "6b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-04_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-04_bottom"]),
+    "6b_b-04_top": PreRegion("6b_b-04_top", "6b_b-04", connections_by_region["6b_b-04_top"], locations_by_region["6b_b-04_top"]),
+    "6b_b-04_bottom": PreRegion("6b_b-04_bottom", "6b_b-04", connections_by_region["6b_b-04_bottom"], locations_by_region["6b_b-04_bottom"]),
 
-    "6b_b-05_top": PreRegion("6b_b-05_top", "6b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-05_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-05_top"]),
-    "6b_b-05_bottom": PreRegion("6b_b-05_bottom", "6b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-05_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-05_bottom"]),
+    "6b_b-05_top": PreRegion("6b_b-05_top", "6b_b-05", connections_by_region["6b_b-05_top"], locations_by_region["6b_b-05_top"]),
+    "6b_b-05_bottom": PreRegion("6b_b-05_bottom", "6b_b-05", connections_by_region["6b_b-05_bottom"], locations_by_region["6b_b-05_bottom"]),
 
-    "6b_b-06_top": PreRegion("6b_b-06_top", "6b_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-06_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-06_top"]),
-    "6b_b-06_bottom": PreRegion("6b_b-06_bottom", "6b_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-06_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-06_bottom"]),
+    "6b_b-06_top": PreRegion("6b_b-06_top", "6b_b-06", connections_by_region["6b_b-06_top"], locations_by_region["6b_b-06_top"]),
+    "6b_b-06_bottom": PreRegion("6b_b-06_bottom", "6b_b-06", connections_by_region["6b_b-06_bottom"], locations_by_region["6b_b-06_bottom"]),
 
-    "6b_b-07_top": PreRegion("6b_b-07_top", "6b_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-07_top"]),
-    "6b_b-07_bottom": PreRegion("6b_b-07_bottom", "6b_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-07_bottom"]),
+    "6b_b-07_top": PreRegion("6b_b-07_top", "6b_b-07", connections_by_region["6b_b-07_top"], locations_by_region["6b_b-07_top"]),
+    "6b_b-07_bottom": PreRegion("6b_b-07_bottom", "6b_b-07", connections_by_region["6b_b-07_bottom"], locations_by_region["6b_b-07_bottom"]),
 
-    "6b_b-08_top": PreRegion("6b_b-08_top", "6b_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-08_top"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-08_top"]),
-    "6b_b-08_bottom": PreRegion("6b_b-08_bottom", "6b_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-08_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-08_bottom"]),
+    "6b_b-08_top": PreRegion("6b_b-08_top", "6b_b-08", connections_by_region["6b_b-08_top"], locations_by_region["6b_b-08_top"]),
+    "6b_b-08_bottom": PreRegion("6b_b-08_bottom", "6b_b-08", connections_by_region["6b_b-08_bottom"], locations_by_region["6b_b-08_bottom"]),
 
-    "6b_b-10_west": PreRegion("6b_b-10_west", "6b_b-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-10_west"]),
-    "6b_b-10_east": PreRegion("6b_b-10_east", "6b_b-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_b-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_b-10_east"]),
+    "6b_b-10_west": PreRegion("6b_b-10_west", "6b_b-10", connections_by_region["6b_b-10_west"], locations_by_region["6b_b-10_west"]),
+    "6b_b-10_east": PreRegion("6b_b-10_east", "6b_b-10", connections_by_region["6b_b-10_east"], locations_by_region["6b_b-10_east"]),
 
-    "6b_c-00_west": PreRegion("6b_c-00_west", "6b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-00_west"]),
-    "6b_c-00_east": PreRegion("6b_c-00_east", "6b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-00_east"]),
+    "6b_c-00_west": PreRegion("6b_c-00_west", "6b_c-00", connections_by_region["6b_c-00_west"], locations_by_region["6b_c-00_west"]),
+    "6b_c-00_east": PreRegion("6b_c-00_east", "6b_c-00", connections_by_region["6b_c-00_east"], locations_by_region["6b_c-00_east"]),
 
-    "6b_c-01_west": PreRegion("6b_c-01_west", "6b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-01_west"]),
-    "6b_c-01_east": PreRegion("6b_c-01_east", "6b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-01_east"]),
+    "6b_c-01_west": PreRegion("6b_c-01_west", "6b_c-01", connections_by_region["6b_c-01_west"], locations_by_region["6b_c-01_west"]),
+    "6b_c-01_east": PreRegion("6b_c-01_east", "6b_c-01", connections_by_region["6b_c-01_east"], locations_by_region["6b_c-01_east"]),
 
-    "6b_c-02_west": PreRegion("6b_c-02_west", "6b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-02_west"]),
-    "6b_c-02_east": PreRegion("6b_c-02_east", "6b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-02_east"]),
+    "6b_c-02_west": PreRegion("6b_c-02_west", "6b_c-02", connections_by_region["6b_c-02_west"], locations_by_region["6b_c-02_west"]),
+    "6b_c-02_east": PreRegion("6b_c-02_east", "6b_c-02", connections_by_region["6b_c-02_east"], locations_by_region["6b_c-02_east"]),
 
-    "6b_c-03_west": PreRegion("6b_c-03_west", "6b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-03_west"]),
-    "6b_c-03_east": PreRegion("6b_c-03_east", "6b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-03_east"]),
+    "6b_c-03_west": PreRegion("6b_c-03_west", "6b_c-03", connections_by_region["6b_c-03_west"], locations_by_region["6b_c-03_west"]),
+    "6b_c-03_east": PreRegion("6b_c-03_east", "6b_c-03", connections_by_region["6b_c-03_east"], locations_by_region["6b_c-03_east"]),
 
-    "6b_c-04_west": PreRegion("6b_c-04_west", "6b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-04_west"]),
-    "6b_c-04_east": PreRegion("6b_c-04_east", "6b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_c-04_east"]),
+    "6b_c-04_west": PreRegion("6b_c-04_west", "6b_c-04", connections_by_region["6b_c-04_west"], locations_by_region["6b_c-04_west"]),
+    "6b_c-04_east": PreRegion("6b_c-04_east", "6b_c-04", connections_by_region["6b_c-04_east"], locations_by_region["6b_c-04_east"]),
 
-    "6b_d-00_west": PreRegion("6b_d-00_west", "6b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-00_west"]),
-    "6b_d-00_east": PreRegion("6b_d-00_east", "6b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-00_east"]),
+    "6b_d-00_west": PreRegion("6b_d-00_west", "6b_d-00", connections_by_region["6b_d-00_west"], locations_by_region["6b_d-00_west"]),
+    "6b_d-00_east": PreRegion("6b_d-00_east", "6b_d-00", connections_by_region["6b_d-00_east"], locations_by_region["6b_d-00_east"]),
 
-    "6b_d-01_west": PreRegion("6b_d-01_west", "6b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-01_west"]),
-    "6b_d-01_east": PreRegion("6b_d-01_east", "6b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-01_east"]),
+    "6b_d-01_west": PreRegion("6b_d-01_west", "6b_d-01", connections_by_region["6b_d-01_west"], locations_by_region["6b_d-01_west"]),
+    "6b_d-01_east": PreRegion("6b_d-01_east", "6b_d-01", connections_by_region["6b_d-01_east"], locations_by_region["6b_d-01_east"]),
 
-    "6b_d-02_west": PreRegion("6b_d-02_west", "6b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-02_west"]),
-    "6b_d-02_east": PreRegion("6b_d-02_east", "6b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-02_east"]),
+    "6b_d-02_west": PreRegion("6b_d-02_west", "6b_d-02", connections_by_region["6b_d-02_west"], locations_by_region["6b_d-02_west"]),
+    "6b_d-02_east": PreRegion("6b_d-02_east", "6b_d-02", connections_by_region["6b_d-02_east"], locations_by_region["6b_d-02_east"]),
 
-    "6b_d-03_west": PreRegion("6b_d-03_west", "6b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-03_west"]),
-    "6b_d-03_east": PreRegion("6b_d-03_east", "6b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-03_east"]),
+    "6b_d-03_west": PreRegion("6b_d-03_west", "6b_d-03", connections_by_region["6b_d-03_west"], locations_by_region["6b_d-03_west"]),
+    "6b_d-03_east": PreRegion("6b_d-03_east", "6b_d-03", connections_by_region["6b_d-03_east"], locations_by_region["6b_d-03_east"]),
 
-    "6b_d-04_west": PreRegion("6b_d-04_west", "6b_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-04_west"]),
-    "6b_d-04_east": PreRegion("6b_d-04_east", "6b_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-04_east"]),
+    "6b_d-04_west": PreRegion("6b_d-04_west", "6b_d-04", connections_by_region["6b_d-04_west"], locations_by_region["6b_d-04_west"]),
+    "6b_d-04_east": PreRegion("6b_d-04_east", "6b_d-04", connections_by_region["6b_d-04_east"], locations_by_region["6b_d-04_east"]),
 
-    "6b_d-05_west": PreRegion("6b_d-05_west", "6b_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-05_west"]),
-    "6b_d-05_goal": PreRegion("6b_d-05_goal", "6b_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6b_d-05_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "6b_d-05_goal"]),
+    "6b_d-05_west": PreRegion("6b_d-05_west", "6b_d-05", connections_by_region["6b_d-05_west"], locations_by_region["6b_d-05_west"]),
+    "6b_d-05_goal": PreRegion("6b_d-05_goal", "6b_d-05", connections_by_region["6b_d-05_goal"], locations_by_region["6b_d-05_goal"]),
 
-    "6c_00_west": PreRegion("6c_00_west", "6c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_00_west"]),
-    "6c_00_east": PreRegion("6c_00_east", "6c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_00_east"]),
+    "6c_00_west": PreRegion("6c_00_west", "6c_00", connections_by_region["6c_00_west"], locations_by_region["6c_00_west"]),
+    "6c_00_east": PreRegion("6c_00_east", "6c_00", connections_by_region["6c_00_east"], locations_by_region["6c_00_east"]),
 
-    "6c_01_west": PreRegion("6c_01_west", "6c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_01_west"]),
-    "6c_01_east": PreRegion("6c_01_east", "6c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_01_east"]),
+    "6c_01_west": PreRegion("6c_01_west", "6c_01", connections_by_region["6c_01_west"], locations_by_region["6c_01_west"]),
+    "6c_01_east": PreRegion("6c_01_east", "6c_01", connections_by_region["6c_01_east"], locations_by_region["6c_01_east"]),
 
-    "6c_02_west": PreRegion("6c_02_west", "6c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_02_west"]),
-    "6c_02_goal": PreRegion("6c_02_goal", "6c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "6c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "6c_02_goal"]),
+    "6c_02_west": PreRegion("6c_02_west", "6c_02", connections_by_region["6c_02_west"], locations_by_region["6c_02_west"]),
+    "6c_02_goal": PreRegion("6c_02_goal", "6c_02", connections_by_region["6c_02_goal"], locations_by_region["6c_02_goal"]),
 
-    "7a_a-00_west": PreRegion("7a_a-00_west", "7a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-00_west"]),
-    "7a_a-00_east": PreRegion("7a_a-00_east", "7a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-00_east"]),
+    "7a_a-00_west": PreRegion("7a_a-00_west", "7a_a-00", connections_by_region["7a_a-00_west"], locations_by_region["7a_a-00_west"]),
+    "7a_a-00_east": PreRegion("7a_a-00_east", "7a_a-00", connections_by_region["7a_a-00_east"], locations_by_region["7a_a-00_east"]),
 
-    "7a_a-01_west": PreRegion("7a_a-01_west", "7a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-01_west"]),
-    "7a_a-01_east": PreRegion("7a_a-01_east", "7a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-01_east"]),
+    "7a_a-01_west": PreRegion("7a_a-01_west", "7a_a-01", connections_by_region["7a_a-01_west"], locations_by_region["7a_a-01_west"]),
+    "7a_a-01_east": PreRegion("7a_a-01_east", "7a_a-01", connections_by_region["7a_a-01_east"], locations_by_region["7a_a-01_east"]),
 
-    "7a_a-02_west": PreRegion("7a_a-02_west", "7a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02_west"]),
-    "7a_a-02_east": PreRegion("7a_a-02_east", "7a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02_east"]),
-    "7a_a-02_north": PreRegion("7a_a-02_north", "7a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02_north"]),
-    "7a_a-02_north-west": PreRegion("7a_a-02_north-west", "7a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02_north-west"]),
+    "7a_a-02_west": PreRegion("7a_a-02_west", "7a_a-02", connections_by_region["7a_a-02_west"], locations_by_region["7a_a-02_west"]),
+    "7a_a-02_east": PreRegion("7a_a-02_east", "7a_a-02", connections_by_region["7a_a-02_east"], locations_by_region["7a_a-02_east"]),
+    "7a_a-02_north": PreRegion("7a_a-02_north", "7a_a-02", connections_by_region["7a_a-02_north"], locations_by_region["7a_a-02_north"]),
+    "7a_a-02_north-west": PreRegion("7a_a-02_north-west", "7a_a-02", connections_by_region["7a_a-02_north-west"], locations_by_region["7a_a-02_north-west"]),
 
-    "7a_a-02b_east": PreRegion("7a_a-02b_east", "7a_a-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02b_east"]),
-    "7a_a-02b_west": PreRegion("7a_a-02b_west", "7a_a-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-02b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-02b_west"]),
+    "7a_a-02b_east": PreRegion("7a_a-02b_east", "7a_a-02b", connections_by_region["7a_a-02b_east"], locations_by_region["7a_a-02b_east"]),
+    "7a_a-02b_west": PreRegion("7a_a-02b_west", "7a_a-02b", connections_by_region["7a_a-02b_west"], locations_by_region["7a_a-02b_west"]),
 
-    "7a_a-03_west": PreRegion("7a_a-03_west", "7a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-03_west"]),
-    "7a_a-03_east": PreRegion("7a_a-03_east", "7a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-03_east"]),
+    "7a_a-03_west": PreRegion("7a_a-03_west", "7a_a-03", connections_by_region["7a_a-03_west"], locations_by_region["7a_a-03_west"]),
+    "7a_a-03_east": PreRegion("7a_a-03_east", "7a_a-03", connections_by_region["7a_a-03_east"], locations_by_region["7a_a-03_east"]),
 
-    "7a_a-04_west": PreRegion("7a_a-04_west", "7a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-04_west"]),
-    "7a_a-04_north": PreRegion("7a_a-04_north", "7a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-04_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-04_north"]),
-    "7a_a-04_east": PreRegion("7a_a-04_east", "7a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-04_east"]),
+    "7a_a-04_west": PreRegion("7a_a-04_west", "7a_a-04", connections_by_region["7a_a-04_west"], locations_by_region["7a_a-04_west"]),
+    "7a_a-04_north": PreRegion("7a_a-04_north", "7a_a-04", connections_by_region["7a_a-04_north"], locations_by_region["7a_a-04_north"]),
+    "7a_a-04_east": PreRegion("7a_a-04_east", "7a_a-04", connections_by_region["7a_a-04_east"], locations_by_region["7a_a-04_east"]),
 
-    "7a_a-04b_east": PreRegion("7a_a-04b_east", "7a_a-04b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-04b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-04b_east"]),
+    "7a_a-04b_east": PreRegion("7a_a-04b_east", "7a_a-04b", connections_by_region["7a_a-04b_east"], locations_by_region["7a_a-04b_east"]),
 
-    "7a_a-05_west": PreRegion("7a_a-05_west", "7a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-05_west"]),
-    "7a_a-05_east": PreRegion("7a_a-05_east", "7a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-05_east"]),
+    "7a_a-05_west": PreRegion("7a_a-05_west", "7a_a-05", connections_by_region["7a_a-05_west"], locations_by_region["7a_a-05_west"]),
+    "7a_a-05_east": PreRegion("7a_a-05_east", "7a_a-05", connections_by_region["7a_a-05_east"], locations_by_region["7a_a-05_east"]),
 
-    "7a_a-06_bottom": PreRegion("7a_a-06_bottom", "7a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-06_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-06_bottom"]),
-    "7a_a-06_top": PreRegion("7a_a-06_top", "7a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-06_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-06_top"]),
-    "7a_a-06_top-side": PreRegion("7a_a-06_top-side", "7a_a-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_a-06_top-side"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_a-06_top-side"]),
+    "7a_a-06_bottom": PreRegion("7a_a-06_bottom", "7a_a-06", connections_by_region["7a_a-06_bottom"], locations_by_region["7a_a-06_bottom"]),
+    "7a_a-06_top": PreRegion("7a_a-06_top", "7a_a-06", connections_by_region["7a_a-06_top"], locations_by_region["7a_a-06_top"]),
+    "7a_a-06_top-side": PreRegion("7a_a-06_top-side", "7a_a-06", connections_by_region["7a_a-06_top-side"], locations_by_region["7a_a-06_top-side"]),
 
-    "7a_b-00_bottom": PreRegion("7a_b-00_bottom", "7a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-00_bottom"]),
-    "7a_b-00_top": PreRegion("7a_b-00_top", "7a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-00_top"]),
+    "7a_b-00_bottom": PreRegion("7a_b-00_bottom", "7a_b-00", connections_by_region["7a_b-00_bottom"], locations_by_region["7a_b-00_bottom"]),
+    "7a_b-00_top": PreRegion("7a_b-00_top", "7a_b-00", connections_by_region["7a_b-00_top"], locations_by_region["7a_b-00_top"]),
 
-    "7a_b-01_west": PreRegion("7a_b-01_west", "7a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-01_west"]),
-    "7a_b-01_east": PreRegion("7a_b-01_east", "7a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-01_east"]),
+    "7a_b-01_west": PreRegion("7a_b-01_west", "7a_b-01", connections_by_region["7a_b-01_west"], locations_by_region["7a_b-01_west"]),
+    "7a_b-01_east": PreRegion("7a_b-01_east", "7a_b-01", connections_by_region["7a_b-01_east"], locations_by_region["7a_b-01_east"]),
 
-    "7a_b-02_south": PreRegion("7a_b-02_south", "7a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02_south"]),
-    "7a_b-02_north-west": PreRegion("7a_b-02_north-west", "7a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02_north-west"]),
-    "7a_b-02_north": PreRegion("7a_b-02_north", "7a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02_north"]),
-    "7a_b-02_north-east": PreRegion("7a_b-02_north-east", "7a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02_north-east"]),
+    "7a_b-02_south": PreRegion("7a_b-02_south", "7a_b-02", connections_by_region["7a_b-02_south"], locations_by_region["7a_b-02_south"]),
+    "7a_b-02_north-west": PreRegion("7a_b-02_north-west", "7a_b-02", connections_by_region["7a_b-02_north-west"], locations_by_region["7a_b-02_north-west"]),
+    "7a_b-02_north": PreRegion("7a_b-02_north", "7a_b-02", connections_by_region["7a_b-02_north"], locations_by_region["7a_b-02_north"]),
+    "7a_b-02_north-east": PreRegion("7a_b-02_north-east", "7a_b-02", connections_by_region["7a_b-02_north-east"], locations_by_region["7a_b-02_north-east"]),
 
-    "7a_b-02b_south": PreRegion("7a_b-02b_south", "7a_b-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02b_south"]),
-    "7a_b-02b_north-west": PreRegion("7a_b-02b_north-west", "7a_b-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02b_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02b_north-west"]),
-    "7a_b-02b_north-east": PreRegion("7a_b-02b_north-east", "7a_b-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02b_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02b_north-east"]),
+    "7a_b-02b_south": PreRegion("7a_b-02b_south", "7a_b-02b", connections_by_region["7a_b-02b_south"], locations_by_region["7a_b-02b_south"]),
+    "7a_b-02b_north-west": PreRegion("7a_b-02b_north-west", "7a_b-02b", connections_by_region["7a_b-02b_north-west"], locations_by_region["7a_b-02b_north-west"]),
+    "7a_b-02b_north-east": PreRegion("7a_b-02b_north-east", "7a_b-02b", connections_by_region["7a_b-02b_north-east"], locations_by_region["7a_b-02b_north-east"]),
 
-    "7a_b-02e_east": PreRegion("7a_b-02e_east", "7a_b-02e", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02e_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02e_east"]),
+    "7a_b-02e_east": PreRegion("7a_b-02e_east", "7a_b-02e", connections_by_region["7a_b-02e_east"], locations_by_region["7a_b-02e_east"]),
 
-    "7a_b-02c_west": PreRegion("7a_b-02c_west", "7a_b-02c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02c_west"]),
-    "7a_b-02c_east": PreRegion("7a_b-02c_east", "7a_b-02c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02c_east"]),
-    "7a_b-02c_south-east": PreRegion("7a_b-02c_south-east", "7a_b-02c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02c_south-east"]),
+    "7a_b-02c_west": PreRegion("7a_b-02c_west", "7a_b-02c", connections_by_region["7a_b-02c_west"], locations_by_region["7a_b-02c_west"]),
+    "7a_b-02c_east": PreRegion("7a_b-02c_east", "7a_b-02c", connections_by_region["7a_b-02c_east"], locations_by_region["7a_b-02c_east"]),
+    "7a_b-02c_south-east": PreRegion("7a_b-02c_south-east", "7a_b-02c", connections_by_region["7a_b-02c_south-east"], locations_by_region["7a_b-02c_south-east"]),
 
-    "7a_b-02d_north": PreRegion("7a_b-02d_north", "7a_b-02d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02d_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02d_north"]),
-    "7a_b-02d_south": PreRegion("7a_b-02d_south", "7a_b-02d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-02d_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-02d_south"]),
+    "7a_b-02d_north": PreRegion("7a_b-02d_north", "7a_b-02d", connections_by_region["7a_b-02d_north"], locations_by_region["7a_b-02d_north"]),
+    "7a_b-02d_south": PreRegion("7a_b-02d_south", "7a_b-02d", connections_by_region["7a_b-02d_south"], locations_by_region["7a_b-02d_south"]),
 
-    "7a_b-03_west": PreRegion("7a_b-03_west", "7a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-03_west"]),
-    "7a_b-03_east": PreRegion("7a_b-03_east", "7a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-03_east"]),
-    "7a_b-03_north": PreRegion("7a_b-03_north", "7a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-03_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-03_north"]),
+    "7a_b-03_west": PreRegion("7a_b-03_west", "7a_b-03", connections_by_region["7a_b-03_west"], locations_by_region["7a_b-03_west"]),
+    "7a_b-03_east": PreRegion("7a_b-03_east", "7a_b-03", connections_by_region["7a_b-03_east"], locations_by_region["7a_b-03_east"]),
+    "7a_b-03_north": PreRegion("7a_b-03_north", "7a_b-03", connections_by_region["7a_b-03_north"], locations_by_region["7a_b-03_north"]),
 
-    "7a_b-04_west": PreRegion("7a_b-04_west", "7a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-04_west"]),
+    "7a_b-04_west": PreRegion("7a_b-04_west", "7a_b-04", connections_by_region["7a_b-04_west"], locations_by_region["7a_b-04_west"]),
 
-    "7a_b-05_west": PreRegion("7a_b-05_west", "7a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-05_west"]),
-    "7a_b-05_east": PreRegion("7a_b-05_east", "7a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-05_east"]),
-    "7a_b-05_north-west": PreRegion("7a_b-05_north-west", "7a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-05_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-05_north-west"]),
+    "7a_b-05_west": PreRegion("7a_b-05_west", "7a_b-05", connections_by_region["7a_b-05_west"], locations_by_region["7a_b-05_west"]),
+    "7a_b-05_east": PreRegion("7a_b-05_east", "7a_b-05", connections_by_region["7a_b-05_east"], locations_by_region["7a_b-05_east"]),
+    "7a_b-05_north-west": PreRegion("7a_b-05_north-west", "7a_b-05", connections_by_region["7a_b-05_north-west"], locations_by_region["7a_b-05_north-west"]),
 
-    "7a_b-06_west": PreRegion("7a_b-06_west", "7a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-06_west"]),
-    "7a_b-06_east": PreRegion("7a_b-06_east", "7a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-06_east"]),
+    "7a_b-06_west": PreRegion("7a_b-06_west", "7a_b-06", connections_by_region["7a_b-06_west"], locations_by_region["7a_b-06_west"]),
+    "7a_b-06_east": PreRegion("7a_b-06_east", "7a_b-06", connections_by_region["7a_b-06_east"], locations_by_region["7a_b-06_east"]),
 
-    "7a_b-07_west": PreRegion("7a_b-07_west", "7a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-07_west"]),
-    "7a_b-07_east": PreRegion("7a_b-07_east", "7a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-07_east"]),
+    "7a_b-07_west": PreRegion("7a_b-07_west", "7a_b-07", connections_by_region["7a_b-07_west"], locations_by_region["7a_b-07_west"]),
+    "7a_b-07_east": PreRegion("7a_b-07_east", "7a_b-07", connections_by_region["7a_b-07_east"], locations_by_region["7a_b-07_east"]),
 
-    "7a_b-08_west": PreRegion("7a_b-08_west", "7a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-08_west"]),
-    "7a_b-08_east": PreRegion("7a_b-08_east", "7a_b-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-08_east"]),
+    "7a_b-08_west": PreRegion("7a_b-08_west", "7a_b-08", connections_by_region["7a_b-08_west"], locations_by_region["7a_b-08_west"]),
+    "7a_b-08_east": PreRegion("7a_b-08_east", "7a_b-08", connections_by_region["7a_b-08_east"], locations_by_region["7a_b-08_east"]),
 
-    "7a_b-09_bottom": PreRegion("7a_b-09_bottom", "7a_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-09_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-09_bottom"]),
-    "7a_b-09_top": PreRegion("7a_b-09_top", "7a_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-09_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-09_top"]),
-    "7a_b-09_top-side": PreRegion("7a_b-09_top-side", "7a_b-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_b-09_top-side"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_b-09_top-side"]),
+    "7a_b-09_bottom": PreRegion("7a_b-09_bottom", "7a_b-09", connections_by_region["7a_b-09_bottom"], locations_by_region["7a_b-09_bottom"]),
+    "7a_b-09_top": PreRegion("7a_b-09_top", "7a_b-09", connections_by_region["7a_b-09_top"], locations_by_region["7a_b-09_top"]),
+    "7a_b-09_top-side": PreRegion("7a_b-09_top-side", "7a_b-09", connections_by_region["7a_b-09_top-side"], locations_by_region["7a_b-09_top-side"]),
 
-    "7a_c-00_west": PreRegion("7a_c-00_west", "7a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-00_west"]),
-    "7a_c-00_east": PreRegion("7a_c-00_east", "7a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-00_east"]),
+    "7a_c-00_west": PreRegion("7a_c-00_west", "7a_c-00", connections_by_region["7a_c-00_west"], locations_by_region["7a_c-00_west"]),
+    "7a_c-00_east": PreRegion("7a_c-00_east", "7a_c-00", connections_by_region["7a_c-00_east"], locations_by_region["7a_c-00_east"]),
 
-    "7a_c-01_bottom": PreRegion("7a_c-01_bottom", "7a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-01_bottom"]),
-    "7a_c-01_top": PreRegion("7a_c-01_top", "7a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-01_top"]),
+    "7a_c-01_bottom": PreRegion("7a_c-01_bottom", "7a_c-01", connections_by_region["7a_c-01_bottom"], locations_by_region["7a_c-01_bottom"]),
+    "7a_c-01_top": PreRegion("7a_c-01_top", "7a_c-01", connections_by_region["7a_c-01_top"], locations_by_region["7a_c-01_top"]),
 
-    "7a_c-02_bottom": PreRegion("7a_c-02_bottom", "7a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-02_bottom"]),
-    "7a_c-02_top": PreRegion("7a_c-02_top", "7a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-02_top"]),
+    "7a_c-02_bottom": PreRegion("7a_c-02_bottom", "7a_c-02", connections_by_region["7a_c-02_bottom"], locations_by_region["7a_c-02_bottom"]),
+    "7a_c-02_top": PreRegion("7a_c-02_top", "7a_c-02", connections_by_region["7a_c-02_top"], locations_by_region["7a_c-02_top"]),
 
-    "7a_c-03_south": PreRegion("7a_c-03_south", "7a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-03_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-03_south"]),
-    "7a_c-03_west": PreRegion("7a_c-03_west", "7a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-03_west"]),
-    "7a_c-03_east": PreRegion("7a_c-03_east", "7a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-03_east"]),
+    "7a_c-03_south": PreRegion("7a_c-03_south", "7a_c-03", connections_by_region["7a_c-03_south"], locations_by_region["7a_c-03_south"]),
+    "7a_c-03_west": PreRegion("7a_c-03_west", "7a_c-03", connections_by_region["7a_c-03_west"], locations_by_region["7a_c-03_west"]),
+    "7a_c-03_east": PreRegion("7a_c-03_east", "7a_c-03", connections_by_region["7a_c-03_east"], locations_by_region["7a_c-03_east"]),
 
-    "7a_c-03b_east": PreRegion("7a_c-03b_east", "7a_c-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-03b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-03b_east"]),
+    "7a_c-03b_east": PreRegion("7a_c-03b_east", "7a_c-03b", connections_by_region["7a_c-03b_east"], locations_by_region["7a_c-03b_east"]),
 
-    "7a_c-04_west": PreRegion("7a_c-04_west", "7a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-04_west"]),
-    "7a_c-04_north-west": PreRegion("7a_c-04_north-west", "7a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-04_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-04_north-west"]),
-    "7a_c-04_north-east": PreRegion("7a_c-04_north-east", "7a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-04_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-04_north-east"]),
-    "7a_c-04_east": PreRegion("7a_c-04_east", "7a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-04_east"]),
+    "7a_c-04_west": PreRegion("7a_c-04_west", "7a_c-04", connections_by_region["7a_c-04_west"], locations_by_region["7a_c-04_west"]),
+    "7a_c-04_north-west": PreRegion("7a_c-04_north-west", "7a_c-04", connections_by_region["7a_c-04_north-west"], locations_by_region["7a_c-04_north-west"]),
+    "7a_c-04_north-east": PreRegion("7a_c-04_north-east", "7a_c-04", connections_by_region["7a_c-04_north-east"], locations_by_region["7a_c-04_north-east"]),
+    "7a_c-04_east": PreRegion("7a_c-04_east", "7a_c-04", connections_by_region["7a_c-04_east"], locations_by_region["7a_c-04_east"]),
 
-    "7a_c-05_west": PreRegion("7a_c-05_west", "7a_c-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-05_west"]),
+    "7a_c-05_west": PreRegion("7a_c-05_west", "7a_c-05", connections_by_region["7a_c-05_west"], locations_by_region["7a_c-05_west"]),
 
-    "7a_c-06_south": PreRegion("7a_c-06_south", "7a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06_south"]),
-    "7a_c-06_north": PreRegion("7a_c-06_north", "7a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06_north"]),
-    "7a_c-06_east": PreRegion("7a_c-06_east", "7a_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06_east"]),
+    "7a_c-06_south": PreRegion("7a_c-06_south", "7a_c-06", connections_by_region["7a_c-06_south"], locations_by_region["7a_c-06_south"]),
+    "7a_c-06_north": PreRegion("7a_c-06_north", "7a_c-06", connections_by_region["7a_c-06_north"], locations_by_region["7a_c-06_north"]),
+    "7a_c-06_east": PreRegion("7a_c-06_east", "7a_c-06", connections_by_region["7a_c-06_east"], locations_by_region["7a_c-06_east"]),
 
-    "7a_c-06b_south": PreRegion("7a_c-06b_south", "7a_c-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06b_south"]),
-    "7a_c-06b_north": PreRegion("7a_c-06b_north", "7a_c-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06b_north"]),
-    "7a_c-06b_west": PreRegion("7a_c-06b_west", "7a_c-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06b_west"]),
-    "7a_c-06b_east": PreRegion("7a_c-06b_east", "7a_c-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06b_east"]),
+    "7a_c-06b_south": PreRegion("7a_c-06b_south", "7a_c-06b", connections_by_region["7a_c-06b_south"], locations_by_region["7a_c-06b_south"]),
+    "7a_c-06b_north": PreRegion("7a_c-06b_north", "7a_c-06b", connections_by_region["7a_c-06b_north"], locations_by_region["7a_c-06b_north"]),
+    "7a_c-06b_west": PreRegion("7a_c-06b_west", "7a_c-06b", connections_by_region["7a_c-06b_west"], locations_by_region["7a_c-06b_west"]),
+    "7a_c-06b_east": PreRegion("7a_c-06b_east", "7a_c-06b", connections_by_region["7a_c-06b_east"], locations_by_region["7a_c-06b_east"]),
 
-    "7a_c-06c_west": PreRegion("7a_c-06c_west", "7a_c-06c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-06c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-06c_west"]),
+    "7a_c-06c_west": PreRegion("7a_c-06c_west", "7a_c-06c", connections_by_region["7a_c-06c_west"], locations_by_region["7a_c-06c_west"]),
 
-    "7a_c-07_west": PreRegion("7a_c-07_west", "7a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-07_west"]),
-    "7a_c-07_south-west": PreRegion("7a_c-07_south-west", "7a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-07_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-07_south-west"]),
-    "7a_c-07_south-east": PreRegion("7a_c-07_south-east", "7a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-07_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-07_south-east"]),
-    "7a_c-07_east": PreRegion("7a_c-07_east", "7a_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-07_east"]),
+    "7a_c-07_west": PreRegion("7a_c-07_west", "7a_c-07", connections_by_region["7a_c-07_west"], locations_by_region["7a_c-07_west"]),
+    "7a_c-07_south-west": PreRegion("7a_c-07_south-west", "7a_c-07", connections_by_region["7a_c-07_south-west"], locations_by_region["7a_c-07_south-west"]),
+    "7a_c-07_south-east": PreRegion("7a_c-07_south-east", "7a_c-07", connections_by_region["7a_c-07_south-east"], locations_by_region["7a_c-07_south-east"]),
+    "7a_c-07_east": PreRegion("7a_c-07_east", "7a_c-07", connections_by_region["7a_c-07_east"], locations_by_region["7a_c-07_east"]),
 
-    "7a_c-07b_east": PreRegion("7a_c-07b_east", "7a_c-07b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-07b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-07b_east"]),
+    "7a_c-07b_east": PreRegion("7a_c-07b_east", "7a_c-07b", connections_by_region["7a_c-07b_east"], locations_by_region["7a_c-07b_east"]),
 
-    "7a_c-08_west": PreRegion("7a_c-08_west", "7a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-08_west"]),
-    "7a_c-08_east": PreRegion("7a_c-08_east", "7a_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-08_east"]),
+    "7a_c-08_west": PreRegion("7a_c-08_west", "7a_c-08", connections_by_region["7a_c-08_west"], locations_by_region["7a_c-08_west"]),
+    "7a_c-08_east": PreRegion("7a_c-08_east", "7a_c-08", connections_by_region["7a_c-08_east"], locations_by_region["7a_c-08_east"]),
 
-    "7a_c-09_bottom": PreRegion("7a_c-09_bottom", "7a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-09_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-09_bottom"]),
-    "7a_c-09_top": PreRegion("7a_c-09_top", "7a_c-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_c-09_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_c-09_top"]),
+    "7a_c-09_bottom": PreRegion("7a_c-09_bottom", "7a_c-09", connections_by_region["7a_c-09_bottom"], locations_by_region["7a_c-09_bottom"]),
+    "7a_c-09_top": PreRegion("7a_c-09_top", "7a_c-09", connections_by_region["7a_c-09_top"], locations_by_region["7a_c-09_top"]),
 
-    "7a_d-00_bottom": PreRegion("7a_d-00_bottom", "7a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-00_bottom"]),
-    "7a_d-00_top": PreRegion("7a_d-00_top", "7a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-00_top"]),
+    "7a_d-00_bottom": PreRegion("7a_d-00_bottom", "7a_d-00", connections_by_region["7a_d-00_bottom"], locations_by_region["7a_d-00_bottom"]),
+    "7a_d-00_top": PreRegion("7a_d-00_top", "7a_d-00", connections_by_region["7a_d-00_top"], locations_by_region["7a_d-00_top"]),
 
-    "7a_d-01_west": PreRegion("7a_d-01_west", "7a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01_west"]),
-    "7a_d-01_east": PreRegion("7a_d-01_east", "7a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01_east"]),
+    "7a_d-01_west": PreRegion("7a_d-01_west", "7a_d-01", connections_by_region["7a_d-01_west"], locations_by_region["7a_d-01_west"]),
+    "7a_d-01_east": PreRegion("7a_d-01_east", "7a_d-01", connections_by_region["7a_d-01_east"], locations_by_region["7a_d-01_east"]),
 
-    "7a_d-01b_west": PreRegion("7a_d-01b_west", "7a_d-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01b_west"]),
-    "7a_d-01b_south-west": PreRegion("7a_d-01b_south-west", "7a_d-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01b_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01b_south-west"]),
-    "7a_d-01b_east": PreRegion("7a_d-01b_east", "7a_d-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01b_east"]),
-    "7a_d-01b_south-east": PreRegion("7a_d-01b_south-east", "7a_d-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01b_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01b_south-east"]),
+    "7a_d-01b_west": PreRegion("7a_d-01b_west", "7a_d-01b", connections_by_region["7a_d-01b_west"], locations_by_region["7a_d-01b_west"]),
+    "7a_d-01b_south-west": PreRegion("7a_d-01b_south-west", "7a_d-01b", connections_by_region["7a_d-01b_south-west"], locations_by_region["7a_d-01b_south-west"]),
+    "7a_d-01b_east": PreRegion("7a_d-01b_east", "7a_d-01b", connections_by_region["7a_d-01b_east"], locations_by_region["7a_d-01b_east"]),
+    "7a_d-01b_south-east": PreRegion("7a_d-01b_south-east", "7a_d-01b", connections_by_region["7a_d-01b_south-east"], locations_by_region["7a_d-01b_south-east"]),
 
-    "7a_d-01c_west": PreRegion("7a_d-01c_west", "7a_d-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01c_west"]),
-    "7a_d-01c_south": PreRegion("7a_d-01c_south", "7a_d-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01c_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01c_south"]),
-    "7a_d-01c_east": PreRegion("7a_d-01c_east", "7a_d-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01c_east"]),
-    "7a_d-01c_south-east": PreRegion("7a_d-01c_south-east", "7a_d-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01c_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01c_south-east"]),
+    "7a_d-01c_west": PreRegion("7a_d-01c_west", "7a_d-01c", connections_by_region["7a_d-01c_west"], locations_by_region["7a_d-01c_west"]),
+    "7a_d-01c_south": PreRegion("7a_d-01c_south", "7a_d-01c", connections_by_region["7a_d-01c_south"], locations_by_region["7a_d-01c_south"]),
+    "7a_d-01c_east": PreRegion("7a_d-01c_east", "7a_d-01c", connections_by_region["7a_d-01c_east"], locations_by_region["7a_d-01c_east"]),
+    "7a_d-01c_south-east": PreRegion("7a_d-01c_south-east", "7a_d-01c", connections_by_region["7a_d-01c_south-east"], locations_by_region["7a_d-01c_south-east"]),
 
-    "7a_d-01d_west": PreRegion("7a_d-01d_west", "7a_d-01d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01d_west"]),
-    "7a_d-01d_east": PreRegion("7a_d-01d_east", "7a_d-01d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-01d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-01d_east"]),
+    "7a_d-01d_west": PreRegion("7a_d-01d_west", "7a_d-01d", connections_by_region["7a_d-01d_west"], locations_by_region["7a_d-01d_west"]),
+    "7a_d-01d_east": PreRegion("7a_d-01d_east", "7a_d-01d", connections_by_region["7a_d-01d_east"], locations_by_region["7a_d-01d_east"]),
 
-    "7a_d-02_west": PreRegion("7a_d-02_west", "7a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-02_west"]),
-    "7a_d-02_east": PreRegion("7a_d-02_east", "7a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-02_east"]),
+    "7a_d-02_west": PreRegion("7a_d-02_west", "7a_d-02", connections_by_region["7a_d-02_west"], locations_by_region["7a_d-02_west"]),
+    "7a_d-02_east": PreRegion("7a_d-02_east", "7a_d-02", connections_by_region["7a_d-02_east"], locations_by_region["7a_d-02_east"]),
 
-    "7a_d-03_west": PreRegion("7a_d-03_west", "7a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03_west"]),
-    "7a_d-03_north-west": PreRegion("7a_d-03_north-west", "7a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03_north-west"]),
-    "7a_d-03_east": PreRegion("7a_d-03_east", "7a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03_east"]),
-    "7a_d-03_north-east": PreRegion("7a_d-03_north-east", "7a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03_north-east"]),
+    "7a_d-03_west": PreRegion("7a_d-03_west", "7a_d-03", connections_by_region["7a_d-03_west"], locations_by_region["7a_d-03_west"]),
+    "7a_d-03_north-west": PreRegion("7a_d-03_north-west", "7a_d-03", connections_by_region["7a_d-03_north-west"], locations_by_region["7a_d-03_north-west"]),
+    "7a_d-03_east": PreRegion("7a_d-03_east", "7a_d-03", connections_by_region["7a_d-03_east"], locations_by_region["7a_d-03_east"]),
+    "7a_d-03_north-east": PreRegion("7a_d-03_north-east", "7a_d-03", connections_by_region["7a_d-03_north-east"], locations_by_region["7a_d-03_north-east"]),
 
-    "7a_d-03b_west": PreRegion("7a_d-03b_west", "7a_d-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03b_west"]),
-    "7a_d-03b_east": PreRegion("7a_d-03b_east", "7a_d-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-03b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-03b_east"]),
+    "7a_d-03b_west": PreRegion("7a_d-03b_west", "7a_d-03b", connections_by_region["7a_d-03b_west"], locations_by_region["7a_d-03b_west"]),
+    "7a_d-03b_east": PreRegion("7a_d-03b_east", "7a_d-03b", connections_by_region["7a_d-03b_east"], locations_by_region["7a_d-03b_east"]),
 
-    "7a_d-04_west": PreRegion("7a_d-04_west", "7a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-04_west"]),
-    "7a_d-04_east": PreRegion("7a_d-04_east", "7a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-04_east"]),
+    "7a_d-04_west": PreRegion("7a_d-04_west", "7a_d-04", connections_by_region["7a_d-04_west"], locations_by_region["7a_d-04_west"]),
+    "7a_d-04_east": PreRegion("7a_d-04_east", "7a_d-04", connections_by_region["7a_d-04_east"], locations_by_region["7a_d-04_east"]),
 
-    "7a_d-05_west": PreRegion("7a_d-05_west", "7a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-05_west"]),
-    "7a_d-05_north-east": PreRegion("7a_d-05_north-east", "7a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-05_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-05_north-east"]),
-    "7a_d-05_east": PreRegion("7a_d-05_east", "7a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-05_east"]),
+    "7a_d-05_west": PreRegion("7a_d-05_west", "7a_d-05", connections_by_region["7a_d-05_west"], locations_by_region["7a_d-05_west"]),
+    "7a_d-05_north-east": PreRegion("7a_d-05_north-east", "7a_d-05", connections_by_region["7a_d-05_north-east"], locations_by_region["7a_d-05_north-east"]),
+    "7a_d-05_east": PreRegion("7a_d-05_east", "7a_d-05", connections_by_region["7a_d-05_east"], locations_by_region["7a_d-05_east"]),
 
-    "7a_d-05b_west": PreRegion("7a_d-05b_west", "7a_d-05b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-05b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-05b_west"]),
+    "7a_d-05b_west": PreRegion("7a_d-05b_west", "7a_d-05b", connections_by_region["7a_d-05b_west"], locations_by_region["7a_d-05b_west"]),
 
-    "7a_d-06_west": PreRegion("7a_d-06_west", "7a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-06_west"]),
-    "7a_d-06_south-west": PreRegion("7a_d-06_south-west", "7a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-06_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-06_south-west"]),
-    "7a_d-06_south-east": PreRegion("7a_d-06_south-east", "7a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-06_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-06_south-east"]),
-    "7a_d-06_east": PreRegion("7a_d-06_east", "7a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-06_east"]),
+    "7a_d-06_west": PreRegion("7a_d-06_west", "7a_d-06", connections_by_region["7a_d-06_west"], locations_by_region["7a_d-06_west"]),
+    "7a_d-06_south-west": PreRegion("7a_d-06_south-west", "7a_d-06", connections_by_region["7a_d-06_south-west"], locations_by_region["7a_d-06_south-west"]),
+    "7a_d-06_south-east": PreRegion("7a_d-06_south-east", "7a_d-06", connections_by_region["7a_d-06_south-east"], locations_by_region["7a_d-06_south-east"]),
+    "7a_d-06_east": PreRegion("7a_d-06_east", "7a_d-06", connections_by_region["7a_d-06_east"], locations_by_region["7a_d-06_east"]),
 
-    "7a_d-07_east": PreRegion("7a_d-07_east", "7a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-07_east"]),
+    "7a_d-07_east": PreRegion("7a_d-07_east", "7a_d-07", connections_by_region["7a_d-07_east"], locations_by_region["7a_d-07_east"]),
 
-    "7a_d-08_west": PreRegion("7a_d-08_west", "7a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-08_west"]),
-    "7a_d-08_east": PreRegion("7a_d-08_east", "7a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-08_east"]),
+    "7a_d-08_west": PreRegion("7a_d-08_west", "7a_d-08", connections_by_region["7a_d-08_west"], locations_by_region["7a_d-08_west"]),
+    "7a_d-08_east": PreRegion("7a_d-08_east", "7a_d-08", connections_by_region["7a_d-08_east"], locations_by_region["7a_d-08_east"]),
 
-    "7a_d-09_west": PreRegion("7a_d-09_west", "7a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-09_west"]),
-    "7a_d-09_east": PreRegion("7a_d-09_east", "7a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-09_east"]),
+    "7a_d-09_west": PreRegion("7a_d-09_west", "7a_d-09", connections_by_region["7a_d-09_west"], locations_by_region["7a_d-09_west"]),
+    "7a_d-09_east": PreRegion("7a_d-09_east", "7a_d-09", connections_by_region["7a_d-09_east"], locations_by_region["7a_d-09_east"]),
 
-    "7a_d-10_west": PreRegion("7a_d-10_west", "7a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10_west"]),
-    "7a_d-10_north-west": PreRegion("7a_d-10_north-west", "7a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10_north-west"]),
-    "7a_d-10_north": PreRegion("7a_d-10_north", "7a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10_north"]),
-    "7a_d-10_north-east": PreRegion("7a_d-10_north-east", "7a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10_north-east"]),
-    "7a_d-10_east": PreRegion("7a_d-10_east", "7a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10_east"]),
+    "7a_d-10_west": PreRegion("7a_d-10_west", "7a_d-10", connections_by_region["7a_d-10_west"], locations_by_region["7a_d-10_west"]),
+    "7a_d-10_north-west": PreRegion("7a_d-10_north-west", "7a_d-10", connections_by_region["7a_d-10_north-west"], locations_by_region["7a_d-10_north-west"]),
+    "7a_d-10_north": PreRegion("7a_d-10_north", "7a_d-10", connections_by_region["7a_d-10_north"], locations_by_region["7a_d-10_north"]),
+    "7a_d-10_north-east": PreRegion("7a_d-10_north-east", "7a_d-10", connections_by_region["7a_d-10_north-east"], locations_by_region["7a_d-10_north-east"]),
+    "7a_d-10_east": PreRegion("7a_d-10_east", "7a_d-10", connections_by_region["7a_d-10_east"], locations_by_region["7a_d-10_east"]),
 
-    "7a_d-10b_west": PreRegion("7a_d-10b_west", "7a_d-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10b_west"]),
-    "7a_d-10b_east": PreRegion("7a_d-10b_east", "7a_d-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-10b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-10b_east"]),
+    "7a_d-10b_west": PreRegion("7a_d-10b_west", "7a_d-10b", connections_by_region["7a_d-10b_west"], locations_by_region["7a_d-10b_west"]),
+    "7a_d-10b_east": PreRegion("7a_d-10b_east", "7a_d-10b", connections_by_region["7a_d-10b_east"], locations_by_region["7a_d-10b_east"]),
 
-    "7a_d-11_bottom": PreRegion("7a_d-11_bottom", "7a_d-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-11_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-11_bottom"]),
-    "7a_d-11_top": PreRegion("7a_d-11_top", "7a_d-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_d-11_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_d-11_top"]),
+    "7a_d-11_bottom": PreRegion("7a_d-11_bottom", "7a_d-11", connections_by_region["7a_d-11_bottom"], locations_by_region["7a_d-11_bottom"]),
+    "7a_d-11_top": PreRegion("7a_d-11_top", "7a_d-11", connections_by_region["7a_d-11_top"], locations_by_region["7a_d-11_top"]),
 
-    "7a_e-00b_bottom": PreRegion("7a_e-00b_bottom", "7a_e-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00b_bottom"]),
-    "7a_e-00b_top": PreRegion("7a_e-00b_top", "7a_e-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00b_top"]),
+    "7a_e-00b_bottom": PreRegion("7a_e-00b_bottom", "7a_e-00b", connections_by_region["7a_e-00b_bottom"], locations_by_region["7a_e-00b_bottom"]),
+    "7a_e-00b_top": PreRegion("7a_e-00b_top", "7a_e-00b", connections_by_region["7a_e-00b_top"], locations_by_region["7a_e-00b_top"]),
 
-    "7a_e-00_west": PreRegion("7a_e-00_west", "7a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00_west"]),
-    "7a_e-00_south-west": PreRegion("7a_e-00_south-west", "7a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00_south-west"]),
-    "7a_e-00_north-west": PreRegion("7a_e-00_north-west", "7a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00_north-west"]),
-    "7a_e-00_east": PreRegion("7a_e-00_east", "7a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-00_east"]),
+    "7a_e-00_west": PreRegion("7a_e-00_west", "7a_e-00", connections_by_region["7a_e-00_west"], locations_by_region["7a_e-00_west"]),
+    "7a_e-00_south-west": PreRegion("7a_e-00_south-west", "7a_e-00", connections_by_region["7a_e-00_south-west"], locations_by_region["7a_e-00_south-west"]),
+    "7a_e-00_north-west": PreRegion("7a_e-00_north-west", "7a_e-00", connections_by_region["7a_e-00_north-west"], locations_by_region["7a_e-00_north-west"]),
+    "7a_e-00_east": PreRegion("7a_e-00_east", "7a_e-00", connections_by_region["7a_e-00_east"], locations_by_region["7a_e-00_east"]),
 
-    "7a_e-01_west": PreRegion("7a_e-01_west", "7a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01_west"]),
-    "7a_e-01_north": PreRegion("7a_e-01_north", "7a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01_north"]),
-    "7a_e-01_east": PreRegion("7a_e-01_east", "7a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01_east"]),
+    "7a_e-01_west": PreRegion("7a_e-01_west", "7a_e-01", connections_by_region["7a_e-01_west"], locations_by_region["7a_e-01_west"]),
+    "7a_e-01_north": PreRegion("7a_e-01_north", "7a_e-01", connections_by_region["7a_e-01_north"], locations_by_region["7a_e-01_north"]),
+    "7a_e-01_east": PreRegion("7a_e-01_east", "7a_e-01", connections_by_region["7a_e-01_east"], locations_by_region["7a_e-01_east"]),
 
-    "7a_e-01b_west": PreRegion("7a_e-01b_west", "7a_e-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01b_west"]),
-    "7a_e-01b_east": PreRegion("7a_e-01b_east", "7a_e-01b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01b_east"]),
+    "7a_e-01b_west": PreRegion("7a_e-01b_west", "7a_e-01b", connections_by_region["7a_e-01b_west"], locations_by_region["7a_e-01b_west"]),
+    "7a_e-01b_east": PreRegion("7a_e-01b_east", "7a_e-01b", connections_by_region["7a_e-01b_east"], locations_by_region["7a_e-01b_east"]),
 
-    "7a_e-01c_west": PreRegion("7a_e-01c_west", "7a_e-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01c_west"]),
-    "7a_e-01c_east": PreRegion("7a_e-01c_east", "7a_e-01c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-01c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-01c_east"]),
+    "7a_e-01c_west": PreRegion("7a_e-01c_west", "7a_e-01c", connections_by_region["7a_e-01c_west"], locations_by_region["7a_e-01c_west"]),
+    "7a_e-01c_east": PreRegion("7a_e-01c_east", "7a_e-01c", connections_by_region["7a_e-01c_east"], locations_by_region["7a_e-01c_east"]),
 
-    "7a_e-02_west": PreRegion("7a_e-02_west", "7a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-02_west"]),
-    "7a_e-02_east": PreRegion("7a_e-02_east", "7a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-02_east"]),
+    "7a_e-02_west": PreRegion("7a_e-02_west", "7a_e-02", connections_by_region["7a_e-02_west"], locations_by_region["7a_e-02_west"]),
+    "7a_e-02_east": PreRegion("7a_e-02_east", "7a_e-02", connections_by_region["7a_e-02_east"], locations_by_region["7a_e-02_east"]),
 
-    "7a_e-03_south-west": PreRegion("7a_e-03_south-west", "7a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-03_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-03_south-west"]),
-    "7a_e-03_west": PreRegion("7a_e-03_west", "7a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-03_west"]),
-    "7a_e-03_east": PreRegion("7a_e-03_east", "7a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-03_east"]),
+    "7a_e-03_south-west": PreRegion("7a_e-03_south-west", "7a_e-03", connections_by_region["7a_e-03_south-west"], locations_by_region["7a_e-03_south-west"]),
+    "7a_e-03_west": PreRegion("7a_e-03_west", "7a_e-03", connections_by_region["7a_e-03_west"], locations_by_region["7a_e-03_west"]),
+    "7a_e-03_east": PreRegion("7a_e-03_east", "7a_e-03", connections_by_region["7a_e-03_east"], locations_by_region["7a_e-03_east"]),
 
-    "7a_e-04_west": PreRegion("7a_e-04_west", "7a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-04_west"]),
-    "7a_e-04_east": PreRegion("7a_e-04_east", "7a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-04_east"]),
+    "7a_e-04_west": PreRegion("7a_e-04_west", "7a_e-04", connections_by_region["7a_e-04_west"], locations_by_region["7a_e-04_west"]),
+    "7a_e-04_east": PreRegion("7a_e-04_east", "7a_e-04", connections_by_region["7a_e-04_east"], locations_by_region["7a_e-04_east"]),
 
-    "7a_e-05_west": PreRegion("7a_e-05_west", "7a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-05_west"]),
-    "7a_e-05_east": PreRegion("7a_e-05_east", "7a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-05_east"]),
+    "7a_e-05_west": PreRegion("7a_e-05_west", "7a_e-05", connections_by_region["7a_e-05_west"], locations_by_region["7a_e-05_west"]),
+    "7a_e-05_east": PreRegion("7a_e-05_east", "7a_e-05", connections_by_region["7a_e-05_east"], locations_by_region["7a_e-05_east"]),
 
-    "7a_e-06_west": PreRegion("7a_e-06_west", "7a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-06_west"]),
-    "7a_e-06_east": PreRegion("7a_e-06_east", "7a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-06_east"]),
+    "7a_e-06_west": PreRegion("7a_e-06_west", "7a_e-06", connections_by_region["7a_e-06_west"], locations_by_region["7a_e-06_west"]),
+    "7a_e-06_east": PreRegion("7a_e-06_east", "7a_e-06", connections_by_region["7a_e-06_east"], locations_by_region["7a_e-06_east"]),
 
-    "7a_e-07_bottom": PreRegion("7a_e-07_bottom", "7a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-07_bottom"]),
-    "7a_e-07_top": PreRegion("7a_e-07_top", "7a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-07_top"]),
+    "7a_e-07_bottom": PreRegion("7a_e-07_bottom", "7a_e-07", connections_by_region["7a_e-07_bottom"], locations_by_region["7a_e-07_bottom"]),
+    "7a_e-07_top": PreRegion("7a_e-07_top", "7a_e-07", connections_by_region["7a_e-07_top"], locations_by_region["7a_e-07_top"]),
 
-    "7a_e-08_south": PreRegion("7a_e-08_south", "7a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-08_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-08_south"]),
-    "7a_e-08_west": PreRegion("7a_e-08_west", "7a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-08_west"]),
-    "7a_e-08_east": PreRegion("7a_e-08_east", "7a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-08_east"]),
+    "7a_e-08_south": PreRegion("7a_e-08_south", "7a_e-08", connections_by_region["7a_e-08_south"], locations_by_region["7a_e-08_south"]),
+    "7a_e-08_west": PreRegion("7a_e-08_west", "7a_e-08", connections_by_region["7a_e-08_west"], locations_by_region["7a_e-08_west"]),
+    "7a_e-08_east": PreRegion("7a_e-08_east", "7a_e-08", connections_by_region["7a_e-08_east"], locations_by_region["7a_e-08_east"]),
 
-    "7a_e-09_north": PreRegion("7a_e-09_north", "7a_e-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-09_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-09_north"]),
-    "7a_e-09_east": PreRegion("7a_e-09_east", "7a_e-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-09_east"]),
+    "7a_e-09_north": PreRegion("7a_e-09_north", "7a_e-09", connections_by_region["7a_e-09_north"], locations_by_region["7a_e-09_north"]),
+    "7a_e-09_east": PreRegion("7a_e-09_east", "7a_e-09", connections_by_region["7a_e-09_east"], locations_by_region["7a_e-09_east"]),
 
-    "7a_e-11_south": PreRegion("7a_e-11_south", "7a_e-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-11_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-11_south"]),
-    "7a_e-11_north": PreRegion("7a_e-11_north", "7a_e-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-11_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-11_north"]),
-    "7a_e-11_east": PreRegion("7a_e-11_east", "7a_e-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-11_east"]),
+    "7a_e-11_south": PreRegion("7a_e-11_south", "7a_e-11", connections_by_region["7a_e-11_south"], locations_by_region["7a_e-11_south"]),
+    "7a_e-11_north": PreRegion("7a_e-11_north", "7a_e-11", connections_by_region["7a_e-11_north"], locations_by_region["7a_e-11_north"]),
+    "7a_e-11_east": PreRegion("7a_e-11_east", "7a_e-11", connections_by_region["7a_e-11_east"], locations_by_region["7a_e-11_east"]),
 
-    "7a_e-12_west": PreRegion("7a_e-12_west", "7a_e-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-12_west"]),
+    "7a_e-12_west": PreRegion("7a_e-12_west", "7a_e-12", connections_by_region["7a_e-12_west"], locations_by_region["7a_e-12_west"]),
 
-    "7a_e-10_south": PreRegion("7a_e-10_south", "7a_e-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-10_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-10_south"]),
-    "7a_e-10_north": PreRegion("7a_e-10_north", "7a_e-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-10_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-10_north"]),
-    "7a_e-10_east": PreRegion("7a_e-10_east", "7a_e-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-10_east"]),
+    "7a_e-10_south": PreRegion("7a_e-10_south", "7a_e-10", connections_by_region["7a_e-10_south"], locations_by_region["7a_e-10_south"]),
+    "7a_e-10_north": PreRegion("7a_e-10_north", "7a_e-10", connections_by_region["7a_e-10_north"], locations_by_region["7a_e-10_north"]),
+    "7a_e-10_east": PreRegion("7a_e-10_east", "7a_e-10", connections_by_region["7a_e-10_east"], locations_by_region["7a_e-10_east"]),
 
-    "7a_e-10b_west": PreRegion("7a_e-10b_west", "7a_e-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-10b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-10b_west"]),
-    "7a_e-10b_east": PreRegion("7a_e-10b_east", "7a_e-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-10b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-10b_east"]),
+    "7a_e-10b_west": PreRegion("7a_e-10b_west", "7a_e-10b", connections_by_region["7a_e-10b_west"], locations_by_region["7a_e-10b_west"]),
+    "7a_e-10b_east": PreRegion("7a_e-10b_east", "7a_e-10b", connections_by_region["7a_e-10b_east"], locations_by_region["7a_e-10b_east"]),
 
-    "7a_e-13_bottom": PreRegion("7a_e-13_bottom", "7a_e-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-13_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-13_bottom"]),
-    "7a_e-13_top": PreRegion("7a_e-13_top", "7a_e-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_e-13_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_e-13_top"]),
+    "7a_e-13_bottom": PreRegion("7a_e-13_bottom", "7a_e-13", connections_by_region["7a_e-13_bottom"], locations_by_region["7a_e-13_bottom"]),
+    "7a_e-13_top": PreRegion("7a_e-13_top", "7a_e-13", connections_by_region["7a_e-13_top"], locations_by_region["7a_e-13_top"]),
 
-    "7a_f-00_south": PreRegion("7a_f-00_south", "7a_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-00_south"]),
-    "7a_f-00_west": PreRegion("7a_f-00_west", "7a_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-00_west"]),
-    "7a_f-00_north-west": PreRegion("7a_f-00_north-west", "7a_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-00_north-west"]),
-    "7a_f-00_north-east": PreRegion("7a_f-00_north-east", "7a_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-00_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-00_north-east"]),
-    "7a_f-00_east": PreRegion("7a_f-00_east", "7a_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-00_east"]),
+    "7a_f-00_south": PreRegion("7a_f-00_south", "7a_f-00", connections_by_region["7a_f-00_south"], locations_by_region["7a_f-00_south"]),
+    "7a_f-00_west": PreRegion("7a_f-00_west", "7a_f-00", connections_by_region["7a_f-00_west"], locations_by_region["7a_f-00_west"]),
+    "7a_f-00_north-west": PreRegion("7a_f-00_north-west", "7a_f-00", connections_by_region["7a_f-00_north-west"], locations_by_region["7a_f-00_north-west"]),
+    "7a_f-00_north-east": PreRegion("7a_f-00_north-east", "7a_f-00", connections_by_region["7a_f-00_north-east"], locations_by_region["7a_f-00_north-east"]),
+    "7a_f-00_east": PreRegion("7a_f-00_east", "7a_f-00", connections_by_region["7a_f-00_east"], locations_by_region["7a_f-00_east"]),
 
-    "7a_f-01_south": PreRegion("7a_f-01_south", "7a_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-01_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-01_south"]),
-    "7a_f-01_north": PreRegion("7a_f-01_north", "7a_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-01_north"]),
+    "7a_f-01_south": PreRegion("7a_f-01_south", "7a_f-01", connections_by_region["7a_f-01_south"], locations_by_region["7a_f-01_south"]),
+    "7a_f-01_north": PreRegion("7a_f-01_north", "7a_f-01", connections_by_region["7a_f-01_north"], locations_by_region["7a_f-01_north"]),
 
-    "7a_f-02_west": PreRegion("7a_f-02_west", "7a_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02_west"]),
-    "7a_f-02_north-west": PreRegion("7a_f-02_north-west", "7a_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02_north-west"]),
-    "7a_f-02_north-east": PreRegion("7a_f-02_north-east", "7a_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02_north-east"]),
-    "7a_f-02_east": PreRegion("7a_f-02_east", "7a_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02_east"]),
+    "7a_f-02_west": PreRegion("7a_f-02_west", "7a_f-02", connections_by_region["7a_f-02_west"], locations_by_region["7a_f-02_west"]),
+    "7a_f-02_north-west": PreRegion("7a_f-02_north-west", "7a_f-02", connections_by_region["7a_f-02_north-west"], locations_by_region["7a_f-02_north-west"]),
+    "7a_f-02_north-east": PreRegion("7a_f-02_north-east", "7a_f-02", connections_by_region["7a_f-02_north-east"], locations_by_region["7a_f-02_north-east"]),
+    "7a_f-02_east": PreRegion("7a_f-02_east", "7a_f-02", connections_by_region["7a_f-02_east"], locations_by_region["7a_f-02_east"]),
 
-    "7a_f-02b_west": PreRegion("7a_f-02b_west", "7a_f-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02b_west"]),
-    "7a_f-02b_east": PreRegion("7a_f-02b_east", "7a_f-02b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-02b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-02b_east"]),
+    "7a_f-02b_west": PreRegion("7a_f-02b_west", "7a_f-02b", connections_by_region["7a_f-02b_west"], locations_by_region["7a_f-02b_west"]),
+    "7a_f-02b_east": PreRegion("7a_f-02b_east", "7a_f-02b", connections_by_region["7a_f-02b_east"], locations_by_region["7a_f-02b_east"]),
 
-    "7a_f-04_west": PreRegion("7a_f-04_west", "7a_f-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-04_west"]),
-    "7a_f-04_east": PreRegion("7a_f-04_east", "7a_f-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-04_east"]),
+    "7a_f-04_west": PreRegion("7a_f-04_west", "7a_f-04", connections_by_region["7a_f-04_west"], locations_by_region["7a_f-04_west"]),
+    "7a_f-04_east": PreRegion("7a_f-04_east", "7a_f-04", connections_by_region["7a_f-04_east"], locations_by_region["7a_f-04_east"]),
 
-    "7a_f-03_west": PreRegion("7a_f-03_west", "7a_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-03_west"]),
-    "7a_f-03_east": PreRegion("7a_f-03_east", "7a_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-03_east"]),
+    "7a_f-03_west": PreRegion("7a_f-03_west", "7a_f-03", connections_by_region["7a_f-03_west"], locations_by_region["7a_f-03_west"]),
+    "7a_f-03_east": PreRegion("7a_f-03_east", "7a_f-03", connections_by_region["7a_f-03_east"], locations_by_region["7a_f-03_east"]),
 
-    "7a_f-05_west": PreRegion("7a_f-05_west", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_west"]),
-    "7a_f-05_south-west": PreRegion("7a_f-05_south-west", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_south-west"]),
-    "7a_f-05_north-west": PreRegion("7a_f-05_north-west", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_north-west"]),
-    "7a_f-05_south": PreRegion("7a_f-05_south", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_south"]),
-    "7a_f-05_north": PreRegion("7a_f-05_north", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_north"]),
-    "7a_f-05_north-east": PreRegion("7a_f-05_north-east", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_north-east"]),
-    "7a_f-05_south-east": PreRegion("7a_f-05_south-east", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_south-east"]),
-    "7a_f-05_east": PreRegion("7a_f-05_east", "7a_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-05_east"]),
+    "7a_f-05_west": PreRegion("7a_f-05_west", "7a_f-05", connections_by_region["7a_f-05_west"], locations_by_region["7a_f-05_west"]),
+    "7a_f-05_south-west": PreRegion("7a_f-05_south-west", "7a_f-05", connections_by_region["7a_f-05_south-west"], locations_by_region["7a_f-05_south-west"]),
+    "7a_f-05_north-west": PreRegion("7a_f-05_north-west", "7a_f-05", connections_by_region["7a_f-05_north-west"], locations_by_region["7a_f-05_north-west"]),
+    "7a_f-05_south": PreRegion("7a_f-05_south", "7a_f-05", connections_by_region["7a_f-05_south"], locations_by_region["7a_f-05_south"]),
+    "7a_f-05_north": PreRegion("7a_f-05_north", "7a_f-05", connections_by_region["7a_f-05_north"], locations_by_region["7a_f-05_north"]),
+    "7a_f-05_north-east": PreRegion("7a_f-05_north-east", "7a_f-05", connections_by_region["7a_f-05_north-east"], locations_by_region["7a_f-05_north-east"]),
+    "7a_f-05_south-east": PreRegion("7a_f-05_south-east", "7a_f-05", connections_by_region["7a_f-05_south-east"], locations_by_region["7a_f-05_south-east"]),
+    "7a_f-05_east": PreRegion("7a_f-05_east", "7a_f-05", connections_by_region["7a_f-05_east"], locations_by_region["7a_f-05_east"]),
 
-    "7a_f-06_north-west": PreRegion("7a_f-06_north-west", "7a_f-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-06_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-06_north-west"]),
-    "7a_f-06_north": PreRegion("7a_f-06_north", "7a_f-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-06_north"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-06_north"]),
-    "7a_f-06_north-east": PreRegion("7a_f-06_north-east", "7a_f-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-06_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-06_north-east"]),
+    "7a_f-06_north-west": PreRegion("7a_f-06_north-west", "7a_f-06", connections_by_region["7a_f-06_north-west"], locations_by_region["7a_f-06_north-west"]),
+    "7a_f-06_north": PreRegion("7a_f-06_north", "7a_f-06", connections_by_region["7a_f-06_north"], locations_by_region["7a_f-06_north"]),
+    "7a_f-06_north-east": PreRegion("7a_f-06_north-east", "7a_f-06", connections_by_region["7a_f-06_north-east"], locations_by_region["7a_f-06_north-east"]),
 
-    "7a_f-07_west": PreRegion("7a_f-07_west", "7a_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-07_west"]),
-    "7a_f-07_south-west": PreRegion("7a_f-07_south-west", "7a_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-07_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-07_south-west"]),
-    "7a_f-07_south": PreRegion("7a_f-07_south", "7a_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-07_south"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-07_south"]),
-    "7a_f-07_south-east": PreRegion("7a_f-07_south-east", "7a_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-07_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-07_south-east"]),
+    "7a_f-07_west": PreRegion("7a_f-07_west", "7a_f-07", connections_by_region["7a_f-07_west"], locations_by_region["7a_f-07_west"]),
+    "7a_f-07_south-west": PreRegion("7a_f-07_south-west", "7a_f-07", connections_by_region["7a_f-07_south-west"], locations_by_region["7a_f-07_south-west"]),
+    "7a_f-07_south": PreRegion("7a_f-07_south", "7a_f-07", connections_by_region["7a_f-07_south"], locations_by_region["7a_f-07_south"]),
+    "7a_f-07_south-east": PreRegion("7a_f-07_south-east", "7a_f-07", connections_by_region["7a_f-07_south-east"], locations_by_region["7a_f-07_south-east"]),
 
-    "7a_f-08_west": PreRegion("7a_f-08_west", "7a_f-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08_west"]),
-    "7a_f-08_north-west": PreRegion("7a_f-08_north-west", "7a_f-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08_north-west"]),
-    "7a_f-08_east": PreRegion("7a_f-08_east", "7a_f-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08_east"]),
+    "7a_f-08_west": PreRegion("7a_f-08_west", "7a_f-08", connections_by_region["7a_f-08_west"], locations_by_region["7a_f-08_west"]),
+    "7a_f-08_north-west": PreRegion("7a_f-08_north-west", "7a_f-08", connections_by_region["7a_f-08_north-west"], locations_by_region["7a_f-08_north-west"]),
+    "7a_f-08_east": PreRegion("7a_f-08_east", "7a_f-08", connections_by_region["7a_f-08_east"], locations_by_region["7a_f-08_east"]),
 
-    "7a_f-08b_west": PreRegion("7a_f-08b_west", "7a_f-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08b_west"]),
-    "7a_f-08b_east": PreRegion("7a_f-08b_east", "7a_f-08b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08b_east"]),
+    "7a_f-08b_west": PreRegion("7a_f-08b_west", "7a_f-08b", connections_by_region["7a_f-08b_west"], locations_by_region["7a_f-08b_west"]),
+    "7a_f-08b_east": PreRegion("7a_f-08b_east", "7a_f-08b", connections_by_region["7a_f-08b_east"], locations_by_region["7a_f-08b_east"]),
 
-    "7a_f-08d_west": PreRegion("7a_f-08d_west", "7a_f-08d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08d_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08d_west"]),
-    "7a_f-08d_east": PreRegion("7a_f-08d_east", "7a_f-08d", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08d_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08d_east"]),
+    "7a_f-08d_west": PreRegion("7a_f-08d_west", "7a_f-08d", connections_by_region["7a_f-08d_west"], locations_by_region["7a_f-08d_west"]),
+    "7a_f-08d_east": PreRegion("7a_f-08d_east", "7a_f-08d", connections_by_region["7a_f-08d_east"], locations_by_region["7a_f-08d_east"]),
 
-    "7a_f-08c_west": PreRegion("7a_f-08c_west", "7a_f-08c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08c_west"]),
-    "7a_f-08c_east": PreRegion("7a_f-08c_east", "7a_f-08c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-08c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-08c_east"]),
+    "7a_f-08c_west": PreRegion("7a_f-08c_west", "7a_f-08c", connections_by_region["7a_f-08c_west"], locations_by_region["7a_f-08c_west"]),
+    "7a_f-08c_east": PreRegion("7a_f-08c_east", "7a_f-08c", connections_by_region["7a_f-08c_east"], locations_by_region["7a_f-08c_east"]),
 
-    "7a_f-09_west": PreRegion("7a_f-09_west", "7a_f-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-09_west"]),
-    "7a_f-09_east": PreRegion("7a_f-09_east", "7a_f-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-09_east"]),
+    "7a_f-09_west": PreRegion("7a_f-09_west", "7a_f-09", connections_by_region["7a_f-09_west"], locations_by_region["7a_f-09_west"]),
+    "7a_f-09_east": PreRegion("7a_f-09_east", "7a_f-09", connections_by_region["7a_f-09_east"], locations_by_region["7a_f-09_east"]),
 
-    "7a_f-10_west": PreRegion("7a_f-10_west", "7a_f-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-10_west"]),
-    "7a_f-10_north-east": PreRegion("7a_f-10_north-east", "7a_f-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-10_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-10_north-east"]),
-    "7a_f-10_east": PreRegion("7a_f-10_east", "7a_f-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-10_east"]),
+    "7a_f-10_west": PreRegion("7a_f-10_west", "7a_f-10", connections_by_region["7a_f-10_west"], locations_by_region["7a_f-10_west"]),
+    "7a_f-10_north-east": PreRegion("7a_f-10_north-east", "7a_f-10", connections_by_region["7a_f-10_north-east"], locations_by_region["7a_f-10_north-east"]),
+    "7a_f-10_east": PreRegion("7a_f-10_east", "7a_f-10", connections_by_region["7a_f-10_east"], locations_by_region["7a_f-10_east"]),
 
-    "7a_f-10b_west": PreRegion("7a_f-10b_west", "7a_f-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-10b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-10b_west"]),
-    "7a_f-10b_east": PreRegion("7a_f-10b_east", "7a_f-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-10b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-10b_east"]),
+    "7a_f-10b_west": PreRegion("7a_f-10b_west", "7a_f-10b", connections_by_region["7a_f-10b_west"], locations_by_region["7a_f-10b_west"]),
+    "7a_f-10b_east": PreRegion("7a_f-10b_east", "7a_f-10b", connections_by_region["7a_f-10b_east"], locations_by_region["7a_f-10b_east"]),
 
-    "7a_f-11_bottom": PreRegion("7a_f-11_bottom", "7a_f-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-11_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-11_bottom"]),
-    "7a_f-11_top": PreRegion("7a_f-11_top", "7a_f-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_f-11_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_f-11_top"]),
+    "7a_f-11_bottom": PreRegion("7a_f-11_bottom", "7a_f-11", connections_by_region["7a_f-11_bottom"], locations_by_region["7a_f-11_bottom"]),
+    "7a_f-11_top": PreRegion("7a_f-11_top", "7a_f-11", connections_by_region["7a_f-11_top"], locations_by_region["7a_f-11_top"]),
 
-    "7a_g-00_bottom": PreRegion("7a_g-00_bottom", "7a_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00_bottom"]),
-    "7a_g-00_top": PreRegion("7a_g-00_top", "7a_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00_top"]),
+    "7a_g-00_bottom": PreRegion("7a_g-00_bottom", "7a_g-00", connections_by_region["7a_g-00_bottom"], locations_by_region["7a_g-00_bottom"]),
+    "7a_g-00_top": PreRegion("7a_g-00_top", "7a_g-00", connections_by_region["7a_g-00_top"], locations_by_region["7a_g-00_top"]),
 
-    "7a_g-00b_bottom": PreRegion("7a_g-00b_bottom", "7a_g-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00b_bottom"]),
-    "7a_g-00b_c26": PreRegion("7a_g-00b_c26", "7a_g-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00b_c26"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00b_c26"]),
-    "7a_g-00b_c24": PreRegion("7a_g-00b_c24", "7a_g-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00b_c24"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00b_c24"]),
-    "7a_g-00b_c21": PreRegion("7a_g-00b_c21", "7a_g-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00b_c21"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00b_c21"]),
-    "7a_g-00b_top": PreRegion("7a_g-00b_top", "7a_g-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-00b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-00b_top"]),
+    "7a_g-00b_bottom": PreRegion("7a_g-00b_bottom", "7a_g-00b", connections_by_region["7a_g-00b_bottom"], locations_by_region["7a_g-00b_bottom"]),
+    "7a_g-00b_c26": PreRegion("7a_g-00b_c26", "7a_g-00b", connections_by_region["7a_g-00b_c26"], locations_by_region["7a_g-00b_c26"]),
+    "7a_g-00b_c24": PreRegion("7a_g-00b_c24", "7a_g-00b", connections_by_region["7a_g-00b_c24"], locations_by_region["7a_g-00b_c24"]),
+    "7a_g-00b_c21": PreRegion("7a_g-00b_c21", "7a_g-00b", connections_by_region["7a_g-00b_c21"], locations_by_region["7a_g-00b_c21"]),
+    "7a_g-00b_top": PreRegion("7a_g-00b_top", "7a_g-00b", connections_by_region["7a_g-00b_top"], locations_by_region["7a_g-00b_top"]),
 
-    "7a_g-01_bottom": PreRegion("7a_g-01_bottom", "7a_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-01_bottom"]),
-    "7a_g-01_c18": PreRegion("7a_g-01_c18", "7a_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-01_c18"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-01_c18"]),
-    "7a_g-01_c16": PreRegion("7a_g-01_c16", "7a_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-01_c16"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-01_c16"]),
-    "7a_g-01_top": PreRegion("7a_g-01_top", "7a_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-01_top"]),
+    "7a_g-01_bottom": PreRegion("7a_g-01_bottom", "7a_g-01", connections_by_region["7a_g-01_bottom"], locations_by_region["7a_g-01_bottom"]),
+    "7a_g-01_c18": PreRegion("7a_g-01_c18", "7a_g-01", connections_by_region["7a_g-01_c18"], locations_by_region["7a_g-01_c18"]),
+    "7a_g-01_c16": PreRegion("7a_g-01_c16", "7a_g-01", connections_by_region["7a_g-01_c16"], locations_by_region["7a_g-01_c16"]),
+    "7a_g-01_top": PreRegion("7a_g-01_top", "7a_g-01", connections_by_region["7a_g-01_top"], locations_by_region["7a_g-01_top"]),
 
-    "7a_g-02_bottom": PreRegion("7a_g-02_bottom", "7a_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-02_bottom"]),
-    "7a_g-02_top": PreRegion("7a_g-02_top", "7a_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-02_top"]),
+    "7a_g-02_bottom": PreRegion("7a_g-02_bottom", "7a_g-02", connections_by_region["7a_g-02_bottom"], locations_by_region["7a_g-02_bottom"]),
+    "7a_g-02_top": PreRegion("7a_g-02_top", "7a_g-02", connections_by_region["7a_g-02_top"], locations_by_region["7a_g-02_top"]),
 
-    "7a_g-03_bottom": PreRegion("7a_g-03_bottom", "7a_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-03_bottom"]),
-    "7a_g-03_goal": PreRegion("7a_g-03_goal", "7a_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7a_g-03_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "7a_g-03_goal"]),
+    "7a_g-03_bottom": PreRegion("7a_g-03_bottom", "7a_g-03", connections_by_region["7a_g-03_bottom"], locations_by_region["7a_g-03_bottom"]),
+    "7a_g-03_goal": PreRegion("7a_g-03_goal", "7a_g-03", connections_by_region["7a_g-03_goal"], locations_by_region["7a_g-03_goal"]),
 
-    "7b_a-00_west": PreRegion("7b_a-00_west", "7b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-00_west"]),
-    "7b_a-00_east": PreRegion("7b_a-00_east", "7b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-00_east"]),
+    "7b_a-00_west": PreRegion("7b_a-00_west", "7b_a-00", connections_by_region["7b_a-00_west"], locations_by_region["7b_a-00_west"]),
+    "7b_a-00_east": PreRegion("7b_a-00_east", "7b_a-00", connections_by_region["7b_a-00_east"], locations_by_region["7b_a-00_east"]),
 
-    "7b_a-01_west": PreRegion("7b_a-01_west", "7b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-01_west"]),
-    "7b_a-01_east": PreRegion("7b_a-01_east", "7b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-01_east"]),
+    "7b_a-01_west": PreRegion("7b_a-01_west", "7b_a-01", connections_by_region["7b_a-01_west"], locations_by_region["7b_a-01_west"]),
+    "7b_a-01_east": PreRegion("7b_a-01_east", "7b_a-01", connections_by_region["7b_a-01_east"], locations_by_region["7b_a-01_east"]),
 
-    "7b_a-02_west": PreRegion("7b_a-02_west", "7b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-02_west"]),
-    "7b_a-02_east": PreRegion("7b_a-02_east", "7b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-02_east"]),
+    "7b_a-02_west": PreRegion("7b_a-02_west", "7b_a-02", connections_by_region["7b_a-02_west"], locations_by_region["7b_a-02_west"]),
+    "7b_a-02_east": PreRegion("7b_a-02_east", "7b_a-02", connections_by_region["7b_a-02_east"], locations_by_region["7b_a-02_east"]),
 
-    "7b_a-03_bottom": PreRegion("7b_a-03_bottom", "7b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-03_bottom"]),
-    "7b_a-03_top": PreRegion("7b_a-03_top", "7b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_a-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_a-03_top"]),
+    "7b_a-03_bottom": PreRegion("7b_a-03_bottom", "7b_a-03", connections_by_region["7b_a-03_bottom"], locations_by_region["7b_a-03_bottom"]),
+    "7b_a-03_top": PreRegion("7b_a-03_top", "7b_a-03", connections_by_region["7b_a-03_top"], locations_by_region["7b_a-03_top"]),
 
-    "7b_b-00_bottom": PreRegion("7b_b-00_bottom", "7b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-00_bottom"]),
-    "7b_b-00_top": PreRegion("7b_b-00_top", "7b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-00_top"]),
+    "7b_b-00_bottom": PreRegion("7b_b-00_bottom", "7b_b-00", connections_by_region["7b_b-00_bottom"], locations_by_region["7b_b-00_bottom"]),
+    "7b_b-00_top": PreRegion("7b_b-00_top", "7b_b-00", connections_by_region["7b_b-00_top"], locations_by_region["7b_b-00_top"]),
 
-    "7b_b-01_bottom": PreRegion("7b_b-01_bottom", "7b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-01_bottom"]),
-    "7b_b-01_top": PreRegion("7b_b-01_top", "7b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-01_top"]),
+    "7b_b-01_bottom": PreRegion("7b_b-01_bottom", "7b_b-01", connections_by_region["7b_b-01_bottom"], locations_by_region["7b_b-01_bottom"]),
+    "7b_b-01_top": PreRegion("7b_b-01_top", "7b_b-01", connections_by_region["7b_b-01_top"], locations_by_region["7b_b-01_top"]),
 
-    "7b_b-02_west": PreRegion("7b_b-02_west", "7b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-02_west"]),
-    "7b_b-02_east": PreRegion("7b_b-02_east", "7b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-02_east"]),
+    "7b_b-02_west": PreRegion("7b_b-02_west", "7b_b-02", connections_by_region["7b_b-02_west"], locations_by_region["7b_b-02_west"]),
+    "7b_b-02_east": PreRegion("7b_b-02_east", "7b_b-02", connections_by_region["7b_b-02_east"], locations_by_region["7b_b-02_east"]),
 
-    "7b_b-03_bottom": PreRegion("7b_b-03_bottom", "7b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-03_bottom"]),
-    "7b_b-03_top": PreRegion("7b_b-03_top", "7b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_b-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_b-03_top"]),
+    "7b_b-03_bottom": PreRegion("7b_b-03_bottom", "7b_b-03", connections_by_region["7b_b-03_bottom"], locations_by_region["7b_b-03_bottom"]),
+    "7b_b-03_top": PreRegion("7b_b-03_top", "7b_b-03", connections_by_region["7b_b-03_top"], locations_by_region["7b_b-03_top"]),
 
-    "7b_c-01_west": PreRegion("7b_c-01_west", "7b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-01_west"]),
-    "7b_c-01_east": PreRegion("7b_c-01_east", "7b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-01_east"]),
+    "7b_c-01_west": PreRegion("7b_c-01_west", "7b_c-01", connections_by_region["7b_c-01_west"], locations_by_region["7b_c-01_west"]),
+    "7b_c-01_east": PreRegion("7b_c-01_east", "7b_c-01", connections_by_region["7b_c-01_east"], locations_by_region["7b_c-01_east"]),
 
-    "7b_c-00_west": PreRegion("7b_c-00_west", "7b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-00_west"]),
-    "7b_c-00_east": PreRegion("7b_c-00_east", "7b_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-00_east"]),
+    "7b_c-00_west": PreRegion("7b_c-00_west", "7b_c-00", connections_by_region["7b_c-00_west"], locations_by_region["7b_c-00_west"]),
+    "7b_c-00_east": PreRegion("7b_c-00_east", "7b_c-00", connections_by_region["7b_c-00_east"], locations_by_region["7b_c-00_east"]),
 
-    "7b_c-02_west": PreRegion("7b_c-02_west", "7b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-02_west"]),
-    "7b_c-02_east": PreRegion("7b_c-02_east", "7b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-02_east"]),
+    "7b_c-02_west": PreRegion("7b_c-02_west", "7b_c-02", connections_by_region["7b_c-02_west"], locations_by_region["7b_c-02_west"]),
+    "7b_c-02_east": PreRegion("7b_c-02_east", "7b_c-02", connections_by_region["7b_c-02_east"], locations_by_region["7b_c-02_east"]),
 
-    "7b_c-03_bottom": PreRegion("7b_c-03_bottom", "7b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-03_bottom"]),
-    "7b_c-03_top": PreRegion("7b_c-03_top", "7b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_c-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_c-03_top"]),
+    "7b_c-03_bottom": PreRegion("7b_c-03_bottom", "7b_c-03", connections_by_region["7b_c-03_bottom"], locations_by_region["7b_c-03_bottom"]),
+    "7b_c-03_top": PreRegion("7b_c-03_top", "7b_c-03", connections_by_region["7b_c-03_top"], locations_by_region["7b_c-03_top"]),
 
-    "7b_d-00_west": PreRegion("7b_d-00_west", "7b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-00_west"]),
-    "7b_d-00_east": PreRegion("7b_d-00_east", "7b_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-00_east"]),
+    "7b_d-00_west": PreRegion("7b_d-00_west", "7b_d-00", connections_by_region["7b_d-00_west"], locations_by_region["7b_d-00_west"]),
+    "7b_d-00_east": PreRegion("7b_d-00_east", "7b_d-00", connections_by_region["7b_d-00_east"], locations_by_region["7b_d-00_east"]),
 
-    "7b_d-01_west": PreRegion("7b_d-01_west", "7b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-01_west"]),
-    "7b_d-01_east": PreRegion("7b_d-01_east", "7b_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-01_east"]),
+    "7b_d-01_west": PreRegion("7b_d-01_west", "7b_d-01", connections_by_region["7b_d-01_west"], locations_by_region["7b_d-01_west"]),
+    "7b_d-01_east": PreRegion("7b_d-01_east", "7b_d-01", connections_by_region["7b_d-01_east"], locations_by_region["7b_d-01_east"]),
 
-    "7b_d-02_west": PreRegion("7b_d-02_west", "7b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-02_west"]),
-    "7b_d-02_east": PreRegion("7b_d-02_east", "7b_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-02_east"]),
+    "7b_d-02_west": PreRegion("7b_d-02_west", "7b_d-02", connections_by_region["7b_d-02_west"], locations_by_region["7b_d-02_west"]),
+    "7b_d-02_east": PreRegion("7b_d-02_east", "7b_d-02", connections_by_region["7b_d-02_east"], locations_by_region["7b_d-02_east"]),
 
-    "7b_d-03_bottom": PreRegion("7b_d-03_bottom", "7b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-03_bottom"]),
-    "7b_d-03_top": PreRegion("7b_d-03_top", "7b_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_d-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_d-03_top"]),
+    "7b_d-03_bottom": PreRegion("7b_d-03_bottom", "7b_d-03", connections_by_region["7b_d-03_bottom"], locations_by_region["7b_d-03_bottom"]),
+    "7b_d-03_top": PreRegion("7b_d-03_top", "7b_d-03", connections_by_region["7b_d-03_top"], locations_by_region["7b_d-03_top"]),
 
-    "7b_e-00_west": PreRegion("7b_e-00_west", "7b_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-00_west"]),
-    "7b_e-00_east": PreRegion("7b_e-00_east", "7b_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-00_east"]),
+    "7b_e-00_west": PreRegion("7b_e-00_west", "7b_e-00", connections_by_region["7b_e-00_west"], locations_by_region["7b_e-00_west"]),
+    "7b_e-00_east": PreRegion("7b_e-00_east", "7b_e-00", connections_by_region["7b_e-00_east"], locations_by_region["7b_e-00_east"]),
 
-    "7b_e-01_west": PreRegion("7b_e-01_west", "7b_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-01_west"]),
-    "7b_e-01_east": PreRegion("7b_e-01_east", "7b_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-01_east"]),
+    "7b_e-01_west": PreRegion("7b_e-01_west", "7b_e-01", connections_by_region["7b_e-01_west"], locations_by_region["7b_e-01_west"]),
+    "7b_e-01_east": PreRegion("7b_e-01_east", "7b_e-01", connections_by_region["7b_e-01_east"], locations_by_region["7b_e-01_east"]),
 
-    "7b_e-02_west": PreRegion("7b_e-02_west", "7b_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-02_west"]),
-    "7b_e-02_east": PreRegion("7b_e-02_east", "7b_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-02_east"]),
+    "7b_e-02_west": PreRegion("7b_e-02_west", "7b_e-02", connections_by_region["7b_e-02_west"], locations_by_region["7b_e-02_west"]),
+    "7b_e-02_east": PreRegion("7b_e-02_east", "7b_e-02", connections_by_region["7b_e-02_east"], locations_by_region["7b_e-02_east"]),
 
-    "7b_e-03_bottom": PreRegion("7b_e-03_bottom", "7b_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-03_bottom"]),
-    "7b_e-03_top": PreRegion("7b_e-03_top", "7b_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_e-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_e-03_top"]),
+    "7b_e-03_bottom": PreRegion("7b_e-03_bottom", "7b_e-03", connections_by_region["7b_e-03_bottom"], locations_by_region["7b_e-03_bottom"]),
+    "7b_e-03_top": PreRegion("7b_e-03_top", "7b_e-03", connections_by_region["7b_e-03_top"], locations_by_region["7b_e-03_top"]),
 
-    "7b_f-00_west": PreRegion("7b_f-00_west", "7b_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-00_west"]),
-    "7b_f-00_east": PreRegion("7b_f-00_east", "7b_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-00_east"]),
+    "7b_f-00_west": PreRegion("7b_f-00_west", "7b_f-00", connections_by_region["7b_f-00_west"], locations_by_region["7b_f-00_west"]),
+    "7b_f-00_east": PreRegion("7b_f-00_east", "7b_f-00", connections_by_region["7b_f-00_east"], locations_by_region["7b_f-00_east"]),
 
-    "7b_f-01_west": PreRegion("7b_f-01_west", "7b_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-01_west"]),
-    "7b_f-01_east": PreRegion("7b_f-01_east", "7b_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-01_east"]),
+    "7b_f-01_west": PreRegion("7b_f-01_west", "7b_f-01", connections_by_region["7b_f-01_west"], locations_by_region["7b_f-01_west"]),
+    "7b_f-01_east": PreRegion("7b_f-01_east", "7b_f-01", connections_by_region["7b_f-01_east"], locations_by_region["7b_f-01_east"]),
 
-    "7b_f-02_west": PreRegion("7b_f-02_west", "7b_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-02_west"]),
-    "7b_f-02_east": PreRegion("7b_f-02_east", "7b_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-02_east"]),
+    "7b_f-02_west": PreRegion("7b_f-02_west", "7b_f-02", connections_by_region["7b_f-02_west"], locations_by_region["7b_f-02_west"]),
+    "7b_f-02_east": PreRegion("7b_f-02_east", "7b_f-02", connections_by_region["7b_f-02_east"], locations_by_region["7b_f-02_east"]),
 
-    "7b_f-03_bottom": PreRegion("7b_f-03_bottom", "7b_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-03_bottom"]),
-    "7b_f-03_top": PreRegion("7b_f-03_top", "7b_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_f-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_f-03_top"]),
+    "7b_f-03_bottom": PreRegion("7b_f-03_bottom", "7b_f-03", connections_by_region["7b_f-03_bottom"], locations_by_region["7b_f-03_bottom"]),
+    "7b_f-03_top": PreRegion("7b_f-03_top", "7b_f-03", connections_by_region["7b_f-03_top"], locations_by_region["7b_f-03_top"]),
 
-    "7b_g-00_bottom": PreRegion("7b_g-00_bottom", "7b_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-00_bottom"]),
-    "7b_g-00_top": PreRegion("7b_g-00_top", "7b_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-00_top"]),
+    "7b_g-00_bottom": PreRegion("7b_g-00_bottom", "7b_g-00", connections_by_region["7b_g-00_bottom"], locations_by_region["7b_g-00_bottom"]),
+    "7b_g-00_top": PreRegion("7b_g-00_top", "7b_g-00", connections_by_region["7b_g-00_top"], locations_by_region["7b_g-00_top"]),
 
-    "7b_g-01_bottom": PreRegion("7b_g-01_bottom", "7b_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-01_bottom"]),
-    "7b_g-01_top": PreRegion("7b_g-01_top", "7b_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-01_top"]),
+    "7b_g-01_bottom": PreRegion("7b_g-01_bottom", "7b_g-01", connections_by_region["7b_g-01_bottom"], locations_by_region["7b_g-01_bottom"]),
+    "7b_g-01_top": PreRegion("7b_g-01_top", "7b_g-01", connections_by_region["7b_g-01_top"], locations_by_region["7b_g-01_top"]),
 
-    "7b_g-02_bottom": PreRegion("7b_g-02_bottom", "7b_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-02_bottom"]),
-    "7b_g-02_top": PreRegion("7b_g-02_top", "7b_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-02_top"]),
+    "7b_g-02_bottom": PreRegion("7b_g-02_bottom", "7b_g-02", connections_by_region["7b_g-02_bottom"], locations_by_region["7b_g-02_bottom"]),
+    "7b_g-02_top": PreRegion("7b_g-02_top", "7b_g-02", connections_by_region["7b_g-02_top"], locations_by_region["7b_g-02_top"]),
 
-    "7b_g-03_bottom": PreRegion("7b_g-03_bottom", "7b_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-03_bottom"]),
-    "7b_g-03_goal": PreRegion("7b_g-03_goal", "7b_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7b_g-03_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "7b_g-03_goal"]),
+    "7b_g-03_bottom": PreRegion("7b_g-03_bottom", "7b_g-03", connections_by_region["7b_g-03_bottom"], locations_by_region["7b_g-03_bottom"]),
+    "7b_g-03_goal": PreRegion("7b_g-03_goal", "7b_g-03", connections_by_region["7b_g-03_goal"], locations_by_region["7b_g-03_goal"]),
 
-    "7c_01_west": PreRegion("7c_01_west", "7c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_01_west"]),
-    "7c_01_east": PreRegion("7c_01_east", "7c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_01_east"]),
+    "7c_01_west": PreRegion("7c_01_west", "7c_01", connections_by_region["7c_01_west"], locations_by_region["7c_01_west"]),
+    "7c_01_east": PreRegion("7c_01_east", "7c_01", connections_by_region["7c_01_east"], locations_by_region["7c_01_east"]),
 
-    "7c_02_west": PreRegion("7c_02_west", "7c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_02_west"]),
-    "7c_02_east": PreRegion("7c_02_east", "7c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_02_east"]),
+    "7c_02_west": PreRegion("7c_02_west", "7c_02", connections_by_region["7c_02_west"], locations_by_region["7c_02_west"]),
+    "7c_02_east": PreRegion("7c_02_east", "7c_02", connections_by_region["7c_02_east"], locations_by_region["7c_02_east"]),
 
-    "7c_03_west": PreRegion("7c_03_west", "7c_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_03_west"]),
-    "7c_03_goal": PreRegion("7c_03_goal", "7c_03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "7c_03_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "7c_03_goal"]),
+    "7c_03_west": PreRegion("7c_03_west", "7c_03", connections_by_region["7c_03_west"], locations_by_region["7c_03_west"]),
+    "7c_03_goal": PreRegion("7c_03_goal", "7c_03", connections_by_region["7c_03_goal"], locations_by_region["7c_03_goal"]),
 
-    "8a_outside_east": PreRegion("8a_outside_east", "8a_outside", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "8a_outside_east"], [loc for _, loc in all_locations.items() if loc.region_name == "8a_outside_east"]),
+    "8a_outside_east": PreRegion("8a_outside_east", "8a_outside", connections_by_region["8a_outside_east"], locations_by_region["8a_outside_east"]),
 
-    "8a_bridge_west": PreRegion("8a_bridge_west", "8a_bridge", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "8a_bridge_west"], [loc for _, loc in all_locations.items() if loc.region_name == "8a_bridge_west"]),
-    "8a_bridge_east": PreRegion("8a_bridge_east", "8a_bridge", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "8a_bridge_east"], [loc for _, loc in all_locations.items() if loc.region_name == "8a_bridge_east"]),
+    "8a_bridge_west": PreRegion("8a_bridge_west", "8a_bridge", connections_by_region["8a_bridge_west"], locations_by_region["8a_bridge_west"]),
+    "8a_bridge_east": PreRegion("8a_bridge_east", "8a_bridge", connections_by_region["8a_bridge_east"], locations_by_region["8a_bridge_east"]),
 
-    "8a_secret_west": PreRegion("8a_secret_west", "8a_secret", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "8a_secret_west"], [loc for _, loc in all_locations.items() if loc.region_name == "8a_secret_west"]),
+    "8a_secret_west": PreRegion("8a_secret_west", "8a_secret", connections_by_region["8a_secret_west"], locations_by_region["8a_secret_west"]),
 
-    "9a_00_west": PreRegion("9a_00_west", "9a_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_00_west"]),
-    "9a_00_east": PreRegion("9a_00_east", "9a_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_00_east"]),
+    "9a_00_west": PreRegion("9a_00_west", "9a_00", connections_by_region["9a_00_west"], locations_by_region["9a_00_west"]),
+    "9a_00_east": PreRegion("9a_00_east", "9a_00", connections_by_region["9a_00_east"], locations_by_region["9a_00_east"]),
 
-    "9a_0x_east": PreRegion("9a_0x_east", "9a_0x", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_0x_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_0x_east"]),
+    "9a_0x_east": PreRegion("9a_0x_east", "9a_0x", connections_by_region["9a_0x_east"], locations_by_region["9a_0x_east"]),
 
-    "9a_01_west": PreRegion("9a_01_west", "9a_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_01_west"]),
-    "9a_01_east": PreRegion("9a_01_east", "9a_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_01_east"]),
+    "9a_01_west": PreRegion("9a_01_west", "9a_01", connections_by_region["9a_01_west"], locations_by_region["9a_01_west"]),
+    "9a_01_east": PreRegion("9a_01_east", "9a_01", connections_by_region["9a_01_east"], locations_by_region["9a_01_east"]),
 
-    "9a_02_west": PreRegion("9a_02_west", "9a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_02_west"]),
-    "9a_02_east": PreRegion("9a_02_east", "9a_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_02_east"]),
+    "9a_02_west": PreRegion("9a_02_west", "9a_02", connections_by_region["9a_02_west"], locations_by_region["9a_02_west"]),
+    "9a_02_east": PreRegion("9a_02_east", "9a_02", connections_by_region["9a_02_east"], locations_by_region["9a_02_east"]),
 
-    "9a_a-00_west": PreRegion("9a_a-00_west", "9a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-00_west"]),
-    "9a_a-00_east": PreRegion("9a_a-00_east", "9a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-00_east"]),
+    "9a_a-00_west": PreRegion("9a_a-00_west", "9a_a-00", connections_by_region["9a_a-00_west"], locations_by_region["9a_a-00_west"]),
+    "9a_a-00_east": PreRegion("9a_a-00_east", "9a_a-00", connections_by_region["9a_a-00_east"], locations_by_region["9a_a-00_east"]),
 
-    "9a_a-01_west": PreRegion("9a_a-01_west", "9a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-01_west"]),
-    "9a_a-01_east": PreRegion("9a_a-01_east", "9a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-01_east"]),
+    "9a_a-01_west": PreRegion("9a_a-01_west", "9a_a-01", connections_by_region["9a_a-01_west"], locations_by_region["9a_a-01_west"]),
+    "9a_a-01_east": PreRegion("9a_a-01_east", "9a_a-01", connections_by_region["9a_a-01_east"], locations_by_region["9a_a-01_east"]),
 
-    "9a_a-02_west": PreRegion("9a_a-02_west", "9a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-02_west"]),
-    "9a_a-02_east": PreRegion("9a_a-02_east", "9a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-02_east"]),
+    "9a_a-02_west": PreRegion("9a_a-02_west", "9a_a-02", connections_by_region["9a_a-02_west"], locations_by_region["9a_a-02_west"]),
+    "9a_a-02_east": PreRegion("9a_a-02_east", "9a_a-02", connections_by_region["9a_a-02_east"], locations_by_region["9a_a-02_east"]),
 
-    "9a_a-03_bottom": PreRegion("9a_a-03_bottom", "9a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-03_bottom"]),
-    "9a_a-03_top": PreRegion("9a_a-03_top", "9a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_a-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_a-03_top"]),
+    "9a_a-03_bottom": PreRegion("9a_a-03_bottom", "9a_a-03", connections_by_region["9a_a-03_bottom"], locations_by_region["9a_a-03_bottom"]),
+    "9a_a-03_top": PreRegion("9a_a-03_top", "9a_a-03", connections_by_region["9a_a-03_top"], locations_by_region["9a_a-03_top"]),
 
-    "9a_b-00_west": PreRegion("9a_b-00_west", "9a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-00_west"]),
-    "9a_b-00_south": PreRegion("9a_b-00_south", "9a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-00_south"]),
-    "9a_b-00_north": PreRegion("9a_b-00_north", "9a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-00_north"]),
-    "9a_b-00_east": PreRegion("9a_b-00_east", "9a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-00_east"]),
+    "9a_b-00_west": PreRegion("9a_b-00_west", "9a_b-00", connections_by_region["9a_b-00_west"], locations_by_region["9a_b-00_west"]),
+    "9a_b-00_south": PreRegion("9a_b-00_south", "9a_b-00", connections_by_region["9a_b-00_south"], locations_by_region["9a_b-00_south"]),
+    "9a_b-00_north": PreRegion("9a_b-00_north", "9a_b-00", connections_by_region["9a_b-00_north"], locations_by_region["9a_b-00_north"]),
+    "9a_b-00_east": PreRegion("9a_b-00_east", "9a_b-00", connections_by_region["9a_b-00_east"], locations_by_region["9a_b-00_east"]),
 
-    "9a_b-01_west": PreRegion("9a_b-01_west", "9a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-01_west"]),
-    "9a_b-01_east": PreRegion("9a_b-01_east", "9a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-01_east"]),
+    "9a_b-01_west": PreRegion("9a_b-01_west", "9a_b-01", connections_by_region["9a_b-01_west"], locations_by_region["9a_b-01_west"]),
+    "9a_b-01_east": PreRegion("9a_b-01_east", "9a_b-01", connections_by_region["9a_b-01_east"], locations_by_region["9a_b-01_east"]),
 
-    "9a_b-02_west": PreRegion("9a_b-02_west", "9a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-02_west"]),
-    "9a_b-02_east": PreRegion("9a_b-02_east", "9a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-02_east"]),
+    "9a_b-02_west": PreRegion("9a_b-02_west", "9a_b-02", connections_by_region["9a_b-02_west"], locations_by_region["9a_b-02_west"]),
+    "9a_b-02_east": PreRegion("9a_b-02_east", "9a_b-02", connections_by_region["9a_b-02_east"], locations_by_region["9a_b-02_east"]),
 
-    "9a_b-03_west": PreRegion("9a_b-03_west", "9a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-03_west"]),
-    "9a_b-03_east": PreRegion("9a_b-03_east", "9a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-03_east"]),
+    "9a_b-03_west": PreRegion("9a_b-03_west", "9a_b-03", connections_by_region["9a_b-03_west"], locations_by_region["9a_b-03_west"]),
+    "9a_b-03_east": PreRegion("9a_b-03_east", "9a_b-03", connections_by_region["9a_b-03_east"], locations_by_region["9a_b-03_east"]),
 
-    "9a_b-04_north-west": PreRegion("9a_b-04_north-west", "9a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-04_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-04_north-west"]),
-    "9a_b-04_west": PreRegion("9a_b-04_west", "9a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-04_west"]),
-    "9a_b-04_east": PreRegion("9a_b-04_east", "9a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-04_east"]),
+    "9a_b-04_north-west": PreRegion("9a_b-04_north-west", "9a_b-04", connections_by_region["9a_b-04_north-west"], locations_by_region["9a_b-04_north-west"]),
+    "9a_b-04_west": PreRegion("9a_b-04_west", "9a_b-04", connections_by_region["9a_b-04_west"], locations_by_region["9a_b-04_west"]),
+    "9a_b-04_east": PreRegion("9a_b-04_east", "9a_b-04", connections_by_region["9a_b-04_east"], locations_by_region["9a_b-04_east"]),
 
-    "9a_b-05_west": PreRegion("9a_b-05_west", "9a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-05_west"]),
-    "9a_b-05_east": PreRegion("9a_b-05_east", "9a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-05_east"]),
+    "9a_b-05_west": PreRegion("9a_b-05_west", "9a_b-05", connections_by_region["9a_b-05_west"], locations_by_region["9a_b-05_west"]),
+    "9a_b-05_east": PreRegion("9a_b-05_east", "9a_b-05", connections_by_region["9a_b-05_east"], locations_by_region["9a_b-05_east"]),
 
-    "9a_b-06_east": PreRegion("9a_b-06_east", "9a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-06_east"]),
+    "9a_b-06_east": PreRegion("9a_b-06_east", "9a_b-06", connections_by_region["9a_b-06_east"], locations_by_region["9a_b-06_east"]),
 
-    "9a_b-07b_bottom": PreRegion("9a_b-07b_bottom", "9a_b-07b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-07b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-07b_bottom"]),
-    "9a_b-07b_top": PreRegion("9a_b-07b_top", "9a_b-07b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-07b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-07b_top"]),
+    "9a_b-07b_bottom": PreRegion("9a_b-07b_bottom", "9a_b-07b", connections_by_region["9a_b-07b_bottom"], locations_by_region["9a_b-07b_bottom"]),
+    "9a_b-07b_top": PreRegion("9a_b-07b_top", "9a_b-07b", connections_by_region["9a_b-07b_top"], locations_by_region["9a_b-07b_top"]),
 
-    "9a_b-07_bottom": PreRegion("9a_b-07_bottom", "9a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-07_bottom"]),
-    "9a_b-07_top": PreRegion("9a_b-07_top", "9a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_b-07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_b-07_top"]),
+    "9a_b-07_bottom": PreRegion("9a_b-07_bottom", "9a_b-07", connections_by_region["9a_b-07_bottom"], locations_by_region["9a_b-07_bottom"]),
+    "9a_b-07_top": PreRegion("9a_b-07_top", "9a_b-07", connections_by_region["9a_b-07_top"], locations_by_region["9a_b-07_top"]),
 
-    "9a_c-00_west": PreRegion("9a_c-00_west", "9a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-00_west"]),
-    "9a_c-00_north-east": PreRegion("9a_c-00_north-east", "9a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-00_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-00_north-east"]),
-    "9a_c-00_east": PreRegion("9a_c-00_east", "9a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-00_east"]),
+    "9a_c-00_west": PreRegion("9a_c-00_west", "9a_c-00", connections_by_region["9a_c-00_west"], locations_by_region["9a_c-00_west"]),
+    "9a_c-00_north-east": PreRegion("9a_c-00_north-east", "9a_c-00", connections_by_region["9a_c-00_north-east"], locations_by_region["9a_c-00_north-east"]),
+    "9a_c-00_east": PreRegion("9a_c-00_east", "9a_c-00", connections_by_region["9a_c-00_east"], locations_by_region["9a_c-00_east"]),
 
-    "9a_c-00b_west": PreRegion("9a_c-00b_west", "9a_c-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-00b_west"]),
+    "9a_c-00b_west": PreRegion("9a_c-00b_west", "9a_c-00b", connections_by_region["9a_c-00b_west"], locations_by_region["9a_c-00b_west"]),
 
-    "9a_c-01_west": PreRegion("9a_c-01_west", "9a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-01_west"]),
-    "9a_c-01_east": PreRegion("9a_c-01_east", "9a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-01_east"]),
+    "9a_c-01_west": PreRegion("9a_c-01_west", "9a_c-01", connections_by_region["9a_c-01_west"], locations_by_region["9a_c-01_west"]),
+    "9a_c-01_east": PreRegion("9a_c-01_east", "9a_c-01", connections_by_region["9a_c-01_east"], locations_by_region["9a_c-01_east"]),
 
-    "9a_c-02_west": PreRegion("9a_c-02_west", "9a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-02_west"]),
-    "9a_c-02_east": PreRegion("9a_c-02_east", "9a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-02_east"]),
+    "9a_c-02_west": PreRegion("9a_c-02_west", "9a_c-02", connections_by_region["9a_c-02_west"], locations_by_region["9a_c-02_west"]),
+    "9a_c-02_east": PreRegion("9a_c-02_east", "9a_c-02", connections_by_region["9a_c-02_east"], locations_by_region["9a_c-02_east"]),
 
-    "9a_c-03_west": PreRegion("9a_c-03_west", "9a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03_west"]),
-    "9a_c-03_north-west": PreRegion("9a_c-03_north-west", "9a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03_north-west"]),
-    "9a_c-03_north": PreRegion("9a_c-03_north", "9a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03_north"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03_north"]),
-    "9a_c-03_north-east": PreRegion("9a_c-03_north-east", "9a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03_north-east"]),
-    "9a_c-03_east": PreRegion("9a_c-03_east", "9a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03_east"]),
+    "9a_c-03_west": PreRegion("9a_c-03_west", "9a_c-03", connections_by_region["9a_c-03_west"], locations_by_region["9a_c-03_west"]),
+    "9a_c-03_north-west": PreRegion("9a_c-03_north-west", "9a_c-03", connections_by_region["9a_c-03_north-west"], locations_by_region["9a_c-03_north-west"]),
+    "9a_c-03_north": PreRegion("9a_c-03_north", "9a_c-03", connections_by_region["9a_c-03_north"], locations_by_region["9a_c-03_north"]),
+    "9a_c-03_north-east": PreRegion("9a_c-03_north-east", "9a_c-03", connections_by_region["9a_c-03_north-east"], locations_by_region["9a_c-03_north-east"]),
+    "9a_c-03_east": PreRegion("9a_c-03_east", "9a_c-03", connections_by_region["9a_c-03_east"], locations_by_region["9a_c-03_east"]),
 
-    "9a_c-03b_west": PreRegion("9a_c-03b_west", "9a_c-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03b_west"]),
-    "9a_c-03b_south": PreRegion("9a_c-03b_south", "9a_c-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03b_south"]),
-    "9a_c-03b_east": PreRegion("9a_c-03b_east", "9a_c-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-03b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-03b_east"]),
+    "9a_c-03b_west": PreRegion("9a_c-03b_west", "9a_c-03b", connections_by_region["9a_c-03b_west"], locations_by_region["9a_c-03b_west"]),
+    "9a_c-03b_south": PreRegion("9a_c-03b_south", "9a_c-03b", connections_by_region["9a_c-03b_south"], locations_by_region["9a_c-03b_south"]),
+    "9a_c-03b_east": PreRegion("9a_c-03b_east", "9a_c-03b", connections_by_region["9a_c-03b_east"], locations_by_region["9a_c-03b_east"]),
 
-    "9a_c-04_west": PreRegion("9a_c-04_west", "9a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-04_west"]),
-    "9a_c-04_east": PreRegion("9a_c-04_east", "9a_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_c-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_c-04_east"]),
+    "9a_c-04_west": PreRegion("9a_c-04_west", "9a_c-04", connections_by_region["9a_c-04_west"], locations_by_region["9a_c-04_west"]),
+    "9a_c-04_east": PreRegion("9a_c-04_east", "9a_c-04", connections_by_region["9a_c-04_east"], locations_by_region["9a_c-04_east"]),
 
-    "9a_d-00_bottom": PreRegion("9a_d-00_bottom", "9a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-00_bottom"]),
-    "9a_d-00_top": PreRegion("9a_d-00_top", "9a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-00_top"]),
+    "9a_d-00_bottom": PreRegion("9a_d-00_bottom", "9a_d-00", connections_by_region["9a_d-00_bottom"], locations_by_region["9a_d-00_bottom"]),
+    "9a_d-00_top": PreRegion("9a_d-00_top", "9a_d-00", connections_by_region["9a_d-00_top"], locations_by_region["9a_d-00_top"]),
 
-    "9a_d-01_bottom": PreRegion("9a_d-01_bottom", "9a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-01_bottom"]),
-    "9a_d-01_top": PreRegion("9a_d-01_top", "9a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-01_top"]),
+    "9a_d-01_bottom": PreRegion("9a_d-01_bottom", "9a_d-01", connections_by_region["9a_d-01_bottom"], locations_by_region["9a_d-01_bottom"]),
+    "9a_d-01_top": PreRegion("9a_d-01_top", "9a_d-01", connections_by_region["9a_d-01_top"], locations_by_region["9a_d-01_top"]),
 
-    "9a_d-02_bottom": PreRegion("9a_d-02_bottom", "9a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-02_bottom"]),
-    "9a_d-02_top": PreRegion("9a_d-02_top", "9a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-02_top"]),
+    "9a_d-02_bottom": PreRegion("9a_d-02_bottom", "9a_d-02", connections_by_region["9a_d-02_bottom"], locations_by_region["9a_d-02_bottom"]),
+    "9a_d-02_top": PreRegion("9a_d-02_top", "9a_d-02", connections_by_region["9a_d-02_top"], locations_by_region["9a_d-02_top"]),
 
-    "9a_d-03_bottom": PreRegion("9a_d-03_bottom", "9a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-03_bottom"]),
-    "9a_d-03_top": PreRegion("9a_d-03_top", "9a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-03_top"]),
+    "9a_d-03_bottom": PreRegion("9a_d-03_bottom", "9a_d-03", connections_by_region["9a_d-03_bottom"], locations_by_region["9a_d-03_bottom"]),
+    "9a_d-03_top": PreRegion("9a_d-03_top", "9a_d-03", connections_by_region["9a_d-03_top"], locations_by_region["9a_d-03_top"]),
 
-    "9a_d-04_bottom": PreRegion("9a_d-04_bottom", "9a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-04_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-04_bottom"]),
-    "9a_d-04_top": PreRegion("9a_d-04_top", "9a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-04_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-04_top"]),
+    "9a_d-04_bottom": PreRegion("9a_d-04_bottom", "9a_d-04", connections_by_region["9a_d-04_bottom"], locations_by_region["9a_d-04_bottom"]),
+    "9a_d-04_top": PreRegion("9a_d-04_top", "9a_d-04", connections_by_region["9a_d-04_top"], locations_by_region["9a_d-04_top"]),
 
-    "9a_d-05_bottom": PreRegion("9a_d-05_bottom", "9a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-05_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-05_bottom"]),
-    "9a_d-05_top": PreRegion("9a_d-05_top", "9a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-05_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-05_top"]),
+    "9a_d-05_bottom": PreRegion("9a_d-05_bottom", "9a_d-05", connections_by_region["9a_d-05_bottom"], locations_by_region["9a_d-05_bottom"]),
+    "9a_d-05_top": PreRegion("9a_d-05_top", "9a_d-05", connections_by_region["9a_d-05_top"], locations_by_region["9a_d-05_top"]),
 
-    "9a_d-06_bottom": PreRegion("9a_d-06_bottom", "9a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-06_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-06_bottom"]),
-    "9a_d-06_top": PreRegion("9a_d-06_top", "9a_d-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-06_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-06_top"]),
+    "9a_d-06_bottom": PreRegion("9a_d-06_bottom", "9a_d-06", connections_by_region["9a_d-06_bottom"], locations_by_region["9a_d-06_bottom"]),
+    "9a_d-06_top": PreRegion("9a_d-06_top", "9a_d-06", connections_by_region["9a_d-06_top"], locations_by_region["9a_d-06_top"]),
 
-    "9a_d-07_bottom": PreRegion("9a_d-07_bottom", "9a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-07_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-07_bottom"]),
-    "9a_d-07_top": PreRegion("9a_d-07_top", "9a_d-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-07_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-07_top"]),
+    "9a_d-07_bottom": PreRegion("9a_d-07_bottom", "9a_d-07", connections_by_region["9a_d-07_bottom"], locations_by_region["9a_d-07_bottom"]),
+    "9a_d-07_top": PreRegion("9a_d-07_top", "9a_d-07", connections_by_region["9a_d-07_top"], locations_by_region["9a_d-07_top"]),
 
-    "9a_d-08_west": PreRegion("9a_d-08_west", "9a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-08_west"]),
-    "9a_d-08_east": PreRegion("9a_d-08_east", "9a_d-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-08_east"]),
+    "9a_d-08_west": PreRegion("9a_d-08_west", "9a_d-08", connections_by_region["9a_d-08_west"], locations_by_region["9a_d-08_west"]),
+    "9a_d-08_east": PreRegion("9a_d-08_east", "9a_d-08", connections_by_region["9a_d-08_east"], locations_by_region["9a_d-08_east"]),
 
-    "9a_d-09_west": PreRegion("9a_d-09_west", "9a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-09_west"]),
-    "9a_d-09_east": PreRegion("9a_d-09_east", "9a_d-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-09_east"]),
+    "9a_d-09_west": PreRegion("9a_d-09_west", "9a_d-09", connections_by_region["9a_d-09_west"], locations_by_region["9a_d-09_west"]),
+    "9a_d-09_east": PreRegion("9a_d-09_east", "9a_d-09", connections_by_region["9a_d-09_east"], locations_by_region["9a_d-09_east"]),
 
-    "9a_d-10_west": PreRegion("9a_d-10_west", "9a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10_west"]),
-    "9a_d-10_east": PreRegion("9a_d-10_east", "9a_d-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10_east"]),
+    "9a_d-10_west": PreRegion("9a_d-10_west", "9a_d-10", connections_by_region["9a_d-10_west"], locations_by_region["9a_d-10_west"]),
+    "9a_d-10_east": PreRegion("9a_d-10_east", "9a_d-10", connections_by_region["9a_d-10_east"], locations_by_region["9a_d-10_east"]),
 
-    "9a_d-10b_west": PreRegion("9a_d-10b_west", "9a_d-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10b_west"]),
-    "9a_d-10b_east": PreRegion("9a_d-10b_east", "9a_d-10b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10b_east"]),
+    "9a_d-10b_west": PreRegion("9a_d-10b_west", "9a_d-10b", connections_by_region["9a_d-10b_west"], locations_by_region["9a_d-10b_west"]),
+    "9a_d-10b_east": PreRegion("9a_d-10b_east", "9a_d-10b", connections_by_region["9a_d-10b_east"], locations_by_region["9a_d-10b_east"]),
 
-    "9a_d-10c_west": PreRegion("9a_d-10c_west", "9a_d-10c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10c_west"]),
-    "9a_d-10c_east": PreRegion("9a_d-10c_east", "9a_d-10c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-10c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-10c_east"]),
+    "9a_d-10c_west": PreRegion("9a_d-10c_west", "9a_d-10c", connections_by_region["9a_d-10c_west"], locations_by_region["9a_d-10c_west"]),
+    "9a_d-10c_east": PreRegion("9a_d-10c_east", "9a_d-10c", connections_by_region["9a_d-10c_east"], locations_by_region["9a_d-10c_east"]),
 
-    "9a_d-11_west": PreRegion("9a_d-11_west", "9a_d-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-11_west"]),
-    "9a_d-11_center": PreRegion("9a_d-11_center", "9a_d-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-11_center"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-11_center"]),
-    "9a_d-11_east": PreRegion("9a_d-11_east", "9a_d-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_d-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_d-11_east"]),
+    "9a_d-11_west": PreRegion("9a_d-11_west", "9a_d-11", connections_by_region["9a_d-11_west"], locations_by_region["9a_d-11_west"]),
+    "9a_d-11_center": PreRegion("9a_d-11_center", "9a_d-11", connections_by_region["9a_d-11_center"], locations_by_region["9a_d-11_center"]),
+    "9a_d-11_east": PreRegion("9a_d-11_east", "9a_d-11", connections_by_region["9a_d-11_east"], locations_by_region["9a_d-11_east"]),
 
-    "9a_space_west": PreRegion("9a_space_west", "9a_space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_space_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_space_west"]),
-    "9a_space_goal": PreRegion("9a_space_goal", "9a_space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9a_space_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "9a_space_goal"]),
+    "9a_space_west": PreRegion("9a_space_west", "9a_space", connections_by_region["9a_space_west"], locations_by_region["9a_space_west"]),
+    "9a_space_goal": PreRegion("9a_space_goal", "9a_space", connections_by_region["9a_space_goal"], locations_by_region["9a_space_goal"]),
 
-    "9b_00_east": PreRegion("9b_00_east", "9b_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_00_east"]),
+    "9b_00_east": PreRegion("9b_00_east", "9b_00", connections_by_region["9b_00_east"], locations_by_region["9b_00_east"]),
 
-    "9b_01_west": PreRegion("9b_01_west", "9b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_01_west"]),
-    "9b_01_east": PreRegion("9b_01_east", "9b_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_01_east"]),
+    "9b_01_west": PreRegion("9b_01_west", "9b_01", connections_by_region["9b_01_west"], locations_by_region["9b_01_west"]),
+    "9b_01_east": PreRegion("9b_01_east", "9b_01", connections_by_region["9b_01_east"], locations_by_region["9b_01_east"]),
 
-    "9b_a-00_west": PreRegion("9b_a-00_west", "9b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-00_west"]),
-    "9b_a-00_east": PreRegion("9b_a-00_east", "9b_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-00_east"]),
+    "9b_a-00_west": PreRegion("9b_a-00_west", "9b_a-00", connections_by_region["9b_a-00_west"], locations_by_region["9b_a-00_west"]),
+    "9b_a-00_east": PreRegion("9b_a-00_east", "9b_a-00", connections_by_region["9b_a-00_east"], locations_by_region["9b_a-00_east"]),
 
-    "9b_a-01_west": PreRegion("9b_a-01_west", "9b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-01_west"]),
-    "9b_a-01_east": PreRegion("9b_a-01_east", "9b_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-01_east"]),
+    "9b_a-01_west": PreRegion("9b_a-01_west", "9b_a-01", connections_by_region["9b_a-01_west"], locations_by_region["9b_a-01_west"]),
+    "9b_a-01_east": PreRegion("9b_a-01_east", "9b_a-01", connections_by_region["9b_a-01_east"], locations_by_region["9b_a-01_east"]),
 
-    "9b_a-02_west": PreRegion("9b_a-02_west", "9b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-02_west"]),
-    "9b_a-02_east": PreRegion("9b_a-02_east", "9b_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-02_east"]),
+    "9b_a-02_west": PreRegion("9b_a-02_west", "9b_a-02", connections_by_region["9b_a-02_west"], locations_by_region["9b_a-02_west"]),
+    "9b_a-02_east": PreRegion("9b_a-02_east", "9b_a-02", connections_by_region["9b_a-02_east"], locations_by_region["9b_a-02_east"]),
 
-    "9b_a-03_west": PreRegion("9b_a-03_west", "9b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-03_west"]),
-    "9b_a-03_east": PreRegion("9b_a-03_east", "9b_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-03_east"]),
+    "9b_a-03_west": PreRegion("9b_a-03_west", "9b_a-03", connections_by_region["9b_a-03_west"], locations_by_region["9b_a-03_west"]),
+    "9b_a-03_east": PreRegion("9b_a-03_east", "9b_a-03", connections_by_region["9b_a-03_east"], locations_by_region["9b_a-03_east"]),
 
-    "9b_a-04_west": PreRegion("9b_a-04_west", "9b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-04_west"]),
-    "9b_a-04_east": PreRegion("9b_a-04_east", "9b_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-04_east"]),
+    "9b_a-04_west": PreRegion("9b_a-04_west", "9b_a-04", connections_by_region["9b_a-04_west"], locations_by_region["9b_a-04_west"]),
+    "9b_a-04_east": PreRegion("9b_a-04_east", "9b_a-04", connections_by_region["9b_a-04_east"], locations_by_region["9b_a-04_east"]),
 
-    "9b_a-05_west": PreRegion("9b_a-05_west", "9b_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-05_west"]),
-    "9b_a-05_east": PreRegion("9b_a-05_east", "9b_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_a-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_a-05_east"]),
+    "9b_a-05_west": PreRegion("9b_a-05_west", "9b_a-05", connections_by_region["9b_a-05_west"], locations_by_region["9b_a-05_west"]),
+    "9b_a-05_east": PreRegion("9b_a-05_east", "9b_a-05", connections_by_region["9b_a-05_east"], locations_by_region["9b_a-05_east"]),
 
-    "9b_b-00_west": PreRegion("9b_b-00_west", "9b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-00_west"]),
-    "9b_b-00_east": PreRegion("9b_b-00_east", "9b_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-00_east"]),
+    "9b_b-00_west": PreRegion("9b_b-00_west", "9b_b-00", connections_by_region["9b_b-00_west"], locations_by_region["9b_b-00_west"]),
+    "9b_b-00_east": PreRegion("9b_b-00_east", "9b_b-00", connections_by_region["9b_b-00_east"], locations_by_region["9b_b-00_east"]),
 
-    "9b_b-01_west": PreRegion("9b_b-01_west", "9b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-01_west"]),
-    "9b_b-01_east": PreRegion("9b_b-01_east", "9b_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-01_east"]),
+    "9b_b-01_west": PreRegion("9b_b-01_west", "9b_b-01", connections_by_region["9b_b-01_west"], locations_by_region["9b_b-01_west"]),
+    "9b_b-01_east": PreRegion("9b_b-01_east", "9b_b-01", connections_by_region["9b_b-01_east"], locations_by_region["9b_b-01_east"]),
 
-    "9b_b-02_west": PreRegion("9b_b-02_west", "9b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-02_west"]),
-    "9b_b-02_east": PreRegion("9b_b-02_east", "9b_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-02_east"]),
+    "9b_b-02_west": PreRegion("9b_b-02_west", "9b_b-02", connections_by_region["9b_b-02_west"], locations_by_region["9b_b-02_west"]),
+    "9b_b-02_east": PreRegion("9b_b-02_east", "9b_b-02", connections_by_region["9b_b-02_east"], locations_by_region["9b_b-02_east"]),
 
-    "9b_b-03_west": PreRegion("9b_b-03_west", "9b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-03_west"]),
-    "9b_b-03_east": PreRegion("9b_b-03_east", "9b_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-03_east"]),
+    "9b_b-03_west": PreRegion("9b_b-03_west", "9b_b-03", connections_by_region["9b_b-03_west"], locations_by_region["9b_b-03_west"]),
+    "9b_b-03_east": PreRegion("9b_b-03_east", "9b_b-03", connections_by_region["9b_b-03_east"], locations_by_region["9b_b-03_east"]),
 
-    "9b_b-04_west": PreRegion("9b_b-04_west", "9b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-04_west"]),
-    "9b_b-04_east": PreRegion("9b_b-04_east", "9b_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-04_east"]),
+    "9b_b-04_west": PreRegion("9b_b-04_west", "9b_b-04", connections_by_region["9b_b-04_west"], locations_by_region["9b_b-04_west"]),
+    "9b_b-04_east": PreRegion("9b_b-04_east", "9b_b-04", connections_by_region["9b_b-04_east"], locations_by_region["9b_b-04_east"]),
 
-    "9b_b-05_west": PreRegion("9b_b-05_west", "9b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-05_west"]),
-    "9b_b-05_east": PreRegion("9b_b-05_east", "9b_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_b-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_b-05_east"]),
+    "9b_b-05_west": PreRegion("9b_b-05_west", "9b_b-05", connections_by_region["9b_b-05_west"], locations_by_region["9b_b-05_west"]),
+    "9b_b-05_east": PreRegion("9b_b-05_east", "9b_b-05", connections_by_region["9b_b-05_east"], locations_by_region["9b_b-05_east"]),
 
-    "9b_c-01_bottom": PreRegion("9b_c-01_bottom", "9b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-01_bottom"]),
-    "9b_c-01_top": PreRegion("9b_c-01_top", "9b_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-01_top"]),
+    "9b_c-01_bottom": PreRegion("9b_c-01_bottom", "9b_c-01", connections_by_region["9b_c-01_bottom"], locations_by_region["9b_c-01_bottom"]),
+    "9b_c-01_top": PreRegion("9b_c-01_top", "9b_c-01", connections_by_region["9b_c-01_top"], locations_by_region["9b_c-01_top"]),
 
-    "9b_c-02_bottom": PreRegion("9b_c-02_bottom", "9b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-02_bottom"]),
-    "9b_c-02_top": PreRegion("9b_c-02_top", "9b_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-02_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-02_top"]),
+    "9b_c-02_bottom": PreRegion("9b_c-02_bottom", "9b_c-02", connections_by_region["9b_c-02_bottom"], locations_by_region["9b_c-02_bottom"]),
+    "9b_c-02_top": PreRegion("9b_c-02_top", "9b_c-02", connections_by_region["9b_c-02_top"], locations_by_region["9b_c-02_top"]),
 
-    "9b_c-03_bottom": PreRegion("9b_c-03_bottom", "9b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-03_bottom"]),
-    "9b_c-03_top": PreRegion("9b_c-03_top", "9b_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-03_top"]),
+    "9b_c-03_bottom": PreRegion("9b_c-03_bottom", "9b_c-03", connections_by_region["9b_c-03_bottom"], locations_by_region["9b_c-03_bottom"]),
+    "9b_c-03_top": PreRegion("9b_c-03_top", "9b_c-03", connections_by_region["9b_c-03_top"], locations_by_region["9b_c-03_top"]),
 
-    "9b_c-04_bottom": PreRegion("9b_c-04_bottom", "9b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-04_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-04_bottom"]),
-    "9b_c-04_top": PreRegion("9b_c-04_top", "9b_c-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-04_top"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-04_top"]),
+    "9b_c-04_bottom": PreRegion("9b_c-04_bottom", "9b_c-04", connections_by_region["9b_c-04_bottom"], locations_by_region["9b_c-04_bottom"]),
+    "9b_c-04_top": PreRegion("9b_c-04_top", "9b_c-04", connections_by_region["9b_c-04_top"], locations_by_region["9b_c-04_top"]),
 
-    "9b_c-05_west": PreRegion("9b_c-05_west", "9b_c-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-05_west"]),
-    "9b_c-05_east": PreRegion("9b_c-05_east", "9b_c-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-05_east"]),
+    "9b_c-05_west": PreRegion("9b_c-05_west", "9b_c-05", connections_by_region["9b_c-05_west"], locations_by_region["9b_c-05_west"]),
+    "9b_c-05_east": PreRegion("9b_c-05_east", "9b_c-05", connections_by_region["9b_c-05_east"], locations_by_region["9b_c-05_east"]),
 
-    "9b_c-06_west": PreRegion("9b_c-06_west", "9b_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-06_west"]),
-    "9b_c-06_east": PreRegion("9b_c-06_east", "9b_c-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-06_east"]),
+    "9b_c-06_west": PreRegion("9b_c-06_west", "9b_c-06", connections_by_region["9b_c-06_west"], locations_by_region["9b_c-06_west"]),
+    "9b_c-06_east": PreRegion("9b_c-06_east", "9b_c-06", connections_by_region["9b_c-06_east"], locations_by_region["9b_c-06_east"]),
 
-    "9b_c-08_west": PreRegion("9b_c-08_west", "9b_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-08_west"]),
-    "9b_c-08_east": PreRegion("9b_c-08_east", "9b_c-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-08_east"]),
+    "9b_c-08_west": PreRegion("9b_c-08_west", "9b_c-08", connections_by_region["9b_c-08_west"], locations_by_region["9b_c-08_west"]),
+    "9b_c-08_east": PreRegion("9b_c-08_east", "9b_c-08", connections_by_region["9b_c-08_east"], locations_by_region["9b_c-08_east"]),
 
-    "9b_c-07_west": PreRegion("9b_c-07_west", "9b_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-07_west"]),
-    "9b_c-07_east": PreRegion("9b_c-07_east", "9b_c-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_c-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_c-07_east"]),
+    "9b_c-07_west": PreRegion("9b_c-07_west", "9b_c-07", connections_by_region["9b_c-07_west"], locations_by_region["9b_c-07_west"]),
+    "9b_c-07_east": PreRegion("9b_c-07_east", "9b_c-07", connections_by_region["9b_c-07_east"], locations_by_region["9b_c-07_east"]),
 
-    "9b_space_west": PreRegion("9b_space_west", "9b_space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_space_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_space_west"]),
-    "9b_space_goal": PreRegion("9b_space_goal", "9b_space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9b_space_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "9b_space_goal"]),
+    "9b_space_west": PreRegion("9b_space_west", "9b_space", connections_by_region["9b_space_west"], locations_by_region["9b_space_west"]),
+    "9b_space_goal": PreRegion("9b_space_goal", "9b_space", connections_by_region["9b_space_goal"], locations_by_region["9b_space_goal"]),
 
-    "9c_intro_west": PreRegion("9c_intro_west", "9c_intro", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_intro_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_intro_west"]),
-    "9c_intro_east": PreRegion("9c_intro_east", "9c_intro", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_intro_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_intro_east"]),
+    "9c_intro_west": PreRegion("9c_intro_west", "9c_intro", connections_by_region["9c_intro_west"], locations_by_region["9c_intro_west"]),
+    "9c_intro_east": PreRegion("9c_intro_east", "9c_intro", connections_by_region["9c_intro_east"], locations_by_region["9c_intro_east"]),
 
-    "9c_00_west": PreRegion("9c_00_west", "9c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_00_west"]),
-    "9c_00_east": PreRegion("9c_00_east", "9c_00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_00_east"]),
+    "9c_00_west": PreRegion("9c_00_west", "9c_00", connections_by_region["9c_00_west"], locations_by_region["9c_00_west"]),
+    "9c_00_east": PreRegion("9c_00_east", "9c_00", connections_by_region["9c_00_east"], locations_by_region["9c_00_east"]),
 
-    "9c_01_west": PreRegion("9c_01_west", "9c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_01_west"]),
-    "9c_01_east": PreRegion("9c_01_east", "9c_01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_01_east"]),
+    "9c_01_west": PreRegion("9c_01_west", "9c_01", connections_by_region["9c_01_west"], locations_by_region["9c_01_west"]),
+    "9c_01_east": PreRegion("9c_01_east", "9c_01", connections_by_region["9c_01_east"], locations_by_region["9c_01_east"]),
 
-    "9c_02_west": PreRegion("9c_02_west", "9c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_02_west"]),
-    "9c_02_goal": PreRegion("9c_02_goal", "9c_02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "9c_02_goal"], [loc for _, loc in all_locations.items() if loc.region_name == "9c_02_goal"]),
+    "9c_02_west": PreRegion("9c_02_west", "9c_02", connections_by_region["9c_02_west"], locations_by_region["9c_02_west"]),
+    "9c_02_goal": PreRegion("9c_02_goal", "9c_02", connections_by_region["9c_02_goal"], locations_by_region["9c_02_goal"]),
 
-    "10a_intro-00-past_west": PreRegion("10a_intro-00-past_west", "10a_intro-00-past", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-00-past_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-00-past_west"]),
-    "10a_intro-00-past_east": PreRegion("10a_intro-00-past_east", "10a_intro-00-past", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-00-past_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-00-past_east"]),
+    "10a_intro-00-past_west": PreRegion("10a_intro-00-past_west", "10a_intro-00-past", connections_by_region["10a_intro-00-past_west"], locations_by_region["10a_intro-00-past_west"]),
+    "10a_intro-00-past_east": PreRegion("10a_intro-00-past_east", "10a_intro-00-past", connections_by_region["10a_intro-00-past_east"], locations_by_region["10a_intro-00-past_east"]),
 
-    "10a_intro-01-future_west": PreRegion("10a_intro-01-future_west", "10a_intro-01-future", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-01-future_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-01-future_west"]),
-    "10a_intro-01-future_east": PreRegion("10a_intro-01-future_east", "10a_intro-01-future", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-01-future_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-01-future_east"]),
+    "10a_intro-01-future_west": PreRegion("10a_intro-01-future_west", "10a_intro-01-future", connections_by_region["10a_intro-01-future_west"], locations_by_region["10a_intro-01-future_west"]),
+    "10a_intro-01-future_east": PreRegion("10a_intro-01-future_east", "10a_intro-01-future", connections_by_region["10a_intro-01-future_east"], locations_by_region["10a_intro-01-future_east"]),
 
-    "10a_intro-02-launch_bottom": PreRegion("10a_intro-02-launch_bottom", "10a_intro-02-launch", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-02-launch_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-02-launch_bottom"]),
-    "10a_intro-02-launch_top": PreRegion("10a_intro-02-launch_top", "10a_intro-02-launch", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-02-launch_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-02-launch_top"]),
+    "10a_intro-02-launch_bottom": PreRegion("10a_intro-02-launch_bottom", "10a_intro-02-launch", connections_by_region["10a_intro-02-launch_bottom"], locations_by_region["10a_intro-02-launch_bottom"]),
+    "10a_intro-02-launch_top": PreRegion("10a_intro-02-launch_top", "10a_intro-02-launch", connections_by_region["10a_intro-02-launch_top"], locations_by_region["10a_intro-02-launch_top"]),
 
-    "10a_intro-03-space_west": PreRegion("10a_intro-03-space_west", "10a_intro-03-space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-03-space_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-03-space_west"]),
-    "10a_intro-03-space_east": PreRegion("10a_intro-03-space_east", "10a_intro-03-space", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_intro-03-space_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_intro-03-space_east"]),
+    "10a_intro-03-space_west": PreRegion("10a_intro-03-space_west", "10a_intro-03-space", connections_by_region["10a_intro-03-space_west"], locations_by_region["10a_intro-03-space_west"]),
+    "10a_intro-03-space_east": PreRegion("10a_intro-03-space_east", "10a_intro-03-space", connections_by_region["10a_intro-03-space_east"], locations_by_region["10a_intro-03-space_east"]),
 
-    "10a_a-00_west": PreRegion("10a_a-00_west", "10a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-00_west"]),
-    "10a_a-00_east": PreRegion("10a_a-00_east", "10a_a-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-00_east"]),
+    "10a_a-00_west": PreRegion("10a_a-00_west", "10a_a-00", connections_by_region["10a_a-00_west"], locations_by_region["10a_a-00_west"]),
+    "10a_a-00_east": PreRegion("10a_a-00_east", "10a_a-00", connections_by_region["10a_a-00_east"], locations_by_region["10a_a-00_east"]),
 
-    "10a_a-01_west": PreRegion("10a_a-01_west", "10a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-01_west"]),
-    "10a_a-01_east": PreRegion("10a_a-01_east", "10a_a-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-01_east"]),
+    "10a_a-01_west": PreRegion("10a_a-01_west", "10a_a-01", connections_by_region["10a_a-01_west"], locations_by_region["10a_a-01_west"]),
+    "10a_a-01_east": PreRegion("10a_a-01_east", "10a_a-01", connections_by_region["10a_a-01_east"], locations_by_region["10a_a-01_east"]),
 
-    "10a_a-02_west": PreRegion("10a_a-02_west", "10a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-02_west"]),
-    "10a_a-02_east": PreRegion("10a_a-02_east", "10a_a-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-02_east"]),
+    "10a_a-02_west": PreRegion("10a_a-02_west", "10a_a-02", connections_by_region["10a_a-02_west"], locations_by_region["10a_a-02_west"]),
+    "10a_a-02_east": PreRegion("10a_a-02_east", "10a_a-02", connections_by_region["10a_a-02_east"], locations_by_region["10a_a-02_east"]),
 
-    "10a_a-03_west": PreRegion("10a_a-03_west", "10a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-03_west"]),
-    "10a_a-03_east": PreRegion("10a_a-03_east", "10a_a-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-03_east"]),
+    "10a_a-03_west": PreRegion("10a_a-03_west", "10a_a-03", connections_by_region["10a_a-03_west"], locations_by_region["10a_a-03_west"]),
+    "10a_a-03_east": PreRegion("10a_a-03_east", "10a_a-03", connections_by_region["10a_a-03_east"], locations_by_region["10a_a-03_east"]),
 
-    "10a_a-04_west": PreRegion("10a_a-04_west", "10a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-04_west"]),
-    "10a_a-04_east": PreRegion("10a_a-04_east", "10a_a-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-04_east"]),
+    "10a_a-04_west": PreRegion("10a_a-04_west", "10a_a-04", connections_by_region["10a_a-04_west"], locations_by_region["10a_a-04_west"]),
+    "10a_a-04_east": PreRegion("10a_a-04_east", "10a_a-04", connections_by_region["10a_a-04_east"], locations_by_region["10a_a-04_east"]),
 
-    "10a_a-05_west": PreRegion("10a_a-05_west", "10a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-05_west"]),
-    "10a_a-05_east": PreRegion("10a_a-05_east", "10a_a-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_a-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_a-05_east"]),
+    "10a_a-05_west": PreRegion("10a_a-05_west", "10a_a-05", connections_by_region["10a_a-05_west"], locations_by_region["10a_a-05_west"]),
+    "10a_a-05_east": PreRegion("10a_a-05_east", "10a_a-05", connections_by_region["10a_a-05_east"], locations_by_region["10a_a-05_east"]),
 
-    "10a_b-00_west": PreRegion("10a_b-00_west", "10a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-00_west"]),
-    "10a_b-00_east": PreRegion("10a_b-00_east", "10a_b-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-00_east"]),
+    "10a_b-00_west": PreRegion("10a_b-00_west", "10a_b-00", connections_by_region["10a_b-00_west"], locations_by_region["10a_b-00_west"]),
+    "10a_b-00_east": PreRegion("10a_b-00_east", "10a_b-00", connections_by_region["10a_b-00_east"], locations_by_region["10a_b-00_east"]),
 
-    "10a_b-01_west": PreRegion("10a_b-01_west", "10a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-01_west"]),
-    "10a_b-01_east": PreRegion("10a_b-01_east", "10a_b-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-01_east"]),
+    "10a_b-01_west": PreRegion("10a_b-01_west", "10a_b-01", connections_by_region["10a_b-01_west"], locations_by_region["10a_b-01_west"]),
+    "10a_b-01_east": PreRegion("10a_b-01_east", "10a_b-01", connections_by_region["10a_b-01_east"], locations_by_region["10a_b-01_east"]),
 
-    "10a_b-02_west": PreRegion("10a_b-02_west", "10a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-02_west"]),
-    "10a_b-02_east": PreRegion("10a_b-02_east", "10a_b-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-02_east"]),
+    "10a_b-02_west": PreRegion("10a_b-02_west", "10a_b-02", connections_by_region["10a_b-02_west"], locations_by_region["10a_b-02_west"]),
+    "10a_b-02_east": PreRegion("10a_b-02_east", "10a_b-02", connections_by_region["10a_b-02_east"], locations_by_region["10a_b-02_east"]),
 
-    "10a_b-03_west": PreRegion("10a_b-03_west", "10a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-03_west"]),
-    "10a_b-03_east": PreRegion("10a_b-03_east", "10a_b-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-03_east"]),
+    "10a_b-03_west": PreRegion("10a_b-03_west", "10a_b-03", connections_by_region["10a_b-03_west"], locations_by_region["10a_b-03_west"]),
+    "10a_b-03_east": PreRegion("10a_b-03_east", "10a_b-03", connections_by_region["10a_b-03_east"], locations_by_region["10a_b-03_east"]),
 
-    "10a_b-04_west": PreRegion("10a_b-04_west", "10a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-04_west"]),
-    "10a_b-04_east": PreRegion("10a_b-04_east", "10a_b-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-04_east"]),
+    "10a_b-04_west": PreRegion("10a_b-04_west", "10a_b-04", connections_by_region["10a_b-04_west"], locations_by_region["10a_b-04_west"]),
+    "10a_b-04_east": PreRegion("10a_b-04_east", "10a_b-04", connections_by_region["10a_b-04_east"], locations_by_region["10a_b-04_east"]),
 
-    "10a_b-05_west": PreRegion("10a_b-05_west", "10a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-05_west"]),
-    "10a_b-05_east": PreRegion("10a_b-05_east", "10a_b-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-05_east"]),
+    "10a_b-05_west": PreRegion("10a_b-05_west", "10a_b-05", connections_by_region["10a_b-05_west"], locations_by_region["10a_b-05_west"]),
+    "10a_b-05_east": PreRegion("10a_b-05_east", "10a_b-05", connections_by_region["10a_b-05_east"], locations_by_region["10a_b-05_east"]),
 
-    "10a_b-06_west": PreRegion("10a_b-06_west", "10a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-06_west"]),
-    "10a_b-06_east": PreRegion("10a_b-06_east", "10a_b-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-06_east"]),
+    "10a_b-06_west": PreRegion("10a_b-06_west", "10a_b-06", connections_by_region["10a_b-06_west"], locations_by_region["10a_b-06_west"]),
+    "10a_b-06_east": PreRegion("10a_b-06_east", "10a_b-06", connections_by_region["10a_b-06_east"], locations_by_region["10a_b-06_east"]),
 
-    "10a_b-07_west": PreRegion("10a_b-07_west", "10a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-07_west"]),
-    "10a_b-07_east": PreRegion("10a_b-07_east", "10a_b-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_b-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_b-07_east"]),
+    "10a_b-07_west": PreRegion("10a_b-07_west", "10a_b-07", connections_by_region["10a_b-07_west"], locations_by_region["10a_b-07_west"]),
+    "10a_b-07_east": PreRegion("10a_b-07_east", "10a_b-07", connections_by_region["10a_b-07_east"], locations_by_region["10a_b-07_east"]),
 
-    "10a_c-00_west": PreRegion("10a_c-00_west", "10a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-00_west"]),
-    "10a_c-00_east": PreRegion("10a_c-00_east", "10a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-00_east"]),
-    "10a_c-00_north-east": PreRegion("10a_c-00_north-east", "10a_c-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-00_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-00_north-east"]),
+    "10a_c-00_west": PreRegion("10a_c-00_west", "10a_c-00", connections_by_region["10a_c-00_west"], locations_by_region["10a_c-00_west"]),
+    "10a_c-00_east": PreRegion("10a_c-00_east", "10a_c-00", connections_by_region["10a_c-00_east"], locations_by_region["10a_c-00_east"]),
+    "10a_c-00_north-east": PreRegion("10a_c-00_north-east", "10a_c-00", connections_by_region["10a_c-00_north-east"], locations_by_region["10a_c-00_north-east"]),
 
-    "10a_c-00b_west": PreRegion("10a_c-00b_west", "10a_c-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-00b_west"]),
-    "10a_c-00b_east": PreRegion("10a_c-00b_east", "10a_c-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-00b_east"]),
+    "10a_c-00b_west": PreRegion("10a_c-00b_west", "10a_c-00b", connections_by_region["10a_c-00b_west"], locations_by_region["10a_c-00b_west"]),
+    "10a_c-00b_east": PreRegion("10a_c-00b_east", "10a_c-00b", connections_by_region["10a_c-00b_east"], locations_by_region["10a_c-00b_east"]),
 
-    "10a_c-01_west": PreRegion("10a_c-01_west", "10a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-01_west"]),
-    "10a_c-01_east": PreRegion("10a_c-01_east", "10a_c-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-01_east"]),
+    "10a_c-01_west": PreRegion("10a_c-01_west", "10a_c-01", connections_by_region["10a_c-01_west"], locations_by_region["10a_c-01_west"]),
+    "10a_c-01_east": PreRegion("10a_c-01_east", "10a_c-01", connections_by_region["10a_c-01_east"], locations_by_region["10a_c-01_east"]),
 
-    "10a_c-02_west": PreRegion("10a_c-02_west", "10a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-02_west"]),
-    "10a_c-02_east": PreRegion("10a_c-02_east", "10a_c-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-02_east"]),
+    "10a_c-02_west": PreRegion("10a_c-02_west", "10a_c-02", connections_by_region["10a_c-02_west"], locations_by_region["10a_c-02_west"]),
+    "10a_c-02_east": PreRegion("10a_c-02_east", "10a_c-02", connections_by_region["10a_c-02_east"], locations_by_region["10a_c-02_east"]),
 
-    "10a_c-alt-00_west": PreRegion("10a_c-alt-00_west", "10a_c-alt-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-alt-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-alt-00_west"]),
-    "10a_c-alt-00_east": PreRegion("10a_c-alt-00_east", "10a_c-alt-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-alt-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-alt-00_east"]),
+    "10a_c-alt-00_west": PreRegion("10a_c-alt-00_west", "10a_c-alt-00", connections_by_region["10a_c-alt-00_west"], locations_by_region["10a_c-alt-00_west"]),
+    "10a_c-alt-00_east": PreRegion("10a_c-alt-00_east", "10a_c-alt-00", connections_by_region["10a_c-alt-00_east"], locations_by_region["10a_c-alt-00_east"]),
 
-    "10a_c-alt-01_west": PreRegion("10a_c-alt-01_west", "10a_c-alt-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-alt-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-alt-01_west"]),
-    "10a_c-alt-01_east": PreRegion("10a_c-alt-01_east", "10a_c-alt-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-alt-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-alt-01_east"]),
+    "10a_c-alt-01_west": PreRegion("10a_c-alt-01_west", "10a_c-alt-01", connections_by_region["10a_c-alt-01_west"], locations_by_region["10a_c-alt-01_west"]),
+    "10a_c-alt-01_east": PreRegion("10a_c-alt-01_east", "10a_c-alt-01", connections_by_region["10a_c-alt-01_east"], locations_by_region["10a_c-alt-01_east"]),
 
-    "10a_c-03_south-west": PreRegion("10a_c-03_south-west", "10a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-03_south-west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-03_south-west"]),
-    "10a_c-03_south": PreRegion("10a_c-03_south", "10a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-03_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-03_south"]),
-    "10a_c-03_north": PreRegion("10a_c-03_north", "10a_c-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_c-03_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_c-03_north"]),
+    "10a_c-03_south-west": PreRegion("10a_c-03_south-west", "10a_c-03", connections_by_region["10a_c-03_south-west"], locations_by_region["10a_c-03_south-west"]),
+    "10a_c-03_south": PreRegion("10a_c-03_south", "10a_c-03", connections_by_region["10a_c-03_south"], locations_by_region["10a_c-03_south"]),
+    "10a_c-03_north": PreRegion("10a_c-03_north", "10a_c-03", connections_by_region["10a_c-03_north"], locations_by_region["10a_c-03_north"]),
 
-    "10a_d-00_south": PreRegion("10a_d-00_south", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_south"]),
-    "10a_d-00_north": PreRegion("10a_d-00_north", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_north"]),
-    "10a_d-00_south-east": PreRegion("10a_d-00_south-east", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_south-east"]),
-    "10a_d-00_north-west": PreRegion("10a_d-00_north-west", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_north-west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_north-west"]),
-    "10a_d-00_breaker": PreRegion("10a_d-00_breaker", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_breaker"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_breaker"]),
-    "10a_d-00_north-east-door": PreRegion("10a_d-00_north-east-door", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_north-east-door"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_north-east-door"]),
-    "10a_d-00_south-east-door": PreRegion("10a_d-00_south-east-door", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_south-east-door"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_south-east-door"]),
-    "10a_d-00_south-west-door": PreRegion("10a_d-00_south-west-door", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_south-west-door"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_south-west-door"]),
-    "10a_d-00_west-door": PreRegion("10a_d-00_west-door", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_west-door"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_west-door"]),
-    "10a_d-00_north-west-door": PreRegion("10a_d-00_north-west-door", "10a_d-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-00_north-west-door"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-00_north-west-door"]),
+    "10a_d-00_south": PreRegion("10a_d-00_south", "10a_d-00", connections_by_region["10a_d-00_south"], locations_by_region["10a_d-00_south"]),
+    "10a_d-00_north": PreRegion("10a_d-00_north", "10a_d-00", connections_by_region["10a_d-00_north"], locations_by_region["10a_d-00_north"]),
+    "10a_d-00_south-east": PreRegion("10a_d-00_south-east", "10a_d-00", connections_by_region["10a_d-00_south-east"], locations_by_region["10a_d-00_south-east"]),
+    "10a_d-00_north-west": PreRegion("10a_d-00_north-west", "10a_d-00", connections_by_region["10a_d-00_north-west"], locations_by_region["10a_d-00_north-west"]),
+    "10a_d-00_breaker": PreRegion("10a_d-00_breaker", "10a_d-00", connections_by_region["10a_d-00_breaker"], locations_by_region["10a_d-00_breaker"]),
+    "10a_d-00_north-east-door": PreRegion("10a_d-00_north-east-door", "10a_d-00", connections_by_region["10a_d-00_north-east-door"], locations_by_region["10a_d-00_north-east-door"]),
+    "10a_d-00_south-east-door": PreRegion("10a_d-00_south-east-door", "10a_d-00", connections_by_region["10a_d-00_south-east-door"], locations_by_region["10a_d-00_south-east-door"]),
+    "10a_d-00_south-west-door": PreRegion("10a_d-00_south-west-door", "10a_d-00", connections_by_region["10a_d-00_south-west-door"], locations_by_region["10a_d-00_south-west-door"]),
+    "10a_d-00_west-door": PreRegion("10a_d-00_west-door", "10a_d-00", connections_by_region["10a_d-00_west-door"], locations_by_region["10a_d-00_west-door"]),
+    "10a_d-00_north-west-door": PreRegion("10a_d-00_north-west-door", "10a_d-00", connections_by_region["10a_d-00_north-west-door"], locations_by_region["10a_d-00_north-west-door"]),
 
-    "10a_d-04_west": PreRegion("10a_d-04_west", "10a_d-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-04_west"]),
+    "10a_d-04_west": PreRegion("10a_d-04_west", "10a_d-04", connections_by_region["10a_d-04_west"], locations_by_region["10a_d-04_west"]),
 
-    "10a_d-03_west": PreRegion("10a_d-03_west", "10a_d-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-03_west"]),
+    "10a_d-03_west": PreRegion("10a_d-03_west", "10a_d-03", connections_by_region["10a_d-03_west"], locations_by_region["10a_d-03_west"]),
 
-    "10a_d-01_east": PreRegion("10a_d-01_east", "10a_d-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-01_east"]),
+    "10a_d-01_east": PreRegion("10a_d-01_east", "10a_d-01", connections_by_region["10a_d-01_east"], locations_by_region["10a_d-01_east"]),
 
-    "10a_d-02_bottom": PreRegion("10a_d-02_bottom", "10a_d-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-02_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-02_bottom"]),
+    "10a_d-02_bottom": PreRegion("10a_d-02_bottom", "10a_d-02", connections_by_region["10a_d-02_bottom"], locations_by_region["10a_d-02_bottom"]),
 
-    "10a_d-05_west": PreRegion("10a_d-05_west", "10a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-05_west"]),
-    "10a_d-05_south": PreRegion("10a_d-05_south", "10a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-05_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-05_south"]),
-    "10a_d-05_north": PreRegion("10a_d-05_north", "10a_d-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_d-05_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_d-05_north"]),
+    "10a_d-05_west": PreRegion("10a_d-05_west", "10a_d-05", connections_by_region["10a_d-05_west"], locations_by_region["10a_d-05_west"]),
+    "10a_d-05_south": PreRegion("10a_d-05_south", "10a_d-05", connections_by_region["10a_d-05_south"], locations_by_region["10a_d-05_south"]),
+    "10a_d-05_north": PreRegion("10a_d-05_north", "10a_d-05", connections_by_region["10a_d-05_north"], locations_by_region["10a_d-05_north"]),
 
-    "10a_e-00y_south": PreRegion("10a_e-00y_south", "10a_e-00y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00y_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00y_south"]),
-    "10a_e-00y_south-east": PreRegion("10a_e-00y_south-east", "10a_e-00y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00y_south-east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00y_south-east"]),
-    "10a_e-00y_north-east": PreRegion("10a_e-00y_north-east", "10a_e-00y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00y_north-east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00y_north-east"]),
-    "10a_e-00y_north": PreRegion("10a_e-00y_north", "10a_e-00y", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00y_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00y_north"]),
+    "10a_e-00y_south": PreRegion("10a_e-00y_south", "10a_e-00y", connections_by_region["10a_e-00y_south"], locations_by_region["10a_e-00y_south"]),
+    "10a_e-00y_south-east": PreRegion("10a_e-00y_south-east", "10a_e-00y", connections_by_region["10a_e-00y_south-east"], locations_by_region["10a_e-00y_south-east"]),
+    "10a_e-00y_north-east": PreRegion("10a_e-00y_north-east", "10a_e-00y", connections_by_region["10a_e-00y_north-east"], locations_by_region["10a_e-00y_north-east"]),
+    "10a_e-00y_north": PreRegion("10a_e-00y_north", "10a_e-00y", connections_by_region["10a_e-00y_north"], locations_by_region["10a_e-00y_north"]),
 
-    "10a_e-00yb_south": PreRegion("10a_e-00yb_south", "10a_e-00yb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00yb_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00yb_south"]),
-    "10a_e-00yb_north": PreRegion("10a_e-00yb_north", "10a_e-00yb", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00yb_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00yb_north"]),
+    "10a_e-00yb_south": PreRegion("10a_e-00yb_south", "10a_e-00yb", connections_by_region["10a_e-00yb_south"], locations_by_region["10a_e-00yb_south"]),
+    "10a_e-00yb_north": PreRegion("10a_e-00yb_north", "10a_e-00yb", connections_by_region["10a_e-00yb_north"], locations_by_region["10a_e-00yb_north"]),
 
-    "10a_e-00z_south": PreRegion("10a_e-00z_south", "10a_e-00z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00z_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00z_south"]),
-    "10a_e-00z_north": PreRegion("10a_e-00z_north", "10a_e-00z", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00z_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00z_north"]),
+    "10a_e-00z_south": PreRegion("10a_e-00z_south", "10a_e-00z", connections_by_region["10a_e-00z_south"], locations_by_region["10a_e-00z_south"]),
+    "10a_e-00z_north": PreRegion("10a_e-00z_north", "10a_e-00z", connections_by_region["10a_e-00z_north"], locations_by_region["10a_e-00z_north"]),
 
-    "10a_e-00_south": PreRegion("10a_e-00_south", "10a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00_south"]),
-    "10a_e-00_north": PreRegion("10a_e-00_north", "10a_e-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00_north"]),
+    "10a_e-00_south": PreRegion("10a_e-00_south", "10a_e-00", connections_by_region["10a_e-00_south"], locations_by_region["10a_e-00_south"]),
+    "10a_e-00_north": PreRegion("10a_e-00_north", "10a_e-00", connections_by_region["10a_e-00_north"], locations_by_region["10a_e-00_north"]),
 
-    "10a_e-00b_south": PreRegion("10a_e-00b_south", "10a_e-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00b_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00b_south"]),
-    "10a_e-00b_north": PreRegion("10a_e-00b_north", "10a_e-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-00b_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-00b_north"]),
+    "10a_e-00b_south": PreRegion("10a_e-00b_south", "10a_e-00b", connections_by_region["10a_e-00b_south"], locations_by_region["10a_e-00b_south"]),
+    "10a_e-00b_north": PreRegion("10a_e-00b_north", "10a_e-00b", connections_by_region["10a_e-00b_north"], locations_by_region["10a_e-00b_north"]),
 
-    "10a_e-01_south": PreRegion("10a_e-01_south", "10a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-01_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-01_south"]),
-    "10a_e-01_north": PreRegion("10a_e-01_north", "10a_e-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-01_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-01_north"]),
+    "10a_e-01_south": PreRegion("10a_e-01_south", "10a_e-01", connections_by_region["10a_e-01_south"], locations_by_region["10a_e-01_south"]),
+    "10a_e-01_north": PreRegion("10a_e-01_north", "10a_e-01", connections_by_region["10a_e-01_north"], locations_by_region["10a_e-01_north"]),
 
-    "10a_e-02_west": PreRegion("10a_e-02_west", "10a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-02_west"]),
-    "10a_e-02_east": PreRegion("10a_e-02_east", "10a_e-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-02_east"]),
+    "10a_e-02_west": PreRegion("10a_e-02_west", "10a_e-02", connections_by_region["10a_e-02_west"], locations_by_region["10a_e-02_west"]),
+    "10a_e-02_east": PreRegion("10a_e-02_east", "10a_e-02", connections_by_region["10a_e-02_east"], locations_by_region["10a_e-02_east"]),
 
-    "10a_e-03_west": PreRegion("10a_e-03_west", "10a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-03_west"]),
-    "10a_e-03_east": PreRegion("10a_e-03_east", "10a_e-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-03_east"]),
+    "10a_e-03_west": PreRegion("10a_e-03_west", "10a_e-03", connections_by_region["10a_e-03_west"], locations_by_region["10a_e-03_west"]),
+    "10a_e-03_east": PreRegion("10a_e-03_east", "10a_e-03", connections_by_region["10a_e-03_east"], locations_by_region["10a_e-03_east"]),
 
-    "10a_e-04_west": PreRegion("10a_e-04_west", "10a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-04_west"]),
-    "10a_e-04_east": PreRegion("10a_e-04_east", "10a_e-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-04_east"]),
+    "10a_e-04_west": PreRegion("10a_e-04_west", "10a_e-04", connections_by_region["10a_e-04_west"], locations_by_region["10a_e-04_west"]),
+    "10a_e-04_east": PreRegion("10a_e-04_east", "10a_e-04", connections_by_region["10a_e-04_east"], locations_by_region["10a_e-04_east"]),
 
-    "10a_e-05_west": PreRegion("10a_e-05_west", "10a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05_west"]),
-    "10a_e-05_east": PreRegion("10a_e-05_east", "10a_e-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05_east"]),
+    "10a_e-05_west": PreRegion("10a_e-05_west", "10a_e-05", connections_by_region["10a_e-05_west"], locations_by_region["10a_e-05_west"]),
+    "10a_e-05_east": PreRegion("10a_e-05_east", "10a_e-05", connections_by_region["10a_e-05_east"], locations_by_region["10a_e-05_east"]),
 
-    "10a_e-05b_west": PreRegion("10a_e-05b_west", "10a_e-05b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05b_west"]),
-    "10a_e-05b_east": PreRegion("10a_e-05b_east", "10a_e-05b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05b_east"]),
+    "10a_e-05b_west": PreRegion("10a_e-05b_west", "10a_e-05b", connections_by_region["10a_e-05b_west"], locations_by_region["10a_e-05b_west"]),
+    "10a_e-05b_east": PreRegion("10a_e-05b_east", "10a_e-05b", connections_by_region["10a_e-05b_east"], locations_by_region["10a_e-05b_east"]),
 
-    "10a_e-05c_west": PreRegion("10a_e-05c_west", "10a_e-05c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05c_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05c_west"]),
-    "10a_e-05c_east": PreRegion("10a_e-05c_east", "10a_e-05c", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-05c_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-05c_east"]),
+    "10a_e-05c_west": PreRegion("10a_e-05c_west", "10a_e-05c", connections_by_region["10a_e-05c_west"], locations_by_region["10a_e-05c_west"]),
+    "10a_e-05c_east": PreRegion("10a_e-05c_east", "10a_e-05c", connections_by_region["10a_e-05c_east"], locations_by_region["10a_e-05c_east"]),
 
-    "10a_e-06_west": PreRegion("10a_e-06_west", "10a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-06_west"]),
-    "10a_e-06_east": PreRegion("10a_e-06_east", "10a_e-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-06_east"]),
+    "10a_e-06_west": PreRegion("10a_e-06_west", "10a_e-06", connections_by_region["10a_e-06_west"], locations_by_region["10a_e-06_west"]),
+    "10a_e-06_east": PreRegion("10a_e-06_east", "10a_e-06", connections_by_region["10a_e-06_east"], locations_by_region["10a_e-06_east"]),
 
-    "10a_e-07_west": PreRegion("10a_e-07_west", "10a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-07_west"]),
-    "10a_e-07_east": PreRegion("10a_e-07_east", "10a_e-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-07_east"]),
+    "10a_e-07_west": PreRegion("10a_e-07_west", "10a_e-07", connections_by_region["10a_e-07_west"], locations_by_region["10a_e-07_west"]),
+    "10a_e-07_east": PreRegion("10a_e-07_east", "10a_e-07", connections_by_region["10a_e-07_east"], locations_by_region["10a_e-07_east"]),
 
-    "10a_e-08_west": PreRegion("10a_e-08_west", "10a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-08_west"]),
-    "10a_e-08_east": PreRegion("10a_e-08_east", "10a_e-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10a_e-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10a_e-08_east"]),
+    "10a_e-08_west": PreRegion("10a_e-08_west", "10a_e-08", connections_by_region["10a_e-08_west"], locations_by_region["10a_e-08_west"]),
+    "10a_e-08_east": PreRegion("10a_e-08_east", "10a_e-08", connections_by_region["10a_e-08_east"], locations_by_region["10a_e-08_east"]),
 
-    "10b_f-door_west": PreRegion("10b_f-door_west", "10b_f-door", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-door_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-door_west"]),
-    "10b_f-door_east": PreRegion("10b_f-door_east", "10b_f-door", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-door_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-door_east"]),
+    "10b_f-door_west": PreRegion("10b_f-door_west", "10b_f-door", connections_by_region["10b_f-door_west"], locations_by_region["10b_f-door_west"]),
+    "10b_f-door_east": PreRegion("10b_f-door_east", "10b_f-door", connections_by_region["10b_f-door_east"], locations_by_region["10b_f-door_east"]),
 
-    "10b_f-00_west": PreRegion("10b_f-00_west", "10b_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-00_west"]),
-    "10b_f-00_east": PreRegion("10b_f-00_east", "10b_f-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-00_east"]),
+    "10b_f-00_west": PreRegion("10b_f-00_west", "10b_f-00", connections_by_region["10b_f-00_west"], locations_by_region["10b_f-00_west"]),
+    "10b_f-00_east": PreRegion("10b_f-00_east", "10b_f-00", connections_by_region["10b_f-00_east"], locations_by_region["10b_f-00_east"]),
 
-    "10b_f-01_west": PreRegion("10b_f-01_west", "10b_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-01_west"]),
-    "10b_f-01_east": PreRegion("10b_f-01_east", "10b_f-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-01_east"]),
+    "10b_f-01_west": PreRegion("10b_f-01_west", "10b_f-01", connections_by_region["10b_f-01_west"], locations_by_region["10b_f-01_west"]),
+    "10b_f-01_east": PreRegion("10b_f-01_east", "10b_f-01", connections_by_region["10b_f-01_east"], locations_by_region["10b_f-01_east"]),
 
-    "10b_f-02_west": PreRegion("10b_f-02_west", "10b_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-02_west"]),
-    "10b_f-02_east": PreRegion("10b_f-02_east", "10b_f-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-02_east"]),
+    "10b_f-02_west": PreRegion("10b_f-02_west", "10b_f-02", connections_by_region["10b_f-02_west"], locations_by_region["10b_f-02_west"]),
+    "10b_f-02_east": PreRegion("10b_f-02_east", "10b_f-02", connections_by_region["10b_f-02_east"], locations_by_region["10b_f-02_east"]),
 
-    "10b_f-03_west": PreRegion("10b_f-03_west", "10b_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-03_west"]),
-    "10b_f-03_east": PreRegion("10b_f-03_east", "10b_f-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-03_east"]),
+    "10b_f-03_west": PreRegion("10b_f-03_west", "10b_f-03", connections_by_region["10b_f-03_west"], locations_by_region["10b_f-03_west"]),
+    "10b_f-03_east": PreRegion("10b_f-03_east", "10b_f-03", connections_by_region["10b_f-03_east"], locations_by_region["10b_f-03_east"]),
 
-    "10b_f-04_west": PreRegion("10b_f-04_west", "10b_f-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-04_west"]),
-    "10b_f-04_east": PreRegion("10b_f-04_east", "10b_f-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-04_east"]),
+    "10b_f-04_west": PreRegion("10b_f-04_west", "10b_f-04", connections_by_region["10b_f-04_west"], locations_by_region["10b_f-04_west"]),
+    "10b_f-04_east": PreRegion("10b_f-04_east", "10b_f-04", connections_by_region["10b_f-04_east"], locations_by_region["10b_f-04_east"]),
 
-    "10b_f-05_west": PreRegion("10b_f-05_west", "10b_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-05_west"]),
-    "10b_f-05_east": PreRegion("10b_f-05_east", "10b_f-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-05_east"]),
+    "10b_f-05_west": PreRegion("10b_f-05_west", "10b_f-05", connections_by_region["10b_f-05_west"], locations_by_region["10b_f-05_west"]),
+    "10b_f-05_east": PreRegion("10b_f-05_east", "10b_f-05", connections_by_region["10b_f-05_east"], locations_by_region["10b_f-05_east"]),
 
-    "10b_f-06_west": PreRegion("10b_f-06_west", "10b_f-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-06_west"]),
-    "10b_f-06_east": PreRegion("10b_f-06_east", "10b_f-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-06_east"]),
+    "10b_f-06_west": PreRegion("10b_f-06_west", "10b_f-06", connections_by_region["10b_f-06_west"], locations_by_region["10b_f-06_west"]),
+    "10b_f-06_east": PreRegion("10b_f-06_east", "10b_f-06", connections_by_region["10b_f-06_east"], locations_by_region["10b_f-06_east"]),
 
-    "10b_f-07_west": PreRegion("10b_f-07_west", "10b_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-07_west"]),
-    "10b_f-07_east": PreRegion("10b_f-07_east", "10b_f-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-07_east"]),
+    "10b_f-07_west": PreRegion("10b_f-07_west", "10b_f-07", connections_by_region["10b_f-07_west"], locations_by_region["10b_f-07_west"]),
+    "10b_f-07_east": PreRegion("10b_f-07_east", "10b_f-07", connections_by_region["10b_f-07_east"], locations_by_region["10b_f-07_east"]),
 
-    "10b_f-08_west": PreRegion("10b_f-08_west", "10b_f-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-08_west"]),
-    "10b_f-08_east": PreRegion("10b_f-08_east", "10b_f-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-08_east"]),
+    "10b_f-08_west": PreRegion("10b_f-08_west", "10b_f-08", connections_by_region["10b_f-08_west"], locations_by_region["10b_f-08_west"]),
+    "10b_f-08_east": PreRegion("10b_f-08_east", "10b_f-08", connections_by_region["10b_f-08_east"], locations_by_region["10b_f-08_east"]),
 
-    "10b_f-09_west": PreRegion("10b_f-09_west", "10b_f-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-09_west"]),
-    "10b_f-09_east": PreRegion("10b_f-09_east", "10b_f-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_f-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_f-09_east"]),
+    "10b_f-09_west": PreRegion("10b_f-09_west", "10b_f-09", connections_by_region["10b_f-09_west"], locations_by_region["10b_f-09_west"]),
+    "10b_f-09_east": PreRegion("10b_f-09_east", "10b_f-09", connections_by_region["10b_f-09_east"], locations_by_region["10b_f-09_east"]),
 
-    "10b_g-00_bottom": PreRegion("10b_g-00_bottom", "10b_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-00_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-00_bottom"]),
-    "10b_g-00_top": PreRegion("10b_g-00_top", "10b_g-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-00_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-00_top"]),
+    "10b_g-00_bottom": PreRegion("10b_g-00_bottom", "10b_g-00", connections_by_region["10b_g-00_bottom"], locations_by_region["10b_g-00_bottom"]),
+    "10b_g-00_top": PreRegion("10b_g-00_top", "10b_g-00", connections_by_region["10b_g-00_top"], locations_by_region["10b_g-00_top"]),
 
-    "10b_g-01_bottom": PreRegion("10b_g-01_bottom", "10b_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-01_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-01_bottom"]),
-    "10b_g-01_top": PreRegion("10b_g-01_top", "10b_g-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-01_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-01_top"]),
+    "10b_g-01_bottom": PreRegion("10b_g-01_bottom", "10b_g-01", connections_by_region["10b_g-01_bottom"], locations_by_region["10b_g-01_bottom"]),
+    "10b_g-01_top": PreRegion("10b_g-01_top", "10b_g-01", connections_by_region["10b_g-01_top"], locations_by_region["10b_g-01_top"]),
 
-    "10b_g-03_bottom": PreRegion("10b_g-03_bottom", "10b_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-03_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-03_bottom"]),
-    "10b_g-03_top": PreRegion("10b_g-03_top", "10b_g-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-03_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-03_top"]),
+    "10b_g-03_bottom": PreRegion("10b_g-03_bottom", "10b_g-03", connections_by_region["10b_g-03_bottom"], locations_by_region["10b_g-03_bottom"]),
+    "10b_g-03_top": PreRegion("10b_g-03_top", "10b_g-03", connections_by_region["10b_g-03_top"], locations_by_region["10b_g-03_top"]),
 
-    "10b_g-02_west": PreRegion("10b_g-02_west", "10b_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-02_west"]),
-    "10b_g-02_east": PreRegion("10b_g-02_east", "10b_g-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-02_east"]),
+    "10b_g-02_west": PreRegion("10b_g-02_west", "10b_g-02", connections_by_region["10b_g-02_west"], locations_by_region["10b_g-02_west"]),
+    "10b_g-02_east": PreRegion("10b_g-02_east", "10b_g-02", connections_by_region["10b_g-02_east"], locations_by_region["10b_g-02_east"]),
 
-    "10b_g-04_west": PreRegion("10b_g-04_west", "10b_g-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-04_west"]),
-    "10b_g-04_east": PreRegion("10b_g-04_east", "10b_g-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-04_east"]),
+    "10b_g-04_west": PreRegion("10b_g-04_west", "10b_g-04", connections_by_region["10b_g-04_west"], locations_by_region["10b_g-04_west"]),
+    "10b_g-04_east": PreRegion("10b_g-04_east", "10b_g-04", connections_by_region["10b_g-04_east"], locations_by_region["10b_g-04_east"]),
 
-    "10b_g-05_west": PreRegion("10b_g-05_west", "10b_g-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-05_west"]),
-    "10b_g-05_east": PreRegion("10b_g-05_east", "10b_g-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-05_east"]),
+    "10b_g-05_west": PreRegion("10b_g-05_west", "10b_g-05", connections_by_region["10b_g-05_west"], locations_by_region["10b_g-05_west"]),
+    "10b_g-05_east": PreRegion("10b_g-05_east", "10b_g-05", connections_by_region["10b_g-05_east"], locations_by_region["10b_g-05_east"]),
 
-    "10b_g-06_west": PreRegion("10b_g-06_west", "10b_g-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-06_west"]),
-    "10b_g-06_east": PreRegion("10b_g-06_east", "10b_g-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_g-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_g-06_east"]),
+    "10b_g-06_west": PreRegion("10b_g-06_west", "10b_g-06", connections_by_region["10b_g-06_west"], locations_by_region["10b_g-06_west"]),
+    "10b_g-06_east": PreRegion("10b_g-06_east", "10b_g-06", connections_by_region["10b_g-06_east"], locations_by_region["10b_g-06_east"]),
 
-    "10b_h-00b_west": PreRegion("10b_h-00b_west", "10b_h-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-00b_west"]),
-    "10b_h-00b_east": PreRegion("10b_h-00b_east", "10b_h-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-00b_east"]),
+    "10b_h-00b_west": PreRegion("10b_h-00b_west", "10b_h-00b", connections_by_region["10b_h-00b_west"], locations_by_region["10b_h-00b_west"]),
+    "10b_h-00b_east": PreRegion("10b_h-00b_east", "10b_h-00b", connections_by_region["10b_h-00b_east"], locations_by_region["10b_h-00b_east"]),
 
-    "10b_h-00_west": PreRegion("10b_h-00_west", "10b_h-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-00_west"]),
-    "10b_h-00_east": PreRegion("10b_h-00_east", "10b_h-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-00_east"]),
+    "10b_h-00_west": PreRegion("10b_h-00_west", "10b_h-00", connections_by_region["10b_h-00_west"], locations_by_region["10b_h-00_west"]),
+    "10b_h-00_east": PreRegion("10b_h-00_east", "10b_h-00", connections_by_region["10b_h-00_east"], locations_by_region["10b_h-00_east"]),
 
-    "10b_h-01_west": PreRegion("10b_h-01_west", "10b_h-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-01_west"]),
-    "10b_h-01_east": PreRegion("10b_h-01_east", "10b_h-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-01_east"]),
+    "10b_h-01_west": PreRegion("10b_h-01_west", "10b_h-01", connections_by_region["10b_h-01_west"], locations_by_region["10b_h-01_west"]),
+    "10b_h-01_east": PreRegion("10b_h-01_east", "10b_h-01", connections_by_region["10b_h-01_east"], locations_by_region["10b_h-01_east"]),
 
-    "10b_h-02_west": PreRegion("10b_h-02_west", "10b_h-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-02_west"]),
-    "10b_h-02_east": PreRegion("10b_h-02_east", "10b_h-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-02_east"]),
+    "10b_h-02_west": PreRegion("10b_h-02_west", "10b_h-02", connections_by_region["10b_h-02_west"], locations_by_region["10b_h-02_west"]),
+    "10b_h-02_east": PreRegion("10b_h-02_east", "10b_h-02", connections_by_region["10b_h-02_east"], locations_by_region["10b_h-02_east"]),
 
-    "10b_h-03_west": PreRegion("10b_h-03_west", "10b_h-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-03_west"]),
-    "10b_h-03_east": PreRegion("10b_h-03_east", "10b_h-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-03_east"]),
+    "10b_h-03_west": PreRegion("10b_h-03_west", "10b_h-03", connections_by_region["10b_h-03_west"], locations_by_region["10b_h-03_west"]),
+    "10b_h-03_east": PreRegion("10b_h-03_east", "10b_h-03", connections_by_region["10b_h-03_east"], locations_by_region["10b_h-03_east"]),
 
-    "10b_h-03b_west": PreRegion("10b_h-03b_west", "10b_h-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-03b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-03b_west"]),
-    "10b_h-03b_east": PreRegion("10b_h-03b_east", "10b_h-03b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-03b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-03b_east"]),
+    "10b_h-03b_west": PreRegion("10b_h-03b_west", "10b_h-03b", connections_by_region["10b_h-03b_west"], locations_by_region["10b_h-03b_west"]),
+    "10b_h-03b_east": PreRegion("10b_h-03b_east", "10b_h-03b", connections_by_region["10b_h-03b_east"], locations_by_region["10b_h-03b_east"]),
 
-    "10b_h-04_top": PreRegion("10b_h-04_top", "10b_h-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-04_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-04_top"]),
-    "10b_h-04_east": PreRegion("10b_h-04_east", "10b_h-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-04_east"]),
-    "10b_h-04_bottom": PreRegion("10b_h-04_bottom", "10b_h-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-04_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-04_bottom"]),
+    "10b_h-04_top": PreRegion("10b_h-04_top", "10b_h-04", connections_by_region["10b_h-04_top"], locations_by_region["10b_h-04_top"]),
+    "10b_h-04_east": PreRegion("10b_h-04_east", "10b_h-04", connections_by_region["10b_h-04_east"], locations_by_region["10b_h-04_east"]),
+    "10b_h-04_bottom": PreRegion("10b_h-04_bottom", "10b_h-04", connections_by_region["10b_h-04_bottom"], locations_by_region["10b_h-04_bottom"]),
 
-    "10b_h-04b_west": PreRegion("10b_h-04b_west", "10b_h-04b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-04b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-04b_west"]),
-    "10b_h-04b_east": PreRegion("10b_h-04b_east", "10b_h-04b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-04b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-04b_east"]),
+    "10b_h-04b_west": PreRegion("10b_h-04b_west", "10b_h-04b", connections_by_region["10b_h-04b_west"], locations_by_region["10b_h-04b_west"]),
+    "10b_h-04b_east": PreRegion("10b_h-04b_east", "10b_h-04b", connections_by_region["10b_h-04b_east"], locations_by_region["10b_h-04b_east"]),
 
-    "10b_h-05_west": PreRegion("10b_h-05_west", "10b_h-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-05_west"]),
-    "10b_h-05_top": PreRegion("10b_h-05_top", "10b_h-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-05_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-05_top"]),
-    "10b_h-05_east": PreRegion("10b_h-05_east", "10b_h-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-05_east"]),
+    "10b_h-05_west": PreRegion("10b_h-05_west", "10b_h-05", connections_by_region["10b_h-05_west"], locations_by_region["10b_h-05_west"]),
+    "10b_h-05_top": PreRegion("10b_h-05_top", "10b_h-05", connections_by_region["10b_h-05_top"], locations_by_region["10b_h-05_top"]),
+    "10b_h-05_east": PreRegion("10b_h-05_east", "10b_h-05", connections_by_region["10b_h-05_east"], locations_by_region["10b_h-05_east"]),
 
-    "10b_h-06_west": PreRegion("10b_h-06_west", "10b_h-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-06_west"]),
-    "10b_h-06_east": PreRegion("10b_h-06_east", "10b_h-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-06_east"]),
+    "10b_h-06_west": PreRegion("10b_h-06_west", "10b_h-06", connections_by_region["10b_h-06_west"], locations_by_region["10b_h-06_west"]),
+    "10b_h-06_east": PreRegion("10b_h-06_east", "10b_h-06", connections_by_region["10b_h-06_east"], locations_by_region["10b_h-06_east"]),
 
-    "10b_h-06b_bottom": PreRegion("10b_h-06b_bottom", "10b_h-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-06b_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-06b_bottom"]),
-    "10b_h-06b_top": PreRegion("10b_h-06b_top", "10b_h-06b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-06b_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-06b_top"]),
+    "10b_h-06b_bottom": PreRegion("10b_h-06b_bottom", "10b_h-06b", connections_by_region["10b_h-06b_bottom"], locations_by_region["10b_h-06b_bottom"]),
+    "10b_h-06b_top": PreRegion("10b_h-06b_top", "10b_h-06b", connections_by_region["10b_h-06b_top"], locations_by_region["10b_h-06b_top"]),
 
-    "10b_h-07_west": PreRegion("10b_h-07_west", "10b_h-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-07_west"]),
-    "10b_h-07_east": PreRegion("10b_h-07_east", "10b_h-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-07_east"]),
+    "10b_h-07_west": PreRegion("10b_h-07_west", "10b_h-07", connections_by_region["10b_h-07_west"], locations_by_region["10b_h-07_west"]),
+    "10b_h-07_east": PreRegion("10b_h-07_east", "10b_h-07", connections_by_region["10b_h-07_east"], locations_by_region["10b_h-07_east"]),
 
-    "10b_h-08_west": PreRegion("10b_h-08_west", "10b_h-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-08_west"]),
-    "10b_h-08_east": PreRegion("10b_h-08_east", "10b_h-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-08_east"]),
+    "10b_h-08_west": PreRegion("10b_h-08_west", "10b_h-08", connections_by_region["10b_h-08_west"], locations_by_region["10b_h-08_west"]),
+    "10b_h-08_east": PreRegion("10b_h-08_east", "10b_h-08", connections_by_region["10b_h-08_east"], locations_by_region["10b_h-08_east"]),
 
-    "10b_h-09_west": PreRegion("10b_h-09_west", "10b_h-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-09_west"]),
-    "10b_h-09_east": PreRegion("10b_h-09_east", "10b_h-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-09_east"]),
+    "10b_h-09_west": PreRegion("10b_h-09_west", "10b_h-09", connections_by_region["10b_h-09_west"], locations_by_region["10b_h-09_west"]),
+    "10b_h-09_east": PreRegion("10b_h-09_east", "10b_h-09", connections_by_region["10b_h-09_east"], locations_by_region["10b_h-09_east"]),
 
-    "10b_h-10_west": PreRegion("10b_h-10_west", "10b_h-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-10_west"]),
-    "10b_h-10_east": PreRegion("10b_h-10_east", "10b_h-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_h-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_h-10_east"]),
+    "10b_h-10_west": PreRegion("10b_h-10_west", "10b_h-10", connections_by_region["10b_h-10_west"], locations_by_region["10b_h-10_west"]),
+    "10b_h-10_east": PreRegion("10b_h-10_east", "10b_h-10", connections_by_region["10b_h-10_east"], locations_by_region["10b_h-10_east"]),
 
-    "10b_i-00_west": PreRegion("10b_i-00_west", "10b_i-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-00_west"]),
-    "10b_i-00_east": PreRegion("10b_i-00_east", "10b_i-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-00_east"]),
+    "10b_i-00_west": PreRegion("10b_i-00_west", "10b_i-00", connections_by_region["10b_i-00_west"], locations_by_region["10b_i-00_west"]),
+    "10b_i-00_east": PreRegion("10b_i-00_east", "10b_i-00", connections_by_region["10b_i-00_east"], locations_by_region["10b_i-00_east"]),
 
-    "10b_i-00b_west": PreRegion("10b_i-00b_west", "10b_i-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-00b_west"]),
-    "10b_i-00b_east": PreRegion("10b_i-00b_east", "10b_i-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-00b_east"]),
+    "10b_i-00b_west": PreRegion("10b_i-00b_west", "10b_i-00b", connections_by_region["10b_i-00b_west"], locations_by_region["10b_i-00b_west"]),
+    "10b_i-00b_east": PreRegion("10b_i-00b_east", "10b_i-00b", connections_by_region["10b_i-00b_east"], locations_by_region["10b_i-00b_east"]),
 
-    "10b_i-01_west": PreRegion("10b_i-01_west", "10b_i-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-01_west"]),
-    "10b_i-01_east": PreRegion("10b_i-01_east", "10b_i-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-01_east"]),
+    "10b_i-01_west": PreRegion("10b_i-01_west", "10b_i-01", connections_by_region["10b_i-01_west"], locations_by_region["10b_i-01_west"]),
+    "10b_i-01_east": PreRegion("10b_i-01_east", "10b_i-01", connections_by_region["10b_i-01_east"], locations_by_region["10b_i-01_east"]),
 
-    "10b_i-02_west": PreRegion("10b_i-02_west", "10b_i-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-02_west"]),
-    "10b_i-02_east": PreRegion("10b_i-02_east", "10b_i-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-02_east"]),
+    "10b_i-02_west": PreRegion("10b_i-02_west", "10b_i-02", connections_by_region["10b_i-02_west"], locations_by_region["10b_i-02_west"]),
+    "10b_i-02_east": PreRegion("10b_i-02_east", "10b_i-02", connections_by_region["10b_i-02_east"], locations_by_region["10b_i-02_east"]),
 
-    "10b_i-03_west": PreRegion("10b_i-03_west", "10b_i-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-03_west"]),
-    "10b_i-03_east": PreRegion("10b_i-03_east", "10b_i-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-03_east"]),
+    "10b_i-03_west": PreRegion("10b_i-03_west", "10b_i-03", connections_by_region["10b_i-03_west"], locations_by_region["10b_i-03_west"]),
+    "10b_i-03_east": PreRegion("10b_i-03_east", "10b_i-03", connections_by_region["10b_i-03_east"], locations_by_region["10b_i-03_east"]),
 
-    "10b_i-04_west": PreRegion("10b_i-04_west", "10b_i-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-04_west"]),
-    "10b_i-04_east": PreRegion("10b_i-04_east", "10b_i-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-04_east"]),
+    "10b_i-04_west": PreRegion("10b_i-04_west", "10b_i-04", connections_by_region["10b_i-04_west"], locations_by_region["10b_i-04_west"]),
+    "10b_i-04_east": PreRegion("10b_i-04_east", "10b_i-04", connections_by_region["10b_i-04_east"], locations_by_region["10b_i-04_east"]),
 
-    "10b_i-05_west": PreRegion("10b_i-05_west", "10b_i-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-05_west"]),
-    "10b_i-05_east": PreRegion("10b_i-05_east", "10b_i-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_i-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_i-05_east"]),
+    "10b_i-05_west": PreRegion("10b_i-05_west", "10b_i-05", connections_by_region["10b_i-05_west"], locations_by_region["10b_i-05_west"]),
+    "10b_i-05_east": PreRegion("10b_i-05_east", "10b_i-05", connections_by_region["10b_i-05_east"], locations_by_region["10b_i-05_east"]),
 
-    "10b_j-00_west": PreRegion("10b_j-00_west", "10b_j-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-00_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-00_west"]),
-    "10b_j-00_east": PreRegion("10b_j-00_east", "10b_j-00", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-00_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-00_east"]),
+    "10b_j-00_west": PreRegion("10b_j-00_west", "10b_j-00", connections_by_region["10b_j-00_west"], locations_by_region["10b_j-00_west"]),
+    "10b_j-00_east": PreRegion("10b_j-00_east", "10b_j-00", connections_by_region["10b_j-00_east"], locations_by_region["10b_j-00_east"]),
 
-    "10b_j-00b_west": PreRegion("10b_j-00b_west", "10b_j-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-00b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-00b_west"]),
-    "10b_j-00b_east": PreRegion("10b_j-00b_east", "10b_j-00b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-00b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-00b_east"]),
+    "10b_j-00b_west": PreRegion("10b_j-00b_west", "10b_j-00b", connections_by_region["10b_j-00b_west"], locations_by_region["10b_j-00b_west"]),
+    "10b_j-00b_east": PreRegion("10b_j-00b_east", "10b_j-00b", connections_by_region["10b_j-00b_east"], locations_by_region["10b_j-00b_east"]),
 
-    "10b_j-01_west": PreRegion("10b_j-01_west", "10b_j-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-01_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-01_west"]),
-    "10b_j-01_east": PreRegion("10b_j-01_east", "10b_j-01", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-01_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-01_east"]),
+    "10b_j-01_west": PreRegion("10b_j-01_west", "10b_j-01", connections_by_region["10b_j-01_west"], locations_by_region["10b_j-01_west"]),
+    "10b_j-01_east": PreRegion("10b_j-01_east", "10b_j-01", connections_by_region["10b_j-01_east"], locations_by_region["10b_j-01_east"]),
 
-    "10b_j-02_west": PreRegion("10b_j-02_west", "10b_j-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-02_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-02_west"]),
-    "10b_j-02_east": PreRegion("10b_j-02_east", "10b_j-02", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-02_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-02_east"]),
+    "10b_j-02_west": PreRegion("10b_j-02_west", "10b_j-02", connections_by_region["10b_j-02_west"], locations_by_region["10b_j-02_west"]),
+    "10b_j-02_east": PreRegion("10b_j-02_east", "10b_j-02", connections_by_region["10b_j-02_east"], locations_by_region["10b_j-02_east"]),
 
-    "10b_j-03_west": PreRegion("10b_j-03_west", "10b_j-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-03_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-03_west"]),
-    "10b_j-03_east": PreRegion("10b_j-03_east", "10b_j-03", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-03_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-03_east"]),
+    "10b_j-03_west": PreRegion("10b_j-03_west", "10b_j-03", connections_by_region["10b_j-03_west"], locations_by_region["10b_j-03_west"]),
+    "10b_j-03_east": PreRegion("10b_j-03_east", "10b_j-03", connections_by_region["10b_j-03_east"], locations_by_region["10b_j-03_east"]),
 
-    "10b_j-04_west": PreRegion("10b_j-04_west", "10b_j-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-04_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-04_west"]),
-    "10b_j-04_east": PreRegion("10b_j-04_east", "10b_j-04", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-04_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-04_east"]),
+    "10b_j-04_west": PreRegion("10b_j-04_west", "10b_j-04", connections_by_region["10b_j-04_west"], locations_by_region["10b_j-04_west"]),
+    "10b_j-04_east": PreRegion("10b_j-04_east", "10b_j-04", connections_by_region["10b_j-04_east"], locations_by_region["10b_j-04_east"]),
 
-    "10b_j-05_west": PreRegion("10b_j-05_west", "10b_j-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-05_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-05_west"]),
-    "10b_j-05_east": PreRegion("10b_j-05_east", "10b_j-05", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-05_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-05_east"]),
+    "10b_j-05_west": PreRegion("10b_j-05_west", "10b_j-05", connections_by_region["10b_j-05_west"], locations_by_region["10b_j-05_west"]),
+    "10b_j-05_east": PreRegion("10b_j-05_east", "10b_j-05", connections_by_region["10b_j-05_east"], locations_by_region["10b_j-05_east"]),
 
-    "10b_j-06_west": PreRegion("10b_j-06_west", "10b_j-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-06_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-06_west"]),
-    "10b_j-06_east": PreRegion("10b_j-06_east", "10b_j-06", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-06_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-06_east"]),
+    "10b_j-06_west": PreRegion("10b_j-06_west", "10b_j-06", connections_by_region["10b_j-06_west"], locations_by_region["10b_j-06_west"]),
+    "10b_j-06_east": PreRegion("10b_j-06_east", "10b_j-06", connections_by_region["10b_j-06_east"], locations_by_region["10b_j-06_east"]),
 
-    "10b_j-07_west": PreRegion("10b_j-07_west", "10b_j-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-07_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-07_west"]),
-    "10b_j-07_east": PreRegion("10b_j-07_east", "10b_j-07", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-07_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-07_east"]),
+    "10b_j-07_west": PreRegion("10b_j-07_west", "10b_j-07", connections_by_region["10b_j-07_west"], locations_by_region["10b_j-07_west"]),
+    "10b_j-07_east": PreRegion("10b_j-07_east", "10b_j-07", connections_by_region["10b_j-07_east"], locations_by_region["10b_j-07_east"]),
 
-    "10b_j-08_west": PreRegion("10b_j-08_west", "10b_j-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-08_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-08_west"]),
-    "10b_j-08_east": PreRegion("10b_j-08_east", "10b_j-08", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-08_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-08_east"]),
+    "10b_j-08_west": PreRegion("10b_j-08_west", "10b_j-08", connections_by_region["10b_j-08_west"], locations_by_region["10b_j-08_west"]),
+    "10b_j-08_east": PreRegion("10b_j-08_east", "10b_j-08", connections_by_region["10b_j-08_east"], locations_by_region["10b_j-08_east"]),
 
-    "10b_j-09_west": PreRegion("10b_j-09_west", "10b_j-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-09_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-09_west"]),
-    "10b_j-09_east": PreRegion("10b_j-09_east", "10b_j-09", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-09_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-09_east"]),
+    "10b_j-09_west": PreRegion("10b_j-09_west", "10b_j-09", connections_by_region["10b_j-09_west"], locations_by_region["10b_j-09_west"]),
+    "10b_j-09_east": PreRegion("10b_j-09_east", "10b_j-09", connections_by_region["10b_j-09_east"], locations_by_region["10b_j-09_east"]),
 
-    "10b_j-10_west": PreRegion("10b_j-10_west", "10b_j-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-10_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-10_west"]),
-    "10b_j-10_east": PreRegion("10b_j-10_east", "10b_j-10", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-10_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-10_east"]),
+    "10b_j-10_west": PreRegion("10b_j-10_west", "10b_j-10", connections_by_region["10b_j-10_west"], locations_by_region["10b_j-10_west"]),
+    "10b_j-10_east": PreRegion("10b_j-10_east", "10b_j-10", connections_by_region["10b_j-10_east"], locations_by_region["10b_j-10_east"]),
 
-    "10b_j-11_west": PreRegion("10b_j-11_west", "10b_j-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-11_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-11_west"]),
-    "10b_j-11_east": PreRegion("10b_j-11_east", "10b_j-11", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-11_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-11_east"]),
+    "10b_j-11_west": PreRegion("10b_j-11_west", "10b_j-11", connections_by_region["10b_j-11_west"], locations_by_region["10b_j-11_west"]),
+    "10b_j-11_east": PreRegion("10b_j-11_east", "10b_j-11", connections_by_region["10b_j-11_east"], locations_by_region["10b_j-11_east"]),
 
-    "10b_j-12_west": PreRegion("10b_j-12_west", "10b_j-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-12_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-12_west"]),
-    "10b_j-12_east": PreRegion("10b_j-12_east", "10b_j-12", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-12_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-12_east"]),
+    "10b_j-12_west": PreRegion("10b_j-12_west", "10b_j-12", connections_by_region["10b_j-12_west"], locations_by_region["10b_j-12_west"]),
+    "10b_j-12_east": PreRegion("10b_j-12_east", "10b_j-12", connections_by_region["10b_j-12_east"], locations_by_region["10b_j-12_east"]),
 
-    "10b_j-13_west": PreRegion("10b_j-13_west", "10b_j-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-13_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-13_west"]),
-    "10b_j-13_east": PreRegion("10b_j-13_east", "10b_j-13", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-13_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-13_east"]),
+    "10b_j-13_west": PreRegion("10b_j-13_west", "10b_j-13", connections_by_region["10b_j-13_west"], locations_by_region["10b_j-13_west"]),
+    "10b_j-13_east": PreRegion("10b_j-13_east", "10b_j-13", connections_by_region["10b_j-13_east"], locations_by_region["10b_j-13_east"]),
 
-    "10b_j-14_west": PreRegion("10b_j-14_west", "10b_j-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-14_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-14_west"]),
-    "10b_j-14_east": PreRegion("10b_j-14_east", "10b_j-14", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-14_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-14_east"]),
+    "10b_j-14_west": PreRegion("10b_j-14_west", "10b_j-14", connections_by_region["10b_j-14_west"], locations_by_region["10b_j-14_west"]),
+    "10b_j-14_east": PreRegion("10b_j-14_east", "10b_j-14", connections_by_region["10b_j-14_east"], locations_by_region["10b_j-14_east"]),
 
-    "10b_j-14b_west": PreRegion("10b_j-14b_west", "10b_j-14b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-14b_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-14b_west"]),
-    "10b_j-14b_east": PreRegion("10b_j-14b_east", "10b_j-14b", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-14b_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-14b_east"]),
+    "10b_j-14b_west": PreRegion("10b_j-14b_west", "10b_j-14b", connections_by_region["10b_j-14b_west"], locations_by_region["10b_j-14b_west"]),
+    "10b_j-14b_east": PreRegion("10b_j-14b_east", "10b_j-14b", connections_by_region["10b_j-14b_east"], locations_by_region["10b_j-14b_east"]),
 
-    "10b_j-15_west": PreRegion("10b_j-15_west", "10b_j-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-15_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-15_west"]),
-    "10b_j-15_east": PreRegion("10b_j-15_east", "10b_j-15", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-15_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-15_east"]),
+    "10b_j-15_west": PreRegion("10b_j-15_west", "10b_j-15", connections_by_region["10b_j-15_west"], locations_by_region["10b_j-15_west"]),
+    "10b_j-15_east": PreRegion("10b_j-15_east", "10b_j-15", connections_by_region["10b_j-15_east"], locations_by_region["10b_j-15_east"]),
 
-    "10b_j-16_west": PreRegion("10b_j-16_west", "10b_j-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-16_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-16_west"]),
-    "10b_j-16_top": PreRegion("10b_j-16_top", "10b_j-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-16_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-16_top"]),
-    "10b_j-16_east": PreRegion("10b_j-16_east", "10b_j-16", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-16_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-16_east"]),
+    "10b_j-16_west": PreRegion("10b_j-16_west", "10b_j-16", connections_by_region["10b_j-16_west"], locations_by_region["10b_j-16_west"]),
+    "10b_j-16_top": PreRegion("10b_j-16_top", "10b_j-16", connections_by_region["10b_j-16_top"], locations_by_region["10b_j-16_top"]),
+    "10b_j-16_east": PreRegion("10b_j-16_east", "10b_j-16", connections_by_region["10b_j-16_east"], locations_by_region["10b_j-16_east"]),
 
-    "10b_j-17_south": PreRegion("10b_j-17_south", "10b_j-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-17_south"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-17_south"]),
-    "10b_j-17_west": PreRegion("10b_j-17_west", "10b_j-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-17_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-17_west"]),
-    "10b_j-17_north": PreRegion("10b_j-17_north", "10b_j-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-17_north"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-17_north"]),
-    "10b_j-17_east": PreRegion("10b_j-17_east", "10b_j-17", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-17_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-17_east"]),
+    "10b_j-17_south": PreRegion("10b_j-17_south", "10b_j-17", connections_by_region["10b_j-17_south"], locations_by_region["10b_j-17_south"]),
+    "10b_j-17_west": PreRegion("10b_j-17_west", "10b_j-17", connections_by_region["10b_j-17_west"], locations_by_region["10b_j-17_west"]),
+    "10b_j-17_north": PreRegion("10b_j-17_north", "10b_j-17", connections_by_region["10b_j-17_north"], locations_by_region["10b_j-17_north"]),
+    "10b_j-17_east": PreRegion("10b_j-17_east", "10b_j-17", connections_by_region["10b_j-17_east"], locations_by_region["10b_j-17_east"]),
 
-    "10b_j-18_west": PreRegion("10b_j-18_west", "10b_j-18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-18_west"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-18_west"]),
-    "10b_j-18_east": PreRegion("10b_j-18_east", "10b_j-18", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-18_east"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-18_east"]),
+    "10b_j-18_west": PreRegion("10b_j-18_west", "10b_j-18", connections_by_region["10b_j-18_west"], locations_by_region["10b_j-18_west"]),
+    "10b_j-18_east": PreRegion("10b_j-18_east", "10b_j-18", connections_by_region["10b_j-18_east"], locations_by_region["10b_j-18_east"]),
 
-    "10b_j-19_bottom": PreRegion("10b_j-19_bottom", "10b_j-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-19_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-19_bottom"]),
-    "10b_j-19_top": PreRegion("10b_j-19_top", "10b_j-19", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_j-19_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_j-19_top"]),
+    "10b_j-19_bottom": PreRegion("10b_j-19_bottom", "10b_j-19", connections_by_region["10b_j-19_bottom"], locations_by_region["10b_j-19_bottom"]),
+    "10b_j-19_top": PreRegion("10b_j-19_top", "10b_j-19", connections_by_region["10b_j-19_top"], locations_by_region["10b_j-19_top"]),
 
-    "10b_GOAL_main": PreRegion("10b_GOAL_main", "10b_GOAL", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_GOAL_main"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_GOAL_main"]),
-    "10b_GOAL_moon": PreRegion("10b_GOAL_moon", "10b_GOAL", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10b_GOAL_moon"], [loc for _, loc in all_locations.items() if loc.region_name == "10b_GOAL_moon"]),
+    "10b_GOAL_main": PreRegion("10b_GOAL_main", "10b_GOAL", connections_by_region["10b_GOAL_main"], locations_by_region["10b_GOAL_main"]),
+    "10b_GOAL_moon": PreRegion("10b_GOAL_moon", "10b_GOAL", connections_by_region["10b_GOAL_moon"], locations_by_region["10b_GOAL_moon"]),
 
-    "10c_end-golden_bottom": PreRegion("10c_end-golden_bottom", "10c_end-golden", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10c_end-golden_bottom"], [loc for _, loc in all_locations.items() if loc.region_name == "10c_end-golden_bottom"]),
-    "10c_end-golden_top": PreRegion("10c_end-golden_top", "10c_end-golden", [reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == "10c_end-golden_top"], [loc for _, loc in all_locations.items() if loc.region_name == "10c_end-golden_top"]),
+    "10c_end-golden_bottom": PreRegion("10c_end-golden_bottom", "10c_end-golden", connections_by_region["10c_end-golden_bottom"], locations_by_region["10c_end-golden_bottom"]),
+    "10c_end-golden_top": PreRegion("10c_end-golden_top", "10c_end-golden", connections_by_region["10c_end-golden_top"], locations_by_region["10c_end-golden_top"]),
 
 }
 
@@ -8923,870 +8933,888 @@ all_room_connections: dict[str, RoomConnection] = {
 
 }
 
+regions_by_room: defaultdict[str, list[PreRegion]] = defaultdict(lambda: [])
+doors_by_room: defaultdict[str, list[Door]] = defaultdict(lambda: [])
+
+for _, region in all_regions.items():
+    regions_by_room[region.room_name].append(region)
+
+for _, door in all_doors.items():
+    doors_by_room[door.room_name].append(door)
+
 all_rooms: dict[str, Room] = {
-    "0a_-1": Room("0a", "0a_-1", "Prologue - Room -1", [reg for _, reg in all_regions.items() if reg.room_name == "0a_-1"], [door for _, door in all_doors.items() if door.room_name == "0a_-1"]),
-    "0a_0": Room("0a", "0a_0", "Prologue - Room 0", [reg for _, reg in all_regions.items() if reg.room_name == "0a_0"], [door for _, door in all_doors.items() if door.room_name == "0a_0"], "Start", "0a_0_west"),
-    "0a_0b": Room("0a", "0a_0b", "Prologue - Room 0b", [reg for _, reg in all_regions.items() if reg.room_name == "0a_0b"], [door for _, door in all_doors.items() if door.room_name == "0a_0b"]),
-    "0a_1": Room("0a", "0a_1", "Prologue - Room 1", [reg for _, reg in all_regions.items() if reg.room_name == "0a_1"], [door for _, door in all_doors.items() if door.room_name == "0a_1"]),
-    "0a_2": Room("0a", "0a_2", "Prologue - Room 2", [reg for _, reg in all_regions.items() if reg.room_name == "0a_2"], [door for _, door in all_doors.items() if door.room_name == "0a_2"]),
-    "0a_3": Room("0a", "0a_3", "Prologue - Room 3", [reg for _, reg in all_regions.items() if reg.room_name == "0a_3"], [door for _, door in all_doors.items() if door.room_name == "0a_3"]),
+    "0a_-1": Room("0a", "0a_-1", "Prologue - Room -1", regions_by_room["0a_-1"], doors_by_room["0a_-1"]),
+    "0a_0": Room("0a", "0a_0", "Prologue - Room 0", regions_by_room["0a_0"], doors_by_room["0a_0"], "Start", "0a_0_west"),
+    "0a_0b": Room("0a", "0a_0b", "Prologue - Room 0b", regions_by_room["0a_0b"], doors_by_room["0a_0b"]),
+    "0a_1": Room("0a", "0a_1", "Prologue - Room 1", regions_by_room["0a_1"], doors_by_room["0a_1"]),
+    "0a_2": Room("0a", "0a_2", "Prologue - Room 2", regions_by_room["0a_2"], doors_by_room["0a_2"]),
+    "0a_3": Room("0a", "0a_3", "Prologue - Room 3", regions_by_room["0a_3"], doors_by_room["0a_3"]),
 
-    "1a_1": Room("1a", "1a_1", "Forsaken City A - Room 1", [reg for _, reg in all_regions.items() if reg.room_name == "1a_1"], [door for _, door in all_doors.items() if door.room_name == "1a_1"], "Start", "1a_1_main"),
-    "1a_2": Room("1a", "1a_2", "Forsaken City A - Room 2", [reg for _, reg in all_regions.items() if reg.room_name == "1a_2"], [door for _, door in all_doors.items() if door.room_name == "1a_2"]),
-    "1a_3": Room("1a", "1a_3", "Forsaken City A - Room 3", [reg for _, reg in all_regions.items() if reg.room_name == "1a_3"], [door for _, door in all_doors.items() if door.room_name == "1a_3"]),
-    "1a_4": Room("1a", "1a_4", "Forsaken City A - Room 4", [reg for _, reg in all_regions.items() if reg.room_name == "1a_4"], [door for _, door in all_doors.items() if door.room_name == "1a_4"]),
-    "1a_3b": Room("1a", "1a_3b", "Forsaken City A - Room 3b", [reg for _, reg in all_regions.items() if reg.room_name == "1a_3b"], [door for _, door in all_doors.items() if door.room_name == "1a_3b"]),
-    "1a_5": Room("1a", "1a_5", "Forsaken City A - Room 5", [reg for _, reg in all_regions.items() if reg.room_name == "1a_5"], [door for _, door in all_doors.items() if door.room_name == "1a_5"]),
-    "1a_5z": Room("1a", "1a_5z", "Forsaken City A - Room 5z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_5z"], [door for _, door in all_doors.items() if door.room_name == "1a_5z"]),
-    "1a_5a": Room("1a", "1a_5a", "Forsaken City A - Room 5a", [reg for _, reg in all_regions.items() if reg.room_name == "1a_5a"], [door for _, door in all_doors.items() if door.room_name == "1a_5a"]),
-    "1a_6": Room("1a", "1a_6", "Forsaken City A - Room 6", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6"], [door for _, door in all_doors.items() if door.room_name == "1a_6"], "Crossing", "1a_6_south-west"),
-    "1a_6z": Room("1a", "1a_6z", "Forsaken City A - Room 6z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6z"], [door for _, door in all_doors.items() if door.room_name == "1a_6z"]),
-    "1a_6zb": Room("1a", "1a_6zb", "Forsaken City A - Room 6zb", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6zb"], [door for _, door in all_doors.items() if door.room_name == "1a_6zb"]),
-    "1a_7zb": Room("1a", "1a_7zb", "Forsaken City A - Room 7zb", [reg for _, reg in all_regions.items() if reg.room_name == "1a_7zb"], [door for _, door in all_doors.items() if door.room_name == "1a_7zb"]),
-    "1a_6a": Room("1a", "1a_6a", "Forsaken City A - Room 6a", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6a"], [door for _, door in all_doors.items() if door.room_name == "1a_6a"]),
-    "1a_6b": Room("1a", "1a_6b", "Forsaken City A - Room 6b", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6b"], [door for _, door in all_doors.items() if door.room_name == "1a_6b"]),
-    "1a_s0": Room("1a", "1a_s0", "Forsaken City A - Room s0", [reg for _, reg in all_regions.items() if reg.room_name == "1a_s0"], [door for _, door in all_doors.items() if door.room_name == "1a_s0"]),
-    "1a_s1": Room("1a", "1a_s1", "Forsaken City A - Room s1", [reg for _, reg in all_regions.items() if reg.room_name == "1a_s1"], [door for _, door in all_doors.items() if door.room_name == "1a_s1"]),
-    "1a_6c": Room("1a", "1a_6c", "Forsaken City A - Room 6c", [reg for _, reg in all_regions.items() if reg.room_name == "1a_6c"], [door for _, door in all_doors.items() if door.room_name == "1a_6c"]),
-    "1a_7": Room("1a", "1a_7", "Forsaken City A - Room 7", [reg for _, reg in all_regions.items() if reg.room_name == "1a_7"], [door for _, door in all_doors.items() if door.room_name == "1a_7"]),
-    "1a_7z": Room("1a", "1a_7z", "Forsaken City A - Room 7z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_7z"], [door for _, door in all_doors.items() if door.room_name == "1a_7z"]),
-    "1a_8z": Room("1a", "1a_8z", "Forsaken City A - Room 8z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_8z"], [door for _, door in all_doors.items() if door.room_name == "1a_8z"]),
-    "1a_8zb": Room("1a", "1a_8zb", "Forsaken City A - Room 8zb", [reg for _, reg in all_regions.items() if reg.room_name == "1a_8zb"], [door for _, door in all_doors.items() if door.room_name == "1a_8zb"]),
-    "1a_8": Room("1a", "1a_8", "Forsaken City A - Room 8", [reg for _, reg in all_regions.items() if reg.room_name == "1a_8"], [door for _, door in all_doors.items() if door.room_name == "1a_8"]),
-    "1a_7a": Room("1a", "1a_7a", "Forsaken City A - Room 7a", [reg for _, reg in all_regions.items() if reg.room_name == "1a_7a"], [door for _, door in all_doors.items() if door.room_name == "1a_7a"]),
-    "1a_9z": Room("1a", "1a_9z", "Forsaken City A - Room 9z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_9z"], [door for _, door in all_doors.items() if door.room_name == "1a_9z"]),
-    "1a_8b": Room("1a", "1a_8b", "Forsaken City A - Room 8b", [reg for _, reg in all_regions.items() if reg.room_name == "1a_8b"], [door for _, door in all_doors.items() if door.room_name == "1a_8b"]),
-    "1a_9": Room("1a", "1a_9", "Forsaken City A - Room 9", [reg for _, reg in all_regions.items() if reg.room_name == "1a_9"], [door for _, door in all_doors.items() if door.room_name == "1a_9"]),
-    "1a_9b": Room("1a", "1a_9b", "Forsaken City A - Room 9b", [reg for _, reg in all_regions.items() if reg.room_name == "1a_9b"], [door for _, door in all_doors.items() if door.room_name == "1a_9b"], "Chasm", "1a_9b_west"),
-    "1a_9c": Room("1a", "1a_9c", "Forsaken City A - Room 9c", [reg for _, reg in all_regions.items() if reg.room_name == "1a_9c"], [door for _, door in all_doors.items() if door.room_name == "1a_9c"]),
-    "1a_10": Room("1a", "1a_10", "Forsaken City A - Room 10", [reg for _, reg in all_regions.items() if reg.room_name == "1a_10"], [door for _, door in all_doors.items() if door.room_name == "1a_10"]),
-    "1a_10z": Room("1a", "1a_10z", "Forsaken City A - Room 10z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_10z"], [door for _, door in all_doors.items() if door.room_name == "1a_10z"]),
-    "1a_10zb": Room("1a", "1a_10zb", "Forsaken City A - Room 10zb", [reg for _, reg in all_regions.items() if reg.room_name == "1a_10zb"], [door for _, door in all_doors.items() if door.room_name == "1a_10zb"]),
-    "1a_11": Room("1a", "1a_11", "Forsaken City A - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "1a_11"], [door for _, door in all_doors.items() if door.room_name == "1a_11"]),
-    "1a_11z": Room("1a", "1a_11z", "Forsaken City A - Room 11z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_11z"], [door for _, door in all_doors.items() if door.room_name == "1a_11z"]),
-    "1a_10a": Room("1a", "1a_10a", "Forsaken City A - Room 10a", [reg for _, reg in all_regions.items() if reg.room_name == "1a_10a"], [door for _, door in all_doors.items() if door.room_name == "1a_10a"]),
-    "1a_12": Room("1a", "1a_12", "Forsaken City A - Room 12", [reg for _, reg in all_regions.items() if reg.room_name == "1a_12"], [door for _, door in all_doors.items() if door.room_name == "1a_12"]),
-    "1a_12z": Room("1a", "1a_12z", "Forsaken City A - Room 12z", [reg for _, reg in all_regions.items() if reg.room_name == "1a_12z"], [door for _, door in all_doors.items() if door.room_name == "1a_12z"]),
-    "1a_12a": Room("1a", "1a_12a", "Forsaken City A - Room 12a", [reg for _, reg in all_regions.items() if reg.room_name == "1a_12a"], [door for _, door in all_doors.items() if door.room_name == "1a_12a"]),
-    "1a_end": Room("1a", "1a_end", "Forsaken City A - Room end", [reg for _, reg in all_regions.items() if reg.room_name == "1a_end"], [door for _, door in all_doors.items() if door.room_name == "1a_end"]),
+    "1a_1": Room("1a", "1a_1", "Forsaken City A - Room 1", regions_by_room["1a_1"], doors_by_room["1a_1"], "Start", "1a_1_main"),
+    "1a_2": Room("1a", "1a_2", "Forsaken City A - Room 2", regions_by_room["1a_2"], doors_by_room["1a_2"]),
+    "1a_3": Room("1a", "1a_3", "Forsaken City A - Room 3", regions_by_room["1a_3"], doors_by_room["1a_3"]),
+    "1a_4": Room("1a", "1a_4", "Forsaken City A - Room 4", regions_by_room["1a_4"], doors_by_room["1a_4"]),
+    "1a_3b": Room("1a", "1a_3b", "Forsaken City A - Room 3b", regions_by_room["1a_3b"], doors_by_room["1a_3b"]),
+    "1a_5": Room("1a", "1a_5", "Forsaken City A - Room 5", regions_by_room["1a_5"], doors_by_room["1a_5"]),
+    "1a_5z": Room("1a", "1a_5z", "Forsaken City A - Room 5z", regions_by_room["1a_5z"], doors_by_room["1a_5z"]),
+    "1a_5a": Room("1a", "1a_5a", "Forsaken City A - Room 5a", regions_by_room["1a_5a"], doors_by_room["1a_5a"]),
+    "1a_6": Room("1a", "1a_6", "Forsaken City A - Room 6", regions_by_room["1a_6"], doors_by_room["1a_6"], "Crossing", "1a_6_south-west"),
+    "1a_6z": Room("1a", "1a_6z", "Forsaken City A - Room 6z", regions_by_room["1a_6z"], doors_by_room["1a_6z"]),
+    "1a_6zb": Room("1a", "1a_6zb", "Forsaken City A - Room 6zb", regions_by_room["1a_6zb"], doors_by_room["1a_6zb"]),
+    "1a_7zb": Room("1a", "1a_7zb", "Forsaken City A - Room 7zb", regions_by_room["1a_7zb"], doors_by_room["1a_7zb"]),
+    "1a_6a": Room("1a", "1a_6a", "Forsaken City A - Room 6a", regions_by_room["1a_6a"], doors_by_room["1a_6a"]),
+    "1a_6b": Room("1a", "1a_6b", "Forsaken City A - Room 6b", regions_by_room["1a_6b"], doors_by_room["1a_6b"]),
+    "1a_s0": Room("1a", "1a_s0", "Forsaken City A - Room s0", regions_by_room["1a_s0"], doors_by_room["1a_s0"]),
+    "1a_s1": Room("1a", "1a_s1", "Forsaken City A - Room s1", regions_by_room["1a_s1"], doors_by_room["1a_s1"]),
+    "1a_6c": Room("1a", "1a_6c", "Forsaken City A - Room 6c", regions_by_room["1a_6c"], doors_by_room["1a_6c"]),
+    "1a_7": Room("1a", "1a_7", "Forsaken City A - Room 7", regions_by_room["1a_7"], doors_by_room["1a_7"]),
+    "1a_7z": Room("1a", "1a_7z", "Forsaken City A - Room 7z", regions_by_room["1a_7z"], doors_by_room["1a_7z"]),
+    "1a_8z": Room("1a", "1a_8z", "Forsaken City A - Room 8z", regions_by_room["1a_8z"], doors_by_room["1a_8z"]),
+    "1a_8zb": Room("1a", "1a_8zb", "Forsaken City A - Room 8zb", regions_by_room["1a_8zb"], doors_by_room["1a_8zb"]),
+    "1a_8": Room("1a", "1a_8", "Forsaken City A - Room 8", regions_by_room["1a_8"], doors_by_room["1a_8"]),
+    "1a_7a": Room("1a", "1a_7a", "Forsaken City A - Room 7a", regions_by_room["1a_7a"], doors_by_room["1a_7a"]),
+    "1a_9z": Room("1a", "1a_9z", "Forsaken City A - Room 9z", regions_by_room["1a_9z"], doors_by_room["1a_9z"]),
+    "1a_8b": Room("1a", "1a_8b", "Forsaken City A - Room 8b", regions_by_room["1a_8b"], doors_by_room["1a_8b"]),
+    "1a_9": Room("1a", "1a_9", "Forsaken City A - Room 9", regions_by_room["1a_9"], doors_by_room["1a_9"]),
+    "1a_9b": Room("1a", "1a_9b", "Forsaken City A - Room 9b", regions_by_room["1a_9b"], doors_by_room["1a_9b"], "Chasm", "1a_9b_west"),
+    "1a_9c": Room("1a", "1a_9c", "Forsaken City A - Room 9c", regions_by_room["1a_9c"], doors_by_room["1a_9c"]),
+    "1a_10": Room("1a", "1a_10", "Forsaken City A - Room 10", regions_by_room["1a_10"], doors_by_room["1a_10"]),
+    "1a_10z": Room("1a", "1a_10z", "Forsaken City A - Room 10z", regions_by_room["1a_10z"], doors_by_room["1a_10z"]),
+    "1a_10zb": Room("1a", "1a_10zb", "Forsaken City A - Room 10zb", regions_by_room["1a_10zb"], doors_by_room["1a_10zb"]),
+    "1a_11": Room("1a", "1a_11", "Forsaken City A - Room 11", regions_by_room["1a_11"], doors_by_room["1a_11"]),
+    "1a_11z": Room("1a", "1a_11z", "Forsaken City A - Room 11z", regions_by_room["1a_11z"], doors_by_room["1a_11z"]),
+    "1a_10a": Room("1a", "1a_10a", "Forsaken City A - Room 10a", regions_by_room["1a_10a"], doors_by_room["1a_10a"]),
+    "1a_12": Room("1a", "1a_12", "Forsaken City A - Room 12", regions_by_room["1a_12"], doors_by_room["1a_12"]),
+    "1a_12z": Room("1a", "1a_12z", "Forsaken City A - Room 12z", regions_by_room["1a_12z"], doors_by_room["1a_12z"]),
+    "1a_12a": Room("1a", "1a_12a", "Forsaken City A - Room 12a", regions_by_room["1a_12a"], doors_by_room["1a_12a"]),
+    "1a_end": Room("1a", "1a_end", "Forsaken City A - Room end", regions_by_room["1a_end"], doors_by_room["1a_end"]),
 
-    "1b_00": Room("1b", "1b_00", "Forsaken City B - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "1b_00"], [door for _, door in all_doors.items() if door.room_name == "1b_00"], "Start", "1b_00_west"),
-    "1b_01": Room("1b", "1b_01", "Forsaken City B - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "1b_01"], [door for _, door in all_doors.items() if door.room_name == "1b_01"]),
-    "1b_02": Room("1b", "1b_02", "Forsaken City B - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "1b_02"], [door for _, door in all_doors.items() if door.room_name == "1b_02"]),
-    "1b_02b": Room("1b", "1b_02b", "Forsaken City B - Room 02b", [reg for _, reg in all_regions.items() if reg.room_name == "1b_02b"], [door for _, door in all_doors.items() if door.room_name == "1b_02b"]),
-    "1b_03": Room("1b", "1b_03", "Forsaken City B - Room 03", [reg for _, reg in all_regions.items() if reg.room_name == "1b_03"], [door for _, door in all_doors.items() if door.room_name == "1b_03"]),
-    "1b_04": Room("1b", "1b_04", "Forsaken City B - Room 04", [reg for _, reg in all_regions.items() if reg.room_name == "1b_04"], [door for _, door in all_doors.items() if door.room_name == "1b_04"], "Contraption", "1b_04_west"),
-    "1b_05": Room("1b", "1b_05", "Forsaken City B - Room 05", [reg for _, reg in all_regions.items() if reg.room_name == "1b_05"], [door for _, door in all_doors.items() if door.room_name == "1b_05"]),
-    "1b_05b": Room("1b", "1b_05b", "Forsaken City B - Room 05b", [reg for _, reg in all_regions.items() if reg.room_name == "1b_05b"], [door for _, door in all_doors.items() if door.room_name == "1b_05b"]),
-    "1b_06": Room("1b", "1b_06", "Forsaken City B - Room 06", [reg for _, reg in all_regions.items() if reg.room_name == "1b_06"], [door for _, door in all_doors.items() if door.room_name == "1b_06"]),
-    "1b_07": Room("1b", "1b_07", "Forsaken City B - Room 07", [reg for _, reg in all_regions.items() if reg.room_name == "1b_07"], [door for _, door in all_doors.items() if door.room_name == "1b_07"]),
-    "1b_08": Room("1b", "1b_08", "Forsaken City B - Room 08", [reg for _, reg in all_regions.items() if reg.room_name == "1b_08"], [door for _, door in all_doors.items() if door.room_name == "1b_08"], "Scrap Pit", "1b_08_west"),
-    "1b_08b": Room("1b", "1b_08b", "Forsaken City B - Room 08b", [reg for _, reg in all_regions.items() if reg.room_name == "1b_08b"], [door for _, door in all_doors.items() if door.room_name == "1b_08b"]),
-    "1b_09": Room("1b", "1b_09", "Forsaken City B - Room 09", [reg for _, reg in all_regions.items() if reg.room_name == "1b_09"], [door for _, door in all_doors.items() if door.room_name == "1b_09"]),
-    "1b_10": Room("1b", "1b_10", "Forsaken City B - Room 10", [reg for _, reg in all_regions.items() if reg.room_name == "1b_10"], [door for _, door in all_doors.items() if door.room_name == "1b_10"]),
-    "1b_11": Room("1b", "1b_11", "Forsaken City B - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "1b_11"], [door for _, door in all_doors.items() if door.room_name == "1b_11"]),
-    "1b_end": Room("1b", "1b_end", "Forsaken City B - Room end", [reg for _, reg in all_regions.items() if reg.room_name == "1b_end"], [door for _, door in all_doors.items() if door.room_name == "1b_end"]),
+    "1b_00": Room("1b", "1b_00", "Forsaken City B - Room 00", regions_by_room["1b_00"], doors_by_room["1b_00"], "Start", "1b_00_west"),
+    "1b_01": Room("1b", "1b_01", "Forsaken City B - Room 01", regions_by_room["1b_01"], doors_by_room["1b_01"]),
+    "1b_02": Room("1b", "1b_02", "Forsaken City B - Room 02", regions_by_room["1b_02"], doors_by_room["1b_02"]),
+    "1b_02b": Room("1b", "1b_02b", "Forsaken City B - Room 02b", regions_by_room["1b_02b"], doors_by_room["1b_02b"]),
+    "1b_03": Room("1b", "1b_03", "Forsaken City B - Room 03", regions_by_room["1b_03"], doors_by_room["1b_03"]),
+    "1b_04": Room("1b", "1b_04", "Forsaken City B - Room 04", regions_by_room["1b_04"], doors_by_room["1b_04"], "Contraption", "1b_04_west"),
+    "1b_05": Room("1b", "1b_05", "Forsaken City B - Room 05", regions_by_room["1b_05"], doors_by_room["1b_05"]),
+    "1b_05b": Room("1b", "1b_05b", "Forsaken City B - Room 05b", regions_by_room["1b_05b"], doors_by_room["1b_05b"]),
+    "1b_06": Room("1b", "1b_06", "Forsaken City B - Room 06", regions_by_room["1b_06"], doors_by_room["1b_06"]),
+    "1b_07": Room("1b", "1b_07", "Forsaken City B - Room 07", regions_by_room["1b_07"], doors_by_room["1b_07"]),
+    "1b_08": Room("1b", "1b_08", "Forsaken City B - Room 08", regions_by_room["1b_08"], doors_by_room["1b_08"], "Scrap Pit", "1b_08_west"),
+    "1b_08b": Room("1b", "1b_08b", "Forsaken City B - Room 08b", regions_by_room["1b_08b"], doors_by_room["1b_08b"]),
+    "1b_09": Room("1b", "1b_09", "Forsaken City B - Room 09", regions_by_room["1b_09"], doors_by_room["1b_09"]),
+    "1b_10": Room("1b", "1b_10", "Forsaken City B - Room 10", regions_by_room["1b_10"], doors_by_room["1b_10"]),
+    "1b_11": Room("1b", "1b_11", "Forsaken City B - Room 11", regions_by_room["1b_11"], doors_by_room["1b_11"]),
+    "1b_end": Room("1b", "1b_end", "Forsaken City B - Room end", regions_by_room["1b_end"], doors_by_room["1b_end"]),
 
-    "1c_00": Room("1c", "1c_00", "Forsaken City C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "1c_00"], [door for _, door in all_doors.items() if door.room_name == "1c_00"], "Start", "1c_00_west"),
-    "1c_01": Room("1c", "1c_01", "Forsaken City C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "1c_01"], [door for _, door in all_doors.items() if door.room_name == "1c_01"]),
-    "1c_02": Room("1c", "1c_02", "Forsaken City C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "1c_02"], [door for _, door in all_doors.items() if door.room_name == "1c_02"]),
+    "1c_00": Room("1c", "1c_00", "Forsaken City C - Room 00", regions_by_room["1c_00"], doors_by_room["1c_00"], "Start", "1c_00_west"),
+    "1c_01": Room("1c", "1c_01", "Forsaken City C - Room 01", regions_by_room["1c_01"], doors_by_room["1c_01"]),
+    "1c_02": Room("1c", "1c_02", "Forsaken City C - Room 02", regions_by_room["1c_02"], doors_by_room["1c_02"]),
 
-    "2a_start": Room("2a", "2a_start", "Old Site A - Room start", [reg for _, reg in all_regions.items() if reg.room_name == "2a_start"], [door for _, door in all_doors.items() if door.room_name == "2a_start"], "Start", "2a_start_main"),
-    "2a_s0": Room("2a", "2a_s0", "Old Site A - Room s0", [reg for _, reg in all_regions.items() if reg.room_name == "2a_s0"], [door for _, door in all_doors.items() if door.room_name == "2a_s0"]),
-    "2a_s1": Room("2a", "2a_s1", "Old Site A - Room s1", [reg for _, reg in all_regions.items() if reg.room_name == "2a_s1"], [door for _, door in all_doors.items() if door.room_name == "2a_s1"]),
-    "2a_s2": Room("2a", "2a_s2", "Old Site A - Room s2", [reg for _, reg in all_regions.items() if reg.room_name == "2a_s2"], [door for _, door in all_doors.items() if door.room_name == "2a_s2"]),
-    "2a_0": Room("2a", "2a_0", "Old Site A - Room 0", [reg for _, reg in all_regions.items() if reg.room_name == "2a_0"], [door for _, door in all_doors.items() if door.room_name == "2a_0"]),
-    "2a_1": Room("2a", "2a_1", "Old Site A - Room 1", [reg for _, reg in all_regions.items() if reg.room_name == "2a_1"], [door for _, door in all_doors.items() if door.room_name == "2a_1"]),
-    "2a_d0": Room("2a", "2a_d0", "Old Site A - Room d0", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d0"], [door for _, door in all_doors.items() if door.room_name == "2a_d0"]),
-    "2a_d7": Room("2a", "2a_d7", "Old Site A - Room d7", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d7"], [door for _, door in all_doors.items() if door.room_name == "2a_d7"]),
-    "2a_d8": Room("2a", "2a_d8", "Old Site A - Room d8", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d8"], [door for _, door in all_doors.items() if door.room_name == "2a_d8"]),
-    "2a_d3": Room("2a", "2a_d3", "Old Site A - Room d3", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d3"], [door for _, door in all_doors.items() if door.room_name == "2a_d3"]),
-    "2a_d2": Room("2a", "2a_d2", "Old Site A - Room d2", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d2"], [door for _, door in all_doors.items() if door.room_name == "2a_d2"]),
-    "2a_d9": Room("2a", "2a_d9", "Old Site A - Room d9", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d9"], [door for _, door in all_doors.items() if door.room_name == "2a_d9"]),
-    "2a_d1": Room("2a", "2a_d1", "Old Site A - Room d1", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d1"], [door for _, door in all_doors.items() if door.room_name == "2a_d1"]),
-    "2a_d6": Room("2a", "2a_d6", "Old Site A - Room d6", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d6"], [door for _, door in all_doors.items() if door.room_name == "2a_d6"]),
-    "2a_d4": Room("2a", "2a_d4", "Old Site A - Room d4", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d4"], [door for _, door in all_doors.items() if door.room_name == "2a_d4"]),
-    "2a_d5": Room("2a", "2a_d5", "Old Site A - Room d5", [reg for _, reg in all_regions.items() if reg.room_name == "2a_d5"], [door for _, door in all_doors.items() if door.room_name == "2a_d5"]),
-    "2a_3x": Room("2a", "2a_3x", "Old Site A - Room 3x", [reg for _, reg in all_regions.items() if reg.room_name == "2a_3x"], [door for _, door in all_doors.items() if door.room_name == "2a_3x"]),
-    "2a_3": Room("2a", "2a_3", "Old Site A - Room 3", [reg for _, reg in all_regions.items() if reg.room_name == "2a_3"], [door for _, door in all_doors.items() if door.room_name == "2a_3"], "Intervention", "2a_3_bottom"),
-    "2a_4": Room("2a", "2a_4", "Old Site A - Room 4", [reg for _, reg in all_regions.items() if reg.room_name == "2a_4"], [door for _, door in all_doors.items() if door.room_name == "2a_4"]),
-    "2a_5": Room("2a", "2a_5", "Old Site A - Room 5", [reg for _, reg in all_regions.items() if reg.room_name == "2a_5"], [door for _, door in all_doors.items() if door.room_name == "2a_5"]),
-    "2a_6": Room("2a", "2a_6", "Old Site A - Room 6", [reg for _, reg in all_regions.items() if reg.room_name == "2a_6"], [door for _, door in all_doors.items() if door.room_name == "2a_6"]),
-    "2a_7": Room("2a", "2a_7", "Old Site A - Room 7", [reg for _, reg in all_regions.items() if reg.room_name == "2a_7"], [door for _, door in all_doors.items() if door.room_name == "2a_7"]),
-    "2a_8": Room("2a", "2a_8", "Old Site A - Room 8", [reg for _, reg in all_regions.items() if reg.room_name == "2a_8"], [door for _, door in all_doors.items() if door.room_name == "2a_8"]),
-    "2a_9": Room("2a", "2a_9", "Old Site A - Room 9", [reg for _, reg in all_regions.items() if reg.room_name == "2a_9"], [door for _, door in all_doors.items() if door.room_name == "2a_9"]),
-    "2a_9b": Room("2a", "2a_9b", "Old Site A - Room 9b", [reg for _, reg in all_regions.items() if reg.room_name == "2a_9b"], [door for _, door in all_doors.items() if door.room_name == "2a_9b"]),
-    "2a_10": Room("2a", "2a_10", "Old Site A - Room 10", [reg for _, reg in all_regions.items() if reg.room_name == "2a_10"], [door for _, door in all_doors.items() if door.room_name == "2a_10"]),
-    "2a_2": Room("2a", "2a_2", "Old Site A - Room 2", [reg for _, reg in all_regions.items() if reg.room_name == "2a_2"], [door for _, door in all_doors.items() if door.room_name == "2a_2"]),
-    "2a_11": Room("2a", "2a_11", "Old Site A - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "2a_11"], [door for _, door in all_doors.items() if door.room_name == "2a_11"]),
-    "2a_12b": Room("2a", "2a_12b", "Old Site A - Room 12b", [reg for _, reg in all_regions.items() if reg.room_name == "2a_12b"], [door for _, door in all_doors.items() if door.room_name == "2a_12b"]),
-    "2a_12c": Room("2a", "2a_12c", "Old Site A - Room 12c", [reg for _, reg in all_regions.items() if reg.room_name == "2a_12c"], [door for _, door in all_doors.items() if door.room_name == "2a_12c"]),
-    "2a_12d": Room("2a", "2a_12d", "Old Site A - Room 12d", [reg for _, reg in all_regions.items() if reg.room_name == "2a_12d"], [door for _, door in all_doors.items() if door.room_name == "2a_12d"]),
-    "2a_12": Room("2a", "2a_12", "Old Site A - Room 12", [reg for _, reg in all_regions.items() if reg.room_name == "2a_12"], [door for _, door in all_doors.items() if door.room_name == "2a_12"]),
-    "2a_13": Room("2a", "2a_13", "Old Site A - Room 13", [reg for _, reg in all_regions.items() if reg.room_name == "2a_13"], [door for _, door in all_doors.items() if door.room_name == "2a_13"]),
-    "2a_end_0": Room("2a", "2a_end_0", "Old Site A - Room end_0", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_0"], [door for _, door in all_doors.items() if door.room_name == "2a_end_0"]),
-    "2a_end_s0": Room("2a", "2a_end_s0", "Old Site A - Room end_s0", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_s0"], [door for _, door in all_doors.items() if door.room_name == "2a_end_s0"]),
-    "2a_end_s1": Room("2a", "2a_end_s1", "Old Site A - Room end_s1", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_s1"], [door for _, door in all_doors.items() if door.room_name == "2a_end_s1"]),
-    "2a_end_1": Room("2a", "2a_end_1", "Old Site A - Room end_1", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_1"], [door for _, door in all_doors.items() if door.room_name == "2a_end_1"]),
-    "2a_end_2": Room("2a", "2a_end_2", "Old Site A - Room end_2", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_2"], [door for _, door in all_doors.items() if door.room_name == "2a_end_2"]),
-    "2a_end_3": Room("2a", "2a_end_3", "Old Site A - Room end_3", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_3"], [door for _, door in all_doors.items() if door.room_name == "2a_end_3"], "Awake", "2a_end_3_west"),
-    "2a_end_4": Room("2a", "2a_end_4", "Old Site A - Room end_4", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_4"], [door for _, door in all_doors.items() if door.room_name == "2a_end_4"]),
-    "2a_end_3b": Room("2a", "2a_end_3b", "Old Site A - Room end_3b", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_3b"], [door for _, door in all_doors.items() if door.room_name == "2a_end_3b"]),
-    "2a_end_3cb": Room("2a", "2a_end_3cb", "Old Site A - Room end_3cb", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_3cb"], [door for _, door in all_doors.items() if door.room_name == "2a_end_3cb"]),
-    "2a_end_3c": Room("2a", "2a_end_3c", "Old Site A - Room end_3c", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_3c"], [door for _, door in all_doors.items() if door.room_name == "2a_end_3c"]),
-    "2a_end_5": Room("2a", "2a_end_5", "Old Site A - Room end_5", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_5"], [door for _, door in all_doors.items() if door.room_name == "2a_end_5"]),
-    "2a_end_6": Room("2a", "2a_end_6", "Old Site A - Room end_6", [reg for _, reg in all_regions.items() if reg.room_name == "2a_end_6"], [door for _, door in all_doors.items() if door.room_name == "2a_end_6"]),
+    "2a_start": Room("2a", "2a_start", "Old Site A - Room start", regions_by_room["2a_start"], doors_by_room["2a_start"], "Start", "2a_start_main"),
+    "2a_s0": Room("2a", "2a_s0", "Old Site A - Room s0", regions_by_room["2a_s0"], doors_by_room["2a_s0"]),
+    "2a_s1": Room("2a", "2a_s1", "Old Site A - Room s1", regions_by_room["2a_s1"], doors_by_room["2a_s1"]),
+    "2a_s2": Room("2a", "2a_s2", "Old Site A - Room s2", regions_by_room["2a_s2"], doors_by_room["2a_s2"]),
+    "2a_0": Room("2a", "2a_0", "Old Site A - Room 0", regions_by_room["2a_0"], doors_by_room["2a_0"]),
+    "2a_1": Room("2a", "2a_1", "Old Site A - Room 1", regions_by_room["2a_1"], doors_by_room["2a_1"]),
+    "2a_d0": Room("2a", "2a_d0", "Old Site A - Room d0", regions_by_room["2a_d0"], doors_by_room["2a_d0"]),
+    "2a_d7": Room("2a", "2a_d7", "Old Site A - Room d7", regions_by_room["2a_d7"], doors_by_room["2a_d7"]),
+    "2a_d8": Room("2a", "2a_d8", "Old Site A - Room d8", regions_by_room["2a_d8"], doors_by_room["2a_d8"]),
+    "2a_d3": Room("2a", "2a_d3", "Old Site A - Room d3", regions_by_room["2a_d3"], doors_by_room["2a_d3"]),
+    "2a_d2": Room("2a", "2a_d2", "Old Site A - Room d2", regions_by_room["2a_d2"], doors_by_room["2a_d2"]),
+    "2a_d9": Room("2a", "2a_d9", "Old Site A - Room d9", regions_by_room["2a_d9"], doors_by_room["2a_d9"]),
+    "2a_d1": Room("2a", "2a_d1", "Old Site A - Room d1", regions_by_room["2a_d1"], doors_by_room["2a_d1"]),
+    "2a_d6": Room("2a", "2a_d6", "Old Site A - Room d6", regions_by_room["2a_d6"], doors_by_room["2a_d6"]),
+    "2a_d4": Room("2a", "2a_d4", "Old Site A - Room d4", regions_by_room["2a_d4"], doors_by_room["2a_d4"]),
+    "2a_d5": Room("2a", "2a_d5", "Old Site A - Room d5", regions_by_room["2a_d5"], doors_by_room["2a_d5"]),
+    "2a_3x": Room("2a", "2a_3x", "Old Site A - Room 3x", regions_by_room["2a_3x"], doors_by_room["2a_3x"]),
+    "2a_3": Room("2a", "2a_3", "Old Site A - Room 3", regions_by_room["2a_3"], doors_by_room["2a_3"], "Intervention", "2a_3_bottom"),
+    "2a_4": Room("2a", "2a_4", "Old Site A - Room 4", regions_by_room["2a_4"], doors_by_room["2a_4"]),
+    "2a_5": Room("2a", "2a_5", "Old Site A - Room 5", regions_by_room["2a_5"], doors_by_room["2a_5"]),
+    "2a_6": Room("2a", "2a_6", "Old Site A - Room 6", regions_by_room["2a_6"], doors_by_room["2a_6"]),
+    "2a_7": Room("2a", "2a_7", "Old Site A - Room 7", regions_by_room["2a_7"], doors_by_room["2a_7"]),
+    "2a_8": Room("2a", "2a_8", "Old Site A - Room 8", regions_by_room["2a_8"], doors_by_room["2a_8"]),
+    "2a_9": Room("2a", "2a_9", "Old Site A - Room 9", regions_by_room["2a_9"], doors_by_room["2a_9"]),
+    "2a_9b": Room("2a", "2a_9b", "Old Site A - Room 9b", regions_by_room["2a_9b"], doors_by_room["2a_9b"]),
+    "2a_10": Room("2a", "2a_10", "Old Site A - Room 10", regions_by_room["2a_10"], doors_by_room["2a_10"]),
+    "2a_2": Room("2a", "2a_2", "Old Site A - Room 2", regions_by_room["2a_2"], doors_by_room["2a_2"]),
+    "2a_11": Room("2a", "2a_11", "Old Site A - Room 11", regions_by_room["2a_11"], doors_by_room["2a_11"]),
+    "2a_12b": Room("2a", "2a_12b", "Old Site A - Room 12b", regions_by_room["2a_12b"], doors_by_room["2a_12b"]),
+    "2a_12c": Room("2a", "2a_12c", "Old Site A - Room 12c", regions_by_room["2a_12c"], doors_by_room["2a_12c"]),
+    "2a_12d": Room("2a", "2a_12d", "Old Site A - Room 12d", regions_by_room["2a_12d"], doors_by_room["2a_12d"]),
+    "2a_12": Room("2a", "2a_12", "Old Site A - Room 12", regions_by_room["2a_12"], doors_by_room["2a_12"]),
+    "2a_13": Room("2a", "2a_13", "Old Site A - Room 13", regions_by_room["2a_13"], doors_by_room["2a_13"]),
+    "2a_end_0": Room("2a", "2a_end_0", "Old Site A - Room end_0", regions_by_room["2a_end_0"], doors_by_room["2a_end_0"]),
+    "2a_end_s0": Room("2a", "2a_end_s0", "Old Site A - Room end_s0", regions_by_room["2a_end_s0"], doors_by_room["2a_end_s0"]),
+    "2a_end_s1": Room("2a", "2a_end_s1", "Old Site A - Room end_s1", regions_by_room["2a_end_s1"], doors_by_room["2a_end_s1"]),
+    "2a_end_1": Room("2a", "2a_end_1", "Old Site A - Room end_1", regions_by_room["2a_end_1"], doors_by_room["2a_end_1"]),
+    "2a_end_2": Room("2a", "2a_end_2", "Old Site A - Room end_2", regions_by_room["2a_end_2"], doors_by_room["2a_end_2"]),
+    "2a_end_3": Room("2a", "2a_end_3", "Old Site A - Room end_3", regions_by_room["2a_end_3"], doors_by_room["2a_end_3"], "Awake", "2a_end_3_west"),
+    "2a_end_4": Room("2a", "2a_end_4", "Old Site A - Room end_4", regions_by_room["2a_end_4"], doors_by_room["2a_end_4"]),
+    "2a_end_3b": Room("2a", "2a_end_3b", "Old Site A - Room end_3b", regions_by_room["2a_end_3b"], doors_by_room["2a_end_3b"]),
+    "2a_end_3cb": Room("2a", "2a_end_3cb", "Old Site A - Room end_3cb", regions_by_room["2a_end_3cb"], doors_by_room["2a_end_3cb"]),
+    "2a_end_3c": Room("2a", "2a_end_3c", "Old Site A - Room end_3c", regions_by_room["2a_end_3c"], doors_by_room["2a_end_3c"]),
+    "2a_end_5": Room("2a", "2a_end_5", "Old Site A - Room end_5", regions_by_room["2a_end_5"], doors_by_room["2a_end_5"]),
+    "2a_end_6": Room("2a", "2a_end_6", "Old Site A - Room end_6", regions_by_room["2a_end_6"], doors_by_room["2a_end_6"]),
 
-    "2b_start": Room("2b", "2b_start", "Old Site B - Room start", [reg for _, reg in all_regions.items() if reg.room_name == "2b_start"], [door for _, door in all_doors.items() if door.room_name == "2b_start"], "Start", "2b_start_west"),
-    "2b_00": Room("2b", "2b_00", "Old Site B - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "2b_00"], [door for _, door in all_doors.items() if door.room_name == "2b_00"]),
-    "2b_01": Room("2b", "2b_01", "Old Site B - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "2b_01"], [door for _, door in all_doors.items() if door.room_name == "2b_01"]),
-    "2b_01b": Room("2b", "2b_01b", "Old Site B - Room 01b", [reg for _, reg in all_regions.items() if reg.room_name == "2b_01b"], [door for _, door in all_doors.items() if door.room_name == "2b_01b"]),
-    "2b_02b": Room("2b", "2b_02b", "Old Site B - Room 02b", [reg for _, reg in all_regions.items() if reg.room_name == "2b_02b"], [door for _, door in all_doors.items() if door.room_name == "2b_02b"]),
-    "2b_02": Room("2b", "2b_02", "Old Site B - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "2b_02"], [door for _, door in all_doors.items() if door.room_name == "2b_02"]),
-    "2b_03": Room("2b", "2b_03", "Old Site B - Room 03", [reg for _, reg in all_regions.items() if reg.room_name == "2b_03"], [door for _, door in all_doors.items() if door.room_name == "2b_03"], "Combination Lock", "2b_03_west"),
-    "2b_04": Room("2b", "2b_04", "Old Site B - Room 04", [reg for _, reg in all_regions.items() if reg.room_name == "2b_04"], [door for _, door in all_doors.items() if door.room_name == "2b_04"]),
-    "2b_05": Room("2b", "2b_05", "Old Site B - Room 05", [reg for _, reg in all_regions.items() if reg.room_name == "2b_05"], [door for _, door in all_doors.items() if door.room_name == "2b_05"]),
-    "2b_06": Room("2b", "2b_06", "Old Site B - Room 06", [reg for _, reg in all_regions.items() if reg.room_name == "2b_06"], [door for _, door in all_doors.items() if door.room_name == "2b_06"]),
-    "2b_07": Room("2b", "2b_07", "Old Site B - Room 07", [reg for _, reg in all_regions.items() if reg.room_name == "2b_07"], [door for _, door in all_doors.items() if door.room_name == "2b_07"]),
-    "2b_08b": Room("2b", "2b_08b", "Old Site B - Room 08b", [reg for _, reg in all_regions.items() if reg.room_name == "2b_08b"], [door for _, door in all_doors.items() if door.room_name == "2b_08b"], "Dream Altar", "2b_08b_west"),
-    "2b_08": Room("2b", "2b_08", "Old Site B - Room 08", [reg for _, reg in all_regions.items() if reg.room_name == "2b_08"], [door for _, door in all_doors.items() if door.room_name == "2b_08"]),
-    "2b_09": Room("2b", "2b_09", "Old Site B - Room 09", [reg for _, reg in all_regions.items() if reg.room_name == "2b_09"], [door for _, door in all_doors.items() if door.room_name == "2b_09"]),
-    "2b_10": Room("2b", "2b_10", "Old Site B - Room 10", [reg for _, reg in all_regions.items() if reg.room_name == "2b_10"], [door for _, door in all_doors.items() if door.room_name == "2b_10"]),
-    "2b_11": Room("2b", "2b_11", "Old Site B - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "2b_11"], [door for _, door in all_doors.items() if door.room_name == "2b_11"]),
-    "2b_end": Room("2b", "2b_end", "Old Site B - Room end", [reg for _, reg in all_regions.items() if reg.room_name == "2b_end"], [door for _, door in all_doors.items() if door.room_name == "2b_end"]),
+    "2b_start": Room("2b", "2b_start", "Old Site B - Room start", regions_by_room["2b_start"], doors_by_room["2b_start"], "Start", "2b_start_west"),
+    "2b_00": Room("2b", "2b_00", "Old Site B - Room 00", regions_by_room["2b_00"], doors_by_room["2b_00"]),
+    "2b_01": Room("2b", "2b_01", "Old Site B - Room 01", regions_by_room["2b_01"], doors_by_room["2b_01"]),
+    "2b_01b": Room("2b", "2b_01b", "Old Site B - Room 01b", regions_by_room["2b_01b"], doors_by_room["2b_01b"]),
+    "2b_02b": Room("2b", "2b_02b", "Old Site B - Room 02b", regions_by_room["2b_02b"], doors_by_room["2b_02b"]),
+    "2b_02": Room("2b", "2b_02", "Old Site B - Room 02", regions_by_room["2b_02"], doors_by_room["2b_02"]),
+    "2b_03": Room("2b", "2b_03", "Old Site B - Room 03", regions_by_room["2b_03"], doors_by_room["2b_03"], "Combination Lock", "2b_03_west"),
+    "2b_04": Room("2b", "2b_04", "Old Site B - Room 04", regions_by_room["2b_04"], doors_by_room["2b_04"]),
+    "2b_05": Room("2b", "2b_05", "Old Site B - Room 05", regions_by_room["2b_05"], doors_by_room["2b_05"]),
+    "2b_06": Room("2b", "2b_06", "Old Site B - Room 06", regions_by_room["2b_06"], doors_by_room["2b_06"]),
+    "2b_07": Room("2b", "2b_07", "Old Site B - Room 07", regions_by_room["2b_07"], doors_by_room["2b_07"]),
+    "2b_08b": Room("2b", "2b_08b", "Old Site B - Room 08b", regions_by_room["2b_08b"], doors_by_room["2b_08b"], "Dream Altar", "2b_08b_west"),
+    "2b_08": Room("2b", "2b_08", "Old Site B - Room 08", regions_by_room["2b_08"], doors_by_room["2b_08"]),
+    "2b_09": Room("2b", "2b_09", "Old Site B - Room 09", regions_by_room["2b_09"], doors_by_room["2b_09"]),
+    "2b_10": Room("2b", "2b_10", "Old Site B - Room 10", regions_by_room["2b_10"], doors_by_room["2b_10"]),
+    "2b_11": Room("2b", "2b_11", "Old Site B - Room 11", regions_by_room["2b_11"], doors_by_room["2b_11"]),
+    "2b_end": Room("2b", "2b_end", "Old Site B - Room end", regions_by_room["2b_end"], doors_by_room["2b_end"]),
 
-    "2c_00": Room("2c", "2c_00", "Old Site C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "2c_00"], [door for _, door in all_doors.items() if door.room_name == "2c_00"], "Start", "2c_00_west"),
-    "2c_01": Room("2c", "2c_01", "Old Site C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "2c_01"], [door for _, door in all_doors.items() if door.room_name == "2c_01"]),
-    "2c_02": Room("2c", "2c_02", "Old Site C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "2c_02"], [door for _, door in all_doors.items() if door.room_name == "2c_02"]),
+    "2c_00": Room("2c", "2c_00", "Old Site C - Room 00", regions_by_room["2c_00"], doors_by_room["2c_00"], "Start", "2c_00_west"),
+    "2c_01": Room("2c", "2c_01", "Old Site C - Room 01", regions_by_room["2c_01"], doors_by_room["2c_01"]),
+    "2c_02": Room("2c", "2c_02", "Old Site C - Room 02", regions_by_room["2c_02"], doors_by_room["2c_02"]),
 
-    "3a_s0": Room("3a", "3a_s0", "Celestial Resort A - Room s0", [reg for _, reg in all_regions.items() if reg.room_name == "3a_s0"], [door for _, door in all_doors.items() if door.room_name == "3a_s0"], "Start", "3a_s0_main"),
-    "3a_s1": Room("3a", "3a_s1", "Celestial Resort A - Room s1", [reg for _, reg in all_regions.items() if reg.room_name == "3a_s1"], [door for _, door in all_doors.items() if door.room_name == "3a_s1"]),
-    "3a_s2": Room("3a", "3a_s2", "Celestial Resort A - Room s2", [reg for _, reg in all_regions.items() if reg.room_name == "3a_s2"], [door for _, door in all_doors.items() if door.room_name == "3a_s2"]),
-    "3a_s3": Room("3a", "3a_s3", "Celestial Resort A - Room s3", [reg for _, reg in all_regions.items() if reg.room_name == "3a_s3"], [door for _, door in all_doors.items() if door.room_name == "3a_s3"]),
-    "3a_0x-a": Room("3a", "3a_0x-a", "Celestial Resort A - Room 0x-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_0x-a"], [door for _, door in all_doors.items() if door.room_name == "3a_0x-a"]),
-    "3a_00-a": Room("3a", "3a_00-a", "Celestial Resort A - Room 00-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_00-a"], [door for _, door in all_doors.items() if door.room_name == "3a_00-a"]),
-    "3a_02-a": Room("3a", "3a_02-a", "Celestial Resort A - Room 02-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_02-a"], [door for _, door in all_doors.items() if door.room_name == "3a_02-a"]),
-    "3a_02-b": Room("3a", "3a_02-b", "Celestial Resort A - Room 02-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_02-b"], [door for _, door in all_doors.items() if door.room_name == "3a_02-b"]),
-    "3a_01-b": Room("3a", "3a_01-b", "Celestial Resort A - Room 01-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_01-b"], [door for _, door in all_doors.items() if door.room_name == "3a_01-b"]),
-    "3a_00-b": Room("3a", "3a_00-b", "Celestial Resort A - Room 00-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_00-b"], [door for _, door in all_doors.items() if door.room_name == "3a_00-b"]),
-    "3a_00-c": Room("3a", "3a_00-c", "Celestial Resort A - Room 00-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_00-c"], [door for _, door in all_doors.items() if door.room_name == "3a_00-c"]),
-    "3a_0x-b": Room("3a", "3a_0x-b", "Celestial Resort A - Room 0x-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_0x-b"], [door for _, door in all_doors.items() if door.room_name == "3a_0x-b"]),
-    "3a_03-a": Room("3a", "3a_03-a", "Celestial Resort A - Room 03-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_03-a"], [door for _, door in all_doors.items() if door.room_name == "3a_03-a"]),
-    "3a_04-b": Room("3a", "3a_04-b", "Celestial Resort A - Room 04-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_04-b"], [door for _, door in all_doors.items() if door.room_name == "3a_04-b"]),
-    "3a_05-a": Room("3a", "3a_05-a", "Celestial Resort A - Room 05-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_05-a"], [door for _, door in all_doors.items() if door.room_name == "3a_05-a"]),
-    "3a_06-a": Room("3a", "3a_06-a", "Celestial Resort A - Room 06-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_06-a"], [door for _, door in all_doors.items() if door.room_name == "3a_06-a"]),
-    "3a_07-a": Room("3a", "3a_07-a", "Celestial Resort A - Room 07-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_07-a"], [door for _, door in all_doors.items() if door.room_name == "3a_07-a"]),
-    "3a_07-b": Room("3a", "3a_07-b", "Celestial Resort A - Room 07-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_07-b"], [door for _, door in all_doors.items() if door.room_name == "3a_07-b"]),
-    "3a_06-b": Room("3a", "3a_06-b", "Celestial Resort A - Room 06-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_06-b"], [door for _, door in all_doors.items() if door.room_name == "3a_06-b"]),
-    "3a_06-c": Room("3a", "3a_06-c", "Celestial Resort A - Room 06-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_06-c"], [door for _, door in all_doors.items() if door.room_name == "3a_06-c"]),
-    "3a_05-c": Room("3a", "3a_05-c", "Celestial Resort A - Room 05-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_05-c"], [door for _, door in all_doors.items() if door.room_name == "3a_05-c"]),
-    "3a_08-c": Room("3a", "3a_08-c", "Celestial Resort A - Room 08-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_08-c"], [door for _, door in all_doors.items() if door.room_name == "3a_08-c"]),
-    "3a_08-b": Room("3a", "3a_08-b", "Celestial Resort A - Room 08-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_08-b"], [door for _, door in all_doors.items() if door.room_name == "3a_08-b"]),
-    "3a_08-a": Room("3a", "3a_08-a", "Celestial Resort A - Room 08-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_08-a"], [door for _, door in all_doors.items() if door.room_name == "3a_08-a"], "Huge Mess", "3a_08-a_west"),
-    "3a_09-b": Room("3a", "3a_09-b", "Celestial Resort A - Room 09-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_09-b"], [door for _, door in all_doors.items() if door.room_name == "3a_09-b"]),
-    "3a_10-x": Room("3a", "3a_10-x", "Celestial Resort A - Room 10-x", [reg for _, reg in all_regions.items() if reg.room_name == "3a_10-x"], [door for _, door in all_doors.items() if door.room_name == "3a_10-x"]),
-    "3a_11-x": Room("3a", "3a_11-x", "Celestial Resort A - Room 11-x", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-x"], [door for _, door in all_doors.items() if door.room_name == "3a_11-x"]),
-    "3a_11-y": Room("3a", "3a_11-y", "Celestial Resort A - Room 11-y", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-y"], [door for _, door in all_doors.items() if door.room_name == "3a_11-y"]),
-    "3a_12-y": Room("3a", "3a_12-y", "Celestial Resort A - Room 12-y", [reg for _, reg in all_regions.items() if reg.room_name == "3a_12-y"], [door for _, door in all_doors.items() if door.room_name == "3a_12-y"]),
-    "3a_11-z": Room("3a", "3a_11-z", "Celestial Resort A - Room 11-z", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-z"], [door for _, door in all_doors.items() if door.room_name == "3a_11-z"]),
-    "3a_10-z": Room("3a", "3a_10-z", "Celestial Resort A - Room 10-z", [reg for _, reg in all_regions.items() if reg.room_name == "3a_10-z"], [door for _, door in all_doors.items() if door.room_name == "3a_10-z"]),
-    "3a_10-y": Room("3a", "3a_10-y", "Celestial Resort A - Room 10-y", [reg for _, reg in all_regions.items() if reg.room_name == "3a_10-y"], [door for _, door in all_doors.items() if door.room_name == "3a_10-y"]),
-    "3a_10-c": Room("3a", "3a_10-c", "Celestial Resort A - Room 10-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_10-c"], [door for _, door in all_doors.items() if door.room_name == "3a_10-c"]),
-    "3a_11-c": Room("3a", "3a_11-c", "Celestial Resort A - Room 11-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-c"], [door for _, door in all_doors.items() if door.room_name == "3a_11-c"]),
-    "3a_12-c": Room("3a", "3a_12-c", "Celestial Resort A - Room 12-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_12-c"], [door for _, door in all_doors.items() if door.room_name == "3a_12-c"]),
-    "3a_12-d": Room("3a", "3a_12-d", "Celestial Resort A - Room 12-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_12-d"], [door for _, door in all_doors.items() if door.room_name == "3a_12-d"]),
-    "3a_11-d": Room("3a", "3a_11-d", "Celestial Resort A - Room 11-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-d"], [door for _, door in all_doors.items() if door.room_name == "3a_11-d"]),
-    "3a_10-d": Room("3a", "3a_10-d", "Celestial Resort A - Room 10-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_10-d"], [door for _, door in all_doors.items() if door.room_name == "3a_10-d"]),
-    "3a_11-b": Room("3a", "3a_11-b", "Celestial Resort A - Room 11-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-b"], [door for _, door in all_doors.items() if door.room_name == "3a_11-b"]),
-    "3a_12-b": Room("3a", "3a_12-b", "Celestial Resort A - Room 12-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_12-b"], [door for _, door in all_doors.items() if door.room_name == "3a_12-b"]),
-    "3a_13-b": Room("3a", "3a_13-b", "Celestial Resort A - Room 13-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_13-b"], [door for _, door in all_doors.items() if door.room_name == "3a_13-b"]),
-    "3a_13-a": Room("3a", "3a_13-a", "Celestial Resort A - Room 13-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_13-a"], [door for _, door in all_doors.items() if door.room_name == "3a_13-a"]),
-    "3a_13-x": Room("3a", "3a_13-x", "Celestial Resort A - Room 13-x", [reg for _, reg in all_regions.items() if reg.room_name == "3a_13-x"], [door for _, door in all_doors.items() if door.room_name == "3a_13-x"]),
-    "3a_12-x": Room("3a", "3a_12-x", "Celestial Resort A - Room 12-x", [reg for _, reg in all_regions.items() if reg.room_name == "3a_12-x"], [door for _, door in all_doors.items() if door.room_name == "3a_12-x"]),
-    "3a_11-a": Room("3a", "3a_11-a", "Celestial Resort A - Room 11-a", [reg for _, reg in all_regions.items() if reg.room_name == "3a_11-a"], [door for _, door in all_doors.items() if door.room_name == "3a_11-a"]),
-    "3a_08-x": Room("3a", "3a_08-x", "Celestial Resort A - Room 08-x", [reg for _, reg in all_regions.items() if reg.room_name == "3a_08-x"], [door for _, door in all_doors.items() if door.room_name == "3a_08-x"]),
-    "3a_09-d": Room("3a", "3a_09-d", "Celestial Resort A - Room 09-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_09-d"], [door for _, door in all_doors.items() if door.room_name == "3a_09-d"], "Elevator Shaft", "3a_09-d_bottom"),
-    "3a_08-d": Room("3a", "3a_08-d", "Celestial Resort A - Room 08-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_08-d"], [door for _, door in all_doors.items() if door.room_name == "3a_08-d"]),
-    "3a_06-d": Room("3a", "3a_06-d", "Celestial Resort A - Room 06-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_06-d"], [door for _, door in all_doors.items() if door.room_name == "3a_06-d"]),
-    "3a_04-d": Room("3a", "3a_04-d", "Celestial Resort A - Room 04-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_04-d"], [door for _, door in all_doors.items() if door.room_name == "3a_04-d"]),
-    "3a_04-c": Room("3a", "3a_04-c", "Celestial Resort A - Room 04-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_04-c"], [door for _, door in all_doors.items() if door.room_name == "3a_04-c"]),
-    "3a_02-c": Room("3a", "3a_02-c", "Celestial Resort A - Room 02-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_02-c"], [door for _, door in all_doors.items() if door.room_name == "3a_02-c"]),
-    "3a_03-b": Room("3a", "3a_03-b", "Celestial Resort A - Room 03-b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_03-b"], [door for _, door in all_doors.items() if door.room_name == "3a_03-b"]),
-    "3a_01-c": Room("3a", "3a_01-c", "Celestial Resort A - Room 01-c", [reg for _, reg in all_regions.items() if reg.room_name == "3a_01-c"], [door for _, door in all_doors.items() if door.room_name == "3a_01-c"]),
-    "3a_02-d": Room("3a", "3a_02-d", "Celestial Resort A - Room 02-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_02-d"], [door for _, door in all_doors.items() if door.room_name == "3a_02-d"]),
-    "3a_00-d": Room("3a", "3a_00-d", "Celestial Resort A - Room 00-d", [reg for _, reg in all_regions.items() if reg.room_name == "3a_00-d"], [door for _, door in all_doors.items() if door.room_name == "3a_00-d"], "Presidential Suite", "3a_00-d_east"),
-    "3a_roof00": Room("3a", "3a_roof00", "Celestial Resort A - Room roof00", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof00"], [door for _, door in all_doors.items() if door.room_name == "3a_roof00"]),
-    "3a_roof01": Room("3a", "3a_roof01", "Celestial Resort A - Room roof01", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof01"], [door for _, door in all_doors.items() if door.room_name == "3a_roof01"]),
-    "3a_roof02": Room("3a", "3a_roof02", "Celestial Resort A - Room roof02", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof02"], [door for _, door in all_doors.items() if door.room_name == "3a_roof02"]),
-    "3a_roof03": Room("3a", "3a_roof03", "Celestial Resort A - Room roof03", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof03"], [door for _, door in all_doors.items() if door.room_name == "3a_roof03"]),
-    "3a_roof04": Room("3a", "3a_roof04", "Celestial Resort A - Room roof04", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof04"], [door for _, door in all_doors.items() if door.room_name == "3a_roof04"]),
-    "3a_roof05": Room("3a", "3a_roof05", "Celestial Resort A - Room roof05", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof05"], [door for _, door in all_doors.items() if door.room_name == "3a_roof05"]),
-    "3a_roof06b": Room("3a", "3a_roof06b", "Celestial Resort A - Room roof06b", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof06b"], [door for _, door in all_doors.items() if door.room_name == "3a_roof06b"]),
-    "3a_roof06": Room("3a", "3a_roof06", "Celestial Resort A - Room roof06", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof06"], [door for _, door in all_doors.items() if door.room_name == "3a_roof06"]),
-    "3a_roof07": Room("3a", "3a_roof07", "Celestial Resort A - Room roof07", [reg for _, reg in all_regions.items() if reg.room_name == "3a_roof07"], [door for _, door in all_doors.items() if door.room_name == "3a_roof07"]),
+    "3a_s0": Room("3a", "3a_s0", "Celestial Resort A - Room s0", regions_by_room["3a_s0"], doors_by_room["3a_s0"], "Start", "3a_s0_main"),
+    "3a_s1": Room("3a", "3a_s1", "Celestial Resort A - Room s1", regions_by_room["3a_s1"], doors_by_room["3a_s1"]),
+    "3a_s2": Room("3a", "3a_s2", "Celestial Resort A - Room s2", regions_by_room["3a_s2"], doors_by_room["3a_s2"]),
+    "3a_s3": Room("3a", "3a_s3", "Celestial Resort A - Room s3", regions_by_room["3a_s3"], doors_by_room["3a_s3"]),
+    "3a_0x-a": Room("3a", "3a_0x-a", "Celestial Resort A - Room 0x-a", regions_by_room["3a_0x-a"], doors_by_room["3a_0x-a"]),
+    "3a_00-a": Room("3a", "3a_00-a", "Celestial Resort A - Room 00-a", regions_by_room["3a_00-a"], doors_by_room["3a_00-a"]),
+    "3a_02-a": Room("3a", "3a_02-a", "Celestial Resort A - Room 02-a", regions_by_room["3a_02-a"], doors_by_room["3a_02-a"]),
+    "3a_02-b": Room("3a", "3a_02-b", "Celestial Resort A - Room 02-b", regions_by_room["3a_02-b"], doors_by_room["3a_02-b"]),
+    "3a_01-b": Room("3a", "3a_01-b", "Celestial Resort A - Room 01-b", regions_by_room["3a_01-b"], doors_by_room["3a_01-b"]),
+    "3a_00-b": Room("3a", "3a_00-b", "Celestial Resort A - Room 00-b", regions_by_room["3a_00-b"], doors_by_room["3a_00-b"]),
+    "3a_00-c": Room("3a", "3a_00-c", "Celestial Resort A - Room 00-c", regions_by_room["3a_00-c"], doors_by_room["3a_00-c"]),
+    "3a_0x-b": Room("3a", "3a_0x-b", "Celestial Resort A - Room 0x-b", regions_by_room["3a_0x-b"], doors_by_room["3a_0x-b"]),
+    "3a_03-a": Room("3a", "3a_03-a", "Celestial Resort A - Room 03-a", regions_by_room["3a_03-a"], doors_by_room["3a_03-a"]),
+    "3a_04-b": Room("3a", "3a_04-b", "Celestial Resort A - Room 04-b", regions_by_room["3a_04-b"], doors_by_room["3a_04-b"]),
+    "3a_05-a": Room("3a", "3a_05-a", "Celestial Resort A - Room 05-a", regions_by_room["3a_05-a"], doors_by_room["3a_05-a"]),
+    "3a_06-a": Room("3a", "3a_06-a", "Celestial Resort A - Room 06-a", regions_by_room["3a_06-a"], doors_by_room["3a_06-a"]),
+    "3a_07-a": Room("3a", "3a_07-a", "Celestial Resort A - Room 07-a", regions_by_room["3a_07-a"], doors_by_room["3a_07-a"]),
+    "3a_07-b": Room("3a", "3a_07-b", "Celestial Resort A - Room 07-b", regions_by_room["3a_07-b"], doors_by_room["3a_07-b"]),
+    "3a_06-b": Room("3a", "3a_06-b", "Celestial Resort A - Room 06-b", regions_by_room["3a_06-b"], doors_by_room["3a_06-b"]),
+    "3a_06-c": Room("3a", "3a_06-c", "Celestial Resort A - Room 06-c", regions_by_room["3a_06-c"], doors_by_room["3a_06-c"]),
+    "3a_05-c": Room("3a", "3a_05-c", "Celestial Resort A - Room 05-c", regions_by_room["3a_05-c"], doors_by_room["3a_05-c"]),
+    "3a_08-c": Room("3a", "3a_08-c", "Celestial Resort A - Room 08-c", regions_by_room["3a_08-c"], doors_by_room["3a_08-c"]),
+    "3a_08-b": Room("3a", "3a_08-b", "Celestial Resort A - Room 08-b", regions_by_room["3a_08-b"], doors_by_room["3a_08-b"]),
+    "3a_08-a": Room("3a", "3a_08-a", "Celestial Resort A - Room 08-a", regions_by_room["3a_08-a"], doors_by_room["3a_08-a"], "Huge Mess", "3a_08-a_west"),
+    "3a_09-b": Room("3a", "3a_09-b", "Celestial Resort A - Room 09-b", regions_by_room["3a_09-b"], doors_by_room["3a_09-b"]),
+    "3a_10-x": Room("3a", "3a_10-x", "Celestial Resort A - Room 10-x", regions_by_room["3a_10-x"], doors_by_room["3a_10-x"]),
+    "3a_11-x": Room("3a", "3a_11-x", "Celestial Resort A - Room 11-x", regions_by_room["3a_11-x"], doors_by_room["3a_11-x"]),
+    "3a_11-y": Room("3a", "3a_11-y", "Celestial Resort A - Room 11-y", regions_by_room["3a_11-y"], doors_by_room["3a_11-y"]),
+    "3a_12-y": Room("3a", "3a_12-y", "Celestial Resort A - Room 12-y", regions_by_room["3a_12-y"], doors_by_room["3a_12-y"]),
+    "3a_11-z": Room("3a", "3a_11-z", "Celestial Resort A - Room 11-z", regions_by_room["3a_11-z"], doors_by_room["3a_11-z"]),
+    "3a_10-z": Room("3a", "3a_10-z", "Celestial Resort A - Room 10-z", regions_by_room["3a_10-z"], doors_by_room["3a_10-z"]),
+    "3a_10-y": Room("3a", "3a_10-y", "Celestial Resort A - Room 10-y", regions_by_room["3a_10-y"], doors_by_room["3a_10-y"]),
+    "3a_10-c": Room("3a", "3a_10-c", "Celestial Resort A - Room 10-c", regions_by_room["3a_10-c"], doors_by_room["3a_10-c"]),
+    "3a_11-c": Room("3a", "3a_11-c", "Celestial Resort A - Room 11-c", regions_by_room["3a_11-c"], doors_by_room["3a_11-c"]),
+    "3a_12-c": Room("3a", "3a_12-c", "Celestial Resort A - Room 12-c", regions_by_room["3a_12-c"], doors_by_room["3a_12-c"]),
+    "3a_12-d": Room("3a", "3a_12-d", "Celestial Resort A - Room 12-d", regions_by_room["3a_12-d"], doors_by_room["3a_12-d"]),
+    "3a_11-d": Room("3a", "3a_11-d", "Celestial Resort A - Room 11-d", regions_by_room["3a_11-d"], doors_by_room["3a_11-d"]),
+    "3a_10-d": Room("3a", "3a_10-d", "Celestial Resort A - Room 10-d", regions_by_room["3a_10-d"], doors_by_room["3a_10-d"]),
+    "3a_11-b": Room("3a", "3a_11-b", "Celestial Resort A - Room 11-b", regions_by_room["3a_11-b"], doors_by_room["3a_11-b"]),
+    "3a_12-b": Room("3a", "3a_12-b", "Celestial Resort A - Room 12-b", regions_by_room["3a_12-b"], doors_by_room["3a_12-b"]),
+    "3a_13-b": Room("3a", "3a_13-b", "Celestial Resort A - Room 13-b", regions_by_room["3a_13-b"], doors_by_room["3a_13-b"]),
+    "3a_13-a": Room("3a", "3a_13-a", "Celestial Resort A - Room 13-a", regions_by_room["3a_13-a"], doors_by_room["3a_13-a"]),
+    "3a_13-x": Room("3a", "3a_13-x", "Celestial Resort A - Room 13-x", regions_by_room["3a_13-x"], doors_by_room["3a_13-x"]),
+    "3a_12-x": Room("3a", "3a_12-x", "Celestial Resort A - Room 12-x", regions_by_room["3a_12-x"], doors_by_room["3a_12-x"]),
+    "3a_11-a": Room("3a", "3a_11-a", "Celestial Resort A - Room 11-a", regions_by_room["3a_11-a"], doors_by_room["3a_11-a"]),
+    "3a_08-x": Room("3a", "3a_08-x", "Celestial Resort A - Room 08-x", regions_by_room["3a_08-x"], doors_by_room["3a_08-x"]),
+    "3a_09-d": Room("3a", "3a_09-d", "Celestial Resort A - Room 09-d", regions_by_room["3a_09-d"], doors_by_room["3a_09-d"], "Elevator Shaft", "3a_09-d_bottom"),
+    "3a_08-d": Room("3a", "3a_08-d", "Celestial Resort A - Room 08-d", regions_by_room["3a_08-d"], doors_by_room["3a_08-d"]),
+    "3a_06-d": Room("3a", "3a_06-d", "Celestial Resort A - Room 06-d", regions_by_room["3a_06-d"], doors_by_room["3a_06-d"]),
+    "3a_04-d": Room("3a", "3a_04-d", "Celestial Resort A - Room 04-d", regions_by_room["3a_04-d"], doors_by_room["3a_04-d"]),
+    "3a_04-c": Room("3a", "3a_04-c", "Celestial Resort A - Room 04-c", regions_by_room["3a_04-c"], doors_by_room["3a_04-c"]),
+    "3a_02-c": Room("3a", "3a_02-c", "Celestial Resort A - Room 02-c", regions_by_room["3a_02-c"], doors_by_room["3a_02-c"]),
+    "3a_03-b": Room("3a", "3a_03-b", "Celestial Resort A - Room 03-b", regions_by_room["3a_03-b"], doors_by_room["3a_03-b"]),
+    "3a_01-c": Room("3a", "3a_01-c", "Celestial Resort A - Room 01-c", regions_by_room["3a_01-c"], doors_by_room["3a_01-c"]),
+    "3a_02-d": Room("3a", "3a_02-d", "Celestial Resort A - Room 02-d", regions_by_room["3a_02-d"], doors_by_room["3a_02-d"]),
+    "3a_00-d": Room("3a", "3a_00-d", "Celestial Resort A - Room 00-d", regions_by_room["3a_00-d"], doors_by_room["3a_00-d"], "Presidential Suite", "3a_00-d_east"),
+    "3a_roof00": Room("3a", "3a_roof00", "Celestial Resort A - Room roof00", regions_by_room["3a_roof00"], doors_by_room["3a_roof00"]),
+    "3a_roof01": Room("3a", "3a_roof01", "Celestial Resort A - Room roof01", regions_by_room["3a_roof01"], doors_by_room["3a_roof01"]),
+    "3a_roof02": Room("3a", "3a_roof02", "Celestial Resort A - Room roof02", regions_by_room["3a_roof02"], doors_by_room["3a_roof02"]),
+    "3a_roof03": Room("3a", "3a_roof03", "Celestial Resort A - Room roof03", regions_by_room["3a_roof03"], doors_by_room["3a_roof03"]),
+    "3a_roof04": Room("3a", "3a_roof04", "Celestial Resort A - Room roof04", regions_by_room["3a_roof04"], doors_by_room["3a_roof04"]),
+    "3a_roof05": Room("3a", "3a_roof05", "Celestial Resort A - Room roof05", regions_by_room["3a_roof05"], doors_by_room["3a_roof05"]),
+    "3a_roof06b": Room("3a", "3a_roof06b", "Celestial Resort A - Room roof06b", regions_by_room["3a_roof06b"], doors_by_room["3a_roof06b"]),
+    "3a_roof06": Room("3a", "3a_roof06", "Celestial Resort A - Room roof06", regions_by_room["3a_roof06"], doors_by_room["3a_roof06"]),
+    "3a_roof07": Room("3a", "3a_roof07", "Celestial Resort A - Room roof07", regions_by_room["3a_roof07"], doors_by_room["3a_roof07"]),
 
-    "3b_00": Room("3b", "3b_00", "Celestial Resort B - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "3b_00"], [door for _, door in all_doors.items() if door.room_name == "3b_00"], "Start", "3b_00_west"),
-    "3b_back": Room("3b", "3b_back", "Celestial Resort B - Room back", [reg for _, reg in all_regions.items() if reg.room_name == "3b_back"], [door for _, door in all_doors.items() if door.room_name == "3b_back"]),
-    "3b_01": Room("3b", "3b_01", "Celestial Resort B - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "3b_01"], [door for _, door in all_doors.items() if door.room_name == "3b_01"]),
-    "3b_02": Room("3b", "3b_02", "Celestial Resort B - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "3b_02"], [door for _, door in all_doors.items() if door.room_name == "3b_02"]),
-    "3b_03": Room("3b", "3b_03", "Celestial Resort B - Room 03", [reg for _, reg in all_regions.items() if reg.room_name == "3b_03"], [door for _, door in all_doors.items() if door.room_name == "3b_03"]),
-    "3b_04": Room("3b", "3b_04", "Celestial Resort B - Room 04", [reg for _, reg in all_regions.items() if reg.room_name == "3b_04"], [door for _, door in all_doors.items() if door.room_name == "3b_04"]),
-    "3b_05": Room("3b", "3b_05", "Celestial Resort B - Room 05", [reg for _, reg in all_regions.items() if reg.room_name == "3b_05"], [door for _, door in all_doors.items() if door.room_name == "3b_05"]),
-    "3b_06": Room("3b", "3b_06", "Celestial Resort B - Room 06", [reg for _, reg in all_regions.items() if reg.room_name == "3b_06"], [door for _, door in all_doors.items() if door.room_name == "3b_06"], "Staff Quarters", "3b_06_west"),
-    "3b_07": Room("3b", "3b_07", "Celestial Resort B - Room 07", [reg for _, reg in all_regions.items() if reg.room_name == "3b_07"], [door for _, door in all_doors.items() if door.room_name == "3b_07"]),
-    "3b_08": Room("3b", "3b_08", "Celestial Resort B - Room 08", [reg for _, reg in all_regions.items() if reg.room_name == "3b_08"], [door for _, door in all_doors.items() if door.room_name == "3b_08"]),
-    "3b_09": Room("3b", "3b_09", "Celestial Resort B - Room 09", [reg for _, reg in all_regions.items() if reg.room_name == "3b_09"], [door for _, door in all_doors.items() if door.room_name == "3b_09"]),
-    "3b_10": Room("3b", "3b_10", "Celestial Resort B - Room 10", [reg for _, reg in all_regions.items() if reg.room_name == "3b_10"], [door for _, door in all_doors.items() if door.room_name == "3b_10"]),
-    "3b_11": Room("3b", "3b_11", "Celestial Resort B - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "3b_11"], [door for _, door in all_doors.items() if door.room_name == "3b_11"], "Library", "3b_11_west"),
-    "3b_13": Room("3b", "3b_13", "Celestial Resort B - Room 13", [reg for _, reg in all_regions.items() if reg.room_name == "3b_13"], [door for _, door in all_doors.items() if door.room_name == "3b_13"]),
-    "3b_14": Room("3b", "3b_14", "Celestial Resort B - Room 14", [reg for _, reg in all_regions.items() if reg.room_name == "3b_14"], [door for _, door in all_doors.items() if door.room_name == "3b_14"]),
-    "3b_15": Room("3b", "3b_15", "Celestial Resort B - Room 15", [reg for _, reg in all_regions.items() if reg.room_name == "3b_15"], [door for _, door in all_doors.items() if door.room_name == "3b_15"]),
-    "3b_12": Room("3b", "3b_12", "Celestial Resort B - Room 12", [reg for _, reg in all_regions.items() if reg.room_name == "3b_12"], [door for _, door in all_doors.items() if door.room_name == "3b_12"]),
-    "3b_16": Room("3b", "3b_16", "Celestial Resort B - Room 16", [reg for _, reg in all_regions.items() if reg.room_name == "3b_16"], [door for _, door in all_doors.items() if door.room_name == "3b_16"], "Rooftop", "3b_16_west"),
-    "3b_17": Room("3b", "3b_17", "Celestial Resort B - Room 17", [reg for _, reg in all_regions.items() if reg.room_name == "3b_17"], [door for _, door in all_doors.items() if door.room_name == "3b_17"]),
-    "3b_18": Room("3b", "3b_18", "Celestial Resort B - Room 18", [reg for _, reg in all_regions.items() if reg.room_name == "3b_18"], [door for _, door in all_doors.items() if door.room_name == "3b_18"]),
-    "3b_19": Room("3b", "3b_19", "Celestial Resort B - Room 19", [reg for _, reg in all_regions.items() if reg.room_name == "3b_19"], [door for _, door in all_doors.items() if door.room_name == "3b_19"]),
-    "3b_21": Room("3b", "3b_21", "Celestial Resort B - Room 21", [reg for _, reg in all_regions.items() if reg.room_name == "3b_21"], [door for _, door in all_doors.items() if door.room_name == "3b_21"]),
-    "3b_20": Room("3b", "3b_20", "Celestial Resort B - Room 20", [reg for _, reg in all_regions.items() if reg.room_name == "3b_20"], [door for _, door in all_doors.items() if door.room_name == "3b_20"]),
-    "3b_end": Room("3b", "3b_end", "Celestial Resort B - Room end", [reg for _, reg in all_regions.items() if reg.room_name == "3b_end"], [door for _, door in all_doors.items() if door.room_name == "3b_end"]),
+    "3b_00": Room("3b", "3b_00", "Celestial Resort B - Room 00", regions_by_room["3b_00"], doors_by_room["3b_00"], "Start", "3b_00_west"),
+    "3b_back": Room("3b", "3b_back", "Celestial Resort B - Room back", regions_by_room["3b_back"], doors_by_room["3b_back"]),
+    "3b_01": Room("3b", "3b_01", "Celestial Resort B - Room 01", regions_by_room["3b_01"], doors_by_room["3b_01"]),
+    "3b_02": Room("3b", "3b_02", "Celestial Resort B - Room 02", regions_by_room["3b_02"], doors_by_room["3b_02"]),
+    "3b_03": Room("3b", "3b_03", "Celestial Resort B - Room 03", regions_by_room["3b_03"], doors_by_room["3b_03"]),
+    "3b_04": Room("3b", "3b_04", "Celestial Resort B - Room 04", regions_by_room["3b_04"], doors_by_room["3b_04"]),
+    "3b_05": Room("3b", "3b_05", "Celestial Resort B - Room 05", regions_by_room["3b_05"], doors_by_room["3b_05"]),
+    "3b_06": Room("3b", "3b_06", "Celestial Resort B - Room 06", regions_by_room["3b_06"], doors_by_room["3b_06"], "Staff Quarters", "3b_06_west"),
+    "3b_07": Room("3b", "3b_07", "Celestial Resort B - Room 07", regions_by_room["3b_07"], doors_by_room["3b_07"]),
+    "3b_08": Room("3b", "3b_08", "Celestial Resort B - Room 08", regions_by_room["3b_08"], doors_by_room["3b_08"]),
+    "3b_09": Room("3b", "3b_09", "Celestial Resort B - Room 09", regions_by_room["3b_09"], doors_by_room["3b_09"]),
+    "3b_10": Room("3b", "3b_10", "Celestial Resort B - Room 10", regions_by_room["3b_10"], doors_by_room["3b_10"]),
+    "3b_11": Room("3b", "3b_11", "Celestial Resort B - Room 11", regions_by_room["3b_11"], doors_by_room["3b_11"], "Library", "3b_11_west"),
+    "3b_13": Room("3b", "3b_13", "Celestial Resort B - Room 13", regions_by_room["3b_13"], doors_by_room["3b_13"]),
+    "3b_14": Room("3b", "3b_14", "Celestial Resort B - Room 14", regions_by_room["3b_14"], doors_by_room["3b_14"]),
+    "3b_15": Room("3b", "3b_15", "Celestial Resort B - Room 15", regions_by_room["3b_15"], doors_by_room["3b_15"]),
+    "3b_12": Room("3b", "3b_12", "Celestial Resort B - Room 12", regions_by_room["3b_12"], doors_by_room["3b_12"]),
+    "3b_16": Room("3b", "3b_16", "Celestial Resort B - Room 16", regions_by_room["3b_16"], doors_by_room["3b_16"], "Rooftop", "3b_16_west"),
+    "3b_17": Room("3b", "3b_17", "Celestial Resort B - Room 17", regions_by_room["3b_17"], doors_by_room["3b_17"]),
+    "3b_18": Room("3b", "3b_18", "Celestial Resort B - Room 18", regions_by_room["3b_18"], doors_by_room["3b_18"]),
+    "3b_19": Room("3b", "3b_19", "Celestial Resort B - Room 19", regions_by_room["3b_19"], doors_by_room["3b_19"]),
+    "3b_21": Room("3b", "3b_21", "Celestial Resort B - Room 21", regions_by_room["3b_21"], doors_by_room["3b_21"]),
+    "3b_20": Room("3b", "3b_20", "Celestial Resort B - Room 20", regions_by_room["3b_20"], doors_by_room["3b_20"]),
+    "3b_end": Room("3b", "3b_end", "Celestial Resort B - Room end", regions_by_room["3b_end"], doors_by_room["3b_end"]),
 
-    "3c_00": Room("3c", "3c_00", "Celestial Resort C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "3c_00"], [door for _, door in all_doors.items() if door.room_name == "3c_00"], "Start", "3c_00_west"),
-    "3c_01": Room("3c", "3c_01", "Celestial Resort C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "3c_01"], [door for _, door in all_doors.items() if door.room_name == "3c_01"]),
-    "3c_02": Room("3c", "3c_02", "Celestial Resort C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "3c_02"], [door for _, door in all_doors.items() if door.room_name == "3c_02"]),
+    "3c_00": Room("3c", "3c_00", "Celestial Resort C - Room 00", regions_by_room["3c_00"], doors_by_room["3c_00"], "Start", "3c_00_west"),
+    "3c_01": Room("3c", "3c_01", "Celestial Resort C - Room 01", regions_by_room["3c_01"], doors_by_room["3c_01"]),
+    "3c_02": Room("3c", "3c_02", "Celestial Resort C - Room 02", regions_by_room["3c_02"], doors_by_room["3c_02"]),
 
-    "4a_a-00": Room("4a", "4a_a-00", "Golden Ridge A - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-00"], [door for _, door in all_doors.items() if door.room_name == "4a_a-00"], "Start", "4a_a-00_west"),
-    "4a_a-01": Room("4a", "4a_a-01", "Golden Ridge A - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-01"], [door for _, door in all_doors.items() if door.room_name == "4a_a-01"]),
-    "4a_a-01x": Room("4a", "4a_a-01x", "Golden Ridge A - Room a-01x", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-01x"], [door for _, door in all_doors.items() if door.room_name == "4a_a-01x"]),
-    "4a_a-02": Room("4a", "4a_a-02", "Golden Ridge A - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-02"], [door for _, door in all_doors.items() if door.room_name == "4a_a-02"]),
-    "4a_a-03": Room("4a", "4a_a-03", "Golden Ridge A - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-03"], [door for _, door in all_doors.items() if door.room_name == "4a_a-03"]),
-    "4a_a-04": Room("4a", "4a_a-04", "Golden Ridge A - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-04"], [door for _, door in all_doors.items() if door.room_name == "4a_a-04"]),
-    "4a_a-05": Room("4a", "4a_a-05", "Golden Ridge A - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-05"], [door for _, door in all_doors.items() if door.room_name == "4a_a-05"]),
-    "4a_a-06": Room("4a", "4a_a-06", "Golden Ridge A - Room a-06", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-06"], [door for _, door in all_doors.items() if door.room_name == "4a_a-06"]),
-    "4a_a-07": Room("4a", "4a_a-07", "Golden Ridge A - Room a-07", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-07"], [door for _, door in all_doors.items() if door.room_name == "4a_a-07"]),
-    "4a_a-08": Room("4a", "4a_a-08", "Golden Ridge A - Room a-08", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-08"], [door for _, door in all_doors.items() if door.room_name == "4a_a-08"]),
-    "4a_a-10": Room("4a", "4a_a-10", "Golden Ridge A - Room a-10", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-10"], [door for _, door in all_doors.items() if door.room_name == "4a_a-10"]),
-    "4a_a-11": Room("4a", "4a_a-11", "Golden Ridge A - Room a-11", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-11"], [door for _, door in all_doors.items() if door.room_name == "4a_a-11"]),
-    "4a_a-09": Room("4a", "4a_a-09", "Golden Ridge A - Room a-09", [reg for _, reg in all_regions.items() if reg.room_name == "4a_a-09"], [door for _, door in all_doors.items() if door.room_name == "4a_a-09"]),
-    "4a_b-00": Room("4a", "4a_b-00", "Golden Ridge A - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-00"], [door for _, door in all_doors.items() if door.room_name == "4a_b-00"], "Shrine", "4a_b-00_south"),
-    "4a_b-01": Room("4a", "4a_b-01", "Golden Ridge A - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-01"], [door for _, door in all_doors.items() if door.room_name == "4a_b-01"]),
-    "4a_b-04": Room("4a", "4a_b-04", "Golden Ridge A - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-04"], [door for _, door in all_doors.items() if door.room_name == "4a_b-04"]),
-    "4a_b-06": Room("4a", "4a_b-06", "Golden Ridge A - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-06"], [door for _, door in all_doors.items() if door.room_name == "4a_b-06"]),
-    "4a_b-07": Room("4a", "4a_b-07", "Golden Ridge A - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-07"], [door for _, door in all_doors.items() if door.room_name == "4a_b-07"]),
-    "4a_b-03": Room("4a", "4a_b-03", "Golden Ridge A - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-03"], [door for _, door in all_doors.items() if door.room_name == "4a_b-03"]),
-    "4a_b-02": Room("4a", "4a_b-02", "Golden Ridge A - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-02"], [door for _, door in all_doors.items() if door.room_name == "4a_b-02"]),
-    "4a_b-sec": Room("4a", "4a_b-sec", "Golden Ridge A - Room b-sec", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-sec"], [door for _, door in all_doors.items() if door.room_name == "4a_b-sec"]),
-    "4a_b-secb": Room("4a", "4a_b-secb", "Golden Ridge A - Room b-secb", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-secb"], [door for _, door in all_doors.items() if door.room_name == "4a_b-secb"]),
-    "4a_b-05": Room("4a", "4a_b-05", "Golden Ridge A - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-05"], [door for _, door in all_doors.items() if door.room_name == "4a_b-05"]),
-    "4a_b-08b": Room("4a", "4a_b-08b", "Golden Ridge A - Room b-08b", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-08b"], [door for _, door in all_doors.items() if door.room_name == "4a_b-08b"]),
-    "4a_b-08": Room("4a", "4a_b-08", "Golden Ridge A - Room b-08", [reg for _, reg in all_regions.items() if reg.room_name == "4a_b-08"], [door for _, door in all_doors.items() if door.room_name == "4a_b-08"]),
-    "4a_c-00": Room("4a", "4a_c-00", "Golden Ridge A - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-00"], [door for _, door in all_doors.items() if door.room_name == "4a_c-00"], "Old Trail", "4a_c-00_west"),
-    "4a_c-01": Room("4a", "4a_c-01", "Golden Ridge A - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-01"], [door for _, door in all_doors.items() if door.room_name == "4a_c-01"]),
-    "4a_c-02": Room("4a", "4a_c-02", "Golden Ridge A - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-02"], [door for _, door in all_doors.items() if door.room_name == "4a_c-02"]),
-    "4a_c-04": Room("4a", "4a_c-04", "Golden Ridge A - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-04"], [door for _, door in all_doors.items() if door.room_name == "4a_c-04"]),
-    "4a_c-05": Room("4a", "4a_c-05", "Golden Ridge A - Room c-05", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-05"], [door for _, door in all_doors.items() if door.room_name == "4a_c-05"]),
-    "4a_c-06": Room("4a", "4a_c-06", "Golden Ridge A - Room c-06", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-06"], [door for _, door in all_doors.items() if door.room_name == "4a_c-06"]),
-    "4a_c-06b": Room("4a", "4a_c-06b", "Golden Ridge A - Room c-06b", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-06b"], [door for _, door in all_doors.items() if door.room_name == "4a_c-06b"]),
-    "4a_c-09": Room("4a", "4a_c-09", "Golden Ridge A - Room c-09", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-09"], [door for _, door in all_doors.items() if door.room_name == "4a_c-09"]),
-    "4a_c-07": Room("4a", "4a_c-07", "Golden Ridge A - Room c-07", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-07"], [door for _, door in all_doors.items() if door.room_name == "4a_c-07"]),
-    "4a_c-08": Room("4a", "4a_c-08", "Golden Ridge A - Room c-08", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-08"], [door for _, door in all_doors.items() if door.room_name == "4a_c-08"]),
-    "4a_c-10": Room("4a", "4a_c-10", "Golden Ridge A - Room c-10", [reg for _, reg in all_regions.items() if reg.room_name == "4a_c-10"], [door for _, door in all_doors.items() if door.room_name == "4a_c-10"]),
-    "4a_d-00": Room("4a", "4a_d-00", "Golden Ridge A - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-00"], [door for _, door in all_doors.items() if door.room_name == "4a_d-00"], "Cliff Face", "4a_d-00_west"),
-    "4a_d-00b": Room("4a", "4a_d-00b", "Golden Ridge A - Room d-00b", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-00b"], [door for _, door in all_doors.items() if door.room_name == "4a_d-00b"]),
-    "4a_d-01": Room("4a", "4a_d-01", "Golden Ridge A - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-01"], [door for _, door in all_doors.items() if door.room_name == "4a_d-01"]),
-    "4a_d-02": Room("4a", "4a_d-02", "Golden Ridge A - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-02"], [door for _, door in all_doors.items() if door.room_name == "4a_d-02"]),
-    "4a_d-03": Room("4a", "4a_d-03", "Golden Ridge A - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-03"], [door for _, door in all_doors.items() if door.room_name == "4a_d-03"]),
-    "4a_d-04": Room("4a", "4a_d-04", "Golden Ridge A - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-04"], [door for _, door in all_doors.items() if door.room_name == "4a_d-04"]),
-    "4a_d-05": Room("4a", "4a_d-05", "Golden Ridge A - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-05"], [door for _, door in all_doors.items() if door.room_name == "4a_d-05"]),
-    "4a_d-06": Room("4a", "4a_d-06", "Golden Ridge A - Room d-06", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-06"], [door for _, door in all_doors.items() if door.room_name == "4a_d-06"]),
-    "4a_d-07": Room("4a", "4a_d-07", "Golden Ridge A - Room d-07", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-07"], [door for _, door in all_doors.items() if door.room_name == "4a_d-07"]),
-    "4a_d-08": Room("4a", "4a_d-08", "Golden Ridge A - Room d-08", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-08"], [door for _, door in all_doors.items() if door.room_name == "4a_d-08"]),
-    "4a_d-09": Room("4a", "4a_d-09", "Golden Ridge A - Room d-09", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-09"], [door for _, door in all_doors.items() if door.room_name == "4a_d-09"]),
-    "4a_d-10": Room("4a", "4a_d-10", "Golden Ridge A - Room d-10", [reg for _, reg in all_regions.items() if reg.room_name == "4a_d-10"], [door for _, door in all_doors.items() if door.room_name == "4a_d-10"]),
+    "4a_a-00": Room("4a", "4a_a-00", "Golden Ridge A - Room a-00", regions_by_room["4a_a-00"], doors_by_room["4a_a-00"], "Start", "4a_a-00_west"),
+    "4a_a-01": Room("4a", "4a_a-01", "Golden Ridge A - Room a-01", regions_by_room["4a_a-01"], doors_by_room["4a_a-01"]),
+    "4a_a-01x": Room("4a", "4a_a-01x", "Golden Ridge A - Room a-01x", regions_by_room["4a_a-01x"], doors_by_room["4a_a-01x"]),
+    "4a_a-02": Room("4a", "4a_a-02", "Golden Ridge A - Room a-02", regions_by_room["4a_a-02"], doors_by_room["4a_a-02"]),
+    "4a_a-03": Room("4a", "4a_a-03", "Golden Ridge A - Room a-03", regions_by_room["4a_a-03"], doors_by_room["4a_a-03"]),
+    "4a_a-04": Room("4a", "4a_a-04", "Golden Ridge A - Room a-04", regions_by_room["4a_a-04"], doors_by_room["4a_a-04"]),
+    "4a_a-05": Room("4a", "4a_a-05", "Golden Ridge A - Room a-05", regions_by_room["4a_a-05"], doors_by_room["4a_a-05"]),
+    "4a_a-06": Room("4a", "4a_a-06", "Golden Ridge A - Room a-06", regions_by_room["4a_a-06"], doors_by_room["4a_a-06"]),
+    "4a_a-07": Room("4a", "4a_a-07", "Golden Ridge A - Room a-07", regions_by_room["4a_a-07"], doors_by_room["4a_a-07"]),
+    "4a_a-08": Room("4a", "4a_a-08", "Golden Ridge A - Room a-08", regions_by_room["4a_a-08"], doors_by_room["4a_a-08"]),
+    "4a_a-10": Room("4a", "4a_a-10", "Golden Ridge A - Room a-10", regions_by_room["4a_a-10"], doors_by_room["4a_a-10"]),
+    "4a_a-11": Room("4a", "4a_a-11", "Golden Ridge A - Room a-11", regions_by_room["4a_a-11"], doors_by_room["4a_a-11"]),
+    "4a_a-09": Room("4a", "4a_a-09", "Golden Ridge A - Room a-09", regions_by_room["4a_a-09"], doors_by_room["4a_a-09"]),
+    "4a_b-00": Room("4a", "4a_b-00", "Golden Ridge A - Room b-00", regions_by_room["4a_b-00"], doors_by_room["4a_b-00"], "Shrine", "4a_b-00_south"),
+    "4a_b-01": Room("4a", "4a_b-01", "Golden Ridge A - Room b-01", regions_by_room["4a_b-01"], doors_by_room["4a_b-01"]),
+    "4a_b-04": Room("4a", "4a_b-04", "Golden Ridge A - Room b-04", regions_by_room["4a_b-04"], doors_by_room["4a_b-04"]),
+    "4a_b-06": Room("4a", "4a_b-06", "Golden Ridge A - Room b-06", regions_by_room["4a_b-06"], doors_by_room["4a_b-06"]),
+    "4a_b-07": Room("4a", "4a_b-07", "Golden Ridge A - Room b-07", regions_by_room["4a_b-07"], doors_by_room["4a_b-07"]),
+    "4a_b-03": Room("4a", "4a_b-03", "Golden Ridge A - Room b-03", regions_by_room["4a_b-03"], doors_by_room["4a_b-03"]),
+    "4a_b-02": Room("4a", "4a_b-02", "Golden Ridge A - Room b-02", regions_by_room["4a_b-02"], doors_by_room["4a_b-02"]),
+    "4a_b-sec": Room("4a", "4a_b-sec", "Golden Ridge A - Room b-sec", regions_by_room["4a_b-sec"], doors_by_room["4a_b-sec"]),
+    "4a_b-secb": Room("4a", "4a_b-secb", "Golden Ridge A - Room b-secb", regions_by_room["4a_b-secb"], doors_by_room["4a_b-secb"]),
+    "4a_b-05": Room("4a", "4a_b-05", "Golden Ridge A - Room b-05", regions_by_room["4a_b-05"], doors_by_room["4a_b-05"]),
+    "4a_b-08b": Room("4a", "4a_b-08b", "Golden Ridge A - Room b-08b", regions_by_room["4a_b-08b"], doors_by_room["4a_b-08b"]),
+    "4a_b-08": Room("4a", "4a_b-08", "Golden Ridge A - Room b-08", regions_by_room["4a_b-08"], doors_by_room["4a_b-08"]),
+    "4a_c-00": Room("4a", "4a_c-00", "Golden Ridge A - Room c-00", regions_by_room["4a_c-00"], doors_by_room["4a_c-00"], "Old Trail", "4a_c-00_west"),
+    "4a_c-01": Room("4a", "4a_c-01", "Golden Ridge A - Room c-01", regions_by_room["4a_c-01"], doors_by_room["4a_c-01"]),
+    "4a_c-02": Room("4a", "4a_c-02", "Golden Ridge A - Room c-02", regions_by_room["4a_c-02"], doors_by_room["4a_c-02"]),
+    "4a_c-04": Room("4a", "4a_c-04", "Golden Ridge A - Room c-04", regions_by_room["4a_c-04"], doors_by_room["4a_c-04"]),
+    "4a_c-05": Room("4a", "4a_c-05", "Golden Ridge A - Room c-05", regions_by_room["4a_c-05"], doors_by_room["4a_c-05"]),
+    "4a_c-06": Room("4a", "4a_c-06", "Golden Ridge A - Room c-06", regions_by_room["4a_c-06"], doors_by_room["4a_c-06"]),
+    "4a_c-06b": Room("4a", "4a_c-06b", "Golden Ridge A - Room c-06b", regions_by_room["4a_c-06b"], doors_by_room["4a_c-06b"]),
+    "4a_c-09": Room("4a", "4a_c-09", "Golden Ridge A - Room c-09", regions_by_room["4a_c-09"], doors_by_room["4a_c-09"]),
+    "4a_c-07": Room("4a", "4a_c-07", "Golden Ridge A - Room c-07", regions_by_room["4a_c-07"], doors_by_room["4a_c-07"]),
+    "4a_c-08": Room("4a", "4a_c-08", "Golden Ridge A - Room c-08", regions_by_room["4a_c-08"], doors_by_room["4a_c-08"]),
+    "4a_c-10": Room("4a", "4a_c-10", "Golden Ridge A - Room c-10", regions_by_room["4a_c-10"], doors_by_room["4a_c-10"]),
+    "4a_d-00": Room("4a", "4a_d-00", "Golden Ridge A - Room d-00", regions_by_room["4a_d-00"], doors_by_room["4a_d-00"], "Cliff Face", "4a_d-00_west"),
+    "4a_d-00b": Room("4a", "4a_d-00b", "Golden Ridge A - Room d-00b", regions_by_room["4a_d-00b"], doors_by_room["4a_d-00b"]),
+    "4a_d-01": Room("4a", "4a_d-01", "Golden Ridge A - Room d-01", regions_by_room["4a_d-01"], doors_by_room["4a_d-01"]),
+    "4a_d-02": Room("4a", "4a_d-02", "Golden Ridge A - Room d-02", regions_by_room["4a_d-02"], doors_by_room["4a_d-02"]),
+    "4a_d-03": Room("4a", "4a_d-03", "Golden Ridge A - Room d-03", regions_by_room["4a_d-03"], doors_by_room["4a_d-03"]),
+    "4a_d-04": Room("4a", "4a_d-04", "Golden Ridge A - Room d-04", regions_by_room["4a_d-04"], doors_by_room["4a_d-04"]),
+    "4a_d-05": Room("4a", "4a_d-05", "Golden Ridge A - Room d-05", regions_by_room["4a_d-05"], doors_by_room["4a_d-05"]),
+    "4a_d-06": Room("4a", "4a_d-06", "Golden Ridge A - Room d-06", regions_by_room["4a_d-06"], doors_by_room["4a_d-06"]),
+    "4a_d-07": Room("4a", "4a_d-07", "Golden Ridge A - Room d-07", regions_by_room["4a_d-07"], doors_by_room["4a_d-07"]),
+    "4a_d-08": Room("4a", "4a_d-08", "Golden Ridge A - Room d-08", regions_by_room["4a_d-08"], doors_by_room["4a_d-08"]),
+    "4a_d-09": Room("4a", "4a_d-09", "Golden Ridge A - Room d-09", regions_by_room["4a_d-09"], doors_by_room["4a_d-09"]),
+    "4a_d-10": Room("4a", "4a_d-10", "Golden Ridge A - Room d-10", regions_by_room["4a_d-10"], doors_by_room["4a_d-10"]),
 
-    "4b_a-00": Room("4b", "4b_a-00", "Golden Ridge B - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "4b_a-00"], [door for _, door in all_doors.items() if door.room_name == "4b_a-00"], "Start", "4b_a-00_west"),
-    "4b_a-01": Room("4b", "4b_a-01", "Golden Ridge B - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "4b_a-01"], [door for _, door in all_doors.items() if door.room_name == "4b_a-01"]),
-    "4b_a-02": Room("4b", "4b_a-02", "Golden Ridge B - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "4b_a-02"], [door for _, door in all_doors.items() if door.room_name == "4b_a-02"]),
-    "4b_a-03": Room("4b", "4b_a-03", "Golden Ridge B - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "4b_a-03"], [door for _, door in all_doors.items() if door.room_name == "4b_a-03"]),
-    "4b_a-04": Room("4b", "4b_a-04", "Golden Ridge B - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "4b_a-04"], [door for _, door in all_doors.items() if door.room_name == "4b_a-04"]),
-    "4b_b-00": Room("4b", "4b_b-00", "Golden Ridge B - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "4b_b-00"], [door for _, door in all_doors.items() if door.room_name == "4b_b-00"], "Stepping Stones", "4b_b-00_west"),
-    "4b_b-01": Room("4b", "4b_b-01", "Golden Ridge B - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "4b_b-01"], [door for _, door in all_doors.items() if door.room_name == "4b_b-01"]),
-    "4b_b-02": Room("4b", "4b_b-02", "Golden Ridge B - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "4b_b-02"], [door for _, door in all_doors.items() if door.room_name == "4b_b-02"]),
-    "4b_b-03": Room("4b", "4b_b-03", "Golden Ridge B - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "4b_b-03"], [door for _, door in all_doors.items() if door.room_name == "4b_b-03"]),
-    "4b_b-04": Room("4b", "4b_b-04", "Golden Ridge B - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "4b_b-04"], [door for _, door in all_doors.items() if door.room_name == "4b_b-04"]),
-    "4b_c-00": Room("4b", "4b_c-00", "Golden Ridge B - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "4b_c-00"], [door for _, door in all_doors.items() if door.room_name == "4b_c-00"], "Gusty Canyon", "4b_c-00_west"),
-    "4b_c-01": Room("4b", "4b_c-01", "Golden Ridge B - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "4b_c-01"], [door for _, door in all_doors.items() if door.room_name == "4b_c-01"]),
-    "4b_c-02": Room("4b", "4b_c-02", "Golden Ridge B - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "4b_c-02"], [door for _, door in all_doors.items() if door.room_name == "4b_c-02"]),
-    "4b_c-03": Room("4b", "4b_c-03", "Golden Ridge B - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "4b_c-03"], [door for _, door in all_doors.items() if door.room_name == "4b_c-03"]),
-    "4b_c-04": Room("4b", "4b_c-04", "Golden Ridge B - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "4b_c-04"], [door for _, door in all_doors.items() if door.room_name == "4b_c-04"]),
-    "4b_d-00": Room("4b", "4b_d-00", "Golden Ridge B - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "4b_d-00"], [door for _, door in all_doors.items() if door.room_name == "4b_d-00"], "Eye of the Storm", "4b_d-00_west"),
-    "4b_d-01": Room("4b", "4b_d-01", "Golden Ridge B - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "4b_d-01"], [door for _, door in all_doors.items() if door.room_name == "4b_d-01"]),
-    "4b_d-02": Room("4b", "4b_d-02", "Golden Ridge B - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "4b_d-02"], [door for _, door in all_doors.items() if door.room_name == "4b_d-02"]),
-    "4b_d-03": Room("4b", "4b_d-03", "Golden Ridge B - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "4b_d-03"], [door for _, door in all_doors.items() if door.room_name == "4b_d-03"]),
-    "4b_end": Room("4b", "4b_end", "Golden Ridge B - Room end", [reg for _, reg in all_regions.items() if reg.room_name == "4b_end"], [door for _, door in all_doors.items() if door.room_name == "4b_end"]),
+    "4b_a-00": Room("4b", "4b_a-00", "Golden Ridge B - Room a-00", regions_by_room["4b_a-00"], doors_by_room["4b_a-00"], "Start", "4b_a-00_west"),
+    "4b_a-01": Room("4b", "4b_a-01", "Golden Ridge B - Room a-01", regions_by_room["4b_a-01"], doors_by_room["4b_a-01"]),
+    "4b_a-02": Room("4b", "4b_a-02", "Golden Ridge B - Room a-02", regions_by_room["4b_a-02"], doors_by_room["4b_a-02"]),
+    "4b_a-03": Room("4b", "4b_a-03", "Golden Ridge B - Room a-03", regions_by_room["4b_a-03"], doors_by_room["4b_a-03"]),
+    "4b_a-04": Room("4b", "4b_a-04", "Golden Ridge B - Room a-04", regions_by_room["4b_a-04"], doors_by_room["4b_a-04"]),
+    "4b_b-00": Room("4b", "4b_b-00", "Golden Ridge B - Room b-00", regions_by_room["4b_b-00"], doors_by_room["4b_b-00"], "Stepping Stones", "4b_b-00_west"),
+    "4b_b-01": Room("4b", "4b_b-01", "Golden Ridge B - Room b-01", regions_by_room["4b_b-01"], doors_by_room["4b_b-01"]),
+    "4b_b-02": Room("4b", "4b_b-02", "Golden Ridge B - Room b-02", regions_by_room["4b_b-02"], doors_by_room["4b_b-02"]),
+    "4b_b-03": Room("4b", "4b_b-03", "Golden Ridge B - Room b-03", regions_by_room["4b_b-03"], doors_by_room["4b_b-03"]),
+    "4b_b-04": Room("4b", "4b_b-04", "Golden Ridge B - Room b-04", regions_by_room["4b_b-04"], doors_by_room["4b_b-04"]),
+    "4b_c-00": Room("4b", "4b_c-00", "Golden Ridge B - Room c-00", regions_by_room["4b_c-00"], doors_by_room["4b_c-00"], "Gusty Canyon", "4b_c-00_west"),
+    "4b_c-01": Room("4b", "4b_c-01", "Golden Ridge B - Room c-01", regions_by_room["4b_c-01"], doors_by_room["4b_c-01"]),
+    "4b_c-02": Room("4b", "4b_c-02", "Golden Ridge B - Room c-02", regions_by_room["4b_c-02"], doors_by_room["4b_c-02"]),
+    "4b_c-03": Room("4b", "4b_c-03", "Golden Ridge B - Room c-03", regions_by_room["4b_c-03"], doors_by_room["4b_c-03"]),
+    "4b_c-04": Room("4b", "4b_c-04", "Golden Ridge B - Room c-04", regions_by_room["4b_c-04"], doors_by_room["4b_c-04"]),
+    "4b_d-00": Room("4b", "4b_d-00", "Golden Ridge B - Room d-00", regions_by_room["4b_d-00"], doors_by_room["4b_d-00"], "Eye of the Storm", "4b_d-00_west"),
+    "4b_d-01": Room("4b", "4b_d-01", "Golden Ridge B - Room d-01", regions_by_room["4b_d-01"], doors_by_room["4b_d-01"]),
+    "4b_d-02": Room("4b", "4b_d-02", "Golden Ridge B - Room d-02", regions_by_room["4b_d-02"], doors_by_room["4b_d-02"]),
+    "4b_d-03": Room("4b", "4b_d-03", "Golden Ridge B - Room d-03", regions_by_room["4b_d-03"], doors_by_room["4b_d-03"]),
+    "4b_end": Room("4b", "4b_end", "Golden Ridge B - Room end", regions_by_room["4b_end"], doors_by_room["4b_end"]),
 
-    "4c_00": Room("4c", "4c_00", "Golden Ridge C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "4c_00"], [door for _, door in all_doors.items() if door.room_name == "4c_00"], "Start", "4c_00_west"),
-    "4c_01": Room("4c", "4c_01", "Golden Ridge C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "4c_01"], [door for _, door in all_doors.items() if door.room_name == "4c_01"]),
-    "4c_02": Room("4c", "4c_02", "Golden Ridge C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "4c_02"], [door for _, door in all_doors.items() if door.room_name == "4c_02"]),
+    "4c_00": Room("4c", "4c_00", "Golden Ridge C - Room 00", regions_by_room["4c_00"], doors_by_room["4c_00"], "Start", "4c_00_west"),
+    "4c_01": Room("4c", "4c_01", "Golden Ridge C - Room 01", regions_by_room["4c_01"], doors_by_room["4c_01"]),
+    "4c_02": Room("4c", "4c_02", "Golden Ridge C - Room 02", regions_by_room["4c_02"], doors_by_room["4c_02"]),
 
-    "5a_a-00b": Room("5a", "5a_a-00b", "Mirror Temple A - Room a-00b", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-00b"], [door for _, door in all_doors.items() if door.room_name == "5a_a-00b"], "Start", "5a_a-00b_west"),
-    "5a_a-00x": Room("5a", "5a_a-00x", "Mirror Temple A - Room a-00x", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-00x"], [door for _, door in all_doors.items() if door.room_name == "5a_a-00x"]),
-    "5a_a-00d": Room("5a", "5a_a-00d", "Mirror Temple A - Room a-00d", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-00d"], [door for _, door in all_doors.items() if door.room_name == "5a_a-00d"]),
-    "5a_a-00c": Room("5a", "5a_a-00c", "Mirror Temple A - Room a-00c", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-00c"], [door for _, door in all_doors.items() if door.room_name == "5a_a-00c"]),
-    "5a_a-00": Room("5a", "5a_a-00", "Mirror Temple A - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-00"], [door for _, door in all_doors.items() if door.room_name == "5a_a-00"]),
-    "5a_a-01": Room("5a", "5a_a-01", "Mirror Temple A - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-01"], [door for _, door in all_doors.items() if door.room_name == "5a_a-01"]),
-    "5a_a-02": Room("5a", "5a_a-02", "Mirror Temple A - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-02"], [door for _, door in all_doors.items() if door.room_name == "5a_a-02"]),
-    "5a_a-03": Room("5a", "5a_a-03", "Mirror Temple A - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-03"], [door for _, door in all_doors.items() if door.room_name == "5a_a-03"]),
-    "5a_a-04": Room("5a", "5a_a-04", "Mirror Temple A - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-04"], [door for _, door in all_doors.items() if door.room_name == "5a_a-04"]),
-    "5a_a-05": Room("5a", "5a_a-05", "Mirror Temple A - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-05"], [door for _, door in all_doors.items() if door.room_name == "5a_a-05"]),
-    "5a_a-06": Room("5a", "5a_a-06", "Mirror Temple A - Room a-06", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-06"], [door for _, door in all_doors.items() if door.room_name == "5a_a-06"]),
-    "5a_a-07": Room("5a", "5a_a-07", "Mirror Temple A - Room a-07", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-07"], [door for _, door in all_doors.items() if door.room_name == "5a_a-07"]),
-    "5a_a-08": Room("5a", "5a_a-08", "Mirror Temple A - Room a-08", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-08"], [door for _, door in all_doors.items() if door.room_name == "5a_a-08"]),
-    "5a_a-10": Room("5a", "5a_a-10", "Mirror Temple A - Room a-10", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-10"], [door for _, door in all_doors.items() if door.room_name == "5a_a-10"]),
-    "5a_a-09": Room("5a", "5a_a-09", "Mirror Temple A - Room a-09", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-09"], [door for _, door in all_doors.items() if door.room_name == "5a_a-09"]),
-    "5a_a-11": Room("5a", "5a_a-11", "Mirror Temple A - Room a-11", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-11"], [door for _, door in all_doors.items() if door.room_name == "5a_a-11"]),
-    "5a_a-12": Room("5a", "5a_a-12", "Mirror Temple A - Room a-12", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-12"], [door for _, door in all_doors.items() if door.room_name == "5a_a-12"]),
-    "5a_a-15": Room("5a", "5a_a-15", "Mirror Temple A - Room a-15", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-15"], [door for _, door in all_doors.items() if door.room_name == "5a_a-15"]),
-    "5a_a-14": Room("5a", "5a_a-14", "Mirror Temple A - Room a-14", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-14"], [door for _, door in all_doors.items() if door.room_name == "5a_a-14"]),
-    "5a_a-13": Room("5a", "5a_a-13", "Mirror Temple A - Room a-13", [reg for _, reg in all_regions.items() if reg.room_name == "5a_a-13"], [door for _, door in all_doors.items() if door.room_name == "5a_a-13"]),
-    "5a_b-00": Room("5a", "5a_b-00", "Mirror Temple A - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-00"], [door for _, door in all_doors.items() if door.room_name == "5a_b-00"], "Depths", "5a_b-00_west"),
-    "5a_b-18": Room("5a", "5a_b-18", "Mirror Temple A - Room b-18", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-18"], [door for _, door in all_doors.items() if door.room_name == "5a_b-18"]),
-    "5a_b-01": Room("5a", "5a_b-01", "Mirror Temple A - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-01"], [door for _, door in all_doors.items() if door.room_name == "5a_b-01"]),
-    "5a_b-01c": Room("5a", "5a_b-01c", "Mirror Temple A - Room b-01c", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-01c"], [door for _, door in all_doors.items() if door.room_name == "5a_b-01c"]),
-    "5a_b-20": Room("5a", "5a_b-20", "Mirror Temple A - Room b-20", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-20"], [door for _, door in all_doors.items() if door.room_name == "5a_b-20"]),
-    "5a_b-21": Room("5a", "5a_b-21", "Mirror Temple A - Room b-21", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-21"], [door for _, door in all_doors.items() if door.room_name == "5a_b-21"]),
-    "5a_b-01b": Room("5a", "5a_b-01b", "Mirror Temple A - Room b-01b", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-01b"], [door for _, door in all_doors.items() if door.room_name == "5a_b-01b"]),
-    "5a_b-02": Room("5a", "5a_b-02", "Mirror Temple A - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-02"], [door for _, door in all_doors.items() if door.room_name == "5a_b-02"]),
-    "5a_b-03": Room("5a", "5a_b-03", "Mirror Temple A - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-03"], [door for _, door in all_doors.items() if door.room_name == "5a_b-03"]),
-    "5a_b-05": Room("5a", "5a_b-05", "Mirror Temple A - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-05"], [door for _, door in all_doors.items() if door.room_name == "5a_b-05"]),
-    "5a_b-04": Room("5a", "5a_b-04", "Mirror Temple A - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-04"], [door for _, door in all_doors.items() if door.room_name == "5a_b-04"]),
-    "5a_b-07": Room("5a", "5a_b-07", "Mirror Temple A - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-07"], [door for _, door in all_doors.items() if door.room_name == "5a_b-07"]),
-    "5a_b-08": Room("5a", "5a_b-08", "Mirror Temple A - Room b-08", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-08"], [door for _, door in all_doors.items() if door.room_name == "5a_b-08"]),
-    "5a_b-09": Room("5a", "5a_b-09", "Mirror Temple A - Room b-09", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-09"], [door for _, door in all_doors.items() if door.room_name == "5a_b-09"]),
-    "5a_b-10": Room("5a", "5a_b-10", "Mirror Temple A - Room b-10", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-10"], [door for _, door in all_doors.items() if door.room_name == "5a_b-10"]),
-    "5a_b-11": Room("5a", "5a_b-11", "Mirror Temple A - Room b-11", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-11"], [door for _, door in all_doors.items() if door.room_name == "5a_b-11"]),
-    "5a_b-12": Room("5a", "5a_b-12", "Mirror Temple A - Room b-12", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-12"], [door for _, door in all_doors.items() if door.room_name == "5a_b-12"]),
-    "5a_b-13": Room("5a", "5a_b-13", "Mirror Temple A - Room b-13", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-13"], [door for _, door in all_doors.items() if door.room_name == "5a_b-13"]),
-    "5a_b-17": Room("5a", "5a_b-17", "Mirror Temple A - Room b-17", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-17"], [door for _, door in all_doors.items() if door.room_name == "5a_b-17"]),
-    "5a_b-22": Room("5a", "5a_b-22", "Mirror Temple A - Room b-22", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-22"], [door for _, door in all_doors.items() if door.room_name == "5a_b-22"]),
-    "5a_b-06": Room("5a", "5a_b-06", "Mirror Temple A - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-06"], [door for _, door in all_doors.items() if door.room_name == "5a_b-06"]),
-    "5a_b-19": Room("5a", "5a_b-19", "Mirror Temple A - Room b-19", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-19"], [door for _, door in all_doors.items() if door.room_name == "5a_b-19"]),
-    "5a_b-14": Room("5a", "5a_b-14", "Mirror Temple A - Room b-14", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-14"], [door for _, door in all_doors.items() if door.room_name == "5a_b-14"]),
-    "5a_b-15": Room("5a", "5a_b-15", "Mirror Temple A - Room b-15", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-15"], [door for _, door in all_doors.items() if door.room_name == "5a_b-15"]),
-    "5a_b-16": Room("5a", "5a_b-16", "Mirror Temple A - Room b-16", [reg for _, reg in all_regions.items() if reg.room_name == "5a_b-16"], [door for _, door in all_doors.items() if door.room_name == "5a_b-16"]),
-    "5a_void": Room("5a", "5a_void", "Mirror Temple A - Room void", [reg for _, reg in all_regions.items() if reg.room_name == "5a_void"], [door for _, door in all_doors.items() if door.room_name == "5a_void"]),
-    "5a_c-00": Room("5a", "5a_c-00", "Mirror Temple A - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-00"], [door for _, door in all_doors.items() if door.room_name == "5a_c-00"], "Unravelling", "5a_c-00_top"),
-    "5a_c-01": Room("5a", "5a_c-01", "Mirror Temple A - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-01"], [door for _, door in all_doors.items() if door.room_name == "5a_c-01"]),
-    "5a_c-01b": Room("5a", "5a_c-01b", "Mirror Temple A - Room c-01b", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-01b"], [door for _, door in all_doors.items() if door.room_name == "5a_c-01b"]),
-    "5a_c-01c": Room("5a", "5a_c-01c", "Mirror Temple A - Room c-01c", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-01c"], [door for _, door in all_doors.items() if door.room_name == "5a_c-01c"]),
-    "5a_c-08b": Room("5a", "5a_c-08b", "Mirror Temple A - Room c-08b", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-08b"], [door for _, door in all_doors.items() if door.room_name == "5a_c-08b"]),
-    "5a_c-08": Room("5a", "5a_c-08", "Mirror Temple A - Room c-08", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-08"], [door for _, door in all_doors.items() if door.room_name == "5a_c-08"]),
-    "5a_c-10": Room("5a", "5a_c-10", "Mirror Temple A - Room c-10", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-10"], [door for _, door in all_doors.items() if door.room_name == "5a_c-10"]),
-    "5a_c-12": Room("5a", "5a_c-12", "Mirror Temple A - Room c-12", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-12"], [door for _, door in all_doors.items() if door.room_name == "5a_c-12"]),
-    "5a_c-07": Room("5a", "5a_c-07", "Mirror Temple A - Room c-07", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-07"], [door for _, door in all_doors.items() if door.room_name == "5a_c-07"]),
-    "5a_c-11": Room("5a", "5a_c-11", "Mirror Temple A - Room c-11", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-11"], [door for _, door in all_doors.items() if door.room_name == "5a_c-11"]),
-    "5a_c-09": Room("5a", "5a_c-09", "Mirror Temple A - Room c-09", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-09"], [door for _, door in all_doors.items() if door.room_name == "5a_c-09"]),
-    "5a_c-13": Room("5a", "5a_c-13", "Mirror Temple A - Room c-13", [reg for _, reg in all_regions.items() if reg.room_name == "5a_c-13"], [door for _, door in all_doors.items() if door.room_name == "5a_c-13"]),
-    "5a_d-00": Room("5a", "5a_d-00", "Mirror Temple A - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-00"], [door for _, door in all_doors.items() if door.room_name == "5a_d-00"], "Search", "5a_d-00_south"),
-    "5a_d-01": Room("5a", "5a_d-01", "Mirror Temple A - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-01"], [door for _, door in all_doors.items() if door.room_name == "5a_d-01"]),
-    "5a_d-09": Room("5a", "5a_d-09", "Mirror Temple A - Room d-09", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-09"], [door for _, door in all_doors.items() if door.room_name == "5a_d-09"]),
-    "5a_d-04": Room("5a", "5a_d-04", "Mirror Temple A - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-04"], [door for _, door in all_doors.items() if door.room_name == "5a_d-04"]),
-    "5a_d-05": Room("5a", "5a_d-05", "Mirror Temple A - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-05"], [door for _, door in all_doors.items() if door.room_name == "5a_d-05"]),
-    "5a_d-06": Room("5a", "5a_d-06", "Mirror Temple A - Room d-06", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-06"], [door for _, door in all_doors.items() if door.room_name == "5a_d-06"]),
-    "5a_d-07": Room("5a", "5a_d-07", "Mirror Temple A - Room d-07", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-07"], [door for _, door in all_doors.items() if door.room_name == "5a_d-07"]),
-    "5a_d-02": Room("5a", "5a_d-02", "Mirror Temple A - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-02"], [door for _, door in all_doors.items() if door.room_name == "5a_d-02"]),
-    "5a_d-03": Room("5a", "5a_d-03", "Mirror Temple A - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-03"], [door for _, door in all_doors.items() if door.room_name == "5a_d-03"]),
-    "5a_d-15": Room("5a", "5a_d-15", "Mirror Temple A - Room d-15", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-15"], [door for _, door in all_doors.items() if door.room_name == "5a_d-15"]),
-    "5a_d-13": Room("5a", "5a_d-13", "Mirror Temple A - Room d-13", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-13"], [door for _, door in all_doors.items() if door.room_name == "5a_d-13"]),
-    "5a_d-19b": Room("5a", "5a_d-19b", "Mirror Temple A - Room d-19b", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-19b"], [door for _, door in all_doors.items() if door.room_name == "5a_d-19b"]),
-    "5a_d-19": Room("5a", "5a_d-19", "Mirror Temple A - Room d-19", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-19"], [door for _, door in all_doors.items() if door.room_name == "5a_d-19"]),
-    "5a_d-10": Room("5a", "5a_d-10", "Mirror Temple A - Room d-10", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-10"], [door for _, door in all_doors.items() if door.room_name == "5a_d-10"]),
-    "5a_d-20": Room("5a", "5a_d-20", "Mirror Temple A - Room d-20", [reg for _, reg in all_regions.items() if reg.room_name == "5a_d-20"], [door for _, door in all_doors.items() if door.room_name == "5a_d-20"]),
-    "5a_e-00": Room("5a", "5a_e-00", "Mirror Temple A - Room e-00", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-00"], [door for _, door in all_doors.items() if door.room_name == "5a_e-00"], "Rescue", "5a_e-00_west"),
-    "5a_e-01": Room("5a", "5a_e-01", "Mirror Temple A - Room e-01", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-01"], [door for _, door in all_doors.items() if door.room_name == "5a_e-01"]),
-    "5a_e-02": Room("5a", "5a_e-02", "Mirror Temple A - Room e-02", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-02"], [door for _, door in all_doors.items() if door.room_name == "5a_e-02"]),
-    "5a_e-03": Room("5a", "5a_e-03", "Mirror Temple A - Room e-03", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-03"], [door for _, door in all_doors.items() if door.room_name == "5a_e-03"]),
-    "5a_e-04": Room("5a", "5a_e-04", "Mirror Temple A - Room e-04", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-04"], [door for _, door in all_doors.items() if door.room_name == "5a_e-04"]),
-    "5a_e-06": Room("5a", "5a_e-06", "Mirror Temple A - Room e-06", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-06"], [door for _, door in all_doors.items() if door.room_name == "5a_e-06"]),
-    "5a_e-05": Room("5a", "5a_e-05", "Mirror Temple A - Room e-05", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-05"], [door for _, door in all_doors.items() if door.room_name == "5a_e-05"]),
-    "5a_e-07": Room("5a", "5a_e-07", "Mirror Temple A - Room e-07", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-07"], [door for _, door in all_doors.items() if door.room_name == "5a_e-07"]),
-    "5a_e-08": Room("5a", "5a_e-08", "Mirror Temple A - Room e-08", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-08"], [door for _, door in all_doors.items() if door.room_name == "5a_e-08"]),
-    "5a_e-09": Room("5a", "5a_e-09", "Mirror Temple A - Room e-09", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-09"], [door for _, door in all_doors.items() if door.room_name == "5a_e-09"]),
-    "5a_e-10": Room("5a", "5a_e-10", "Mirror Temple A - Room e-10", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-10"], [door for _, door in all_doors.items() if door.room_name == "5a_e-10"]),
-    "5a_e-11": Room("5a", "5a_e-11", "Mirror Temple A - Room e-11", [reg for _, reg in all_regions.items() if reg.room_name == "5a_e-11"], [door for _, door in all_doors.items() if door.room_name == "5a_e-11"]),
+    "5a_a-00b": Room("5a", "5a_a-00b", "Mirror Temple A - Room a-00b", regions_by_room["5a_a-00b"], doors_by_room["5a_a-00b"], "Start", "5a_a-00b_west"),
+    "5a_a-00x": Room("5a", "5a_a-00x", "Mirror Temple A - Room a-00x", regions_by_room["5a_a-00x"], doors_by_room["5a_a-00x"]),
+    "5a_a-00d": Room("5a", "5a_a-00d", "Mirror Temple A - Room a-00d", regions_by_room["5a_a-00d"], doors_by_room["5a_a-00d"]),
+    "5a_a-00c": Room("5a", "5a_a-00c", "Mirror Temple A - Room a-00c", regions_by_room["5a_a-00c"], doors_by_room["5a_a-00c"]),
+    "5a_a-00": Room("5a", "5a_a-00", "Mirror Temple A - Room a-00", regions_by_room["5a_a-00"], doors_by_room["5a_a-00"]),
+    "5a_a-01": Room("5a", "5a_a-01", "Mirror Temple A - Room a-01", regions_by_room["5a_a-01"], doors_by_room["5a_a-01"]),
+    "5a_a-02": Room("5a", "5a_a-02", "Mirror Temple A - Room a-02", regions_by_room["5a_a-02"], doors_by_room["5a_a-02"]),
+    "5a_a-03": Room("5a", "5a_a-03", "Mirror Temple A - Room a-03", regions_by_room["5a_a-03"], doors_by_room["5a_a-03"]),
+    "5a_a-04": Room("5a", "5a_a-04", "Mirror Temple A - Room a-04", regions_by_room["5a_a-04"], doors_by_room["5a_a-04"]),
+    "5a_a-05": Room("5a", "5a_a-05", "Mirror Temple A - Room a-05", regions_by_room["5a_a-05"], doors_by_room["5a_a-05"]),
+    "5a_a-06": Room("5a", "5a_a-06", "Mirror Temple A - Room a-06", regions_by_room["5a_a-06"], doors_by_room["5a_a-06"]),
+    "5a_a-07": Room("5a", "5a_a-07", "Mirror Temple A - Room a-07", regions_by_room["5a_a-07"], doors_by_room["5a_a-07"]),
+    "5a_a-08": Room("5a", "5a_a-08", "Mirror Temple A - Room a-08", regions_by_room["5a_a-08"], doors_by_room["5a_a-08"]),
+    "5a_a-10": Room("5a", "5a_a-10", "Mirror Temple A - Room a-10", regions_by_room["5a_a-10"], doors_by_room["5a_a-10"]),
+    "5a_a-09": Room("5a", "5a_a-09", "Mirror Temple A - Room a-09", regions_by_room["5a_a-09"], doors_by_room["5a_a-09"]),
+    "5a_a-11": Room("5a", "5a_a-11", "Mirror Temple A - Room a-11", regions_by_room["5a_a-11"], doors_by_room["5a_a-11"]),
+    "5a_a-12": Room("5a", "5a_a-12", "Mirror Temple A - Room a-12", regions_by_room["5a_a-12"], doors_by_room["5a_a-12"]),
+    "5a_a-15": Room("5a", "5a_a-15", "Mirror Temple A - Room a-15", regions_by_room["5a_a-15"], doors_by_room["5a_a-15"]),
+    "5a_a-14": Room("5a", "5a_a-14", "Mirror Temple A - Room a-14", regions_by_room["5a_a-14"], doors_by_room["5a_a-14"]),
+    "5a_a-13": Room("5a", "5a_a-13", "Mirror Temple A - Room a-13", regions_by_room["5a_a-13"], doors_by_room["5a_a-13"]),
+    "5a_b-00": Room("5a", "5a_b-00", "Mirror Temple A - Room b-00", regions_by_room["5a_b-00"], doors_by_room["5a_b-00"], "Depths", "5a_b-00_west"),
+    "5a_b-18": Room("5a", "5a_b-18", "Mirror Temple A - Room b-18", regions_by_room["5a_b-18"], doors_by_room["5a_b-18"]),
+    "5a_b-01": Room("5a", "5a_b-01", "Mirror Temple A - Room b-01", regions_by_room["5a_b-01"], doors_by_room["5a_b-01"]),
+    "5a_b-01c": Room("5a", "5a_b-01c", "Mirror Temple A - Room b-01c", regions_by_room["5a_b-01c"], doors_by_room["5a_b-01c"]),
+    "5a_b-20": Room("5a", "5a_b-20", "Mirror Temple A - Room b-20", regions_by_room["5a_b-20"], doors_by_room["5a_b-20"]),
+    "5a_b-21": Room("5a", "5a_b-21", "Mirror Temple A - Room b-21", regions_by_room["5a_b-21"], doors_by_room["5a_b-21"]),
+    "5a_b-01b": Room("5a", "5a_b-01b", "Mirror Temple A - Room b-01b", regions_by_room["5a_b-01b"], doors_by_room["5a_b-01b"]),
+    "5a_b-02": Room("5a", "5a_b-02", "Mirror Temple A - Room b-02", regions_by_room["5a_b-02"], doors_by_room["5a_b-02"]),
+    "5a_b-03": Room("5a", "5a_b-03", "Mirror Temple A - Room b-03", regions_by_room["5a_b-03"], doors_by_room["5a_b-03"]),
+    "5a_b-05": Room("5a", "5a_b-05", "Mirror Temple A - Room b-05", regions_by_room["5a_b-05"], doors_by_room["5a_b-05"]),
+    "5a_b-04": Room("5a", "5a_b-04", "Mirror Temple A - Room b-04", regions_by_room["5a_b-04"], doors_by_room["5a_b-04"]),
+    "5a_b-07": Room("5a", "5a_b-07", "Mirror Temple A - Room b-07", regions_by_room["5a_b-07"], doors_by_room["5a_b-07"]),
+    "5a_b-08": Room("5a", "5a_b-08", "Mirror Temple A - Room b-08", regions_by_room["5a_b-08"], doors_by_room["5a_b-08"]),
+    "5a_b-09": Room("5a", "5a_b-09", "Mirror Temple A - Room b-09", regions_by_room["5a_b-09"], doors_by_room["5a_b-09"]),
+    "5a_b-10": Room("5a", "5a_b-10", "Mirror Temple A - Room b-10", regions_by_room["5a_b-10"], doors_by_room["5a_b-10"]),
+    "5a_b-11": Room("5a", "5a_b-11", "Mirror Temple A - Room b-11", regions_by_room["5a_b-11"], doors_by_room["5a_b-11"]),
+    "5a_b-12": Room("5a", "5a_b-12", "Mirror Temple A - Room b-12", regions_by_room["5a_b-12"], doors_by_room["5a_b-12"]),
+    "5a_b-13": Room("5a", "5a_b-13", "Mirror Temple A - Room b-13", regions_by_room["5a_b-13"], doors_by_room["5a_b-13"]),
+    "5a_b-17": Room("5a", "5a_b-17", "Mirror Temple A - Room b-17", regions_by_room["5a_b-17"], doors_by_room["5a_b-17"]),
+    "5a_b-22": Room("5a", "5a_b-22", "Mirror Temple A - Room b-22", regions_by_room["5a_b-22"], doors_by_room["5a_b-22"]),
+    "5a_b-06": Room("5a", "5a_b-06", "Mirror Temple A - Room b-06", regions_by_room["5a_b-06"], doors_by_room["5a_b-06"]),
+    "5a_b-19": Room("5a", "5a_b-19", "Mirror Temple A - Room b-19", regions_by_room["5a_b-19"], doors_by_room["5a_b-19"]),
+    "5a_b-14": Room("5a", "5a_b-14", "Mirror Temple A - Room b-14", regions_by_room["5a_b-14"], doors_by_room["5a_b-14"]),
+    "5a_b-15": Room("5a", "5a_b-15", "Mirror Temple A - Room b-15", regions_by_room["5a_b-15"], doors_by_room["5a_b-15"]),
+    "5a_b-16": Room("5a", "5a_b-16", "Mirror Temple A - Room b-16", regions_by_room["5a_b-16"], doors_by_room["5a_b-16"]),
+    "5a_void": Room("5a", "5a_void", "Mirror Temple A - Room void", regions_by_room["5a_void"], doors_by_room["5a_void"]),
+    "5a_c-00": Room("5a", "5a_c-00", "Mirror Temple A - Room c-00", regions_by_room["5a_c-00"], doors_by_room["5a_c-00"], "Unravelling", "5a_c-00_top"),
+    "5a_c-01": Room("5a", "5a_c-01", "Mirror Temple A - Room c-01", regions_by_room["5a_c-01"], doors_by_room["5a_c-01"]),
+    "5a_c-01b": Room("5a", "5a_c-01b", "Mirror Temple A - Room c-01b", regions_by_room["5a_c-01b"], doors_by_room["5a_c-01b"]),
+    "5a_c-01c": Room("5a", "5a_c-01c", "Mirror Temple A - Room c-01c", regions_by_room["5a_c-01c"], doors_by_room["5a_c-01c"]),
+    "5a_c-08b": Room("5a", "5a_c-08b", "Mirror Temple A - Room c-08b", regions_by_room["5a_c-08b"], doors_by_room["5a_c-08b"]),
+    "5a_c-08": Room("5a", "5a_c-08", "Mirror Temple A - Room c-08", regions_by_room["5a_c-08"], doors_by_room["5a_c-08"]),
+    "5a_c-10": Room("5a", "5a_c-10", "Mirror Temple A - Room c-10", regions_by_room["5a_c-10"], doors_by_room["5a_c-10"]),
+    "5a_c-12": Room("5a", "5a_c-12", "Mirror Temple A - Room c-12", regions_by_room["5a_c-12"], doors_by_room["5a_c-12"]),
+    "5a_c-07": Room("5a", "5a_c-07", "Mirror Temple A - Room c-07", regions_by_room["5a_c-07"], doors_by_room["5a_c-07"]),
+    "5a_c-11": Room("5a", "5a_c-11", "Mirror Temple A - Room c-11", regions_by_room["5a_c-11"], doors_by_room["5a_c-11"]),
+    "5a_c-09": Room("5a", "5a_c-09", "Mirror Temple A - Room c-09", regions_by_room["5a_c-09"], doors_by_room["5a_c-09"]),
+    "5a_c-13": Room("5a", "5a_c-13", "Mirror Temple A - Room c-13", regions_by_room["5a_c-13"], doors_by_room["5a_c-13"]),
+    "5a_d-00": Room("5a", "5a_d-00", "Mirror Temple A - Room d-00", regions_by_room["5a_d-00"], doors_by_room["5a_d-00"], "Search", "5a_d-00_south"),
+    "5a_d-01": Room("5a", "5a_d-01", "Mirror Temple A - Room d-01", regions_by_room["5a_d-01"], doors_by_room["5a_d-01"]),
+    "5a_d-09": Room("5a", "5a_d-09", "Mirror Temple A - Room d-09", regions_by_room["5a_d-09"], doors_by_room["5a_d-09"]),
+    "5a_d-04": Room("5a", "5a_d-04", "Mirror Temple A - Room d-04", regions_by_room["5a_d-04"], doors_by_room["5a_d-04"]),
+    "5a_d-05": Room("5a", "5a_d-05", "Mirror Temple A - Room d-05", regions_by_room["5a_d-05"], doors_by_room["5a_d-05"]),
+    "5a_d-06": Room("5a", "5a_d-06", "Mirror Temple A - Room d-06", regions_by_room["5a_d-06"], doors_by_room["5a_d-06"]),
+    "5a_d-07": Room("5a", "5a_d-07", "Mirror Temple A - Room d-07", regions_by_room["5a_d-07"], doors_by_room["5a_d-07"]),
+    "5a_d-02": Room("5a", "5a_d-02", "Mirror Temple A - Room d-02", regions_by_room["5a_d-02"], doors_by_room["5a_d-02"]),
+    "5a_d-03": Room("5a", "5a_d-03", "Mirror Temple A - Room d-03", regions_by_room["5a_d-03"], doors_by_room["5a_d-03"]),
+    "5a_d-15": Room("5a", "5a_d-15", "Mirror Temple A - Room d-15", regions_by_room["5a_d-15"], doors_by_room["5a_d-15"]),
+    "5a_d-13": Room("5a", "5a_d-13", "Mirror Temple A - Room d-13", regions_by_room["5a_d-13"], doors_by_room["5a_d-13"]),
+    "5a_d-19b": Room("5a", "5a_d-19b", "Mirror Temple A - Room d-19b", regions_by_room["5a_d-19b"], doors_by_room["5a_d-19b"]),
+    "5a_d-19": Room("5a", "5a_d-19", "Mirror Temple A - Room d-19", regions_by_room["5a_d-19"], doors_by_room["5a_d-19"]),
+    "5a_d-10": Room("5a", "5a_d-10", "Mirror Temple A - Room d-10", regions_by_room["5a_d-10"], doors_by_room["5a_d-10"]),
+    "5a_d-20": Room("5a", "5a_d-20", "Mirror Temple A - Room d-20", regions_by_room["5a_d-20"], doors_by_room["5a_d-20"]),
+    "5a_e-00": Room("5a", "5a_e-00", "Mirror Temple A - Room e-00", regions_by_room["5a_e-00"], doors_by_room["5a_e-00"], "Rescue", "5a_e-00_west"),
+    "5a_e-01": Room("5a", "5a_e-01", "Mirror Temple A - Room e-01", regions_by_room["5a_e-01"], doors_by_room["5a_e-01"]),
+    "5a_e-02": Room("5a", "5a_e-02", "Mirror Temple A - Room e-02", regions_by_room["5a_e-02"], doors_by_room["5a_e-02"]),
+    "5a_e-03": Room("5a", "5a_e-03", "Mirror Temple A - Room e-03", regions_by_room["5a_e-03"], doors_by_room["5a_e-03"]),
+    "5a_e-04": Room("5a", "5a_e-04", "Mirror Temple A - Room e-04", regions_by_room["5a_e-04"], doors_by_room["5a_e-04"]),
+    "5a_e-06": Room("5a", "5a_e-06", "Mirror Temple A - Room e-06", regions_by_room["5a_e-06"], doors_by_room["5a_e-06"]),
+    "5a_e-05": Room("5a", "5a_e-05", "Mirror Temple A - Room e-05", regions_by_room["5a_e-05"], doors_by_room["5a_e-05"]),
+    "5a_e-07": Room("5a", "5a_e-07", "Mirror Temple A - Room e-07", regions_by_room["5a_e-07"], doors_by_room["5a_e-07"]),
+    "5a_e-08": Room("5a", "5a_e-08", "Mirror Temple A - Room e-08", regions_by_room["5a_e-08"], doors_by_room["5a_e-08"]),
+    "5a_e-09": Room("5a", "5a_e-09", "Mirror Temple A - Room e-09", regions_by_room["5a_e-09"], doors_by_room["5a_e-09"]),
+    "5a_e-10": Room("5a", "5a_e-10", "Mirror Temple A - Room e-10", regions_by_room["5a_e-10"], doors_by_room["5a_e-10"]),
+    "5a_e-11": Room("5a", "5a_e-11", "Mirror Temple A - Room e-11", regions_by_room["5a_e-11"], doors_by_room["5a_e-11"]),
 
-    "5b_start": Room("5b", "5b_start", "Mirror Temple B - Room start", [reg for _, reg in all_regions.items() if reg.room_name == "5b_start"], [door for _, door in all_doors.items() if door.room_name == "5b_start"], "Start", "5b_start_west"),
-    "5b_a-00": Room("5b", "5b_a-00", "Mirror Temple B - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "5b_a-00"], [door for _, door in all_doors.items() if door.room_name == "5b_a-00"]),
-    "5b_a-01": Room("5b", "5b_a-01", "Mirror Temple B - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "5b_a-01"], [door for _, door in all_doors.items() if door.room_name == "5b_a-01"]),
-    "5b_a-02": Room("5b", "5b_a-02", "Mirror Temple B - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "5b_a-02"], [door for _, door in all_doors.items() if door.room_name == "5b_a-02"]),
-    "5b_b-00": Room("5b", "5b_b-00", "Mirror Temple B - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-00"], [door for _, door in all_doors.items() if door.room_name == "5b_b-00"], "Central Chamber", "5b_b-00_south"),
-    "5b_b-01": Room("5b", "5b_b-01", "Mirror Temple B - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-01"], [door for _, door in all_doors.items() if door.room_name == "5b_b-01"]),
-    "5b_b-04": Room("5b", "5b_b-04", "Mirror Temple B - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-04"], [door for _, door in all_doors.items() if door.room_name == "5b_b-04"]),
-    "5b_b-02": Room("5b", "5b_b-02", "Mirror Temple B - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-02"], [door for _, door in all_doors.items() if door.room_name == "5b_b-02"]),
-    "5b_b-05": Room("5b", "5b_b-05", "Mirror Temple B - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-05"], [door for _, door in all_doors.items() if door.room_name == "5b_b-05"]),
-    "5b_b-06": Room("5b", "5b_b-06", "Mirror Temple B - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-06"], [door for _, door in all_doors.items() if door.room_name == "5b_b-06"]),
-    "5b_b-07": Room("5b", "5b_b-07", "Mirror Temple B - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-07"], [door for _, door in all_doors.items() if door.room_name == "5b_b-07"]),
-    "5b_b-03": Room("5b", "5b_b-03", "Mirror Temple B - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-03"], [door for _, door in all_doors.items() if door.room_name == "5b_b-03"]),
-    "5b_b-08": Room("5b", "5b_b-08", "Mirror Temple B - Room b-08", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-08"], [door for _, door in all_doors.items() if door.room_name == "5b_b-08"]),
-    "5b_b-09": Room("5b", "5b_b-09", "Mirror Temple B - Room b-09", [reg for _, reg in all_regions.items() if reg.room_name == "5b_b-09"], [door for _, door in all_doors.items() if door.room_name == "5b_b-09"]),
-    "5b_c-00": Room("5b", "5b_c-00", "Mirror Temple B - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "5b_c-00"], [door for _, door in all_doors.items() if door.room_name == "5b_c-00"], "Through the Mirror", "5b_c-00_mirror"),
-    "5b_c-01": Room("5b", "5b_c-01", "Mirror Temple B - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "5b_c-01"], [door for _, door in all_doors.items() if door.room_name == "5b_c-01"]),
-    "5b_c-02": Room("5b", "5b_c-02", "Mirror Temple B - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "5b_c-02"], [door for _, door in all_doors.items() if door.room_name == "5b_c-02"]),
-    "5b_c-03": Room("5b", "5b_c-03", "Mirror Temple B - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "5b_c-03"], [door for _, door in all_doors.items() if door.room_name == "5b_c-03"]),
-    "5b_c-04": Room("5b", "5b_c-04", "Mirror Temple B - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "5b_c-04"], [door for _, door in all_doors.items() if door.room_name == "5b_c-04"]),
-    "5b_d-00": Room("5b", "5b_d-00", "Mirror Temple B - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-00"], [door for _, door in all_doors.items() if door.room_name == "5b_d-00"], "Mix Master", "5b_d-00_west"),
-    "5b_d-01": Room("5b", "5b_d-01", "Mirror Temple B - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-01"], [door for _, door in all_doors.items() if door.room_name == "5b_d-01"]),
-    "5b_d-02": Room("5b", "5b_d-02", "Mirror Temple B - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-02"], [door for _, door in all_doors.items() if door.room_name == "5b_d-02"]),
-    "5b_d-03": Room("5b", "5b_d-03", "Mirror Temple B - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-03"], [door for _, door in all_doors.items() if door.room_name == "5b_d-03"]),
-    "5b_d-04": Room("5b", "5b_d-04", "Mirror Temple B - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-04"], [door for _, door in all_doors.items() if door.room_name == "5b_d-04"]),
-    "5b_d-05": Room("5b", "5b_d-05", "Mirror Temple B - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "5b_d-05"], [door for _, door in all_doors.items() if door.room_name == "5b_d-05"]),
+    "5b_start": Room("5b", "5b_start", "Mirror Temple B - Room start", regions_by_room["5b_start"], doors_by_room["5b_start"], "Start", "5b_start_west"),
+    "5b_a-00": Room("5b", "5b_a-00", "Mirror Temple B - Room a-00", regions_by_room["5b_a-00"], doors_by_room["5b_a-00"]),
+    "5b_a-01": Room("5b", "5b_a-01", "Mirror Temple B - Room a-01", regions_by_room["5b_a-01"], doors_by_room["5b_a-01"]),
+    "5b_a-02": Room("5b", "5b_a-02", "Mirror Temple B - Room a-02", regions_by_room["5b_a-02"], doors_by_room["5b_a-02"]),
+    "5b_b-00": Room("5b", "5b_b-00", "Mirror Temple B - Room b-00", regions_by_room["5b_b-00"], doors_by_room["5b_b-00"], "Central Chamber", "5b_b-00_south"),
+    "5b_b-01": Room("5b", "5b_b-01", "Mirror Temple B - Room b-01", regions_by_room["5b_b-01"], doors_by_room["5b_b-01"]),
+    "5b_b-04": Room("5b", "5b_b-04", "Mirror Temple B - Room b-04", regions_by_room["5b_b-04"], doors_by_room["5b_b-04"]),
+    "5b_b-02": Room("5b", "5b_b-02", "Mirror Temple B - Room b-02", regions_by_room["5b_b-02"], doors_by_room["5b_b-02"]),
+    "5b_b-05": Room("5b", "5b_b-05", "Mirror Temple B - Room b-05", regions_by_room["5b_b-05"], doors_by_room["5b_b-05"]),
+    "5b_b-06": Room("5b", "5b_b-06", "Mirror Temple B - Room b-06", regions_by_room["5b_b-06"], doors_by_room["5b_b-06"]),
+    "5b_b-07": Room("5b", "5b_b-07", "Mirror Temple B - Room b-07", regions_by_room["5b_b-07"], doors_by_room["5b_b-07"]),
+    "5b_b-03": Room("5b", "5b_b-03", "Mirror Temple B - Room b-03", regions_by_room["5b_b-03"], doors_by_room["5b_b-03"]),
+    "5b_b-08": Room("5b", "5b_b-08", "Mirror Temple B - Room b-08", regions_by_room["5b_b-08"], doors_by_room["5b_b-08"]),
+    "5b_b-09": Room("5b", "5b_b-09", "Mirror Temple B - Room b-09", regions_by_room["5b_b-09"], doors_by_room["5b_b-09"]),
+    "5b_c-00": Room("5b", "5b_c-00", "Mirror Temple B - Room c-00", regions_by_room["5b_c-00"], doors_by_room["5b_c-00"], "Through the Mirror", "5b_c-00_mirror"),
+    "5b_c-01": Room("5b", "5b_c-01", "Mirror Temple B - Room c-01", regions_by_room["5b_c-01"], doors_by_room["5b_c-01"]),
+    "5b_c-02": Room("5b", "5b_c-02", "Mirror Temple B - Room c-02", regions_by_room["5b_c-02"], doors_by_room["5b_c-02"]),
+    "5b_c-03": Room("5b", "5b_c-03", "Mirror Temple B - Room c-03", regions_by_room["5b_c-03"], doors_by_room["5b_c-03"]),
+    "5b_c-04": Room("5b", "5b_c-04", "Mirror Temple B - Room c-04", regions_by_room["5b_c-04"], doors_by_room["5b_c-04"]),
+    "5b_d-00": Room("5b", "5b_d-00", "Mirror Temple B - Room d-00", regions_by_room["5b_d-00"], doors_by_room["5b_d-00"], "Mix Master", "5b_d-00_west"),
+    "5b_d-01": Room("5b", "5b_d-01", "Mirror Temple B - Room d-01", regions_by_room["5b_d-01"], doors_by_room["5b_d-01"]),
+    "5b_d-02": Room("5b", "5b_d-02", "Mirror Temple B - Room d-02", regions_by_room["5b_d-02"], doors_by_room["5b_d-02"]),
+    "5b_d-03": Room("5b", "5b_d-03", "Mirror Temple B - Room d-03", regions_by_room["5b_d-03"], doors_by_room["5b_d-03"]),
+    "5b_d-04": Room("5b", "5b_d-04", "Mirror Temple B - Room d-04", regions_by_room["5b_d-04"], doors_by_room["5b_d-04"]),
+    "5b_d-05": Room("5b", "5b_d-05", "Mirror Temple B - Room d-05", regions_by_room["5b_d-05"], doors_by_room["5b_d-05"]),
 
-    "5c_00": Room("5c", "5c_00", "Mirror Temple C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "5c_00"], [door for _, door in all_doors.items() if door.room_name == "5c_00"], "Start", "5c_00_west"),
-    "5c_01": Room("5c", "5c_01", "Mirror Temple C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "5c_01"], [door for _, door in all_doors.items() if door.room_name == "5c_01"]),
-    "5c_02": Room("5c", "5c_02", "Mirror Temple C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "5c_02"], [door for _, door in all_doors.items() if door.room_name == "5c_02"]),
+    "5c_00": Room("5c", "5c_00", "Mirror Temple C - Room 00", regions_by_room["5c_00"], doors_by_room["5c_00"], "Start", "5c_00_west"),
+    "5c_01": Room("5c", "5c_01", "Mirror Temple C - Room 01", regions_by_room["5c_01"], doors_by_room["5c_01"]),
+    "5c_02": Room("5c", "5c_02", "Mirror Temple C - Room 02", regions_by_room["5c_02"], doors_by_room["5c_02"]),
 
-    "6a_00": Room("6a", "6a_00", "Reflection A - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "6a_00"], [door for _, door in all_doors.items() if door.room_name == "6a_00"], "Start", "6a_00_east"),
-    "6a_01": Room("6a", "6a_01", "Reflection A - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "6a_01"], [door for _, door in all_doors.items() if door.room_name == "6a_01"]),
-    "6a_02": Room("6a", "6a_02", "Reflection A - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "6a_02"], [door for _, door in all_doors.items() if door.room_name == "6a_02"]),
-    "6a_03": Room("6a", "6a_03", "Reflection A - Room 03", [reg for _, reg in all_regions.items() if reg.room_name == "6a_03"], [door for _, door in all_doors.items() if door.room_name == "6a_03"]),
-    "6a_02b": Room("6a", "6a_02b", "Reflection A - Room 02b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_02b"], [door for _, door in all_doors.items() if door.room_name == "6a_02b"]),
-    "6a_04": Room("6a", "6a_04", "Reflection A - Room 04", [reg for _, reg in all_regions.items() if reg.room_name == "6a_04"], [door for _, door in all_doors.items() if door.room_name == "6a_04"], "Hollows", "6a_04_south"),
-    "6a_04b": Room("6a", "6a_04b", "Reflection A - Room 04b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_04b"], [door for _, door in all_doors.items() if door.room_name == "6a_04b"]),
-    "6a_04c": Room("6a", "6a_04c", "Reflection A - Room 04c", [reg for _, reg in all_regions.items() if reg.room_name == "6a_04c"], [door for _, door in all_doors.items() if door.room_name == "6a_04c"]),
-    "6a_04d": Room("6a", "6a_04d", "Reflection A - Room 04d", [reg for _, reg in all_regions.items() if reg.room_name == "6a_04d"], [door for _, door in all_doors.items() if door.room_name == "6a_04d"]),
-    "6a_04e": Room("6a", "6a_04e", "Reflection A - Room 04e", [reg for _, reg in all_regions.items() if reg.room_name == "6a_04e"], [door for _, door in all_doors.items() if door.room_name == "6a_04e"]),
-    "6a_05": Room("6a", "6a_05", "Reflection A - Room 05", [reg for _, reg in all_regions.items() if reg.room_name == "6a_05"], [door for _, door in all_doors.items() if door.room_name == "6a_05"]),
-    "6a_06": Room("6a", "6a_06", "Reflection A - Room 06", [reg for _, reg in all_regions.items() if reg.room_name == "6a_06"], [door for _, door in all_doors.items() if door.room_name == "6a_06"]),
-    "6a_07": Room("6a", "6a_07", "Reflection A - Room 07", [reg for _, reg in all_regions.items() if reg.room_name == "6a_07"], [door for _, door in all_doors.items() if door.room_name == "6a_07"]),
-    "6a_08a": Room("6a", "6a_08a", "Reflection A - Room 08a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_08a"], [door for _, door in all_doors.items() if door.room_name == "6a_08a"]),
-    "6a_08b": Room("6a", "6a_08b", "Reflection A - Room 08b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_08b"], [door for _, door in all_doors.items() if door.room_name == "6a_08b"]),
-    "6a_09": Room("6a", "6a_09", "Reflection A - Room 09", [reg for _, reg in all_regions.items() if reg.room_name == "6a_09"], [door for _, door in all_doors.items() if door.room_name == "6a_09"]),
-    "6a_10a": Room("6a", "6a_10a", "Reflection A - Room 10a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_10a"], [door for _, door in all_doors.items() if door.room_name == "6a_10a"]),
-    "6a_10b": Room("6a", "6a_10b", "Reflection A - Room 10b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_10b"], [door for _, door in all_doors.items() if door.room_name == "6a_10b"]),
-    "6a_11": Room("6a", "6a_11", "Reflection A - Room 11", [reg for _, reg in all_regions.items() if reg.room_name == "6a_11"], [door for _, door in all_doors.items() if door.room_name == "6a_11"]),
-    "6a_12a": Room("6a", "6a_12a", "Reflection A - Room 12a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_12a"], [door for _, door in all_doors.items() if door.room_name == "6a_12a"]),
-    "6a_12b": Room("6a", "6a_12b", "Reflection A - Room 12b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_12b"], [door for _, door in all_doors.items() if door.room_name == "6a_12b"]),
-    "6a_13": Room("6a", "6a_13", "Reflection A - Room 13", [reg for _, reg in all_regions.items() if reg.room_name == "6a_13"], [door for _, door in all_doors.items() if door.room_name == "6a_13"]),
-    "6a_14a": Room("6a", "6a_14a", "Reflection A - Room 14a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_14a"], [door for _, door in all_doors.items() if door.room_name == "6a_14a"]),
-    "6a_14b": Room("6a", "6a_14b", "Reflection A - Room 14b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_14b"], [door for _, door in all_doors.items() if door.room_name == "6a_14b"]),
-    "6a_15": Room("6a", "6a_15", "Reflection A - Room 15", [reg for _, reg in all_regions.items() if reg.room_name == "6a_15"], [door for _, door in all_doors.items() if door.room_name == "6a_15"]),
-    "6a_16a": Room("6a", "6a_16a", "Reflection A - Room 16a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_16a"], [door for _, door in all_doors.items() if door.room_name == "6a_16a"]),
-    "6a_16b": Room("6a", "6a_16b", "Reflection A - Room 16b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_16b"], [door for _, door in all_doors.items() if door.room_name == "6a_16b"]),
-    "6a_17": Room("6a", "6a_17", "Reflection A - Room 17", [reg for _, reg in all_regions.items() if reg.room_name == "6a_17"], [door for _, door in all_doors.items() if door.room_name == "6a_17"]),
-    "6a_18a": Room("6a", "6a_18a", "Reflection A - Room 18a", [reg for _, reg in all_regions.items() if reg.room_name == "6a_18a"], [door for _, door in all_doors.items() if door.room_name == "6a_18a"]),
-    "6a_18b": Room("6a", "6a_18b", "Reflection A - Room 18b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_18b"], [door for _, door in all_doors.items() if door.room_name == "6a_18b"]),
-    "6a_19": Room("6a", "6a_19", "Reflection A - Room 19", [reg for _, reg in all_regions.items() if reg.room_name == "6a_19"], [door for _, door in all_doors.items() if door.room_name == "6a_19"]),
-    "6a_20": Room("6a", "6a_20", "Reflection A - Room 20", [reg for _, reg in all_regions.items() if reg.room_name == "6a_20"], [door for _, door in all_doors.items() if door.room_name == "6a_20"]),
-    "6a_b-00": Room("6a", "6a_b-00", "Reflection A - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-00"], [door for _, door in all_doors.items() if door.room_name == "6a_b-00"], "Reflection", "6a_b-00_west"),
-    "6a_b-00b": Room("6a", "6a_b-00b", "Reflection A - Room b-00b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-00b"], [door for _, door in all_doors.items() if door.room_name == "6a_b-00b"]),
-    "6a_b-00c": Room("6a", "6a_b-00c", "Reflection A - Room b-00c", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-00c"], [door for _, door in all_doors.items() if door.room_name == "6a_b-00c"]),
-    "6a_b-01": Room("6a", "6a_b-01", "Reflection A - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-01"], [door for _, door in all_doors.items() if door.room_name == "6a_b-01"]),
-    "6a_b-02": Room("6a", "6a_b-02", "Reflection A - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-02"], [door for _, door in all_doors.items() if door.room_name == "6a_b-02"]),
-    "6a_b-02b": Room("6a", "6a_b-02b", "Reflection A - Room b-02b", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-02b"], [door for _, door in all_doors.items() if door.room_name == "6a_b-02b"]),
-    "6a_b-03": Room("6a", "6a_b-03", "Reflection A - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "6a_b-03"], [door for _, door in all_doors.items() if door.room_name == "6a_b-03"]),
-    "6a_boss-00": Room("6a", "6a_boss-00", "Reflection A - Room boss-00", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-00"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-00"], "Rock Bottom", "6a_boss-00_west"),
-    "6a_boss-01": Room("6a", "6a_boss-01", "Reflection A - Room boss-01", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-01"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-01"]),
-    "6a_boss-02": Room("6a", "6a_boss-02", "Reflection A - Room boss-02", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-02"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-02"]),
-    "6a_boss-03": Room("6a", "6a_boss-03", "Reflection A - Room boss-03", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-03"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-03"]),
-    "6a_boss-04": Room("6a", "6a_boss-04", "Reflection A - Room boss-04", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-04"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-04"]),
-    "6a_boss-05": Room("6a", "6a_boss-05", "Reflection A - Room boss-05", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-05"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-05"]),
-    "6a_boss-06": Room("6a", "6a_boss-06", "Reflection A - Room boss-06", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-06"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-06"]),
-    "6a_boss-07": Room("6a", "6a_boss-07", "Reflection A - Room boss-07", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-07"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-07"]),
-    "6a_boss-08": Room("6a", "6a_boss-08", "Reflection A - Room boss-08", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-08"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-08"]),
-    "6a_boss-09": Room("6a", "6a_boss-09", "Reflection A - Room boss-09", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-09"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-09"]),
-    "6a_boss-10": Room("6a", "6a_boss-10", "Reflection A - Room boss-10", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-10"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-10"]),
-    "6a_boss-11": Room("6a", "6a_boss-11", "Reflection A - Room boss-11", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-11"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-11"]),
-    "6a_boss-12": Room("6a", "6a_boss-12", "Reflection A - Room boss-12", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-12"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-12"]),
-    "6a_boss-13": Room("6a", "6a_boss-13", "Reflection A - Room boss-13", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-13"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-13"]),
-    "6a_boss-14": Room("6a", "6a_boss-14", "Reflection A - Room boss-14", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-14"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-14"]),
-    "6a_boss-15": Room("6a", "6a_boss-15", "Reflection A - Room boss-15", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-15"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-15"]),
-    "6a_boss-16": Room("6a", "6a_boss-16", "Reflection A - Room boss-16", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-16"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-16"]),
-    "6a_boss-17": Room("6a", "6a_boss-17", "Reflection A - Room boss-17", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-17"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-17"]),
-    "6a_boss-18": Room("6a", "6a_boss-18", "Reflection A - Room boss-18", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-18"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-18"]),
-    "6a_boss-19": Room("6a", "6a_boss-19", "Reflection A - Room boss-19", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-19"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-19"]),
-    "6a_boss-20": Room("6a", "6a_boss-20", "Reflection A - Room boss-20", [reg for _, reg in all_regions.items() if reg.room_name == "6a_boss-20"], [door for _, door in all_doors.items() if door.room_name == "6a_boss-20"]),
-    "6a_after-00": Room("6a", "6a_after-00", "Reflection A - Room after-00", [reg for _, reg in all_regions.items() if reg.room_name == "6a_after-00"], [door for _, door in all_doors.items() if door.room_name == "6a_after-00"], "Resolution", "6a_after-00_bottom"),
-    "6a_after-01": Room("6a", "6a_after-01", "Reflection A - Room after-01", [reg for _, reg in all_regions.items() if reg.room_name == "6a_after-01"], [door for _, door in all_doors.items() if door.room_name == "6a_after-01"]),
+    "6a_00": Room("6a", "6a_00", "Reflection A - Room 00", regions_by_room["6a_00"], doors_by_room["6a_00"], "Start", "6a_00_east"),
+    "6a_01": Room("6a", "6a_01", "Reflection A - Room 01", regions_by_room["6a_01"], doors_by_room["6a_01"]),
+    "6a_02": Room("6a", "6a_02", "Reflection A - Room 02", regions_by_room["6a_02"], doors_by_room["6a_02"]),
+    "6a_03": Room("6a", "6a_03", "Reflection A - Room 03", regions_by_room["6a_03"], doors_by_room["6a_03"]),
+    "6a_02b": Room("6a", "6a_02b", "Reflection A - Room 02b", regions_by_room["6a_02b"], doors_by_room["6a_02b"]),
+    "6a_04": Room("6a", "6a_04", "Reflection A - Room 04", regions_by_room["6a_04"], doors_by_room["6a_04"], "Hollows", "6a_04_south"),
+    "6a_04b": Room("6a", "6a_04b", "Reflection A - Room 04b", regions_by_room["6a_04b"], doors_by_room["6a_04b"]),
+    "6a_04c": Room("6a", "6a_04c", "Reflection A - Room 04c", regions_by_room["6a_04c"], doors_by_room["6a_04c"]),
+    "6a_04d": Room("6a", "6a_04d", "Reflection A - Room 04d", regions_by_room["6a_04d"], doors_by_room["6a_04d"]),
+    "6a_04e": Room("6a", "6a_04e", "Reflection A - Room 04e", regions_by_room["6a_04e"], doors_by_room["6a_04e"]),
+    "6a_05": Room("6a", "6a_05", "Reflection A - Room 05", regions_by_room["6a_05"], doors_by_room["6a_05"]),
+    "6a_06": Room("6a", "6a_06", "Reflection A - Room 06", regions_by_room["6a_06"], doors_by_room["6a_06"]),
+    "6a_07": Room("6a", "6a_07", "Reflection A - Room 07", regions_by_room["6a_07"], doors_by_room["6a_07"]),
+    "6a_08a": Room("6a", "6a_08a", "Reflection A - Room 08a", regions_by_room["6a_08a"], doors_by_room["6a_08a"]),
+    "6a_08b": Room("6a", "6a_08b", "Reflection A - Room 08b", regions_by_room["6a_08b"], doors_by_room["6a_08b"]),
+    "6a_09": Room("6a", "6a_09", "Reflection A - Room 09", regions_by_room["6a_09"], doors_by_room["6a_09"]),
+    "6a_10a": Room("6a", "6a_10a", "Reflection A - Room 10a", regions_by_room["6a_10a"], doors_by_room["6a_10a"]),
+    "6a_10b": Room("6a", "6a_10b", "Reflection A - Room 10b", regions_by_room["6a_10b"], doors_by_room["6a_10b"]),
+    "6a_11": Room("6a", "6a_11", "Reflection A - Room 11", regions_by_room["6a_11"], doors_by_room["6a_11"]),
+    "6a_12a": Room("6a", "6a_12a", "Reflection A - Room 12a", regions_by_room["6a_12a"], doors_by_room["6a_12a"]),
+    "6a_12b": Room("6a", "6a_12b", "Reflection A - Room 12b", regions_by_room["6a_12b"], doors_by_room["6a_12b"]),
+    "6a_13": Room("6a", "6a_13", "Reflection A - Room 13", regions_by_room["6a_13"], doors_by_room["6a_13"]),
+    "6a_14a": Room("6a", "6a_14a", "Reflection A - Room 14a", regions_by_room["6a_14a"], doors_by_room["6a_14a"]),
+    "6a_14b": Room("6a", "6a_14b", "Reflection A - Room 14b", regions_by_room["6a_14b"], doors_by_room["6a_14b"]),
+    "6a_15": Room("6a", "6a_15", "Reflection A - Room 15", regions_by_room["6a_15"], doors_by_room["6a_15"]),
+    "6a_16a": Room("6a", "6a_16a", "Reflection A - Room 16a", regions_by_room["6a_16a"], doors_by_room["6a_16a"]),
+    "6a_16b": Room("6a", "6a_16b", "Reflection A - Room 16b", regions_by_room["6a_16b"], doors_by_room["6a_16b"]),
+    "6a_17": Room("6a", "6a_17", "Reflection A - Room 17", regions_by_room["6a_17"], doors_by_room["6a_17"]),
+    "6a_18a": Room("6a", "6a_18a", "Reflection A - Room 18a", regions_by_room["6a_18a"], doors_by_room["6a_18a"]),
+    "6a_18b": Room("6a", "6a_18b", "Reflection A - Room 18b", regions_by_room["6a_18b"], doors_by_room["6a_18b"]),
+    "6a_19": Room("6a", "6a_19", "Reflection A - Room 19", regions_by_room["6a_19"], doors_by_room["6a_19"]),
+    "6a_20": Room("6a", "6a_20", "Reflection A - Room 20", regions_by_room["6a_20"], doors_by_room["6a_20"]),
+    "6a_b-00": Room("6a", "6a_b-00", "Reflection A - Room b-00", regions_by_room["6a_b-00"], doors_by_room["6a_b-00"], "Reflection", "6a_b-00_west"),
+    "6a_b-00b": Room("6a", "6a_b-00b", "Reflection A - Room b-00b", regions_by_room["6a_b-00b"], doors_by_room["6a_b-00b"]),
+    "6a_b-00c": Room("6a", "6a_b-00c", "Reflection A - Room b-00c", regions_by_room["6a_b-00c"], doors_by_room["6a_b-00c"]),
+    "6a_b-01": Room("6a", "6a_b-01", "Reflection A - Room b-01", regions_by_room["6a_b-01"], doors_by_room["6a_b-01"]),
+    "6a_b-02": Room("6a", "6a_b-02", "Reflection A - Room b-02", regions_by_room["6a_b-02"], doors_by_room["6a_b-02"]),
+    "6a_b-02b": Room("6a", "6a_b-02b", "Reflection A - Room b-02b", regions_by_room["6a_b-02b"], doors_by_room["6a_b-02b"]),
+    "6a_b-03": Room("6a", "6a_b-03", "Reflection A - Room b-03", regions_by_room["6a_b-03"], doors_by_room["6a_b-03"]),
+    "6a_boss-00": Room("6a", "6a_boss-00", "Reflection A - Room boss-00", regions_by_room["6a_boss-00"], doors_by_room["6a_boss-00"], "Rock Bottom", "6a_boss-00_west"),
+    "6a_boss-01": Room("6a", "6a_boss-01", "Reflection A - Room boss-01", regions_by_room["6a_boss-01"], doors_by_room["6a_boss-01"]),
+    "6a_boss-02": Room("6a", "6a_boss-02", "Reflection A - Room boss-02", regions_by_room["6a_boss-02"], doors_by_room["6a_boss-02"]),
+    "6a_boss-03": Room("6a", "6a_boss-03", "Reflection A - Room boss-03", regions_by_room["6a_boss-03"], doors_by_room["6a_boss-03"]),
+    "6a_boss-04": Room("6a", "6a_boss-04", "Reflection A - Room boss-04", regions_by_room["6a_boss-04"], doors_by_room["6a_boss-04"]),
+    "6a_boss-05": Room("6a", "6a_boss-05", "Reflection A - Room boss-05", regions_by_room["6a_boss-05"], doors_by_room["6a_boss-05"]),
+    "6a_boss-06": Room("6a", "6a_boss-06", "Reflection A - Room boss-06", regions_by_room["6a_boss-06"], doors_by_room["6a_boss-06"]),
+    "6a_boss-07": Room("6a", "6a_boss-07", "Reflection A - Room boss-07", regions_by_room["6a_boss-07"], doors_by_room["6a_boss-07"]),
+    "6a_boss-08": Room("6a", "6a_boss-08", "Reflection A - Room boss-08", regions_by_room["6a_boss-08"], doors_by_room["6a_boss-08"]),
+    "6a_boss-09": Room("6a", "6a_boss-09", "Reflection A - Room boss-09", regions_by_room["6a_boss-09"], doors_by_room["6a_boss-09"]),
+    "6a_boss-10": Room("6a", "6a_boss-10", "Reflection A - Room boss-10", regions_by_room["6a_boss-10"], doors_by_room["6a_boss-10"]),
+    "6a_boss-11": Room("6a", "6a_boss-11", "Reflection A - Room boss-11", regions_by_room["6a_boss-11"], doors_by_room["6a_boss-11"]),
+    "6a_boss-12": Room("6a", "6a_boss-12", "Reflection A - Room boss-12", regions_by_room["6a_boss-12"], doors_by_room["6a_boss-12"]),
+    "6a_boss-13": Room("6a", "6a_boss-13", "Reflection A - Room boss-13", regions_by_room["6a_boss-13"], doors_by_room["6a_boss-13"]),
+    "6a_boss-14": Room("6a", "6a_boss-14", "Reflection A - Room boss-14", regions_by_room["6a_boss-14"], doors_by_room["6a_boss-14"]),
+    "6a_boss-15": Room("6a", "6a_boss-15", "Reflection A - Room boss-15", regions_by_room["6a_boss-15"], doors_by_room["6a_boss-15"]),
+    "6a_boss-16": Room("6a", "6a_boss-16", "Reflection A - Room boss-16", regions_by_room["6a_boss-16"], doors_by_room["6a_boss-16"]),
+    "6a_boss-17": Room("6a", "6a_boss-17", "Reflection A - Room boss-17", regions_by_room["6a_boss-17"], doors_by_room["6a_boss-17"]),
+    "6a_boss-18": Room("6a", "6a_boss-18", "Reflection A - Room boss-18", regions_by_room["6a_boss-18"], doors_by_room["6a_boss-18"]),
+    "6a_boss-19": Room("6a", "6a_boss-19", "Reflection A - Room boss-19", regions_by_room["6a_boss-19"], doors_by_room["6a_boss-19"]),
+    "6a_boss-20": Room("6a", "6a_boss-20", "Reflection A - Room boss-20", regions_by_room["6a_boss-20"], doors_by_room["6a_boss-20"]),
+    "6a_after-00": Room("6a", "6a_after-00", "Reflection A - Room after-00", regions_by_room["6a_after-00"], doors_by_room["6a_after-00"], "Resolution", "6a_after-00_bottom"),
+    "6a_after-01": Room("6a", "6a_after-01", "Reflection A - Room after-01", regions_by_room["6a_after-01"], doors_by_room["6a_after-01"]),
 
-    "6b_a-00": Room("6b", "6b_a-00", "Reflection B - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-00"], [door for _, door in all_doors.items() if door.room_name == "6b_a-00"], "Start", "6b_a-00_bottom"),
-    "6b_a-01": Room("6b", "6b_a-01", "Reflection B - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-01"], [door for _, door in all_doors.items() if door.room_name == "6b_a-01"]),
-    "6b_a-02": Room("6b", "6b_a-02", "Reflection B - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-02"], [door for _, door in all_doors.items() if door.room_name == "6b_a-02"]),
-    "6b_a-03": Room("6b", "6b_a-03", "Reflection B - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-03"], [door for _, door in all_doors.items() if door.room_name == "6b_a-03"]),
-    "6b_a-04": Room("6b", "6b_a-04", "Reflection B - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-04"], [door for _, door in all_doors.items() if door.room_name == "6b_a-04"]),
-    "6b_a-05": Room("6b", "6b_a-05", "Reflection B - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-05"], [door for _, door in all_doors.items() if door.room_name == "6b_a-05"]),
-    "6b_a-06": Room("6b", "6b_a-06", "Reflection B - Room a-06", [reg for _, reg in all_regions.items() if reg.room_name == "6b_a-06"], [door for _, door in all_doors.items() if door.room_name == "6b_a-06"]),
-    "6b_b-00": Room("6b", "6b_b-00", "Reflection B - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-00"], [door for _, door in all_doors.items() if door.room_name == "6b_b-00"], "Reflection", "6b_b-00_west"),
-    "6b_b-01": Room("6b", "6b_b-01", "Reflection B - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-01"], [door for _, door in all_doors.items() if door.room_name == "6b_b-01"]),
-    "6b_b-02": Room("6b", "6b_b-02", "Reflection B - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-02"], [door for _, door in all_doors.items() if door.room_name == "6b_b-02"]),
-    "6b_b-03": Room("6b", "6b_b-03", "Reflection B - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-03"], [door for _, door in all_doors.items() if door.room_name == "6b_b-03"]),
-    "6b_b-04": Room("6b", "6b_b-04", "Reflection B - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-04"], [door for _, door in all_doors.items() if door.room_name == "6b_b-04"]),
-    "6b_b-05": Room("6b", "6b_b-05", "Reflection B - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-05"], [door for _, door in all_doors.items() if door.room_name == "6b_b-05"]),
-    "6b_b-06": Room("6b", "6b_b-06", "Reflection B - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-06"], [door for _, door in all_doors.items() if door.room_name == "6b_b-06"]),
-    "6b_b-07": Room("6b", "6b_b-07", "Reflection B - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-07"], [door for _, door in all_doors.items() if door.room_name == "6b_b-07"]),
-    "6b_b-08": Room("6b", "6b_b-08", "Reflection B - Room b-08", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-08"], [door for _, door in all_doors.items() if door.room_name == "6b_b-08"]),
-    "6b_b-10": Room("6b", "6b_b-10", "Reflection B - Room b-10", [reg for _, reg in all_regions.items() if reg.room_name == "6b_b-10"], [door for _, door in all_doors.items() if door.room_name == "6b_b-10"]),
-    "6b_c-00": Room("6b", "6b_c-00", "Reflection B - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "6b_c-00"], [door for _, door in all_doors.items() if door.room_name == "6b_c-00"], "Rock Bottom", "6b_c-00_west"),
-    "6b_c-01": Room("6b", "6b_c-01", "Reflection B - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "6b_c-01"], [door for _, door in all_doors.items() if door.room_name == "6b_c-01"]),
-    "6b_c-02": Room("6b", "6b_c-02", "Reflection B - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "6b_c-02"], [door for _, door in all_doors.items() if door.room_name == "6b_c-02"]),
-    "6b_c-03": Room("6b", "6b_c-03", "Reflection B - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "6b_c-03"], [door for _, door in all_doors.items() if door.room_name == "6b_c-03"]),
-    "6b_c-04": Room("6b", "6b_c-04", "Reflection B - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "6b_c-04"], [door for _, door in all_doors.items() if door.room_name == "6b_c-04"]),
-    "6b_d-00": Room("6b", "6b_d-00", "Reflection B - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-00"], [door for _, door in all_doors.items() if door.room_name == "6b_d-00"], "Reprieve", "6b_d-00_west"),
-    "6b_d-01": Room("6b", "6b_d-01", "Reflection B - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-01"], [door for _, door in all_doors.items() if door.room_name == "6b_d-01"]),
-    "6b_d-02": Room("6b", "6b_d-02", "Reflection B - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-02"], [door for _, door in all_doors.items() if door.room_name == "6b_d-02"]),
-    "6b_d-03": Room("6b", "6b_d-03", "Reflection B - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-03"], [door for _, door in all_doors.items() if door.room_name == "6b_d-03"]),
-    "6b_d-04": Room("6b", "6b_d-04", "Reflection B - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-04"], [door for _, door in all_doors.items() if door.room_name == "6b_d-04"]),
-    "6b_d-05": Room("6b", "6b_d-05", "Reflection B - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "6b_d-05"], [door for _, door in all_doors.items() if door.room_name == "6b_d-05"]),
+    "6b_a-00": Room("6b", "6b_a-00", "Reflection B - Room a-00", regions_by_room["6b_a-00"], doors_by_room["6b_a-00"], "Start", "6b_a-00_bottom"),
+    "6b_a-01": Room("6b", "6b_a-01", "Reflection B - Room a-01", regions_by_room["6b_a-01"], doors_by_room["6b_a-01"]),
+    "6b_a-02": Room("6b", "6b_a-02", "Reflection B - Room a-02", regions_by_room["6b_a-02"], doors_by_room["6b_a-02"]),
+    "6b_a-03": Room("6b", "6b_a-03", "Reflection B - Room a-03", regions_by_room["6b_a-03"], doors_by_room["6b_a-03"]),
+    "6b_a-04": Room("6b", "6b_a-04", "Reflection B - Room a-04", regions_by_room["6b_a-04"], doors_by_room["6b_a-04"]),
+    "6b_a-05": Room("6b", "6b_a-05", "Reflection B - Room a-05", regions_by_room["6b_a-05"], doors_by_room["6b_a-05"]),
+    "6b_a-06": Room("6b", "6b_a-06", "Reflection B - Room a-06", regions_by_room["6b_a-06"], doors_by_room["6b_a-06"]),
+    "6b_b-00": Room("6b", "6b_b-00", "Reflection B - Room b-00", regions_by_room["6b_b-00"], doors_by_room["6b_b-00"], "Reflection", "6b_b-00_west"),
+    "6b_b-01": Room("6b", "6b_b-01", "Reflection B - Room b-01", regions_by_room["6b_b-01"], doors_by_room["6b_b-01"]),
+    "6b_b-02": Room("6b", "6b_b-02", "Reflection B - Room b-02", regions_by_room["6b_b-02"], doors_by_room["6b_b-02"]),
+    "6b_b-03": Room("6b", "6b_b-03", "Reflection B - Room b-03", regions_by_room["6b_b-03"], doors_by_room["6b_b-03"]),
+    "6b_b-04": Room("6b", "6b_b-04", "Reflection B - Room b-04", regions_by_room["6b_b-04"], doors_by_room["6b_b-04"]),
+    "6b_b-05": Room("6b", "6b_b-05", "Reflection B - Room b-05", regions_by_room["6b_b-05"], doors_by_room["6b_b-05"]),
+    "6b_b-06": Room("6b", "6b_b-06", "Reflection B - Room b-06", regions_by_room["6b_b-06"], doors_by_room["6b_b-06"]),
+    "6b_b-07": Room("6b", "6b_b-07", "Reflection B - Room b-07", regions_by_room["6b_b-07"], doors_by_room["6b_b-07"]),
+    "6b_b-08": Room("6b", "6b_b-08", "Reflection B - Room b-08", regions_by_room["6b_b-08"], doors_by_room["6b_b-08"]),
+    "6b_b-10": Room("6b", "6b_b-10", "Reflection B - Room b-10", regions_by_room["6b_b-10"], doors_by_room["6b_b-10"]),
+    "6b_c-00": Room("6b", "6b_c-00", "Reflection B - Room c-00", regions_by_room["6b_c-00"], doors_by_room["6b_c-00"], "Rock Bottom", "6b_c-00_west"),
+    "6b_c-01": Room("6b", "6b_c-01", "Reflection B - Room c-01", regions_by_room["6b_c-01"], doors_by_room["6b_c-01"]),
+    "6b_c-02": Room("6b", "6b_c-02", "Reflection B - Room c-02", regions_by_room["6b_c-02"], doors_by_room["6b_c-02"]),
+    "6b_c-03": Room("6b", "6b_c-03", "Reflection B - Room c-03", regions_by_room["6b_c-03"], doors_by_room["6b_c-03"]),
+    "6b_c-04": Room("6b", "6b_c-04", "Reflection B - Room c-04", regions_by_room["6b_c-04"], doors_by_room["6b_c-04"]),
+    "6b_d-00": Room("6b", "6b_d-00", "Reflection B - Room d-00", regions_by_room["6b_d-00"], doors_by_room["6b_d-00"], "Reprieve", "6b_d-00_west"),
+    "6b_d-01": Room("6b", "6b_d-01", "Reflection B - Room d-01", regions_by_room["6b_d-01"], doors_by_room["6b_d-01"]),
+    "6b_d-02": Room("6b", "6b_d-02", "Reflection B - Room d-02", regions_by_room["6b_d-02"], doors_by_room["6b_d-02"]),
+    "6b_d-03": Room("6b", "6b_d-03", "Reflection B - Room d-03", regions_by_room["6b_d-03"], doors_by_room["6b_d-03"]),
+    "6b_d-04": Room("6b", "6b_d-04", "Reflection B - Room d-04", regions_by_room["6b_d-04"], doors_by_room["6b_d-04"]),
+    "6b_d-05": Room("6b", "6b_d-05", "Reflection B - Room d-05", regions_by_room["6b_d-05"], doors_by_room["6b_d-05"]),
 
-    "6c_00": Room("6c", "6c_00", "Reflection C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "6c_00"], [door for _, door in all_doors.items() if door.room_name == "6c_00"], "Start", "6c_00_west"),
-    "6c_01": Room("6c", "6c_01", "Reflection C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "6c_01"], [door for _, door in all_doors.items() if door.room_name == "6c_01"]),
-    "6c_02": Room("6c", "6c_02", "Reflection C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "6c_02"], [door for _, door in all_doors.items() if door.room_name == "6c_02"]),
+    "6c_00": Room("6c", "6c_00", "Reflection C - Room 00", regions_by_room["6c_00"], doors_by_room["6c_00"], "Start", "6c_00_west"),
+    "6c_01": Room("6c", "6c_01", "Reflection C - Room 01", regions_by_room["6c_01"], doors_by_room["6c_01"]),
+    "6c_02": Room("6c", "6c_02", "Reflection C - Room 02", regions_by_room["6c_02"], doors_by_room["6c_02"]),
 
-    "7a_a-00": Room("7a", "7a_a-00", "The Summit A - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-00"], [door for _, door in all_doors.items() if door.room_name == "7a_a-00"], "Start", "7a_a-00_west"),
-    "7a_a-01": Room("7a", "7a_a-01", "The Summit A - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-01"], [door for _, door in all_doors.items() if door.room_name == "7a_a-01"]),
-    "7a_a-02": Room("7a", "7a_a-02", "The Summit A - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-02"], [door for _, door in all_doors.items() if door.room_name == "7a_a-02"]),
-    "7a_a-02b": Room("7a", "7a_a-02b", "The Summit A - Room a-02b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-02b"], [door for _, door in all_doors.items() if door.room_name == "7a_a-02b"]),
-    "7a_a-03": Room("7a", "7a_a-03", "The Summit A - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-03"], [door for _, door in all_doors.items() if door.room_name == "7a_a-03"]),
-    "7a_a-04": Room("7a", "7a_a-04", "The Summit A - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-04"], [door for _, door in all_doors.items() if door.room_name == "7a_a-04"]),
-    "7a_a-04b": Room("7a", "7a_a-04b", "The Summit A - Room a-04b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-04b"], [door for _, door in all_doors.items() if door.room_name == "7a_a-04b"]),
-    "7a_a-05": Room("7a", "7a_a-05", "The Summit A - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-05"], [door for _, door in all_doors.items() if door.room_name == "7a_a-05"]),
-    "7a_a-06": Room("7a", "7a_a-06", "The Summit A - Room a-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_a-06"], [door for _, door in all_doors.items() if door.room_name == "7a_a-06"]),
-    "7a_b-00": Room("7a", "7a_b-00", "The Summit A - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-00"], [door for _, door in all_doors.items() if door.room_name == "7a_b-00"], "500 M", "7a_b-00_bottom"),
-    "7a_b-01": Room("7a", "7a_b-01", "The Summit A - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-01"], [door for _, door in all_doors.items() if door.room_name == "7a_b-01"]),
-    "7a_b-02": Room("7a", "7a_b-02", "The Summit A - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-02"], [door for _, door in all_doors.items() if door.room_name == "7a_b-02"]),
-    "7a_b-02b": Room("7a", "7a_b-02b", "The Summit A - Room b-02b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-02b"], [door for _, door in all_doors.items() if door.room_name == "7a_b-02b"]),
-    "7a_b-02e": Room("7a", "7a_b-02e", "The Summit A - Room b-02e", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-02e"], [door for _, door in all_doors.items() if door.room_name == "7a_b-02e"]),
-    "7a_b-02c": Room("7a", "7a_b-02c", "The Summit A - Room b-02c", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-02c"], [door for _, door in all_doors.items() if door.room_name == "7a_b-02c"]),
-    "7a_b-02d": Room("7a", "7a_b-02d", "The Summit A - Room b-02d", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-02d"], [door for _, door in all_doors.items() if door.room_name == "7a_b-02d"]),
-    "7a_b-03": Room("7a", "7a_b-03", "The Summit A - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-03"], [door for _, door in all_doors.items() if door.room_name == "7a_b-03"]),
-    "7a_b-04": Room("7a", "7a_b-04", "The Summit A - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-04"], [door for _, door in all_doors.items() if door.room_name == "7a_b-04"]),
-    "7a_b-05": Room("7a", "7a_b-05", "The Summit A - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-05"], [door for _, door in all_doors.items() if door.room_name == "7a_b-05"]),
-    "7a_b-06": Room("7a", "7a_b-06", "The Summit A - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-06"], [door for _, door in all_doors.items() if door.room_name == "7a_b-06"]),
-    "7a_b-07": Room("7a", "7a_b-07", "The Summit A - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-07"], [door for _, door in all_doors.items() if door.room_name == "7a_b-07"]),
-    "7a_b-08": Room("7a", "7a_b-08", "The Summit A - Room b-08", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-08"], [door for _, door in all_doors.items() if door.room_name == "7a_b-08"]),
-    "7a_b-09": Room("7a", "7a_b-09", "The Summit A - Room b-09", [reg for _, reg in all_regions.items() if reg.room_name == "7a_b-09"], [door for _, door in all_doors.items() if door.room_name == "7a_b-09"]),
-    "7a_c-00": Room("7a", "7a_c-00", "The Summit A - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-00"], [door for _, door in all_doors.items() if door.room_name == "7a_c-00"], "1000 M", "7a_c-00_west"),
-    "7a_c-01": Room("7a", "7a_c-01", "The Summit A - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-01"], [door for _, door in all_doors.items() if door.room_name == "7a_c-01"]),
-    "7a_c-02": Room("7a", "7a_c-02", "The Summit A - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-02"], [door for _, door in all_doors.items() if door.room_name == "7a_c-02"]),
-    "7a_c-03": Room("7a", "7a_c-03", "The Summit A - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-03"], [door for _, door in all_doors.items() if door.room_name == "7a_c-03"]),
-    "7a_c-03b": Room("7a", "7a_c-03b", "The Summit A - Room c-03b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-03b"], [door for _, door in all_doors.items() if door.room_name == "7a_c-03b"]),
-    "7a_c-04": Room("7a", "7a_c-04", "The Summit A - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-04"], [door for _, door in all_doors.items() if door.room_name == "7a_c-04"]),
-    "7a_c-05": Room("7a", "7a_c-05", "The Summit A - Room c-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-05"], [door for _, door in all_doors.items() if door.room_name == "7a_c-05"]),
-    "7a_c-06": Room("7a", "7a_c-06", "The Summit A - Room c-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-06"], [door for _, door in all_doors.items() if door.room_name == "7a_c-06"]),
-    "7a_c-06b": Room("7a", "7a_c-06b", "The Summit A - Room c-06b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-06b"], [door for _, door in all_doors.items() if door.room_name == "7a_c-06b"]),
-    "7a_c-06c": Room("7a", "7a_c-06c", "The Summit A - Room c-06c", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-06c"], [door for _, door in all_doors.items() if door.room_name == "7a_c-06c"]),
-    "7a_c-07": Room("7a", "7a_c-07", "The Summit A - Room c-07", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-07"], [door for _, door in all_doors.items() if door.room_name == "7a_c-07"]),
-    "7a_c-07b": Room("7a", "7a_c-07b", "The Summit A - Room c-07b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-07b"], [door for _, door in all_doors.items() if door.room_name == "7a_c-07b"]),
-    "7a_c-08": Room("7a", "7a_c-08", "The Summit A - Room c-08", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-08"], [door for _, door in all_doors.items() if door.room_name == "7a_c-08"]),
-    "7a_c-09": Room("7a", "7a_c-09", "The Summit A - Room c-09", [reg for _, reg in all_regions.items() if reg.room_name == "7a_c-09"], [door for _, door in all_doors.items() if door.room_name == "7a_c-09"]),
-    "7a_d-00": Room("7a", "7a_d-00", "The Summit A - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-00"], [door for _, door in all_doors.items() if door.room_name == "7a_d-00"], "1500 M", "7a_d-00_bottom"),
-    "7a_d-01": Room("7a", "7a_d-01", "The Summit A - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-01"], [door for _, door in all_doors.items() if door.room_name == "7a_d-01"]),
-    "7a_d-01b": Room("7a", "7a_d-01b", "The Summit A - Room d-01b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-01b"], [door for _, door in all_doors.items() if door.room_name == "7a_d-01b"]),
-    "7a_d-01c": Room("7a", "7a_d-01c", "The Summit A - Room d-01c", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-01c"], [door for _, door in all_doors.items() if door.room_name == "7a_d-01c"]),
-    "7a_d-01d": Room("7a", "7a_d-01d", "The Summit A - Room d-01d", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-01d"], [door for _, door in all_doors.items() if door.room_name == "7a_d-01d"]),
-    "7a_d-02": Room("7a", "7a_d-02", "The Summit A - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-02"], [door for _, door in all_doors.items() if door.room_name == "7a_d-02"]),
-    "7a_d-03": Room("7a", "7a_d-03", "The Summit A - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-03"], [door for _, door in all_doors.items() if door.room_name == "7a_d-03"]),
-    "7a_d-03b": Room("7a", "7a_d-03b", "The Summit A - Room d-03b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-03b"], [door for _, door in all_doors.items() if door.room_name == "7a_d-03b"]),
-    "7a_d-04": Room("7a", "7a_d-04", "The Summit A - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-04"], [door for _, door in all_doors.items() if door.room_name == "7a_d-04"]),
-    "7a_d-05": Room("7a", "7a_d-05", "The Summit A - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-05"], [door for _, door in all_doors.items() if door.room_name == "7a_d-05"]),
-    "7a_d-05b": Room("7a", "7a_d-05b", "The Summit A - Room d-05b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-05b"], [door for _, door in all_doors.items() if door.room_name == "7a_d-05b"]),
-    "7a_d-06": Room("7a", "7a_d-06", "The Summit A - Room d-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-06"], [door for _, door in all_doors.items() if door.room_name == "7a_d-06"]),
-    "7a_d-07": Room("7a", "7a_d-07", "The Summit A - Room d-07", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-07"], [door for _, door in all_doors.items() if door.room_name == "7a_d-07"]),
-    "7a_d-08": Room("7a", "7a_d-08", "The Summit A - Room d-08", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-08"], [door for _, door in all_doors.items() if door.room_name == "7a_d-08"]),
-    "7a_d-09": Room("7a", "7a_d-09", "The Summit A - Room d-09", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-09"], [door for _, door in all_doors.items() if door.room_name == "7a_d-09"]),
-    "7a_d-10": Room("7a", "7a_d-10", "The Summit A - Room d-10", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-10"], [door for _, door in all_doors.items() if door.room_name == "7a_d-10"]),
-    "7a_d-10b": Room("7a", "7a_d-10b", "The Summit A - Room d-10b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-10b"], [door for _, door in all_doors.items() if door.room_name == "7a_d-10b"]),
-    "7a_d-11": Room("7a", "7a_d-11", "The Summit A - Room d-11", [reg for _, reg in all_regions.items() if reg.room_name == "7a_d-11"], [door for _, door in all_doors.items() if door.room_name == "7a_d-11"]),
-    "7a_e-00b": Room("7a", "7a_e-00b", "The Summit A - Room e-00b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-00b"], [door for _, door in all_doors.items() if door.room_name == "7a_e-00b"], "2000 M", "7a_e-00b_bottom"),
-    "7a_e-00": Room("7a", "7a_e-00", "The Summit A - Room e-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-00"], [door for _, door in all_doors.items() if door.room_name == "7a_e-00"]),
-    "7a_e-01": Room("7a", "7a_e-01", "The Summit A - Room e-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-01"], [door for _, door in all_doors.items() if door.room_name == "7a_e-01"]),
-    "7a_e-01b": Room("7a", "7a_e-01b", "The Summit A - Room e-01b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-01b"], [door for _, door in all_doors.items() if door.room_name == "7a_e-01b"]),
-    "7a_e-01c": Room("7a", "7a_e-01c", "The Summit A - Room e-01c", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-01c"], [door for _, door in all_doors.items() if door.room_name == "7a_e-01c"]),
-    "7a_e-02": Room("7a", "7a_e-02", "The Summit A - Room e-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-02"], [door for _, door in all_doors.items() if door.room_name == "7a_e-02"]),
-    "7a_e-03": Room("7a", "7a_e-03", "The Summit A - Room e-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-03"], [door for _, door in all_doors.items() if door.room_name == "7a_e-03"]),
-    "7a_e-04": Room("7a", "7a_e-04", "The Summit A - Room e-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-04"], [door for _, door in all_doors.items() if door.room_name == "7a_e-04"]),
-    "7a_e-05": Room("7a", "7a_e-05", "The Summit A - Room e-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-05"], [door for _, door in all_doors.items() if door.room_name == "7a_e-05"]),
-    "7a_e-06": Room("7a", "7a_e-06", "The Summit A - Room e-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-06"], [door for _, door in all_doors.items() if door.room_name == "7a_e-06"]),
-    "7a_e-07": Room("7a", "7a_e-07", "The Summit A - Room e-07", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-07"], [door for _, door in all_doors.items() if door.room_name == "7a_e-07"]),
-    "7a_e-08": Room("7a", "7a_e-08", "The Summit A - Room e-08", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-08"], [door for _, door in all_doors.items() if door.room_name == "7a_e-08"]),
-    "7a_e-09": Room("7a", "7a_e-09", "The Summit A - Room e-09", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-09"], [door for _, door in all_doors.items() if door.room_name == "7a_e-09"]),
-    "7a_e-11": Room("7a", "7a_e-11", "The Summit A - Room e-11", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-11"], [door for _, door in all_doors.items() if door.room_name == "7a_e-11"]),
-    "7a_e-12": Room("7a", "7a_e-12", "The Summit A - Room e-12", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-12"], [door for _, door in all_doors.items() if door.room_name == "7a_e-12"]),
-    "7a_e-10": Room("7a", "7a_e-10", "The Summit A - Room e-10", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-10"], [door for _, door in all_doors.items() if door.room_name == "7a_e-10"]),
-    "7a_e-10b": Room("7a", "7a_e-10b", "The Summit A - Room e-10b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-10b"], [door for _, door in all_doors.items() if door.room_name == "7a_e-10b"]),
-    "7a_e-13": Room("7a", "7a_e-13", "The Summit A - Room e-13", [reg for _, reg in all_regions.items() if reg.room_name == "7a_e-13"], [door for _, door in all_doors.items() if door.room_name == "7a_e-13"]),
-    "7a_f-00": Room("7a", "7a_f-00", "The Summit A - Room f-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-00"], [door for _, door in all_doors.items() if door.room_name == "7a_f-00"], "2500 M", "7a_f-00_south"),
-    "7a_f-01": Room("7a", "7a_f-01", "The Summit A - Room f-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-01"], [door for _, door in all_doors.items() if door.room_name == "7a_f-01"]),
-    "7a_f-02": Room("7a", "7a_f-02", "The Summit A - Room f-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-02"], [door for _, door in all_doors.items() if door.room_name == "7a_f-02"]),
-    "7a_f-02b": Room("7a", "7a_f-02b", "The Summit A - Room f-02b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-02b"], [door for _, door in all_doors.items() if door.room_name == "7a_f-02b"]),
-    "7a_f-04": Room("7a", "7a_f-04", "The Summit A - Room f-04", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-04"], [door for _, door in all_doors.items() if door.room_name == "7a_f-04"]),
-    "7a_f-03": Room("7a", "7a_f-03", "The Summit A - Room f-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-03"], [door for _, door in all_doors.items() if door.room_name == "7a_f-03"]),
-    "7a_f-05": Room("7a", "7a_f-05", "The Summit A - Room f-05", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-05"], [door for _, door in all_doors.items() if door.room_name == "7a_f-05"]),
-    "7a_f-06": Room("7a", "7a_f-06", "The Summit A - Room f-06", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-06"], [door for _, door in all_doors.items() if door.room_name == "7a_f-06"]),
-    "7a_f-07": Room("7a", "7a_f-07", "The Summit A - Room f-07", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-07"], [door for _, door in all_doors.items() if door.room_name == "7a_f-07"]),
-    "7a_f-08": Room("7a", "7a_f-08", "The Summit A - Room f-08", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-08"], [door for _, door in all_doors.items() if door.room_name == "7a_f-08"]),
-    "7a_f-08b": Room("7a", "7a_f-08b", "The Summit A - Room f-08b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-08b"], [door for _, door in all_doors.items() if door.room_name == "7a_f-08b"]),
-    "7a_f-08d": Room("7a", "7a_f-08d", "The Summit A - Room f-08d", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-08d"], [door for _, door in all_doors.items() if door.room_name == "7a_f-08d"]),
-    "7a_f-08c": Room("7a", "7a_f-08c", "The Summit A - Room f-08c", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-08c"], [door for _, door in all_doors.items() if door.room_name == "7a_f-08c"]),
-    "7a_f-09": Room("7a", "7a_f-09", "The Summit A - Room f-09", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-09"], [door for _, door in all_doors.items() if door.room_name == "7a_f-09"]),
-    "7a_f-10": Room("7a", "7a_f-10", "The Summit A - Room f-10", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-10"], [door for _, door in all_doors.items() if door.room_name == "7a_f-10"]),
-    "7a_f-10b": Room("7a", "7a_f-10b", "The Summit A - Room f-10b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-10b"], [door for _, door in all_doors.items() if door.room_name == "7a_f-10b"]),
-    "7a_f-11": Room("7a", "7a_f-11", "The Summit A - Room f-11", [reg for _, reg in all_regions.items() if reg.room_name == "7a_f-11"], [door for _, door in all_doors.items() if door.room_name == "7a_f-11"]),
-    "7a_g-00": Room("7a", "7a_g-00", "The Summit A - Room g-00", [reg for _, reg in all_regions.items() if reg.room_name == "7a_g-00"], [door for _, door in all_doors.items() if door.room_name == "7a_g-00"], "3000 M", "7a_g-00_bottom"),
-    "7a_g-00b": Room("7a", "7a_g-00b", "The Summit A - Room g-00b", [reg for _, reg in all_regions.items() if reg.room_name == "7a_g-00b"], [door for _, door in all_doors.items() if door.room_name == "7a_g-00b"]),
-    "7a_g-01": Room("7a", "7a_g-01", "The Summit A - Room g-01", [reg for _, reg in all_regions.items() if reg.room_name == "7a_g-01"], [door for _, door in all_doors.items() if door.room_name == "7a_g-01"]),
-    "7a_g-02": Room("7a", "7a_g-02", "The Summit A - Room g-02", [reg for _, reg in all_regions.items() if reg.room_name == "7a_g-02"], [door for _, door in all_doors.items() if door.room_name == "7a_g-02"]),
-    "7a_g-03": Room("7a", "7a_g-03", "The Summit A - Room g-03", [reg for _, reg in all_regions.items() if reg.room_name == "7a_g-03"], [door for _, door in all_doors.items() if door.room_name == "7a_g-03"]),
+    "7a_a-00": Room("7a", "7a_a-00", "The Summit A - Room a-00", regions_by_room["7a_a-00"], doors_by_room["7a_a-00"], "Start", "7a_a-00_west"),
+    "7a_a-01": Room("7a", "7a_a-01", "The Summit A - Room a-01", regions_by_room["7a_a-01"], doors_by_room["7a_a-01"]),
+    "7a_a-02": Room("7a", "7a_a-02", "The Summit A - Room a-02", regions_by_room["7a_a-02"], doors_by_room["7a_a-02"]),
+    "7a_a-02b": Room("7a", "7a_a-02b", "The Summit A - Room a-02b", regions_by_room["7a_a-02b"], doors_by_room["7a_a-02b"]),
+    "7a_a-03": Room("7a", "7a_a-03", "The Summit A - Room a-03", regions_by_room["7a_a-03"], doors_by_room["7a_a-03"]),
+    "7a_a-04": Room("7a", "7a_a-04", "The Summit A - Room a-04", regions_by_room["7a_a-04"], doors_by_room["7a_a-04"]),
+    "7a_a-04b": Room("7a", "7a_a-04b", "The Summit A - Room a-04b", regions_by_room["7a_a-04b"], doors_by_room["7a_a-04b"]),
+    "7a_a-05": Room("7a", "7a_a-05", "The Summit A - Room a-05", regions_by_room["7a_a-05"], doors_by_room["7a_a-05"]),
+    "7a_a-06": Room("7a", "7a_a-06", "The Summit A - Room a-06", regions_by_room["7a_a-06"], doors_by_room["7a_a-06"]),
+    "7a_b-00": Room("7a", "7a_b-00", "The Summit A - Room b-00", regions_by_room["7a_b-00"], doors_by_room["7a_b-00"], "500 M", "7a_b-00_bottom"),
+    "7a_b-01": Room("7a", "7a_b-01", "The Summit A - Room b-01", regions_by_room["7a_b-01"], doors_by_room["7a_b-01"]),
+    "7a_b-02": Room("7a", "7a_b-02", "The Summit A - Room b-02", regions_by_room["7a_b-02"], doors_by_room["7a_b-02"]),
+    "7a_b-02b": Room("7a", "7a_b-02b", "The Summit A - Room b-02b", regions_by_room["7a_b-02b"], doors_by_room["7a_b-02b"]),
+    "7a_b-02e": Room("7a", "7a_b-02e", "The Summit A - Room b-02e", regions_by_room["7a_b-02e"], doors_by_room["7a_b-02e"]),
+    "7a_b-02c": Room("7a", "7a_b-02c", "The Summit A - Room b-02c", regions_by_room["7a_b-02c"], doors_by_room["7a_b-02c"]),
+    "7a_b-02d": Room("7a", "7a_b-02d", "The Summit A - Room b-02d", regions_by_room["7a_b-02d"], doors_by_room["7a_b-02d"]),
+    "7a_b-03": Room("7a", "7a_b-03", "The Summit A - Room b-03", regions_by_room["7a_b-03"], doors_by_room["7a_b-03"]),
+    "7a_b-04": Room("7a", "7a_b-04", "The Summit A - Room b-04", regions_by_room["7a_b-04"], doors_by_room["7a_b-04"]),
+    "7a_b-05": Room("7a", "7a_b-05", "The Summit A - Room b-05", regions_by_room["7a_b-05"], doors_by_room["7a_b-05"]),
+    "7a_b-06": Room("7a", "7a_b-06", "The Summit A - Room b-06", regions_by_room["7a_b-06"], doors_by_room["7a_b-06"]),
+    "7a_b-07": Room("7a", "7a_b-07", "The Summit A - Room b-07", regions_by_room["7a_b-07"], doors_by_room["7a_b-07"]),
+    "7a_b-08": Room("7a", "7a_b-08", "The Summit A - Room b-08", regions_by_room["7a_b-08"], doors_by_room["7a_b-08"]),
+    "7a_b-09": Room("7a", "7a_b-09", "The Summit A - Room b-09", regions_by_room["7a_b-09"], doors_by_room["7a_b-09"]),
+    "7a_c-00": Room("7a", "7a_c-00", "The Summit A - Room c-00", regions_by_room["7a_c-00"], doors_by_room["7a_c-00"], "1000 M", "7a_c-00_west"),
+    "7a_c-01": Room("7a", "7a_c-01", "The Summit A - Room c-01", regions_by_room["7a_c-01"], doors_by_room["7a_c-01"]),
+    "7a_c-02": Room("7a", "7a_c-02", "The Summit A - Room c-02", regions_by_room["7a_c-02"], doors_by_room["7a_c-02"]),
+    "7a_c-03": Room("7a", "7a_c-03", "The Summit A - Room c-03", regions_by_room["7a_c-03"], doors_by_room["7a_c-03"]),
+    "7a_c-03b": Room("7a", "7a_c-03b", "The Summit A - Room c-03b", regions_by_room["7a_c-03b"], doors_by_room["7a_c-03b"]),
+    "7a_c-04": Room("7a", "7a_c-04", "The Summit A - Room c-04", regions_by_room["7a_c-04"], doors_by_room["7a_c-04"]),
+    "7a_c-05": Room("7a", "7a_c-05", "The Summit A - Room c-05", regions_by_room["7a_c-05"], doors_by_room["7a_c-05"]),
+    "7a_c-06": Room("7a", "7a_c-06", "The Summit A - Room c-06", regions_by_room["7a_c-06"], doors_by_room["7a_c-06"]),
+    "7a_c-06b": Room("7a", "7a_c-06b", "The Summit A - Room c-06b", regions_by_room["7a_c-06b"], doors_by_room["7a_c-06b"]),
+    "7a_c-06c": Room("7a", "7a_c-06c", "The Summit A - Room c-06c", regions_by_room["7a_c-06c"], doors_by_room["7a_c-06c"]),
+    "7a_c-07": Room("7a", "7a_c-07", "The Summit A - Room c-07", regions_by_room["7a_c-07"], doors_by_room["7a_c-07"]),
+    "7a_c-07b": Room("7a", "7a_c-07b", "The Summit A - Room c-07b", regions_by_room["7a_c-07b"], doors_by_room["7a_c-07b"]),
+    "7a_c-08": Room("7a", "7a_c-08", "The Summit A - Room c-08", regions_by_room["7a_c-08"], doors_by_room["7a_c-08"]),
+    "7a_c-09": Room("7a", "7a_c-09", "The Summit A - Room c-09", regions_by_room["7a_c-09"], doors_by_room["7a_c-09"]),
+    "7a_d-00": Room("7a", "7a_d-00", "The Summit A - Room d-00", regions_by_room["7a_d-00"], doors_by_room["7a_d-00"], "1500 M", "7a_d-00_bottom"),
+    "7a_d-01": Room("7a", "7a_d-01", "The Summit A - Room d-01", regions_by_room["7a_d-01"], doors_by_room["7a_d-01"]),
+    "7a_d-01b": Room("7a", "7a_d-01b", "The Summit A - Room d-01b", regions_by_room["7a_d-01b"], doors_by_room["7a_d-01b"]),
+    "7a_d-01c": Room("7a", "7a_d-01c", "The Summit A - Room d-01c", regions_by_room["7a_d-01c"], doors_by_room["7a_d-01c"]),
+    "7a_d-01d": Room("7a", "7a_d-01d", "The Summit A - Room d-01d", regions_by_room["7a_d-01d"], doors_by_room["7a_d-01d"]),
+    "7a_d-02": Room("7a", "7a_d-02", "The Summit A - Room d-02", regions_by_room["7a_d-02"], doors_by_room["7a_d-02"]),
+    "7a_d-03": Room("7a", "7a_d-03", "The Summit A - Room d-03", regions_by_room["7a_d-03"], doors_by_room["7a_d-03"]),
+    "7a_d-03b": Room("7a", "7a_d-03b", "The Summit A - Room d-03b", regions_by_room["7a_d-03b"], doors_by_room["7a_d-03b"]),
+    "7a_d-04": Room("7a", "7a_d-04", "The Summit A - Room d-04", regions_by_room["7a_d-04"], doors_by_room["7a_d-04"]),
+    "7a_d-05": Room("7a", "7a_d-05", "The Summit A - Room d-05", regions_by_room["7a_d-05"], doors_by_room["7a_d-05"]),
+    "7a_d-05b": Room("7a", "7a_d-05b", "The Summit A - Room d-05b", regions_by_room["7a_d-05b"], doors_by_room["7a_d-05b"]),
+    "7a_d-06": Room("7a", "7a_d-06", "The Summit A - Room d-06", regions_by_room["7a_d-06"], doors_by_room["7a_d-06"]),
+    "7a_d-07": Room("7a", "7a_d-07", "The Summit A - Room d-07", regions_by_room["7a_d-07"], doors_by_room["7a_d-07"]),
+    "7a_d-08": Room("7a", "7a_d-08", "The Summit A - Room d-08", regions_by_room["7a_d-08"], doors_by_room["7a_d-08"]),
+    "7a_d-09": Room("7a", "7a_d-09", "The Summit A - Room d-09", regions_by_room["7a_d-09"], doors_by_room["7a_d-09"]),
+    "7a_d-10": Room("7a", "7a_d-10", "The Summit A - Room d-10", regions_by_room["7a_d-10"], doors_by_room["7a_d-10"]),
+    "7a_d-10b": Room("7a", "7a_d-10b", "The Summit A - Room d-10b", regions_by_room["7a_d-10b"], doors_by_room["7a_d-10b"]),
+    "7a_d-11": Room("7a", "7a_d-11", "The Summit A - Room d-11", regions_by_room["7a_d-11"], doors_by_room["7a_d-11"]),
+    "7a_e-00b": Room("7a", "7a_e-00b", "The Summit A - Room e-00b", regions_by_room["7a_e-00b"], doors_by_room["7a_e-00b"], "2000 M", "7a_e-00b_bottom"),
+    "7a_e-00": Room("7a", "7a_e-00", "The Summit A - Room e-00", regions_by_room["7a_e-00"], doors_by_room["7a_e-00"]),
+    "7a_e-01": Room("7a", "7a_e-01", "The Summit A - Room e-01", regions_by_room["7a_e-01"], doors_by_room["7a_e-01"]),
+    "7a_e-01b": Room("7a", "7a_e-01b", "The Summit A - Room e-01b", regions_by_room["7a_e-01b"], doors_by_room["7a_e-01b"]),
+    "7a_e-01c": Room("7a", "7a_e-01c", "The Summit A - Room e-01c", regions_by_room["7a_e-01c"], doors_by_room["7a_e-01c"]),
+    "7a_e-02": Room("7a", "7a_e-02", "The Summit A - Room e-02", regions_by_room["7a_e-02"], doors_by_room["7a_e-02"]),
+    "7a_e-03": Room("7a", "7a_e-03", "The Summit A - Room e-03", regions_by_room["7a_e-03"], doors_by_room["7a_e-03"]),
+    "7a_e-04": Room("7a", "7a_e-04", "The Summit A - Room e-04", regions_by_room["7a_e-04"], doors_by_room["7a_e-04"]),
+    "7a_e-05": Room("7a", "7a_e-05", "The Summit A - Room e-05", regions_by_room["7a_e-05"], doors_by_room["7a_e-05"]),
+    "7a_e-06": Room("7a", "7a_e-06", "The Summit A - Room e-06", regions_by_room["7a_e-06"], doors_by_room["7a_e-06"]),
+    "7a_e-07": Room("7a", "7a_e-07", "The Summit A - Room e-07", regions_by_room["7a_e-07"], doors_by_room["7a_e-07"]),
+    "7a_e-08": Room("7a", "7a_e-08", "The Summit A - Room e-08", regions_by_room["7a_e-08"], doors_by_room["7a_e-08"]),
+    "7a_e-09": Room("7a", "7a_e-09", "The Summit A - Room e-09", regions_by_room["7a_e-09"], doors_by_room["7a_e-09"]),
+    "7a_e-11": Room("7a", "7a_e-11", "The Summit A - Room e-11", regions_by_room["7a_e-11"], doors_by_room["7a_e-11"]),
+    "7a_e-12": Room("7a", "7a_e-12", "The Summit A - Room e-12", regions_by_room["7a_e-12"], doors_by_room["7a_e-12"]),
+    "7a_e-10": Room("7a", "7a_e-10", "The Summit A - Room e-10", regions_by_room["7a_e-10"], doors_by_room["7a_e-10"]),
+    "7a_e-10b": Room("7a", "7a_e-10b", "The Summit A - Room e-10b", regions_by_room["7a_e-10b"], doors_by_room["7a_e-10b"]),
+    "7a_e-13": Room("7a", "7a_e-13", "The Summit A - Room e-13", regions_by_room["7a_e-13"], doors_by_room["7a_e-13"]),
+    "7a_f-00": Room("7a", "7a_f-00", "The Summit A - Room f-00", regions_by_room["7a_f-00"], doors_by_room["7a_f-00"], "2500 M", "7a_f-00_south"),
+    "7a_f-01": Room("7a", "7a_f-01", "The Summit A - Room f-01", regions_by_room["7a_f-01"], doors_by_room["7a_f-01"]),
+    "7a_f-02": Room("7a", "7a_f-02", "The Summit A - Room f-02", regions_by_room["7a_f-02"], doors_by_room["7a_f-02"]),
+    "7a_f-02b": Room("7a", "7a_f-02b", "The Summit A - Room f-02b", regions_by_room["7a_f-02b"], doors_by_room["7a_f-02b"]),
+    "7a_f-04": Room("7a", "7a_f-04", "The Summit A - Room f-04", regions_by_room["7a_f-04"], doors_by_room["7a_f-04"]),
+    "7a_f-03": Room("7a", "7a_f-03", "The Summit A - Room f-03", regions_by_room["7a_f-03"], doors_by_room["7a_f-03"]),
+    "7a_f-05": Room("7a", "7a_f-05", "The Summit A - Room f-05", regions_by_room["7a_f-05"], doors_by_room["7a_f-05"]),
+    "7a_f-06": Room("7a", "7a_f-06", "The Summit A - Room f-06", regions_by_room["7a_f-06"], doors_by_room["7a_f-06"]),
+    "7a_f-07": Room("7a", "7a_f-07", "The Summit A - Room f-07", regions_by_room["7a_f-07"], doors_by_room["7a_f-07"]),
+    "7a_f-08": Room("7a", "7a_f-08", "The Summit A - Room f-08", regions_by_room["7a_f-08"], doors_by_room["7a_f-08"]),
+    "7a_f-08b": Room("7a", "7a_f-08b", "The Summit A - Room f-08b", regions_by_room["7a_f-08b"], doors_by_room["7a_f-08b"]),
+    "7a_f-08d": Room("7a", "7a_f-08d", "The Summit A - Room f-08d", regions_by_room["7a_f-08d"], doors_by_room["7a_f-08d"]),
+    "7a_f-08c": Room("7a", "7a_f-08c", "The Summit A - Room f-08c", regions_by_room["7a_f-08c"], doors_by_room["7a_f-08c"]),
+    "7a_f-09": Room("7a", "7a_f-09", "The Summit A - Room f-09", regions_by_room["7a_f-09"], doors_by_room["7a_f-09"]),
+    "7a_f-10": Room("7a", "7a_f-10", "The Summit A - Room f-10", regions_by_room["7a_f-10"], doors_by_room["7a_f-10"]),
+    "7a_f-10b": Room("7a", "7a_f-10b", "The Summit A - Room f-10b", regions_by_room["7a_f-10b"], doors_by_room["7a_f-10b"]),
+    "7a_f-11": Room("7a", "7a_f-11", "The Summit A - Room f-11", regions_by_room["7a_f-11"], doors_by_room["7a_f-11"]),
+    "7a_g-00": Room("7a", "7a_g-00", "The Summit A - Room g-00", regions_by_room["7a_g-00"], doors_by_room["7a_g-00"], "3000 M", "7a_g-00_bottom"),
+    "7a_g-00b": Room("7a", "7a_g-00b", "The Summit A - Room g-00b", regions_by_room["7a_g-00b"], doors_by_room["7a_g-00b"]),
+    "7a_g-01": Room("7a", "7a_g-01", "The Summit A - Room g-01", regions_by_room["7a_g-01"], doors_by_room["7a_g-01"]),
+    "7a_g-02": Room("7a", "7a_g-02", "The Summit A - Room g-02", regions_by_room["7a_g-02"], doors_by_room["7a_g-02"]),
+    "7a_g-03": Room("7a", "7a_g-03", "The Summit A - Room g-03", regions_by_room["7a_g-03"], doors_by_room["7a_g-03"]),
 
-    "7b_a-00": Room("7b", "7b_a-00", "The Summit B - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_a-00"], [door for _, door in all_doors.items() if door.room_name == "7b_a-00"], "Start", "7b_a-00_west"),
-    "7b_a-01": Room("7b", "7b_a-01", "The Summit B - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_a-01"], [door for _, door in all_doors.items() if door.room_name == "7b_a-01"]),
-    "7b_a-02": Room("7b", "7b_a-02", "The Summit B - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_a-02"], [door for _, door in all_doors.items() if door.room_name == "7b_a-02"]),
-    "7b_a-03": Room("7b", "7b_a-03", "The Summit B - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_a-03"], [door for _, door in all_doors.items() if door.room_name == "7b_a-03"]),
-    "7b_b-00": Room("7b", "7b_b-00", "The Summit B - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_b-00"], [door for _, door in all_doors.items() if door.room_name == "7b_b-00"], "500 M", "7b_b-00_bottom"),
-    "7b_b-01": Room("7b", "7b_b-01", "The Summit B - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_b-01"], [door for _, door in all_doors.items() if door.room_name == "7b_b-01"]),
-    "7b_b-02": Room("7b", "7b_b-02", "The Summit B - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_b-02"], [door for _, door in all_doors.items() if door.room_name == "7b_b-02"]),
-    "7b_b-03": Room("7b", "7b_b-03", "The Summit B - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_b-03"], [door for _, door in all_doors.items() if door.room_name == "7b_b-03"]),
-    "7b_c-01": Room("7b", "7b_c-01", "The Summit B - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_c-01"], [door for _, door in all_doors.items() if door.room_name == "7b_c-01"], "1000 M", "7b_c-01_west"),
-    "7b_c-00": Room("7b", "7b_c-00", "The Summit B - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_c-00"], [door for _, door in all_doors.items() if door.room_name == "7b_c-00"]),
-    "7b_c-02": Room("7b", "7b_c-02", "The Summit B - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_c-02"], [door for _, door in all_doors.items() if door.room_name == "7b_c-02"]),
-    "7b_c-03": Room("7b", "7b_c-03", "The Summit B - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_c-03"], [door for _, door in all_doors.items() if door.room_name == "7b_c-03"]),
-    "7b_d-00": Room("7b", "7b_d-00", "The Summit B - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_d-00"], [door for _, door in all_doors.items() if door.room_name == "7b_d-00"], "1500 M", "7b_d-00_west"),
-    "7b_d-01": Room("7b", "7b_d-01", "The Summit B - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_d-01"], [door for _, door in all_doors.items() if door.room_name == "7b_d-01"]),
-    "7b_d-02": Room("7b", "7b_d-02", "The Summit B - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_d-02"], [door for _, door in all_doors.items() if door.room_name == "7b_d-02"]),
-    "7b_d-03": Room("7b", "7b_d-03", "The Summit B - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_d-03"], [door for _, door in all_doors.items() if door.room_name == "7b_d-03"]),
-    "7b_e-00": Room("7b", "7b_e-00", "The Summit B - Room e-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_e-00"], [door for _, door in all_doors.items() if door.room_name == "7b_e-00"], "2000 M", "7b_e-00_west"),
-    "7b_e-01": Room("7b", "7b_e-01", "The Summit B - Room e-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_e-01"], [door for _, door in all_doors.items() if door.room_name == "7b_e-01"]),
-    "7b_e-02": Room("7b", "7b_e-02", "The Summit B - Room e-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_e-02"], [door for _, door in all_doors.items() if door.room_name == "7b_e-02"]),
-    "7b_e-03": Room("7b", "7b_e-03", "The Summit B - Room e-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_e-03"], [door for _, door in all_doors.items() if door.room_name == "7b_e-03"]),
-    "7b_f-00": Room("7b", "7b_f-00", "The Summit B - Room f-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_f-00"], [door for _, door in all_doors.items() if door.room_name == "7b_f-00"], "2500 M", "7b_f-00_west"),
-    "7b_f-01": Room("7b", "7b_f-01", "The Summit B - Room f-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_f-01"], [door for _, door in all_doors.items() if door.room_name == "7b_f-01"]),
-    "7b_f-02": Room("7b", "7b_f-02", "The Summit B - Room f-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_f-02"], [door for _, door in all_doors.items() if door.room_name == "7b_f-02"]),
-    "7b_f-03": Room("7b", "7b_f-03", "The Summit B - Room f-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_f-03"], [door for _, door in all_doors.items() if door.room_name == "7b_f-03"]),
-    "7b_g-00": Room("7b", "7b_g-00", "The Summit B - Room g-00", [reg for _, reg in all_regions.items() if reg.room_name == "7b_g-00"], [door for _, door in all_doors.items() if door.room_name == "7b_g-00"], "3000 M", "7b_g-00_bottom"),
-    "7b_g-01": Room("7b", "7b_g-01", "The Summit B - Room g-01", [reg for _, reg in all_regions.items() if reg.room_name == "7b_g-01"], [door for _, door in all_doors.items() if door.room_name == "7b_g-01"]),
-    "7b_g-02": Room("7b", "7b_g-02", "The Summit B - Room g-02", [reg for _, reg in all_regions.items() if reg.room_name == "7b_g-02"], [door for _, door in all_doors.items() if door.room_name == "7b_g-02"]),
-    "7b_g-03": Room("7b", "7b_g-03", "The Summit B - Room g-03", [reg for _, reg in all_regions.items() if reg.room_name == "7b_g-03"], [door for _, door in all_doors.items() if door.room_name == "7b_g-03"]),
+    "7b_a-00": Room("7b", "7b_a-00", "The Summit B - Room a-00", regions_by_room["7b_a-00"], doors_by_room["7b_a-00"], "Start", "7b_a-00_west"),
+    "7b_a-01": Room("7b", "7b_a-01", "The Summit B - Room a-01", regions_by_room["7b_a-01"], doors_by_room["7b_a-01"]),
+    "7b_a-02": Room("7b", "7b_a-02", "The Summit B - Room a-02", regions_by_room["7b_a-02"], doors_by_room["7b_a-02"]),
+    "7b_a-03": Room("7b", "7b_a-03", "The Summit B - Room a-03", regions_by_room["7b_a-03"], doors_by_room["7b_a-03"]),
+    "7b_b-00": Room("7b", "7b_b-00", "The Summit B - Room b-00", regions_by_room["7b_b-00"], doors_by_room["7b_b-00"], "500 M", "7b_b-00_bottom"),
+    "7b_b-01": Room("7b", "7b_b-01", "The Summit B - Room b-01", regions_by_room["7b_b-01"], doors_by_room["7b_b-01"]),
+    "7b_b-02": Room("7b", "7b_b-02", "The Summit B - Room b-02", regions_by_room["7b_b-02"], doors_by_room["7b_b-02"]),
+    "7b_b-03": Room("7b", "7b_b-03", "The Summit B - Room b-03", regions_by_room["7b_b-03"], doors_by_room["7b_b-03"]),
+    "7b_c-01": Room("7b", "7b_c-01", "The Summit B - Room c-01", regions_by_room["7b_c-01"], doors_by_room["7b_c-01"], "1000 M", "7b_c-01_west"),
+    "7b_c-00": Room("7b", "7b_c-00", "The Summit B - Room c-00", regions_by_room["7b_c-00"], doors_by_room["7b_c-00"]),
+    "7b_c-02": Room("7b", "7b_c-02", "The Summit B - Room c-02", regions_by_room["7b_c-02"], doors_by_room["7b_c-02"]),
+    "7b_c-03": Room("7b", "7b_c-03", "The Summit B - Room c-03", regions_by_room["7b_c-03"], doors_by_room["7b_c-03"]),
+    "7b_d-00": Room("7b", "7b_d-00", "The Summit B - Room d-00", regions_by_room["7b_d-00"], doors_by_room["7b_d-00"], "1500 M", "7b_d-00_west"),
+    "7b_d-01": Room("7b", "7b_d-01", "The Summit B - Room d-01", regions_by_room["7b_d-01"], doors_by_room["7b_d-01"]),
+    "7b_d-02": Room("7b", "7b_d-02", "The Summit B - Room d-02", regions_by_room["7b_d-02"], doors_by_room["7b_d-02"]),
+    "7b_d-03": Room("7b", "7b_d-03", "The Summit B - Room d-03", regions_by_room["7b_d-03"], doors_by_room["7b_d-03"]),
+    "7b_e-00": Room("7b", "7b_e-00", "The Summit B - Room e-00", regions_by_room["7b_e-00"], doors_by_room["7b_e-00"], "2000 M", "7b_e-00_west"),
+    "7b_e-01": Room("7b", "7b_e-01", "The Summit B - Room e-01", regions_by_room["7b_e-01"], doors_by_room["7b_e-01"]),
+    "7b_e-02": Room("7b", "7b_e-02", "The Summit B - Room e-02", regions_by_room["7b_e-02"], doors_by_room["7b_e-02"]),
+    "7b_e-03": Room("7b", "7b_e-03", "The Summit B - Room e-03", regions_by_room["7b_e-03"], doors_by_room["7b_e-03"]),
+    "7b_f-00": Room("7b", "7b_f-00", "The Summit B - Room f-00", regions_by_room["7b_f-00"], doors_by_room["7b_f-00"], "2500 M", "7b_f-00_west"),
+    "7b_f-01": Room("7b", "7b_f-01", "The Summit B - Room f-01", regions_by_room["7b_f-01"], doors_by_room["7b_f-01"]),
+    "7b_f-02": Room("7b", "7b_f-02", "The Summit B - Room f-02", regions_by_room["7b_f-02"], doors_by_room["7b_f-02"]),
+    "7b_f-03": Room("7b", "7b_f-03", "The Summit B - Room f-03", regions_by_room["7b_f-03"], doors_by_room["7b_f-03"]),
+    "7b_g-00": Room("7b", "7b_g-00", "The Summit B - Room g-00", regions_by_room["7b_g-00"], doors_by_room["7b_g-00"], "3000 M", "7b_g-00_bottom"),
+    "7b_g-01": Room("7b", "7b_g-01", "The Summit B - Room g-01", regions_by_room["7b_g-01"], doors_by_room["7b_g-01"]),
+    "7b_g-02": Room("7b", "7b_g-02", "The Summit B - Room g-02", regions_by_room["7b_g-02"], doors_by_room["7b_g-02"]),
+    "7b_g-03": Room("7b", "7b_g-03", "The Summit B - Room g-03", regions_by_room["7b_g-03"], doors_by_room["7b_g-03"]),
 
-    "7c_01": Room("7c", "7c_01", "The Summit C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "7c_01"], [door for _, door in all_doors.items() if door.room_name == "7c_01"], "Start", "7c_01_west"),
-    "7c_02": Room("7c", "7c_02", "The Summit C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "7c_02"], [door for _, door in all_doors.items() if door.room_name == "7c_02"]),
-    "7c_03": Room("7c", "7c_03", "The Summit C - Room 03", [reg for _, reg in all_regions.items() if reg.room_name == "7c_03"], [door for _, door in all_doors.items() if door.room_name == "7c_03"]),
+    "7c_01": Room("7c", "7c_01", "The Summit C - Room 01", regions_by_room["7c_01"], doors_by_room["7c_01"], "Start", "7c_01_west"),
+    "7c_02": Room("7c", "7c_02", "The Summit C - Room 02", regions_by_room["7c_02"], doors_by_room["7c_02"]),
+    "7c_03": Room("7c", "7c_03", "The Summit C - Room 03", regions_by_room["7c_03"], doors_by_room["7c_03"]),
 
-    "8a_outside": Room("8a", "8a_outside", "Epilogue - Room outside", [reg for _, reg in all_regions.items() if reg.room_name == "8a_outside"], [door for _, door in all_doors.items() if door.room_name == "8a_outside"], "Start", "8a_outside_east"),
-    "8a_bridge": Room("8a", "8a_bridge", "Epilogue - Room bridge", [reg for _, reg in all_regions.items() if reg.room_name == "8a_bridge"], [door for _, door in all_doors.items() if door.room_name == "8a_bridge"]),
-    "8a_secret": Room("8a", "8a_secret", "Epilogue - Room secret", [reg for _, reg in all_regions.items() if reg.room_name == "8a_secret"], [door for _, door in all_doors.items() if door.room_name == "8a_secret"]),
+    "8a_outside": Room("8a", "8a_outside", "Epilogue - Room outside", regions_by_room["8a_outside"], doors_by_room["8a_outside"], "Start", "8a_outside_east"),
+    "8a_bridge": Room("8a", "8a_bridge", "Epilogue - Room bridge", regions_by_room["8a_bridge"], doors_by_room["8a_bridge"]),
+    "8a_secret": Room("8a", "8a_secret", "Epilogue - Room secret", regions_by_room["8a_secret"], doors_by_room["8a_secret"]),
 
-    "9a_00": Room("9a", "9a_00", "Core A - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "9a_00"], [door for _, door in all_doors.items() if door.room_name == "9a_00"], "Start", "9a_00_west"),
-    "9a_0x": Room("9a", "9a_0x", "Core A - Room 0x", [reg for _, reg in all_regions.items() if reg.room_name == "9a_0x"], [door for _, door in all_doors.items() if door.room_name == "9a_0x"]),
-    "9a_01": Room("9a", "9a_01", "Core A - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "9a_01"], [door for _, door in all_doors.items() if door.room_name == "9a_01"]),
-    "9a_02": Room("9a", "9a_02", "Core A - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "9a_02"], [door for _, door in all_doors.items() if door.room_name == "9a_02"]),
-    "9a_a-00": Room("9a", "9a_a-00", "Core A - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "9a_a-00"], [door for _, door in all_doors.items() if door.room_name == "9a_a-00"], "Into the Core", "9a_a-00_west"),
-    "9a_a-01": Room("9a", "9a_a-01", "Core A - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "9a_a-01"], [door for _, door in all_doors.items() if door.room_name == "9a_a-01"]),
-    "9a_a-02": Room("9a", "9a_a-02", "Core A - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "9a_a-02"], [door for _, door in all_doors.items() if door.room_name == "9a_a-02"]),
-    "9a_a-03": Room("9a", "9a_a-03", "Core A - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "9a_a-03"], [door for _, door in all_doors.items() if door.room_name == "9a_a-03"]),
-    "9a_b-00": Room("9a", "9a_b-00", "Core A - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-00"], [door for _, door in all_doors.items() if door.room_name == "9a_b-00"]),
-    "9a_b-01": Room("9a", "9a_b-01", "Core A - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-01"], [door for _, door in all_doors.items() if door.room_name == "9a_b-01"]),
-    "9a_b-02": Room("9a", "9a_b-02", "Core A - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-02"], [door for _, door in all_doors.items() if door.room_name == "9a_b-02"]),
-    "9a_b-03": Room("9a", "9a_b-03", "Core A - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-03"], [door for _, door in all_doors.items() if door.room_name == "9a_b-03"]),
-    "9a_b-04": Room("9a", "9a_b-04", "Core A - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-04"], [door for _, door in all_doors.items() if door.room_name == "9a_b-04"]),
-    "9a_b-05": Room("9a", "9a_b-05", "Core A - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-05"], [door for _, door in all_doors.items() if door.room_name == "9a_b-05"]),
-    "9a_b-06": Room("9a", "9a_b-06", "Core A - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-06"], [door for _, door in all_doors.items() if door.room_name == "9a_b-06"]),
-    "9a_b-07b": Room("9a", "9a_b-07b", "Core A - Room b-07b", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-07b"], [door for _, door in all_doors.items() if door.room_name == "9a_b-07b"]),
-    "9a_b-07": Room("9a", "9a_b-07", "Core A - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "9a_b-07"], [door for _, door in all_doors.items() if door.room_name == "9a_b-07"]),
-    "9a_c-00": Room("9a", "9a_c-00", "Core A - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-00"], [door for _, door in all_doors.items() if door.room_name == "9a_c-00"], "Hot and Cold", "9a_c-00_west"),
-    "9a_c-00b": Room("9a", "9a_c-00b", "Core A - Room c-00b", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-00b"], [door for _, door in all_doors.items() if door.room_name == "9a_c-00b"]),
-    "9a_c-01": Room("9a", "9a_c-01", "Core A - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-01"], [door for _, door in all_doors.items() if door.room_name == "9a_c-01"]),
-    "9a_c-02": Room("9a", "9a_c-02", "Core A - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-02"], [door for _, door in all_doors.items() if door.room_name == "9a_c-02"]),
-    "9a_c-03": Room("9a", "9a_c-03", "Core A - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-03"], [door for _, door in all_doors.items() if door.room_name == "9a_c-03"]),
-    "9a_c-03b": Room("9a", "9a_c-03b", "Core A - Room c-03b", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-03b"], [door for _, door in all_doors.items() if door.room_name == "9a_c-03b"]),
-    "9a_c-04": Room("9a", "9a_c-04", "Core A - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "9a_c-04"], [door for _, door in all_doors.items() if door.room_name == "9a_c-04"]),
-    "9a_d-00": Room("9a", "9a_d-00", "Core A - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-00"], [door for _, door in all_doors.items() if door.room_name == "9a_d-00"], "Heart of the Mountain", "9a_d-00_bottom"),
-    "9a_d-01": Room("9a", "9a_d-01", "Core A - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-01"], [door for _, door in all_doors.items() if door.room_name == "9a_d-01"]),
-    "9a_d-02": Room("9a", "9a_d-02", "Core A - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-02"], [door for _, door in all_doors.items() if door.room_name == "9a_d-02"]),
-    "9a_d-03": Room("9a", "9a_d-03", "Core A - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-03"], [door for _, door in all_doors.items() if door.room_name == "9a_d-03"]),
-    "9a_d-04": Room("9a", "9a_d-04", "Core A - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-04"], [door for _, door in all_doors.items() if door.room_name == "9a_d-04"]),
-    "9a_d-05": Room("9a", "9a_d-05", "Core A - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-05"], [door for _, door in all_doors.items() if door.room_name == "9a_d-05"]),
-    "9a_d-06": Room("9a", "9a_d-06", "Core A - Room d-06", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-06"], [door for _, door in all_doors.items() if door.room_name == "9a_d-06"]),
-    "9a_d-07": Room("9a", "9a_d-07", "Core A - Room d-07", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-07"], [door for _, door in all_doors.items() if door.room_name == "9a_d-07"]),
-    "9a_d-08": Room("9a", "9a_d-08", "Core A - Room d-08", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-08"], [door for _, door in all_doors.items() if door.room_name == "9a_d-08"]),
-    "9a_d-09": Room("9a", "9a_d-09", "Core A - Room d-09", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-09"], [door for _, door in all_doors.items() if door.room_name == "9a_d-09"]),
-    "9a_d-10": Room("9a", "9a_d-10", "Core A - Room d-10", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-10"], [door for _, door in all_doors.items() if door.room_name == "9a_d-10"]),
-    "9a_d-10b": Room("9a", "9a_d-10b", "Core A - Room d-10b", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-10b"], [door for _, door in all_doors.items() if door.room_name == "9a_d-10b"]),
-    "9a_d-10c": Room("9a", "9a_d-10c", "Core A - Room d-10c", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-10c"], [door for _, door in all_doors.items() if door.room_name == "9a_d-10c"]),
-    "9a_d-11": Room("9a", "9a_d-11", "Core A - Room d-11", [reg for _, reg in all_regions.items() if reg.room_name == "9a_d-11"], [door for _, door in all_doors.items() if door.room_name == "9a_d-11"]),
-    "9a_space": Room("9a", "9a_space", "Core A - Room space", [reg for _, reg in all_regions.items() if reg.room_name == "9a_space"], [door for _, door in all_doors.items() if door.room_name == "9a_space"]),
+    "9a_00": Room("9a", "9a_00", "Core A - Room 00", regions_by_room["9a_00"], doors_by_room["9a_00"], "Start", "9a_00_west"),
+    "9a_0x": Room("9a", "9a_0x", "Core A - Room 0x", regions_by_room["9a_0x"], doors_by_room["9a_0x"]),
+    "9a_01": Room("9a", "9a_01", "Core A - Room 01", regions_by_room["9a_01"], doors_by_room["9a_01"]),
+    "9a_02": Room("9a", "9a_02", "Core A - Room 02", regions_by_room["9a_02"], doors_by_room["9a_02"]),
+    "9a_a-00": Room("9a", "9a_a-00", "Core A - Room a-00", regions_by_room["9a_a-00"], doors_by_room["9a_a-00"], "Into the Core", "9a_a-00_west"),
+    "9a_a-01": Room("9a", "9a_a-01", "Core A - Room a-01", regions_by_room["9a_a-01"], doors_by_room["9a_a-01"]),
+    "9a_a-02": Room("9a", "9a_a-02", "Core A - Room a-02", regions_by_room["9a_a-02"], doors_by_room["9a_a-02"]),
+    "9a_a-03": Room("9a", "9a_a-03", "Core A - Room a-03", regions_by_room["9a_a-03"], doors_by_room["9a_a-03"]),
+    "9a_b-00": Room("9a", "9a_b-00", "Core A - Room b-00", regions_by_room["9a_b-00"], doors_by_room["9a_b-00"]),
+    "9a_b-01": Room("9a", "9a_b-01", "Core A - Room b-01", regions_by_room["9a_b-01"], doors_by_room["9a_b-01"]),
+    "9a_b-02": Room("9a", "9a_b-02", "Core A - Room b-02", regions_by_room["9a_b-02"], doors_by_room["9a_b-02"]),
+    "9a_b-03": Room("9a", "9a_b-03", "Core A - Room b-03", regions_by_room["9a_b-03"], doors_by_room["9a_b-03"]),
+    "9a_b-04": Room("9a", "9a_b-04", "Core A - Room b-04", regions_by_room["9a_b-04"], doors_by_room["9a_b-04"]),
+    "9a_b-05": Room("9a", "9a_b-05", "Core A - Room b-05", regions_by_room["9a_b-05"], doors_by_room["9a_b-05"]),
+    "9a_b-06": Room("9a", "9a_b-06", "Core A - Room b-06", regions_by_room["9a_b-06"], doors_by_room["9a_b-06"]),
+    "9a_b-07b": Room("9a", "9a_b-07b", "Core A - Room b-07b", regions_by_room["9a_b-07b"], doors_by_room["9a_b-07b"]),
+    "9a_b-07": Room("9a", "9a_b-07", "Core A - Room b-07", regions_by_room["9a_b-07"], doors_by_room["9a_b-07"]),
+    "9a_c-00": Room("9a", "9a_c-00", "Core A - Room c-00", regions_by_room["9a_c-00"], doors_by_room["9a_c-00"], "Hot and Cold", "9a_c-00_west"),
+    "9a_c-00b": Room("9a", "9a_c-00b", "Core A - Room c-00b", regions_by_room["9a_c-00b"], doors_by_room["9a_c-00b"]),
+    "9a_c-01": Room("9a", "9a_c-01", "Core A - Room c-01", regions_by_room["9a_c-01"], doors_by_room["9a_c-01"]),
+    "9a_c-02": Room("9a", "9a_c-02", "Core A - Room c-02", regions_by_room["9a_c-02"], doors_by_room["9a_c-02"]),
+    "9a_c-03": Room("9a", "9a_c-03", "Core A - Room c-03", regions_by_room["9a_c-03"], doors_by_room["9a_c-03"]),
+    "9a_c-03b": Room("9a", "9a_c-03b", "Core A - Room c-03b", regions_by_room["9a_c-03b"], doors_by_room["9a_c-03b"]),
+    "9a_c-04": Room("9a", "9a_c-04", "Core A - Room c-04", regions_by_room["9a_c-04"], doors_by_room["9a_c-04"]),
+    "9a_d-00": Room("9a", "9a_d-00", "Core A - Room d-00", regions_by_room["9a_d-00"], doors_by_room["9a_d-00"], "Heart of the Mountain", "9a_d-00_bottom"),
+    "9a_d-01": Room("9a", "9a_d-01", "Core A - Room d-01", regions_by_room["9a_d-01"], doors_by_room["9a_d-01"]),
+    "9a_d-02": Room("9a", "9a_d-02", "Core A - Room d-02", regions_by_room["9a_d-02"], doors_by_room["9a_d-02"]),
+    "9a_d-03": Room("9a", "9a_d-03", "Core A - Room d-03", regions_by_room["9a_d-03"], doors_by_room["9a_d-03"]),
+    "9a_d-04": Room("9a", "9a_d-04", "Core A - Room d-04", regions_by_room["9a_d-04"], doors_by_room["9a_d-04"]),
+    "9a_d-05": Room("9a", "9a_d-05", "Core A - Room d-05", regions_by_room["9a_d-05"], doors_by_room["9a_d-05"]),
+    "9a_d-06": Room("9a", "9a_d-06", "Core A - Room d-06", regions_by_room["9a_d-06"], doors_by_room["9a_d-06"]),
+    "9a_d-07": Room("9a", "9a_d-07", "Core A - Room d-07", regions_by_room["9a_d-07"], doors_by_room["9a_d-07"]),
+    "9a_d-08": Room("9a", "9a_d-08", "Core A - Room d-08", regions_by_room["9a_d-08"], doors_by_room["9a_d-08"]),
+    "9a_d-09": Room("9a", "9a_d-09", "Core A - Room d-09", regions_by_room["9a_d-09"], doors_by_room["9a_d-09"]),
+    "9a_d-10": Room("9a", "9a_d-10", "Core A - Room d-10", regions_by_room["9a_d-10"], doors_by_room["9a_d-10"]),
+    "9a_d-10b": Room("9a", "9a_d-10b", "Core A - Room d-10b", regions_by_room["9a_d-10b"], doors_by_room["9a_d-10b"]),
+    "9a_d-10c": Room("9a", "9a_d-10c", "Core A - Room d-10c", regions_by_room["9a_d-10c"], doors_by_room["9a_d-10c"]),
+    "9a_d-11": Room("9a", "9a_d-11", "Core A - Room d-11", regions_by_room["9a_d-11"], doors_by_room["9a_d-11"]),
+    "9a_space": Room("9a", "9a_space", "Core A - Room space", regions_by_room["9a_space"], doors_by_room["9a_space"]),
 
-    "9b_00": Room("9b", "9b_00", "Core B - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "9b_00"], [door for _, door in all_doors.items() if door.room_name == "9b_00"], "Start", "9b_00_east"),
-    "9b_01": Room("9b", "9b_01", "Core B - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "9b_01"], [door for _, door in all_doors.items() if door.room_name == "9b_01"]),
-    "9b_a-00": Room("9b", "9b_a-00", "Core B - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-00"], [door for _, door in all_doors.items() if door.room_name == "9b_a-00"], "Into the Core", "9b_a-00_west"),
-    "9b_a-01": Room("9b", "9b_a-01", "Core B - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-01"], [door for _, door in all_doors.items() if door.room_name == "9b_a-01"]),
-    "9b_a-02": Room("9b", "9b_a-02", "Core B - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-02"], [door for _, door in all_doors.items() if door.room_name == "9b_a-02"]),
-    "9b_a-03": Room("9b", "9b_a-03", "Core B - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-03"], [door for _, door in all_doors.items() if door.room_name == "9b_a-03"]),
-    "9b_a-04": Room("9b", "9b_a-04", "Core B - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-04"], [door for _, door in all_doors.items() if door.room_name == "9b_a-04"]),
-    "9b_a-05": Room("9b", "9b_a-05", "Core B - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "9b_a-05"], [door for _, door in all_doors.items() if door.room_name == "9b_a-05"]),
-    "9b_b-00": Room("9b", "9b_b-00", "Core B - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-00"], [door for _, door in all_doors.items() if door.room_name == "9b_b-00"], "Burning or Freezing", "9b_b-00_west"),
-    "9b_b-01": Room("9b", "9b_b-01", "Core B - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-01"], [door for _, door in all_doors.items() if door.room_name == "9b_b-01"]),
-    "9b_b-02": Room("9b", "9b_b-02", "Core B - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-02"], [door for _, door in all_doors.items() if door.room_name == "9b_b-02"]),
-    "9b_b-03": Room("9b", "9b_b-03", "Core B - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-03"], [door for _, door in all_doors.items() if door.room_name == "9b_b-03"]),
-    "9b_b-04": Room("9b", "9b_b-04", "Core B - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-04"], [door for _, door in all_doors.items() if door.room_name == "9b_b-04"]),
-    "9b_b-05": Room("9b", "9b_b-05", "Core B - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "9b_b-05"], [door for _, door in all_doors.items() if door.room_name == "9b_b-05"]),
-    "9b_c-01": Room("9b", "9b_c-01", "Core B - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-01"], [door for _, door in all_doors.items() if door.room_name == "9b_c-01"], "Heartbeat", "9b_c-01_bottom"),
-    "9b_c-02": Room("9b", "9b_c-02", "Core B - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-02"], [door for _, door in all_doors.items() if door.room_name == "9b_c-02"]),
-    "9b_c-03": Room("9b", "9b_c-03", "Core B - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-03"], [door for _, door in all_doors.items() if door.room_name == "9b_c-03"]),
-    "9b_c-04": Room("9b", "9b_c-04", "Core B - Room c-04", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-04"], [door for _, door in all_doors.items() if door.room_name == "9b_c-04"]),
-    "9b_c-05": Room("9b", "9b_c-05", "Core B - Room c-05", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-05"], [door for _, door in all_doors.items() if door.room_name == "9b_c-05"]),
-    "9b_c-06": Room("9b", "9b_c-06", "Core B - Room c-06", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-06"], [door for _, door in all_doors.items() if door.room_name == "9b_c-06"]),
-    "9b_c-08": Room("9b", "9b_c-08", "Core B - Room c-08", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-08"], [door for _, door in all_doors.items() if door.room_name == "9b_c-08"]),
-    "9b_c-07": Room("9b", "9b_c-07", "Core B - Room c-07", [reg for _, reg in all_regions.items() if reg.room_name == "9b_c-07"], [door for _, door in all_doors.items() if door.room_name == "9b_c-07"]),
-    "9b_space": Room("9b", "9b_space", "Core B - Room space", [reg for _, reg in all_regions.items() if reg.room_name == "9b_space"], [door for _, door in all_doors.items() if door.room_name == "9b_space"]),
+    "9b_00": Room("9b", "9b_00", "Core B - Room 00", regions_by_room["9b_00"], doors_by_room["9b_00"], "Start", "9b_00_east"),
+    "9b_01": Room("9b", "9b_01", "Core B - Room 01", regions_by_room["9b_01"], doors_by_room["9b_01"]),
+    "9b_a-00": Room("9b", "9b_a-00", "Core B - Room a-00", regions_by_room["9b_a-00"], doors_by_room["9b_a-00"], "Into the Core", "9b_a-00_west"),
+    "9b_a-01": Room("9b", "9b_a-01", "Core B - Room a-01", regions_by_room["9b_a-01"], doors_by_room["9b_a-01"]),
+    "9b_a-02": Room("9b", "9b_a-02", "Core B - Room a-02", regions_by_room["9b_a-02"], doors_by_room["9b_a-02"]),
+    "9b_a-03": Room("9b", "9b_a-03", "Core B - Room a-03", regions_by_room["9b_a-03"], doors_by_room["9b_a-03"]),
+    "9b_a-04": Room("9b", "9b_a-04", "Core B - Room a-04", regions_by_room["9b_a-04"], doors_by_room["9b_a-04"]),
+    "9b_a-05": Room("9b", "9b_a-05", "Core B - Room a-05", regions_by_room["9b_a-05"], doors_by_room["9b_a-05"]),
+    "9b_b-00": Room("9b", "9b_b-00", "Core B - Room b-00", regions_by_room["9b_b-00"], doors_by_room["9b_b-00"], "Burning or Freezing", "9b_b-00_west"),
+    "9b_b-01": Room("9b", "9b_b-01", "Core B - Room b-01", regions_by_room["9b_b-01"], doors_by_room["9b_b-01"]),
+    "9b_b-02": Room("9b", "9b_b-02", "Core B - Room b-02", regions_by_room["9b_b-02"], doors_by_room["9b_b-02"]),
+    "9b_b-03": Room("9b", "9b_b-03", "Core B - Room b-03", regions_by_room["9b_b-03"], doors_by_room["9b_b-03"]),
+    "9b_b-04": Room("9b", "9b_b-04", "Core B - Room b-04", regions_by_room["9b_b-04"], doors_by_room["9b_b-04"]),
+    "9b_b-05": Room("9b", "9b_b-05", "Core B - Room b-05", regions_by_room["9b_b-05"], doors_by_room["9b_b-05"]),
+    "9b_c-01": Room("9b", "9b_c-01", "Core B - Room c-01", regions_by_room["9b_c-01"], doors_by_room["9b_c-01"], "Heartbeat", "9b_c-01_bottom"),
+    "9b_c-02": Room("9b", "9b_c-02", "Core B - Room c-02", regions_by_room["9b_c-02"], doors_by_room["9b_c-02"]),
+    "9b_c-03": Room("9b", "9b_c-03", "Core B - Room c-03", regions_by_room["9b_c-03"], doors_by_room["9b_c-03"]),
+    "9b_c-04": Room("9b", "9b_c-04", "Core B - Room c-04", regions_by_room["9b_c-04"], doors_by_room["9b_c-04"]),
+    "9b_c-05": Room("9b", "9b_c-05", "Core B - Room c-05", regions_by_room["9b_c-05"], doors_by_room["9b_c-05"]),
+    "9b_c-06": Room("9b", "9b_c-06", "Core B - Room c-06", regions_by_room["9b_c-06"], doors_by_room["9b_c-06"]),
+    "9b_c-08": Room("9b", "9b_c-08", "Core B - Room c-08", regions_by_room["9b_c-08"], doors_by_room["9b_c-08"]),
+    "9b_c-07": Room("9b", "9b_c-07", "Core B - Room c-07", regions_by_room["9b_c-07"], doors_by_room["9b_c-07"]),
+    "9b_space": Room("9b", "9b_space", "Core B - Room space", regions_by_room["9b_space"], doors_by_room["9b_space"]),
 
-    "9c_intro": Room("9c", "9c_intro", "Core C - Room intro", [reg for _, reg in all_regions.items() if reg.room_name == "9c_intro"], [door for _, door in all_doors.items() if door.room_name == "9c_intro"], "Start", "9c_intro_west"),
-    "9c_00": Room("9c", "9c_00", "Core C - Room 00", [reg for _, reg in all_regions.items() if reg.room_name == "9c_00"], [door for _, door in all_doors.items() if door.room_name == "9c_00"]),
-    "9c_01": Room("9c", "9c_01", "Core C - Room 01", [reg for _, reg in all_regions.items() if reg.room_name == "9c_01"], [door for _, door in all_doors.items() if door.room_name == "9c_01"]),
-    "9c_02": Room("9c", "9c_02", "Core C - Room 02", [reg for _, reg in all_regions.items() if reg.room_name == "9c_02"], [door for _, door in all_doors.items() if door.room_name == "9c_02"]),
+    "9c_intro": Room("9c", "9c_intro", "Core C - Room intro", regions_by_room["9c_intro"], doors_by_room["9c_intro"], "Start", "9c_intro_west"),
+    "9c_00": Room("9c", "9c_00", "Core C - Room 00", regions_by_room["9c_00"], doors_by_room["9c_00"]),
+    "9c_01": Room("9c", "9c_01", "Core C - Room 01", regions_by_room["9c_01"], doors_by_room["9c_01"]),
+    "9c_02": Room("9c", "9c_02", "Core C - Room 02", regions_by_room["9c_02"], doors_by_room["9c_02"]),
 
-    "10a_intro-00-past": Room("10a", "10a_intro-00-past", "Farewell - Room intro-00-past", [reg for _, reg in all_regions.items() if reg.room_name == "10a_intro-00-past"], [door for _, door in all_doors.items() if door.room_name == "10a_intro-00-past"], "Start", "10a_intro-00-past_west"),
-    "10a_intro-01-future": Room("10a", "10a_intro-01-future", "Farewell - Room intro-01-future", [reg for _, reg in all_regions.items() if reg.room_name == "10a_intro-01-future"], [door for _, door in all_doors.items() if door.room_name == "10a_intro-01-future"]),
-    "10a_intro-02-launch": Room("10a", "10a_intro-02-launch", "Farewell - Room intro-02-launch", [reg for _, reg in all_regions.items() if reg.room_name == "10a_intro-02-launch"], [door for _, door in all_doors.items() if door.room_name == "10a_intro-02-launch"]),
-    "10a_intro-03-space": Room("10a", "10a_intro-03-space", "Farewell - Room intro-03-space", [reg for _, reg in all_regions.items() if reg.room_name == "10a_intro-03-space"], [door for _, door in all_doors.items() if door.room_name == "10a_intro-03-space"]),
-    "10a_a-00": Room("10a", "10a_a-00", "Farewell - Room a-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-00"], [door for _, door in all_doors.items() if door.room_name == "10a_a-00"], "Singular", "10a_a-00_west"),
-    "10a_a-01": Room("10a", "10a_a-01", "Farewell - Room a-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-01"], [door for _, door in all_doors.items() if door.room_name == "10a_a-01"]),
-    "10a_a-02": Room("10a", "10a_a-02", "Farewell - Room a-02", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-02"], [door for _, door in all_doors.items() if door.room_name == "10a_a-02"]),
-    "10a_a-03": Room("10a", "10a_a-03", "Farewell - Room a-03", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-03"], [door for _, door in all_doors.items() if door.room_name == "10a_a-03"]),
-    "10a_a-04": Room("10a", "10a_a-04", "Farewell - Room a-04", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-04"], [door for _, door in all_doors.items() if door.room_name == "10a_a-04"]),
-    "10a_a-05": Room("10a", "10a_a-05", "Farewell - Room a-05", [reg for _, reg in all_regions.items() if reg.room_name == "10a_a-05"], [door for _, door in all_doors.items() if door.room_name == "10a_a-05"]),
-    "10a_b-00": Room("10a", "10a_b-00", "Farewell - Room b-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-00"], [door for _, door in all_doors.items() if door.room_name == "10a_b-00"]),
-    "10a_b-01": Room("10a", "10a_b-01", "Farewell - Room b-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-01"], [door for _, door in all_doors.items() if door.room_name == "10a_b-01"]),
-    "10a_b-02": Room("10a", "10a_b-02", "Farewell - Room b-02", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-02"], [door for _, door in all_doors.items() if door.room_name == "10a_b-02"]),
-    "10a_b-03": Room("10a", "10a_b-03", "Farewell - Room b-03", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-03"], [door for _, door in all_doors.items() if door.room_name == "10a_b-03"]),
-    "10a_b-04": Room("10a", "10a_b-04", "Farewell - Room b-04", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-04"], [door for _, door in all_doors.items() if door.room_name == "10a_b-04"]),
-    "10a_b-05": Room("10a", "10a_b-05", "Farewell - Room b-05", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-05"], [door for _, door in all_doors.items() if door.room_name == "10a_b-05"]),
-    "10a_b-06": Room("10a", "10a_b-06", "Farewell - Room b-06", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-06"], [door for _, door in all_doors.items() if door.room_name == "10a_b-06"]),
-    "10a_b-07": Room("10a", "10a_b-07", "Farewell - Room b-07", [reg for _, reg in all_regions.items() if reg.room_name == "10a_b-07"], [door for _, door in all_doors.items() if door.room_name == "10a_b-07"]),
-    "10a_c-00": Room("10a", "10a_c-00", "Farewell - Room c-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-00"], [door for _, door in all_doors.items() if door.room_name == "10a_c-00"], "Power Source", "10a_c-00_west"),
-    "10a_c-00b": Room("10a", "10a_c-00b", "Farewell - Room c-00b", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-00b"], [door for _, door in all_doors.items() if door.room_name == "10a_c-00b"]),
-    "10a_c-01": Room("10a", "10a_c-01", "Farewell - Room c-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-01"], [door for _, door in all_doors.items() if door.room_name == "10a_c-01"]),
-    "10a_c-02": Room("10a", "10a_c-02", "Farewell - Room c-02", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-02"], [door for _, door in all_doors.items() if door.room_name == "10a_c-02"]),
-    "10a_c-alt-00": Room("10a", "10a_c-alt-00", "Farewell - Room c-alt-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-alt-00"], [door for _, door in all_doors.items() if door.room_name == "10a_c-alt-00"]),
-    "10a_c-alt-01": Room("10a", "10a_c-alt-01", "Farewell - Room c-alt-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-alt-01"], [door for _, door in all_doors.items() if door.room_name == "10a_c-alt-01"]),
-    "10a_c-03": Room("10a", "10a_c-03", "Farewell - Room c-03", [reg for _, reg in all_regions.items() if reg.room_name == "10a_c-03"], [door for _, door in all_doors.items() if door.room_name == "10a_c-03"]),
-    "10a_d-00": Room("10a", "10a_d-00", "Farewell - Room d-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-00"], [door for _, door in all_doors.items() if door.room_name == "10a_d-00"]),
-    "10a_d-04": Room("10a", "10a_d-04", "Farewell - Room d-04", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-04"], [door for _, door in all_doors.items() if door.room_name == "10a_d-04"]),
-    "10a_d-03": Room("10a", "10a_d-03", "Farewell - Room d-03", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-03"], [door for _, door in all_doors.items() if door.room_name == "10a_d-03"]),
-    "10a_d-01": Room("10a", "10a_d-01", "Farewell - Room d-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-01"], [door for _, door in all_doors.items() if door.room_name == "10a_d-01"]),
-    "10a_d-02": Room("10a", "10a_d-02", "Farewell - Room d-02", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-02"], [door for _, door in all_doors.items() if door.room_name == "10a_d-02"]),
-    "10a_d-05": Room("10a", "10a_d-05", "Farewell - Room d-05", [reg for _, reg in all_regions.items() if reg.room_name == "10a_d-05"], [door for _, door in all_doors.items() if door.room_name == "10a_d-05"]),
-    "10a_e-00y": Room("10a", "10a_e-00y", "Farewell - Room e-00y", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-00y"], [door for _, door in all_doors.items() if door.room_name == "10a_e-00y"]),
-    "10a_e-00yb": Room("10a", "10a_e-00yb", "Farewell - Room e-00yb", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-00yb"], [door for _, door in all_doors.items() if door.room_name == "10a_e-00yb"]),
-    "10a_e-00z": Room("10a", "10a_e-00z", "Farewell - Room e-00z", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-00z"], [door for _, door in all_doors.items() if door.room_name == "10a_e-00z"], "Remembered", "10a_e-00z_south"),
-    "10a_e-00": Room("10a", "10a_e-00", "Farewell - Room e-00", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-00"], [door for _, door in all_doors.items() if door.room_name == "10a_e-00"]),
-    "10a_e-00b": Room("10a", "10a_e-00b", "Farewell - Room e-00b", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-00b"], [door for _, door in all_doors.items() if door.room_name == "10a_e-00b"]),
-    "10a_e-01": Room("10a", "10a_e-01", "Farewell - Room e-01", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-01"], [door for _, door in all_doors.items() if door.room_name == "10a_e-01"]),
-    "10a_e-02": Room("10a", "10a_e-02", "Farewell - Room e-02", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-02"], [door for _, door in all_doors.items() if door.room_name == "10a_e-02"]),
-    "10a_e-03": Room("10a", "10a_e-03", "Farewell - Room e-03", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-03"], [door for _, door in all_doors.items() if door.room_name == "10a_e-03"]),
-    "10a_e-04": Room("10a", "10a_e-04", "Farewell - Room e-04", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-04"], [door for _, door in all_doors.items() if door.room_name == "10a_e-04"]),
-    "10a_e-05": Room("10a", "10a_e-05", "Farewell - Room e-05", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-05"], [door for _, door in all_doors.items() if door.room_name == "10a_e-05"]),
-    "10a_e-05b": Room("10a", "10a_e-05b", "Farewell - Room e-05b", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-05b"], [door for _, door in all_doors.items() if door.room_name == "10a_e-05b"]),
-    "10a_e-05c": Room("10a", "10a_e-05c", "Farewell - Room e-05c", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-05c"], [door for _, door in all_doors.items() if door.room_name == "10a_e-05c"]),
-    "10a_e-06": Room("10a", "10a_e-06", "Farewell - Room e-06", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-06"], [door for _, door in all_doors.items() if door.room_name == "10a_e-06"]),
-    "10a_e-07": Room("10a", "10a_e-07", "Farewell - Room e-07", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-07"], [door for _, door in all_doors.items() if door.room_name == "10a_e-07"]),
-    "10a_e-08": Room("10a", "10a_e-08", "Farewell - Room e-08", [reg for _, reg in all_regions.items() if reg.room_name == "10a_e-08"], [door for _, door in all_doors.items() if door.room_name == "10a_e-08"]),
+    "10a_intro-00-past": Room("10a", "10a_intro-00-past", "Farewell - Room intro-00-past", regions_by_room["10a_intro-00-past"], doors_by_room["10a_intro-00-past"], "Start", "10a_intro-00-past_west"),
+    "10a_intro-01-future": Room("10a", "10a_intro-01-future", "Farewell - Room intro-01-future", regions_by_room["10a_intro-01-future"], doors_by_room["10a_intro-01-future"]),
+    "10a_intro-02-launch": Room("10a", "10a_intro-02-launch", "Farewell - Room intro-02-launch", regions_by_room["10a_intro-02-launch"], doors_by_room["10a_intro-02-launch"]),
+    "10a_intro-03-space": Room("10a", "10a_intro-03-space", "Farewell - Room intro-03-space", regions_by_room["10a_intro-03-space"], doors_by_room["10a_intro-03-space"]),
+    "10a_a-00": Room("10a", "10a_a-00", "Farewell - Room a-00", regions_by_room["10a_a-00"], doors_by_room["10a_a-00"], "Singular", "10a_a-00_west"),
+    "10a_a-01": Room("10a", "10a_a-01", "Farewell - Room a-01", regions_by_room["10a_a-01"], doors_by_room["10a_a-01"]),
+    "10a_a-02": Room("10a", "10a_a-02", "Farewell - Room a-02", regions_by_room["10a_a-02"], doors_by_room["10a_a-02"]),
+    "10a_a-03": Room("10a", "10a_a-03", "Farewell - Room a-03", regions_by_room["10a_a-03"], doors_by_room["10a_a-03"]),
+    "10a_a-04": Room("10a", "10a_a-04", "Farewell - Room a-04", regions_by_room["10a_a-04"], doors_by_room["10a_a-04"]),
+    "10a_a-05": Room("10a", "10a_a-05", "Farewell - Room a-05", regions_by_room["10a_a-05"], doors_by_room["10a_a-05"]),
+    "10a_b-00": Room("10a", "10a_b-00", "Farewell - Room b-00", regions_by_room["10a_b-00"], doors_by_room["10a_b-00"]),
+    "10a_b-01": Room("10a", "10a_b-01", "Farewell - Room b-01", regions_by_room["10a_b-01"], doors_by_room["10a_b-01"]),
+    "10a_b-02": Room("10a", "10a_b-02", "Farewell - Room b-02", regions_by_room["10a_b-02"], doors_by_room["10a_b-02"]),
+    "10a_b-03": Room("10a", "10a_b-03", "Farewell - Room b-03", regions_by_room["10a_b-03"], doors_by_room["10a_b-03"]),
+    "10a_b-04": Room("10a", "10a_b-04", "Farewell - Room b-04", regions_by_room["10a_b-04"], doors_by_room["10a_b-04"]),
+    "10a_b-05": Room("10a", "10a_b-05", "Farewell - Room b-05", regions_by_room["10a_b-05"], doors_by_room["10a_b-05"]),
+    "10a_b-06": Room("10a", "10a_b-06", "Farewell - Room b-06", regions_by_room["10a_b-06"], doors_by_room["10a_b-06"]),
+    "10a_b-07": Room("10a", "10a_b-07", "Farewell - Room b-07", regions_by_room["10a_b-07"], doors_by_room["10a_b-07"]),
+    "10a_c-00": Room("10a", "10a_c-00", "Farewell - Room c-00", regions_by_room["10a_c-00"], doors_by_room["10a_c-00"], "Power Source", "10a_c-00_west"),
+    "10a_c-00b": Room("10a", "10a_c-00b", "Farewell - Room c-00b", regions_by_room["10a_c-00b"], doors_by_room["10a_c-00b"]),
+    "10a_c-01": Room("10a", "10a_c-01", "Farewell - Room c-01", regions_by_room["10a_c-01"], doors_by_room["10a_c-01"]),
+    "10a_c-02": Room("10a", "10a_c-02", "Farewell - Room c-02", regions_by_room["10a_c-02"], doors_by_room["10a_c-02"]),
+    "10a_c-alt-00": Room("10a", "10a_c-alt-00", "Farewell - Room c-alt-00", regions_by_room["10a_c-alt-00"], doors_by_room["10a_c-alt-00"]),
+    "10a_c-alt-01": Room("10a", "10a_c-alt-01", "Farewell - Room c-alt-01", regions_by_room["10a_c-alt-01"], doors_by_room["10a_c-alt-01"]),
+    "10a_c-03": Room("10a", "10a_c-03", "Farewell - Room c-03", regions_by_room["10a_c-03"], doors_by_room["10a_c-03"]),
+    "10a_d-00": Room("10a", "10a_d-00", "Farewell - Room d-00", regions_by_room["10a_d-00"], doors_by_room["10a_d-00"]),
+    "10a_d-04": Room("10a", "10a_d-04", "Farewell - Room d-04", regions_by_room["10a_d-04"], doors_by_room["10a_d-04"]),
+    "10a_d-03": Room("10a", "10a_d-03", "Farewell - Room d-03", regions_by_room["10a_d-03"], doors_by_room["10a_d-03"]),
+    "10a_d-01": Room("10a", "10a_d-01", "Farewell - Room d-01", regions_by_room["10a_d-01"], doors_by_room["10a_d-01"]),
+    "10a_d-02": Room("10a", "10a_d-02", "Farewell - Room d-02", regions_by_room["10a_d-02"], doors_by_room["10a_d-02"]),
+    "10a_d-05": Room("10a", "10a_d-05", "Farewell - Room d-05", regions_by_room["10a_d-05"], doors_by_room["10a_d-05"]),
+    "10a_e-00y": Room("10a", "10a_e-00y", "Farewell - Room e-00y", regions_by_room["10a_e-00y"], doors_by_room["10a_e-00y"]),
+    "10a_e-00yb": Room("10a", "10a_e-00yb", "Farewell - Room e-00yb", regions_by_room["10a_e-00yb"], doors_by_room["10a_e-00yb"]),
+    "10a_e-00z": Room("10a", "10a_e-00z", "Farewell - Room e-00z", regions_by_room["10a_e-00z"], doors_by_room["10a_e-00z"], "Remembered", "10a_e-00z_south"),
+    "10a_e-00": Room("10a", "10a_e-00", "Farewell - Room e-00", regions_by_room["10a_e-00"], doors_by_room["10a_e-00"]),
+    "10a_e-00b": Room("10a", "10a_e-00b", "Farewell - Room e-00b", regions_by_room["10a_e-00b"], doors_by_room["10a_e-00b"]),
+    "10a_e-01": Room("10a", "10a_e-01", "Farewell - Room e-01", regions_by_room["10a_e-01"], doors_by_room["10a_e-01"]),
+    "10a_e-02": Room("10a", "10a_e-02", "Farewell - Room e-02", regions_by_room["10a_e-02"], doors_by_room["10a_e-02"]),
+    "10a_e-03": Room("10a", "10a_e-03", "Farewell - Room e-03", regions_by_room["10a_e-03"], doors_by_room["10a_e-03"]),
+    "10a_e-04": Room("10a", "10a_e-04", "Farewell - Room e-04", regions_by_room["10a_e-04"], doors_by_room["10a_e-04"]),
+    "10a_e-05": Room("10a", "10a_e-05", "Farewell - Room e-05", regions_by_room["10a_e-05"], doors_by_room["10a_e-05"]),
+    "10a_e-05b": Room("10a", "10a_e-05b", "Farewell - Room e-05b", regions_by_room["10a_e-05b"], doors_by_room["10a_e-05b"]),
+    "10a_e-05c": Room("10a", "10a_e-05c", "Farewell - Room e-05c", regions_by_room["10a_e-05c"], doors_by_room["10a_e-05c"]),
+    "10a_e-06": Room("10a", "10a_e-06", "Farewell - Room e-06", regions_by_room["10a_e-06"], doors_by_room["10a_e-06"]),
+    "10a_e-07": Room("10a", "10a_e-07", "Farewell - Room e-07", regions_by_room["10a_e-07"], doors_by_room["10a_e-07"]),
+    "10a_e-08": Room("10a", "10a_e-08", "Farewell - Room e-08", regions_by_room["10a_e-08"], doors_by_room["10a_e-08"]),
 
-    "10b_f-door": Room("10b", "10b_f-door", "Farewell - Room f-door", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-door"], [door for _, door in all_doors.items() if door.room_name == "10b_f-door"], "Event Horizon", "10b_f-door_west"),
-    "10b_f-00": Room("10b", "10b_f-00", "Farewell - Room f-00", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-00"], [door for _, door in all_doors.items() if door.room_name == "10b_f-00"]),
-    "10b_f-01": Room("10b", "10b_f-01", "Farewell - Room f-01", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-01"], [door for _, door in all_doors.items() if door.room_name == "10b_f-01"]),
-    "10b_f-02": Room("10b", "10b_f-02", "Farewell - Room f-02", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-02"], [door for _, door in all_doors.items() if door.room_name == "10b_f-02"]),
-    "10b_f-03": Room("10b", "10b_f-03", "Farewell - Room f-03", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-03"], [door for _, door in all_doors.items() if door.room_name == "10b_f-03"]),
-    "10b_f-04": Room("10b", "10b_f-04", "Farewell - Room f-04", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-04"], [door for _, door in all_doors.items() if door.room_name == "10b_f-04"]),
-    "10b_f-05": Room("10b", "10b_f-05", "Farewell - Room f-05", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-05"], [door for _, door in all_doors.items() if door.room_name == "10b_f-05"]),
-    "10b_f-06": Room("10b", "10b_f-06", "Farewell - Room f-06", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-06"], [door for _, door in all_doors.items() if door.room_name == "10b_f-06"]),
-    "10b_f-07": Room("10b", "10b_f-07", "Farewell - Room f-07", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-07"], [door for _, door in all_doors.items() if door.room_name == "10b_f-07"]),
-    "10b_f-08": Room("10b", "10b_f-08", "Farewell - Room f-08", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-08"], [door for _, door in all_doors.items() if door.room_name == "10b_f-08"]),
-    "10b_f-09": Room("10b", "10b_f-09", "Farewell - Room f-09", [reg for _, reg in all_regions.items() if reg.room_name == "10b_f-09"], [door for _, door in all_doors.items() if door.room_name == "10b_f-09"]),
-    "10b_g-00": Room("10b", "10b_g-00", "Farewell - Room g-00", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-00"], [door for _, door in all_doors.items() if door.room_name == "10b_g-00"]),
-    "10b_g-01": Room("10b", "10b_g-01", "Farewell - Room g-01", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-01"], [door for _, door in all_doors.items() if door.room_name == "10b_g-01"]),
-    "10b_g-03": Room("10b", "10b_g-03", "Farewell - Room g-03", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-03"], [door for _, door in all_doors.items() if door.room_name == "10b_g-03"]),
-    "10b_g-02": Room("10b", "10b_g-02", "Farewell - Room g-02", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-02"], [door for _, door in all_doors.items() if door.room_name == "10b_g-02"]),
-    "10b_g-04": Room("10b", "10b_g-04", "Farewell - Room g-04", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-04"], [door for _, door in all_doors.items() if door.room_name == "10b_g-04"]),
-    "10b_g-05": Room("10b", "10b_g-05", "Farewell - Room g-05", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-05"], [door for _, door in all_doors.items() if door.room_name == "10b_g-05"]),
-    "10b_g-06": Room("10b", "10b_g-06", "Farewell - Room g-06", [reg for _, reg in all_regions.items() if reg.room_name == "10b_g-06"], [door for _, door in all_doors.items() if door.room_name == "10b_g-06"]),
-    "10b_h-00b": Room("10b", "10b_h-00b", "Farewell - Room h-00b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-00b"], [door for _, door in all_doors.items() if door.room_name == "10b_h-00b"], "Determination", "10b_h-00b_west"),
-    "10b_h-00": Room("10b", "10b_h-00", "Farewell - Room h-00", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-00"], [door for _, door in all_doors.items() if door.room_name == "10b_h-00"]),
-    "10b_h-01": Room("10b", "10b_h-01", "Farewell - Room h-01", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-01"], [door for _, door in all_doors.items() if door.room_name == "10b_h-01"]),
-    "10b_h-02": Room("10b", "10b_h-02", "Farewell - Room h-02", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-02"], [door for _, door in all_doors.items() if door.room_name == "10b_h-02"]),
-    "10b_h-03": Room("10b", "10b_h-03", "Farewell - Room h-03", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-03"], [door for _, door in all_doors.items() if door.room_name == "10b_h-03"]),
-    "10b_h-03b": Room("10b", "10b_h-03b", "Farewell - Room h-03b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-03b"], [door for _, door in all_doors.items() if door.room_name == "10b_h-03b"]),
-    "10b_h-04": Room("10b", "10b_h-04", "Farewell - Room h-04", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-04"], [door for _, door in all_doors.items() if door.room_name == "10b_h-04"]),
-    "10b_h-04b": Room("10b", "10b_h-04b", "Farewell - Room h-04b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-04b"], [door for _, door in all_doors.items() if door.room_name == "10b_h-04b"]),
-    "10b_h-05": Room("10b", "10b_h-05", "Farewell - Room h-05", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-05"], [door for _, door in all_doors.items() if door.room_name == "10b_h-05"]),
-    "10b_h-06": Room("10b", "10b_h-06", "Farewell - Room h-06", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-06"], [door for _, door in all_doors.items() if door.room_name == "10b_h-06"]),
-    "10b_h-06b": Room("10b", "10b_h-06b", "Farewell - Room h-06b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-06b"], [door for _, door in all_doors.items() if door.room_name == "10b_h-06b"]),
-    "10b_h-07": Room("10b", "10b_h-07", "Farewell - Room h-07", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-07"], [door for _, door in all_doors.items() if door.room_name == "10b_h-07"]),
-    "10b_h-08": Room("10b", "10b_h-08", "Farewell - Room h-08", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-08"], [door for _, door in all_doors.items() if door.room_name == "10b_h-08"]),
-    "10b_h-09": Room("10b", "10b_h-09", "Farewell - Room h-09", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-09"], [door for _, door in all_doors.items() if door.room_name == "10b_h-09"]),
-    "10b_h-10": Room("10b", "10b_h-10", "Farewell - Room h-10", [reg for _, reg in all_regions.items() if reg.room_name == "10b_h-10"], [door for _, door in all_doors.items() if door.room_name == "10b_h-10"]),
-    "10b_i-00": Room("10b", "10b_i-00", "Farewell - Room i-00", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-00"], [door for _, door in all_doors.items() if door.room_name == "10b_i-00"], "Stubbornness", "10b_i-00_west"),
-    "10b_i-00b": Room("10b", "10b_i-00b", "Farewell - Room i-00b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-00b"], [door for _, door in all_doors.items() if door.room_name == "10b_i-00b"]),
-    "10b_i-01": Room("10b", "10b_i-01", "Farewell - Room i-01", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-01"], [door for _, door in all_doors.items() if door.room_name == "10b_i-01"]),
-    "10b_i-02": Room("10b", "10b_i-02", "Farewell - Room i-02", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-02"], [door for _, door in all_doors.items() if door.room_name == "10b_i-02"]),
-    "10b_i-03": Room("10b", "10b_i-03", "Farewell - Room i-03", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-03"], [door for _, door in all_doors.items() if door.room_name == "10b_i-03"]),
-    "10b_i-04": Room("10b", "10b_i-04", "Farewell - Room i-04", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-04"], [door for _, door in all_doors.items() if door.room_name == "10b_i-04"]),
-    "10b_i-05": Room("10b", "10b_i-05", "Farewell - Room i-05", [reg for _, reg in all_regions.items() if reg.room_name == "10b_i-05"], [door for _, door in all_doors.items() if door.room_name == "10b_i-05"]),
-    "10b_j-00": Room("10b", "10b_j-00", "Farewell - Room j-00", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-00"], [door for _, door in all_doors.items() if door.room_name == "10b_j-00"], "Reconciliation", "10b_j-00_west"),
-    "10b_j-00b": Room("10b", "10b_j-00b", "Farewell - Room j-00b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-00b"], [door for _, door in all_doors.items() if door.room_name == "10b_j-00b"]),
-    "10b_j-01": Room("10b", "10b_j-01", "Farewell - Room j-01", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-01"], [door for _, door in all_doors.items() if door.room_name == "10b_j-01"]),
-    "10b_j-02": Room("10b", "10b_j-02", "Farewell - Room j-02", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-02"], [door for _, door in all_doors.items() if door.room_name == "10b_j-02"]),
-    "10b_j-03": Room("10b", "10b_j-03", "Farewell - Room j-03", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-03"], [door for _, door in all_doors.items() if door.room_name == "10b_j-03"]),
-    "10b_j-04": Room("10b", "10b_j-04", "Farewell - Room j-04", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-04"], [door for _, door in all_doors.items() if door.room_name == "10b_j-04"]),
-    "10b_j-05": Room("10b", "10b_j-05", "Farewell - Room j-05", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-05"], [door for _, door in all_doors.items() if door.room_name == "10b_j-05"]),
-    "10b_j-06": Room("10b", "10b_j-06", "Farewell - Room j-06", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-06"], [door for _, door in all_doors.items() if door.room_name == "10b_j-06"]),
-    "10b_j-07": Room("10b", "10b_j-07", "Farewell - Room j-07", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-07"], [door for _, door in all_doors.items() if door.room_name == "10b_j-07"]),
-    "10b_j-08": Room("10b", "10b_j-08", "Farewell - Room j-08", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-08"], [door for _, door in all_doors.items() if door.room_name == "10b_j-08"]),
-    "10b_j-09": Room("10b", "10b_j-09", "Farewell - Room j-09", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-09"], [door for _, door in all_doors.items() if door.room_name == "10b_j-09"]),
-    "10b_j-10": Room("10b", "10b_j-10", "Farewell - Room j-10", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-10"], [door for _, door in all_doors.items() if door.room_name == "10b_j-10"]),
-    "10b_j-11": Room("10b", "10b_j-11", "Farewell - Room j-11", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-11"], [door for _, door in all_doors.items() if door.room_name == "10b_j-11"]),
-    "10b_j-12": Room("10b", "10b_j-12", "Farewell - Room j-12", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-12"], [door for _, door in all_doors.items() if door.room_name == "10b_j-12"]),
-    "10b_j-13": Room("10b", "10b_j-13", "Farewell - Room j-13", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-13"], [door for _, door in all_doors.items() if door.room_name == "10b_j-13"]),
-    "10b_j-14": Room("10b", "10b_j-14", "Farewell - Room j-14", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-14"], [door for _, door in all_doors.items() if door.room_name == "10b_j-14"]),
-    "10b_j-14b": Room("10b", "10b_j-14b", "Farewell - Room j-14b", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-14b"], [door for _, door in all_doors.items() if door.room_name == "10b_j-14b"]),
-    "10b_j-15": Room("10b", "10b_j-15", "Farewell - Room j-15", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-15"], [door for _, door in all_doors.items() if door.room_name == "10b_j-15"]),
-    "10b_j-16": Room("10b", "10b_j-16", "Farewell - Room j-16", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-16"], [door for _, door in all_doors.items() if door.room_name == "10b_j-16"], "Farewell", "10b_j-16_west"),
-    "10b_j-17": Room("10b", "10b_j-17", "Farewell - Room j-17", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-17"], [door for _, door in all_doors.items() if door.room_name == "10b_j-17"]),
-    "10b_j-18": Room("10b", "10b_j-18", "Farewell - Room j-18", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-18"], [door for _, door in all_doors.items() if door.room_name == "10b_j-18"]),
-    "10b_j-19": Room("10b", "10b_j-19", "Farewell - Room j-19", [reg for _, reg in all_regions.items() if reg.room_name == "10b_j-19"], [door for _, door in all_doors.items() if door.room_name == "10b_j-19"]),
-    "10b_GOAL": Room("10b", "10b_GOAL", "Farewell - Room GOAL", [reg for _, reg in all_regions.items() if reg.room_name == "10b_GOAL"], [door for _, door in all_doors.items() if door.room_name == "10b_GOAL"]),
+    "10b_f-door": Room("10b", "10b_f-door", "Farewell - Room f-door", regions_by_room["10b_f-door"], doors_by_room["10b_f-door"], "Event Horizon", "10b_f-door_west"),
+    "10b_f-00": Room("10b", "10b_f-00", "Farewell - Room f-00", regions_by_room["10b_f-00"], doors_by_room["10b_f-00"]),
+    "10b_f-01": Room("10b", "10b_f-01", "Farewell - Room f-01", regions_by_room["10b_f-01"], doors_by_room["10b_f-01"]),
+    "10b_f-02": Room("10b", "10b_f-02", "Farewell - Room f-02", regions_by_room["10b_f-02"], doors_by_room["10b_f-02"]),
+    "10b_f-03": Room("10b", "10b_f-03", "Farewell - Room f-03", regions_by_room["10b_f-03"], doors_by_room["10b_f-03"]),
+    "10b_f-04": Room("10b", "10b_f-04", "Farewell - Room f-04", regions_by_room["10b_f-04"], doors_by_room["10b_f-04"]),
+    "10b_f-05": Room("10b", "10b_f-05", "Farewell - Room f-05", regions_by_room["10b_f-05"], doors_by_room["10b_f-05"]),
+    "10b_f-06": Room("10b", "10b_f-06", "Farewell - Room f-06", regions_by_room["10b_f-06"], doors_by_room["10b_f-06"]),
+    "10b_f-07": Room("10b", "10b_f-07", "Farewell - Room f-07", regions_by_room["10b_f-07"], doors_by_room["10b_f-07"]),
+    "10b_f-08": Room("10b", "10b_f-08", "Farewell - Room f-08", regions_by_room["10b_f-08"], doors_by_room["10b_f-08"]),
+    "10b_f-09": Room("10b", "10b_f-09", "Farewell - Room f-09", regions_by_room["10b_f-09"], doors_by_room["10b_f-09"]),
+    "10b_g-00": Room("10b", "10b_g-00", "Farewell - Room g-00", regions_by_room["10b_g-00"], doors_by_room["10b_g-00"]),
+    "10b_g-01": Room("10b", "10b_g-01", "Farewell - Room g-01", regions_by_room["10b_g-01"], doors_by_room["10b_g-01"]),
+    "10b_g-03": Room("10b", "10b_g-03", "Farewell - Room g-03", regions_by_room["10b_g-03"], doors_by_room["10b_g-03"]),
+    "10b_g-02": Room("10b", "10b_g-02", "Farewell - Room g-02", regions_by_room["10b_g-02"], doors_by_room["10b_g-02"]),
+    "10b_g-04": Room("10b", "10b_g-04", "Farewell - Room g-04", regions_by_room["10b_g-04"], doors_by_room["10b_g-04"]),
+    "10b_g-05": Room("10b", "10b_g-05", "Farewell - Room g-05", regions_by_room["10b_g-05"], doors_by_room["10b_g-05"]),
+    "10b_g-06": Room("10b", "10b_g-06", "Farewell - Room g-06", regions_by_room["10b_g-06"], doors_by_room["10b_g-06"]),
+    "10b_h-00b": Room("10b", "10b_h-00b", "Farewell - Room h-00b", regions_by_room["10b_h-00b"], doors_by_room["10b_h-00b"], "Determination", "10b_h-00b_west"),
+    "10b_h-00": Room("10b", "10b_h-00", "Farewell - Room h-00", regions_by_room["10b_h-00"], doors_by_room["10b_h-00"]),
+    "10b_h-01": Room("10b", "10b_h-01", "Farewell - Room h-01", regions_by_room["10b_h-01"], doors_by_room["10b_h-01"]),
+    "10b_h-02": Room("10b", "10b_h-02", "Farewell - Room h-02", regions_by_room["10b_h-02"], doors_by_room["10b_h-02"]),
+    "10b_h-03": Room("10b", "10b_h-03", "Farewell - Room h-03", regions_by_room["10b_h-03"], doors_by_room["10b_h-03"]),
+    "10b_h-03b": Room("10b", "10b_h-03b", "Farewell - Room h-03b", regions_by_room["10b_h-03b"], doors_by_room["10b_h-03b"]),
+    "10b_h-04": Room("10b", "10b_h-04", "Farewell - Room h-04", regions_by_room["10b_h-04"], doors_by_room["10b_h-04"]),
+    "10b_h-04b": Room("10b", "10b_h-04b", "Farewell - Room h-04b", regions_by_room["10b_h-04b"], doors_by_room["10b_h-04b"]),
+    "10b_h-05": Room("10b", "10b_h-05", "Farewell - Room h-05", regions_by_room["10b_h-05"], doors_by_room["10b_h-05"]),
+    "10b_h-06": Room("10b", "10b_h-06", "Farewell - Room h-06", regions_by_room["10b_h-06"], doors_by_room["10b_h-06"]),
+    "10b_h-06b": Room("10b", "10b_h-06b", "Farewell - Room h-06b", regions_by_room["10b_h-06b"], doors_by_room["10b_h-06b"]),
+    "10b_h-07": Room("10b", "10b_h-07", "Farewell - Room h-07", regions_by_room["10b_h-07"], doors_by_room["10b_h-07"]),
+    "10b_h-08": Room("10b", "10b_h-08", "Farewell - Room h-08", regions_by_room["10b_h-08"], doors_by_room["10b_h-08"]),
+    "10b_h-09": Room("10b", "10b_h-09", "Farewell - Room h-09", regions_by_room["10b_h-09"], doors_by_room["10b_h-09"]),
+    "10b_h-10": Room("10b", "10b_h-10", "Farewell - Room h-10", regions_by_room["10b_h-10"], doors_by_room["10b_h-10"]),
+    "10b_i-00": Room("10b", "10b_i-00", "Farewell - Room i-00", regions_by_room["10b_i-00"], doors_by_room["10b_i-00"], "Stubbornness", "10b_i-00_west"),
+    "10b_i-00b": Room("10b", "10b_i-00b", "Farewell - Room i-00b", regions_by_room["10b_i-00b"], doors_by_room["10b_i-00b"]),
+    "10b_i-01": Room("10b", "10b_i-01", "Farewell - Room i-01", regions_by_room["10b_i-01"], doors_by_room["10b_i-01"]),
+    "10b_i-02": Room("10b", "10b_i-02", "Farewell - Room i-02", regions_by_room["10b_i-02"], doors_by_room["10b_i-02"]),
+    "10b_i-03": Room("10b", "10b_i-03", "Farewell - Room i-03", regions_by_room["10b_i-03"], doors_by_room["10b_i-03"]),
+    "10b_i-04": Room("10b", "10b_i-04", "Farewell - Room i-04", regions_by_room["10b_i-04"], doors_by_room["10b_i-04"]),
+    "10b_i-05": Room("10b", "10b_i-05", "Farewell - Room i-05", regions_by_room["10b_i-05"], doors_by_room["10b_i-05"]),
+    "10b_j-00": Room("10b", "10b_j-00", "Farewell - Room j-00", regions_by_room["10b_j-00"], doors_by_room["10b_j-00"], "Reconciliation", "10b_j-00_west"),
+    "10b_j-00b": Room("10b", "10b_j-00b", "Farewell - Room j-00b", regions_by_room["10b_j-00b"], doors_by_room["10b_j-00b"]),
+    "10b_j-01": Room("10b", "10b_j-01", "Farewell - Room j-01", regions_by_room["10b_j-01"], doors_by_room["10b_j-01"]),
+    "10b_j-02": Room("10b", "10b_j-02", "Farewell - Room j-02", regions_by_room["10b_j-02"], doors_by_room["10b_j-02"]),
+    "10b_j-03": Room("10b", "10b_j-03", "Farewell - Room j-03", regions_by_room["10b_j-03"], doors_by_room["10b_j-03"]),
+    "10b_j-04": Room("10b", "10b_j-04", "Farewell - Room j-04", regions_by_room["10b_j-04"], doors_by_room["10b_j-04"]),
+    "10b_j-05": Room("10b", "10b_j-05", "Farewell - Room j-05", regions_by_room["10b_j-05"], doors_by_room["10b_j-05"]),
+    "10b_j-06": Room("10b", "10b_j-06", "Farewell - Room j-06", regions_by_room["10b_j-06"], doors_by_room["10b_j-06"]),
+    "10b_j-07": Room("10b", "10b_j-07", "Farewell - Room j-07", regions_by_room["10b_j-07"], doors_by_room["10b_j-07"]),
+    "10b_j-08": Room("10b", "10b_j-08", "Farewell - Room j-08", regions_by_room["10b_j-08"], doors_by_room["10b_j-08"]),
+    "10b_j-09": Room("10b", "10b_j-09", "Farewell - Room j-09", regions_by_room["10b_j-09"], doors_by_room["10b_j-09"]),
+    "10b_j-10": Room("10b", "10b_j-10", "Farewell - Room j-10", regions_by_room["10b_j-10"], doors_by_room["10b_j-10"]),
+    "10b_j-11": Room("10b", "10b_j-11", "Farewell - Room j-11", regions_by_room["10b_j-11"], doors_by_room["10b_j-11"]),
+    "10b_j-12": Room("10b", "10b_j-12", "Farewell - Room j-12", regions_by_room["10b_j-12"], doors_by_room["10b_j-12"]),
+    "10b_j-13": Room("10b", "10b_j-13", "Farewell - Room j-13", regions_by_room["10b_j-13"], doors_by_room["10b_j-13"]),
+    "10b_j-14": Room("10b", "10b_j-14", "Farewell - Room j-14", regions_by_room["10b_j-14"], doors_by_room["10b_j-14"]),
+    "10b_j-14b": Room("10b", "10b_j-14b", "Farewell - Room j-14b", regions_by_room["10b_j-14b"], doors_by_room["10b_j-14b"]),
+    "10b_j-15": Room("10b", "10b_j-15", "Farewell - Room j-15", regions_by_room["10b_j-15"], doors_by_room["10b_j-15"]),
+    "10b_j-16": Room("10b", "10b_j-16", "Farewell - Room j-16", regions_by_room["10b_j-16"], doors_by_room["10b_j-16"], "Farewell", "10b_j-16_west"),
+    "10b_j-17": Room("10b", "10b_j-17", "Farewell - Room j-17", regions_by_room["10b_j-17"], doors_by_room["10b_j-17"]),
+    "10b_j-18": Room("10b", "10b_j-18", "Farewell - Room j-18", regions_by_room["10b_j-18"], doors_by_room["10b_j-18"]),
+    "10b_j-19": Room("10b", "10b_j-19", "Farewell - Room j-19", regions_by_room["10b_j-19"], doors_by_room["10b_j-19"]),
+    "10b_GOAL": Room("10b", "10b_GOAL", "Farewell - Room GOAL", regions_by_room["10b_GOAL"], doors_by_room["10b_GOAL"]),
 
-    "10c_end-golden": Room("10c", "10c_end-golden", "Farewell - Room end-golden", [reg for _, reg in all_regions.items() if reg.room_name == "10c_end-golden"], [door for _, door in all_doors.items() if door.room_name == "10c_end-golden"]),
+    "10c_end-golden": Room("10c", "10c_end-golden", "Farewell - Room end-golden", regions_by_room["10c_end-golden"], doors_by_room["10c_end-golden"]),
 
 }
 
+rooms_by_level: defaultdict[str, list[Room]] = defaultdict(lambda: [])
+room_cons_by_level: defaultdict[str, list[RoomConnection]] = defaultdict(lambda: [])
+
+for _, room in all_rooms.items():
+    rooms_by_level[room.level_name].append(room)
+
+for _, room_con in all_room_connections.items():
+    room_cons_by_level[room_con.level_name].append(room_con)
+
 all_levels: dict[str, Level] = {
-    "0a": Level("0a", "Prologue", [room for _, room in all_rooms.items() if room.level_name == "0a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "0a"]),
-    "1a": Level("1a", "Forsaken City A", [room for _, room in all_rooms.items() if room.level_name == "1a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "1a"]),
-    "1b": Level("1b", "Forsaken City B", [room for _, room in all_rooms.items() if room.level_name == "1b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "1b"]),
-    "1c": Level("1c", "Forsaken City C", [room for _, room in all_rooms.items() if room.level_name == "1c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "1c"]),
-    "2a": Level("2a", "Old Site A", [room for _, room in all_rooms.items() if room.level_name == "2a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "2a"]),
-    "2b": Level("2b", "Old Site B", [room for _, room in all_rooms.items() if room.level_name == "2b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "2b"]),
-    "2c": Level("2c", "Old Site C", [room for _, room in all_rooms.items() if room.level_name == "2c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "2c"]),
-    "3a": Level("3a", "Celestial Resort A", [room for _, room in all_rooms.items() if room.level_name == "3a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "3a"]),
-    "3b": Level("3b", "Celestial Resort B", [room for _, room in all_rooms.items() if room.level_name == "3b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "3b"]),
-    "3c": Level("3c", "Celestial Resort C", [room for _, room in all_rooms.items() if room.level_name == "3c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "3c"]),
-    "4a": Level("4a", "Golden Ridge A", [room for _, room in all_rooms.items() if room.level_name == "4a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "4a"]),
-    "4b": Level("4b", "Golden Ridge B", [room for _, room in all_rooms.items() if room.level_name == "4b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "4b"]),
-    "4c": Level("4c", "Golden Ridge C", [room for _, room in all_rooms.items() if room.level_name == "4c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "4c"]),
-    "5a": Level("5a", "Mirror Temple A", [room for _, room in all_rooms.items() if room.level_name == "5a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "5a"]),
-    "5b": Level("5b", "Mirror Temple B", [room for _, room in all_rooms.items() if room.level_name == "5b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "5b"]),
-    "5c": Level("5c", "Mirror Temple C", [room for _, room in all_rooms.items() if room.level_name == "5c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "5c"]),
-    "6a": Level("6a", "Reflection A", [room for _, room in all_rooms.items() if room.level_name == "6a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "6a"]),
-    "6b": Level("6b", "Reflection B", [room for _, room in all_rooms.items() if room.level_name == "6b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "6b"]),
-    "6c": Level("6c", "Reflection C", [room for _, room in all_rooms.items() if room.level_name == "6c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "6c"]),
-    "7a": Level("7a", "The Summit A", [room for _, room in all_rooms.items() if room.level_name == "7a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "7a"]),
-    "7b": Level("7b", "The Summit B", [room for _, room in all_rooms.items() if room.level_name == "7b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "7b"]),
-    "7c": Level("7c", "The Summit C", [room for _, room in all_rooms.items() if room.level_name == "7c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "7c"]),
-    "8a": Level("8a", "Epilogue", [room for _, room in all_rooms.items() if room.level_name == "8a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "8a"]),
-    "9a": Level("9a", "Core A", [room for _, room in all_rooms.items() if room.level_name == "9a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "9a"]),
-    "9b": Level("9b", "Core B", [room for _, room in all_rooms.items() if room.level_name == "9b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "9b"]),
-    "9c": Level("9c", "Core C", [room for _, room in all_rooms.items() if room.level_name == "9c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "9c"]),
-    "10a": Level("10a", "Farewell", [room for _, room in all_rooms.items() if room.level_name == "10a"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "10a"]),
-    "10b": Level("10b", "Farewell", [room for _, room in all_rooms.items() if room.level_name == "10b"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "10b"]),
-    "10c": Level("10c", "Farewell", [room for _, room in all_rooms.items() if room.level_name == "10c"], [room_con for _, room_con in all_room_connections.items() if room_con.level_name == "10c"]),
+    "0a": Level("0a", "Prologue", rooms_by_level["0a"], room_cons_by_level["0a"]),
+    "1a": Level("1a", "Forsaken City A", rooms_by_level["1a"], room_cons_by_level["1a"]),
+    "1b": Level("1b", "Forsaken City B", rooms_by_level["1b"], room_cons_by_level["1b"]),
+    "1c": Level("1c", "Forsaken City C", rooms_by_level["1c"], room_cons_by_level["1c"]),
+    "2a": Level("2a", "Old Site A", rooms_by_level["2a"], room_cons_by_level["2a"]),
+    "2b": Level("2b", "Old Site B", rooms_by_level["2b"], room_cons_by_level["2b"]),
+    "2c": Level("2c", "Old Site C", rooms_by_level["2c"], room_cons_by_level["2c"]),
+    "3a": Level("3a", "Celestial Resort A", rooms_by_level["3a"], room_cons_by_level["3a"]),
+    "3b": Level("3b", "Celestial Resort B", rooms_by_level["3b"], room_cons_by_level["3b"]),
+    "3c": Level("3c", "Celestial Resort C", rooms_by_level["3c"], room_cons_by_level["3c"]),
+    "4a": Level("4a", "Golden Ridge A", rooms_by_level["4a"], room_cons_by_level["4a"]),
+    "4b": Level("4b", "Golden Ridge B", rooms_by_level["4b"], room_cons_by_level["4b"]),
+    "4c": Level("4c", "Golden Ridge C", rooms_by_level["4c"], room_cons_by_level["4c"]),
+    "5a": Level("5a", "Mirror Temple A", rooms_by_level["5a"], room_cons_by_level["5a"]),
+    "5b": Level("5b", "Mirror Temple B", rooms_by_level["5b"], room_cons_by_level["5b"]),
+    "5c": Level("5c", "Mirror Temple C", rooms_by_level["5c"], room_cons_by_level["5c"]),
+    "6a": Level("6a", "Reflection A", rooms_by_level["6a"], room_cons_by_level["6a"]),
+    "6b": Level("6b", "Reflection B", rooms_by_level["6b"], room_cons_by_level["6b"]),
+    "6c": Level("6c", "Reflection C", rooms_by_level["6c"], room_cons_by_level["6c"]),
+    "7a": Level("7a", "The Summit A", rooms_by_level["7a"], room_cons_by_level["7a"]),
+    "7b": Level("7b", "The Summit B", rooms_by_level["7b"], room_cons_by_level["7b"]),
+    "7c": Level("7c", "The Summit C", rooms_by_level["7c"], room_cons_by_level["7c"]),
+    "8a": Level("8a", "Epilogue", rooms_by_level["8a"], room_cons_by_level["8a"]),
+    "9a": Level("9a", "Core A", rooms_by_level["9a"], room_cons_by_level["9a"]),
+    "9b": Level("9b", "Core B", rooms_by_level["9b"], room_cons_by_level["9b"]),
+    "9c": Level("9c", "Core C", rooms_by_level["9c"], room_cons_by_level["9c"]),
+    "10a": Level("10a", "Farewell", rooms_by_level["10a"], room_cons_by_level["10a"]),
+    "10b": Level("10b", "Farewell", rooms_by_level["10b"], room_cons_by_level["10b"]),
+    "10c": Level("10c", "Farewell", rooms_by_level["10c"], room_cons_by_level["10c"]),
 
 }
 
diff --git a/worlds/celeste_open_world/data/ParseData.py b/worlds/celeste_open_world/data/ParseData.py
index b9f8f47267..c75ddfefc3 100644
--- a/worlds/celeste_open_world/data/ParseData.py
+++ b/worlds/celeste_open_world/data/ParseData.py
@@ -18,8 +18,8 @@ if __name__ == "__main__":
     for level in level_data["levels"]:
         level_str = (f"    \"{level['name']}\": Level(\"{level['name']}\", "
                      f"\"{level['display_name']}\", "
-                     f"[room for _, room in all_rooms.items() if room.level_name == \"{level['name']}\"], "
-                     f"[room_con for _, room_con in all_room_connections.items() if room_con.level_name == \"{level['name']}\"]),"
+                     f"rooms_by_level[\"{level['name']}\"], "
+                     f"room_cons_by_level[\"{level['name']}\"]),"
                     )
 
         all_levels.append(level_str)
@@ -31,8 +31,8 @@ if __name__ == "__main__":
 
             room_str = (f"    \"{room_full_name}\": Room(\"{level['name']}\", "
                          f"\"{room_full_name}\", \"{room_full_display_name}\", "
-                         f"[reg for _, reg in all_regions.items() if reg.room_name == \"{room_full_name}\"], "
-                         f"[door for _, door in all_doors.items() if door.room_name == \"{room_full_name}\"]"
+                         f"regions_by_room[\"{room_full_name}\"], "
+                         f"doors_by_room[\"{room_full_name}\"]"
                         )
 
             if "checkpoint" in room and room["checkpoint"] != "":
@@ -47,8 +47,8 @@ if __name__ == "__main__":
 
                 region_str = (f"    \"{region_full_name}\": PreRegion(\"{region_full_name}\", "
                               f"\"{room_full_name}\", "
-                              f"[reg_con for _, reg_con in all_region_connections.items() if reg_con.source_name == \"{region_full_name}\"], "
-                              f"[loc for _, loc in all_locations.items() if loc.region_name == \"{region_full_name}\"]),"
+                              f"connections_by_region[\"{region_full_name}\"], "
+                              f"locations_by_region[\"{region_full_name}\"]),"
                              )
 
                 all_regions.append(region_str)
@@ -150,6 +150,7 @@ if __name__ == "__main__":
     print("")
     print("from ..Levels import Level, Room, PreRegion, LevelLocation, RegionConnection, RoomConnection, Door, DoorDirection, LocationType")
     print("from ..Names import ItemName")
+    print(f"from collections import defaultdict")
     print("")
     print("all_doors: dict[str, Door] = {")
     for line in all_doors:
@@ -166,6 +167,15 @@ if __name__ == "__main__":
         print(line)
     print("}")
     print("")
+    print("connections_by_region: defaultdict[str, list[RegionConnection]] = defaultdict(lambda: [])")
+    print("locations_by_region: defaultdict[str, list[LevelLocation]] = defaultdict(lambda: [])")
+    print("")
+    print("for _, connection in all_region_connections.items():")
+    print("    connections_by_region[connection.source_name].append(connection)")
+    print("")
+    print("for _, location in all_locations.items():")
+    print("    locations_by_region[location.region_name].append(location)")
+    print("")
     print("all_regions: dict[str, PreRegion] = {")
     for line in all_regions:
         print(line)
@@ -176,11 +186,29 @@ if __name__ == "__main__":
         print(line)
     print("}")
     print("")
+    print("regions_by_room: defaultdict[str, list[PreRegion]] = defaultdict(lambda: [])")
+    print("doors_by_room: defaultdict[str, list[Door]] = defaultdict(lambda: [])")
+    print("")
+    print("for _, region in all_regions.items():")
+    print("    regions_by_room[region.room_name].append(region)")
+    print("")
+    print("for _, door in all_doors.items():")
+    print("    doors_by_room[door.room_name].append(door)")
+    print("")
     print("all_rooms: dict[str, Room] = {")
     for line in all_rooms:
         print(line)
     print("}")
     print("")
+    print("rooms_by_level: defaultdict[str, list[Room]] = defaultdict(lambda: [])")
+    print("room_cons_by_level: defaultdict[str, list[RoomConnection]] = defaultdict(lambda: [])")
+    print("")
+    print("for _, room in all_rooms.items():")
+    print("    rooms_by_level[room.level_name].append(room)")
+    print("")
+    print("for _, room_con in all_room_connections.items():")
+    print("    room_cons_by_level[room_con.level_name].append(room_con)")
+    print("")
     print("all_levels: dict[str, Level] = {")
     for line in all_levels:
         print(line)
diff --git a/worlds/celeste_open_world/docs/en_Celeste (Open World).md b/worlds/celeste_open_world/docs/en_Celeste (Open World).md
index c27c4d6480..6330bd9bff 100644
--- a/worlds/celeste_open_world/docs/en_Celeste (Open World).md	
+++ b/worlds/celeste_open_world/docs/en_Celeste (Open World).md	
@@ -95,4 +95,4 @@ Additionally, the following locations can optionally be included in the Location
 
 ## How can I get started?
 
-To get started playing Celeste (Open World) in Archipelago, [go to the setup guide for this game](../../../tutorial/Celeste%20(Open%20World)/guide/en)
+To get started playing Celeste (Open World) in Archipelago, [go to the setup guide for this game](/tutorial/Celeste%20%28Open%20World%29/guide_en)
diff --git a/worlds/civ_6/Container.py b/worlds/civ_6/Container.py
index a5790c1ec4..433145f42f 100644
--- a/worlds/civ_6/Container.py
+++ b/worlds/civ_6/Container.py
@@ -44,9 +44,10 @@ class CivVIContainer(APPlayerContainer):
             opened_zipfile.writestr(filename, yml)
         super().write_contents(opened_zipfile)
 
+
 def sanitize_value(value: str) -> str:
-  """Removes values that can cause issues in XML"""
-  return value.replace('"', "'").replace('&', 'and')
+    """Removes values that can cause issues in XML"""
+    return value.replace('"', "'").replace('&', 'and').replace('{', '').replace('}', '')
 
 
 def get_cost(world: 'CivVIWorld', location: CivVILocationData) -> int:
@@ -87,8 +88,10 @@ def generate_new_items(world: 'CivVIWorld') -> str:
     boost_civics = []
 
     if world.options.boostsanity:
-        boost_techs = [location for location in locations if location.location_type == CivVICheckType.BOOST and location.name.split("_")[1] == "TECH"]
-        boost_civics = [location for location in locations if location.location_type == CivVICheckType.BOOST and location.name.split("_")[1] == "CIVIC"]
+        boost_techs = [location for location in locations if location.location_type ==
+                       CivVICheckType.BOOST and location.name.split("_")[1] == "TECH"]
+        boost_civics = [location for location in locations if location.location_type ==
+                        CivVICheckType.BOOST and location.name.split("_")[1] == "CIVIC"]
         techs += boost_techs
         civics += boost_civics
 
diff --git a/worlds/cv64/aesthetics.py b/worlds/cv64/aesthetics.py
index 66709174d8..5bfe943684 100644
--- a/worlds/cv64/aesthetics.py
+++ b/worlds/cv64/aesthetics.py
@@ -214,7 +214,7 @@ renon_item_dialogue = {
           "\"Banshee Boomerang.\"",
     0x10: "No weapon triangle\n"
           "advantages with this.",
-    0x12: "It looks sus? Trust me,"
+    0x12: "It looks sus? Trust me,\n"
           "my wares are genuine.",
     0x15: "This non-volatile kind\n"
           "is safe to handle.",
diff --git a/worlds/cv64/data/patches.py b/worlds/cv64/data/patches.py
index 4a964612f0..160c9c73e1 100644
--- a/worlds/cv64/data/patches.py
+++ b/worlds/cv64/data/patches.py
@@ -2034,7 +2034,7 @@ new_game_extras = [
     0x24090000,  # ADDIU T1, R0, 0x0000  <- Starting Ice Traps
     0xA1099BE2,  # SB    T1, 0x9BE2 (T0)
     0x240C0000,  # ADDIU T4, R0, 0x0000
-    0x240D0022,  # ADDIU T5, R0, 0x0022
+    0x240D0023,  # ADDIU T5, R0, 0x0023
     0x11AC0007,  # BEQ   T5, T4, [forward 0x07]
     0x3C0A8040,  # LUI   T2, 0x8040
     0x014C5021,  # ADDU  T2, T2, T4
diff --git a/worlds/cv64/docs/setup_en.md b/worlds/cv64/docs/setup_en.md
index 707618a1eb..51a91bbad1 100644
--- a/worlds/cv64/docs/setup_en.md
+++ b/worlds/cv64/docs/setup_en.md
@@ -30,7 +30,7 @@ the White Jewels.
 
 1. Create your options file (YAML). You can make one on the
 [Castlevania 64 options page](../../../games/Castlevania%2064/player-options).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have the `.apcv64` file extension.
 3. Open `ArchipelagoLauncher.exe`
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/cv64/rom.py b/worlds/cv64/rom.py
index 2e56df394d..4c31dc148a 100644
--- a/worlds/cv64/rom.py
+++ b/worlds/cv64/rom.py
@@ -1030,7 +1030,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
         basemd5 = hashlib.md5()
         basemd5.update(base_rom_bytes)
         if CV64_US_10_HASH != basemd5.hexdigest():
-            raise Exception("Supplied Base Rom does not match known MD5 for Castlevania 64 US 1.0."
+            raise Exception("Supplied Base Rom does not match known MD5 for Castlevania 64 US 1.0. "
                             "Get the correct game and version, then dump it.")
         setattr(get_base_rom_bytes, "base_rom_bytes", base_rom_bytes)
     return base_rom_bytes
diff --git a/worlds/cvcotm/client.py b/worlds/cvcotm/client.py
index 36019cd60e..74a853bbaa 100644
--- a/worlds/cvcotm/client.py
+++ b/worlds/cvcotm/client.py
@@ -247,6 +247,10 @@ class CastlevaniaCotMClient(BizHawkClient):
                 await bizhawk.write(ctx.bizhawk_ctx, [(QUEUED_TEXTBOX_1_ADDRESS, [0 for _ in range(12)], "EWRAM")])
                 return
 
+            # If the player doesn't have Dash Boots for whatever reason, put them in their inventory now.
+            if not magic_items_array[0]:
+                await bizhawk.write(ctx.bizhawk_ctx, [(MAGIC_ITEMS_ARRAY_START, [1], "EWRAM")])
+
             # Enable DeathLink if it's in our slot_data.
             if "DeathLink" not in ctx.tags and ctx.slot_data["death_link"]:
                 await ctx.update_death_link(True)
diff --git a/worlds/cvcotm/docs/setup_en.md b/worlds/cvcotm/docs/setup_en.md
index 4c34dcb836..f968ee01a5 100644
--- a/worlds/cvcotm/docs/setup_en.md
+++ b/worlds/cvcotm/docs/setup_en.md
@@ -28,7 +28,7 @@ clear it.
 ## Generating and Patching a Game
 
 1. Create your settings file (YAML). You can make one on the [Castlevania: Circle of the Moon options page](../../../games/Castlevania%20-%20Circle%20of%20the%20Moon/player-options).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have the `.apcvcotm` file extension.
 3. Open `ArchipelagoLauncher.exe`.
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/cvcotm/rom.py b/worlds/cvcotm/rom.py
index 350829292b..a1b41ba31d 100644
--- a/worlds/cvcotm/rom.py
+++ b/worlds/cvcotm/rom.py
@@ -586,7 +586,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
         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]:
-            raise Exception("Supplied Base ROM does not match known MD5s for Castlevania: Circle of the Moon USA."
+            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)
     return base_rom_bytes
diff --git a/worlds/dark_souls_3/Locations.py b/worlds/dark_souls_3/Locations.py
index b4e45fb577..569a0348d2 100644
--- a/worlds/dark_souls_3/Locations.py
+++ b/worlds/dark_souls_3/Locations.py
@@ -2025,13 +2025,13 @@ location_tables: Dict[str, List[DS3LocationData]] = {
         DS3LocationData("LC: Rusted Coin - chapel", "Rusted Coin x2"),
         DS3LocationData("LC: Braille Divine Tome of Lothric - wyvern room",
                         "Braille Divine Tome of Lothric", hidden=True),  # Hidden fall
-        DS3LocationData("LC: Red Tearstone Ring - chapel, drop onto roof", "Red Tearstone Ring"),
+        DS3LocationData("LC: Red Tearstone Ring - chapel, balcony before drop", "Red Tearstone Ring"),
         DS3LocationData("LC: Twinkling Titanite - moat, left side", "Twinkling Titanite x2"),
         DS3LocationData("LC: Large Soul of a Nameless Soldier - plaza left, by pillar",
                         "Large Soul of a Nameless Soldier"),
         DS3LocationData("LC: Titanite Scale - altar", "Titanite Scale x3"),
         DS3LocationData("LC: Titanite Scale - chapel, chest", "Titanite Scale"),
-        DS3LocationData("LC: Hood of Prayer", "Hood of Prayer"),
+        DS3LocationData("LC: Hood of Prayer - ascent, chest at beginning", "Hood of Prayer"),
         DS3LocationData("LC: Robe of Prayer - ascent, chest at beginning", "Robe of Prayer"),
         DS3LocationData("LC: Skirt of Prayer - ascent, chest at beginning", "Skirt of Prayer"),
         DS3LocationData("LC: Spirit Tree Crest Shield - basement, chest",
diff --git a/worlds/dark_souls_3/Options.py b/worlds/dark_souls_3/Options.py
index ad81dd9f7b..52222e4d39 100644
--- a/worlds/dark_souls_3/Options.py
+++ b/worlds/dark_souls_3/Options.py
@@ -218,10 +218,11 @@ class RandomizeEnemiesOption(DefaultOnToggle):
 
 
 class SimpleEarlyBossesOption(DefaultOnToggle):
-    """Avoid replacing Iudex Gundyr and Vordt with late bosses.
+    """Avoid replacing Iudex Gundyr and Vordt with difficult bosses.
 
-    This excludes all bosses after Dancer of the Boreal Valley from these two boss fights. Disable
-    it for a chance at a much harder early game.
+    This limits these fights to bosses that are known to scale gracefully for low-level fights.
+    This doesn't necessarily mean that those bosses will be from the early game, just that they're
+    not too difficult when scaled down.
 
     This is ignored unless enemies are randomized.
     """
diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py
index a1ad2f6a70..4ee972be9c 100644
--- a/worlds/dark_souls_3/__init__.py
+++ b/worlds/dark_souls_3/__init__.py
@@ -6,6 +6,7 @@ from logging import warning
 from typing import cast, Any, Callable, Dict, Set, List, Optional, TextIO, Union
 
 from BaseClasses import CollectionState, MultiWorld, Region, Location, LocationProgressType, Entrance, Tutorial, ItemClassification
+from Fill import remaining_fill
 
 from worlds.AutoWorld import World, WebWorld
 from worlds.generic.Rules import CollectionRule, ItemRule, add_rule, add_item_rule
@@ -90,6 +91,22 @@ class DarkSouls3World(World):
         self.created_regions = set()
         self.all_excluded_locations.update(self.options.exclude_locations.value)
 
+        # This code doesn't work because tests don't verify options
+        # Don't consider disabled locations to be AP-excluded
+        # if not self.options.enable_dlc:
+            # self.options.exclude_locations.value = {
+                # location
+                # for location in self.options.exclude_locations
+                # if not location_dictionary[location].dlc
+            # }
+
+        # if not self.options.enable_ngp:
+            # self.options.exclude_locations.value = {
+                # location for
+                # location in self.options.exclude_locations
+                # if not location_dictionary[location].ngp
+            # }
+
         # Inform Universal Tracker where Yhorm is being randomized to.
         if hasattr(self.multiworld, "re_gen_passthrough"):
             if "Dark Souls III" in self.multiworld.re_gen_passthrough:
@@ -264,6 +281,13 @@ class DarkSouls3World(World):
                 ):
                     new_location.progress_type = LocationProgressType.EXCLUDED
             else:
+                # Don't consider non-randomized locations to be AP-excluded
+                if location.name in excluded:
+                    excluded.remove(location.name)
+                    # Only remove from all_excluded if excluded does not have priority over missable
+                    if not (self.options.missable_location_behavior < self.options.excluded_location_behavior):
+                        self.all_excluded_locations.remove(location.name)
+
                 # Don't allow missable duplicates of progression items to be expected progression.
                 if location.name in self.missable_dupe_prog_locs: continue
 
@@ -283,11 +307,6 @@ class DarkSouls3World(World):
                     parent = new_region,
                 )
                 new_location.place_locked_item(event_item)
-                if location.name in excluded:
-                    excluded.remove(location.name)
-                    # Only remove from all_excluded if excluded does not have priority over missable
-                    if not (self.options.missable_location_behavior < self.options.excluded_location_behavior):
-                        self.all_excluded_locations.remove(location.name)
 
             new_region.locations.append(new_location)
 
@@ -1357,7 +1376,7 @@ class DarkSouls3World(World):
         if self.yhorm_location != default_yhorm_location:
             text += f"\nYhorm takes the place of {self.yhorm_location.name} in {self.player_name}'s world\n"
 
-        if self.options.excluded_location_behavior == "allow_useful":
+        if self.options.excluded_location_behavior != "forbid_useful":
             text += f"\n{self.player_name}'s world excluded: {sorted(self.all_excluded_locations)}\n"
 
         if text:
@@ -1455,6 +1474,7 @@ class DarkSouls3World(World):
                         f"contain smoothed items, but only {len(converted_item_order)} items to smooth."
                     )
 
+                sorted_spheres = []
                 for sphere in locations_by_sphere:
                     locations = [loc for loc in sphere if loc.item.name in names]
 
@@ -1462,12 +1482,12 @@ class DarkSouls3World(World):
                     offworld = ds3_world._shuffle([loc for loc in locations if loc.game != "Dark Souls III"])
                     onworld = sorted((loc for loc in locations if loc.game == "Dark Souls III"),
                                      key=lambda loc: loc.data.region_value)
-
                     # Give offworld regions the last (best) items within a given sphere
-                    for location in onworld + offworld:
-                        new_item = ds3_world._pop_item(location, converted_item_order)
-                        location.item = new_item
-                        new_item.location = location
+                    sorted_spheres.extend(onworld)
+                    sorted_spheres.extend(offworld)
+
+                converted_item_order.reverse()
+                remaining_fill(multiworld, sorted_spheres, converted_item_order, name="DS3 Smoothing", check_location_can_fill=True)
 
             if ds3_world.options.smooth_upgrade_items:
                 base_names = {
@@ -1500,19 +1520,6 @@ class DarkSouls3World(World):
         self.random.shuffle(copy)
         return copy
 
-    def _pop_item(
-        self,
-        location: Location,
-        items: List[DarkSouls3Item]
-    ) -> DarkSouls3Item:
-        """Returns the next item in items that can be assigned to location."""
-        for i, item in enumerate(items):
-            if location.can_fill(self.multiworld.state, item, False):
-                return items.pop(i)
-
-        # If we can't find a suitable item, give up and assign an unsuitable one.
-        return items.pop(0)
-
     def _get_our_locations(self) -> List[DarkSouls3Location]:
         return cast(List[DarkSouls3Location], self.multiworld.get_locations(self.player))
 
diff --git a/worlds/earthbound/Client.py b/worlds/earthbound/Client.py
new file mode 100644
index 0000000000..5bd76d3e8a
--- /dev/null
+++ b/worlds/earthbound/Client.py
@@ -0,0 +1,516 @@
+import logging
+import struct
+import typing
+import time
+import uuid
+from struct import pack
+from .game_data.local_data import client_specials, world_version, hint_bits, item_id_table, money_id_table
+from .game_data.text_data import text_encoder
+from .gifting.gift_tags import gift_properties
+from .gifting.trait_parser import wanted_traits, trait_interpreter, gift_exclusions
+
+from NetUtils import ClientStatus, color
+from worlds.AutoSNIClient import SNIClient
+
+if typing.TYPE_CHECKING:
+    from SNIClient import SNIContext
+else:
+    SNIContext = typing.Any
+
+snes_logger = logging.getLogger("SNES")
+
+ROM_START = 0x000000
+WRAM_START = 0xF50000
+WRAM_SIZE = 0x20000
+SRAM_START = 0xE00000
+
+EB_ROMHASH_START = 0x00FFC0
+WORLD_VERSION = 0x3FF0A0
+ROMHASH_SIZE = 0x15
+
+ITEM_MODE = ROM_START + 0x04FD76
+
+ITEMQUEUE_HIGH = WRAM_START + 0xB576
+ITEM_RECEIVED = WRAM_START + 0xB570
+SPECIAL_RECEIVED = WRAM_START + 0xB572
+MONEY_RECIVED = WRAM_START + 0xB5F1
+SAVE_FILE = WRAM_START + 0xB4A1
+GIYGAS_CLEAR = WRAM_START + 0x9C11
+GAME_CLEAR = WRAM_START + 0x9C85
+OPEN_WINDOW = WRAM_START + 0x8958
+MELODY_TABLE = WRAM_START + 0x9C1E
+EARTH_POWER_FLAG = WRAM_START + 0x9C82
+CUR_SCENE = WRAM_START + 0x97B8
+IS_IN_BATTLE = WRAM_START + 0x9643
+DEATHLINK_ENABLED = ROM_START + 0x04FD74
+DEATHLINK_TYPE = ROM_START + 0x04FD75
+IS_CURRENTLY_DEAD = WRAM_START + 0xB582
+GOT_DEATH_FROM_SERVER = WRAM_START + 0xB583
+PLAYER_JUST_DIED_SEND_DEATHLINK = WRAM_START + 0xB584
+IS_ABLE_TO_RECEIVE_DEATHLINKS = WRAM_START + 0xB585
+CHAR_COUNT = WRAM_START + 0x98A4
+OSS_FLAG = WRAM_START + 0x5D98
+HINT_SCOUNT_IDS = ROM_START + 0x310250
+SCOUTED_HINT_FLAGS = WRAM_START + 0xB621
+MONEY_IN_BANK = WRAM_START + 0x9835
+IS_ENERGYLINK_ENABLED = ROM_START + 0x04FD78
+already_tried_to_connect = False
+
+
+class EarthBoundClient(SNIClient):
+    game = "EarthBound"
+    patch_suffix = ".apeb"
+    most_recent_connect: str = ""
+    client_version: str = world_version
+    hint_list: list[int] = []
+    hinted_shop_locations: list[int] = []
+
+    async def deathlink_kill_player(self, ctx: "SNIContext") -> None:
+        from SNIClient import DeathState, snes_buffered_write, snes_flush_writes, snes_read
+        battle_hp = {
+            1: WRAM_START + 0x9FBF,
+            2: WRAM_START + 0xA00D,
+            3: WRAM_START + 0xA05B,
+            4: WRAM_START + 0xA0A9,
+        }
+
+        active_hp = {
+            1: WRAM_START + 0x9A15,
+            2: WRAM_START + 0x9A74,
+            3: WRAM_START + 0x9AD3,
+            4: WRAM_START + 0x9B32,
+        }
+
+        scrolling_hp = {
+            1: WRAM_START + 0x9A13,
+            2: WRAM_START + 0x9A72,
+            3: WRAM_START + 0x9AD1,
+            4: WRAM_START + 0x9B30,
+        }
+
+        deathlink_mode = await snes_read(ctx, DEATHLINK_TYPE, 1)
+        oss_flag = await snes_read(ctx, OSS_FLAG, 1)
+        is_currently_dead = await snes_read(ctx, IS_CURRENTLY_DEAD, 1)
+        can_receive_deathlinks = await snes_read(ctx, IS_ABLE_TO_RECEIVE_DEATHLINKS, 1)
+        is_in_battle = await snes_read(ctx, IS_IN_BATTLE, 1)
+        char_count = await snes_read(ctx, CHAR_COUNT, 1)
+        snes_buffered_write(ctx, GOT_DEATH_FROM_SERVER, bytes([0x01]))
+        text_open = await snes_read(ctx, OPEN_WINDOW, 1)
+
+        if text_open is None: #Catch None reads from client jank????????
+            return
+
+        if is_currently_dead[0] != 0x00 or can_receive_deathlinks[0] == 0x00:
+            return
+
+        # If suppression is set and we're not in a battle dont do deathlinks
+        if oss_flag[0] != 0x00 and is_in_battle[0] == 0x00:
+            return
+
+        # Prevent overworld deaths while a menu is open
+        if not is_in_battle[0] and text_open[0] != 0xFF:
+            return
+
+        for i in range(char_count[0]):
+            w_cur_char = WRAM_START + 0x986F + i
+            current_char = await snes_read(ctx, w_cur_char, 1)
+            snes_buffered_write(ctx, active_hp[current_char[0]], bytes([0x00, 0x00]))
+            snes_buffered_write(ctx, battle_hp[i + 1], bytes([0x00, 0x00]))
+            if deathlink_mode[0] == 0 or is_in_battle[0] == 0:
+                # This should be the check for instant or mercy. Write the value, call it here
+                snes_buffered_write(ctx, scrolling_hp[current_char[0]], bytes([0x00, 0x00]))
+        await snes_flush_writes(ctx)
+        ctx.death_state = DeathState.dead
+        ctx.last_death_link = time.time()
+
+    def on_package(self, ctx, cmd: str, args: dict[str, typing.Any]) -> None:
+        super().on_package(ctx, cmd, args)
+
+        if cmd == "Connected":
+            self.slot_data = args.get("slot_data", None)
+
+    async def validate_rom(self, ctx: "SNIContext") -> bool:
+        from SNIClient import snes_read
+
+        rom_name = await snes_read(ctx, EB_ROMHASH_START, ROMHASH_SIZE)
+        apworld_version = await snes_read(ctx, WORLD_VERSION, 16)
+
+        item_handling = await snes_read(ctx, ITEM_MODE, 1)
+        if rom_name is None or rom_name[:6] != b"MOM2AP":
+            return False
+
+        apworld_version = apworld_version.decode("utf-8").strip("\x00")
+        if apworld_version != self.most_recent_connect and apworld_version != self.client_version:
+            ctx.gui_error("Bad Version", f"EarthBound APWorld version {self.client_version} does not match generated version {apworld_version}")
+            self.most_recent_connect = apworld_version
+            return False
+
+        ctx.game = self.game
+        if item_handling[0] == 0x00:
+            ctx.items_handling = 0b001
+        else:
+            ctx.items_handling = 0b111
+        ctx.rom = rom_name
+
+        death_link = await snes_read(ctx, DEATHLINK_ENABLED, 1)
+        if death_link:
+            await ctx.update_death_link(bool(death_link[0] & 0b1))
+        return True
+
+    async def game_watcher(self, ctx: "SNIContext") -> None:
+        from SNIClient import snes_buffered_write, snes_flush_writes, snes_read, snes_write
+        giygas_clear = await snes_read(ctx, GIYGAS_CLEAR, 0x1)
+        game_clear = await snes_read(ctx, GAME_CLEAR, 0x1)
+        item_received = await snes_read(ctx, ITEM_RECEIVED, 0x1)
+        special_received = await snes_read(ctx, SPECIAL_RECEIVED, 0x1)
+        money_received = await snes_read(ctx, MONEY_RECIVED, 0x2)
+        save_num = await snes_read(ctx, SAVE_FILE, 0x1)
+        text_open = await snes_read(ctx, OPEN_WINDOW, 1)
+        melody_table = await snes_read(ctx, MELODY_TABLE, 2)
+        earth_power_absorbed = await snes_read(ctx, EARTH_POWER_FLAG, 1)
+        cur_script = await snes_read(ctx, CUR_SCENE, 1)
+        rom = await snes_read(ctx, EB_ROMHASH_START, ROMHASH_SIZE)
+        scouted_hint_flags = await snes_read(ctx, SCOUTED_HINT_FLAGS, 1)
+        gift_target = await snes_read(ctx, WRAM_START + 0xB5E7, 2)
+        outbound_gifts = await snes_read(ctx, WRAM_START + 0x31D0, 1)
+        shop_scout = await snes_read(ctx, WRAM_START + 0x0770, 1)
+        shop_scouts_enabled = await snes_read(ctx, ROM_START + 0x04FD77, 1)
+        outgoing_energy = await snes_read(ctx, MONEY_IN_BANK, 4)
+        if rom != ctx.rom:
+            ctx.rom = None
+            return
+        
+        if giygas_clear[0] & 0x01 == 0x01:  # Are we in the epilogue
+            return
+
+        if save_num[0] == 0x00:  # If on the title screen
+            return
+
+        if ctx.slot is None:
+            return
+
+        if outgoing_energy is None: #None Catcher
+            return
+
+
+        if f"GiftBoxes;{ctx.team}" not in ctx.stored_data:
+            await ctx.send_msgs([{
+                "cmd": "SetNotify",
+                "keys": [f"GiftBoxes;{ctx.team}"]
+            }])
+
+        # GIFTING DATA
+        if f"GiftBox;{ctx.team};{ctx.slot}" not in ctx.stored_data:
+            local_giftbox = {
+                            str(ctx.slot): {
+                                "is_open": True,
+                                "accepts_any_gift": False,
+                                "desired_traits": wanted_traits,
+                                "minimum_gift_data_version": 2,
+                                "maximum_gift_data_version": 3}}
+            await ctx.send_msgs([{
+                        "cmd": "Set",
+                        "key": f"GiftBoxes;{ctx.team}",
+                        "want_reply": False,
+                        "default": {},
+                        "operations": [{"operation": "update", "value": local_giftbox}]
+                    }])
+        
+            await ctx.send_msgs([{
+                        "cmd": "Get",
+                        "keys": [f"GiftBox;{ctx.team};{ctx.slot}"]
+                    }])
+
+            await ctx.send_msgs([{
+                        "cmd": "SetNotify",
+                        "keys": [f"GiftBox;{ctx.team};{ctx.slot}", f"GiftBoxes;{ctx.team}"]
+                    }])
+
+        inbox = ctx.stored_data.get(f"GiftBox;{ctx.team};{ctx.slot}")
+        motherbox = ctx.stored_data.get(f"GiftBoxes;{ctx.team}")
+        if inbox:
+            gift_item_name = "None"
+            key, gift = next(iter(inbox.items()))
+            if "item_name" in gift or "ItemName" in gift:
+                gift_item_name = gift.get("item_name", gift.get("ItemName"))
+            if gift_item_name in item_id_table and gift_item_name not in gift_exclusions:
+                # If the name matches an EB item, convert it to one (even if not coming from EB)
+                item = item_id_table[gift_item_name]
+            else:
+                item = trait_interpreter(gift)
+
+            inbox_queue = await snes_read(ctx, WRAM_START + 0x3200, 1)
+            # Pause if the receiver queue is full
+            if not inbox_queue[0]:
+                await snes_write(ctx, [(WRAM_START + 0x3200, bytes([item]))])
+                inbox.pop(key)
+                await ctx.send_msgs([{
+                            "cmd": "Set",
+                            "key": f"GiftBox;{ctx.team};{ctx.slot}",
+                            "want_reply": False,
+                            "default": {},
+                            "operations": [{"operation": "pop", "value": key}]
+                        }])
+
+        # We're in the Gift selection menu. This should write the selected player's name into RAM
+        # for parsing.
+        # TODO; CHECK A SETNOTIFY HERE
+        gift_target = int.from_bytes(gift_target, byteorder="little")
+
+        # Giftbox checking for the gift menu UI
+        if gift_target != 0x00 and motherbox is not None:
+            gift_recipient = str(gift_target)
+            recip_name = ctx.player_names[gift_target]
+            recip_name = get_alias(recip_name, ctx.slot_info[gift_target].name)
+            recip_name = text_encoder(recip_name, 20)
+            if gift_recipient in motherbox:
+                if "IsOpen" in motherbox[gift_recipient]:
+                    motherbox[gift_recipient]["is_open"] = motherbox[gift_recipient].pop("IsOpen")
+                    
+            if gift_recipient in motherbox and motherbox[gift_recipient]["is_open"]:
+                recip_name.extend(text_encoder(" (Open)", 20))
+            else:
+                recip_name.extend(text_encoder(" (Closed)", 20))
+            recip_name.append(0x00)
+            await snes_write(ctx, [(WRAM_START + 0xFF80, recip_name)])
+            await snes_write(ctx, [(WRAM_START + 0xB5E7, bytes([0x00, 0x00]))])
+            await snes_write(ctx, [(WRAM_START + 0xB573, bytes([0x00, 0x00]))])
+            
+            gift_flag_byte = await snes_read(ctx, WRAM_START + 0xB622, 1)
+            gift_flag_byte = gift_flag_byte[0] | 0x04
+            await snes_write(ctx, [(WRAM_START + 0xB622, bytes([gift_flag_byte]))])
+
+        if outbound_gifts[0] != 0x00 and motherbox is not None:
+            gift_buffer = await snes_read(ctx, WRAM_START + 0x31D1, 3)
+            gift_item_id = gift_buffer[0]
+            gift = gift_properties[gift_item_id]
+            recipient = struct.unpack("H", gift_buffer[-2:])
+            if str(recipient[0]) in motherbox:
+                # Check if the player's box is open, refund if not
+                if "IsOpen" in motherbox[str(recipient[0])]:
+                    # Does the recipient 0 thing work if > 255? Will need some testing.
+                    motherbox[str(recipient[0])]["is_open"] = motherbox[str(recipient[0])].pop("IsOpen")
+
+                if "AcceptsAnyGift" in motherbox[str(recipient[0])]:
+                    motherbox[str(recipient[0])]["accepts_any_gift"] = motherbox[str(recipient[0])].pop("AcceptsAnyGift")
+
+                if "DesiredTraits" in motherbox[str(recipient[0])]:
+                    motherbox[str(recipient[0])]["desired_traits"] = motherbox[str(recipient[0])].pop("DesiredTraits")
+
+                if "Trait" in motherbox[str(recipient[0])]["desired_traits"]:
+                    motherbox[str(recipient[0])]["desired_traits"]["trait"] = motherbox[str(recipient[0])]["desired_traits"].pop("Trait")
+
+            if str(recipient[0]) in motherbox and motherbox[str(recipient[0])]["is_open"] and (any(
+                        motherbox[str(recipient[0])]["accepts_any_gift"] or
+                        trait["trait"] in motherbox[str(recipient[0])]["desired_traits"] for trait in gift.traits)):
+                was_refunded = False
+                recipient = recipient[0]
+            else:
+                was_refunded = True
+                recipient = ctx.slot
+            guid = str(uuid.uuid4())
+            outgoing_gift = {
+                            guid: {
+                                "id": guid,
+                                "item_name": gift.name,
+                                "amount": 1,
+                                "item_value": gift.value,
+                                "traits": gift.traits,
+                                "sender_slot": ctx.slot,
+                                "receiver_slot": recipient,
+                                "sender_team": ctx.team,
+                                "receiver_team": ctx.team,  # ??? Should be Receive slot team?
+                                "is_refund": was_refunded}}
+
+            await ctx.send_msgs([{
+                        "cmd": "Set",
+                        "key": f"GiftBox;{ctx.team};{recipient}",  # Receiver team here too
+                        "want_reply": True,
+                        "default": {},
+                        "operations": [{"operation": "update", "value": outgoing_gift}]
+                    }])
+            
+            gift_queue = await snes_read(ctx, WRAM_START + 0x31D4, 0x21)
+            # shuffle the entire queue down 3 bytes
+            outbox_full_byte = await snes_read(ctx, WRAM_START + 0xB622, 1)
+
+            await snes_write(ctx, [(WRAM_START + 0x31D1, gift_queue)])
+            await snes_write(ctx, [(WRAM_START + 0x31D0, bytes([outbound_gifts[0] - 1]))])
+            outbox_full_byte = outbox_full_byte[0] & ~0x08
+            await snes_write(ctx, [(WRAM_START + 0xB622, bytes([outbox_full_byte]))])
+
+        if (game_clear[0] & 0x01 == 0x01) and not ctx.finished_game:  # Goal should ignore the item queue and textbox check
+            await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+            ctx.finished_game = True
+        
+        for i in range(6):
+            if scouted_hint_flags[0] & hint_bits[i]:
+                if i not in self.hint_list:
+                    scoutable_hint = await snes_read(ctx, HINT_SCOUNT_IDS + (i * 3), 3)
+                    if not scoutable_hint[2]:
+                        scoutable_hint = (int.from_bytes(scoutable_hint[:2], byteorder="little") + 0xEB0000)
+                        self.hint_list.append(i)
+                        await ctx.send_msgs([{"cmd": "CreateHints", "locations": [scoutable_hint], "player": ctx.player}])
+                    else:
+                        hint = self.slot_data['hint_man_hints'][i]
+                        await ctx.send_msgs([{"cmd": "CreateHints", "locations": [hint[0]], "player": hint[1]}])
+                        self.hint_list.append(i)
+        
+        if shop_scout[0] and shop_scouts_enabled[0]:
+            shop_slots = []
+            for i in range(7):
+                slot_id = (0xEB0FF9 + (shop_scout[0] * 7) + i)
+                if slot_id in ctx.server_locations and slot_id not in self.hinted_shop_locations:
+                    shop_slots.append(slot_id)
+            
+            if shop_slots:
+                if shop_scouts_enabled[0] == 2:
+                    await ctx.send_msgs([{"cmd": "CreateHints", "locations": shop_slots, "player": ctx.slot}])
+                    await snes_write(ctx, [(WRAM_START + 0x0770, bytes([0x00]))])
+                else:
+                    prog_shops = []
+                    await ctx.send_msgs([{"cmd": "LocationScouts", "locations": shop_slots, "create_as_hint": 0}])
+                    for location in shop_slots:
+                        if location in ctx.locations_info:
+                            self.hinted_shop_locations.append(location)
+                            if ctx.locations_info[location].flags & 0x01:
+                                prog_shops.append(location)
+                    if prog_shops:
+                        await ctx.send_msgs([{"cmd": "CreateHints", "locations": prog_shops, "player": ctx.slot}])
+
+        melody_data = f"{ctx.team}_{ctx.slot}_melody_status"
+        earth_power_data = f"{ctx.team}_{ctx.slot}_earthpower"
+        current_melodies = int.from_bytes(melody_table, "little")
+        earth_power_state = int.from_bytes(earth_power_absorbed, "little")
+
+        if melody_data not in ctx.stored_data or (ctx.stored_data[melody_data] != current_melodies) or (ctx.stored_data[earth_power_data] != earth_power_state):
+            await ctx.send_msgs([{
+                        "cmd": "Set",
+                        "key": melody_data,
+                        "default": None,
+                        "want_reply": True,
+                        "operations": [{"operation": "replace", "value": int.from_bytes(melody_table, "little")}]},
+                        {
+                        "cmd": "Set",
+                        "key": earth_power_data,
+                        "default": None,
+                        "want_reply": True,
+                        "operations": [{"operation": "replace", "value": int.from_bytes(earth_power_absorbed, "little")}]
+                    }])
+
+        # death link handling goes here
+        if "DeathLink" in ctx.tags and ctx.last_death_link + 1 < time.time():
+            send_deathlink = await snes_read(ctx, PLAYER_JUST_DIED_SEND_DEATHLINK, 1)
+            currently_dead = send_deathlink[0] != 0x00
+            if send_deathlink[0] != 0x00:
+                snes_buffered_write(ctx, PLAYER_JUST_DIED_SEND_DEATHLINK, bytes([0x00]))
+            await ctx.handle_deathlink_state(currently_dead)
+
+        new_checks = []
+        from .game_data.local_data import check_table
+
+        location_ram_data = await snes_read(ctx, WRAM_START + 0x9C00, 0x88)
+        shop_location_flags = await snes_read(ctx, WRAM_START + 0xB721, 0x41)
+        for loc_id, loc_data in check_table.items():
+            if loc_id not in ctx.locations_checked:
+                if loc_id >= 0xEB1000:
+                    data = shop_location_flags[loc_data[0]]
+                else:
+                    data = location_ram_data[loc_data[0]]
+                masked_data = data & (1 << loc_data[1])
+                bit_set = masked_data != 0
+                invert_bit = ((len(loc_data) >= 3) and loc_data[2])
+                if bit_set != invert_bit and loc_id in ctx.server_locations:
+                    if text_open[0] == 0xFF or shop_scout[0]:  # Don't check locations while in a textbox
+                        new_checks.append(loc_id)
+                        
+        for new_check_id in new_checks:
+            ctx.locations_checked.add(new_check_id)
+            location = ctx.location_names.lookup_in_slot(new_check_id)
+            snes_logger.info(
+                f'New Check: {location} ({len(ctx.locations_checked)}/{len(ctx.missing_locations) + len(ctx.checked_locations)})')
+            await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": [new_check_id]}])
+            await snes_write(ctx, [(WRAM_START + 0x0770, bytes([0]))])
+
+        if item_received[0] or special_received[0] != 0x00 or money_received[0] != 0x00:  # If processing any item from the server
+            return
+
+        is_energylink_enabled = await snes_read(ctx, IS_ENERGYLINK_ENABLED, 1)
+        is_requesting_energy = await snes_read(ctx, WRAM_START + 0x0790, 1)
+        energy_withdrawal = await snes_read(ctx, WRAM_START + 0x0796, 4)
+        ctx.set_notify(f"EnergyLink{ctx.team}")
+        energy = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0)
+        exchange_rate = 1000000
+        if is_energylink_enabled[0]:
+
+            deposited_energy = int.from_bytes(outgoing_energy, byteorder="little")
+            if deposited_energy:
+                deposited_energy *= exchange_rate
+                await snes_write(ctx, [(MONEY_IN_BANK, (0x00).to_bytes(4, byteorder="little"))])
+                await ctx.send_msgs([{
+                    "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations":
+                        [{"operation": "add", "value": deposited_energy},
+                            {"operation": "max", "value": 0}]}])
+
+            if is_requesting_energy[0] and energy:  # This is just to pull the current number for a display.
+                energy //= exchange_rate
+                if energy > 9999999:
+                    energy = 9999999
+                    cap_flag = await snes_read(ctx, WRAM_START + 0xB623, 1)
+                    cap_flag = int.from_bytes(cap_flag)
+                    cap_flag |= 0x20
+                    await snes_write(ctx, [(WRAM_START + 0xB623, cap_flag.to_bytes(1, byteorder="little"))])
+
+                await snes_write(ctx, [(WRAM_START + 0x0792, int(energy).to_bytes(4, byteorder="little"))])
+                await snes_write(ctx, [(WRAM_START + 0x0790, (0x00).to_bytes(1, byteorder="little"))])
+
+            if any(energy_withdrawal) and energy:
+                withdrawal = int.from_bytes(energy_withdrawal, byteorder="little")
+                withdrawal *= exchange_rate
+                energy = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0)  # Refresh the value
+
+                if withdrawal > energy:
+                    energy_success = 2
+                    withdrawal = energy
+                else:
+                    energy_success = 1
+
+                await snes_write(ctx, [(WRAM_START + 0x97D0, (withdrawal // exchange_rate).to_bytes(4, byteorder="little"))])
+                await snes_write(ctx, [(WRAM_START + 0x0796, (0x00).to_bytes(4, byteorder="little"))])
+                await ctx.send_msgs([{
+                    "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations":
+                        [{"operation": "add", "value": (withdrawal * -1)},
+                            {"operation": "max", "value": 0}]}])
+                await snes_write(ctx, [(WRAM_START + 0x079A, energy_success.to_bytes(1, byteorder="little"))])  # Signal the game to continue
+
+        if cur_script[0]:  # Stop items during cutscenes
+            return
+
+        recv_count = await snes_read(ctx, ITEMQUEUE_HIGH, 2)
+        recv_index = struct.unpack("H", recv_count)[0]
+        if recv_index < len(ctx.items_received):
+            item = ctx.items_received[recv_index]
+            item_id = (item.item - 0xEB0000)
+            recv_index += 1
+            logging.info('Received %s from %s (%s) (%d/%d in list)' % (
+                color(ctx.item_names.lookup_in_slot(item.item), "red", "bold"),
+                color(ctx.player_names[item.player], 'yellow'),
+                ctx.location_names.lookup_in_slot(item.location, item.player), recv_index, len(ctx.items_received)))
+
+            snes_buffered_write(ctx, ITEMQUEUE_HIGH, pack("H", recv_index))
+            if item_id <= 0xFD:
+                snes_buffered_write(ctx, WRAM_START + 0xB570, bytes([item_id]))
+            elif item_id in money_id_table:
+                snes_buffered_write(ctx, WRAM_START + 0xB5F1, bytes([list(money_id_table).index(item_id) + 1]))
+            else:
+                snes_buffered_write(ctx, WRAM_START + 0xB572, bytes([client_specials[item_id]]))
+
+        await snes_flush_writes(ctx)
+
+
+def get_alias(alias: str, slot_name: str) -> str:
+    try:
+        index = alias.index(f" ({slot_name}")
+    except ValueError:
+        return alias
+    return alias[:index]
diff --git a/worlds/earthbound/Items.py b/worlds/earthbound/Items.py
new file mode 100644
index 0000000000..ed57aced11
--- /dev/null
+++ b/worlds/earthbound/Items.py
@@ -0,0 +1,337 @@
+from typing import Dict, Set, NamedTuple, Optional
+from BaseClasses import ItemClassification
+
+
+class ItemData(NamedTuple):
+    category: str
+    code: Optional[int]
+    classification: ItemClassification
+    amount: int = 1
+
+
+item_table: Dict[str, ItemData] = {
+    "Franklin Badge": ItemData("Key Items", 0xEB0001, ItemClassification.progression),
+    "Teddy Bear": ItemData("Characters", 0xEB0002, ItemClassification.filler, 0),
+    "Super Plush Bear": ItemData("Characters", 0xEB0003, ItemClassification.useful, 0),
+
+    "Broken Machine": ItemData("Broken Items", 0xEB0004, ItemClassification.useful, 0),
+    "Broken Gadget": ItemData("Jeff Weapons", 0xEB0005, ItemClassification.useful, 0),
+    "Broken Air Gun": ItemData("Jeff Weapons", 0xEB0006, ItemClassification.filler, 0),
+    "Broken Spray Can": ItemData("Broken Items", 0xEB0007, ItemClassification.filler, 0),
+    "Broken Laser": ItemData("Jeff Weapons", 0xEB0008, ItemClassification.useful, 0),
+    "Broken Iron": ItemData("Broken Items", 0xEB0009, ItemClassification.filler, 0),
+    "Broken Pipe": ItemData("Broken Items", 0xEB000A, ItemClassification.useful, 0),
+    "Broken Cannon": ItemData("Jeff Weapons", 0xEB000B, ItemClassification.useful, 0),
+    "Broken Tube": ItemData("Broken Items", 0xEB000C, ItemClassification.useful, 0),
+    "Broken Bazooka": ItemData("Broken Items", 0xEB000D, ItemClassification.useful, 0),
+    "Broken Trumpet": ItemData("Broken Items", 0xEB000E, ItemClassification.filler, 0),
+    "Broken Harmonica": ItemData("Jeff Weapons", 0xEB000F, ItemClassification.useful, 0),
+    "Broken Antenna": ItemData("Jeff Weapons", 0xEB0010, ItemClassification.useful, 0),
+
+    "Cracked Bat": ItemData("Ness Weapons", 0xEB0011, ItemClassification.filler, 0),
+    "Tee Ball Bat": ItemData("Ness Weapons", 0xEB0012, ItemClassification.filler, 0),
+    "Sand Lot Bat": ItemData("Ness Weapons", 0xEB0013, ItemClassification.filler, 0),
+    "Minor League Bat": ItemData("Ness Weapons", 0xEB0014, ItemClassification.filler, 0),
+    "Mr. Baseball Bat": ItemData("Ness Weapons", 0xEB0015, ItemClassification.useful, 0),
+    "Big League Bat": ItemData("Ness Weapons", 0xEB00D5, ItemClassification.useful, 0),
+    "Hall of Fame Bat": ItemData("Ness Weapons", 0xEB0017, ItemClassification.useful, 0),
+    "Magicant Bat": ItemData("Ness Weapons", 0xEB0018, ItemClassification.useful),
+    "Legendary Bat": ItemData("Ness Weapons", 0xEB0019, ItemClassification.useful),
+    "Gutsy Bat": ItemData("Ness Weapons", 0xEB001A, ItemClassification.useful, 0),
+    "Casey Bat": ItemData("Ness Weapons", 0xEB001B, ItemClassification.filler, 0),
+
+    "Fry Pan": ItemData("Paula Weapons", 0xEB001C, ItemClassification.filler, 0),
+    "Thick Fry Pan": ItemData("Paula Weapons", 0xEB001D, ItemClassification.filler, 0),
+    "Deluxe Fry Pan": ItemData("Paula Weapons", 0xEB001E, ItemClassification.filler, 0),
+    "Chef's Fry Pan": ItemData("Paula Weapons", 0xEB001F, ItemClassification.useful, 0),
+    "French Fry Pan": ItemData("Paula Weapons", 0xEB0020, ItemClassification.useful, 0),
+    "Magic Fry Pan": ItemData("Paula Weapons", 0xEB0021, ItemClassification.useful, 0),
+    "Holy Fry Pan": ItemData("Paula Weapons", 0xEB0022, ItemClassification.useful, 0),
+
+    "Sword of Kings": ItemData("Poo Weapons", 0xEB0023, ItemClassification.useful, 0),
+
+    "Pop Gun": ItemData("Jeff Weapons", 0xEB0024, ItemClassification.filler),
+    "Stun Gun": ItemData("Jeff Weapons", 0xEB0025, ItemClassification.filler),
+    "Toy Air Gun": ItemData("Jeff Weapons", 0xEB0026, ItemClassification.filler, 0),
+    "Magnum Air Gun": ItemData("Jeff Weapons", 0xEB0027, ItemClassification.filler, 0),
+    "Zip Gun": ItemData("Jeff Weapons", 0xEB0028, ItemClassification.filler, 0),
+    "Laser Gun": ItemData("Jeff Weapons", 0xEB0029, ItemClassification.filler, 0),
+    "Hyper Beam": ItemData("Jeff Weapons", 0xEB002A, ItemClassification.useful, 0),
+    "Crusher Beam": ItemData("Jeff Weapons", 0xEB002B, ItemClassification.useful, 0),
+    "Spectrum Beam": ItemData("Jeff Weapons", 0xEB002C, ItemClassification.useful, 0),
+    "Death Ray": ItemData("Jeff Weapons", 0xEB002D, ItemClassification.useful),
+    "Baddest Beam": ItemData("Jeff Weapons", 0xEB002E, ItemClassification.useful, 0),
+    "Moon Beam Gun": ItemData("Jeff Weapons", 0xEB002F, ItemClassification.useful),
+    "Gaia Beam": ItemData("Jeff Weapons", 0xEB0030, ItemClassification.useful, 0),
+
+    "Yo-yo": ItemData("Alt Weapons", 0xEB0031, ItemClassification.filler, 0),
+    "Slingshot": ItemData("Alt Weapons", 0xEB0032, ItemClassification.filler, 0),
+    "Bionic Slingshot": ItemData("Alt Weapons", 0xEB0033, ItemClassification.filler, 0),
+    "Trick Yo-yo": ItemData("Alt Weapons", 0xEB0034, ItemClassification.filler, 0),
+    "Combat Yo-yo": ItemData("Alt Weapons", 0xEB0035, ItemClassification.filler, 0),
+
+    "Travel Charm": ItemData("Body Equipment", 0xEB0036, ItemClassification.filler),
+    "Great Charm": ItemData("Body Equipment", 0xEB0037, ItemClassification.filler),
+    "Crystal Charm": ItemData("Body Equipment", 0xEB0038, ItemClassification.filler, 0),
+    "Rabbit's Foot": ItemData("Body Equipment", 0xEB0039, ItemClassification.useful),
+    "Flame Pendant": ItemData("Body Equipment", 0xEB003A, ItemClassification.useful),
+    "Rain Pendant": ItemData("Body Equipment", 0xEB003B, ItemClassification.useful),
+    "Night Pendant": ItemData("Body Equipment", 0xEB003C, ItemClassification.useful),
+    "Sea Pendant": ItemData("Body Equipment", 0xEB003D, ItemClassification.useful),
+    "Star Pendant": ItemData("Body Equipment", 0xEB003E, ItemClassification.useful, 0),
+    "Cloak of Kings": ItemData("Poo Equipment", 0xEB003F, ItemClassification.useful),
+
+    "Cheap Bracelet": ItemData("Arm Equipment", 0xEB0040, ItemClassification.filler, 0),
+    "Copper Bracelet": ItemData("Arm Equipment", 0xEB0041, ItemClassification.filler, 0),
+    "Silver Bracelet": ItemData("Arm Equipment", 0xEB0042, ItemClassification.filler, 0),
+    "Gold Bracelet": ItemData("Arm Equipment", 0xEB0043, ItemClassification.filler, 0),
+    "Platinum Band": ItemData("Arm Equipment", 0xEB00D8, ItemClassification.useful),
+    "Diamond Band": ItemData("Arm Equipment", 0xEB00D9, ItemClassification.useful),
+    "Pixie's Bracelet": ItemData("Arm Equipment", 0xEB0046, ItemClassification.useful),
+    "Cherub's Band": ItemData("Arm Equipment", 0xEB0047, ItemClassification.useful),
+    "Goddess Band": ItemData("Arm Equipment", 0xEB0048, ItemClassification.useful),
+    "Bracer of Kings": ItemData("Poo Equipment", 0xEB0049, ItemClassification.useful),
+
+    "Baseball Cap": ItemData("Other Equipment", 0xEB004A, ItemClassification.filler, 0),
+    "Holmes Hat": ItemData("Other Equipment", 0xEB004B, ItemClassification.filler, 0),
+    "Mr. Baseball Cap": ItemData("Other Equipment", 0xEB004C, ItemClassification.filler, 0),
+    "Hard Hat": ItemData("Other Equipment", 0xEB004D, ItemClassification.filler, 0),
+    "Ribbon": ItemData("Ribbons", 0xEB004E, ItemClassification.filler, 0),
+    "Red Ribbon": ItemData("Ribbons", 0xEB004F, ItemClassification.filler, 0),
+    "Goddess Ribbon": ItemData("Ribbons", 0xEB0050, ItemClassification.useful, 0),
+    "Coin of Slumber": ItemData("Other Equipment", 0xEB0051, ItemClassification.useful),
+    "Coin of Defense": ItemData("Other Equipment", 0xEB0052, ItemClassification.useful, 0),
+    "Lucky Coin": ItemData("Other Equipment", 0xEB0053, ItemClassification.useful, 0),
+    "Talisman Coin": ItemData("Other Equipment", 0xEB0054, ItemClassification.useful, 0),
+    "Shiny Coin": ItemData("Other Equipment", 0xEB0055, ItemClassification.useful, 0),
+    "Souvenir Coin": ItemData("Other Equipment", 0xEB0056, ItemClassification.useful),
+    "Diadem of Kings": ItemData("Poo Equipment", 0xEB0057, ItemClassification.useful),
+
+    "Cookie": ItemData("Food", 0xEB0058, ItemClassification.filler, 0),
+    "Bag of Fries": ItemData("Food", 0xEB0059, ItemClassification.filler, 0),
+    "Hamburger": ItemData("Food", 0xEB005A, ItemClassification.filler, 0),
+    "Boiled Egg": ItemData("Food", 0xEB005B, ItemClassification.filler, 0),
+    "Fresh Egg": ItemData("Food", 0xEB005C, ItemClassification.filler, 0),
+    "Picnic Lunch": ItemData("Food", 0xEB005D, ItemClassification.filler, 0),
+    "Pasta di Summers": ItemData("Food", 0xEB005E, ItemClassification.filler, 0),
+    "Pizza": ItemData("Food", 0xEB005F, ItemClassification.filler, 0),
+    "Chef's Special": ItemData("Food", 0xEB0060, ItemClassification.filler, 0),
+    "Large Pizza": ItemData("Food", 0xEB0061, ItemClassification.filler, 0),
+    "PSI Caramel": ItemData("Food", 0xEB0062, ItemClassification.useful, 0),
+    "Magic Truffle": ItemData("Food", 0xEB0063, ItemClassification.useful, 0),
+    "Brain Food Lunch": ItemData("Food", 0xEB0064, ItemClassification.useful, 0),
+    "Rock Candy": ItemData("Food", 0xEB0065, ItemClassification.useful, 0),
+    "Croissant": ItemData("Food", 0xEB0066, ItemClassification.filler, 0),
+    "Bread Roll": ItemData("Food", 0xEB0067, ItemClassification.filler, 0),
+    
+    "Pak of Bubble Gum": ItemData("Key Items", 0xEB0068, ItemClassification.progression),
+    "Jar of Fly Honey": ItemData("Key Items", 0xEB0069, ItemClassification.progression),
+
+    "Can of Fruit Juice": ItemData("Food", 0xEB006A, ItemClassification.filler, 0),
+    "Royal Iced Tea": ItemData("Food", 0xEB006B, ItemClassification.filler, 0),
+    "Protein Drink": ItemData("Food", 0xEB006C, ItemClassification.filler, 0),
+    "Kraken Soup": ItemData("Food", 0xEB006D, ItemClassification.filler, 0),
+    "Bottle of Water": ItemData("Food", 0xEB006E, ItemClassification.filler, 0),
+    "Cold Remedy": ItemData("Status Heal", 0xEB006F, ItemClassification.filler, 0),
+    "Vial of Serum": ItemData("Status Heal", 0xEB0070, ItemClassification.filler, 0),
+    "IQ Capsule": ItemData("Food", 0xEB0071, ItemClassification.useful, 0),
+    "Guts Capsule": ItemData("Food", 0xEB0072, ItemClassification.useful, 0),
+    "Speed Capsule": ItemData("Food", 0xEB0073, ItemClassification.useful, 0),
+    "Vital Capsule": ItemData("Food", 0xEB0074, ItemClassification.useful, 0),
+    "Luck Capsule": ItemData("Food", 0xEB0075, ItemClassification.useful, 0),
+    "Ketchup Packet": ItemData("Condiments", 0xEB0076, ItemClassification.filler, 0),
+    "Sugar Packet": ItemData("Condiments", 0xEB0077, ItemClassification.filler, 0),
+    "Tin of Cocoa": ItemData("Condiments", 0xEB0078, ItemClassification.filler, 0),
+    "Carton of Cream": ItemData("Condiments", 0xEB0079, ItemClassification.filler, 0),
+    "Sprig of Parsley": ItemData("Condiments", 0xEB007A, ItemClassification.filler, 0),
+    "Jar of Hot Sauce": ItemData("Condiments", 0xEB007B, ItemClassification.filler, 0),
+    "Salt Packet": ItemData("Condiments", 0xEB007C, ItemClassification.filler, 0),
+    "Tiny Key": ItemData("Key Items", 0xEB007D, ItemClassification.progression),  # Progressive Gun
+    "Jar of Delisauce": ItemData("Condiments", 0xEB007E, ItemClassification.useful, 0),
+    "Wet Towel": ItemData("Status Heal", 0xEB007F, ItemClassification.filler, 0),
+    "Refreshing Herb": ItemData("Status Heal", 0xEB0080, ItemClassification.useful, 0),
+    "Secret Herb": ItemData("Status Heal", 0xEB0081, ItemClassification.useful, 0),
+    "Horn of Life": ItemData("Status Heal", 0xEB0082, ItemClassification.useful, 0),
+
+    "Counter-PSI Unit": ItemData("Jeff Items", 0xEB0083, ItemClassification.useful, 0),
+    "Shield Killer": ItemData("Jeff Items", 0xEB0084, ItemClassification.useful, 0),
+    "Bazooka": ItemData("Jeff Items", 0xEB0085, ItemClassification.useful, 0),
+    "Heavy Bazooka": ItemData("Jeff Items", 0xEB0086, ItemClassification.useful, 0),
+    "HP-Sucker": ItemData("Jeff Items", 0xEB0087, ItemClassification.useful),
+    "Hungry HP-Sucker": ItemData("Jeff Items", 0xEB0088, ItemClassification.useful, 0),
+    "Xterminator Spray": ItemData("Battle Items", 0xEB0089, ItemClassification.useful, 0),
+    "Slime Generator": ItemData("Jeff Items", 0xEB008A, ItemClassification.useful, 0),
+    "Yogurt Dispenser": ItemData("Key Items", 0xEB008B, ItemClassification.progression),
+
+    "Ruler": ItemData("Battle Items", 0xEB008C, ItemClassification.filler, 0),
+    "Snake Bag": ItemData("Battle Items", 0xEB008D, ItemClassification.filler, 0),
+    "Mummy Wrap": ItemData("Battle Items", 0xEB008E, ItemClassification.filler, 0),
+    "Protractor": ItemData("Battle Items", 0xEB008F, ItemClassification.filler, 0),
+    "Bottle Rocket": ItemData("Jeff Items", 0xEB0090, ItemClassification.filler, 0),
+    "Big Bottle Rocket": ItemData("Jeff Items", 0xEB0091, ItemClassification.useful, 0),
+    "Multi Bottle Rocket": ItemData("Jeff Items", 0xEB0092, ItemClassification.useful, 0),
+    "Bomb": ItemData("Battle Items", 0xEB0093, ItemClassification.filler, 0),
+    "Super Bomb": ItemData("Battle Items", 0xEB0094, ItemClassification.useful, 0),
+    "Insecticide Spray": ItemData("Battle Items", 0xEB0095, ItemClassification.filler, 0),
+    "Rust Promoter": ItemData("Battle Items", 0xEB0096, ItemClassification.filler, 0),
+    "Rust Promoter DX": ItemData("Battle Items", 0xEB0097, ItemClassification.useful, 0),
+    "Pair of Dirty Socks": ItemData("Battle Items", 0xEB0098, ItemClassification.filler, 0),
+    "Stag Beetle": ItemData("Battle Items", 0xEB0099, ItemClassification.filler, 0),
+    "Toothbrush": ItemData("Battle Items", 0xEB009A, ItemClassification.filler, 0),
+    "Handbag Strap": ItemData("Battle Items", 0xEB009B, ItemClassification.filler, 0),
+    "Pharaoh's Curse": ItemData("Battle Items", 0xEB009C, ItemClassification.filler, 0),
+    "Defense Shower": ItemData("Battle Items", 0xEB009D, ItemClassification.useful, 0),
+
+    "UFO Engine": ItemData("Key Items", 0xEB009E, ItemClassification.progression),
+    "Sudden Guts Pill": ItemData("Battle Items", 0xEB009F, ItemClassification.useful, 0),
+    "Bag of Dragonite": ItemData("Battle Items", 0xEB00A0, ItemClassification.useful, 0),
+    "Defense Spray": ItemData("Battle Items", 0xEB00A1, ItemClassification.filler, 0),
+
+    "Piggy Nose": ItemData("Key Items", 0xEB00A2, ItemClassification.progression),
+    "For Sale Sign": ItemData("Field Items", 0xEB00A3, ItemClassification.filler),
+    "Shyness Book": ItemData("Key Items", 0xEB00A4, ItemClassification.progression),
+    "Picture Postcard": ItemData("Field Items", 0xEB00A5, ItemClassification.filler, 0),
+    "King Banana": ItemData("Key Items", 0xEB00A6, ItemClassification.progression),
+    "Letter For Tony": ItemData("Key Items", 0xEB00A7, ItemClassification.progression),
+    "Chick": ItemData("Field Items", 0xEB00A8, ItemClassification.filler, 0),
+    "Chicken": ItemData("Field Items", 0xEB00A9, ItemClassification.filler, 0),
+    "Key to the Shack": ItemData("Key Items", 0xEB00AA, ItemClassification.progression),
+    "Key to the Cabin": ItemData("Key Items", 0xEB00AB, ItemClassification.progression),
+    "Bad Key Machine": ItemData("Key Items", 0xEB00AC, ItemClassification.progression),
+    # "Archipelago Item": ItemData("Key Items", 0xEB00AD, ItemClassification.progression, 0),
+    "Zombie Paper": ItemData("Key Items", 0xEB00AE, ItemClassification.progression),
+    "Hawk Eye": ItemData("Key Items", 0xEB00AF, ItemClassification.progression),
+    "Bicycle": ItemData("Key Items", 0xEB00B0, ItemClassification.useful),
+    "ATM Card": ItemData("Key Items", 0xEB00B1, ItemClassification.progression, 0),
+    "Show Ticket": ItemData("Key Items", 0xEB00B2, ItemClassification.filler, 0),
+    "Tenda Lavapants": ItemData("Key Items", 0xEB00B3, ItemClassification.progression),  # Progressive Bat
+    "Wad of Bills": ItemData("Key Items", 0xEB00B4, ItemClassification.progression),
+    "Warp Pad": ItemData("Key Items", 0xEB00B5, ItemClassification.progression, 0),
+    "Diamond": ItemData("Key Items", 0xEB00B6, ItemClassification.progression),
+    "Signed Banana": ItemData("Key Items", 0xEB00B7, ItemClassification.progression),
+    "Pencil Eraser": ItemData("Key Items", 0xEB00B8, ItemClassification.progression),
+    "Hieroglyph Copy": ItemData("Key Items", 0xEB00B9, ItemClassification.progression),
+    "Meteotite": ItemData("Field Items", 0xEB00BA, ItemClassification.useful, 0),
+    "Contact Lens": ItemData("Key Items", 0xEB00BB, ItemClassification.progression),
+
+    "Hand-Aid": ItemData("Food", 0xEB00BC, ItemClassification.useful),
+    "Trout Yogurt": ItemData("Food", 0xEB00BD, ItemClassification.filler, 0),
+    "Banana": ItemData("Food", 0xEB00BE, ItemClassification.filler, 0),
+    "Calorie Stick": ItemData("Food", 0xEB00BF, ItemClassification.filler, 0),
+    "Key to the Tower": ItemData("Key Items", 0xEB00C0, ItemClassification.progression),
+    "Meteorite Piece": ItemData("Key Items", 0xEB00C1, ItemClassification.progression),
+
+    "Earth Pendant": ItemData("Body Equipment", 0xEB00C2, ItemClassification.useful, 0),
+    "Neutralizer": ItemData("Jeff Items", 0xEB00C3, ItemClassification.useful),
+    "Sound Stone": ItemData("Key Items", 0xEB00C4, ItemClassification.progression, 0),
+    "Exit Mouse": ItemData("Key Items", 0xEB00C5, ItemClassification.useful, 0),
+
+    "Gelato de Resort": ItemData("Food", 0xEB00C6, ItemClassification.filler, 0),
+    "Snake": ItemData("Battle Items", 0xEB00C7, ItemClassification.filler, 0),
+    "Viper": ItemData("Battle Items", 0xEB00C8, ItemClassification.filler, 0),
+    "Brain Stone": ItemData("Battle Items", 0xEB00C9, ItemClassification.filler),
+    "Police Badge": ItemData("Key Items", 0xEB00CA, ItemClassification.progression),
+    "Mining Permit": ItemData("Key Items", 0xEB00CB, ItemClassification.progression),
+    "Suporma": ItemData("Field Items", 0xEB00CC, ItemClassification.trap),
+    "Key to the Locker": ItemData("Key Items", 0xEB00CD, ItemClassification.progression),
+    "Insignificant Item": ItemData("Key Items", 0xEB00CE, ItemClassification.progression),
+    "Magic Tart": ItemData("Food", 0xEB00CF, ItemClassification.useful, 0),
+    "Tiny Ruby": ItemData("Key Items", 0xEB00D0, ItemClassification.progression),
+    "Monkey's Love": ItemData("Battle Items", 0xEB00D1, ItemClassification.useful),
+    "Eraser Eraser": ItemData("Key Items", 0xEB00D2, ItemClassification.progression),
+    "Tendakraut": ItemData("Key Items", 0xEB00D3, ItemClassification.progression),
+
+    "T-Rex's Bat": ItemData("Ness Weapons", 0xEB00D4, ItemClassification.useful, 0),
+    # "Big League Bat": ItemData("Ness Weapons", 0xEB0016, ItemClassification.useful, 0), Summers copy
+    "Ultimate Bat": ItemData("Ness Weapons", 0xEB00D6, ItemClassification.useful, 0),
+    "Double Beam": ItemData("Jeff Weapons", 0xEB00D7, ItemClassification.useful, 0),
+    # "Platinum Band": ItemData("Arm Equipment", 0xEB00D8, ItemClassification.useful, 0), Summers copy
+    # "Diamond Band": ItemData("Arm Equipment", 0xEB00D9, ItemClassification.useful, 0), Summers Copy
+    "Defense Ribbon": ItemData("Ribbons", 0xEB00DA, ItemClassification.useful, 0),
+    "Talisman Ribbon": ItemData("Ribbons", 0xEB00DB, ItemClassification.useful),
+    "Saturn Ribbon": ItemData("Ribbons", 0xEB00DC, ItemClassification.useful),
+    "Coin of Silence": ItemData("Other Equipment", 0xEB00DD, ItemClassification.useful, 0),
+    "Charm Coin": ItemData("Other Equipment", 0xEB00DE, ItemClassification.useful, 0),
+
+    "Cup of Noodles": ItemData("Food", 0xEB00DF, ItemClassification.filler, 0),
+    "Repel Sandwich": ItemData("Food", 0xEB00E0, ItemClassification.useful, 0),
+    "Repel Superwich": ItemData("Food", 0xEB00E1, ItemClassification.useful, 0),
+    "Lucky Sandwich": ItemData("Food", 0xEB00E2, ItemClassification.useful, 0),
+    "Progressive Bat": ItemData("Progressive Equipment", 0xEB00E3, ItemClassification.useful, 0), 
+    "Progressive Fry Pan": ItemData("Progressive Equipment", 0xEB00E4, ItemClassification.useful, 0),
+    "Progressive Gun": ItemData("Progressive Equipment", 0xEB00E5, ItemClassification.useful, 0),
+    "Progressive Bracelet": ItemData("Progressive Equipment", 0xEB00E6, ItemClassification.useful, 0),
+    "Progressive Other": ItemData("Progressive Equipment", 0xEB00E7, ItemClassification.useful, 0),
+
+    "Cup of Coffee": ItemData("Food", 0xEB00E8, ItemClassification.filler, 0),
+    "Double Burger": ItemData("Food", 0xEB00E9, ItemClassification.filler, 0),
+    "Peanut Cheese Bar": ItemData("Food", 0xEB00EA, ItemClassification.filler, 0),
+    "Piggy Jelly": ItemData("Food", 0xEB00EB, ItemClassification.filler, 0),
+    "Bowl of Rice Gruel": ItemData("Food", 0xEB00EC, ItemClassification.filler, 0),
+    "Bean Croquette": ItemData("Food", 0xEB00ED, ItemClassification.filler, 0),
+    "Molokheiya Soup": ItemData("Food", 0xEB00EE, ItemClassification.filler, 0),
+    "Plain Roll": ItemData("Food", 0xEB00EF, ItemClassification.filler, 0),
+    "Kabob": ItemData("Food", 0xEB00F0, ItemClassification.filler, 0),
+    "Plain Yogurt": ItemData("Food", 0xEB00F1, ItemClassification.filler, 0),
+    "Beef Jerky": ItemData("Food", 0xEB00F2, ItemClassification.filler, 0),
+    "Mammoth Burger": ItemData("Food", 0xEB00F3, ItemClassification.filler, 0),
+    "Spicy Jerky": ItemData("Food", 0xEB00F4, ItemClassification.filler, 0),
+    "Luxury Jerky": ItemData("Food", 0xEB00F5, ItemClassification.filler, 0),
+    "Bottle of DXwater": ItemData("Food", 0xEB00F6, ItemClassification.useful, 0),
+    "Magic Pudding": ItemData("Food", 0xEB00F7, ItemClassification.useful, 0),
+
+    "Non-Stick Frypan": ItemData("Paula Weapons", 0xEB00F8, ItemClassification.useful, 0),
+    "Mr. Saturn Coin": ItemData("Other Equipment", 0xEB00F9, ItemClassification.useful),
+    "Meteornium": ItemData("Field Items", 0xEB00FA, ItemClassification.useful, 0),
+    "Popsicle": ItemData("Food", 0xEB00FB, ItemClassification.filler, 0),
+    "Cup of Lifenoodles": ItemData("Status Heal", 0xEB00FC, ItemClassification.useful, 0),
+    "Carrot Key": ItemData("Key Items", 0xEB00FD, ItemClassification.progression),
+
+    "Onett Teleport": ItemData("PSI", 0xEB00FE, ItemClassification.progression),
+    "Twoson Teleport": ItemData("PSI", 0xEB00FF, ItemClassification.progression),
+    "Happy-Happy Village Teleport": ItemData("PSI", 0xEB0100, ItemClassification.progression),
+    "Threed Teleport": ItemData("PSI", 0xEB0101, ItemClassification.progression),
+    "Saturn Valley Teleport": ItemData("PSI", 0xEB0102, ItemClassification.progression),
+    "Dusty Dunes Teleport": ItemData("PSI", 0xEB0103, ItemClassification.progression),
+    "Fourside Teleport": ItemData("PSI", 0xEB0104, ItemClassification.progression),
+    "Winters Teleport": ItemData("PSI", 0xEB0105, ItemClassification.progression),
+    "Summers Teleport": ItemData("PSI", 0xEB0106, ItemClassification.progression),
+    "Scaraba Teleport": ItemData("PSI", 0xEB0107, ItemClassification.progression),
+    "Dalaam Teleport": ItemData("PSI", 0xEB0108, ItemClassification.progression),
+    "Deep Darkness Teleport": ItemData("PSI", 0xEB0109, ItemClassification.progression),
+    "Tenda Village Teleport": ItemData("PSI", 0xEB010A, ItemClassification.progression),
+    "Lost Underworld Teleport": ItemData("PSI", 0xEB010B, ItemClassification.progression),
+    "Progressive Poo PSI": ItemData("PSI", 0xEB010C, ItemClassification.useful, 2),
+    "Magicant Teleport": ItemData("PSI", 0xEB010D, ItemClassification.progression),
+
+    "Paula": ItemData("Characters", 0xEB010E, ItemClassification.progression),
+    "Jeff": ItemData("Characters", 0xEB010F, ItemClassification.progression),
+    "Poo": ItemData("Characters", 0xEB0110, ItemClassification.progression),
+    "Flying Man": ItemData("Characters", 0xEB0111, ItemClassification.useful),
+    "Ness": ItemData("Characters", 0xEB0112, ItemClassification.progression),
+    "Photograph": ItemData("Photos", 0xEB0113, ItemClassification.trap, 0),
+
+    "$10": ItemData("Money", 0xEB0114, ItemClassification.filler, 0),
+    "$100": ItemData("Money", 0xEB0115, ItemClassification.filler, 0),
+    "$1000": ItemData("Money", 0xEB0116, ItemClassification.useful, 0),
+
+    'Threed Tunnels Clear': ItemData('Events', None, ItemClassification.progression, 0),
+    'Submarine to Deep Darkness': ItemData('Events', None, ItemClassification.progression, 0),
+    'Melody': ItemData('Events', None, ItemClassification.progression, 0),
+    'Saved Earth': ItemData('Events', None, ItemClassification.progression, 0),
+    "Power of the Earth": ItemData("Events", None, ItemClassification.progression, 0),
+    "Alternate Goal": ItemData("Events", None, ItemClassification.useful, 0),
+    "Valley Bridge Repair": ItemData("Events", None, ItemClassification.progression, 0),
+    "Magicant Unlock": ItemData("Events", None, ItemClassification.progression, 0),
+    "ATM Access": ItemData("Events", None, ItemClassification.progression, 0)
+}
+
+
+def get_item_names_per_category() -> Dict[str, Set[str]]:
+    categories: Dict[str, Set[str]] = {}
+
+    for name, data in item_table.items():
+        if data.category != "Events":
+            categories.setdefault(data.category, set()).add(name)
+
+    return categories
diff --git a/worlds/earthbound/Locations.py b/worlds/earthbound/Locations.py
new file mode 100644
index 0000000000..8b5e5f78cd
--- /dev/null
+++ b/worlds/earthbound/Locations.py
@@ -0,0 +1,594 @@
+from typing import List, Optional, NamedTuple, TYPE_CHECKING
+from .Options import MagicantMode, ShopRandomizer
+
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+
+
+class LocationData(NamedTuple):
+    region: str
+    name: str
+    code: Optional[int]
+
+
+def get_locations(world: "EarthBoundWorld") -> List[LocationData]:
+
+    location_table: List[LocationData] = [
+        LocationData("Northern Onett", "Onett - Tracy Gift", 0xEB0000),
+        LocationData("Northern Onett", "Onett - Tracy's Room Present", 0xEB0001),
+        LocationData("Northern Onett", "Onett - Hilltop Present", 0xEB0002),
+        LocationData("Northern Onett", "Onett - Meteor Item", 0xEB0003),
+        LocationData("Northern Onett", "Onett - Buzz Buzz", 0xEB0004),
+        LocationData("Northern Onett", "Onett - Mani Mani Statue", 0xEB0005),
+        LocationData("Onett", "Onett - Library Counter", 0xEB0006),
+        LocationData("Onett", "Onett - Library Bookshelf", 0xEB0007),
+        LocationData("Onett", "Onett - Burger Shop Trashcan", 0xEB0008),
+        LocationData("Onett", "Onett - Treehouse Guy", 0xEB0009),
+        LocationData("Onett", "Onett - South Road Present", 0xEB000A),
+        LocationData("Onett", "Onett - Hotel Trashcan", 0xEB000B),
+        LocationData("Onett", "Onett - Arcade Trashcan", 0xEB000C),
+        LocationData("Onett", "Onett - Mayor Pirkle", 0xEB000D),
+        LocationData("Onett", "Onett - Traveling Entertainer", 0xEB000E),
+        LocationData("Giant Step", "Giant Step - First Cave Present", 0xEB000F),
+        LocationData("Giant Step", "Giant Step - Floor 2 Cave Present", 0xEB0010),
+        LocationData("Giant Step", "Giant Step - Floor 3 Present", 0xEB0011),
+        LocationData("Twoson", "Twoson - Bike Shop Rental", 0xEB0012),
+        LocationData("Twoson", "Twoson - Antique Shop", 0xEB0013),
+        LocationData("Twoson", "Twoson - Paula's Room Present", 0xEB0014),
+        LocationData("Twoson", "Twoson - Apple Kid Trashcan", 0xEB0015),
+        LocationData("Twoson", "Twoson - South of Town Present", 0xEB0016),
+        LocationData("Twoson", "Twoson - Orange Kid Donation", 0xEB0017),
+        LocationData("Twoson", "Twoson - Apple Kid Invention", 0xEB0018),
+        LocationData("Twoson", "Twoson - Apple Kid's Mouse", 0xEB0019),
+        LocationData("Twoson", "Twoson - Paula's Mother", 0xEB001A),
+        LocationData("Everdred's House", "Twoson - Everdred Meeting", 0xEB001B),
+        LocationData("Twoson", "Twoson - Insignificant Location", 0xEB001C),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - Split Hill Present", 0xEB001D),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - Hill Nook Present", 0xEB001E),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - South of Bridge Present", 0xEB001F),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - Dead End Present", 0xEB0020),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - River Overlook Present", 0xEB0021),
+        LocationData("Peaceful Rest Valley", "Peaceful Rest Valley - North Side Present", 0xEB0022),
+        LocationData("Happy-Happy Village", "Happy-Happy Village - Donation Lady", 0xEB0023),
+        LocationData("Happy-Happy HQ", "Happy-Happy Village - Right HQ Present", 0xEB0024),
+        LocationData("Happy-Happy HQ", "Happy-Happy Village - Left HQ Present", 0xEB0025),
+        LocationData("Happy-Happy Village", "Happy-Happy Village - Prisoner Item", 0xEB0026),
+        LocationData("Happy-Happy Village", "Happy-Happy Village - Prisoner", 0xEB0027),
+        LocationData("Happy-Happy HQ", "Happy-Happy Village - Defeat Carpainter", 0xEB0028),
+        LocationData("Lilliput Steps", "Lilliput Steps - Southwest Pool Present", 0xEB0029),
+        LocationData("Lilliput Steps", "Lilliput Steps - East Cliff Present", 0xEB002A),
+        LocationData("Lilliput Steps", "Lilliput Steps - North Stream Present", 0xEB002B),
+        LocationData("Boogey Tent", "Threed - Boogey Tent Trashcan", 0xEB002C),
+        LocationData("Threed", "Threed - Cemetery Trashcan", 0xEB002D),
+        LocationData("Threed", "Threed - Downtown Trashcan", 0xEB002E),
+        LocationData("Threed", "Threed - East Side Trashcan", 0xEB002F),
+        LocationData("Threed", "Threed - Northeast Shack Trashcan", 0xEB0030),
+        LocationData("Threed", "Threed - Hospital Drawer", 0xEB0031),
+        LocationData("Threed", "Threed - Zombie Prisoner", 0xEB0032),
+        LocationData("Threed Underground", "Threed Underground - Left Coffin", 0xEB0033),
+        LocationData("Threed Underground", "Threed Underground - Right Coffin", 0xEB0034),
+        LocationData("Grapefruit Falls", "Grapefruit Falls - South Present", 0xEB0035),
+        LocationData("Grapefruit Falls", "Grapefruit Falls - North Present", 0xEB0036),
+        LocationData("Grapefruit Falls", "Grapefruit Falls - Saturn Cave Present", 0xEB0037),
+        LocationData("Saturn Valley", "Saturn Valley - Ladder Present", 0xEB0038),
+        LocationData("Saturn Valley", "Saturn Valley - Trashcan #1", 0xEB0039),
+        LocationData("Saturn Valley", "Saturn Valley - Trashcan #2", 0xEB003A),
+        LocationData("Saturn Valley", "Saturn Valley - Trashcan #3", 0xEB003B),
+        LocationData("Upper Saturn Valley", "Saturn Valley - Saturn Coffee", 0xEB003C),
+        LocationData("Saturn Valley", "Saturn Valley - Post Belch Gift #1", 0xEB003D),
+        LocationData("Saturn Valley", "Saturn Valley - Post Belch Gift #2", 0xEB003E),
+        LocationData("Saturn Valley", "Saturn Valley - Post Belch Gift #3", 0xEB003F),
+        LocationData("Milky Well", "Milky Well - Cavern Present", 0xEB0040),
+        LocationData("Belch's Factory", "Belch's Factory - Top Right Room Trashcan", 0xEB0041),
+        LocationData("Belch's Factory", "Belch's Factory - Pit Room Trashcan #1", 0xEB0042),
+        LocationData("Belch's Factory", "Belch's Factory - Pit Room Trashcan #2", 0xEB0043),
+        LocationData("Belch's Factory", "Belch's Factory - Balcony Room Trashcan #1", 0xEB0044),
+        LocationData("Belch's Factory", "Belch's Factory - Balcony Room Trashcan #2", 0xEB0045),
+        LocationData("Belch's Factory", "Belch's Factory - Balcony Room Trashcan #3", 0xEB0046),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Northwest Corner Present", 0xEB0047),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - South Side Present", 0xEB0048),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Surrounding Rocks Present", 0xEB0049),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Black Sesame Present", 0xEB004A),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Oasis Present", 0xEB004B),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Northeast Corner Present", 0xEB004C),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - North Central Present", 0xEB004D),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Shining Spot", 0xEB004E),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - East Peninsula Present", 0xEB004F),
+        LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Reward", 0xEB0050),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #1", 0xEB0051),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #2", 0xEB0052),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #3", 0xEB0053),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #4", 0xEB0054),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #5", 0xEB0055),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #6", 0xEB0056),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Many Present Room Present #7", 0xEB0057),
+        LocationData("Scaraba", "Scaraba - Snake Bag Salesman", 0xEB0058),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Upper Right Locker", 0xEB0059),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Upper Left Locker", 0xEB005A),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Bottom Right Locker", 0xEB005B),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Bottom Left Locker", 0xEB005C),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Maxwell Item", 0xEB005D),
+        LocationData("Snow Wood Boarding School", "Snow Wood - Bedroom", 0xEB005E),
+        LocationData("Winters", "Winters - Drugstore Saleswoman", 0xEB005F),
+        LocationData("Brickroad Maze", "Brick Road Maze - Top Path Present", 0xEB0060),
+        LocationData("Brickroad Maze", "Brick Road Maze - Guarded Present", 0xEB0061),
+        LocationData("Brickroad Maze", "Brick Road Maze - Out of the Way Present", 0xEB0062),
+        LocationData("Brickroad Maze", "Brick Road Maze - Alcove Present", 0xEB0063),
+        LocationData("Brickroad Maze", "Brick Road Maze - Near Exit Present", 0xEB0064),
+        LocationData("Rainy Circle", "Rainy Circle - Isolated Present", 0xEB0065),
+        LocationData("Rainy Circle", "Rainy Circle - East Cliff Present", 0xEB0066),
+        LocationData("Rainy Circle", "Rainy Circle - Near Ropes Present", 0xEB0067),
+        LocationData("Andonuts Lab Area", "Andonuts Lab - Present", 0xEB0068),
+        LocationData("Andonuts Lab Area", "Andonuts Lab - Mouse", 0xEB0069),
+        LocationData("Stonehenge Base", "Stonehenge - Purple Maze Present", 0xEB006A),
+        LocationData("Stonehenge Base", "Stonehenge - Dead End Present", 0xEB006B),
+        LocationData("Stonehenge Base", "Stonehenge - Near End of the Maze Present", 0xEB006C),
+        LocationData("Stonehenge Base", "Stonehenge - Bridge Room East Balcony Present", 0xEB006D),
+        LocationData("Stonehenge Base", "Stonehenge - Bridge Room Lower Present", 0xEB006E),
+        LocationData("Stonehenge Base", "Stonehenge - Flashing Room Right Path Present", 0xEB006F),
+        LocationData("Stonehenge Base", "Stonehenge - Flashing Room Center Present", 0xEB0070),
+        LocationData("Stonehenge Base", "Stonehenge - Flashing Room Upper Present", 0xEB0071),
+        LocationData("Stonehenge Base", "Stonehenge - Kidnapped Mr. Saturn", 0xEB0072),
+        LocationData("Stonehenge Base", "Stonehenge - Tony Item", 0xEB0073),
+        LocationData("Gold Mine", "Gold Mine - Mouse Crossroad Present #1", 0xEB0074),
+        LocationData("Gold Mine", "Gold Mine - Mouse Crossroad Present #2", 0xEB0075),
+        LocationData("Gold Mine", "Gold Mine - B1F Lonely Mole Present", 0xEB0076),
+        LocationData("Gold Mine", "Gold Mine - South Hall Present", 0xEB0077),
+        LocationData("Gold Mine", "Gold Mine - South Corner Present", 0xEB0078),
+        LocationData("Gold Mine", "Gold Mine - South Mole Present #1", 0xEB0079),
+        LocationData("Gold Mine", "Gold Mine - South Mole Present #2", 0xEB007A),
+        LocationData("Gold Mine", "Gold Mine - North Crossroad Detour Present", 0xEB007B),
+        LocationData("Gold Mine", "Gold Mine - North Mole Present", 0xEB007C),
+        LocationData("Gold Mine", "Gold Mine - West Mole Present", 0xEB007D),
+        LocationData("Gold Mine", "Gold Mine - B1F Isolated Present", 0xEB007E),
+        LocationData("Gold Mine", "Gold Mine - West Crossroad Detour Present", 0xEB007F),
+        LocationData("Gold Mine", "Gold Mine - B1F Junction Present", 0xEB0080),
+        LocationData("Gold Mine", "Gold Mine - B1F Junction Mole Present", 0xEB0081),
+        LocationData("Monkey Caves", "Monkey Caves - 1F Right Chest", 0xEB00F1),
+        LocationData("Monkey Caves", "Monkey Caves - 1F Left Chest", 0xEB00F2),
+        LocationData("Monkey Caves", "Monkey Caves - West 2F Left Chest", 0xEB00F3),
+        LocationData("Monkey Caves", "Monkey Caves - West 2F Right Chest #1", 0xEB00F4),
+        LocationData("Monkey Caves", "Monkey Caves - West 2F Right Chest #2", 0xEB00F5),
+        LocationData("Monkey Caves", "Monkey Caves - East 2F Left Chest", 0xEB00F6),
+        LocationData("Monkey Caves", "Monkey Caves - East 2F Right Chest", 0xEB00F7),
+        LocationData("Monkey Caves", "Monkey Caves - East West 3F Right Chest #1", 0xEB00F8),
+        LocationData("Monkey Caves", "Monkey Caves - East West 3F Right Chest #2", 0xEB00F9),
+        LocationData("Monkey Caves", "Monkey Caves - West End Chest", 0xEB0082),
+        LocationData("Monkey Caves", "Monkey Caves - West End Trashcan", 0xEB0083),
+        LocationData("Monkey Caves", "Monkey Caves - East End Chest", 0xEB0084),
+        LocationData("Monkey Caves", "Monkey Caves - East End Trashcan", 0xEB0085),
+        LocationData("Monkey Caves", "Monkey Caves - Bow Monkey Gift", 0xEB0086),
+        LocationData("Monkey Caves", "Monkey Caves - Talah Rama Chest #1", 0xEB0087),
+        LocationData("Monkey Caves", "Monkey Caves - Talah Rama Chest #2", 0xEB0088),
+        LocationData("Monkey Caves", "Monkey Caves - Talah Rama Gift", 0xEB0089),
+        LocationData("Monkey Caves", "Monkey Caves - Monkey Power", 0xEB008A),
+        LocationData("Fourside", "Fourside - Venus Gift", 0xEB008B),
+        LocationData("Moonside", "Fourside - Post-Moonside Delivery", 0xEB008C),
+        LocationData("Fourside", "Fourside - Bakery 2F Gift", 0xEB008D),
+        LocationData("Moonside", "Moonside - Two Trees Present", 0xEB008E),
+        LocationData("Moonside", "Moonside - East Island Present", 0xEB008F),
+        LocationData("Moonside", "Moonside - Businessman Present", 0xEB0090),
+        LocationData("Moonside", "Moonside - West Island Present", 0xEB0091),
+        LocationData("Moonside", "Moonside - Hospital Present", 0xEB0092),
+        LocationData("Fourside Dept. Store", "Fourside - Department Store Blackout", 0xEB0093),
+        LocationData("Magnet Hill", "Magnet Hill - West Entrance Trashcan", 0xEB0094),
+        LocationData("Magnet Hill", "Magnet Hill - First Room Free Door Trashcan", 0xEB0095),
+        LocationData("Magnet Hill", "Magnet Hill - First Room Barrel Door Trashcan", 0xEB0096),
+        LocationData("Magnet Hill", "Magnet Hill - Second Room Dead End Trashcan", 0xEB0097),
+        LocationData("Magnet Hill", "Magnet Hill - Final Room Door Trashcan", 0xEB0098),
+        LocationData("Magnet Hill", "Fourside - Magnet Hill Chest", 0xEB0099),
+        LocationData("Monotoli Building", "Monotoli Building - One Table Present", 0xEB009A),
+        LocationData("Monotoli Building", "Monotoli Building - Two Table Present", 0xEB009B),
+        LocationData("Monotoli Building", "Monotoli Building - Electra Gift", 0xEB009C),
+        LocationData("Monotoli Building", "Monotoli Building - Monotoli Gift", 0xEB009D),
+        LocationData("Monotoli Building", "Monotoli Building - Monotoli Character", 0xEB009E),
+        LocationData("Summers Museum", "Summers - Museum Item", 0xEB009F),
+        LocationData("Summers", "Summers - Magic Cake", 0xEB00A0),
+        LocationData("Dalaam", "Dalaam - Throne Room Chest #1", 0xEB00A1),
+        LocationData("Dalaam", "Dalaam - Throne Room Chest #2", 0xEB00A2),
+        LocationData("Dalaam", "Dalaam - Throne Room Chest #3", 0xEB00A3),
+        LocationData("Dalaam", "Dalaam - Trial of Mu", 0xEB00A4),
+        LocationData("Dalaam", "Dalaam - Restaurant Chest #1", 0xEB00A5),
+        LocationData("Dalaam", "Dalaam - Restaurant Chest #2", 0xEB00A6),
+        LocationData("Dalaam", "Dalaam - Do Do Guy's House Chest", 0xEB00A7),
+        LocationData("Dalaam", "Dalaam - Upper House Chest", 0xEB00A8),
+        LocationData("Dalaam", "Dalaam - Throne Character", 0xEB00A9),
+        LocationData("Ness's Mind", "Poo - Starting Item", 0xEB00AA),
+        LocationData("Pink Cloud", "Pink Cloud - Three Holes Present", 0xEB00AB),
+        LocationData("Pink Cloud", "Pink Cloud - Left Hole Present", 0xEB00AC),
+        LocationData("Pink Cloud", "Pink Cloud - Ground Floor Present", 0xEB00AD),
+        LocationData("Pyramid", "Pyramid - Anteroom Sarcophagus", 0xEB00AE),
+        LocationData("Pyramid", "Pyramid - Northwest Door Sarcophagus", 0xEB00AF),
+        LocationData("Pyramid", "Pyramid - Hallway Sarcophagus #1", 0xEB00B0),
+        LocationData("Pyramid", "Pyramid - Hallway Sarcophagus #2", 0xEB00B1),
+        LocationData("Pyramid", "Pyramid - Switch Room Sarcophagus", 0xEB00B2),
+        LocationData("Pyramid", "Pyramid - Pedestal Item", 0xEB00B3),
+        LocationData("Pyramid", "Pyramid - Way Out Sarcophagus", 0xEB00B4),
+        LocationData("Southern Scaraba", "Scaraba - Star Master", 0xEB00B5),
+        LocationData("Southern Scaraba", "Scaraba - Key Holder", 0xEB00B6),
+        LocationData("Dungeon Man", "Dungeon Man - 1F Dead End Present", 0xEB00B7),
+        LocationData("Dungeon Man", "Dungeon Man - 1F Long Walk Present", 0xEB00B8),
+        LocationData("Dungeon Man", "Dungeon Man - 1F Disappointing Present", 0xEB00B9),
+        LocationData("Dungeon Man", "Dungeon Man - 1F Opinion Present", 0xEB00BA),
+        LocationData("Dungeon Man", "Dungeon Man - 1F No Sign Present", 0xEB00BB),
+        LocationData("Dungeon Man", "Dungeon Man - 2F Unnecessary Billboard Present", 0xEB00BC),
+        LocationData("Dungeon Man", "Dungeon Man - 2F Dungeon Exploration Present", 0xEB00BD),
+        LocationData("Dungeon Man", "Dungeon Man - 2F South Ledge Present", 0xEB00BE),
+        LocationData("Dungeon Man", "Dungeon Man - 2F North Alcove Present", 0xEB00BF),
+        LocationData("Dungeon Man", "Dungeon Man - 3F Present", 0xEB00C0),
+        LocationData("Dungeon Man", "Dungeon Man - 2F Hole Present", 0xEB00C1),
+        LocationData("Dungeon Man", "Dungeon Man - 1F Exit Ledge Present", 0xEB00C2),
+        LocationData("Deep Darkness", "Deep Darkness - Teleporting Monkey", 0xEB00C3),
+        LocationData("Deep Darkness", "Deep Darkness - Crest of Darkness Present", 0xEB00C4),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Helicopter Present", 0xEB00C5),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Yellow Bird Present", 0xEB00C6),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Swamp Present", 0xEB00C7),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Corner Present", 0xEB00C8),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Alcove Present", 0xEB00C9),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - North Alcove Truffle", 0xEB00CA),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Near Land Truffle", 0xEB00CB),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Present Truffle", 0xEB00CC),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Village Truffle", 0xEB00CD),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Entrance Truffle", 0xEB00CE),
+        LocationData("Deep Darkness Darkness", "Deep Darkness - Barf Character", 0xEB00CF),
+        LocationData("Tenda Village", "Tenda Village - Trashcan", 0xEB00D0),
+        LocationData("Tenda Village", "Tenda Village - Tenda Tea", 0xEB00D1),
+        LocationData("Tenda Village", "Tenda Village - Tenda Gift", 0xEB00D2),
+        LocationData("Tenda Village", "Tenda Village - Tenda Gift #2", 0xEB00D3),
+        LocationData("Lumine Hall", "Lumine Hall - B1F Non-Talkative Rock Present", 0xEB00D4),
+        LocationData("Lumine Hall", "Lumine Hall - 1F North Path Present", 0xEB00D5),
+        LocationData("Lumine Hall", "Lumine Hall - B1F Thankful Rock Corner Present", 0xEB00D6),
+        LocationData("Lumine Hall", "Lumine Hall - B1F Thankful Rock Junction Present", 0xEB00D7),
+        LocationData("Lumine Hall", "Lumine Hall - 1F Above Belly Button Present", 0xEB00D8),
+        LocationData("Lumine Hall", "Lumine Hall - B1F Belly Button Present", 0xEB00D9),
+        LocationData("Lumine Hall", "Lumine Hall - 1F Near Exit Present", 0xEB00DA),
+        LocationData("Lumine Hall", "Lumine Hall - 1F Dead End Present", 0xEB00DB),
+        LocationData("Lumine Hall", "Lumine Hall - B1F West Alcove Present", 0xEB00DC),
+        LocationData("Lost Underworld", "Lost Underworld - Talking Rock", 0xEB00DD),
+        LocationData("Lost Underworld", "Lost Underworld - East Present", 0xEB00DE),
+        LocationData("Lost Underworld", "Lost Underworld - Northeast Present", 0xEB00DF),
+        LocationData("Lost Underworld", "Lost Underworld - Northeast of Tenda Tribe Present", 0xEB00E0),
+        LocationData("Lost Underworld", "Lost Underworld - Southwest of Tenda Tribe Present", 0xEB00E1),
+        LocationData("Lost Underworld", "Lost Underworld - Evacuation Present", 0xEB00E2),
+        LocationData("Fire Spring", "Fire Spring - 1st Cave Present", 0xEB00E3),
+        LocationData("Fire Spring", "Fire Spring - East Corner Present", 0xEB00E4),
+        LocationData("Fire Spring", "Fire Spring - Volcano Present", 0xEB00E5),
+        LocationData("Fire Spring", "Fire Spring - Lone Cave Present", 0xEB00E6),
+        LocationData("Fire Spring", "Fire Spring - Upper Volcano Present", 0xEB00E7),
+        LocationData("Cave of the Present", "Cave of the Present - Star Master", 0xEB00EE),
+        LocationData("Cave of the Present", "Cave of the Present - Broken Phase Distorter", 0xEB00EF),
+
+        LocationData("Happy-Happy HQ", "Carpainter Defeated", None),
+        LocationData("Belch's Factory", "Belch Defeated", None),
+        LocationData("Dungeon Man", "Dungeon Man Submarine", None),
+        LocationData("Giant Step", "Giant Step Sanctuary", None),
+        LocationData("Lilliput Steps", "Lilliput Steps Sanctuary", None),
+        LocationData("Milky Well", "Milky Well Sanctuary", None),
+        LocationData("Rainy Circle", "Rainy Circle Sanctuary", None),
+        LocationData("Magnet Hill", "Magnet Hill Sanctuary", None),
+        LocationData("Pink Cloud", "Pink Cloud Sanctuary", None),
+        LocationData("Lumine Hall", "Lumine Hall Sanctuary", None),
+        LocationData("Fire Spring", "Fire Spring Sanctuary", None),
+        LocationData("Ness's Mind", "Sanctuary Goal", None),
+        LocationData("Global ATM Access", "Any ATM", None)
+    ]
+
+    if world.options.giygas_required:
+        location_table += [
+            LocationData("Cave of the Past", "Cave of the Past - Present", 0xEB00F0),
+            LocationData("Endgame", "Giygas", None),
+        ]
+
+    if world.options.alternate_sanctuary_goal:
+        location_table += [
+            LocationData("Ness's Mind", "+2 Sanctuaries", None)
+        ]
+
+    if world.options.magicant_mode in range(1, 3):
+        location_table += [
+            LocationData("Sea of Eden", "Magicant - Ness's Nightmare", None),
+        ]
+
+    if not world.options.magicant_mode:
+        location_table += [
+            LocationData("Sea of Eden", "Magicant - Ness's Nightmare", 0xEB00ED),
+        ]
+
+    if world.options.magicant_mode < MagicantMode.option_alternate_goal:
+        location_table += [
+            LocationData("Magicant", "Magicant - Ness's Gift", 0xEB00E8),
+            LocationData("Magicant", "Magicant - Present Near Ness", 0xEB00E9),
+            LocationData("Magicant", "Magicant - Lonely Present", 0xEB00EA),
+            LocationData("Magicant", "Magicant - North Present", 0xEB00EB),
+            LocationData("Magicant", "Magicant - Hills Present", 0xEB00EC),
+            LocationData("Magicant", "Magicant - Town Present", 0xEB00FA)
+        ]
+    if world.options.magicant_mode == MagicantMode.option_alternate_goal:
+        location_table += [
+            LocationData("Ness's Mind", "+1 Sanctuary", None)
+        ]
+
+    if world.options.shop_randomizer == ShopRandomizer.option_shopsanity:
+        location_table += [
+            LocationData("Onett", "Onett Drugstore - Right Counter Slot 1", 0xeb1000),
+            LocationData("Onett", "Onett Drugstore - Right Counter Slot 2", 0xeb1001),
+            LocationData("Onett", "Onett Drugstore - Right Counter Slot 3", 0xeb1002),
+            LocationData("Onett", "Onett Drugstore - Right Counter Slot 4", 0xeb1003),
+            LocationData("Onett", "Onett Drugstore - Right Counter Slot 5", 0xeb1004),
+            LocationData("Onett", "Onett Drugstore - Left Counter", 0xeb1007),
+            LocationData("Summers", "Summers - Beach Cart", 0xeb100e),
+            LocationData("Onett", "Onett Burger Shop - Slot 1", 0xeb1015),
+            LocationData("Onett", "Onett Burger Shop - Slot 2", 0xeb1016),
+            LocationData("Onett", "Onett Burger Shop - Slot 3", 0xeb1017),
+            LocationData("Onett", "Onett Burger Shop - Slot 4", 0xeb1018),
+            LocationData("Onett", "Onett Bakery - Slot 1", 0xeb101c),
+            LocationData("Onett", "Onett Bakery - Slot 2", 0xeb101d),
+            LocationData("Onett", "Onett Bakery - Slot 3", 0xeb101e),
+            LocationData("Onett", "Onett Bakery - Slot 4", 0xeb101f),
+            LocationData("Twoson", "Twoson Department Store Burger Shop - Slot 1", 0xeb1023),
+            LocationData("Twoson", "Twoson Department Store Burger Shop - Slot 2", 0xeb1024),
+            LocationData("Twoson", "Twoson Department Store Burger Shop - Slot 3", 0xeb1025),
+            LocationData("Twoson", "Twoson Department Store Burger Shop - Slot 4", 0xeb1026),
+            LocationData("Twoson", "Twoson Department Store Bakery - Slot 1", 0xeb102a),
+            LocationData("Twoson", "Twoson Department Store Bakery - Slot 2", 0xeb102b),
+            LocationData("Twoson", "Twoson Department Store Bakery - Slot 3", 0xeb102c),
+            LocationData("Twoson", "Twoson Department Store Bakery - Slot 4", 0xeb102d),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 1", 0xeb1031),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 2", 0xeb1032),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 3", 0xeb1033),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 4", 0xeb1034),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 5", 0xeb1035),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Right Counter Slot 6", 0xeb1036),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Left Counter Slot 1", 0xeb1038),
+            LocationData("Twoson", "Twoson Department Store Top Floor - Left Counter Slot 2", 0xeb1039),
+            LocationData("Summers", "Summers - Magic Cake Cart Shop Slot", 0xeb103f),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 1", 0xeb1046),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 2", 0xeb1047),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 3", 0xeb1048),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 4", 0xeb1049),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 5", 0xeb104a),
+            LocationData("Twoson", "Burglin Park Junk Shop - Slot 6", 0xeb104b),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 1", 0xeb105b),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 2", 0xeb105c),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 3", 0xeb105d),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 4", 0xeb105e),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 5", 0xeb105f),
+            LocationData("Twoson", "Burglin Park Bread Stand - Slot 6", 0xeb1060),
+            LocationData("Twoson", "Burglin Park - Banana Stand", 0xeb1062),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Right Counter Slot 1", 0xeb1069),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Right Counter Slot 2", 0xeb106a),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Right Counter Slot 3", 0xeb106b),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Right Counter Slot 4", 0xeb106c),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Right Counter Slot 5", 0xeb106d),
+            LocationData("Threed", "Threed Drugstore - Right Counter Slot 1", 0xeb1070),
+            LocationData("Threed", "Threed Drugstore - Right Counter Slot 2", 0xeb1071),
+            LocationData("Threed", "Threed Drugstore - Right Counter Slot 3", 0xeb1072),
+            LocationData("Threed", "Threed Drugstore - Right Counter Slot 4", 0xeb1073),
+            LocationData("Threed", "Threed Drugstore - Right Counter Slot 5", 0xeb1074),
+            LocationData("Threed", "Threed Drugstore - Left Counter Slot 1", 0xeb1077),
+            LocationData("Threed", "Threed Drugstore - Left Counter Slot 2", 0xeb1078),
+            LocationData("Threed", "Threed Drugstore - Left Counter Slot 3", 0xeb1079),
+            LocationData("Threed", "Threed Drugstore - Left Counter Slot 4", 0xeb107a),
+            LocationData("Threed", "Threed Drugstore - Left Counter Slot 5", 0xeb107b),
+            LocationData("Threed", "Threed - Arms Dealer Slot 1", 0xeb107e),
+            LocationData("Threed", "Threed - Arms Dealer Slot 2", 0xeb107f),
+            LocationData("Threed", "Threed - Arms Dealer Slot 3", 0xeb1080),
+            LocationData("Threed", "Threed - Arms Dealer Slot 4", 0xeb1081),
+            LocationData("Threed", "Threed Bakery - Slot 1", 0xeb1085),
+            LocationData("Threed", "Threed Bakery - Slot 2", 0xeb1086),
+            LocationData("Threed", "Threed Bakery - Slot 3", 0xeb1087),
+            LocationData("Threed", "Threed Bakery - Slot 4", 0xeb1088),
+            LocationData("Threed", "Threed Bakery - Slot 5", 0xeb1089),
+            LocationData("Threed", "Threed Bakery - Slot 6", 0xeb108a),
+            LocationData("Threed", "Threed Bakery - Slot 7", 0xeb108b),
+            LocationData("Scaraba", "Scaraba - Expensive Water Guy", 0xeb108c),
+            LocationData("Winters", "Winters Drugstore - Slot 1", 0xeb1093),
+            LocationData("Winters", "Winters Drugstore - Slot 2", 0xeb1094),
+            LocationData("Winters", "Winters Drugstore - Slot 3", 0xeb1095),
+            LocationData("Winters", "Winters Drugstore - Slot 4", 0xeb1096),
+            LocationData("Winters", "Winters Drugstore - Slot 5", 0xeb1097),
+            LocationData("Winters", "Winters Drugstore - Slot 6", 0xeb1098),
+            LocationData("Winters", "Winters Drugstore - Slot 7", 0xeb1099),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Center Saturn Slot 1", 0xeb109a),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Center Saturn Slot 2", 0xeb109b),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Center Saturn Slot 3", 0xeb109c),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Center Saturn Slot 4", 0xeb109d),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Center Saturn Slot 5", 0xeb109e),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Counter Slot 1", 0xeb10a1),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Counter Slot 2", 0xeb10a2),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Counter Slot 3", 0xeb10a3),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Counter Slot 4", 0xeb10a4),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Counter Slot 5", 0xeb10a5),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Arms Dealer Slot 1", 0xeb10a8),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Arms Dealer Slot 2", 0xeb10a9),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Arms Dealer Slot 3", 0xeb10aa),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Arms Dealer Slot 4", 0xeb10ab),
+            LocationData("Fourside", "Fourside Bakery - Slot 1", 0xeb10af),
+            LocationData("Fourside", "Fourside Bakery - Slot 2", 0xeb10b0),
+            LocationData("Fourside", "Fourside Bakery - Slot 3", 0xeb10b1),
+            LocationData("Fourside", "Fourside Bakery - Slot 4", 0xeb10b2),
+            LocationData("Fourside", "Fourside Bakery - Slot 5", 0xeb10b3),
+            LocationData("Fourside", "Fourside Bakery - Slot 6", 0xeb10b4),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 1", 0xeb10b6),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 2", 0xeb10b7),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 3", 0xeb10b8),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 4", 0xeb10b9),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 5", 0xeb10ba),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 6", 0xeb10bb),
+            LocationData("Fourside", "Fourside Department Store - Tool Shop Slot 7", 0xeb10bc),
+            LocationData("Fourside", "Fourside Department Store - Shop Shop Slot 1", 0xeb10bd),
+            LocationData("Fourside", "Fourside Department Store - Shop Shop Slot 2", 0xeb10be),
+            LocationData("Fourside", "Fourside Department Store - Shop Shop Slot 3", 0xeb10bf),
+            LocationData("Fourside", "Fourside Department Store - Shop Shop Slot 4", 0xeb10c0),
+            LocationData("Fourside", "Fourside Department Store - Food Shop Slot 1", 0xeb10c4),
+            LocationData("Fourside", "Fourside Department Store - Food Shop Slot 2", 0xeb10c5),
+            LocationData("Fourside", "Fourside Department Store - Food Shop Slot 3", 0xeb10c6),
+            LocationData("Fourside", "Fourside Department Store - Food Shop Slot 4", 0xeb10c7),
+            LocationData("Fourside", "Fourside Department Store - Food Shop Slot 5", 0xeb10c8),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 1", 0xeb10cb),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 2", 0xeb10cc),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 3", 0xeb10cd),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 4", 0xeb10ce),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 5", 0xeb10cf),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 6", 0xeb10d0),
+            LocationData("Fourside", "Fourside Department Store - 2F Cart Slot 7", 0xeb10d1),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 1", 0xeb10d2),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 2", 0xeb10d3),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 3", 0xeb10d4),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 4", 0xeb10d5),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 5", 0xeb10d6),
+            LocationData("Fourside", "Fourside Department Store - Toys Shop Slot 6", 0xeb10d7),
+            LocationData("Fourside", "Fourside Department Store - Sports Shop Slot 1", 0xeb10d9),
+            LocationData("Fourside", "Fourside Department Store - Sports Shop Slot 2", 0xeb10da),
+            LocationData("Fourside", "Fourside Department Store - Sports Shop Slot 3", 0xeb10db),
+            LocationData("Fourside", "Fourside Department Store - Sports Shop Slot 4", 0xeb10dc),
+            LocationData("Fourside", "Fourside Department Store - Burger Shop Slot 1", 0xeb10e0),
+            LocationData("Fourside", "Fourside Department Store - Burger Shop Slot 2", 0xeb10e1),
+            LocationData("Fourside", "Fourside Department Store - Burger Shop Slot 3", 0xeb10e2),
+            LocationData("Fourside", "Fourside Department Store - Burger Shop Slot 4", 0xeb10e3),
+            LocationData("Fourside", "Fourside Department Store - Burger Shop Slot 5", 0xeb10e4),
+            LocationData("Fourside", "Fourside Department Store - Arms Dealer Slot 1", 0xeb10e7),
+            LocationData("Fourside", "Fourside Department Store - Arms Dealer Slot 2", 0xeb10e8),
+            LocationData("Fourside", "Fourside Department Store - Arms Dealer Slot 3", 0xeb10e9),
+            LocationData("Fourside", "Fourside Department Store - Arms Dealer Slot 4", 0xeb10ea),
+            LocationData("Fourside", "Fourside Department Store - Arms Dealer Slot 5", 0xeb10eb),
+            LocationData("Fourside", "Fourside - Northeast Alley Junk Shop Slot 1", 0xeb10ee),
+            LocationData("Fourside", "Fourside - Northeast Alley Junk Shop Slot 2", 0xeb10ef),
+            LocationData("Fourside", "Fourside - Northeast Alley Junk Shop Slot 3", 0xeb10f0),
+            LocationData("Fourside", "Fourside - Northeast Alley Junk Shop Slot 4", 0xeb10f1),
+            LocationData("Summers", "Summers - Scam Shop Slot 1", 0xeb1103),
+            LocationData("Summers", "Summers - Scam Shop Slot 2", 0xeb1104),
+            LocationData("Summers", "Summers - Scam Shop Slot 3", 0xeb1105),
+            LocationData("Summers", "Summers - Scam Shop Slot 4", 0xeb1106),
+            LocationData("Summers", "Summers - Scam Shop Slot 5", 0xeb1107),
+            LocationData("Summers", "Summers - Scam Shop Slot 6", 0xeb1108),
+            LocationData("Summers", "Summers - Scam Shop Slot 7", 0xeb1109),
+            LocationData("Summers", "Summers Harbor - Shop Slot 1", 0xeb110a),
+            LocationData("Summers", "Summers Harbor - Shop Slot 2", 0xeb110b),
+            LocationData("Summers", "Summers Harbor - Shop Slot 3", 0xeb110c),
+            LocationData("Summers", "Summers Harbor - Shop Slot 4", 0xeb110d),
+            LocationData("Summers", "Summers Harbor - Shop Slot 5", 0xeb110e),
+            LocationData("Summers", "Summers Harbor - Shop Slot 6", 0xeb110f),
+            LocationData("Summers", "Summers Harbor - Shop Slot 7", 0xeb1110),
+            LocationData("Summers", "Summers Restaurant - Slot 1", 0xeb1111),
+            LocationData("Summers", "Summers Restaurant - Slot 2", 0xeb1112),
+            LocationData("Summers", "Summers Restaurant - Slot 3", 0xeb1113),
+            LocationData("Summers", "Summers Restaurant - Slot 4", 0xeb1114),
+            LocationData("Summers", "Summers Restaurant - Slot 5", 0xeb1115),
+            LocationData("Summers", "Summers Restaurant - Slot 6", 0xeb1116),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 1", 0xeb1118),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 2", 0xeb1119),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 3", 0xeb111a),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 4", 0xeb111b),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 5", 0xeb111c),
+            LocationData("Scaraba", "Scaraba - Indoors Shop Slot 6", 0xeb111d),
+            LocationData("Scaraba", "Scaraba Bazaar - Red Snake Carpet Slot 1", 0xeb1126),
+            LocationData("Scaraba", "Scaraba Bazaar - Red Snake Carpet Slot 2", 0xeb1127),
+            LocationData("Scaraba", "Scaraba Bazaar - Red Snake Carpet Slot 3", 0xeb1128),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 1", 0xeb112d),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 2", 0xeb112e),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 3", 0xeb112f),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 4", 0xeb1130),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 5", 0xeb1131),
+            LocationData("Scaraba", "Scaraba Bazaar - Bottom Left Carpet Slot 6", 0xeb1132),
+            LocationData("Scaraba", "Scaraba Hotel - Arms Dealer Slot 1", 0xeb1134),
+            LocationData("Scaraba", "Scaraba Hotel - Arms Dealer Slot 2", 0xeb1135),
+            LocationData("Scaraba", "Scaraba Hotel - Arms Dealer Slot 3", 0xeb1136),
+            LocationData("Scaraba", "Scaraba Hotel - Arms Dealer Slot 4", 0xeb1137),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 1", 0xeb113b),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 2", 0xeb113c),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 3", 0xeb113d),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 4", 0xeb113e),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 5", 0xeb113f),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 6", 0xeb1140),
+            LocationData("Deep Darkness", "Deep Darkness - Businessman Slot 7", 0xeb1141),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Post-Belch Saturn Slot 1", 0xeb1157),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Post-Belch Saturn Slot 2", 0xeb1158),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Post-Belch Saturn Slot 3", 0xeb1159),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Post-Belch Saturn Slot 4", 0xeb115a),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 1", 0xeb115e),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 2", 0xeb115f),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 3", 0xeb1160),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 4", 0xeb1161),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 5", 0xeb1162),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 6", 0xeb1163),
+            LocationData("Southern Scaraba", "Scaraba - Southern Camel Shop Slot 7", 0xeb1164),
+            LocationData("Deep Darkness", "Deep Darkness - Arms Dealer Slot 1", 0xeb1165),
+            LocationData("Deep Darkness", "Deep Darkness - Arms Dealer Slot 2", 0xeb1166),
+            LocationData("Deep Darkness", "Deep Darkness - Arms Dealer Slot 3", 0xeb1167),
+            LocationData("Deep Darkness", "Deep Darkness - Arms Dealer Slot 4", 0xeb1168),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 1", 0xeb116c),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 2", 0xeb116d),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 3", 0xeb116e),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 4", 0xeb116f),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 5", 0xeb1170),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 6", 0xeb1171),
+            LocationData("Lost Underworld", "Lost Underworld - Tenda Camp Shop Slot 7", 0xeb1172),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 1", 0xeb117a),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 2", 0xeb117b),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 3", 0xeb117c),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 4", 0xeb117d),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 5", 0xeb117e),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 6", 0xeb117f),
+            LocationData("Happy-Happy Village", "Happy-Happy Village Drugstore - Left Counter Slot 7", 0xeb1180),
+            LocationData("Grapefruit Falls", "Grapefruit Falls - Hiker Shop Slot 1", 0xeb1181),
+            LocationData("Grapefruit Falls", "Grapefruit Falls - Hiker Shop Slot 2", 0xeb1182),
+            LocationData("Grapefruit Falls", "Grapefruit Falls - Hiker Shop Slot 3", 0xeb1183),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 1", 0xeb1188),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 2", 0xeb1189),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 3", 0xeb118a),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 4", 0xeb118b),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 5", 0xeb118c),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 6", 0xeb118d),
+            LocationData("Saturn Valley", "Saturn Valley Shop - Top Saturn Slot 7", 0xeb118e),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 1", 0xeb118f),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 2", 0xeb1190),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 3", 0xeb1191),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 4", 0xeb1192),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 5", 0xeb1193),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 6", 0xeb1194),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes Drugstore - Left Shop Slot 7", 0xeb1195),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 1", 0xeb1196),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 2", 0xeb1197),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 3", 0xeb1198),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 4", 0xeb1199),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 5", 0xeb119a),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 6", 0xeb119b),
+            LocationData("Dusty Dunes Desert", "Dusty Dunes - Mine Food Cart Slot 7", 0xeb119c),
+            LocationData("Moonside", "Moonside Hotel - Shop Slot 1", 0xeb119d),
+            LocationData("Moonside", "Moonside Hotel - Shop Slot 2", 0xeb119e),
+            LocationData("Moonside", "Moonside Hotel - Shop Slot 3", 0xeb119f),
+            LocationData("Moonside", "Moonside Hotel - Shop Slot 4", 0xeb11a0),
+            LocationData("Moonside", "Moonside Hotel - Shop Slot 5", 0xeb11a1),
+            LocationData("Dalaam", "Dalaam Restaurant - Slot 1", 0xeb11a4),
+            LocationData("Dalaam", "Dalaam Restaurant - Slot 2", 0xeb11a5),
+            LocationData("Dalaam", "Dalaam Restaurant - Slot 3", 0xeb11a6),
+            LocationData("Dalaam", "Dalaam Restaurant - Slot 4", 0xeb11a7),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 1", 0xeb11ab),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 2", 0xeb11ac),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 3", 0xeb11ad),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 4", 0xeb11ae),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 5", 0xeb11af),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 6", 0xeb11b0),
+            LocationData("Scaraba", "Scaraba Bazaar - Delicacy Shop Slot 7", 0xeb11b1),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 1", 0xeb11b2),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 2", 0xeb11b3),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 3", 0xeb11b4),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 4", 0xeb11b5),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 5", 0xeb11b6),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 6", 0xeb11b7),
+            LocationData("Common Condiment Shop", "Twoson/Scaraba - Shared Condiment Shop Slot 7", 0xeb11b8),
+            LocationData("Andonuts Lab Area", "Andonuts Lab - Caveman Shop Slot 1", 0xeb11c0),
+            LocationData("Andonuts Lab Area", "Andonuts Lab - Caveman Shop Slot 2", 0xeb11c1),
+            LocationData("Andonuts Lab Area", "Andonuts Lab - Caveman Shop Slot 3", 0xeb11c2),
+            LocationData("Andonuts Lab Area", "Andonuts Lab - Caveman Shop Slot 4", 0xeb11c3),
+            LocationData("Andonuts Lab Area", "Andonuts Lab - Caveman Shop Slot 5", 0xeb11c4)
+        ]
+
+        if world.options.magicant_mode < MagicantMode.option_alternate_goal:
+            location_table += [
+                LocationData("Magicant", "Magicant - Shop Slot 1", 0xeb10f5),
+                LocationData("Magicant", "Magicant - Shop Slot 2", 0xeb10f6)
+            ]
+
+    return location_table
diff --git a/worlds/earthbound/Options.py b/worlds/earthbound/Options.py
new file mode 100644
index 0000000000..40dd90d633
--- /dev/null
+++ b/worlds/earthbound/Options.py
@@ -0,0 +1,625 @@
+from dataclasses import dataclass
+from Options import (Toggle, DefaultOnToggle, DeathLink, Choice, Range, PerGameCommonOptions, StartInventoryPool,
+                     OptionGroup, FreeText, Visibility, PlandoBosses)
+from .modules.boss_shuffle import boss_plando_keys 
+
+
+class GiygasRequired(DefaultOnToggle):
+    """If enabled, your goal will be to defeat Giygas at the Cave of the Past.
+       If disabled, your goal will either complete automatically upon completing
+       enough Sanctuaries, or completing Magicant if it is required."""
+    display_name = "Giygas Required"
+
+
+class SanctuariesRequired(Range):
+    """How many of the eight "Your Sanctuary" locations are required to be cleared."""
+    display_name = "Required Sanctuaries"
+    range_start = 1
+    range_end = 8
+    default = 4
+
+
+class SanctuaryAltGoal(Toggle):
+    """If enabled, you will be able to win by completing 2 more Sanctuaries than are required.
+       Does nothing if 7 or more Sanctuaries are required, or if Magicant and Giygas are not required."""
+    display_name = "Sanctuary Alternate Goal"
+
+
+class MagicantMode(Choice):
+    """PSI Location: You will be able to find a Magicant teleport item. Ness's Nightmare contains a PSI location, and no stat boost.
+       Required: You will unlock the Magicant Teleport upon reaching your Sanctuary goal. If Giygas is required, beating Ness's Nightmare will unlock the Cave of the Past and grant a party-wide stat boost. Otherwise, Ness's Nightmare will finish your game.
+       Alternate Goal: You will unlock the Magicant Teleport upon reaching one more Sanctuary than required. Beating Ness's Nightmare will finish your game. Does nothing if Giygas is not required, or if 8 Sanctuaries are required. Magicant locations are removed from the multiworld, but contain random junk for yourself.
+       Optional Boost: You will be able to find a Magicant teleport item. Beating Ness's Nightmare will grant a party-wide stat boost. Magicant locations are removed from the multiworld, but contain random junk for yourself.
+       Removed: Magicant will be completely inacessible."""
+    display_name = "Magicant Mode"
+    option_psi_location = 0
+    option_required = 1
+    option_alternate_goal = 2
+    option_optional_boost = 3
+    option_removed = 4
+    default = 0
+
+
+class MonkeyCavesMode(Choice):
+    """Chests: Items required to finish the Monkey Caves will be forcibly placed on the chests that can be found in-between rooms of the monkey caves. The "reward" locations, usually found at the end of a branch, are still random. If you waste chest items, they will need to be replaced via the methods in hunt mode.
+       Hunt: Items required to finish the Monkey Caves will needsell you every minor item needed to be found outside. They can be obtained from the Dusty Dunes drugstore, the Fourside department store, and the pizza shop in either Twoson or Threed.
+       Shop: The monkey outside the Monkey Caves will sell every item needed to complete the caves and is not affected by shop randomization.
+       Solved: The Monkey Caves monkeys will already be moved out of the way and not require any items."""
+    display_name = "Monkey Caves Mode"
+    option_chests = 0
+    option_hunt = 1
+    option_shop = 2
+    option_solved = 3
+    default = 1
+    
+
+class ShortenPrayers(DefaultOnToggle):
+    """If enabled, the Prayer cutscenes while fighting Giygas will be skipped, excluding the final one."""
+    display_name = "Skip Prayer Sequences"
+
+
+class RandomStartLocation(Toggle):
+    """If disabled, you will always start at Ness's house with no teleports unlocked.
+       If enabled, you will start at a random teleport destination with one teleport unlocked.
+       Additionally, you will need to fight Captain Strong to access the north part of Onett if this is enabled."""
+    display_name = "Random Starting Location"
+
+
+class LocalTeleports(Toggle):
+    """Forces all teleports and Poo PSI to be placed locally in your world."""
+    display_name = "Local Teleports"
+
+
+class CharacterShuffle(Choice):
+    """Shuffled: Characters will be shuffled amongst Character Locations. Extra locations will have Flying Man, a Teddy Bear, or a Super Plush Bear.
+       Anywhere: Characters can be found anywhere in the multiworld, and character locations will have regular checks.
+       See the Game Page for more information on Character Locations."""
+    display_name = "Character Shuffle"
+    option_shuffled = 0
+    option_anywhere = 1
+    default = 0
+
+
+class PSIShuffle(Choice):
+    """None: Characters will learn their normal PSI skills.
+       Basic: Offensive and Assist PSI will be shuffled. Recovery PSI is not modified. Ness's Favorite Thing will be named Wave in other slots.
+       Extended: Basic shuffle, but includes Jeff gadgets and some combat items.
+       See the Game Page for more information."""
+    display_name = "PSI Shuffle"
+    option_none = 0
+    option_basic = 1
+    option_extended = 2
+
+
+class BossShuffle(PlandoBosses):
+    """Shuffles boss encounters amongst each other."""
+    display_name = "Boss Shuffle"
+
+    option_false = 0
+    option_true = 1
+    default = 0
+    bosses = boss_plando_keys
+    locations = boss_plando_keys
+    duplicate_bosses = False
+
+    @classmethod
+    def can_place_boss(cls, boss: str, location: str) -> bool:
+        return True
+
+
+class DecoupleDiamondDog(Toggle):
+    """Shuffles Diamond Dog as a boss separate from Carbon Dog. Carbon Dog will transform into a random boss.
+       Does nothing if Boss Shuffle is disabled."""
+    display_name = "Decouple Diamond Dog"
+
+
+class ShuffleGiygas(Toggle):
+    """Adds the standalone Giygas fight to the shuffled boss pool.
+       This only applies to the second phase Giygas. The prayer fight is not affected.
+       Does nothing if Boss Shuffle is disabled."""
+    display_name = "Add Giygas to Boss Pool"
+
+
+class BanFlashFavorite(Toggle):
+    """If enabled, allows PSI Flash to be shuffled onto the Favorite Thing PSI slot. Can be quite annoying early-game. 
+       Does nothing if PSI Shuffle is set to None."""
+    display_name = "Flash as Favorite"
+
+
+class PreFixItems(Toggle):
+    """If enabled, broken items in the multiworld pool will be replaced with their fixed versions.
+       This does not affect any items that are not placed by the multiworld."""
+    display_name = "Prefixed Items"
+
+
+class AutoscaleParty(Toggle):
+    """If enabled, joining party members will be scaled to roughly the level of the sphere they were obtained in."""
+    display_name = "Autoscale Party Members"
+
+
+class ProgressiveWeapons(Toggle):
+    """If enabled, Bats, Fry Pans, and Guns will be progressive. Does not apply to items dropped by enemies or found in shops."""
+    display_name = "Progressive Weapons"
+
+
+class ProgressiveArmor(Toggle):
+    """If enabled, Bracelets and items for the Other slot besides Ribbons will be progressive. Does not apply to items dropped by enemies or found in shops."""
+    display_name = "Progressive Armor"
+
+
+class PresentSprites(DefaultOnToggle):
+    """If enabled, Presents, Trash cans, and chests will have their appearance modified to be indicative of the item they contain."""
+    display_name = "Match Present Sprites"
+
+
+class NoAPPresents(Toggle):
+    """If enabled, present that contain items for other players will appear as EarthBound presents (trashcan, present, and chest) instead of Archipelago boxes.
+       Does nothing if Presents Match Contents is disabled."""
+
+
+class ShuffleDrops(Toggle):
+    """If enabled, enemies will drop random filler items. This does not put checks on enemy drops.
+       Drop rates are unchanged."""
+    display_name = "Shuffle Drops"
+
+
+class RandomFranklinBadge(Toggle):
+    """If enabled, the Franklin Badge will reflect a randomly selected attack type. The type can be determined from the item's name, as well as the help
+       text for it. The badge's function outside of battle will not change, and neither will its name outside of the game itself."""
+    display_name = "Franklin Badge Protection"
+
+
+class CommonWeight(Range):
+    """Weight for placing a common filler item."""
+    display_name = "Common Filler Weight"
+    range_start = 1
+    range_end = 100
+    default = 80
+
+
+class UncommonWeight(Range):
+    """Weight for placing an uncommon filler item."""
+    display_name = "Uncommon Filler Weight"
+    range_start = 1
+    range_end = 100
+    default = 30
+
+
+class RareWeight(Range):
+    """Weight for placing a rare filler item."""
+    display_name = "Rare Filler Weight"
+    range_start = 0
+    range_end = 100
+    default = 5
+
+
+class MoneyWeight(Range):
+    """Weight for placing money in the item pool."""
+    display_name = "Money Weight"
+    range_start = 0
+    range_end = 100
+    default = 0
+
+
+class ExperienceModifier(Range):
+    """Percentage of EXP enemies give you. 100 is vanilla, after scaling, and 300 is x3."""
+    display_name = "Experience Percentage"
+    range_start = 100
+    range_end = 300
+    default = 150
+
+
+class StartingMoney(Range):
+    """How much money you start with."""
+    display_name = "Starting Money"
+    range_start = 0
+    range_end = 99999
+    default = 20
+
+
+class EasyDeaths(DefaultOnToggle):
+    """Fully revives and heals all party members after death. If off, only Ness will be healed with 0 PP."""
+    display_name = "Easy Deaths"
+
+
+class RandomFlavors(DefaultOnToggle):
+    """Randomizes the non-plain window color options."""
+    display_name = "Random Flavors"
+
+
+class DeathLinkMode(Choice):
+    """Controls how receiving a Deathlink functions in battle.
+       Instant: The player will be instantly defeated.
+       Mortal: All characters will receieve mortal damage. The player will not be able to heal until the battle is finished.
+       Mortal Mercy: All characters will receieve mortal damage, but the player will be able to heal it before they die.
+       Regardless of this setting, receiving a deathlink outside of battle will always instantly defeat the player."""
+    display_name = "Death Link Mode"
+    option_instant = 0
+    option_mortal = 1
+    option_mortal_mercy = 2
+    default = 1
+
+
+class RandomBattleBG(Toggle):
+    """Generates random battle backgrounds."""
+    display_name = "Randomize Battle Backgrounds"
+
+
+class RandomSwirlColors(Toggle):
+    """Generates random colors for pre-battle swirls."""
+    display_name = "Randomize Swirl Colors"
+
+
+class RemoteItems(Toggle):
+    """If enabled, you will receive your own items from the server upon collecting them, rather than locally.
+       This allows co-op within the same game, and protects against loss of save data.
+       However, you will not be able to play offline if this is enabled."""
+    display_name = "Remote Items"
+
+
+class PlandoLumineHallText(FreeText):
+    """Set text to be displayed at Lumine Hall. If nothing is entered, random community-submitted text will be selected instead."""
+    display_name = "Lumine Hall Text Plando"
+    visibility = Visibility.none
+
+
+class Armorizer(Choice):
+    """All equippable armor will have randomly generated attributes. This includes who can equip it, elemental resistance (and how strong that resistance is),
+       defense, and the secondary stat it increases (Either Luck or Speed, depending on armor slot.) Choosing "Help!" from the Goods menu will give you exact details
+       on that piece of equipment.
+       Keep Type: Equipment will keep its original equipment slot. If Progressive Armor is enabled, you will get armor with progressively higher defense. 
+       Chaos: Equipment will have a randomly selected slot. It will try to respect the defense progressively, but the type may not match the type received."""
+    display_name = "Armorizer"
+    option_off = 0
+    option_keep_type = 1
+    option_chaos = 2
+    default = 0
+
+
+class Weaponizer(Choice):
+    """All weapons will have randomly generated attributes. This includes offense, guts boost, and miss rate.
+       Keep Type: Equipment will keep the character that was originally able to use it. If Progressive Weapons is enabled, you will get weapons with progressively higher offense.
+       Chaos: Equipment will be able to be equipped by a randomly selected character. It will try to respect the offense progresively, but the type may not match the type recieved.
+       The Tee Ball Bat will always be a weapon for Ness."""
+    display_name = "Weaponizer"
+    option_off = 0
+    option_keep_type = 1
+    option_chaos = 2
+    default = 0
+
+
+class ElementChance(Range):
+    """Percent chance for any given Body/Other equipment to have elemental protection.
+       Affects Armorizer only."""
+    display_name = "Elemental Resistance Chance"
+    range_start = 1
+    range_end = 50
+    default = 15
+
+
+class NoFreeSancs(Toggle):
+    """If enabled, the entrance to Lilliput Steps and Fire Spring will be locked and require extra key items to access.
+       These items are the Tiny Key and Tenda Lavapants, respectively."""
+    display_name = "No Free Sanctuaries"
+
+
+class RandomizeFanfares(Choice):
+    """Randomizes fanfares."""
+    display_name = "Randomize Fanfares"
+    option_off = 0
+    option_on = 1
+    option_on_no_sound_stone_fanfares = 2
+    default = 0
+
+
+class RandomizeBattleMusic(Toggle):
+    """Randomizes in-battle songs."""
+    display_name = "Randomize Battle Music"
+
+
+class RandomizeOverworldMusic(Choice):
+    """Randomizes music on the overworld. Some sound effects might sound weird.
+       Normal: Does not randomize music.
+       Match Type: Music will be randomized with similar song categories (Town, dungeon, etc.)
+       Full: Overworld music will be randomized disregarding categories."""
+    display_name = "Overworld Music Randomizer"
+    option_normal = 0
+    option_match_type = 1
+    option_full = 2
+    default = 0
+
+
+class RandomizePSIPalettes(Choice):
+    """Randomizes the colors of PSI spells.
+       Normal: Doesn't randomize PSI colors.
+       Shuffled: PSI spell palettes are swapped around with each other.
+       Randomized: PSI spells use completely random colors."""
+    display_name = "Random PSI Palettes"
+    option_normal = 0
+    option_shuffled = 1
+    option_randomized = 2
+    default = 0
+
+
+class ShopRandomizer(Choice):
+    """Randomizes items in shops.
+       Local Filler: Shops contain only random items for yourself and are not checks.
+       Shopsanity. Every shop slot in the game contains a Multiworld location. ONLY ENABLE SHOPSANITY IF YOU KNOW WHAT YOU ARE DOING."""
+    display_name = "Shop Randomizer"
+    option_off = 0
+    option_local_filler = 1
+    option_shopsanity = 2
+    default = 0
+
+
+class ScoutShopChecks(Choice):
+    """Scouts Shop checks when you open a shop. Only affects shops in Shopsanity mode."""
+    display_name = "Scout Shop Checks"
+    option_off = 0
+    option_progression_only = 1
+    option_all = 2
+    default = 1
+
+
+class StartingCharacter(Choice):
+    """Sets which character you start as. Each character will always start with the ability to teleport,
+       and the ATM card. Ness will not be required to fight Sanctuary bosses."""
+    display_name = "Starting Character"
+    option_Ness = 0
+    option_Paula = 1
+    option_Jeff = 2
+    option_Poo = 3
+    default = 0
+
+
+class EquipamizerStatCap(DefaultOnToggle):
+    """If enabled, the highest value that Equipamizer can roll for a piece of equipment's
+       main stat will be capped. 80 for armor, 125 for weapons.
+       If disabled, the main stat can potentially roll up to 128."""
+    display_name = "Equipamizer Stat Cap"
+
+
+class MoneyDropMultiplier(Range):
+    """Multiplies money dropped by enemies by the chosen value."""
+    display_name = "Money Drop Multiplier"
+    range_start = 1
+    range_end = 100
+    default = 1
+
+
+class EnemyShuffle(Toggle):
+    """Shuffles Non-boss enemies amongst each other."""
+    display_name = "Enemy Shuffle"
+
+
+class SkipEpilogue(Toggle):
+    """If enabled, the choice to play the epilogue after beating Giygas will be removed, and you will
+       go directly to the credits. This option is mainly for no-release seeds where checks could be
+       potentially spoiled in the open-access epilogue."""
+    display_name = "Skip Epilogue"
+    visibility = Visibility.template
+
+
+class EnergyLink(Toggle):
+    """If enabled, the money in the ATM will be linked across the Archipelago Server.
+       This requires a server connection to be used, but won't break offline play."""
+    display_name = "Energy Link"
+
+
+class DungeonShuffle(Toggle):
+    """Shuffles Dungeon entrances amongst each other."""
+    display_name = "Dungeon Shuffle"
+
+
+class PhotoCount(Range):
+    """How many Photograph traps are placed in the item pool."""
+    display_name = "Photos in pool"
+    range_start = 0
+    range_end = 32
+    default = 20
+
+
+class EasyCombat(Toggle):
+    """Automatically halves all scaled enemy levels."""
+    display_name = "Easy Combat"
+
+
+class EnemizerStats(Toggle):
+    """Randomizes base stats and level of non-boss enemies."""
+    display_name = "Randomize Enemy Stats"
+
+
+class EnemizerAttacks(Toggle):
+    """Randomizes attacks of non-boss enemies."""
+    display_name = "Randomize Enemy Attacks"
+
+
+class EnemizerAttributes(Toggle):
+    """Randomizes most attributes of non-boss enemies."""
+    display_name = "Randomize Enemy Attributes"
+
+
+class RandomMapColors(Choice):
+    """Randomizes map colors.
+       Normal: Uses normal colors
+       Nice: Uses generally good looking palettes for maps with little artifacting.
+       Ugly: Allows map palettes with artifacting or colors that may not look good.
+       Nonsense: Allows really bad palettes or heavy artifacting."""
+    display_name = "Shuffle Map Palettes"
+    option_normal = 0
+    option_nice = 1
+    option_ugly = 2
+    option_nonsense = 3
+    default = 0
+
+class SafeFinalBoss(DefaultOnToggle):
+    """Prevents specific difficult bosses from being randomized onto Heavily Armed Pokey's boss slot.
+       Only affects Boss Shuffle, and does not affect Phase 2 Giygas if Boss Shuffle Add Giygas is enabled."""
+    display_name = "Safe Final Boss"
+
+
+@dataclass
+class EBOptions(PerGameCommonOptions):
+    giygas_required: GiygasRequired
+    sanctuaries_required: SanctuariesRequired
+    skip_prayer_sequences: ShortenPrayers
+    random_start_location: RandomStartLocation
+    alternate_sanctuary_goal: SanctuaryAltGoal
+    magicant_mode: MagicantMode
+    monkey_caves_mode: MonkeyCavesMode
+    local_teleports: LocalTeleports
+    character_shuffle: CharacterShuffle
+    starting_character: StartingCharacter
+    psi_shuffle: PSIShuffle
+    allow_flash_as_favorite_thing: BanFlashFavorite
+    enemy_shuffle: EnemyShuffle
+    boss_shuffle: BossShuffle
+    decouple_diamond_dog: DecoupleDiamondDog
+    boss_shuffle_add_giygas: ShuffleGiygas
+    safe_final_boss: SafeFinalBoss
+    randomize_enemy_attributes: EnemizerAttributes
+    randomize_enemy_stats: EnemizerStats
+    randomize_enemy_attacks: EnemizerAttacks
+    experience_modifier: ExperienceModifier
+    money_drop_multiplier: MoneyDropMultiplier
+    starting_money: StartingMoney
+    easy_deaths: EasyDeaths
+    easy_combat: EasyCombat
+    progressive_weapons: ProgressiveWeapons
+    progressive_armor: ProgressiveArmor
+    armorizer: Armorizer
+    weaponizer: Weaponizer
+    armorizer_resistance_chance: ElementChance
+    equipamizer_cap_stats: EquipamizerStatCap
+    auto_scale_party_members: AutoscaleParty
+    remote_items: RemoteItems
+    random_flavors: RandomFlavors
+    random_battle_backgrounds: RandomBattleBG
+    random_swirl_colors: RandomSwirlColors
+    presents_match_contents: PresentSprites
+    nonlocal_items_use_local_presents: NoAPPresents
+    prefixed_items: PreFixItems
+    total_photos: PhotoCount
+    randomize_franklinbadge_protection: RandomFranklinBadge
+    shuffle_enemy_drops: ShuffleDrops
+    common_filler_weight: CommonWeight
+    uncommon_filler_weight: UncommonWeight
+    rare_filler_weight: RareWeight
+    money_weight: MoneyWeight
+    plando_lumine_hall_text: PlandoLumineHallText
+    no_free_sanctuaries: NoFreeSancs
+    randomize_overworld_music: RandomizeOverworldMusic
+    randomize_battle_music: RandomizeBattleMusic
+    randomize_fanfares: RandomizeFanfares
+    randomize_psi_palettes: RandomizePSIPalettes
+    map_palette_shuffle: RandomMapColors
+    shop_randomizer: ShopRandomizer
+    scout_shop_checks: ScoutShopChecks
+    dungeon_shuffle: DungeonShuffle
+    skip_epilogue: SkipEpilogue
+    start_inventory_from_pool: StartInventoryPool
+    death_link: DeathLink
+    death_link_mode: DeathLinkMode
+    energy_link: EnergyLink
+
+
+eb_option_groups = [
+    OptionGroup("Goal Settings", [
+        GiygasRequired,
+        SanctuariesRequired,
+        SanctuaryAltGoal
+    ]),
+    
+    OptionGroup("Item Settings", [
+        LocalTeleports,
+        CharacterShuffle,
+        ProgressiveWeapons,
+        ProgressiveArmor,
+        RandomFranklinBadge,
+        CommonWeight,
+        UncommonWeight,
+        RareWeight,
+        MoneyWeight,
+        PreFixItems,
+        PhotoCount
+    ]),
+
+    OptionGroup("Equipamizer", [
+        Armorizer,
+        Weaponizer,
+        ElementChance,
+        EquipamizerStatCap
+    ]),
+
+    OptionGroup("World Modes", [
+        RandomStartLocation,
+        MagicantMode,
+        MonkeyCavesMode,
+        NoFreeSancs,
+        StartingCharacter
+    ]),
+
+    OptionGroup("PSI Randomization", [
+        PSIShuffle,
+        BanFlashFavorite
+    ]),
+
+    OptionGroup("Enemy Randomization", [
+        EnemyShuffle,
+        BossShuffle,
+        SafeFinalBoss,
+        DecoupleDiamondDog,
+        ShuffleGiygas,
+        ExperienceModifier,
+        ShuffleDrops,
+        MoneyDropMultiplier
+    ]),
+
+    OptionGroup("Enemizer", [
+        EnemizerAttributes,
+        EnemizerAttacks,
+        EnemizerStats
+    ]),
+
+    OptionGroup("Shop Randomization", [
+        ShopRandomizer,
+        ScoutShopChecks
+    ]),
+
+    OptionGroup("Entrance Randomization", [
+        DungeonShuffle
+    ]),
+
+    OptionGroup("Convenience Settings", [
+        ShortenPrayers,
+        EasyDeaths,
+        StartingMoney,
+        RemoteItems,
+        AutoscaleParty,
+        SkipEpilogue,
+        EasyCombat
+    ]),
+
+    OptionGroup("Aesthetic Settings", [
+        RandomFlavors,
+        RandomSwirlColors,
+        RandomBattleBG,
+        RandomMapColors,
+        PresentSprites,
+        NoAPPresents,
+        RandomizePSIPalettes,
+        PlandoLumineHallText
+    ]),
+
+    OptionGroup("Music Randomizer", [
+        RandomizeOverworldMusic,
+        RandomizeBattleMusic,
+        RandomizeFanfares
+    ]),
+
+    OptionGroup("Multiplayer Features", [
+        DeathLink,
+        DeathLinkMode,
+        EnergyLink
+    ])
+]
diff --git a/worlds/earthbound/Regions.py b/worlds/earthbound/Regions.py
new file mode 100644
index 0000000000..b5bea536b7
--- /dev/null
+++ b/worlds/earthbound/Regions.py
@@ -0,0 +1,279 @@
+from typing import List, Dict, TYPE_CHECKING, Optional
+from BaseClasses import Region, Location
+from .Locations import LocationData
+from .Options import MagicantMode
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+
+
+class EBLocation(Location):
+    game: str = "EarthBound"
+
+
+def init_areas(world: "EarthBoundWorld", locations: list[LocationData]) -> None:
+    multiworld = world.multiworld
+    player = world.player
+
+    locations_per_region = get_locations_per_region(locations)
+
+    regions = [
+        create_region(world, player, locations_per_region, "Menu"),
+        create_region(world, player, locations_per_region, "Ness's Mind"),
+        create_region(world, player, locations_per_region, "Global ATM Access"),
+        create_region(world, player, locations_per_region, "Northern Onett"),
+        create_region(world, player, locations_per_region, "Onett"),
+        create_region(world, player, locations_per_region, "Arcade"),
+        create_region(world, player, locations_per_region, "Giant Step"),
+        create_region(world, player, locations_per_region, "Twoson"),
+        create_region(world, player, locations_per_region, "Common Condiment Shop"),
+        create_region(world, player, locations_per_region, "Everdred's House"),
+        create_region(world, player, locations_per_region, "Peaceful Rest Valley"),
+        create_region(world, player, locations_per_region, "Happy-Happy Village"),
+        create_region(world, player, locations_per_region, "Happy-Happy HQ"),
+        create_region(world, player, locations_per_region, "Lilliput Steps"),
+        create_region(world, player, locations_per_region, "Threed"),
+        create_region(world, player, locations_per_region, "Threed Underground"),
+        create_region(world, player, locations_per_region, "Boogey Tent"),
+        create_region(world, player, locations_per_region, "Grapefruit Falls"),
+        create_region(world, player, locations_per_region, "Belch's Factory"),
+        create_region(world, player, locations_per_region, "Saturn Valley"),
+        create_region(world, player, locations_per_region, "Upper Saturn Valley"),
+        create_region(world, player, locations_per_region, "Milky Well"),
+        create_region(world, player, locations_per_region, "Dusty Dunes Desert"),
+        create_region(world, player, locations_per_region, "Gold Mine"),
+        create_region(world, player, locations_per_region, "Monkey Caves"),
+        create_region(world, player, locations_per_region, "Fourside"),
+        create_region(world, player, locations_per_region, "Moonside"),
+        create_region(world, player, locations_per_region, "Fourside Dept. Store"),
+        create_region(world, player, locations_per_region, "Magnet Hill"),
+        create_region(world, player, locations_per_region, "Monotoli Building"),
+        create_region(world, player, locations_per_region, "Winters"),
+        create_region(world, player, locations_per_region, "Snow Wood Boarding School"),
+        create_region(world, player, locations_per_region, "Southern Winters"),
+        create_region(world, player, locations_per_region, "Brickroad Maze"),
+        create_region(world, player, locations_per_region, "Rainy Circle"),
+        create_region(world, player, locations_per_region, "Andonuts Lab Area"),
+        create_region(world, player, locations_per_region, "Stonehenge Base"),
+        create_region(world, player, locations_per_region, "Summers"),
+        create_region(world, player, locations_per_region, "Summers Museum"),
+        create_region(world, player, locations_per_region, "Dalaam"),
+        create_region(world, player, locations_per_region, "Pink Cloud"),
+        create_region(world, player, locations_per_region, "Scaraba"),
+        create_region(world, player, locations_per_region, "Pyramid"),
+        create_region(world, player, locations_per_region, "Southern Scaraba"),
+        create_region(world, player, locations_per_region, "Dungeon Man"),
+        create_region(world, player, locations_per_region, "Deep Darkness"),
+        create_region(world, player, locations_per_region, "Deep Darkness Darkness"),
+        create_region(world, player, locations_per_region, "Tenda Village"),
+        create_region(world, player, locations_per_region, "Lumine Hall"),
+        create_region(world, player, locations_per_region, "Lost Underworld"),
+        create_region(world, player, locations_per_region, "Fire Spring"),
+        create_region(world, player, locations_per_region, "Magicant"),
+        create_region(world, player, locations_per_region, "Sea of Eden"),
+        create_region(world, player, locations_per_region, "Cave of the Present")
+
+    ]
+    if world.options.giygas_required:
+        regions.extend([
+            create_region(world, player, locations_per_region, "Cave of the Past"),
+            create_region(world, player, locations_per_region, "Endgame")
+        ])
+    multiworld.regions += regions
+
+def connect_area_exits(world: "EarthBoundWorld"):
+    multiworld = world.multiworld
+    player = world.player
+
+    connect_menu_region(world)
+    arcade_connection = world.dungeon_connections["Arcade"]
+    giant_step_connection = world.dungeon_connections["Giant Step"]
+    lilliput_steps_connection = world.dungeon_connections["Lilliput Steps"]
+    happy_happy_hq_connection = world.dungeon_connections["Happy-Happy HQ"]
+    belch_factory_connection = world.dungeon_connections["Belch's Factory"]
+    milky_well_connection = world.dungeon_connections["Milky Well"]
+    gold_mine_connection = world.dungeon_connections["Gold Mine"]
+    moonside_connection = world.dungeon_connections["Moonside"]
+    monotoli_building_connection = world.dungeon_connections["Monotoli Building"]
+    magnet_hill_connection = world.dungeon_connections["Magnet Hill"]
+    pink_cloud_connection = world.dungeon_connections["Pink Cloud"]
+    pyramid_connection = world.dungeon_connections["Pyramid"]
+    dungeon_man_connection = world.dungeon_connections["Dungeon Man"]
+    rainy_circle_connection = world.dungeon_connections["Rainy Circle"]
+    stonehenge_connection = world.dungeon_connections["Stonehenge Base"]
+    lumine_hall_connection = world.dungeon_connections["Lumine Hall"]
+    fire_spring_connection = world.dungeon_connections["Fire Spring"]
+    sea_of_eden_connection = world.dungeon_connections["Sea of Eden"]
+    brickroad_maze_connection = world.dungeon_connections["Brickroad Maze"]
+
+    multiworld.get_region("Ness's Mind", player).add_exits(["Onett", "Twoson", "Happy-Happy Village", "Threed", "Saturn Valley", "Dusty Dunes Desert", "Fourside", "Winters", "Summers", "Dalaam", "Scaraba", "Deep Darkness", "Tenda Village", "Lost Underworld", "Magicant"],
+                {"Onett": lambda state: state.has("Onett Teleport", player),
+                    "Twoson": lambda state: state.has("Twoson Teleport", player),
+                    "Happy-Happy Village": lambda state: state.has("Happy-Happy Village Teleport", player),
+                    "Threed": lambda state: state.has("Threed Teleport", player),
+                    "Saturn Valley": lambda state: state.has("Saturn Valley Teleport", player),
+                    "Dusty Dunes Desert": lambda state: state.has("Dusty Dunes Teleport", player),
+                    "Fourside": lambda state: state.has("Fourside Teleport", player),
+                    "Winters": lambda state: state.has("Winters Teleport", player),
+                    "Summers": lambda state: state.has("Summers Teleport", player),
+                    "Dalaam": lambda state: state.has("Dalaam Teleport", player),
+                    "Scaraba": lambda state: state.has("Scaraba Teleport", player),
+                    "Deep Darkness": lambda state: state.has("Deep Darkness Teleport", player),
+                    "Tenda Village": lambda state: state.has("Tenda Village Teleport", player),
+                    "Lost Underworld": lambda state: state.has("Lost Underworld Teleport", player),
+                    "Magicant": lambda state: state.has_any({"Magicant Teleport", "Magicant Unlock"}, player)})
+    multiworld.get_region("Northern Onett", player).add_exits(["Onett"])
+
+    multiworld.get_region("Onett", player).add_exits([giant_step_connection, "Twoson", "Northern Onett", "Global ATM Access", arcade_connection],
+                                                    {giant_step_connection: lambda state: state.has("Key to the Shack", player),
+                                                    "Twoson": lambda state: state.has("Police Badge", player),
+                                                    "Northern Onett": lambda state: state.has("Police Badge", player)})
+
+    multiworld.get_region("Twoson", player).add_exits(["Onett", "Peaceful Rest Valley", "Threed", "Everdred's House", "Global ATM Access", "Common Condiment Shop"],
+                    {"Onett": lambda state: state.has("Police Badge", player),
+                        "Peaceful Rest Valley": lambda state: state.has_any({"Pencil Eraser", "Valley Bridge Repair"}, player),
+                        "Threed": lambda state: state.has_any({"Threed Tunnels Clear", "Wad of Bills"}, player),
+                        "Everdred's House": lambda state: state.has("Paula", player)})
+
+    multiworld.get_region("Peaceful Rest Valley", player).add_exits(["Twoson", "Happy-Happy Village"],
+                                                                    {"Twoson": lambda state: state.has_any({"Pencil Eraser", "Valley Bridge Repair"}, player)})
+
+    multiworld.get_region("Happy-Happy Village", player).add_exits(["Peaceful Rest Valley", lilliput_steps_connection, "Global ATM Access", happy_happy_hq_connection])
+    
+    multiworld.get_region("Threed", player).add_exits(["Twoson", "Dusty Dunes Desert", "Andonuts Lab Area", "Threed Underground", "Boogey Tent", "Global ATM Access"],
+                                                    {"Twoson": lambda state: state.has("Threed Tunnels Clear", player),
+                                                    "Dusty Dunes Desert": lambda state: state.has("Threed Tunnels Clear", player),
+                                                    "Andonuts Lab Area": lambda state: state.has_all({"UFO Engine", "Bad Key Machine"}, player),
+                                                    "Threed Underground": lambda state: state.has("Zombie Paper", player),
+                                                    "Boogey Tent": lambda state: state.has("Jeff", player)})
+
+    multiworld.get_region("Threed Underground", player).add_exits(["Grapefruit Falls"])
+
+    multiworld.get_region("Grapefruit Falls", player).add_exits([belch_factory_connection, "Saturn Valley", "Threed Underground"],
+                                                                {belch_factory_connection: lambda state: state.has("Jar of Fly Honey", player)})
+
+    multiworld.get_region(belch_factory_connection, player).add_exits(["Upper Saturn Valley"],
+                    {"Upper Saturn Valley": lambda state: state.has("Threed Tunnels Clear", player)})
+
+    multiworld.get_region("Saturn Valley", player).add_exits(["Grapefruit Falls", "Cave of the Present", "Global ATM Access"],
+                    {"Cave of the Present": lambda state: state.has("Meteorite Piece", player)})
+
+    multiworld.get_region("Upper Saturn Valley", player).add_exits([milky_well_connection, "Saturn Valley"])
+
+    multiworld.get_region("Dusty Dunes Desert", player).add_exits(["Threed", "Monkey Caves", gold_mine_connection, "Fourside", "Global ATM Access"],
+                    {"Threed": lambda state: state.has("Threed Tunnels Clear", player),
+                        "Monkey Caves": lambda state: state.has("King Banana", player),
+                        gold_mine_connection: lambda state: state.has("Mining Permit", player)})
+
+    multiworld.get_region("Fourside", player).add_exits(["Dusty Dunes Desert", monotoli_building_connection, magnet_hill_connection, "Threed", "Fourside Dept. Store", "Global ATM Access", moonside_connection],
+                    {monotoli_building_connection: lambda state: state.has("Yogurt Dispenser", player),
+                        magnet_hill_connection: lambda state: state.has("Signed Banana", player),
+                        "Threed": lambda state: state.has("Diamond", player),
+                        "Fourside Dept. Store": lambda state: state.has("Jeff", player)})
+
+    multiworld.get_region("Moonside", player).add_exits(["Global ATM Access"])
+
+    multiworld.get_region("Summers", player).add_exits(["Scaraba", "Summers Museum", "Global ATM Access"],
+                    {"Summers Museum": lambda state: state.has("Tiny Ruby", player)})
+
+    multiworld.get_region("Winters", player).add_exits(["Snow Wood Boarding School", "Southern Winters", "Global ATM Access"],
+                    {"Snow Wood Boarding School": lambda state: state.has("Letter For Tony", player),
+                        "Southern Winters": lambda state: state.has("Pak of Bubble Gum", player)})
+
+    multiworld.get_region("Southern Winters", player).add_exits([brickroad_maze_connection])
+
+    multiworld.get_region(brickroad_maze_connection, player).add_exits(["Southern Winters", rainy_circle_connection])
+
+    multiworld.get_region(rainy_circle_connection, player).add_exits([brickroad_maze_connection, "Andonuts Lab Area"])
+
+    multiworld.get_region("Andonuts Lab Area", player).add_exits([stonehenge_connection, "Winters", rainy_circle_connection],
+    {stonehenge_connection: lambda state: state.has("Eraser Eraser", player)})
+
+    multiworld.get_region("Dalaam", player).add_exits([pink_cloud_connection],
+                                                    {pink_cloud_connection: lambda state: state.has("Carrot Key", player)})
+
+    multiworld.get_region("Scaraba", player).add_exits([pyramid_connection, "Global ATM Access", "Common Condiment Shop"],
+                                                    {pyramid_connection: lambda state: state.has("Hieroglyph Copy", player)})
+
+    multiworld.get_region(pyramid_connection, player).add_exits(["Southern Scaraba"])
+
+    multiworld.get_region("Southern Scaraba", player).add_exits([dungeon_man_connection],
+                                                                {dungeon_man_connection: lambda state: state.has_any({"Key to the Tower"}, player)})
+
+    multiworld.get_region("Dungeon Man", player).add_exits(["Deep Darkness"],
+                                                        {"Deep Darkness": lambda state: state.has("Submarine to Deep Darkness", player)})
+
+    multiworld.get_region("Deep Darkness", player).add_exits(["Deep Darkness Darkness"],
+                                                            {"Deep Darkness Darkness": lambda state: state.has("Hawk Eye", player)})
+
+    multiworld.get_region("Deep Darkness Darkness", player).add_exits(["Tenda Village", "Deep Darkness"])
+
+    multiworld.get_region("Tenda Village", player).add_exits([lumine_hall_connection, "Deep Darkness Darkness"],
+                                                            {lumine_hall_connection: lambda state: state.has("Shyness Book", player),
+                                                            "Deep Darkness Darkness": lambda state: state.has_all({"Shyness Book", "Hawk Eye"}, player)})
+
+    multiworld.get_region("Lumine Hall", player).add_exits(["Lost Underworld"])
+
+    multiworld.get_region("Lost Underworld", player).add_exits([fire_spring_connection])
+
+    if world.options.giygas_required:
+        multiworld.get_region("Cave of the Present", player).add_exits(["Cave of the Past"],
+                                                                    {"Cave of the Past": lambda state: state.has("Power of the Earth", player)})
+
+        multiworld.get_region("Cave of the Past", player).add_exits(["Endgame"],
+                                                                    {"Endgame": lambda state: state.has("Paula", player)})
+
+    if world.options.magicant_mode < MagicantMode.option_optional_boost:  # 3
+        multiworld.get_region("Magicant", player).add_exits(["Global ATM Access", sea_of_eden_connection],
+                                                            {sea_of_eden_connection: lambda state: state.has("Ness", player)})
+
+
+def create_location(player: int, location_data: LocationData, region: Region) -> Location:
+    location = EBLocation(player, location_data.name, location_data.code, region)
+
+    return location
+
+
+def create_region(world: "EarthBoundWorld", player: int, locations_per_region: Dict[str, List[LocationData]], name: str) -> Region:
+    region = Region(name, player, world.multiworld)
+
+    if name in locations_per_region:
+        for location_data in locations_per_region[name]:
+            location = create_location(player, location_data, region)
+            region.locations.append(location)
+
+    return region
+
+
+def get_locations_per_region(locations: List[LocationData]) -> Dict[str, List[LocationData]]:
+    per_region: Dict[str, List[LocationData]] = {}
+
+    for location in locations:
+        per_region.setdefault(location.region, []).append(location)
+
+    return per_region
+
+
+def connect_menu_region(world: "EarthBoundWorld") -> None:
+    starting_region_list = {
+        0: "Northern Onett",
+        1: "Onett",
+        2: "Twoson",
+        3: "Happy-Happy Village",
+        4: "Threed",
+        5: "Saturn Valley",
+        6: "Fourside",
+        7: "Winters",
+        8: "Summers",
+        9: "Dalaam",
+        10: "Scaraba",
+        11: "Deep Darkness",
+        12: "Tenda Village",
+        13: "Lost Underworld",
+        14: "Magicant"
+    }
+
+    world.starting_region = starting_region_list[world.start_location]
+    world.multiworld.get_region("Menu", world.player).add_exits([world.starting_region, "Ness's Mind"],
+                          {"Ness's Mind": lambda state: state.has_any({"Ness", "Paula", "Jeff", "Poo"}, world.player),
+                                world.starting_region: lambda state: state.has_any({"Ness", "Paula", "Jeff", "Poo"}, world.player)})
+    
\ No newline at end of file
diff --git a/worlds/earthbound/Rom.py b/worlds/earthbound/Rom.py
new file mode 100644
index 0000000000..af23200e14
--- /dev/null
+++ b/worlds/earthbound/Rom.py
@@ -0,0 +1,848 @@
+import hashlib
+import os
+import Utils
+import typing
+import struct
+import settings
+from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes, APPatchExtension
+from .game_data import local_data
+from .game_data.battle_bg_data import battle_bg_bpp
+from .modules.psi_shuffle import write_psi
+from .game_data.text_data import barf_text, text_encoder
+from .modules.flavor_data import flavor_data, vanilla_flavor_pointers
+from .modules.hint_data import parse_hint_data
+from .modules.enemy_data import scale_enemies
+from .modules.area_scaling import calculate_scaling
+from .modules.boss_shuffle import write_bosses
+from .modules.equipamizer import randomize_armor, randomize_weapons
+from .modules.music_rando import music_randomizer
+from .modules.palette_shuffle import randomize_psi_palettes, map_palette_shuffle
+from .modules.shopsanity import write_shop_checks
+from .modules.enemy_shuffler import apply_enemy_shuffle
+from .modules.dungeon_er import write_dungeon_entrances
+# from .modules.foodamizer import randomize_food
+from .modules.enemizer.randomize_enemy_attributes import randomize_enemy_attributes
+from .modules.enemizer.randomize_enemy_stats import randomize_enemy_stats
+from .modules.enemizer.randomize_enemy_attacks import randomize_enemy_attacks
+from .game_data.static_location_data import location_groups
+from BaseClasses import ItemClassification
+from typing import TYPE_CHECKING, Sequence
+from logging import warning
+# from .local_data import local_locations
+
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+
+item_id_table = local_data.item_id_table
+location_dialogue = local_data.location_dialogue
+present_locations = local_data.present_locations
+psi_locations = local_data.psi_locations
+npc_locations = local_data.npc_locations
+character_locations = local_data.character_locations
+special_name_table = local_data.special_name_table
+item_space_checks = local_data.item_space_checks
+local_present_types = local_data.local_present_types
+present_text_pointers = local_data.present_text_pointers
+psi_item_table = local_data.psi_item_table
+character_item_table = local_data.character_item_table
+party_id_nums = local_data.party_id_nums
+starting_psi_table = local_data.starting_psi_table
+badge_names = local_data.badge_names
+world_version = local_data.world_version
+protection_checks = local_data.protection_checks
+protection_text = local_data.protection_text
+nonlocal_present_types = local_data.nonlocal_present_types
+ap_text_pntrs = local_data.ap_text_pntrs
+money_item_table = local_data.money_item_table
+
+valid_hashes = ["a864b2e5c141d2dec1c4cbed75a42a85",  # Cartridge
+                "6d71ccc8e2afda15d011348291afdf4f"]  # VC
+
+
+class LocalRom(object):
+
+    def __init__(self, file: bytes, name: str | None = None) -> None:
+        self.file = bytearray(file)
+        self.name = name
+
+    def read_byte(self, offset: int) -> int:
+        return self.file[offset]
+
+    def read_bytes(self, offset: int, length: int) -> bytes:
+        return self.file[offset:offset + length]
+
+    def write_bytes(self, offset: int, values: Sequence[int]) -> None:
+        self.file[offset:offset + len(values)] = values
+
+    def get_bytes(self) -> bytes:
+        return bytes(self.file)
+
+
+def patch_rom(world: "EarthBoundWorld", rom: LocalRom, player: int) -> None:
+    rom.copy_bytes(0x1578DD, 0x3E, 0x34A060)  # Threed/Saturn teleport move
+    rom.copy_bytes(0x15791B, 0xF8, 0x157959)
+
+    rom.copy_bytes(0x34A000, 0x1F, 0x1578DD)
+    rom.copy_bytes(0x34A020, 0x1F, 0x15793A)
+    rom.copy_bytes(0x34A040, 0x1F, 0x157A51)
+    rom.copy_bytes(0x34A060, 0x3E, 0x1578FC)
+    rom.copy_bytes(0x15ED4B, 0x06, 0x15F1FB)
+    rom.copy_bytes(0x1A7FA7, 0xBF, 0x389900)
+
+    starting_area_coordinates = {
+                    0: [0x50, 0x04, 0xB5, 0x1F],  # North Onett
+                    1: [0x52, 0x06, 0x4C, 0x1F],  # Onett
+                    2: [0xEF, 0x22, 0x41, 0x1F],  # Twoson
+                    3: [0x53, 0x06, 0x85, 0x1D],  # Happy Happy
+                    4: [0x55, 0x24, 0x69, 0x1D],  # Threed
+                    5: [0x60, 0x1D, 0x30, 0x01],  # Saturn Valley
+                    6: [0xAB, 0x10, 0xF3, 0x09],  # Fourside
+                    7: [0xE3, 0x09, 0xA3, 0x1D],  # Winters
+                    8: [0xCB, 0x24, 0x7B, 0x1E],  # Summers
+                    9: [0xD0, 0x1E, 0x31, 0x1D],  # Dalaam
+                    10: [0xC7, 0x1F, 0x37, 0x19],  # Scaraba
+                    11: [0xDD, 0x1B, 0xB7, 0x17],  # Deep Darkness
+                    12: [0xD0, 0x25, 0x47, 0x18],  # Tenda Village
+                    13: [0x9C, 0x00, 0x84, 0x17],  # Lost Underworld
+                    14: [0x4B, 0x11, 0xAD, 0x18]  # Magicant
+    }
+
+    starting_levels = {
+        "Ness": 0x15F5FB,
+        "Paula": 0x15F60F,
+        "Jeff": 0x15F623,
+        "Poo": 0x15F637
+    }
+
+    atm_card_slots = {
+        "Ness": 0x15F5FF,
+        "Paula": 0x15F613,
+        "Jeff": 0x15F629,
+        "Poo": 0x15F63B
+    }
+
+    starting_weapon = {
+        "Ness": [0x15F600, 0x12],
+        "Paula": [0x15F615, 0x1C],
+        "Jeff": [0x15F62A, 0x24]
+    }
+
+    teleport_learnlevel = {
+        "Ness": [0x158D53, 0x158D62],
+        "Paula": [0x158D54, 0x158D63],
+        "Poo": [0x158D55, 0x158D64]
+    }
+    world.start_items = []
+    world.handled_locations = []
+    
+    for item in world.multiworld.precollected_items[world.player]:
+        world.start_items.append(item.name)
+
+    if world.options.random_start_location:
+        rom.write_bytes(0x0F96C2, bytearray([0x69, 0x00]))
+        rom.write_bytes(0x0F9618, bytearray([0x69, 0x00]))
+        rom.write_bytes(0x0F9629, bytearray([0x69, 0x00]))  # Block Northern Onett
+    else:
+        rom.write_bytes(0x00B66A, bytearray([0x06]))  # Fix starting direction
+    
+    rom.write_bytes(0x01FE9B, bytearray(starting_area_coordinates[world.start_location][0:2]))
+    rom.write_bytes(0x01FE9E, bytearray(starting_area_coordinates[world.start_location][2:4]))  # Start position
+
+    rom.write_bytes(0x01FE91, bytearray(starting_area_coordinates[world.start_location][0:2]))
+    rom.write_bytes(0x01FE8B, bytearray(starting_area_coordinates[world.start_location][2:4]))  # Respawn position
+
+    if world.options.skip_epilogue:
+        rom.write_bytes(0x09C4D4, struct.pack("I", 0xEEA437))
+
+    if world.starting_character == "Poo":
+        rom.write_bytes(starting_levels[world.starting_character], bytearray([0x06]))
+    else:
+        rom.write_bytes(starting_levels[world.starting_character], bytearray([0x03]))
+    rom.write_bytes(atm_card_slots[world.starting_character], bytearray([0xB1]))
+    if world.starting_character != "Ness":
+        rom.write_bytes(atm_card_slots["Ness"], bytearray([0x58]))
+    if world.starting_character != "Poo":
+        rom.write_bytes(starting_weapon[world.starting_character][0], bytearray([starting_weapon[world.starting_character][1]]))
+
+    if world.starting_character != "Jeff":
+        for i in range(2):
+            rom.write_bytes(teleport_learnlevel[world.starting_character][i - 1], bytearray([0x01]))
+    else:
+        rom.write_bytes(0x15F62B, bytearray([0xB5]))
+
+    if world.options.alternate_sanctuary_goal:
+        rom.write_bytes(0x04FD72, bytearray([world.options.sanctuaries_required.value + 2]))
+    else:
+        rom.write_bytes(0x04FD72, bytearray([0xFF]))
+
+    if not world.options.giygas_required:
+        rom.write_bytes(0x2E9C29, bytearray([0x10, 0xA5]))
+
+    if world.options.magicant_mode == 2:
+        rom.write_bytes(0x04FD71, bytearray([world.options.sanctuaries_required.value + 1]))
+        rom.write_bytes(0x2EA26A, bytearray([0x0A, 0x10, 0xA5, 0xEE]))  # Alt goal magicant sets the credits
+    elif world.options.magicant_mode == 1:
+        rom.write_bytes(0x2E9C29, bytearray([0x00, 0xA5]))
+        if world.options.giygas_required:
+            rom.write_bytes(0x2EA26A, bytearray([0x08, 0xD9, 0x9B, 0xEE]))  # Give stat boost if magicant + giygas required
+        else:
+            rom.write_bytes(0x2EA26A, bytearray([0x0A, 0x10, 0xA5, 0xEE]))  # If no giygas, set credits
+    elif world.options.magicant_mode == 3:
+        rom.write_bytes(0x2EA26A, bytearray([0x08, 0x0F, 0x9C, 0xEE]))  # Give only stat boost if set to boost
+
+    rom.write_bytes(0x04FD74, bytearray([world.options.death_link.value]))
+    rom.write_bytes(0x04FD75, bytearray([world.options.death_link_mode.value]))
+    rom.write_bytes(0x04FD76, bytearray([world.options.remote_items.value]))
+    rom.write_bytes(0x04FD78, bytearray([world.options.energy_link.value]))
+
+    if world.options.death_link_mode != 1:
+        rom.write_bytes(0x2FFDFE, bytearray([0x80]))  # Mercy healing
+        rom.write_bytes(0x2FFE30, bytearray([0x80]))  # Mercy text
+        rom.write_bytes(0x2FFE59, bytearray([0x80]))  # Mercy revive
+        # IF YOU ADD ASM, CHANGE THESE OR THE GAME WILL CRASH
+
+    if world.options.monkey_caves_mode == 2:
+        rom.write_bytes(0x062B87, bytearray([0x0A, 0x28, 0xCA, 0xEE]))
+    elif world.options.monkey_caves_mode == 3:
+        rom.write_bytes(0x0F1388, bytearray([0x03, 0xCA, 0xEE]))
+
+    if world.options.no_free_sanctuaries:
+        rom.write_bytes(0x0F09F2, bytearray([0x15, 0x84]))  # Lock Lilliput steps with flag $0415
+        rom.write_bytes(0x0F09EE, struct.pack("I", 0xEEF790))  # Lilliput door script
+
+        rom.write_bytes(0x0F23D2, bytearray([0x16, 0x84]))  # Lock Fire Spring with flag $0146
+        rom.write_bytes(0x0F23CE, struct.pack("I", 0xEEF946))  # Fire Spring door script
+
+    rom.write_bytes(0x04FD70, bytearray([world.options.sanctuaries_required.value]))
+    shop_checks = []
+    
+    for location in world.multiworld.get_locations(player):
+        if location.address:
+            receiver_name = world.multiworld.get_player_name(location.item.player)
+            name = location.name
+            if world.options.remote_items:
+                item = "Remote Item"
+            else:
+                item = location.item.name
+            item_name_loc = (((location.address - 0xEB0000) * 128) + 0x3F0000)
+            # todo; replace with the encoder function
+            item_text = text_encoder(location.item.name, 128)
+            item_text.extend([0x00])
+            player_name_loc = (((location.address - 0xEB0000) * 48) + 0x3F8000)
+            player_text = text_encoder(receiver_name, 48)
+            # Locations over this address are Shopsanity locations and handled in the shopsanity module
+            if location.address < 0xEB1000:
+                rom.write_bytes(item_name_loc, bytearray(item_text))
+                rom.write_bytes(player_name_loc, bytearray(player_text))
+
+            if item not in item_id_table or location.item.player != location.player:
+                item_id = 0xAD
+            else:
+                item_id = item_id_table[item]
+
+            if name in location_dialogue:
+                for i in range(len(location_dialogue[name])):
+                    if location.item.player != location.player or item == "Remote Item":
+                        rom.write_bytes(location_dialogue[name][i] - 1, bytearray([0x17, location.address - 0xEB0000]))
+                    elif item in item_id_table:
+                        rom.write_bytes(location_dialogue[name][i], bytearray([item_id]))
+                    elif item in psi_item_table or item in character_item_table:
+                        rom.write_bytes(location_dialogue[name][i] - 1, bytearray([0x16, special_name_table[item][0]]))
+                    elif item in money_item_table:
+                        rom.write_bytes(location_dialogue[name][i] - 1, bytearray([0x16, (0x16 + list(money_item_table).index(item))]))
+
+            if name in present_locations:
+                world.handled_locations.append(name)
+                if item == "Nothing":  # I can change this to "In nothing_table" later todo: make it so nonlocal items do not follow this table
+                    rom.write_bytes(present_locations[name], bytearray([0x00, 0x00, 0x01]))
+                elif location.item.player != location.player or item == "Remote Item":
+                    rom.write_bytes(present_locations[name], bytearray([item_id, 0x00, 0x00, (location.address - 0xEB0000)]))
+                elif item in item_id_table:
+                    rom.write_bytes(present_locations[name], bytearray([item_id, 0x00]))
+                elif item in psi_item_table:
+                    rom.write_bytes(present_locations[name], bytearray([psi_item_table[item], 0x00, 0x02]))
+                elif item in character_item_table:
+                    rom.write_bytes(present_locations[name], bytearray([character_item_table[item][0], 0x00, 0x03]))
+                elif item in money_item_table:
+                    rom.write_bytes(present_locations[name], struct.pack("H", money_item_table[item]))
+                    rom.write_bytes(present_locations[name] + 2, bytearray([0x01]))
+
+            if name in npc_locations:
+                world.handled_locations.append(name)
+                for i in range(len(npc_locations[name])):
+                    if item in item_id_table or location.item.player != location.player or item == "Remote Item":
+                        rom.write_bytes(npc_locations[name][i], bytearray([item_id]))
+                    elif item in psi_item_table or item in character_item_table:
+                        rom.write_bytes(npc_locations[name][i] - 3, bytearray([0x0E, 0x00, 0x0E, (special_name_table[item][0] + 1)]))
+                        rom.write_bytes(npc_locations[name][i] + 2, bytearray([0xA5, 0xAA, 0xEE]))
+                    elif item in money_item_table:
+                        rom.write_bytes(npc_locations[name][i] - 3, bytearray([0x1D, 0x25]))
+                        rom.write_bytes(npc_locations[name][i] - 1, struct.pack("H", money_item_table[item]))
+                        rom.write_bytes(npc_locations[name][i] + 2, bytearray([0x00, 0xF0, 0xF3]))
+
+            if name in psi_locations:
+                world.handled_locations.append(name)
+                if item in special_name_table and location.item.player == location.player and item != "Remote Item":
+                    rom.write_bytes(psi_locations[name][0], special_name_table[item][1].to_bytes(3, byteorder="little"))
+                    rom.write_bytes(psi_locations[name][0] + 4, bytearray([0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
+                elif item in money_item_table and location.item.player == location.player:
+                    rom.write_bytes(psi_locations[name][0] - 1, bytearray([0x1D, 0x25]))
+                    rom.write_bytes(psi_locations[name][0] + 1, struct.pack("H", money_item_table[item]))
+                    rom.write_bytes(psi_locations[name][0] + 3, bytearray([0x08, 0x26, 0xF0, 0xF3, 0x00, 0x03, 0x00]))
+                else:
+                    rom.write_bytes(psi_locations[name][0], bytearray(psi_locations[name][1:4]))
+                    rom.write_bytes(psi_locations[name][4], bytearray([item_id]))
+
+            if name in character_locations:
+                world.handled_locations.append(name)
+                if item in character_item_table and location.item.player == location.player and item != "Remote Item":
+                    rom.write_bytes(character_locations[name][0], special_name_table[item][1].to_bytes(3, byteorder="little"))
+                    if name == "Snow Wood - Bedroom":  # Use lying down sprites for the bedroom check
+                        rom.write_bytes(character_locations[name][1], struct.pack("H", character_item_table[item][2]))
+                        rom.write_bytes(0x0FB0D8, bytearray([0x06]))
+                    else:
+                        rom.write_bytes(character_locations[name][1], struct.pack("H", character_item_table[item][1]))
+                elif item in psi_item_table and location.item.player == location.player:
+                    rom.write_bytes(character_locations[name][0], (special_name_table[item][1] + 1).to_bytes(3, byteorder="little"))
+                    rom.write_bytes(character_locations[name][1], bytearray([0x62]))
+                    rom.write_bytes(character_locations[name][2], bytearray([0x70, 0xF9, 0xD5]))
+                elif item in money_item_table and location.item.player == location.player:
+                    rom.write_bytes(character_locations[name][2] - 1, bytearray([0x1D, 0x25]))
+                    rom.write_bytes(character_locations[name][2] + 1, struct.pack("H", money_item_table[item]))
+                    rom.write_bytes(character_locations[name][0] - 2, bytearray([0x01]))
+                    rom.write_bytes(character_locations[name][0], bytearray([0x4B, 0xF0, 0xF3]))
+                    rom.write_bytes(character_locations[name][1], bytearray([0x97]))
+                else:
+                    rom.write_bytes(character_locations[name][0], bytearray(character_locations[name][4:7]))
+                    if location.item.name in ["Ness", "Paula", "Jeff", "Poo"]:
+                        rom.write_bytes(character_locations[name][1], bytearray([character_item_table[location.item.name][1]]))
+                    else:
+                        rom.write_bytes(character_locations[name][1], bytearray([0x97]))
+                    rom.write_bytes(character_locations[name][2], bytearray([0x18, 0xF9, 0xD5]))
+                    rom.write_bytes(character_locations[name][3], bytearray([item_id]))
+                if name == "Deep Darkness - Barf Character":
+                    if item in character_item_table:
+                        rom.write_bytes(0x2EA0E2, bytearray(barf_text[item][0:3]))
+                        rom.write_bytes(0x2EA0E8, bytearray(barf_text[item][3:6]))
+                    elif item in psi_item_table and location.item.player == location.player:
+                        rom.write_bytes(0x2EA0E2, bytearray([0x98, 0xC3, 0xEE]))
+                        rom.write_bytes(0x2EA0E8, bytearray([0xF7, 0xC4, 0xEE]))
+                    else:
+                        rom.write_bytes(0x2EA0E2, bytearray([0x6A, 0xC3, 0xEE]))
+                        rom.write_bytes(0x2EA0E8, bytearray([0xB4, 0xC4, 0xEE]))
+
+            if name == "Poo - Starting Item":
+                world.handled_locations.append(name)
+                if item in item_id_table and location.item.player == location.player and item != "Remote Item":
+                    rom.write_bytes(0x15F63C, bytearray([item_id]))
+                else:
+                    rom.write_bytes(0x15F63C, bytearray([0x00]))  # Don't give anything if the item doesn't have a tangible ID
+
+                if item in special_name_table and location.item.player == location.player:  # Apply a special script if teleport or character
+                    rom.write_bytes(0x15F765, special_name_table[item][1].to_bytes(3, byteorder="little"))  # This might be offset, check if it is
+                    rom.write_bytes(0x2EC618, bytearray([(special_name_table[item][0] + 1)]))
+                    rom.write_bytes(0x2EC61A, bytearray([0xA5, 0xAA, 0xEE]))
+                    rom.write_bytes(0x2EC613, bytearray([0x03, 0x01]))
+                
+                if item in money_item_table and location.item.player == location.player:
+                    rom.write_bytes(0x15F764, bytearray([0x1D, 0x08]))
+                    rom.write_bytes(0x15F766, struct.pack("H", money_item_table[item]))
+                    rom.write_bytes(0x15F768, bytearray([0x01]))
+
+            if location.address >= 0xEB1000:
+                world.handled_locations.append(name)
+                shop_checks.append(location)
+
+            if name not in world.handled_locations:
+                warning(f"{name} not placed in {world.multiworld.get_player_name(world.player)}'s EarthBound world. Something went wrong here.")
+            
+            if name in item_space_checks:
+                if item not in item_id_table or location.item.player != location.player:
+                    if len(item_space_checks[name]) == 4:
+                        rom.write_bytes(item_space_checks[name][0], bytearray(item_space_checks[name][1:4]))
+                    else:
+                        rom.write_bytes(item_space_checks[name][0], bytearray(item_space_checks[name][1:4]))
+                        rom.write_bytes(item_space_checks[name][4], bytearray(item_space_checks[name][5:8]))
+
+            if name in present_locations and "Lost Underworld" not in name and world.options.presents_match_contents:
+                if ItemClassification.trap in location.item.classification:
+                    world.present_type = "trap"
+                elif ItemClassification.progression in location.item.classification:
+                    world.present_type = "progression"
+                elif ItemClassification.useful in location.item.classification:
+                    world.present_type = "useful"
+                else:
+                    world.present_type = "filler"
+
+                if location.item.player == world.player or world.options.nonlocal_items_use_local_presents:
+                    rom.write_bytes(present_locations[name] - 12, bytearray(local_present_types[world.present_type]))
+                    if name != "Threed - Boogey Tent Trashcan":
+                        rom.write_bytes(present_locations[name] - 4, bytearray(present_text_pointers[world.present_type]))
+                else:
+                    rom.write_bytes(present_locations[name] - 12, bytearray(nonlocal_present_types[world.present_type]))
+                    if name != "Threed - Boogey Tent Trashcan":
+                        if world.present_type == "progression":
+                            rom.write_bytes(present_locations[name] - 4, struct.pack("I", world.random.choice(ap_text_pntrs)))
+                        elif world.present_type == "trap":
+                            rom.write_bytes(present_locations[name] - 4, bytearray([0x8D, 0xce, 0xee]))
+                        else:
+                            rom.write_bytes(present_locations[name] - 4, bytearray([0xc1, 0xcd, 0xee]))
+
+    location = world.multiworld.get_location("Twoson - Bike Shop Rental", world.player)
+    if location.item.name in item_id_table:
+        item_id = item_id_table[location.item.name]
+    else:
+        item_id = 0xAD
+
+    rom.write_bytes(0x0800C4, bytearray([item_id]))  # Bike shop
+    rom.write_bytes(0x0802EA, bytearray([item_id]))
+
+    rom.write_bytes(0x2EA05C, bytearray([item_id_table[world.slime_pile_wanted_item]]))
+    rom.write_bytes(0x2F61F6, bytearray([item_id_table[world.slime_pile_wanted_item]]))
+    
+    hintable_locations = [
+        location for location in world.multiworld.get_locations()
+        if location.player == world.player or location.item.player == world.player
+    ]
+    world.hint_pointer = 0x0000
+    world.hint_number = 0
+    for index, hint in enumerate(world.in_game_hint_types):
+        if hint == "item_at_location":
+            for location in hintable_locations:
+                if location.name == world.hinted_locations[index] and location.player == world.player:
+                    parse_hint_data(world, location, rom, hint, index)
+                    
+        elif hint == "region_progression_check":
+            world.progression_count = 0
+            for location in hintable_locations:
+                if location.name in location_groups[world.hinted_regions[index]] and location.player == world.player:
+                    if ItemClassification.progression in location.item.classification:
+                        world.progression_count += 1
+            world.hinted_area = world.hinted_regions[index]  # im doing a little sneaky
+            parse_hint_data(world, location, rom, hint, index)
+
+        elif hint == "hint_for_good_item" or hint == "prog_item_at_region":
+            hintable_locations_2 = []
+            for location in hintable_locations:
+                if location.item.name == world.hinted_items[index] and location.item.player == world.player:
+                    hintable_locations_2.append(location)
+            if hintable_locations_2 == []:
+                # This is just failsafe behavior
+                warning(f"Warning: Unable to create local hint for {world.hinted_items[index]} for "
+                        + f"{world.multiworld.get_player_name(world.player)}'s EarthBound world."
+                        + " Please report this.")
+                location = world.random.choice(hintable_locations)
+            else:
+                location = world.random.choice(hintable_locations_2)
+            parse_hint_data(world, location, rom, hint, index)
+
+        elif hint == "item_in_local_region":
+            for location in hintable_locations:
+                if location.name == world.hinted_locations[index] and location.player == world.player:
+                    parse_hint_data(world, location, rom, hint, index)
+        else:
+            location = "null"
+            parse_hint_data(world, location, rom, hint, index)
+    
+    for location in hintable_locations:
+        if location.item.name == "Paula":
+            world.paula_region = location.parent_region
+        
+        if location.item.name == "Jeff":
+            world.jeff_region = location.parent_region
+
+        if location.item.name == "Poo":
+            world.poo_region = location.parent_region
+
+    if world.options.skip_prayer_sequences:
+        rom.write_bytes(0x07BC96, bytearray([0x02]))
+        rom.write_bytes(0x07BA2C, bytearray([0x02]))
+        rom.write_bytes(0x07BAC7, bytearray([0x02]))
+        rom.write_bytes(0x07BB38, bytearray([0x02]))
+        rom.write_bytes(0x07BBF3, bytearray([0x02])) 
+        rom.write_bytes(0x07BC56, bytearray([0x02])) 
+        rom.write_bytes(0x07B9A1, bytearray([0x1f, 0xeb, 0xff, 0x02, 0x1f, 0x1f, 0xca, 0x01, 0x06, 0x1f, 0x1f, 0x72, 0x01, 0x06, 0x02]))  # Clean up overworld stuff
+
+    if world.options.easy_deaths:
+        rom.write_bytes(0x2EBFF9, bytearray([0x0A]))
+        rom.write_bytes(0x04C7CE, bytearray([0x5C, 0x8A, 0xFB, 0xEF]))  # Jump to code that restores the party
+        rom.write_bytes(0x04C7D4, bytearray([0xEA, 0xEA, 0xEA]))
+        # rom.write_bytes(0x04C7DA, bytearray([0xEA, 0xEA]))#Stop the game from zeroing stuff
+        rom.write_bytes(0x0912F2, bytearray([0x0A, 0xFE, 0xBF, 0xEE]))
+        rom.write_bytes(0x2EBFFE, bytearray([0x00, 0x1B, 0x04, 0x15, 0x38, 0x1F, 0x81, 0xFF, 0xFF, 0x1B, 0x04, 0x0A, 0xF7, 0x12, 0xC9]))  # Hospitals = 0$
+        rom.write_bytes(0x04C822, bytearray([0xEA, 0xEA, 0xEA, 0xEA]))
+        rom.write_bytes(0x04C7F7, bytearray([0x00, 0x00])) # Stop "rounding up" the money
+
+    if world.options.magicant_mode >= 2:
+        rom.write_bytes(0x077629, bytearray([item_id_table[world.magicant_junk[0]]]))
+        rom.write_bytes(0x077614, bytearray([item_id_table[world.magicant_junk[0]]]))
+        rom.write_bytes(0x0FF25C, bytearray([item_id_table[world.magicant_junk[1]]]))
+        rom.write_bytes(0x0FF27E, bytearray([item_id_table[world.magicant_junk[2]]]))
+        rom.write_bytes(0x0FF28F, bytearray([item_id_table[world.magicant_junk[3]]]))
+        rom.write_bytes(0x0FF2A0, bytearray([item_id_table[world.magicant_junk[4]]]))
+        rom.write_bytes(0x0FF26D, bytearray([item_id_table[world.magicant_junk[5]]]))
+
+    rom.write_bytes(0x02EC1AA, bytearray([world.options.sanctuaries_required.value]))
+    if world.options.alternate_sanctuary_goal and world.options.giygas_required:
+        rom.write_bytes(0x02EC1E2, bytearray([0xFD, 0xC1, 0xEE]))
+
+    if world.options.magicant_mode == 1 and world.options.giygas_required:  # Apple kid text
+        rom.write_bytes(0x2EC1D8, bytearray([0x33, 0xC2, 0xEE]))
+    elif world.options.magicant_mode == 2:
+        rom.write_bytes(0x2EC1D8, bytearray([0x6A, 0xC2, 0xEE]))
+
+    if not world.options.giygas_required:
+        rom.write_bytes(0x2EC164, bytearray([0xE8, 0xF0, 0xEE]))
+        rom.write_bytes(0x02EC1E2, bytearray([0x40, 0xC1, 0xEE]))
+        rom.write_bytes(0x02EC1E2, bytearray([0x40, 0xC1, 0xEE]))
+    
+    flavor_address = 0x3FAF10
+    for i in range(4):
+        rom.copy_bytes(world.flavor_pointer[i], 2, 0x34B110 + (2 * i))
+
+    rom.copy_bytes(0x202008, 0x100, 0x34B000)
+    for i in range(4):
+        if world.available_flavors[i] not in ["Mint flavor", "Strawberry flavor", "Banana flavor", "Peanut flavor"]:
+            rom.write_bytes(flavor_address, bytearray(world.flavor_text[i]))
+            flavor_addr = flavor_address - 0x3F0000
+            flavor_addr = struct.pack("H", flavor_addr)
+            rom.write_bytes(world.flavor_pointer[i], flavor_addr)
+            rom.write_bytes(world.flavor_pointer[i] + 5, bytearray([0xFF]))
+            flavor_address += len(world.flavor_text[i])
+            rom.write_bytes(0x202008 + (0x40 * i), bytearray(flavor_data[world.available_flavors[i]]))
+        else:
+            rom.copy_bytes(vanilla_flavor_pointers[world.available_flavors[i]][1], 0x40, 0x202008 + (0x40 * i))
+            rom.copy_bytes(vanilla_flavor_pointers[world.available_flavors[i]][2], 2, world.flavor_pointer[i])
+
+    rom.write_bytes(0x048037, bytearray(world.lumine_text))
+    starting_item_address = 0
+    starting_psi = 0
+    starting_char = 0
+    starting_psi_types = []
+    starting_character_count = []
+    starting_inventory_pointers = {
+        "Ness": 0x99F3,
+        "Paula": 0x9A53,
+        "Jeff": 0x9AB4,
+        "Poo": 0x9B0F
+    }
+
+    starting_inv_amounts = {
+        "Ness": 0x0B,
+        "Paula": 0x0A,
+        "Jeff": 0x08,
+        "Poo": 0x0C
+    }
+
+    location = world.multiworld.get_location("Poo - Starting Item", world.player)
+    if world.starting_character == "Poo" and location.item.name in item_id_table and location.item.player == world.player:
+        starting_inventory_pointers["Poo"] = 0x9B10
+        starting_inv_amounts["Poo"] = 0x0B
+    rom.write_bytes(0x16FB66, struct.pack("H", starting_inventory_pointers[world.starting_character]))
+    rom.write_bytes(0x16FB68, struct.pack("H", starting_inv_amounts[world.starting_character]))
+    
+    for item in world.multiworld.precollected_items[player]:
+        if item.name == world.starting_character:  # Write the starting character
+            rom.write_bytes(0x00B672, bytearray([world.options.starting_character.value + 1]))
+
+        if world.options.remote_items:
+            continue
+
+        if item.name == "Photograph":
+            rom.write_bytes(0x17FEA8, bytearray([0x01]))
+
+        if item.name == "Poo" and world.multiworld.get_location("Poo - Starting Item", world.player).item.name in special_name_table and item.player == world.player:
+            world.multiworld.push_precollected(world.multiworld.get_location("Poo - Starting Item", world.player).item)
+        elif item.name == "Poo" and world.multiworld.get_location("Poo - Starting Item", world.player).item.name in money_item_table:
+            world.starting_money += money_item_table[world.multiworld.get_location("Poo - Starting Item", world.player).item.name]
+
+        # if item.name == "Poo" and world.multiworld.get_location("Poo - Starting Item", world.player).item.name == "Photograph":
+            # rom.write_bytes(0x17FEA9, bytearray([0x01]))
+
+        if item.name in ["Progressive Bat", "Progressive Fry Pan", "Progressive Gun", "Progressive Bracelet",
+                         "Progressive Other"]:
+            old_item_name = item.name
+            item.name = world.progressive_item_groups[item.name][world.start_prog_counts[item.name]]
+            if world.start_prog_counts[old_item_name] != len(world.progressive_item_groups[old_item_name]) - 1:
+                world.start_prog_counts[old_item_name] += 1
+
+        if item.name in item_id_table:
+            rom.write_bytes(0x375000 + starting_item_address, bytearray([item_id_table[item.name]]))
+            starting_item_address += 1
+        elif item.name in psi_item_table:
+            if item.name != "Progressive Poo PSI":
+                if item.name not in starting_psi_types:
+                    rom.write_bytes(0x17FC7C + starting_psi, bytearray([starting_psi_table[item.name]]))
+                    starting_psi_types.append(item.name)
+                    starting_psi += 1
+            else:
+                if starting_psi_types.count(item.name) < 2:
+                    rom.write_bytes(0x17FC7C + starting_psi, bytearray([starting_psi_table[item.name]]))
+                    starting_psi_types.append(item.name)
+                    starting_psi += 1
+        elif item.name in character_item_table and item.name != "Photograph":
+            if item.name not in starting_character_count:
+                rom.write_bytes(0x17FC8D + starting_char, bytearray([party_id_nums[item.name]]))
+                starting_character_count.append(item.name)
+                starting_char += 1
+        elif item.name in money_item_table:
+            world.starting_money += money_item_table[item]
+
+    if world.options.random_battle_backgrounds:
+        bpp2_bgs = [bg_id for bg_id, bpp in battle_bg_bpp.items() if bpp == 2]
+        bpp4_bgs = [bg_id for bg_id, bpp in battle_bg_bpp.items() if bpp == 4]
+        for i in range(483):
+            world.flipped_bg = world.random.randint(0, 100)
+            if i == 480:
+                drawn_background = struct.pack("H", 0x00E3)
+            else:
+                drawn_background = struct.pack("H", world.random.randint(0x01, 0x0146))
+
+            if battle_bg_bpp[struct.unpack("H", drawn_background)[0]] == 4:
+                drawn_background_2 = struct.pack("H",  0x0000)
+            else:
+                drawn_background_2 = struct.pack("H", world.random.choice(bpp2_bgs))
+            #print(f"ello mate we are doing background {i} at {hex(0xCBD89A + (i * 4))}, the background is {drawn_background[0]}.")
+            if world.flipped_bg > 33 or drawn_background not in bpp2_bgs:
+                rom.write_bytes(0x0BD89A + (i * 4), drawn_background)
+                rom.write_bytes(0x0BD89C + (i * 4), drawn_background_2)
+            else:
+                rom.write_bytes(0x0BD89A + (i * 4), drawn_background_2)
+                rom.write_bytes(0x0BD89C + (i * 4), drawn_background)
+
+            rom.write_bytes(0x00B5F1, struct.pack("H", world.random.choice(bpp4_bgs)))
+
+    if world.options.random_swirl_colors:
+        if world.random.random() < 0.5:
+            rom.write_bytes(0x02E98A, bytearray([0x7F]))  # Color math mode
+            rom.write_bytes(0x02E996, bytearray([0x3F]))
+
+        rom.write_bytes(0x300240, bytearray([world.random.randint(0x00, 0x1F)]))  # Normal swirls
+        rom.write_bytes(0x300245, bytearray([world.random.randint(0x00, 0x1F)]))
+        rom.write_bytes(0x30024A, bytearray([world.random.randint(0x00, 0x1F)]))
+
+        rom.write_bytes(0x300253, bytearray([world.random.randint(0x00, 0x1F)]))  # Green swirls
+        rom.write_bytes(0x300258, bytearray([world.random.randint(0x00, 0x1F)]))
+        rom.write_bytes(0x30025D, bytearray([world.random.randint(0x00, 0x1F)]))
+
+        rom.write_bytes(0x300269, bytearray([world.random.randint(0x00, 0x1F)]))  # Red swirls
+        rom.write_bytes(0x30026E, bytearray([world.random.randint(0x00, 0x1F)]))
+        rom.write_bytes(0x300273, bytearray([world.random.randint(0x00, 0x1F)]))
+
+    if not world.options.prefixed_items:
+        rom.write_bytes(0x15F9DC, bytearray([0x06]))
+        rom.write_bytes(0x15F9DE, bytearray([0x08]))
+        rom.write_bytes(0x15F9E0, bytearray([0x05]))
+        rom.write_bytes(0x15F9E2, bytearray([0x0B]))
+        rom.write_bytes(0x15F9E4, bytearray([0x0F]))
+        rom.write_bytes(0x15F9E6, bytearray([0x10]))
+        # change if necessary
+
+    if world.options.psi_shuffle:
+        write_psi(world, rom)
+
+    world.description_pointer = 0x1000
+    if world.options.armorizer:
+        randomize_armor(world, rom)
+
+    if world.options.weaponizer:
+        randomize_weapons(world, rom)
+    
+    music_randomizer(world, rom)
+    if world.options.map_palette_shuffle:
+        map_palette_shuffle(world, rom)
+    if world.options.randomize_psi_palettes:
+        randomize_psi_palettes(world, rom)
+
+    if world.options.randomize_enemy_attributes:
+        randomize_enemy_attributes(world, rom)
+
+    if world.options.randomize_enemy_stats:
+        randomize_enemy_stats(world, rom)
+
+    if world.options.randomize_enemy_attacks:
+        randomize_enemy_attacks(world, rom)
+
+    apply_enemy_shuffle(world, rom)
+    # randomize_food(world,rom)
+    write_bosses(world, rom)
+    if world.options.dungeon_shuffle:
+        write_dungeon_entrances(world, rom)
+
+    world.get_all_spheres.wait()
+    calculate_scaling(world)
+    if world.options.shop_randomizer:
+        write_shop_checks(world, rom, shop_checks)
+
+    scale_enemies(world, rom)
+    world.badge_name = badge_names[world.franklin_protection]
+    world.badge_name = text_encoder(world.badge_name, 23)
+    world.badge_name.extend([0x00])
+    world.starting_money = min(world.starting_money, 99999)
+    world.starting_money = struct.pack('<I', world.starting_money)
+
+    rom.write_bytes(0x17FCD0, world.starting_money)
+    rom.write_bytes(0x17FCE0, world.prayer_player)
+    rom.write_bytes(0x17FD00, world.credits_player)
+    rom.write_bytes(0x155027, world.badge_name)
+    rom.write_bytes(0x17FD50, struct.pack("H", world.multiworld.players))
+    rom.write_bytes(0x3FF0A0, world.world_version.encode("ascii"))
+    display_version = text_encoder(world_version, 15)
+    display_version.extend([0x02])
+    rom.write_bytes(0x3CFFBF, display_version)
+
+    for element in world.franklinbadge_elements:
+        for address in protection_checks[element]:
+            if element == world.franklin_protection:
+                rom.write_bytes(address, [0xF0])
+            else:
+                rom.write_bytes(address, [0x80])
+                # THIS WILL CRASH IF ADDRESS IS WRONG.
+    rom.write_bytes(0x2EC909, struct.pack("I", protection_text[world.franklin_protection][0]))  # help text
+    rom.write_bytes(0x2EC957, struct.pack("I", protection_text[world.franklin_protection][1]))  # battle text
+    from Utils import __version__
+    rom.name = bytearray(f'MOM2AP{__version__.replace(".", "")[0:3]}_{player}_{world.multiworld.seed:11}\0', "utf8")[:21]
+    rom.name.extend([0] * (21 - len(rom.name)))
+    rom.write_bytes(0x00FFC0, rom.name)
+
+    rom.write_file("token_patch.bin", rom.get_token_binary())
+
+
+class EBProcPatch(APProcedurePatch, APTokenMixin):
+    hash = valid_hashes
+    game = "EarthBound"
+    patch_file_ending = ".apeb"
+    result_file_ending = ".sfc"
+    name: bytearray
+    procedure = [
+        ("apply_bsdiff4", ["earthbound_basepatch.bsdiff4"]),
+        ("apply_tokens", ["token_patch.bin"]),
+        ("repoint_vanilla_tables", [])
+    ]
+
+    @classmethod
+    def get_source_data(cls) -> bytes:
+        return get_base_rom_bytes()
+
+    def write_bytes(self, offset: int, value: typing.Iterable[int]) -> None:
+        self.write_token(APTokenTypes.WRITE, offset, bytes(value))
+    
+    def copy_bytes(self, source: int, amount: int, destination: int) -> None:
+        self.write_token(APTokenTypes.COPY, destination, (amount, source))
+
+
+class EBPatchExtensions(APPatchExtension):
+    game = "EarthBound"
+
+    @staticmethod
+    def repoint_vanilla_tables(caller: APProcedurePatch, rom: bytes) -> bytes:
+        rom = LocalRom(rom)
+        version_check = rom.read_bytes(0x3FF0A0, 16)
+        version_check = version_check.split(b'\x00', 1)[0]
+        version_check_str = version_check.decode("ascii")
+        client_version = world_version
+        if client_version != version_check_str and version_check_str != "":
+            raise Exception(f"Error! Patch generated on EarthBound APWorld version {version_check_str} doesn't match client version {client_version}! " +
+                            f"Please use EarthBound APWorld version {version_check_str} for patching.")
+        elif version_check_str == "":
+            raise Exception(f"Error! Patch generated on old EarthBound APWorld version, doesn't match client version {client_version}! " +
+                            f"Please verify you are using the same APWorld as the generator.")
+
+        for action_number in range(0x013F):
+            current_action = rom.read_bytes(0x157B68 + (12 * action_number), 12)
+            rom.write_bytes(0x3FAFB0 + (12 * action_number), current_action)
+        
+        for psi_number in range(0x35):
+            current_action = rom.read_bytes(0x158A50 + (15 * psi_number), 15)
+            rom.write_bytes(0x350000 + (15 * psi_number), current_action)
+        
+        psi_text_table = rom.read_bytes(0x158D7A, (25 * 17))
+        rom.write_bytes(0x3B0500, psi_text_table)
+
+        psi_anim_config = rom.read_bytes(0x0CF04D, 0x0198)
+        rom.write_bytes(0x360000, psi_anim_config)
+        
+        psi_anim_pointers = rom.read_bytes(0x0CF58F, 0x088)
+        rom.write_bytes(0x360400, psi_anim_pointers)
+
+        psi_anim_palettes = rom.read_bytes(0x0CF47F, 0x0110)
+        rom.write_bytes(0x360600, psi_anim_palettes)
+
+        for psi_number in range(0x32):
+            psi_anim = rom.read_bytes(0x2F8583 + (0x04 * psi_number), 4)
+            rom.write_bytes(0x3B0003 + (4 * psi_number), psi_anim)
+            rom.write_bytes(0x3B0003, bytearray([0x4C]))
+            # rom.write_bytes(0x3B0002, bytearray([0x45]))
+
+        main_font_data = rom.read_bytes(0x210C7A, 96)
+        main_font_gfx = rom.read_bytes(0x210CDA, 0x0C00)
+        saturn_font_data = rom.read_bytes(0x201359, 96)
+        saturn_font_gfx = rom.read_bytes(0x2013B9, 0x0C00)
+        letter_n = rom.read_bytes(0x21169F, 6)
+        letter_a = rom.read_bytes(0x2114FF, 6)
+        letter_e = rom.read_bytes(0x21157F, 6)
+        saturn_a = rom.read_bytes(0x2017DD, 9)
+        saturn_n = rom.read_bytes(0x20197E, 8)
+        saturn_e = rom.read_bytes(0x20185C, 24)
+
+        accent_tilde = rom.read_bytes(0x2118A1, 2)
+        saturn_tilde = rom.read_bytes(0x201F7F, 2)
+
+        rom.write_bytes(0x3A0000, main_font_data)
+        rom.write_bytes(0x3C0000, main_font_gfx)
+
+        rom.write_bytes(0x3A0100, saturn_font_data)
+        rom.write_bytes(0x3C1000, saturn_font_gfx)
+        rom.write_bytes(0x3C0D25, letter_n)  # Setup n
+        rom.write_bytes(0x3C0D45, letter_a)  # Setup a
+        rom.write_bytes(0x3C0D65, letter_e)
+        rom.write_bytes(0x3C0D22, accent_tilde)
+
+        rom.write_bytes(0x3C1D25, saturn_n)  # Setup n
+        rom.write_bytes(0x3C1D45, saturn_a)
+        rom.write_bytes(0x3C1D63, saturn_e)
+        rom.write_bytes(0x3C1D22, saturn_tilde)
+
+        # ---------------------------------------
+        ness_level = rom.read_bytes(0x15F5FB, 1)
+        paula_level = rom.read_bytes(0x15f60f, 1)
+        jeff_level = rom.read_bytes(0x15f623, 1)
+        poo_level = rom.read_bytes(0x15f637, 1)
+
+        ness_start_exp = rom.read_bytes(0x158F49 + (ness_level[0] * 4), 4)
+        paula_start_exp = rom.read_bytes(0x1590D9 + (paula_level[0] * 4), 4)
+        jeff_start_exp = rom.read_bytes(0x159269 + (jeff_level[0] * 4), 4)
+        poo_start_exp = rom.read_bytes(0x1593F9 + (poo_level[0] * 4), 4)
+
+        rom.write_bytes(0x17FD40, ness_start_exp)
+        rom.write_bytes(0x17FD44, paula_start_exp)
+        rom.write_bytes(0x17FD48, jeff_start_exp)
+        rom.write_bytes(0x17FD4C, poo_start_exp)
+        return rom.get_bytes()
+
+
+def get_base_rom_bytes(file_name: str = "") -> bytes:
+    base_rom_bytes = getattr(get_base_rom_bytes, "base_rom_bytes", None)
+    if not base_rom_bytes:
+        file_name = get_base_rom_path(file_name)
+        base_rom_bytes = bytes(Utils.read_snes_rom(open(file_name, "rb")))
+
+        basemd5 = hashlib.md5()
+        basemd5.update(base_rom_bytes)
+        if basemd5.hexdigest() not in valid_hashes:
+            raise Exception('Supplied Base Rom does not match known MD5 for US(1.0) release. '
+                            'Get the correct game and version, then dump it')
+        get_base_rom_bytes.base_rom_bytes = base_rom_bytes
+    return base_rom_bytes
+
+
+def get_base_rom_path(file_name: str = "") -> str:
+    options: settings.Settings = settings.get_settings()
+    if not file_name:
+        file_name = options["earthbound_options"]["rom_file"]
+    if not os.path.exists(file_name):
+        file_name = Utils.user_path(file_name)
+    return file_name
+
+
+# Fix hint text, I have a special idea where I can give it info on a random region
diff --git a/worlds/earthbound/Rules.py b/worlds/earthbound/Rules.py
new file mode 100644
index 0000000000..1028868676
--- /dev/null
+++ b/worlds/earthbound/Rules.py
@@ -0,0 +1,128 @@
+from worlds.generic.Rules import set_rule, forbid_items_for_player, add_rule
+from typing import TYPE_CHECKING
+from .Options import ShopRandomizer, MonkeyCavesMode
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+
+
+def set_location_rules(world: "EarthBoundWorld") -> None:
+    player = world.player
+    twoson_paula_room_present = world.get_location("Twoson - Paula's Room Present")
+    can_buy_pizza = world.get_location("Threed - Downtown Trashcan")
+
+    set_rule(world.multiworld.get_location("Onett - Traveling Entertainer", player), lambda state: state.has("Key to the Shack", player))
+    set_rule(world.multiworld.get_location("Onett - South Road Present", player), lambda state: state.has("Police Badge", player))
+    set_rule(world.multiworld.get_location("Onett - Tracy Gift", player), lambda state: state.has("Ness", player))
+    set_rule(world.multiworld.get_location("Twoson - Paula's Mother", player), lambda state: state.has("Paula", player))
+    set_rule(world.multiworld.get_location("Twoson - Everdred Meeting", player), lambda state: state.has("Paula", player))
+    set_rule(world.multiworld.get_location("Twoson - Insignificant Location", player), lambda state: state.has("Insignificant Item", player))
+    set_rule(world.multiworld.get_location("Happy-Happy Village - Defeat Carpainter", player), lambda state: state.has("Franklin Badge", player))
+    set_rule(world.multiworld.get_location("Carpainter Defeated", player), lambda state: state.has("Franklin Badge", player))
+    set_rule(world.multiworld.get_location("Happy-Happy Village - Prisoner", player), lambda state: state.has("Key to the Cabin", player))
+    set_rule(world.multiworld.get_location("Threed - Boogey Tent Trashcan", player), lambda state: state.has("Jeff", player))
+    set_rule(world.multiworld.get_location("Threed - Zombie Prisoner", player), lambda state: state.has("Bad Key Machine", player))
+    set_rule(world.multiworld.get_location("Saturn Valley - Post Belch Gift #1", player), lambda state: state.has("Threed Tunnels Clear", player))
+    set_rule(world.multiworld.get_location("Saturn Valley - Post Belch Gift #2", player), lambda state: state.has("Threed Tunnels Clear", player))
+    set_rule(world.multiworld.get_location("Saturn Valley - Post Belch Gift #3", player), lambda state: state.has("Threed Tunnels Clear", player))
+    set_rule(world.multiworld.get_location("Saturn Valley - Saturn Coffee", player), lambda state: state.has("Threed Tunnels Clear", player))
+    set_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Chest #1", player), lambda state: state.has("Pencil Eraser", player))
+    set_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Chest #2", player), lambda state: state.has("Pencil Eraser", player))
+    set_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Gift", player), lambda state: state.has("Pencil Eraser", player))
+    set_rule(world.multiworld.get_location("Monkey Caves - Monkey Power", player), lambda state: state.has("Pencil Eraser", player))
+    set_rule(world.multiworld.get_location("Dusty Dunes - Mine Reward", player), lambda state: state.can_reach_region("Gold Mine", player))
+    set_rule(world.multiworld.get_location("Snow Wood - Upper Right Locker", player), lambda state: state.has("Key to the Locker", player))
+    set_rule(world.multiworld.get_location("Snow Wood - Upper Left Locker", player), lambda state: state.has("Key to the Locker", player))
+    set_rule(world.multiworld.get_location("Snow Wood - Bottom Right Locker", player), lambda state: state.has("Key to the Locker", player))
+    set_rule(world.multiworld.get_location("Snow Wood - Bottom Left Locker", player), lambda state: state.has("Key to the Locker", player))
+    set_rule(world.multiworld.get_location("Fourside - Bakery 2F Gift", player), lambda state: state.has("Contact Lens", player))
+    set_rule(world.multiworld.get_location("Fourside - Department Store Blackout", player), lambda state: state.has("Jeff", player))
+    set_rule(world.multiworld.get_location("Fourside - Venus Gift", player), lambda state: state.has("Diamond", player))
+    set_rule(world.multiworld.get_location("Summers - Museum Item", player), lambda state: state.has("Tiny Ruby", player))
+    set_rule(world.multiworld.get_location("Dalaam - Trial of Mu", player), lambda state: state.has("Poo", player))
+    set_rule(world.multiworld.get_location("Poo - Starting Item", player), lambda state: state.has("Poo", player))
+    set_rule(world.multiworld.get_location("Deep Darkness - North Alcove Truffle", player), lambda state: state.has("Piggy Nose", player))
+    set_rule(world.multiworld.get_location("Deep Darkness - Near Land Truffle", player), lambda state: state.has("Piggy Nose", player))
+    set_rule(world.multiworld.get_location("Deep Darkness - Present Truffle", player), lambda state: state.has("Piggy Nose", player))
+    set_rule(world.multiworld.get_location("Deep Darkness - Village Truffle", player), lambda state: state.has("Piggy Nose", player))
+    set_rule(world.multiworld.get_location("Deep Darkness - Entrance Truffle", player), lambda state: state.has("Piggy Nose", player))
+    set_rule(world.multiworld.get_location("Tenda Village - Tenda Tea", player), lambda state: state.has("Shyness Book", player))
+    set_rule(world.multiworld.get_location("Tenda Village - Tenda Gift", player), lambda state: state.has("Shyness Book", player))
+    set_rule(world.multiworld.get_location("Tenda Village - Tenda Gift #2", player), lambda state: state.has("Shyness Book", player))
+    set_rule(world.multiworld.get_location("Lost Underworld - Talking Rock", player), lambda state: state.has("Tendakraut", player))
+    set_rule(world.multiworld.get_location("Sanctuary Goal", player), lambda state: state.has("Melody", player, world.options.sanctuaries_required.value))
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Poo"}, player)
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Progressive Bat"}, player)
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Progressive Gun"}, player)
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Progressive Fry Pan"}, player)
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Progressive Bracelet"}, player)
+    forbid_items_for_player(world.multiworld.get_location("Poo - Starting Item", player), {"Progressive Other"}, player)
+
+    if world.options.giygas_required:
+        set_rule(world.multiworld.get_location("Giygas", player), lambda state: state.has("Paula", player))
+
+    if world.options.monkey_caves_mode < MonkeyCavesMode.option_shop:  # 2
+        set_rule(world.multiworld.get_location("Monkey Caves - West 2F Left Chest", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        set_rule(world.multiworld.get_location("Monkey Caves - East 2F Left Chest", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        set_rule(world.multiworld.get_location("Monkey Caves - East End Chest", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        set_rule(world.multiworld.get_location("Monkey Caves - East End Trashcan", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        set_rule(world.multiworld.get_location("Monkey Caves - East West 3F Right Chest #1", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        set_rule(world.multiworld.get_location("Monkey Caves - East West 3F Right Chest #2", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+
+        add_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Chest #1", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        add_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Chest #2", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        add_rule(world.multiworld.get_location("Monkey Caves - Talah Rama Gift", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+        add_rule(world.multiworld.get_location("Monkey Caves - Monkey Power", player), lambda state: (twoson_paula_room_present.can_reach(state) or can_buy_pizza.can_reach(state)))
+
+    if world.options.no_free_sanctuaries:
+        lilliput_steps = world.multiworld.get_entrance(f"Happy-Happy Village -> {world.dungeon_connections['Lilliput Steps']}", player)
+        fire_spring = world.multiworld.get_entrance(f"Lost Underworld -> {world.dungeon_connections['Fire Spring']}", player)
+        add_rule(fire_spring, lambda state: state.has("Tenda Lavapants", player))
+        add_rule(lilliput_steps, lambda state: state.has("Tiny Key", player))
+
+    if world.options.shop_randomizer == ShopRandomizer.option_shopsanity:  # 2
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 1", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 2", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 3", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 4", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 5", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 6", player), lambda state: state.has("Tendakraut", player))
+        set_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 7", player), lambda state: state.has("Tendakraut", player))
+
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 1", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 2", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 3", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 4", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 5", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 6", player), lambda state: state.has("Mining Permit", player))
+        set_rule(world.multiworld.get_location("Dusty Dunes - Mine Food Cart Slot 7", player), lambda state: state.has("Mining Permit", player))
+
+        set_rule(world.multiworld.get_location("Saturn Valley Shop - Post-Belch Saturn Slot 1", player), lambda state: state.has("Threed Tunnels Clear", player))
+        set_rule(world.multiworld.get_location("Saturn Valley Shop - Post-Belch Saturn Slot 2", player), lambda state: state.has("Threed Tunnels Clear", player))
+        set_rule(world.multiworld.get_location("Saturn Valley Shop - Post-Belch Saturn Slot 3", player), lambda state: state.has("Threed Tunnels Clear", player))
+        set_rule(world.multiworld.get_location("Saturn Valley Shop - Post-Belch Saturn Slot 4", player), lambda state: state.has("Threed Tunnels Clear", player))
+
+        set_rule(world.multiworld.get_location("Deep Darkness - Arms Dealer Slot 1", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Arms Dealer Slot 2", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Arms Dealer Slot 3", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Arms Dealer Slot 4", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 1", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 2", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 3", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 4", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 5", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 6", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Deep Darkness - Businessman Slot 7", player), lambda state: state.has("ATM Access", player))
+
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 1", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 2", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 3", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 4", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 5", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 6", player), lambda state: state.has("ATM Access", player))
+        add_rule(world.multiworld.get_location("Lost Underworld - Tenda Camp Shop Slot 7", player), lambda state: state.has("ATM Access", player))
+
+        set_rule(world.multiworld.get_location("Dalaam Restaurant - Slot 1", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Dalaam Restaurant - Slot 2", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Dalaam Restaurant - Slot 3", player), lambda state: state.has("ATM Access", player))
+        set_rule(world.multiworld.get_location("Dalaam Restaurant - Slot 4", player), lambda state: state.has("ATM Access", player))
+        
\ No newline at end of file
diff --git a/worlds/earthbound/__init__.py b/worlds/earthbound/__init__.py
new file mode 100644
index 0000000000..3f2a1dc39c
--- /dev/null
+++ b/worlds/earthbound/__init__.py
@@ -0,0 +1,609 @@
+import os
+import typing
+import threading
+import pkgutil
+from typing import List, Set, Dict, TextIO, Tuple
+
+from BaseClasses import Item, MultiWorld, Location, Tutorial, ItemClassification
+from Fill import fill_restrictive
+from worlds.AutoWorld import World, WebWorld
+import itertools
+import settings
+from .Items import get_item_names_per_category, item_table
+from .Locations import get_locations
+from .Regions import init_areas, connect_area_exits
+from .Options import EBOptions, eb_option_groups
+from .setup_game import setup_gamevars, place_static_items
+from .modules.enemy_data import initialize_enemies
+from .modules.flavor_data import create_flavors
+from .game_data.local_data import item_id_table, world_version
+from .modules.hint_data import setup_hints
+from .game_data.text_data import spoiler_psi, spoiler_starts, spoiler_badges
+from .Client import EarthBoundClient
+from .Rules import set_location_rules
+from .Rom import patch_rom, EBProcPatch, valid_hashes
+from .game_data.static_location_data import location_ids, location_groups
+from .modules.equipamizer import EBArmor, EBWeapon
+from .modules.boss_shuffle import BossData, SlotInfo
+from worlds.generic.Rules import add_item_rule
+from Options import OptionError
+
+
+class EBSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """File name of the EarthBound US ROM"""
+        description = "EarthBound ROM File"
+        copy_to = "EarthBound.sfc"
+        md5s = valid_hashes
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
+class EBWeb(WebWorld):
+    theme = "ocean"
+
+    setup_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the EarthBound randomizer"
+        "and connecting to an Archipelago server.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Pink Switch"]
+    )
+
+
+    tutorials = [setup_en]
+
+    option_groups = eb_option_groups
+    # option_presets = eb_option_presets
+
+class EBItem(Item):
+    game: str = "EarthBound"
+
+
+class EarthBoundWorld(World):
+    """EarthBound is a contemporary-themed JRPG. Take four psychically-endowed children
+       across the world in search of 8 Melodies to defeat Giygas, the cosmic evil."""
+    
+    game = "EarthBound"
+    option_definitions = EBOptions
+    data_version = 1
+    required_client_version = (0, 5, 0) 
+
+    item_name_to_id = {item: data.code for item, data in item_table.items() if data.code}
+    location_name_to_id = location_ids
+    item_name_groups = get_item_names_per_category()
+    location_name_groups = location_groups
+
+    web = EBWeb()
+    settings: typing.ClassVar[EBSettings]
+    # topology_present = True
+
+    options_dataclass = EBOptions
+    options: EBOptions
+
+    locked_locations: List[str]
+    location_cache: List[Location]
+
+    def __init__(self, multiworld: MultiWorld, player: int):
+        self.rom_name_available_event = threading.Event()
+        super().__init__(multiworld, player)
+
+        self.locked_locations = []
+        self.location_cache = []
+        self.event_count = 8
+        self.progressive_filler_bats: int = 0
+        self.progressive_filler_pans: int = 0
+        self.progressive_filler_guns: int = 0
+        self.progressive_filler_bracelets: int = 0
+        self.progressive_filler_other: int = 0
+        self.world_version: str = world_version
+        self.armor_list = Dict[str, EBArmor]
+        self.weapon_list = Dict[str, EBWeapon]
+        self.boss_slots = Dict[str, SlotInfo]
+        self.boss_info = Dict[str, BossData]
+        self.starting_character: str | None = None
+        self.locals = []
+        self.rom_name = None
+        self.starting_area_teleport = None
+        self.common_gear = []
+        self.uncommon_gear = []
+        self.rare_gear = []
+        self.get_all_spheres = threading.Event()
+        self.boss_list: List[str] = []
+        self.starting_region = str
+        self.start_location = int
+        self.dungeon_connections: dict[str, str] = {}
+        self.has_generated_output: bool = False
+        self.hint_man_hints: list[tuple[int | str, player]] = []
+
+        self.common_items = [
+            "Cookie",
+            "Bag of Fries",
+            "Teddy Bear",
+            "Hamburger",
+            "Boiled Egg",
+            "Fresh Egg",
+            "Picnic Lunch",
+            "Croissant",
+            "Bread Roll",
+            "Can of Fruit Juice",
+            "Royal Iced Tea",
+            "Protein Drink",
+            "Bottle of Water",
+            "Cold Remedy",
+            "Vial of Serum",
+            "Ketchup Packet",
+            "Sugar Packet",
+            "Tin of Cocoa",
+            "Carton of Cream",
+            "Sprig of Parsley",
+            "Jar of Hot Sauce",
+            "Salt Packet",
+            "Wet Towel",
+            "Refreshing Herb",
+            "Ruler",
+            "Protractor",
+            "Insecticide Spray",
+            "Rust Promoter",
+            "Stag Beetle",
+            "Toothbrush",
+            "Handbag Strap",
+            "Chick",
+            "Chicken",
+            "Trout Yogurt",
+            "Banana",
+            "Calorie Stick",
+            "Gelato de Resort",
+            "Snake",
+            "Cup of Noodles",
+            "Cup of Coffee",
+            "Double Burger",
+            "Bean Croquette",
+            "Molokheiya Soup",
+            "Plain Roll",
+            "Magic Tart",
+            "PSI Caramel",
+            "Popsicle",
+            "Bottle Rocket"
+        ]
+
+        self.common_gear = [
+            "Yo-yo",
+            "Slingshot",
+            "Travel Charm",
+            "Great Charm",
+            "Ribbon",
+            "Red Ribbon"
+        ]
+
+        self.uncommon_items = [
+            "Pasta di Summers",
+            "Pizza",
+            "Chef's Special",
+            "Super Plush Bear",
+            "Jar of Delisauce",
+            "Secret Herb",
+            "Xterminator Spray",
+            "Snake Bag",
+            "Bomb",
+            "Rust Promoter DX",
+            "Pair of Dirty Socks",
+            "Mummy Wrap",
+            "Pharaoh's Curse",
+            "Sudden Guts Pill",
+            "Picture Postcard",
+            "Viper",
+            "Repel Sandwich",
+            "Lucky Sandwich",
+            "Peanut Cheese Bar",
+            "Bowl of Rice Gruel",
+            "Kabob",
+            "Plain Yogurt",
+            "Beef Jerky",
+            "Mammoth Burger",
+            "Bottle of DXwater",
+            "Magic Pudding",
+            "Big Bottle Rocket",
+            "Bazooka",
+            "Meteornium"
+
+        ]
+
+        self.uncommon_gear = [
+            "Trick Yo-yo",
+            "Bionic Slingshot",
+            "Crystal Charm",
+            "Defense Ribbon",
+            "Earth Pendant",
+            "Flame Pendant",
+            "Rain Pendant",
+            "Night Pendant"
+        ]
+
+        self.rare_items = [
+            "Large Pizza",
+            "Magic Truffle",
+            "Brain Food Lunch",
+            "Rock Candy",
+            "Kraken Soup",
+            "IQ Capsule",
+            "Guts Capsule",
+            "Speed Capsule",
+            "Vital Capsule",
+            "Luck Capsule",
+            "Horn of Life",
+            "Multi Bottle Rocket",
+            "Super Bomb",
+            "Bag of Dragonite",
+            "Meteotite",
+            "Repel Superwich",
+            "Piggy Jelly",
+            "Spicy Jerky",
+            "Luxury Jerky",
+            "Cup of Lifenoodles"
+        ]
+
+        self.rare_gear = [
+            "Combat Yo-yo",
+            "Sword of Kings",
+            "Sea Pendant",
+            "Star Pendant",
+            "Goddess Ribbon"
+        ]
+
+        self.money = [
+            "$10",
+            "$100",
+            "$1000"
+        ]
+
+    def generate_early(self) -> None:  # Todo: place locked items in generate_early
+        self.starting_character = self.options.starting_character.current_key.capitalize()
+        self.locals = []
+        local_space_count = 0
+        max_counts = {
+            "Ness": 12,
+            "Paula": 11,
+            "Jeff": 9,
+            "Poo": 12
+        }
+
+        max_count = max_counts[self.starting_character]
+        for item_name, amount in itertools.chain(self.options.start_inventory.items(), self.options.start_inventory_from_pool.items()):
+            if item_name in item_id_table:
+                local_space_count += amount
+                if local_space_count > max_count and not self.options.remote_items:
+                    player = self.multiworld.get_player_name(self.player)
+                    raise OptionError(f"{player}: starting inventory cannot place more than {max_count} items into 'Goods' for {self.starting_character}. Attempted to place {local_space_count} Goods items.")
+
+        setup_gamevars(self)
+        create_flavors(self)
+        initialize_enemies(self)
+
+        if not self.options.character_shuffle:
+            self.options.local_items.value.update(["Paula", "Jeff", "Poo", "Flying Man"])
+            self.event_count += 6
+
+        if self.options.local_teleports:
+            self.options.local_items.value |= self.item_name_groups["PSI"]
+
+    def create_regions(self) -> None:
+        init_areas(self, get_locations(self))
+        connect_area_exits(self)
+        place_static_items(self)
+
+    def create_items(self) -> None:
+        pool = self.get_item_pool(self.get_excluded_items())
+        self.fill_item_pool(pool)
+
+        self.multiworld.itempool += pool
+
+    def set_rules(self) -> None:
+        set_location_rules(self)
+        self.multiworld.completion_condition[self.player] = lambda state: state.has('Saved Earth', self.player)
+
+    def pre_fill(self) -> None:
+        prefill_locations = []
+        prefill_items = []
+
+        if not self.options.character_shuffle:
+            main_characters = ["Ness", "Paula", "Jeff", "Poo"]
+            for character in main_characters:
+                if character != self.starting_character:
+                    prefill_items.append(self.create_item(character))
+
+            prefill_items.extend([
+                self.create_item("Flying Man"),
+                self.create_item("Teddy Bear"),
+                self.create_item("Super Plush Bear")
+            ])
+
+            prefill_locations.extend([
+                self.multiworld.get_location("Happy-Happy Village - Prisoner", self.player),
+                self.multiworld.get_location("Threed - Zombie Prisoner", self.player),
+                self.multiworld.get_location("Snow Wood - Bedroom", self.player),
+                self.multiworld.get_location("Monotoli Building - Monotoli Character", self.player),
+                self.multiworld.get_location("Dalaam - Throne Character", self.player),
+                self.multiworld.get_location("Deep Darkness - Barf Character", self.player),
+            ])
+            self.random.shuffle(prefill_locations)
+            add_item_rule(self.multiworld.get_location("Happy-Happy Village - Prisoner", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+            add_item_rule(self.multiworld.get_location("Threed - Zombie Prisoner", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+            add_item_rule(self.multiworld.get_location("Snow Wood - Bedroom", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+            add_item_rule(self.multiworld.get_location("Monotoli Building - Monotoli Character", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+            add_item_rule(self.multiworld.get_location("Dalaam - Throne Character", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+            add_item_rule(self.multiworld.get_location("Deep Darkness - Barf Character", self.player), lambda item: item.name in self.item_name_groups["Characters"])
+
+        fill_restrictive(self.multiworld, self.multiworld.get_all_state(False, collect_pre_fill_items=False), prefill_locations, prefill_items, True, True)
+        setup_hints(self)
+
+    def get_pre_fill_items(self) -> list[Item]:
+        characters = ["Ness", "Paula", "Jeff", "Poo"]
+        prefill_items = []
+        for character in characters:
+            if character != self.starting_character:
+                prefill_items.append(self.create_item(f"{character}"))     
+        return prefill_items
+
+    @classmethod
+    def stage_generate_output(cls, multiworld: MultiWorld, output_directory: str) -> None:
+        try:
+            multiworld.earthbound_locations_by_sphere = list(multiworld.get_spheres())
+        except Exception:
+            raise
+        finally:
+            for world in multiworld.get_game_worlds("EarthBound"):
+                world.get_all_spheres.set()
+
+    def generate_output(self, output_directory: str) -> None:
+        self.has_generated_output = True  # Make sure data defined in generate output doesn't get added to spoiler only mode
+        try:
+            patch = EBProcPatch(player=self.player, player_name=self.multiworld.player_name[self.player])
+            patch.write_file("earthbound_basepatch.bsdiff4", pkgutil.get_data(__name__, "src/earthbound_basepatch.bsdiff4"))
+            patch_rom(self, patch, self.player)
+
+            self.rom_name = patch.name
+
+            patch.write(os.path.join(output_directory,
+                                     f"{self.multiworld.get_out_file_name_base(self.player)}{patch.patch_file_ending}"))
+        except Exception:
+            raise
+        finally:
+            self.rom_name_available_event.set()  # make sure threading continues and errors are collected
+
+    def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None:
+        if self.options.dungeon_shuffle:
+            dungeon_entrances = {}
+            dungeon_mapping = {}
+            for dungeon in self.dungeon_connections:
+                dungeon_entrances[self.dungeon_connections[dungeon]] = dungeon
+
+            for dungeon in dungeon_entrances:
+                for location in self.get_region(dungeon).locations:
+                    if location.address:
+                        dungeon_mapping[location.address] = dungeon_entrances[dungeon]
+
+            hint_data[self.player] = dungeon_mapping
+
+    def fill_slot_data(self) -> Dict[str, typing.Any]:
+        return {
+            "starting_area": self.start_location,
+            "pizza_logic": self.options.monkey_caves_mode.value,
+            "free_sancs": self.options.no_free_sanctuaries.value,
+            "shopsanity": self.options.shop_randomizer.value,
+            "hint_man_hints": self.hint_man_hints
+        }
+
+    def modify_multidata(self, multidata: dict) -> None:
+        import base64
+        # wait for self.rom_name to be available.
+        self.rom_name_available_event.wait()
+        rom_name = getattr(self, "rom_name", None)
+        if rom_name:
+            new_name = base64.b64encode(bytes(self.rom_name)).decode()
+            multidata["connect_names"][new_name] = multidata["connect_names"][self.multiworld.player_name[self.player]]
+
+    def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
+        spoiler_handle.write(f"\nStarting Location:    {spoiler_starts[self.start_location]}\n")
+        spoiler_handle.write(f"Franklin Badge Protection:    {spoiler_badges[self.franklin_protection]}\n")
+        if self.options.psi_shuffle:
+            spoiler_handle.write("\nPSI Shuffle:\n")
+            spoiler_handle.write(f" Favorite Thing PSI Slot:    {spoiler_psi[self.offensive_psi_slots[0]]}\n")
+            spoiler_handle.write(f" Ness Offensive PSI Middle Slot:    {spoiler_psi[self.offensive_psi_slots[1]]}\n")
+            spoiler_handle.write(f" Paula Offensive PSI Top Slot:    {spoiler_psi[self.offensive_psi_slots[2]]}\n")
+            spoiler_handle.write(f" Paula/Poo Offensive PSI Middle Slot:    {spoiler_psi[self.offensive_psi_slots[3]]}\n")
+            spoiler_handle.write(f" Paula/Poo Offensive PSI Bottom Slot:    {spoiler_psi[self.offensive_psi_slots[4]]}\n")
+            spoiler_handle.write(f" Poo Progressive PSI Slot:    {spoiler_psi[self.offensive_psi_slots[5]]}\n")
+
+            spoiler_handle.write(f" Ness/Poo Shield Slot:    {spoiler_psi[self.shield_slots[0]]}\n")
+            spoiler_handle.write(f" Paula Shield Slot:    {spoiler_psi[self.shield_slots[1]]}\n")
+
+            spoiler_handle.write(f" Ness Assist PSI Middle Slot:    {spoiler_psi[self.assist_psi_slots[0]]}\n")
+            spoiler_handle.write(f" Ness Assist PSI Bottom Slot:    {spoiler_psi[self.assist_psi_slots[1]]}\n")
+            spoiler_handle.write(f" Paula Assist PSI Middle Slot:    {spoiler_psi[self.assist_psi_slots[2]]}\n")
+            spoiler_handle.write(f" Paula Assist PSI Bottom Slot:    {spoiler_psi[self.assist_psi_slots[3]]}\n")
+            spoiler_handle.write(f" Poo Assist PSI Slot:    {spoiler_psi[self.assist_psi_slots[4]]}\n")
+        if self.options.psi_shuffle == 2:
+            spoiler_handle.write(f" Bomb/Bazooka Slot:    {spoiler_psi[self.jeff_offense_items[0]]}\n")
+            spoiler_handle.write(f" Bottle Rocket Slot:    {spoiler_psi[self.jeff_offense_items[1]]}\n")
+
+            spoiler_handle.write(f" Spray Can Slot:    {spoiler_psi[self.jeff_assist_items[0]]}\n")
+            spoiler_handle.write(f" Multi-Level Gadget Slot 1:    {spoiler_psi[self.jeff_assist_items[1]]}\n")
+            spoiler_handle.write(f" Single-Level Gadget Slot 1:    {spoiler_psi[self.jeff_assist_items[2]]}\n")
+            spoiler_handle.write(f" Single-Level Gadget Slot 2:    {spoiler_psi[self.jeff_assist_items[3]]}\n")
+            spoiler_handle.write(f" Multi-Level Gadget Slot 2:    {spoiler_psi[self.jeff_assist_items[4]]}\n")
+
+        if self.options.boss_shuffle:
+            spoiler_handle.write("\nBoss Randomization:\n" + 
+                                 f" Frank => {self.boss_list[0]}\n" +
+                                 f" Frankystein Mark II => {self.boss_list[1]}\n" +
+                                 f" Titanic Ant => {self.boss_list[2]}\n" +
+                                 f" Captain Strong => {self.boss_list[3]}\n" +
+                                 f" Everdred => {self.boss_list[4]}\n" +
+                                 f" Mr. Carpainter => {self.boss_list[5]}\n" +
+                                 f" Mondo Mole => {self.boss_list[6]}\n" +
+                                 f" Boogey Tent => {self.boss_list[7]}\n" +
+                                 f" Mini Barf => {self.boss_list[8]}\n" +
+                                 f" Master Belch => {self.boss_list[9]}\n" +
+                                 f" Trillionage Sprout => {self.boss_list[10]}\n" +
+                                 f" Guardian Digger => {self.boss_list[11]}\n" +
+                                 f" Dept. Store Spook => {self.boss_list[12]}\n" +
+                                 f" Evil Mani-Mani => {self.boss_list[13]}\n" +
+                                 f" Clumsy Robot => {self.boss_list[14]}\n" +
+                                 f" Shrooom! => {self.boss_list[15]}\n" +
+                                 f" Plague Rat of Doom => {self.boss_list[16]}\n" +
+                                 f" Thunder and Storm => {self.boss_list[17]}\n" +
+                                 f" Kraken => {self.boss_list[18]}\n" +
+                                 f" Guardian General => {self.boss_list[19]}\n" +
+                                 f" Master Barf => {self.boss_list[20]}\n" +
+                                 f" Starman Deluxe => {self.boss_list[21]}\n" +
+                                 f" Electro Specter => {self.boss_list[22]}\n" +
+                                 f" Carbon Dog => {self.boss_list[23]}\n" +
+                                 f" Ness's Nightmare => {self.boss_list[24]}\n" +
+                                 f" Heavily Armed Pokey => {self.boss_list[25]}\n" +
+                                 f" Starman Junior => {self.boss_list[26]}\n" +
+                                 f" Diamond Dog => {self.boss_list[27]}\n" +
+                                 f" Giygas (Phase 2) => {self.boss_list[28]}\n")
+
+        if self.options.dungeon_shuffle:
+            spoiler_handle.write("\nDungeon Entrances:\n")
+            for dungeon in self.dungeon_connections:
+                spoiler_handle.write(
+                    f" {dungeon} => {self.dungeon_connections[dungeon]}\n"
+                )
+        
+        if self.has_generated_output:
+            spoiler_handle.write("\nArea Levels:\n")
+            spoiler_excluded_areas = ["Ness's Mind", "Global ATM Access", "Common Condiment Shop"]
+            for area in self.area_levels:
+                if area not in spoiler_excluded_areas:
+                    spoiler_handle.write(f" {area}: Level {self.area_levels[area]}\n")
+
+    def create_item(self, name: str) -> EBItem:
+        data = item_table[name]
+        return EBItem(name, data.classification, data.code, self.player)
+
+    def get_filler_item_name(self) -> str:  # Todo: make this suck less
+        weights = {"rare": self.options.rare_filler_weight.value, "uncommon": self.options.uncommon_filler_weight.value, "common": self.options.common_filler_weight.value,
+                   "rare_gear": int(self.options.rare_filler_weight.value * 0.5), "uncommon_gear": int(self.options.uncommon_filler_weight.value * 0.5),
+                   "common_gear": int(self.options.common_filler_weight.value * 0.5), "money": self.options.money_weight.value}
+        
+        filler_type = self.random.choices(list(weights), weights=list(weights.values()), k=1)[0]
+        weight_table = {
+            "common": self.common_items,
+            "common_gear": self.common_gear,
+            "uncommon": self.uncommon_items,
+            "uncommon_gear": self.uncommon_gear,
+            "rare": self.rare_items,
+            "rare_gear": self.rare_gear,
+            "money": self.money
+        }
+        return self.random.choice(weight_table[filler_type])
+
+    def get_excluded_items(self) -> Set[str]:
+        excluded_items: Set[str] = set()
+        excluded_items.add(self.starting_character)
+        starting_area_to_teleport = ["Onett Teleport", "Onett Teleport", "Twoson Teleport", "Happy-Happy Village Teleport",
+                                     "Threed Teleport", "Saturn Valley Teleport", "Fourside Teleport", "Winters Teleport",
+                                     "Summers Teleport", "Dalaam Teleport", "Scaraba Teleport", "Deep Darkness Teleport",
+                                     "Tenda Village Teleport", "Lost Underworld Teleport", "Magicant Teleport"]
+        self.starting_area_teleport = starting_area_to_teleport[self.start_location]
+        excluded_items.add(self.starting_area_teleport)
+        if self.options.random_start_location:
+            excluded_items.add(self.starting_teleport)
+
+        if self.options.magicant_mode not in [0, 3]:
+            excluded_items.add("Magicant Teleport")
+
+        if not self.options.character_shuffle:
+            excluded_items.add("Ness")
+            excluded_items.add("Paula")
+            excluded_items.add("Jeff")
+            excluded_items.add("Poo")
+            excluded_items.add("Flying Man")
+
+        if self.options.progressive_weapons:
+            excluded_items.add("Magicant Bat")
+            excluded_items.add("Legendary Bat")
+            excluded_items.add("Pop Gun")
+            excluded_items.add("Stun Gun")
+            excluded_items.add("Death Ray")
+            excluded_items.add("Moon Beam Gun")
+
+        if self.options.progressive_armor:
+            excluded_items.add("Platinum Band")
+            excluded_items.add("Diamond Band")
+            excluded_items.add("Pixie's Bracelet")
+            excluded_items.add("Cherub's Band")
+            excluded_items.add("Goddess Band")
+            excluded_items.add("Coin of Slumber")
+            excluded_items.add("Souvenir Coin")
+            excluded_items.add("Mr. Saturn Coin")
+
+        if not self.options.no_free_sanctuaries:
+            excluded_items.add("Tiny Key")
+            excluded_items.add("Tenda Lavapants")
+
+        return excluded_items
+
+    def set_classifications(self, name: str) -> Item:
+        data = item_table[name]
+        item = Item(name, data.classification, data.code, self.player)
+
+        if name == "Magicant Teleport" and self.options.magicant_mode == 3:
+            item.classification = ItemClassification.useful
+        return item
+
+    def fill_item_pool(self, pool: List[Item]) -> None:
+        item_to_counts = {
+            "Progressive Bat": self.progressive_filler_bats,
+            "Progressive Fry Pan": self.progressive_filler_pans,
+            "Progressive Gun": self.progressive_filler_guns,
+            "Progressive Bracelet": self.progressive_filler_bracelets,
+            "Progressive Other": self.progressive_filler_other
+        }
+
+        max_filler_counts = {
+            "Progressive Bat": 8,
+            "Progressive Fry Pan": 9,
+            "Progressive Gun": 6,
+            "Progressive Bracelet": 6,
+            "Progressive Other": 10
+        }
+
+        for _ in range(len(self.multiworld.get_unfilled_locations(self.player)) - len(pool) - self.event_count):  # Change to fix event count
+            item = self.set_classifications(self.get_filler_item_name())
+            if item.name in ["Progressive Bat", "Progressive Fry Pan", "Progressive Other",
+                             "Progressive Gun", "Progressive Bracelet"]:
+                item_to_counts[item.name] += 1
+
+                if item_to_counts[item.name] >= max_filler_counts[item.name]:
+                    self.common_gear = [x for x in self.common_gear if x != item.name]
+                    self.uncommon_gear = [x for x in self.uncommon_gear if x != item.name]
+                    self.rare_gear = [x for x in self.rare_gear if x != item.name]
+            pool.append(item)
+
+    def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
+        pool: List[Item] = []
+
+        for name, data in item_table.items():
+            if name not in excluded_items:
+                for _ in range(data.amount):
+                    item = self.set_classifications(name)
+                    pool.append(item)
+        
+        if self.options.progressive_weapons:
+            for i in range(2):
+                pool.append(self.set_classifications("Progressive Bat"))
+            for i in range(4):
+                pool.append(self.set_classifications("Progressive Gun"))
+
+        if self.options.progressive_armor:
+            for i in range(5):
+                pool.append(self.set_classifications("Progressive Bracelet"))
+            for i in range(3):
+                pool.append(self.set_classifications("Progressive Other"))
+
+        return pool
diff --git a/worlds/earthbound/archipelago.json b/worlds/earthbound/archipelago.json
new file mode 100644
index 0000000000..1cfdc01f50
--- /dev/null
+++ b/worlds/earthbound/archipelago.json
@@ -0,0 +1,4 @@
+{"game": "EarthBound",
+"authors": ["Pink Switch"],
+"minimum_ap_version": "0.6.3",
+"world_version": "4.3.1"}
diff --git a/worlds/earthbound/docs/en_EarthBound.md b/worlds/earthbound/docs/en_EarthBound.md
new file mode 100644
index 0000000000..4043aa6d73
--- /dev/null
+++ b/worlds/earthbound/docs/en_EarthBound.md
@@ -0,0 +1,124 @@
+# EarthBound
+
+## 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?
+
+Randomization of EarthBound randomizes all items, from presents, PSI Locations, Character Locations, and gifts from NPCs.
+
+## What is the goal of EarthBound when randomized?
+By default, the goal is to reach the defined number of Sanctuaries, and then defeat Giygas at the Cave of the Past.
+If Giygas is disabled, the game will end once the player reaches the required sanctuary number.
+If Magicant is set to "required", players will need to defeat Ness's Nightmare in Magicant, unlocked upon reaching their required
+Sanctuaries, before they can win.
+Optionally, the player can set Alternate Goal conditions, on 1 or 2 sanctuaries more than required, but these will never be the expected
+goal.
+
+You can check your goals by speaking to Apple Kid in the Cave of the Present.
+
+
+## What items and locations get shuffled?
+
+Locations consist of PSI Locations, Character Locations, presents, and gifts from NPCs.
+
+PSI Locations are locations tied to psychic events in the normal game, usually corresponding to the Sanctuaries, PSI Teleport, or PSI Starstorm.
+
+PSI Locations:
+- Checking the Mani-Mani Statue in Onett
+- Speaking with Buzz Buzz
+- Drinking the Coffee at Saturn Valley
+- Defeating the Dept. Store Spook in Fourside
+- Speaking with the Monkey with Talah Rama
+- Eating the Magic Cake in Summers
+- Completing Poo's Trial of Mu in Dalaam
+- Speaking with the Star Master outside the Pyramid in Scaraba
+- Drinking the Tea at Tenda Village
+- Speaking with the Talking Rock in the Lost Underworld
+- Speaking with the Star Master in the Cave of the Present
+- Defeating Ness's Nightmare (Only if the Magicant Mode option is set to Psi location)
+
+Character Locations:
+ - The cabin just outside Happy-Happy Village
+ - The graveyard prison in Threed
+ - The second floor bedroom in the Snow Wood Boarding School
+ - Monotoli's office in Fourside
+ - The Throne Room in Dalaam
+ - Defeating Master Barf in Deep Darkness
+
+
+## Which items can be in another player's world?
+
+Items you can find for EarthBound include PSI for Poo, characters, teleport destinations, money, and just about any regular or key item.
+A few new key items have been added to replace certain plot flags.
+
+## What does another world's item look like in EarthBound?
+When collecting an item for another player, the item and player are identified as the receiver. If Shopsanity is enabled, items for other players
+in shops will display the player they are for below the shop window. When attempting to purchase an item for another player, the full name of the item and its receiver
+will be displayed to confirm. If the 'Presents Match Contents' option is enabled, presents will display the Archipelago symbol if they contain an item for another player.
+
+## What happens when I receive an item?
+When you receive an item, the sound effect of an item being received will play, and it will be put in your inventory. If your inventory is full, it will automatically be put in storage.
+!If storage is full, you will not be able to receive any more items until you clear room! If you receive PSI, the PSI learn fanfare plays instead. If you receive a character, a cutscene
+will play.
+
+## My inventory is full and there's items I can't find!
+You can press R at any time on the overworld to access a pocket storage menu that allows you to store, withdraw from storage, and toss unnessecary items within one menu.
+
+## What about Escargo Express?
+Escargo Express's item storage has been replaced with a cross-game gift delivery system. From any phone, you can call Escargo Express to receive or send Gift items to other players.
+In order for players to be eligible, they have to have gifting enabled. Your gift inbox can hold 69 gifted items at a time, and up to 10 items can be queued to be sent to other players.
+
+## Hints?
+In most major towns, you can find a helpful Hint Man who will give hints about your game... for a price.
+The location of the Hint Man will be marked on your map, viewable at all times with X.
+
+## Repel Sandwiches?
+Skip Sandwiches (And Skip Sandwich DXs) have been replaced with an item called the Repel Sandwich (and Repel Superwich).
+Repel Sandwiches will prevent normal enemies from spawning for a short time. The help text can tell you more.
+
+## Is there a run button?
+You can hold down the Y button to run.
+
+## I returned to Moonside after beating the Mani-Mani statue and now I can't leave!
+Check behind the cafe counter as you would in Fourside. A sparkle indicates the general area.
+
+## How do I get to the undeground prison in Threed?
+Use the Bad Key Machine on the door from the outside.
+
+## How do I get from Onett to Twoson?
+The captain at the Police Station might be convinced to remove the barricade...
+
+## How do I get rid of the ghosts in the road tunnels?
+The ghosts will vanish after Master Belch is defeated, irregardless of anything else.
+
+## How do I get back to Andonuts's Lab after using the Sky Runner?
+You can either go back to the underground prison or talk to Bubble Monkey, regardless of if you have helped him before.
+
+## My game automatically rolls credits after getting to Lumine Hall, but I need to get to the Lost Underworld
+Once you defeat the boss of Lumine Hall, the Lost Underworld teleport is automatically unlocked. You will need to leave and warp there, though.
+
+## How do I get into the Tenda Camp in the Lost Underworld?
+Bring them Tendakraut. They tend to notice it if you walk up to the gate with it already in your inventory.
+
+## I started as Jeff. Can I teleport?
+Jeff starts with an item called the "Warp pad", which is an inventory item that functions as Teleport. It can safely be tucked into Key Item storage.
+
+## Community Suggestions
+Community suggestions for certain things are being accepted. You can find submissions below.
+
+## Lumine Hall Text Scroll
+https://docs.google.com/forms/d/e/1FAIpQLSff7FR0mxtQcZ3d87BoZcRMggBxqGYk2fwmY_ibVnR1sXXQWw/viewform
+
+## Window Flavor Colors
+https://docs.google.com/forms/d/e/1FAIpQLSd17Bp4NYGHJqadaYprKaEXFW4EgbUYSPKxGoyufhArb1BbYw/viewform
+
+## Joke Hints
+https://docs.google.com/forms/d/e/1FAIpQLScHWK0wHPCmDgHYh8juTrntsyVqEdzYWGCScLdEs21oZCa2mQ/viewform
+
+## Equipment Randomizer
+https://docs.google.com/forms/d/e/1FAIpQLSdy-aczL4LmMDirbeD-s5N6u8ae0G2BSrhGfCxOqFhZa_x48A/viewform
+
+## Enemy Randomizer
+https://docs.google.com/forms/d/e/1FAIpQLSdF0aFoIwCO7t7OpaObTE_b6dAgLpXC2_8fS-SjdgJDjAQJ6A/viewform
\ No newline at end of file
diff --git a/worlds/earthbound/docs/setup_en.md b/worlds/earthbound/docs/setup_en.md
new file mode 100644
index 0000000000..3a2f0b5375
--- /dev/null
+++ b/worlds/earthbound/docs/setup_en.md
@@ -0,0 +1,128 @@
+# EarthBound Archipelago Randomizer Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases).
+
+
+- Hardware or software capable of loading and playing SNES ROM files
+    - An emulator capable of connecting to SNI such as:
+        - snes9x-rr from: [snes9x rr](https://github.com/gocha/snes9x-rr/releases),
+        - BizHawk from: [TASVideos](https://tasvideos.org/BizHawk)
+        - snes9x-nwa from: [snes9x nwa](https://github.com/Skarsnik/snes9x-emunwa/releases)
+        - RetroArch 1.10.3 or newer from: RetroArch Website
+        - You can additionally use the FX Pack Pro, however some issues with it have been reported and it is not officially recommended.
+    
+- Your legally obtained EarthBound English ROM file, probably named `EarthBound (USA).sfc`
+
+## Optional Software
+- EarthBound Archipelago Poptracker Pack
+	- PopTracker from: [PopTracker Releases Page](https://github.com/black-sliver/PopTracker/releases/)
+	- EarthBound Archipelago PopTracker pack from: [EarthBound AP Tracker Releases Page](https://github.com/PinkSwitch/earthbound_poptracker/releases/tag/ebpoptracker1.0)
+    - The EarthBound Sprite Injector Tool (For custom sprite usage): [EarthBound Sprite Injector](https://github.com/PinkSwitch/eb-sprite-injector/releases/)
+
+## Installation Procedures
+
+### Windows Setup
+
+1. Download and install Archipelago from the link above, making sure to install the most recent version.
+2. During generation/patching, you will be asked to locate your base ROM file. This is your EarthBound ROM file.
+3. If you are using an emulator, you should assign your Lua capable emulator as your default program for launching ROM
+   files.
+    1. Extract your emulator's folder to your Desktop, or somewhere you will remember.
+    2. Right-click on a ROM file and select **Open with...**
+    3. Check the box next to **Always use this app to open .sfc files**
+    4. Scroll to the bottom of the list and click the grey text **Look for another App on this PC**
+    5. Browse for your emulator's `.exe` file and click **Open**. This file should be located inside the folder you
+       extracted in step one.
+
+## Create a Config (.yaml) File
+
+### What is a config file and why do I need one?
+
+See the guide on setting up a basic YAML at the Archipelago setup
+guide: [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en)
+
+### Where do I get a config file?
+
+The Player Options page on the website allows you to configure your personal options and export a config file from
+them.
+
+### Verifying your config file
+
+If you would like to validate your config file to make sure it works, you may do so on the YAML Validator page. YAML
+validator page: [YAML Validation page](/mysterycheck)
+
+## Joining a MultiWorld Game
+
+### Obtain your patch file and create your ROM
+
+When you join a multiworld game, you will be asked to provide your config file to whomever is hosting. Once that is done,
+the host will provide you with either a link to download your patch file, or with a zip file containing everyone's patch
+files. Your patch file should have a `.apeb` extension.
+
+Put your patch file on your desktop or somewhere convenient, and double click it. This should automatically launch the
+client, and will also create your ROM in the same place as your patch file.
+
+### Connect to the client
+
+#### With an emulator
+
+When the client launched automatically, SNI should have also automatically launched in the background. If this is its
+first time launching, you may be prompted to allow it to communicate through the Windows Firewall.
+
+##### snes9x-rr
+
+1. Load your ROM file if it hasn't already been loaded.
+2. Click on the File menu and hover on **Lua Scripting**
+3. Click on **New Lua Script Window...**
+4. In the new window, click **Browse...**
+5. Select the connector lua file included with your client
+    - Look in the Archipelago folder for `/SNI/lua/Connector.lua`.
+6. If you see an error while loading the script that states `socket.dll missing` or similar, navigate to the folder of
+the lua you are using in your file explorer and copy the `socket.dll` to the base folder of your snes9x install.
+
+##### BizHawk
+
+1. Ensure you have the BSNES core loaded. This is done with the main menubar, under:
+    - (≤ 2.8) `Config` 〉 `Cores` 〉 `SNES` 〉 `BSNES`
+    - (≥ 2.9) `Config` 〉 `Preferred Cores` 〉 `SNES` 〉 `BSNESv115+`
+2. Load your ROM file if it hasn't already been loaded.
+   If you changed your core preference after loading the ROM, don't forget to reload it (default hotkey: Ctrl+R).
+3. Drag+drop the `Connector.lua` file included with your client onto the main EmuHawk window.
+    - Look in the Archipelago folder for `/SNI/lua/x64` or `/SNI/lua/x86` depending on if the
+      emulator is 64-bit or 32-bit. Please note the most recent versions of BizHawk are 64-bit only.
+    - You could instead open the Lua Console manually, click `Script` 〉 `Open Script`, and navigate to `Connector.lua`
+      with the file picker.
+
+
+
+### Connect to the Archipelago Server
+
+The patch file which launched your client should have automatically connected you to the AP Server. There are a few
+reasons this may not happen however, including if the game is hosted on the website but was generated elsewhere. If the
+client window shows "Server Status: Not Connected", simply ask the host for the address of the server, and copy/paste it
+into the "Server" input field then press enter.
+
+The client will attempt to reconnect to the new server address, and should momentarily show "Server Status: Connected".
+
+### Play the game
+
+When the client shows both SNES Device and Server as connected, you're ready to begin playing. Congratulations on
+successfully joining a multiworld game!
+
+## Hosting a MultiWorld game
+
+The recommended way to host a game is to use our hosting service. The process is relatively simple:
+
+1. Collect config files from your players.
+2. Create a zip file containing your players' config files.
+3. Upload that zip file to the Generate page above.
+    - Generate page: [WebHost Seed Generation Page](/generate)
+4. Wait a moment while the seed is generated.
+5. When the seed is generated, you will be redirected to a "Seed Info" page.
+6. Click "Create New Room". This will take you to the server page. Provide the link to this page to your players, so
+   they may download their patch files from there.
+7. Note that a link to a MultiWorld Tracker is at the top of the room page. The tracker shows the progress of all
+   players in the game. Any observers may also be given the link to this page.
+8. Once all players have joined, you may begin playing.
diff --git a/worlds/earthbound/game_data/__init__.py b/worlds/earthbound/game_data/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/earthbound/game_data/battle_bg_data.py b/worlds/earthbound/game_data/battle_bg_data.py
new file mode 100644
index 0000000000..faafea4c06
--- /dev/null
+++ b/worlds/earthbound/game_data/battle_bg_data.py
@@ -0,0 +1,329 @@
+battle_bg_bpp = {
+    0x00: 2,
+    0x01: 4,
+    0x02: 4,
+    0x03: 4,
+    0x04: 4,
+    0x05: 4,
+    0x06: 4,
+    0x07: 4,
+    0x08: 4,
+    0x09: 4,
+    0x0a: 4,
+    0x0b: 4,
+    0x0c: 4,
+    0x0d: 4,
+    0x0e: 4,
+    0x0f: 4,
+    0x10: 4,
+    0x11: 4,
+    0x12: 4,
+    0x13: 4,
+    0x14: 4,
+    0x15: 4,
+    0x16: 4,
+    0x17: 4,
+    0x18: 4,
+    0x19: 4,
+    0x1a: 4,
+    0x1b: 4,
+    0x1c: 4,
+    0x1d: 4,
+    0x1e: 4,
+    0x1f: 4,
+    0x20: 4,
+    0x21: 4,
+    0x22: 4,
+    0x23: 4,
+    0x24: 4,
+    0x25: 4,
+    0x26: 4,
+    0x27: 4,
+    0x28: 4,
+    0x29: 4,
+    0x2a: 4,
+    0x2b: 4,
+    0x2c: 4,
+    0x2d: 2,
+    0x2e: 4,
+    0x2f: 4,
+    0x30: 4,
+    0x31: 4,
+    0x32: 4,
+    0x33: 4,
+    0x34: 4,
+    0x35: 4,
+    0x36: 4,
+    0x37: 4,
+    0x38: 4,
+    0x39: 4,
+    0x3a: 4,
+    0x3b: 4,
+    0x3c: 4,
+    0x3d: 4,
+    0x3e: 4,
+    0x3f: 4,
+    0x40: 4,
+    0x41: 4,
+    0x42: 4,
+    0x43: 4,
+    0x44: 4,
+    0x45: 4,
+    0x46: 4,
+    0x47: 4,
+    0x48: 4,
+    0x49: 4,
+    0x4a: 4,
+    0x4b: 4,
+    0x4c: 4,
+    0x4d: 4,
+    0x4e: 4,
+    0x4f: 4,
+    0x50: 4,
+    0x51: 4,
+    0x52: 4,
+    0x53: 4,
+    0x54: 4,
+    0x55: 4,
+    0x56: 4,
+    0x57: 4,
+    0x58: 4,
+    0x59: 4,
+    0x5a: 4,
+    0x5b: 4,
+    0x5c: 4,
+    0x5d: 4,
+    0x5e: 4,
+    0x5f: 4,
+    0x60: 4,
+    0x61: 4,
+    0x62: 4,
+    0x63: 4,
+    0x64: 4,
+    0x65: 4,
+    0x66: 4,
+    0x67: 4,
+    0x68: 4,
+    0x69: 4,
+    0x6a: 4,
+    0x6b: 4,
+    0x6c: 4,
+    0x6d: 4,
+    0x6e: 4,
+    0x6f: 4,
+    0x70: 4,
+    0x71: 4,
+    0x72: 4,
+    0x73: 4,
+    0x74: 4,
+    0x75: 4,
+    0x76: 4,
+    0x77: 4,
+    0x78: 4,
+    0x79: 4,
+    0x7a: 4,
+    0x7b: 4,
+    0x7c: 4,
+    0x7d: 4,
+    0x7e: 4,
+    0x7f: 4,
+    0x80: 4,
+    0x81: 4,
+    0x82: 4,
+    0x83: 4,
+    0x84: 4,
+    0x85: 4,
+    0x86: 4,
+    0x87: 4,
+    0x88: 4,
+    0x89: 4,
+    0x8a: 4,
+    0x8b: 4,
+    0x8c: 4,
+    0x8d: 4,
+    0x8e: 4,
+    0x8f: 4,
+    0x90: 4,
+    0x91: 4,
+    0x92: 4,
+    0x93: 4,
+    0x94: 4,
+    0x95: 4,
+    0x96: 4,
+    0x97: 4,
+    0x98: 4,
+    0x99: 4,
+    0x9a: 4,
+    0x9b: 4,
+    0x9c: 4,
+    0x9d: 4,
+    0x9e: 4,
+    0x9f: 4,
+    0xa0: 4,
+    0xa1: 4,
+    0xa2: 4,
+    0xa3: 2,
+    0xa4: 2,
+    0xa5: 2,
+    0xa6: 2,
+    0xa7: 2,
+    0xa8: 2,
+    0xa9: 2,
+    0xaa: 2,
+    0xab: 2,
+    0xac: 2,
+    0xad: 2,
+    0xae: 2,
+    0xaf: 2,
+    0xb0: 2,
+    0xb1: 2,
+    0xb2: 2,
+    0xb3: 2,
+    0xb4: 2,
+    0xb5: 2,
+    0xb6: 2,
+    0xb7: 2,
+    0xb8: 2,
+    0xb9: 2,
+    0xba: 2,
+    0xbb: 2,
+    0xbc: 2,
+    0xbd: 4,
+    0xbe: 2,
+    0xbf: 2,
+    0xc0: 2,
+    0xc1: 2,
+    0xc2: 2,
+    0xc3: 4,
+    0xc4: 4,
+    0xc5: 4,
+    0xc6: 4,
+    0xc7: 4,
+    0xc8: 2,
+    0xc9: 2,
+    0xca: 2,
+    0xcb: 2,
+    0xcc: 2,
+    0xcd: 2,
+    0xce: 2,
+    0xcf: 2,
+    0xd0: 4,
+    0xd1: 4,
+    0xd2: 2,
+    0xd3: 2,
+    0xd4: 2,
+    0xd5: 2,
+    0xd6: 2,
+    0xd7: 2,
+    0xd8: 2,
+    0xd9: 2,
+    0xda: 2,
+    0xdb: 2,
+    0xdc: 4,
+    0xdd: 2,
+    0xde: 2,
+    0xdf: 2,
+    0xe0: 2,
+    0xe1: 4,
+    0xe2: 4,
+    0xe3: 4,
+    0xe4: 4,
+    0xe5: 4,
+    0xe6: 4,
+    0xe7: 4,
+    0xe8: 4,
+    0xe9: 4,
+    0xea: 4,
+    0xeb: 4,
+    0xec: 4,
+    0xed: 4,
+    0xee: 4,
+    0xef: 4,
+    0xf0: 4,
+    0xf1: 4,
+    0xf2: 4,
+    0xf3: 4,
+    0xf4: 4,
+    0xf5: 4,
+    0xf6: 4,
+    0xf7: 4,
+    0xf8: 2,
+    0xf9: 4,
+    0xfa: 4,
+    0xfb: 4,
+    0xfc: 2,
+    0xfd: 4,
+    0xfe: 4,
+    0xff: 4,
+    0x100: 4,
+    0x101: 4,
+    0x102: 2,
+    0x103: 4,
+    0x104: 4,
+    0x105: 4,
+    0x106: 4,
+    0x107: 2,
+    0x108: 2,
+    0x109: 4,
+    0x10a: 2,
+    0x10b: 2,
+    0x10c: 4,
+    0x10d: 2,
+    0x10e: 2,
+    0x10f: 4,
+    0x110: 2,
+    0x111: 2,
+    0x112: 2,
+    0x113: 2,
+    0x114: 2,
+    0x115: 2,
+    0x116: 4,
+    0x117: 4,
+    0x118: 4,
+    0x119: 2,
+    0x11a: 2,
+    0x11b: 4,
+    0x11c: 4,
+    0x11d: 4,
+    0x11e: 4,
+    0x11f: 4,
+    0x120: 4,
+    0x121: 4,
+    0x122: 4,
+    0x123: 4,
+    0x124: 2,
+    0x125: 2,
+    0x126: 4,
+    0x127: 4,
+    0x128: 4,
+    0x129: 4,
+    0x12a: 4,
+    0x12b: 4,
+    0x12c: 4,
+    0x12d: 4,
+    0x12e: 4,
+    0x12f: 4,
+    0x130: 4,
+    0x131: 4,
+    0x132: 2,
+    0x133: 2,
+    0x134: 4,
+    0x135: 4,
+    0x136: 4,
+    0x137: 4,
+    0x138: 4,
+    0x139: 4,
+    0x13a: 4,
+    0x13b: 4,
+    0x13c: 4,
+    0x13d: 4,
+    0x13e: 4,
+    0x13f: 4,
+    0x140: 4,
+    0x141: 4,
+    0x142: 4,
+    0x143: 4,
+    0x144: 4,
+    0x145: 4,
+    0x146: 2
+}
diff --git a/worlds/earthbound/game_data/local_data.py b/worlds/earthbound/game_data/local_data.py
new file mode 100644
index 0000000000..c5a85b2733
--- /dev/null
+++ b/worlds/earthbound/game_data/local_data.py
@@ -0,0 +1,1406 @@
+world_version = "4.3.1"
+
+check_table = {
+    0xEB0000: [0x11, 3],
+    0xEB0001: [0x6C, 4],
+    0xEB0002: [0x6B, 7],
+    0xEB0003: [0x11, 6],
+    0xEB0004: [0x84, 3],
+    0xEB0005: [0x82, 1],
+    0xEB0006: [0x47, 6],
+    0xEB0007: [0x13, 0],
+    0xEB0008: [0x6C, 0],
+    0xEB0009: [0x11, 4],
+    0xEB000A: [0x6C, 1],
+    0xEB000B: [0x6C, 2],
+    0xEB000C: [0x6C, 3],
+    0xEB000D: [0x11, 7],
+    0xEB000E: [0x11, 5],
+    0xEB000F: [0x6C, 6],
+    0xEB0010: [0x6C, 7],
+    0xEB0011: [0x6C, 5],
+    0xEB0012: [0x12, 0],
+    0xEB0013: [0x5B, 5],
+    0xEB0014: [0x6D, 1],
+    0xEB0015: [0x6D, 2],
+    0xEB0016: [0x6D, 0],
+    0xEB0017: [0x4C, 5],
+    0xEB0018: [0x12, 2],
+    0xEB0019: [0x12, 1],
+    0xEB001A: [0x12, 3],
+    0xEB001B: [0x12, 4],
+    0xEB001C: [0x85, 2],
+    0xEB001D: [0x6E, 0],
+    0xEB001E: [0x6D, 5],
+    0xEB001F: [0x6D, 7],
+    0xEB0020: [0x6E, 1],
+    0xEB0021: [0x6E, 2],
+    0xEB0022: [0x6D, 6],
+    0xEB0023: [0x83, 7],
+    0xEB0024: [0x6D, 4],
+    0xEB0025: [0x6D, 3],
+    0xEB0026: [0x12, 5],
+    0xEB0027: [0x85, 4],
+    0xEB0028: [0x17, 1],
+    0xEB0029: [0x6E, 4],
+    0xEB002A: [0x6E, 5],
+    0xEB002B: [0x6E, 3],
+    0xEB002C: [0x12, 6],
+    0xEB002D: [0x6E, 6],
+    0xEB002E: [0x6F, 0],
+    0xEB002F: [0x6F, 1],
+    0xEB0030: [0x6E, 7],
+    0xEB0031: [0x66, 2],
+    0xEB0032: [0x0D, 6],
+    0xEB0033: [0x6F, 2],
+    0xEB0034: [0x6F, 3],
+    0xEB0035: [0x73, 4],
+    0xEB0036: [0x73, 3],
+    0xEB0037: [0x73, 5],
+    0xEB0038: [0x73, 6],
+    0xEB0039: [0x73, 7],
+    0xEB003A: [0x74, 0],
+    0xEB003B: [0x74, 1],
+    0xEB003C: [0x84, 5],
+    0xEB003D: [0x1D, 2],
+    0xEB003E: [0x1D, 3],
+    0xEB003F: [0x1D, 4],
+    0xEB0040: [0x73, 2],
+    0xEB0041: [0x72, 5],
+    0xEB0042: [0x73, 1],
+    0xEB0043: [0x72, 4],
+    0xEB0044: [0x73, 0],
+    0xEB0045: [0x72, 7],
+    0xEB0046: [0x72, 6],
+    0xEB0047: [0x76, 2],
+    0xEB0048: [0x76, 7],
+    0xEB0049: [0x76, 1],
+    0xEB004A: [0x76, 4],
+    0xEB004B: [0x76, 5],
+    0xEB004C: [0x76, 6],
+    0xEB004D: [0x76, 3],
+    0xEB004E: [0x38, 0],
+    0xEB004F: [0x77, 0],
+    0xEB0050: [0x13, 1],
+    0xEB0051: [0x70, 0],
+    0xEB0052: [0x6F, 5],
+    0xEB0053: [0x6F, 7],
+    0xEB0054: [0x70, 2],
+    0xEB0055: [0x70, 1],
+    0xEB0056: [0x6F, 6],
+    0xEB0057: [0x6F, 4],
+    0xEB0058: [0x85, 1],
+    0xEB0059: [0x12, 7],
+    0xEB005A: [0x86, 3],
+    0xEB005B: [0x0A, 6],
+    0xEB005C: [0x31, 5],
+    0xEB005D: [0x53, 4],
+    0xEB005E: [0x17, 7],
+    0xEB005F: [0x30, 2],
+    0xEB0060: [0x71, 0],
+    0xEB0061: [0x70, 6],
+    0xEB0062: [0x70, 4],
+    0xEB0063: [0x70, 7],
+    0xEB0064: [0x70, 5],
+    0xEB0065: [0x71, 3],
+    0xEB0066: [0x71, 1],
+    0xEB0067: [0x71, 2],
+    0xEB0068: [0x70, 3],
+    0xEB0069: [0x55, 1],
+    0xEB006A: [0x72, 3],
+    0xEB006B: [0x71, 5],
+    0xEB006C: [0x72, 1],
+    0xEB006D: [0x71, 6],
+    0xEB006E: [0x71, 7],
+    0xEB006F: [0x71, 4],
+    0xEB0070: [0x72, 0],
+    0xEB0071: [0x72, 2],
+    0xEB0072: [0x58, 3],
+    0xEB0073: [0x83, 4],
+    0xEB0074: [0x78, 5],
+    0xEB0075: [0x78, 3],
+    0xEB0076: [0x77, 3],
+    0xEB0077: [0x78, 6],
+    0xEB0078: [0x78, 2],
+    0xEB0079: [0x77, 5],
+    0xEB007A: [0x77, 2],
+    0xEB007B: [0x77, 7],
+    0xEB007C: [0x77, 4],
+    0xEB007D: [0x77, 1],
+    0xEB007E: [0x78, 1],
+    0xEB007F: [0x78, 0],
+    0xEB0080: [0x78, 4],
+    0xEB0081: [0x77, 6],
+    0xEB0082: [0x74, 2],
+    0xEB0083: [0x74, 3],
+    0xEB0084: [0x74, 4],
+    0xEB0085: [0x74, 5],
+    0xEB0086: [0x41, 7],
+    0xEB0087: [0x74, 6],
+    0xEB0088: [0x74, 7],
+    0xEB0089: [0x4D, 1],
+    0xEB008A: [0x54, 4],
+    0xEB00F1: [0x75, 1],
+    0xEB00F2: [0x75, 0],
+    0xEB00F3: [0x75, 2],
+    0xEB00F4: [0x75, 4],
+    0xEB00F5: [0x75, 3],
+    0xEB00F6: [0x75, 5],
+    0xEB00F7: [0x75, 6],
+    0xEB00F8: [0x76, 0],
+    0xEB00F9: [0x75, 7],
+    0xEB008B: [0x19, 3],
+    0xEB008C: [0x83, 6],
+    0xEB008D: [0x63, 7],
+    0xEB008E: [0x79, 2],
+    0xEB008F: [0x79, 3],
+    0xEB0090: [0x79, 6],
+    0xEB0091: [0x79, 5],
+    0xEB0092: [0x79, 4],
+    0xEB0093: [0x19, 2],
+    0xEB0094: [0x7A, 2],
+    0xEB0095: [0x7A, 3],
+    0xEB0096: [0x7A, 1],
+    0xEB0097: [0x79, 7],
+    0xEB0098: [0x7A, 0],
+    0xEB0099: [0x78, 7],
+    0xEB009A: [0x79, 0],
+    0xEB009B: [0x79, 1],
+    0xEB009C: [0x19, 4],
+    0xEB009D: [0x64, 4],
+    0xEB009E: [0x5A, 7],
+    0xEB009F: [0x32, 6],
+    0xEB00A0: [0x0F, 4],
+    0xEB00A1: [0x7C, 6],
+    0xEB00A2: [0x7C, 7],
+    0xEB00A3: [0x7D, 0],
+    0xEB00A4: [0x2A, 0],
+    0xEB00A5: [0x7D, 2],
+    0xEB00A6: [0x7D, 4],
+    0xEB00A7: [0x7D, 3],
+    0xEB00A8: [0x7D, 1],
+    0xEB00A9: [0x57, 4],
+    0xEB00AA: [0x09, 7],
+    0xEB00AB: [0x7D, 6],
+    0xEB00AC: [0x7D, 5],
+    0xEB00AD: [0x7D, 7],
+    0xEB00AE: [0x7A, 6],
+    0xEB00AF: [0x7A, 4],
+    0xEB00B0: [0x7A, 5],
+    0xEB00B1: [0x7B, 0],
+    0xEB00B2: [0x7B, 1],
+    0xEB00B3: [0x33, 3],
+    0xEB00B4: [0x7A, 7],
+    0xEB00B5: [0x83, 0],
+    0xEB00B6: [0x31, 7],
+    0xEB00B7: [0x7B, 6],
+    0xEB00B8: [0x7B, 2],
+    0xEB00B9: [0x7C, 5],
+    0xEB00BA: [0x7C, 0],
+    0xEB00BB: [0x7C, 1],
+    0xEB00BC: [0x7C, 2],
+    0xEB00BD: [0x7B, 4],
+    0xEB00BE: [0x7B, 7],
+    0xEB00BF: [0x7B, 5],
+    0xEB00C0: [0x7C, 4],
+    0xEB00C1: [0x7C, 3],
+    0xEB00C2: [0x7B, 3],
+    0xEB00C3: [0x59, 1],
+    0xEB00C4: [0x7E, 4],
+    0xEB00C5: [0x7E, 3],
+    0xEB00C6: [0x7E, 2],
+    0xEB00C7: [0x7E, 5],
+    0xEB00C8: [0x7E, 0],
+    0xEB00C9: [0x7E, 1],
+    0xEB00CA: [0x3E, 7],
+    0xEB00CB: [0x3F, 1],
+    0xEB00CC: [0x3F, 0],
+    0xEB00CD: [0x3F, 2],
+    0xEB00CE: [0x3E, 6],
+    0xEB00CF: [0x84, 7],
+    0xEB00D0: [0x7F, 7],
+    0xEB00D1: [0x83, 1],
+    0xEB00D2: [0x82, 6],
+    0xEB00D3: [0x13, 3],
+    0xEB00D4: [0x7F, 6],
+    0xEB00D5: [0x7F, 2],
+    0xEB00D6: [0x7F, 0],
+    0xEB00D7: [0x7F, 5],
+    0xEB00D8: [0x7E, 7],
+    0xEB00D9: [0x7F, 3],
+    0xEB00DA: [0x7E, 6],
+    0xEB00DB: [0x7F, 1],
+    0xEB00DC: [0x7F, 4],
+    0xEB00DD: [0x3C, 6],
+    0xEB00DE: [0x80, 1],
+    0xEB00DF: [0x80, 2],
+    0xEB00E0: [0x80, 3],
+    0xEB00E1: [0x80, 4],
+    0xEB00E2: [0x80, 0],
+    0xEB00E3: [0x81, 1],
+    0xEB00E4: [0x80, 7],
+    0xEB00E5: [0x81, 0],
+    0xEB00E6: [0x80, 6],
+    0xEB00E7: [0x80, 5],
+    0xEB00E8: [0x13, 4],
+    0xEB00E9: [0x81, 2],
+    0xEB00EA: [0x81, 4],
+    0xEB00EB: [0x81, 5],
+    0xEB00EC: [0x81, 6],
+    0xEB00ED: [0x86, 1],
+    0xEB00EE: [0x84, 4],
+    0xEB00EF: [0x86, 4],
+    0xEB00F0: [0x81, 7],
+    0xEB00FA: [0x81, 3],
+    # Shop checks
+    0xeb1000: [0x00, 0],
+    0xeb1001: [0x00, 1],
+    0xeb1002: [0x00, 2],
+    0xeb1003: [0x00, 3],
+    0xeb1004: [0x00, 4],
+    0xeb1007: [0x01, 0],
+    0xeb100e: [0x02, 0],
+    0xeb1015: [0x03, 0],
+    0xeb1016: [0x03, 1],
+    0xeb1017: [0x03, 2],
+    0xeb1018: [0x03, 3],
+    0xeb101c: [0x04, 0],
+    0xeb101d: [0x04, 1],
+    0xeb101e: [0x04, 2],
+    0xeb101f: [0x04, 3],
+    0xeb1023: [0x05, 0],
+    0xeb1024: [0x05, 1],
+    0xeb1025: [0x05, 2],
+    0xeb1026: [0x05, 3],
+    0xeb102a: [0x06, 0],
+    0xeb102b: [0x06, 1],
+    0xeb102c: [0x06, 2],
+    0xeb102d: [0x06, 3],
+    0xeb1031: [0x07, 0],
+    0xeb1032: [0x07, 1],
+    0xeb1033: [0x07, 2],
+    0xeb1034: [0x07, 3],
+    0xeb1035: [0x07, 4],
+    0xeb1036: [0x07, 5],
+    0xeb1038: [0x08, 0],
+    0xeb1039: [0x08, 1],
+    0xeb103f: [0x09, 0],
+    0xeb1046: [0x0a, 0],
+    0xeb1047: [0x0a, 1],
+    0xeb1048: [0x0a, 2],
+    0xeb1049: [0x0a, 3],
+    0xeb104a: [0x0a, 4],
+    0xeb104b: [0x0a, 5],
+    0xeb105b: [0x0d, 0],
+    0xeb105c: [0x0d, 1],
+    0xeb105d: [0x0d, 2],
+    0xeb105e: [0x0d, 3],
+    0xeb105f: [0x0d, 4],
+    0xeb1060: [0x0d, 5],
+    0xeb1062: [0x0e, 0],
+    0xeb1069: [0x0f, 0],
+    0xeb106a: [0x0f, 1],
+    0xeb106b: [0x0f, 2],
+    0xeb106c: [0x0f, 3],
+    0xeb106d: [0x0f, 4],
+    0xeb1070: [0x10, 0],
+    0xeb1071: [0x10, 1],
+    0xeb1072: [0x10, 2],
+    0xeb1073: [0x10, 3],
+    0xeb1074: [0x10, 4],
+    0xeb1077: [0x11, 0],
+    0xeb1078: [0x11, 1],
+    0xeb1079: [0x11, 2],
+    0xeb107a: [0x11, 3],
+    0xeb107b: [0x11, 4],
+    0xeb107e: [0x12, 0],
+    0xeb107f: [0x12, 1],
+    0xeb1080: [0x12, 2],
+    0xeb1081: [0x12, 3],
+    0xeb1085: [0x13, 0],
+    0xeb1086: [0x13, 1],
+    0xeb1087: [0x13, 2],
+    0xeb1088: [0x13, 3],
+    0xeb1089: [0x13, 4],
+    0xeb108a: [0x13, 5],
+    0xeb108b: [0x13, 6],
+    0xeb108c: [0x14, 0],
+    0xeb1093: [0x15, 0],
+    0xeb1094: [0x15, 1],
+    0xeb1095: [0x15, 2],
+    0xeb1096: [0x15, 3],
+    0xeb1097: [0x15, 4],
+    0xeb1098: [0x15, 5],
+    0xeb1099: [0x15, 6],
+    0xeb109a: [0x16, 0],
+    0xeb109b: [0x16, 1],
+    0xeb109c: [0x16, 2],
+    0xeb109d: [0x16, 3],
+    0xeb109e: [0x16, 4],
+    0xeb10a1: [0x17, 0],
+    0xeb10a2: [0x17, 1],
+    0xeb10a3: [0x17, 2],
+    0xeb10a4: [0x17, 3],
+    0xeb10a5: [0x17, 4],
+    0xeb10a8: [0x18, 0],
+    0xeb10a9: [0x18, 1],
+    0xeb10aa: [0x18, 2],
+    0xeb10ab: [0x18, 3],
+    0xeb10af: [0x19, 0],
+    0xeb10b0: [0x19, 1],
+    0xeb10b1: [0x19, 2],
+    0xeb10b2: [0x19, 3],
+    0xeb10b3: [0x19, 4],
+    0xeb10b4: [0x19, 5],
+    0xeb10b6: [0x1a, 0],
+    0xeb10b7: [0x1a, 1],
+    0xeb10b8: [0x1a, 2],
+    0xeb10b9: [0x1a, 3],
+    0xeb10ba: [0x1a, 4],
+    0xeb10bb: [0x1a, 5],
+    0xeb10bc: [0x1a, 6],
+    0xeb10bd: [0x1b, 0],
+    0xeb10be: [0x1b, 1],
+    0xeb10bf: [0x1b, 2],
+    0xeb10c0: [0x1b, 3],
+    0xeb10c4: [0x1c, 0],
+    0xeb10c5: [0x1c, 1],
+    0xeb10c6: [0x1c, 2],
+    0xeb10c7: [0x1c, 3],
+    0xeb10c8: [0x1c, 4],
+    0xeb10cb: [0x1d, 0],
+    0xeb10cc: [0x1d, 1],
+    0xeb10cd: [0x1d, 2],
+    0xeb10ce: [0x1d, 3],
+    0xeb10cf: [0x1d, 4],
+    0xeb10d0: [0x1d, 5],
+    0xeb10d1: [0x1d, 6],
+    0xeb10d2: [0x1e, 0],
+    0xeb10d3: [0x1e, 1],
+    0xeb10d4: [0x1e, 2],
+    0xeb10d5: [0x1e, 3],
+    0xeb10d6: [0x1e, 4],
+    0xeb10d7: [0x1e, 5],
+    0xeb10d9: [0x1f, 0],
+    0xeb10da: [0x1f, 1],
+    0xeb10db: [0x1f, 2],
+    0xeb10dc: [0x1f, 3],
+    0xeb10e0: [0x20, 0],
+    0xeb10e1: [0x20, 1],
+    0xeb10e2: [0x20, 2],
+    0xeb10e3: [0x20, 3],
+    0xeb10e4: [0x20, 4],
+    0xeb10e7: [0x21, 0],
+    0xeb10e8: [0x21, 1],
+    0xeb10e9: [0x21, 2],
+    0xeb10ea: [0x21, 3],
+    0xeb10eb: [0x21, 4],
+    0xeb10ee: [0x22, 0],
+    0xeb10ef: [0x22, 1],
+    0xeb10f0: [0x22, 2],
+    0xeb10f1: [0x22, 3],
+    0xeb10f5: [0x23, 0],
+    0xeb10f6: [0x23, 1],
+    0xeb1103: [0x25, 0],
+    0xeb1104: [0x25, 1],
+    0xeb1105: [0x25, 2],
+    0xeb1106: [0x25, 3],
+    0xeb1107: [0x25, 4],
+    0xeb1108: [0x25, 5],
+    0xeb1109: [0x25, 6],
+    0xeb110a: [0x26, 0],
+    0xeb110b: [0x26, 1],
+    0xeb110c: [0x26, 2],
+    0xeb110d: [0x26, 3],
+    0xeb110e: [0x26, 4],
+    0xeb110f: [0x26, 5],
+    0xeb1110: [0x26, 6],
+    0xeb1111: [0x27, 0],
+    0xeb1112: [0x27, 1],
+    0xeb1113: [0x27, 2],
+    0xeb1114: [0x27, 3],
+    0xeb1115: [0x27, 4],
+    0xeb1116: [0x27, 5],
+    0xeb1118: [0x28, 0],
+    0xeb1119: [0x28, 1],
+    0xeb111a: [0x28, 2],
+    0xeb111b: [0x28, 3],
+    0xeb111c: [0x28, 4],
+    0xeb111d: [0x28, 5],
+    0xeb1126: [0x2a, 0],
+    0xeb1127: [0x2a, 1],
+    0xeb1128: [0x2a, 2],
+    0xeb112d: [0x2b, 0],
+    0xeb112e: [0x2b, 1],
+    0xeb112f: [0x2b, 2],
+    0xeb1130: [0x2b, 3],
+    0xeb1131: [0x2b, 4],
+    0xeb1132: [0x2b, 5],
+    0xeb1134: [0x2c, 0],
+    0xeb1135: [0x2c, 1],
+    0xeb1136: [0x2c, 2],
+    0xeb1137: [0x2c, 3],
+    0xeb113b: [0x2d, 0],
+    0xeb113c: [0x2d, 1],
+    0xeb113d: [0x2d, 2],
+    0xeb113e: [0x2d, 3],
+    0xeb113f: [0x2d, 4],
+    0xeb1140: [0x2d, 5],
+    0xeb1141: [0x2d, 6],
+    0xeb1157: [0x31, 0],
+    0xeb1158: [0x31, 1],
+    0xeb1159: [0x31, 2],
+    0xeb115a: [0x31, 3],
+    0xeb115e: [0x32, 0],
+    0xeb115f: [0x32, 1],
+    0xeb1160: [0x32, 2],
+    0xeb1161: [0x32, 3],
+    0xeb1162: [0x32, 4],
+    0xeb1163: [0x32, 5],
+    0xeb1164: [0x32, 6],
+    0xeb1165: [0x33, 0],
+    0xeb1166: [0x33, 1],
+    0xeb1167: [0x33, 2],
+    0xeb1168: [0x33, 3],
+    0xeb116c: [0x34, 0],
+    0xeb116d: [0x34, 1],
+    0xeb116e: [0x34, 2],
+    0xeb116f: [0x34, 3],
+    0xeb1170: [0x34, 4],
+    0xeb1171: [0x34, 5],
+    0xeb1172: [0x34, 6],
+    0xeb117a: [0x36, 0],
+    0xeb117b: [0x36, 1],
+    0xeb117c: [0x36, 2],
+    0xeb117d: [0x36, 3],
+    0xeb117e: [0x36, 4],
+    0xeb117f: [0x36, 5],
+    0xeb1180: [0x36, 6],
+    0xeb1181: [0x37, 0],
+    0xeb1182: [0x37, 1],
+    0xeb1183: [0x37, 2],
+    0xeb1188: [0x38, 0],
+    0xeb1189: [0x38, 1],
+    0xeb118a: [0x38, 2],
+    0xeb118b: [0x38, 3],
+    0xeb118c: [0x38, 4],
+    0xeb118d: [0x38, 5],
+    0xeb118e: [0x38, 6],
+    0xeb118f: [0x39, 0],
+    0xeb1190: [0x39, 1],
+    0xeb1191: [0x39, 2],
+    0xeb1192: [0x39, 3],
+    0xeb1193: [0x39, 4],
+    0xeb1194: [0x39, 5],
+    0xeb1195: [0x39, 6],
+    0xeb1196: [0x3a, 0],
+    0xeb1197: [0x3a, 1],
+    0xeb1198: [0x3a, 2],
+    0xeb1199: [0x3a, 3],
+    0xeb119a: [0x3a, 4],
+    0xeb119b: [0x3a, 5],
+    0xeb119c: [0x3a, 6],
+    0xeb119d: [0x3b, 0],
+    0xeb119e: [0x3b, 1],
+    0xeb119f: [0x3b, 2],
+    0xeb11a0: [0x3b, 3],
+    0xeb11a1: [0x3b, 4],
+    0xeb11a4: [0x3c, 0],
+    0xeb11a5: [0x3c, 1],
+    0xeb11a6: [0x3c, 2],
+    0xeb11a7: [0x3c, 3],
+    0xeb11ab: [0x3d, 0],
+    0xeb11ac: [0x3d, 1],
+    0xeb11ad: [0x3d, 2],
+    0xeb11ae: [0x3d, 3],
+    0xeb11af: [0x3d, 4],
+    0xeb11b0: [0x3d, 5],
+    0xeb11b1: [0x3d, 6],
+    0xeb11b2: [0x3e, 0],
+    0xeb11b3: [0x3e, 1],
+    0xeb11b4: [0x3e, 2],
+    0xeb11b5: [0x3e, 3],
+    0xeb11b6: [0x3e, 4],
+    0xeb11b7: [0x3e, 5],
+    0xeb11b8: [0x3e, 6],
+    0xeb11c0: [0x40, 0],
+    0xeb11c1: [0x40, 1],
+    0xeb11c2: [0x40, 2],
+    0xeb11c3: [0x40, 3],
+    0xeb11c4: [0x40, 4]
+}
+
+location_dialogue = {  # Locations which just need to print the name of the item
+    "Onett - Tracy Gift": [0x07616B, 0x330478],
+    "Onett - Meteor Item": [0x0862C3],
+    "Onett - Library Counter": [0x05EC0C],
+    "Onett - Library Bookshelf": [0x2EBA66],
+    "Onett - Treehouse Guy": [0x073F34],
+    "Onett - Mayor Pirkle": [0x0661D6, 0x072D4B, 0x072BE9],
+    "Onett - Traveling Entertainer": [0x07476C],
+    "Twoson - Bike Shop Rental": [0x080046, 0x08008F],
+    "Twoson - Orange Kid Donation": [0x08134A, 0x0813B9, 0x3303E3],
+    "Twoson - Apple Kid Invention": [0x081F89, 0x081FF3],
+    "Twoson - Apple Kid's Mouse": [0x2EBA86],
+    "Twoson - Antique Shop": [0x093E5F, 0x093F0A],
+    "Twoson - Paula's Mother": [0x08061B, 0x0807F7],
+    "Twoson - Everdred Meeting": [0x095FA2],
+    "Twoson - Insignificant Location": [0x094EB1],
+    "Happy-Happy Village - Donation Lady": [0x2EC578, 0x2EC580],
+    "Happy-Happy Village - Prisoner Item": [0x2F95FE, 0x33001E, 0x079646],
+    "Happy-Happy Village - Defeat Carpainter": [0x098215],
+    "Threed - Hospital Drawer": [0x08686C],
+    "Saturn Valley - Post Belch Gift #1": [0x07EAAA],
+    "Saturn Valley - Post Belch Gift #2": [0x07EACE],
+    "Saturn Valley - Post Belch Gift #3": [0x07EAF2],
+    "Dusty Dunes - Shining Spot": [0x060D8D],
+    "Dusty Dunes - Mine Reward": [0x06038A, 0x06123A, 0x06053F],
+    "Snow Wood - Maxwell Item": [0x06AB89],
+    "Scaraba - Snake Bag Salesman": [0x2EA713, 0x057116],
+    "Winters - Drugstore Saleswoman": [0x07A223, 0x06AEB8],
+    "Andonuts Lab - Mouse": [0x06C840],
+    "Stonehenge - Tony Item": [0x2FFA0C],
+    "Stonehenge - Kidnapped Mr. Saturn": [0x06C061],
+    "Monkey Caves - Bow Monkey Gift": [0x0625E7],
+    "Monkey Caves - Talah Rama Gift": [0x060E77],
+    "Fourside - Venus Gift": [0x06D643],
+    "Fourside - Post-Moonside Delivery": [0x07AA04, 0x3310E6],
+    "Fourside - Bakery 2F Gift": [0x06DDAC],
+    "Monotoli Building - Monotoli Gift": [0x06EAA9],
+    "Monotoli Building - Electra Gift": [0x06E9A9],
+    "Summers - Museum Item": [0x08ABB8],
+    "Pyramid - Pedestal Item": [0x2EBA92],
+    "Scaraba - Key Holder": [0x2EBA9E],
+    "Deep Darkness - Teleporting Monkey": [0x2EBEE2],
+    "Deep Darkness - North Alcove Truffle": [0x3315CE],
+    "Deep Darkness - Near Land Truffle": [0x33162A],
+    "Deep Darkness - Present Truffle": [0x3315FC],
+    "Deep Darkness - Village Truffle": [0x331658],
+    "Deep Darkness - Entrance Truffle": [0x3315A0],
+    "Tenda Village - Tenda Gift": [0x09DA6C, 0x09DA79],
+    "Tenda Village - Tenda Gift #2": [0x09D7FD],
+    "Magicant - Ness's Gift": [0x077614],
+    "Cave of the Present - Broken Phase Distorter": [0x2F58FC],
+    "Onett - Buzz Buzz": [0x2EAA43],
+    "Onett - Mani Mani Statue": [0x2EA99E],
+    "Deep Darkness - Barf Character": [0x2EB664],
+    "Dalaam - Throne Character": [0x2EB4E2],
+    "Monotoli Building - Monotoli Character": [0x2EB2C3],
+    "Snow Wood - Bedroom": [0x2EB10D],
+    "Threed - Zombie Prisoner": [0x2EAFB1, 0x2EC9E1],
+    "Happy-Happy Village - Prisoner": [0x2EBABA],
+    "Saturn Valley - Saturn Coffee": [0x2EB008],
+    "Monkey Caves - Monkey Power": [0x2EB1A1],
+    "Fourside - Department Store Blackout": [0x2EBFE8, 0x2ED155],
+    "Summers - Magic Cake": [0x2EBFB4],
+    "Scaraba - Star Master": [0x2EBFA7],
+    "Dalaam - Trial of Mu": [0x2EBF95, 0x2EBF88],
+    "Tenda Village - Tenda Tea": [0x2EB6CC],
+    "Lost Underworld - Talking Rock": [0x2EB751],
+    "Cave of the Present - Star Master": [0x2EB8DF],
+    "Magicant - Ness's Nightmare": [0x2EB803, 0x2EB87C],
+    "Dungeon Man - 1F Exit Ledge Present": [0x057A55],
+    "Snow Wood - Upper Right Locker": [0x2EFB11],
+    "Snow Wood - Upper Left Locker": [0x2EFB50],
+    "Snow Wood - Bottom Right Locker": [0x2EFB8F],
+    "Snow Wood - Bottom Left Locker": [0x2EFBCE]
+}
+
+npc_locations = {  # Locations given to you by an NPC
+    "Onett - Tracy Gift": [0x07617B],
+    "Onett - Meteor Item": [0x086304],
+    "Onett - Library Counter": [0x07339C],
+    "Onett - Library Bookshelf": [0x087E7B],
+    "Onett - Treehouse Guy": [0x073F78],
+    "Onett - Mayor Pirkle": [0x072D61],
+    "Onett - Traveling Entertainer": [0x07477C],
+    "Twoson - Bike Shop Rental": [0x0801A5],
+    "Twoson - Orange Kid Donation": [0x081362],
+    "Twoson - Apple Kid's Mouse": [0x0819DF],
+    "Twoson - Apple Kid Invention": [0x082015],
+    "Twoson - Antique Shop": [0x2EAEFD],
+    "Twoson - Paula's Mother": [0x08062F, 0x08081F],
+    "Twoson - Everdred Meeting": [0x096052],
+    "Twoson - Insignificant Location": [0x094ED1],
+    "Happy-Happy Village - Donation Lady": [0x098A97, 0x0893B6],
+    "Happy-Happy Village - Prisoner Item": [0x2F9664, 0x2EAF41, 0x2F9707],
+    "Happy-Happy Village - Defeat Carpainter": [0x09826F],
+    "Threed - Hospital Drawer": [0x086883],
+    "Saturn Valley - Post Belch Gift #1": [0x07EAB2],
+    "Saturn Valley - Post Belch Gift #2": [0x07EAD6],
+    "Saturn Valley - Post Belch Gift #3": [0x07EAFA],
+    "Dusty Dunes - Shining Spot": [0x060DAD],
+    "Dusty Dunes - Mine Reward": [0x06058F],
+    "Snow Wood - Maxwell Item": [0x06AC73],
+    "Scaraba - Snake Bag Salesman": [0x0570AC],
+    "Winters - Drugstore Saleswoman": [0x06AEC7],
+    "Andonuts Lab - Mouse": [0x06C898],
+    "Stonehenge - Kidnapped Mr. Saturn": [0x06C076],
+    "Stonehenge - Tony Item": [0x2FFA78],
+    "Monkey Caves - Bow Monkey Gift": [0x062636],
+    "Monkey Caves - Talah Rama Gift": [0x060FEB],
+    "Fourside - Venus Gift": [0x2EB1CE],
+    "Fourside - Post-Moonside Delivery": [0x07AAC4, 0x07B598, 0x331101],
+    "Fourside - Bakery 2F Gift": [0x06DE56],
+    "Monotoli Building - Electra Gift": [0x2EB29B],
+    "Monotoli Building - Monotoli Gift": [0x06EB3C],
+    "Summers - Museum Item": [0x08ABF2],
+    "Pyramid - Pedestal Item": [0x0931DF],
+    "Scaraba - Key Holder": [0x0576C1],
+    "Deep Darkness - Teleporting Monkey": [0x09E50F, 0x09E55F],
+    "Deep Darkness - North Alcove Truffle": [0x3315E5],
+    "Deep Darkness - Near Land Truffle": [0x331641],
+    "Deep Darkness - Present Truffle": [0x331613],
+    "Deep Darkness - Village Truffle": [0x33166F],
+    "Deep Darkness - Entrance Truffle": [0x3315B7],
+    "Tenda Village - Tenda Gift": [0x09DAF0],
+    "Tenda Village - Tenda Gift #2": [0x09D814],
+    "Magicant - Ness's Gift": [0x077629],
+    "Cave of the Present - Broken Phase Distorter": [0x2F590C],
+    "Dungeon Man - 1F Exit Ledge Present": [0x057A6B],
+    "Snow Wood - Upper Right Locker": [0x2EFB2A],
+    "Snow Wood - Upper Left Locker": [0x2EFB69],
+    "Snow Wood - Bottom Right Locker": [0x2EFBA8],
+    "Snow Wood - Bottom Left Locker": [0x2EFBE7]
+}
+
+
+present_locations = {  # Field presents
+    "Onett - Tracy's Room Present": 0x0FE756,
+    "Onett - Hilltop Present": 0x0FE701,
+    "Onett - Burger Shop Trashcan": 0x0FE712,
+    "Onett - South Road Present": 0x0FE723,
+    "Onett - Hotel Trashcan": 0x0FE734,
+    "Onett - Arcade Trashcan": 0x0FE745,
+    "Giant Step - First Cave Present": 0x0FE778,
+    "Giant Step - Floor 2 Cave Present": 0x0FE789,
+    "Giant Step - Floor 3 Present": 0x0FE767,
+    "Twoson - Paula's Room Present": 0x0FE7AB,
+    "Twoson - Apple Kid Trashcan": 0x0FE7BC,
+    "Twoson - South of Town Present": 0x0FE79A,
+    "Peaceful Rest Valley - Split Hill Present": 0x0FE822,
+    "Peaceful Rest Valley - Hill Nook Present": 0x0FE7EF,
+    "Peaceful Rest Valley - South of Bridge Present": 0x0FE811,
+    "Peaceful Rest Valley - Dead End Present": 0x0FE833,
+    "Peaceful Rest Valley - River Overlook Present": 0x0FE844,
+    "Peaceful Rest Valley - North Side Present": 0x0FE800,
+    "Happy-Happy Village - Right HQ Present": 0x0FE7DE,
+    "Happy-Happy Village - Left HQ Present": 0x0FE7CD,
+    "Lilliput Steps - Southwest Pool Present": 0x0FE866,
+    "Lilliput Steps - East Cliff Present": 0x0FE877,
+    "Lilliput Steps - North Stream Present": 0x0FE855,
+    "Threed - Boogey Tent Trashcan": 0x0FB038,
+    "Threed - Cemetery Trashcan": 0x0FE888,
+    "Threed - Downtown Trashcan": 0x0FE8AA,
+    "Threed - East Side Trashcan": 0x0FE8BB,
+    "Threed - Northeast Shack Trashcan": 0x0FE899,
+    "Threed Underground - Left Coffin": 0x0FE8CC,
+    "Threed Underground - Right Coffin": 0x0FE8DD,
+    "Grapefruit Falls - South Present": 0x0FEB0E,
+    "Grapefruit Falls - North Present": 0x0FEAFD,
+    "Grapefruit Falls - Saturn Cave Present": 0x0FEB1F,
+    "Saturn Valley - Ladder Present": 0x0FEB30,
+    "Saturn Valley - Trashcan #1": 0x0FEB41,
+    "Saturn Valley - Trashcan #2": 0x0FEB52,
+    "Saturn Valley - Trashcan #3": 0x0FEB63,
+    "Milky Well - Cavern Present": 0x0FEAEC,
+    "Belch's Factory - Top Right Room Trashcan": 0x0FEA97,
+    "Belch's Factory - Pit Room Trashcan #1": 0x0FEADB,
+    "Belch's Factory - Pit Room Trashcan #2": 0x0FEA86,
+    "Belch's Factory - Balcony Room Trashcan #1": 0x0FEACA,
+    "Belch's Factory - Balcony Room Trashcan #2": 0x0FEAB9,
+    "Belch's Factory - Balcony Room Trashcan #3": 0x0FEAA8,
+    "Dusty Dunes - Northwest Corner Present": 0x0FEC84,
+    "Dusty Dunes - South Side Present": 0x0FECD9,
+    "Dusty Dunes - Surrounding Rocks Present": 0x0FEC73,
+    "Dusty Dunes - Black Sesame Present": 0x0FECA6,
+    "Dusty Dunes - Oasis Present": 0x0FECB7,
+    "Dusty Dunes - Northeast Corner Present": 0x0FECC8,
+    "Dusty Dunes - North Central Present": 0x0FEC95,
+    "Dusty Dunes - East Peninsula Present": 0x0FECEA,
+    "Snow Wood - Many Present Room Present #1": 0x0FE932,
+    "Snow Wood - Many Present Room Present #2": 0x0FE8FF,
+    "Snow Wood - Many Present Room Present #3": 0x0FE921,
+    "Snow Wood - Many Present Room Present #4": 0x0FE954,
+    "Snow Wood - Many Present Room Present #5": 0x0FE943,
+    "Snow Wood - Many Present Room Present #6": 0x0FE910,
+    "Snow Wood - Many Present Room Present #7": 0x0FE8EE,
+    "Brick Road Maze - Top Path Present": 0x0FE9BA,
+    "Brick Road Maze - Guarded Present": 0x0FE998,
+    "Brick Road Maze - Out of the Way Present": 0x0FE976,
+    "Brick Road Maze - Alcove Present": 0x0FE9A9,
+    "Brick Road Maze - Near Exit Present": 0x0FE987,
+    "Rainy Circle - Isolated Present": 0x0FE9ED,
+    "Rainy Circle - East Cliff Present": 0x0FE9CB,
+    "Rainy Circle - Near Ropes Present": 0x0FE9DC,
+    "Andonuts Lab - Present": 0x0FE965,
+    "Stonehenge - Purple Maze Present": 0x0FEA75,
+    "Stonehenge - Dead End Present": 0x0FEA0F,
+    "Stonehenge - Near End of the Maze Present": 0x0FEA53,
+    "Stonehenge - Bridge Room East Balcony Present": 0x0FEA20,
+    "Stonehenge - Bridge Room Lower Present": 0x0FEA31,
+    "Stonehenge - Flashing Room Right Path Present": 0x0FE9FE,
+    "Stonehenge - Flashing Room Center Present": 0x0FEA42,
+    "Stonehenge - Flashing Room Upper Present": 0x0FEA64,
+    "Gold Mine - Mouse Crossroad Present #1": 0x0FEDC7,
+    "Gold Mine - Mouse Crossroad Present #2": 0x0FEDA5,
+    "Gold Mine - B1F Lonely Mole Present": 0x0FED1D,
+    "Gold Mine - South Hall Present": 0x0FEDD8,
+    "Gold Mine - South Corner Present": 0x0FED94,
+    "Gold Mine - South Mole Present #1": 0x0FED3F,
+    "Gold Mine - South Mole Present #2": 0x0FED0C,
+    "Gold Mine - North Crossroad Detour Present": 0x0FED61,
+    "Gold Mine - North Mole Present": 0x0FED2E,
+    "Gold Mine - West Mole Present": 0x0FECFB,
+    "Gold Mine - B1F Isolated Present": 0x0FED83,
+    "Gold Mine - West Crossroad Detour Present": 0x0FED72,
+    "Gold Mine - B1F Junction Present": 0x0FEDB6,
+    "Gold Mine - B1F Junction Mole Present": 0x0FED50,
+    "Monkey Caves - 1F Right Chest": 0x0FEBEB,
+    "Monkey Caves - 1F Left Chest": 0x0FEBDA,
+    "Monkey Caves - West 2F Left Chest": 0x0FEBFC,
+    "Monkey Caves - West 2F Right Chest #1": 0x0FEC1E,
+    "Monkey Caves - West 2F Right Chest #2": 0x0FEC0D,
+    "Monkey Caves - East 2F Left Chest": 0x0FEC2F,
+    "Monkey Caves - East 2F Right Chest": 0x0FEC40,
+    "Monkey Caves - East West 3F Right Chest #1": 0x0FEC62,
+    "Monkey Caves - East West 3F Right Chest #2": 0x0FEC51,
+    "Monkey Caves - West End Chest": 0x0FEB74,
+    "Monkey Caves - West End Trashcan": 0x0FEB85,
+    "Monkey Caves - East End Chest": 0x0FEB96,
+    "Monkey Caves - East End Trashcan": 0x0FEBA7,
+    "Monkey Caves - Talah Rama Chest #1": 0x0FEBB8,
+    "Monkey Caves - Talah Rama Chest #2": 0x0FEBC9,
+    "Moonside - Two Trees Present": 0x0FEE1C,
+    "Moonside - East Island Present": 0x0FEE2D,
+    "Moonside - Businessman Present": 0x0FEE60,
+    "Moonside - West Island Present": 0x0FEE4F,
+    "Moonside - Hospital Present": 0x0FEE3E,
+    "Magnet Hill - West Entrance Trashcan": 0x0FEEA4,
+    "Magnet Hill - First Room Free Door Trashcan": 0x0FEEB5,
+    "Magnet Hill - First Room Barrel Door Trashcan": 0x0FEE93,
+    "Magnet Hill - Second Room Dead End Trashcan": 0x0FEE71,
+    "Magnet Hill - Final Room Door Trashcan": 0x0FEE82,
+    "Fourside - Magnet Hill Chest": 0x0FEDE9,
+    "Monotoli Building - One Table Present": 0x0FEDFA,
+    "Monotoli Building - Two Table Present": 0x0FEE0B,
+    "Dalaam - Throne Room Chest #1": 0x0FEFF8,
+    "Dalaam - Throne Room Chest #2": 0x0FF009,
+    "Dalaam - Throne Room Chest #3": 0x0FF01A,
+    "Dalaam - Restaurant Chest #1": 0x0FF03C,
+    "Dalaam - Restaurant Chest #2": 0x0FF05E,
+    "Dalaam - Do Do Guy's House Chest": 0x0FF04D,
+    "Dalaam - Upper House Chest": 0x0FF02B,
+    "Pink Cloud - Three Holes Present": 0x0FF080,
+    "Pink Cloud - Left Hole Present": 0x0FF06F,
+    "Pink Cloud - Ground Floor Present": 0x0FF091,
+    "Pyramid - Anteroom Sarcophagus": 0x0FEEE8,
+    "Pyramid - Northwest Door Sarcophagus": 0x0FEEC6,
+    "Pyramid - Hallway Sarcophagus #1": 0x0FEED7,
+    "Pyramid - Hallway Sarcophagus #2": 0x0FEF0A,
+    "Pyramid - Switch Room Sarcophagus": 0x0FEF1B,
+    "Pyramid - Way Out Sarcophagus": 0x0FEEF9,
+    "Dungeon Man - 1F Dead End Present": 0x0FEF70,
+    "Dungeon Man - 1F Long Walk Present": 0x0FEF2C,
+    "Dungeon Man - 1F Disappointing Present": 0x0FEFE7,
+    "Dungeon Man - 1F Opinion Present": 0x0FEF92,
+    "Dungeon Man - 1F No Sign Present": 0x0FEFA3,
+    "Dungeon Man - 2F Unnecessary Billboard Present": 0x0FEFB4,
+    "Dungeon Man - 2F Dungeon Exploration Present": 0x0FEF4E,
+    "Dungeon Man - 2F South Ledge Present": 0x0FEF81,
+    "Dungeon Man - 2F North Alcove Present": 0x0FEF5F,
+    "Dungeon Man - 3F Present": 0x0FEFD6,
+    "Dungeon Man - 2F Hole Present": 0x0FEFC5,
+    "Dungeon Man - 1F Exit Ledge Present": 0x0FEF3D,
+    "Deep Darkness - Crest of Darkness Present": 0x0FF0E6,
+    "Deep Darkness - Helicopter Present": 0x0FF0D5,
+    "Deep Darkness - Yellow Bird Present": 0x0FF0C4,
+    "Deep Darkness - Swamp Present": 0x0FF0F7,
+    "Deep Darkness - Corner Present": 0x0FF0A2,
+    "Deep Darkness - Alcove Present": 0x0FF0B3,
+    "Tenda Village - Trashcan": 0x0FF1A1,
+    "Lumine Hall - B1F Non-Talkative Rock Present": 0x0FF190,
+    "Lumine Hall - 1F North Path Present": 0x0FF14C,
+    "Lumine Hall - B1F Thankful Rock Corner Present": 0x0FF12A,
+    "Lumine Hall - B1F Thankful Rock Junction Present": 0x0FF17F,
+    "Lumine Hall - 1F Above Belly Button Present": 0x0FF119,
+    "Lumine Hall - B1F Belly Button Present": 0x0FF15D,
+    "Lumine Hall - 1F Near Exit Present": 0x0FF108,
+    "Lumine Hall - 1F Dead End Present": 0x0FF13B,
+    "Lumine Hall - B1F West Alcove Present": 0x0FF16E,
+    "Lost Underworld - East Present": 0x0FF1C3,
+    "Lost Underworld - Northeast Present": 0x0FF1D4,
+    "Lost Underworld - Northeast of Tenda Tribe Present": 0x0FF1E5,
+    "Lost Underworld - Southwest of Tenda Tribe Present": 0x0FF1F6,
+    "Lost Underworld - Evacuation Present": 0x0FF1B2,
+    "Fire Spring - 1st Cave Present": 0x0FF24B,
+    "Fire Spring - East Corner Present": 0x0FF229,
+    "Fire Spring - Volcano Present": 0x0FF23A,
+    "Fire Spring - Lone Cave Present": 0x0FF218,
+    "Fire Spring - Upper Volcano Present": 0x0FF207,
+    "Magicant - Present Near Ness": 0x0FF25C,
+    "Magicant - Lonely Present": 0x0FF27E,
+    "Magicant - North Present": 0x0FF28F,
+    "Magicant - Hills Present": 0x0FF2A0,
+    "Magicant - Town Present": 0x0FF26D,
+    "Cave of the Past - Present": 0x0FF2B1
+}
+
+psi_locations = {
+    "Onett - Mani Mani Statue": [0x2EA976, 0x90, 0xA9, 0xEE, 0x2EA9B9],
+    "Onett - Buzz Buzz": [0x2EAA04, 0x12, 0xAA, 0xEE, 0x2EAA49],
+    "Saturn Valley - Saturn Coffee": [0x2EAFE3, 0xF1, 0xAF, 0xEE, 0x2EB030],
+    "Monkey Caves - Monkey Power": [0x2EB12E, 0x68, 0xB1, 0xEE, 0x2EB1B1],
+    "Fourside - Department Store Blackout": [0x2EB22F, 0x66, 0xB2, 0xEE, 0x2EBFEF],
+    "Summers - Magic Cake": [0x2EB311, 0x1F, 0xB3, 0xEE, 0x2EB3A1],
+    "Dalaam - Trial of Mu": [0x2EB3FA, 0x08, 0xB4, 0xEE, 0x2EB443],
+    "Scaraba - Star Master": [0x2EB521, 0x32, 0xB5, 0xEE, 0x2EBFAD],
+    "Tenda Village - Tenda Tea": [0x2EB6A9, 0xB7, 0xB6, 0xEE, 0x2EB6E7],
+    "Lost Underworld - Talking Rock": [0x2EB72D, 0x3B, 0xB7, 0xEE, 0x2EB770],
+    "Magicant - Ness's Nightmare": [0x2EB7B4, 0xC7, 0xB7, 0xEE, 0x2EB812],
+    "Cave of the Present - Star Master": [0x2EB8C8, 0xD6, 0xB8, 0xEE, 0x2EB8EE]
+}
+
+character_locations = {
+    "Happy-Happy Village - Prisoner": [0x2EBAA9, 0x0FA68B, 0x2EBAA4, 0x2EBAC9, 0xB8, 0xBA, 0xEE],
+    "Threed - Zombie Prisoner": [0x2EAF7F, 0x0FA977, 0x2EAF7A, 0x2EAFC5, 0xAF, 0xAF, 0xEE],
+    "Snow Wood - Bedroom": [0x2EB0DA, 0x0FB0D6, 0x2EB0D5, 0x2EB11C, 0x0B, 0xB1, 0xEE],
+    "Monotoli Building - Monotoli Character": [0x2EB2B2, 0x0FC37F, 0x2EB2AD, 0x2EB2D2, 0xC1, 0xB2, 0xEE],
+    "Dalaam - Throne Character": [0x2EB4D1, 0x0FD20A, 0x2EB4CC, 0x2EB4F1, 0xE0, 0xB4, 0xEE],
+    "Deep Darkness - Barf Character": [0x2EB654, 0x0FE0C8, 0x2EB64F, 0x2EB673, 0x62, 0xB6, 0xEE]
+}
+
+item_id_table = {
+    "Franklin Badge": 0x01,
+    "Teddy Bear": 0x02,
+    "Super Plush Bear": 0x03,
+    "Broken Machine": 0x04,
+    "Broken Gadget": 0x05,
+    "Broken Air Gun": 0x06,
+    "Broken Spray Can": 0x07,
+    "Broken Laser": 0x08,
+    "Broken Iron": 0x09,
+    "Broken Pipe": 0x0A,
+    "Broken Cannon": 0x0B,
+    "Broken Tube": 0x0C,
+    "Broken Bazooka": 0x0D,
+    "Broken Trumpet": 0x0E,
+    "Broken Harmonica": 0x0F,
+    "Broken Antenna": 0x10,
+    "Cracked Bat": 0x11,
+    "Tee Ball Bat": 0x12,
+    "Sand Lot Bat": 0x13,
+    "Minor League Bat": 0x14,
+    "Mr. Baseball Bat": 0x15,
+    "Big League Bat": 0xD5,
+    "Hall of Fame Bat": 0x17,
+    "Magicant Bat": 0x18,
+    "Legendary Bat": 0x19,
+    "Gutsy Bat": 0x1A,
+    "Casey Bat": 0x1B,
+    "Fry Pan": 0x1C,
+    "Thick Fry Pan": 0x1D,
+    "Deluxe Fry Pan": 0x1E,
+    "Chef's Fry Pan": 0x1F,
+    "French Fry Pan": 0x20,
+    "Magic Fry Pan": 0x21,
+    "Holy Fry Pan": 0x22,
+    "Sword of Kings": 0x23,
+    "Pop Gun": 0x24,
+    "Stun Gun": 0x25,
+    "Toy Air Gun": 0x26,
+    "Magnum Air Gun": 0x27,
+    "Zip Gun": 0x28,
+    "Laser Gun": 0x29,
+    "Hyper Beam": 0x2A,
+    "Crusher Beam": 0x2B,
+    "Spectrum Beam": 0x2C,
+    "Death Ray": 0x2D,
+    "Baddest Beam": 0x2E,
+    "Moon Beam Gun": 0x2F,
+    "Gaia Beam": 0x30,
+    "Yo-yo": 0x31,
+    "Slingshot": 0x32,
+    "Bionic Slingshot": 0x33,
+    "Trick Yo-yo": 0x34,
+    "Combat Yo-yo": 0x35,
+    "Travel Charm": 0x36,
+    "Great Charm": 0x37,
+    "Crystal Charm": 0x38,
+    "Rabbit's Foot": 0x39,
+    "Flame Pendant": 0x3A,
+    "Rain Pendant": 0x3B,
+    "Night Pendant": 0x3C,
+    "Sea Pendant": 0x3D,
+    "Star Pendant": 0x3E,
+    "Cloak of Kings": 0x3F,
+    "Cheap Bracelet": 0x40,
+    "Copper Bracelet": 0x41,
+    "Silver Bracelet": 0x42,
+    "Gold Bracelet": 0x43,
+    "Platinum Band": 0xD8,
+    "Diamond Band": 0xD9,
+    "Pixie's Bracelet": 0x46,
+    "Cherub's Band": 0x47,
+    "Goddess Band": 0x48,
+    "Bracer of Kings": 0x49,
+    "Baseball Cap": 0x4A,
+    "Holmes Hat": 0x4B,
+    "Mr. Baseball Cap": 0x4C,
+    "Hard Hat": 0x4D,
+    "Ribbon": 0x4E,
+    "Red Ribbon": 0x4F,
+    "Goddess Ribbon": 0x50,
+    "Coin of Slumber": 0x51,
+    "Coin of Defense": 0x52,
+    "Lucky Coin": 0x53,
+    "Talisman Coin": 0x54,
+    "Shiny Coin": 0x55,
+    "Souvenir Coin": 0x56,
+    "Diadem of Kings": 0x57,
+    "Cookie": 0x58,
+    "Bag of Fries": 0x59,
+    "Hamburger": 0x5A,
+    "Boiled Egg": 0x5B,
+    "Fresh Egg": 0x5C,
+    "Picnic Lunch": 0x5D,
+    "Pasta di Summers": 0x5E,
+    "Pizza": 0x5F,
+    "Chef's Special": 0x60,
+    "Large Pizza": 0x61,
+    "PSI Caramel": 0x62,
+    "Magic Truffle": 0x63,
+    "Brain Food Lunch": 0x64,
+    "Rock Candy": 0x65,
+    "Croissant": 0x66,
+    "Bread Roll": 0x67,
+    "Pak of Bubble Gum": 0x68,
+    "Jar of Fly Honey": 0x69,
+    "Can of Fruit Juice": 0x6A,
+    "Royal Iced Tea": 0x6B,
+    "Protein Drink": 0x6C,
+    "Kraken Soup": 0x6D,
+    "Bottle of Water": 0x6E,
+    "Cold Remedy": 0x6F,
+    "Vial of Serum": 0x70,
+    "IQ Capsule": 0x71,
+    "Guts Capsule": 0x72,
+    "Speed Capsule": 0x73,
+    "Vital Capsule": 0x74,
+    "Luck Capsule": 0x75,
+    "Ketchup Packet": 0x76,
+    "Sugar Packet": 0x77,
+    "Tin of Cocoa": 0x78,
+    "Carton of Cream": 0x79,
+    "Sprig of Parsley": 0x7A,
+    "Jar of Hot Sauce": 0x7B,
+    "Salt Packet": 0x7C,
+    "Tiny Key": 0x7D,
+    "Jar of Delisauce": 0x7E,
+    "Wet Towel": 0x7F,
+    "Refreshing Herb": 0x80,
+    "Secret Herb": 0x81,
+    "Horn of Life": 0x82,
+    "Counter-PSI Unit": 0x83,
+    "Shield Killer": 0x84,
+    "Bazooka": 0x85,
+    "Heavy Bazooka": 0x86,
+    "HP-Sucker": 0x87,
+    "Hungry HP-Sucker": 0x88,
+    "Xterminator Spray": 0x89,
+    "Slime Generator": 0x8A,
+    "Yogurt Dispenser": 0x8B,
+    "Ruler": 0x8C,
+    "Snake Bag": 0x8D,
+    "Mummy Wrap": 0x8E,
+    "Protractor": 0x8F,
+    "Bottle Rocket": 0x90,
+    "Big Bottle Rocket": 0x91,
+    "Multi Bottle Rocket": 0x92,
+    "Bomb": 0x93,
+    "Super Bomb": 0x94,
+    "Insecticide Spray": 0x95,
+    "Rust Promoter": 0x96,
+    "Rust Promoter DX": 0x97,
+    "Pair of Dirty Socks": 0x98,
+    "Stag Beetle": 0x99,
+    "Toothbrush": 0x9A,
+    "Handbag Strap": 0x9B,
+    "Pharaoh's Curse": 0x9C,
+    "Defense Shower": 0x9D,
+    "UFO Engine": 0x9E,
+    "Sudden Guts Pill": 0x9F,
+    "Bag of Dragonite": 0xA0,
+    "Defense Spray": 0xA1,
+    "Piggy Nose": 0xA2,
+    "For Sale Sign": 0xA3,
+    "Shyness Book": 0xA4,
+    "Picture Postcard": 0xA5,
+    "King Banana": 0xA6,
+    "Letter For Tony": 0xA7,
+    "Chick": 0xA8,
+    "Chicken": 0xA9,
+    "Key to the Shack": 0xAA,
+    "Key to the Cabin": 0xAB,
+    "Bad Key Machine": 0xAC,
+    "Zombie Paper": 0xAE,
+    "Hawk Eye": 0xAF,
+    "Bicycle": 0xB0,
+    "ATM Card": 0xB1,
+    "Show Ticket": 0xB2,
+    "Tenda Lavapants": 0xB3,
+    "Wad of Bills": 0xB4,
+    "Receiver Phone": 0xB5,
+    "Diamond": 0xB6,
+    "Signed Banana": 0xB7,
+    "Pencil Eraser": 0xB8,
+    "Hieroglyph Copy": 0xB9,
+    "Meteotite": 0xBA,
+    "Contact Lens": 0xBB,
+    "Hand-Aid": 0xBC,
+    "Trout Yogurt": 0xBD,
+    "Banana": 0xBE,
+    "Calorie Stick": 0xBF,
+    "Key to the Tower": 0xC0,
+    "Meteorite Piece": 0xC1,
+    "Earth Pendant": 0xC2,
+    "Neutralizer": 0xC3,
+    "Sound Stone": 0xC4,
+    "Exit Mouse": 0xC5,
+    "Gelato de Resort": 0xC6,
+    "Snake": 0xC7,
+    "Viper": 0xC8,
+    "Brain Stone": 0xC9,
+    "Police Badge": 0xCA,
+    "Mining Permit": 0xCB,
+    "Suporma": 0xCC,
+    "Key to the Locker": 0xCD,
+    "Insignificant Item": 0xCE,
+    "Magic Tart": 0xCF,
+    "Tiny Ruby": 0xD0,
+    "Monkey's Love": 0xD1,
+    "Eraser Eraser": 0xD2,
+    "Tendakraut": 0xD3,
+    "T-Rex's Bat": 0xD4,
+    "Ultimate Bat": 0xD6,
+    "Double Beam": 0xD7,
+    "Defense Ribbon": 0xDA,
+    "Talisman Ribbon": 0xDB,
+    "Saturn Ribbon": 0xDC,
+    "Coin of Silence": 0xDD,
+    "Charm Coin": 0xDE,
+    "Cup of Noodles": 0xDF,
+    "Repel Sandwich": 0xE0,
+    "Repel Superwich": 0xE1,
+    "Lucky Sandwich": 0xE2,
+    "Progressive Bat": 0xE3,
+    "Progressive Fry Pan": 0xE4,
+    "Progressive Gun": 0xE5,
+    "Progressive Bracelet": 0xE6,
+    "Progressive Other": 0xE7,
+    "Cup of Coffee": 0xE8,
+    "Double Burger": 0xE9,
+    "Peanut Cheese Bar": 0xEA,
+    "Piggy Jelly": 0xEB,
+    "Bowl of Rice Gruel": 0xEC,
+    "Bean Croquette": 0xED,
+    "Molokheiya Soup": 0xEE,
+    "Plain Roll": 0xEF,
+    "Kabob": 0xF0,
+    "Plain Yogurt": 0xF1,
+    "Beef Jerky": 0xF2,
+    "Mammoth Burger": 0xF3,
+    "Spicy Jerky": 0xF4,
+    "Luxury Jerky": 0xF5,
+    "Bottle of DXwater": 0xF6,
+    "Magic Pudding": 0xF7,
+    "Non-Stick Frypan": 0xF8,
+    "Mr. Saturn Coin": 0xF9,
+    "Meteornium": 0xFA,
+    "Popsicle": 0xFB,
+    "Cup of Lifenoodles": 0xFC,
+    "Carrot Key": 0xFD
+}
+
+psi_item_table = {
+    "Onett Teleport": 0x01,
+    "Twoson Teleport": 0x02,
+    "Happy-Happy Village Teleport": 0x03,
+    "Threed Teleport": 0x04,
+    "Saturn Valley Teleport": 0x05,
+    "Dusty Dunes Teleport": 0x06,
+    "Fourside Teleport": 0x07,
+    "Winters Teleport": 0x08,
+    "Summers Teleport": 0x09,
+    "Scaraba Teleport": 0x0A,
+    "Dalaam Teleport": 0x0B,
+    "Deep Darkness Teleport": 0x0C,
+    "Tenda Village Teleport": 0x0D,
+    "Lost Underworld Teleport": 0x0E,
+    "Magicant Teleport": 0x0F,
+    "Progressive Poo PSI": 0x10
+}
+
+character_item_table = {
+    "Paula": [0x01, 0x02, 0x0189, 0x06], 
+    "Jeff": [0x02, 0x03, 0x018A, 0x06],
+    "Poo": [0x03, 0x04, 0x018B, 0x06],
+    "Flying Man": [0x04, 0x27, 0x0027, 0x04],
+    "Ness": [0x05, 0x00, 0x0010, 0x01, 0x06],  # the last 2 might not be needed anymore
+    "Photograph": [0x06, 0x0153, 0x01C1]
+}
+
+party_id_nums = {
+    "Paula": 0x02,
+    "Jeff": 0x03,
+    "Poo": 0x04,
+    "Flying Man": 0x0B,
+    "Ness": 0x01
+}
+
+special_name_table = {
+    "Onett Teleport": [0x00, 0xEE9210],
+    "Twoson Teleport": [0x01, 0xEE9240],
+    "Happy-Happy Village Teleport": [0x02, 0xEE9271],
+    "Threed Teleport": [0x03, 0xEE92AF],
+    "Saturn Valley Teleport": [0x04, 0xEE92E0],
+    "Dusty Dunes Teleport": [0x05, 0xEE9318],
+    "Fourside Teleport": [0x06, 0xEE9355],
+    "Winters Teleport": [0x07, 0xEE9388],
+    "Summers Teleport": [0x08, 0xEE93BA],
+    "Scaraba Teleport": [0x09, 0xEE93EC],
+    "Dalaam Teleport": [0x0A, 0xEE941E],
+    "Deep Darkness Teleport": [0x0B, 0xEE944F],
+    "Tenda Village Teleport": [0x0C, 0xEE948B],
+    "Lost Underworld Teleport": [0x0D, 0xEE94C3],
+    "Progressive Poo PSI": [0x0E, 0xEE9554],
+    "Paula": [0x0F, 0xD5F830],
+    "Jeff": [0x10, 0xD5F837],
+    "Poo": [0x11, 0xD5F83E],
+    "Flying Man": [0x12, 0xD5F845],
+    "Magicant Teleport": [0x13, 0xEE9501],
+    "Ness": [0x14, 0xD5F849],
+    "Photograph": [0x15, 0xF3FFE0]
+}
+
+client_specials = {
+    0x00FE: 0x01,
+    0x00FF: 0x02,
+    0x0100: 0x0D,
+    0x0101: 0x03,
+    0x0102: 0x05,
+    0x0103: 0x0E,
+    0x0104: 0x06,
+    0x0105: 0x04,
+    0x0106: 0x07,
+    0x0107: 0x09,
+    0x0108: 0x08,
+    0x0109: 0x0A,
+    0x010A: 0x0B,
+    0x010B: 0x0C,
+    0x010C: 0x14,
+    0x010D: 0x0F,
+    0x010E: 0x10,
+    0x010F: 0x11,
+    0x0110: 0x12,
+    0x0111: 0x13,
+    0x0112: 0x15,
+    0x0113: 0x16
+}
+
+
+starting_psi_table = {
+    "Onett Teleport": 0x01,
+    "Twoson Teleport": 0x02,
+    "Threed Teleport": 0x03,
+    "Winters Teleport": 0x04,
+    "Saturn Valley Teleport": 0x05,
+    "Fourside Teleport": 0x06,
+    "Summers Teleport": 0x07,
+    "Dalaam Teleport": 0x08,
+    "Scaraba Teleport": 0x09,
+    "Deep Darkness Teleport": 0x0A,
+    "Tenda Village Teleport": 0x0B,
+    "Lost Underworld Teleport": 0x0C,
+    "Happy-Happy Village Teleport": 0x0D,
+    "Dusty Dunes Teleport": 0x0E,
+    "Magicant Teleport": 0x0F,
+    "Progressive Poo PSI": 0x10
+}
+
+# Todo; convert the list shit to a Struct.pack!
+item_space_checks = {
+    "Onett - Tracy Gift": [0x076174, 0x78, 0x61, 0xC7],
+    "Onett - Meteor Item": [0x0862FD, 0x01, 0x63, 0xC8],
+    "Onett - Library Counter": [0x05ECA7, 0xAB, 0xEC, 0xC5],
+    "Onett - Library Bookshelf": [0x087E74, 0x78, 0x7E, 0xC3],
+    "Onett - Treehouse Guy": [0x073F71, 0x75, 0x3F, 0xC7],
+    "Onett - Mayor Pirkle": [0x072D5A, 0x5E, 0x2D, 0xC7],
+    "Onett - Traveling Entertainer": [0x074775, 0x79, 0x74, 0xC7],
+    "Twoson - Bike Shop Rental": [0x08019E, 0xA2, 0x01, 0xC8],
+    "Twoson - Orange Kid Donation": [0x08135B, 0x5F, 0x13, 0xC8],
+    "Twoson - Apple Kid's Mouse": [0x0819D8, 0xDC, 0x19, 0xC8],
+    "Twoson - Apple Kid Invention": [0x08200E, 0x11, 0x20, 0xC8],
+    "Twoson - Antique Shop": [0x093EE3, 0xE7, 0x3E, 0xC9],
+    "Twoson - Paula's Mother": [0x080628, 0x2C, 0x0C, 0xC8],
+    "Twoson - Everdred Meeting": [0x09604B, 0x4F, 0x60, 0xC9],
+    "Happy-Happy Village - Donation Lady": [0x098A90, 0x94, 0x8A, 0xC9, 0x0893AF, 0xB3, 0x93, 0xC8],
+    "Happy-Happy Village - Prisoner Item": [0x2F965D, 0x61, 0x96, 0xEF, 0x2EAF3A, 0x3E, 0xAF, 0xEE],
+    "Happy-Happy Village - Defeat Carpainter": [0x098268, 0x6C, 0x82, 0xC9],
+    "Threed - Hospital Drawer": [0x08687C, 0x80, 0x68, 0xC8],
+    "Threed - Boogey Tent Trashcan": [0x2EF640, 0x44, 0xF6, 0xEE],
+    "Saturn Valley - Post Belch Gift #1": [0x2EC049, 0x4D, 0xC0, 0xEE],
+    "Saturn Valley - Post Belch Gift #2": [0x2EC063, 0x67, 0xC0, 0xEE],
+    "Saturn Valley - Post Belch Gift #3": [0x2EC056, 0x5A, 0xC0, 0xEE],
+    "Dusty Dunes - Shining Spot": [0x060DA1, 0xA5, 0x0D, 0xC6],
+    "Dusty Dunes - Mine Reward": [0x060588, 0x8C, 0x05, 0xC6],
+    "Snow Wood - Maxwell Item": [0x06AC6C, 0x70, 0xAC, 0xC6],
+    "Scaraba - Snake Bag Salesman": [0x057024, 0x28, 0x70, 0xC5],
+    "Winters - Drugstore Saleswoman": [0x2EF625, 0x29, 0xF6, 0xEE],
+    "Andonuts Lab - Mouse": [0x06C891, 0x95, 0xC8, 0xC6],
+    "Stonehenge - Kidnapped Mr. Saturn": [0x06C06F, 0x73, 0xC0, 0xC6],
+    "Stonehenge - Tony Item": [0x2FFA71, 0x7F, 0xFA, 0xEF],
+    "Monkey Caves - Bow Monkey Gift": [0x0625F1, 0xF5, 0x25, 0xC6],
+    "Monkey Caves - Talah Rama Gift": [0x060FE1, 0xE5, 0x0F, 0xC6],
+    "Fourside - Venus Gift": [0x2EB1C7, 0xCB, 0xB1, 0xEE],
+    "Fourside - Post-Moonside Delivery": [0x07AABD, 0xC1, 0xAA, 0xC7, 0x07B57C, 0x80, 0xB5, 0xC7],
+    "Monotoli Building - Electra Gift": [0x06E99C, 0xA0, 0xE9, 0xC6],
+    "Monotoli Building - Monotoli Gift": [0x06EB35, 0x39, 0xEB, 0xC6],
+    "Summers - Museum Item": [0x08ABEB, 0xEF, 0xAB, 0xC8],
+    "Pyramid - Pedestal Item": [0x0931D8, 0xDC, 0x31, 0xC9],
+    "Scaraba - Key Holder": [0x0576B9, 0xBD, 0x76, 0xC5],  # Extra break?
+    "Deep Darkness - Teleporting Monkey": [0x09E508, 0x0C, 0xE5, 0xC9],
+    "Deep Darkness - North Alcove Truffle": [0x3315DE, 0xE2, 0x15, 0xF3],
+    "Deep Darkness - Near Land Truffle": [0x33163A, 0x3E, 0x16, 0xF3],
+    "Deep Darkness - Present Truffle": [0x33160C, 0x10, 0x16, 0xF3],
+    "Deep Darkness - Village Truffle": [0x331668, 0x6C, 0x16, 0xF3],
+    "Deep Darkness - Entrance Truffle": [0x3315B0, 0xB4, 0x15, 0xF3],
+    "Tenda Village - Tenda Gift #2": [0x09D80D, 0x11, 0xD8, 0xC9],
+    "Magicant - Ness's Gift": [0x077622, 0x26, 0x76, 0xC7],
+    "Cave of the Present - Broken Phase Distorter": [0x2F5905, 0x09, 0x59, 0xEF],
+    "Onett - Mani Mani Statue": [0x2EBEA6, 0xAA, 0xBE, 0xEE],
+    "Onett - Buzz Buzz": [0x2EAA4C, 0x50, 0xAA, 0xEE],
+    "Saturn Valley - Saturn Coffee": [0x2EB029, 0x2D, 0xB0, 0xEE],
+    "Monkey Caves - Monkey Power": [0x2EB1AA, 0xAE, 0xB1, 0xEE],
+    "Fourside - Department Store Blackout": [0x2EB26B, 0x6F, 0xB2, 0xEE],
+    "Summers - Magic Cake": [0x2EB39A, 0x9E, 0xB3, 0xEE],
+    "Dalaam - Trial of Mu": [0x2EB43C, 0x40, 0xB4, 0xEE],
+    "Scaraba - Star Master": [0x2EB537, 0x3B, 0xB5, 0xEE],
+    "Tenda Village - Tenda Tea": [0x2EB6E0, 0xE4, 0xB6, 0xEE],
+    "Lost Underworld - Talking Rock": [0x2EB769, 0x6D, 0xB7, 0xEE],
+    "Magicant - Ness's Nightmare": [0x2EB80B, 0x0F, 0xB8, 0xEE],
+    "Cave of the Present - Star Master": [0x2EB8E7, 0xEB, 0xB8, 0xEE],
+    "Happy-Happy Village - Prisoner": [0x2EBAC2, 0xC6, 0xBA, 0xEE],
+    "Threed - Zombie Prisoner": [0x2EAF85, 0x89, 0xAF, 0xEE],
+    "Dalaam - Throne Character": [0x2EB4EA, 0xEE, 0xB4, 0xEE],
+    "Snow Wood - Upper Right Locker": [0x2EFB23, 0x27, 0xFB, 0xEE],
+    "Snow Wood - Upper Left Locker": [0x2EFB62, 0x66, 0xFB, 0xEE],
+    "Snow Wood - Bottom Right Locker": [0x2EFBA1, 0xA5, 0xFB, 0xEE],
+    "Snow Wood - Bottom Left Locker": [0x2EFBE0, 0xE4, 0xFB, 0xEE],
+    "Snow Wood - Bedroom": [0x2EB0E0, 0xE4, 0xB0, 0xEE],
+    "Monotoli Building - Monotoli Character": [0x2EB2B8, 0xBC, 0xB2, 0xEE],
+    "Deep Darkness - Barf Character": [0x2EB65A, 0x5E, 0xB6, 0xEE]
+}
+
+protection_checks = {
+    "thunder": [0x0297D2],
+    "fire": [0x2FFC35, 0x2FFC77],
+    "freeze": [0x2FFC56],
+    "flash": [0x2FFC9B],
+    "starstorm": [0x2FFCCD],
+    "special": [0x2FFC1E],
+    "explosive": [0x2FFCED]
+}
+
+badge_names = {
+    "thunder": "Franklin badge",
+    "fire": "Bunsen badge",
+    "freeze": "Thilorier badge",
+    "flash": "Cowen badge",
+    "starstorm": "Leavitt badge",
+    "special": "Mesmer badge",
+    "explosive": "Nobel badge"
+}
+
+protection_text = {
+    "thunder": [0xEEC911, 0xEEC95F],
+    "fire": [0xEEC91C, 0xEEC969],
+    "freeze": [0xEEC922, 0xEEC96E],
+    "flash": [0xEEC928, 0xEEC972],
+    "starstorm": [0xEEC92F, 0xEEC978],
+    "special": [0xEEC93A, 0xEEC982],
+    "explosive": [0xEEC94A, 0xEEC989]
+}
+
+local_present_types = {
+    "filler": [0xd6, 0x00],
+    "progression": [0xE9, 0x00],
+    "useful": [0xC3, 0x00],
+    "trap": [0xE9, 0x00],
+    "progression_skip_balancing": [0xE9, 0x00]
+}
+
+nonlocal_present_types = {
+    "filler": [0x98, 0x01],
+    "progression": [0x90, 0x01],
+    "useful": [0x98, 0x01],
+    "trap": [0x90, 0x01],
+    "progression_skip_balancing": [0x90, 0x01]
+
+}
+
+present_text_pointers = {
+    "filler": [0x5b, 0xd8, 0xc7],
+    "progression": [0x67, 0xd8, 0xc7],
+    "useful": [0x4F, 0xD8, 0xC7],
+    "progression_skip_balancing": [0x67, 0xd8, 0xc7],
+    "trap": [0x67, 0xd8, 0xc7]
+}
+
+ap_text_pntrs = [
+    0xEECDCD,  # ce
+    0xEECDD9,  # cf
+    0xEECDE5,  # d0
+    0xEECDF1,  # e7
+    0xEECDFD,  # e8
+    0xEECE09,  # e9
+    0xEECE15,  # ea
+    0xEECE21,  # eb
+    0xEECE2D,  # ec
+    0xEECE39,  # ed
+    0xEECE45,  # ee
+    0xEECE51,  # ef
+    0xEECE5D,  # f0
+    0xEECE69,  # f1
+    0xEECE75,  # f2
+    0xEECE81,  # f3
+    # [0x8D, 0xCE, 0xEE] #trap text
+]
+
+hint_bits = [
+    0x04,
+    0x08,
+    0x10,
+    0x20,
+    0x40,
+    0x80
+]
+
+money_item_table = {
+    "$10": 10,
+    "$100": 100,
+    "$1000": 1000
+}
+
+money_id_table = {
+    0x114: 10,
+    0x115: 100,
+    0x116: 1000
+}
+
+# 0: Action pointer, call the actual item being given
+# 1: Sprite ID
+# 2: Secondary routine pointer, used for items and psi
+# 3: Inventory item give
+# 4: Standard item routine address
+# For characters
diff --git a/worlds/earthbound/game_data/palettes_organized.py b/worlds/earthbound/game_data/palettes_organized.py
new file mode 100644
index 0000000000..aaf9276279
--- /dev/null
+++ b/worlds/earthbound/game_data/palettes_organized.py
@@ -0,0 +1,11066 @@
+map_palettes = {
+    "Pyramid": 0,
+    "Lost Underworld": 1,
+    "Cave of the Past": 2,
+    "Giygas's Lair": 3,
+    "Onett": 4,
+    # "Onett Nighttime": 5,
+    # "Onett Flashback": 6,
+    "Twoson": 7,
+    "Happy-Happy Village": 8,
+    "Happy-Happy Clear": 9,
+    "Tunnel Outdoors": 10,
+    "Threed": 11,
+    "Threed Daytime": 12,
+    "Fourside": 13,
+    "Moonside": 14,
+    "Magicant": 15,
+    "Tunnels": 16,
+    "Magicant Interiors": 17,
+    "Tents": 18,
+    "Peaceful Rest Valley": 19,
+    "Grapefruit Falls": 20,
+    "Saturn Valley": 21,
+    "Deep Darkness": 22,
+    "Lilliput Steps Sanctuary": 23,
+    "Milky Well": 24,
+    "Deep Darkness Darkness": 25,
+    "Summers": 26,
+    "Dusty Dunes Desert": 27,
+    "The Sky": 28,
+    "Dalaam": 29,
+    "Dalaam Palace": 30,
+    "Cave of the Present": 31,
+    "Pink Cloud Sanctuary": 32,
+    "The Sea": 33,
+    # "????": 34,
+    "Monotoli Offices": 35,
+    "Onett Hotel": 36,
+    "Threed Red-Wall House": 37,
+    "Electra's Room": 38,
+    "Threed Green-Wall House": 39,
+    "Threed Blue-Wall House": 40,
+    "Pokey's House": 41,
+    "Moonside Hospital": 42,
+    "Onett Green-Wall House": 43,
+    "Onett Blue-Wall House": 44,
+    "Onett Seafoam-Wall House": 45,
+    "Onett Peach-Wall House": 46,
+    "Onett Light Blue-Wall House": 47,
+    "Onett Pink-Wall House": 48,
+    "Onett White-Wall House": 49,
+    # "Onett Flashback House": 50,
+    "Hospitals": 51,
+    "Apple Kid's House": 52,
+    "Tracy's Room": 53,
+    "Orange Kid's House": 54,
+    "Everdred's House": 55,
+    "Twoson Green-Wall House": 56,
+    "Ness's Room": 57,
+    "Police Station Backroom": 58,
+    "Winters": 59,
+    "Rainy Circle Sanctuary": 60,
+    # "Winters Nighttime": 61,
+    # "Ness's House Nighttime": 62,
+    "Hospital Rooms": 63,
+    "Twoson Peach-Wall House": 64,
+    "Twoson Pink-Wall House": 65,
+    "Twoson Gray-Wall House": 66,
+    "Gold Office": 67,
+    "Happy-Happy Guardhouse": 68,
+    "Happy-Happy Hospital": 69,
+    "Happy-Happy Hospital Clear": 70,
+    "Onett Town Hall": 71,
+    "Onett Hotel Bedrooms": 72,
+    "Fourside Hotel Bedrooms": 73,
+    "Happy-Happy Saturn House": 74,
+    "Happy-Happy Hotel": 75,
+    "Twoson Hotel Bedrooms": 76,
+    "Threed Hotel Bedrooms": 77,
+    "Happy-Happy Hotel Clear": 78,
+    "Monotoli Building": 79,
+    "Paula's House": 80,
+    "Paula's Room": 81,
+    "Ness's House": 82,
+    "Twoson Hotel": 83,
+    "Threed Hotel": 84,
+    "Fourside Hotel": 85,
+    "Monotoli Elevators": 86,
+    "Fourside Dept. Store Office": 87,
+    "Onett Library": 88,
+    "Paula's House Rooms": 89,
+    "Onett Police Station": 90,
+    "Scaraba": 91,
+    "Dalaam House": 92,
+    "Scaraba House": 93,
+    "Happy-Happy HQ": 94,
+    "Fourside Cafe": 95,
+    "Moonside Cafe": 96,
+    "Scaraba Hospital": 97,
+    "Scaraba Shop": 98,
+    "Twoson Dept. Store": 99,
+    "Fourside Dept. Store": 100,
+    "Bakery": 101,
+    "Mach Pizza": 102,
+    "Burger Shop": 103,
+    "Onett Drugstore": 104,
+    "Threed Drugstore": 105,
+    "Winters Drugstore": 106,
+    "Chaos Theater": 107,
+    "Fourside Museum": 108,
+    "Summers Hotel": 109,
+    "Summers Shop": 110,
+    # "Topolla Theater Stage": 111,
+    "Snow Wood Boarding School": 112,
+    # "Chaos Theater Stage": 113,
+    "Summers Harbor House": 114,
+    "Summers Restaurant": 115,
+    "Moonside Museum": 116,
+    "Stoic Club": 117,
+    "Andonuts Lab": 118,
+    "Topolla Theater": 119,
+    "Summers Museum": 120,
+    "Onett Arcade": 121,
+    "Twoson Bus Station": 122,
+    "Twoson Bike Shop": 123,
+    "Hint Shop": 124,
+    "Fourside Dept. Store Rooms": 125,
+    "Threed Tent": 126,
+    "Onett Treehouse": 127,
+    "Lier's House": 128,
+    "Run-down House": 129,
+    "Paula's Cabin": 130,
+    "Dusty Dunes Drugstore": 131,
+    "Dusty Dunes Miner Shack": 132,
+    "Traveler's Shack": 133,
+    "Lumine Hall": 134,
+    "Connector Caves": 135,
+    "Lumine Hall Sanctuary": 136,
+    "Fire Spring": 137,
+    "Sea of Eden": 138,
+    "Monkey Caves Treasure Rooms": 139,
+    "Dungeon Man": 140,
+    "Threed Underground": 141,
+    "Lier's Cave": 142,
+    "Stonehenge Balcony Room": 143,
+    "Stonehenge Balcony Off": 144,
+    "Brickroad Maze": 145,
+    "Rainy Circle": 146,
+    "Belch's Factory": 147,
+    "Milky Well Caves": 148,
+    "Lilliput Steps": 149,
+    "Monkey Caves Hallway": 150,
+    "Giant Step": 151,
+    "Pink Cloud": 152,
+    "Saturn Caves": 153,
+    "Stonehenge Tunnels": 154,
+    # "Stonehenge Flashing Room": 155,
+    # "????": 156,
+    "Gold Mine": 157,
+    "Sewer": 158,
+    "Tenda Village": 159,
+    "Fourside Dept. Store Blackout": 160,
+    "Fourside Dept. Store Blackout Rooms": 161,
+    "Magicant Manly Fish": 162,
+    "Magicant Ness": 163,
+    # "Magicant Tracy (Unused)": 164,
+    "Magicant Rabbit": 165,
+    "Magicant Belch": 166,
+    "Magicant Mom": 167
+}
+
+# To anyone reviewing this, you can just close and ignore these.
+
+nice_palettes = {
+    "Pyramid": [
+        0,
+        6,
+        26,
+        31,
+        33,
+        34,
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        57,
+        62,
+        67,
+        68,
+        69,
+        70,
+        75,
+        78,
+        79,
+        82,
+        84,
+        85,
+        87,
+        92,
+        93,
+        95,
+        99,
+        100,
+        101,
+        107,
+        109,
+        110,
+        111,
+        112,
+        113,
+        118,
+        119,
+        124,
+        128,
+        129,
+        130,
+        131,
+        132,
+        133,
+        155,
+        156,
+        159,
+        160    
+    ],
+    "Lost Underworld": [
+        1,
+        22,
+        62,
+        79,
+        86,
+        107,
+        114,
+        130,
+        133,
+        134,
+        141,
+        154,
+        156    
+    ],
+    "Cave of the Past": [
+        2,
+        42,
+        62,
+        79,
+        86,
+        92,
+        101,
+        107,
+        123,
+        137,
+        140,
+        142,
+        146,
+        157    
+    ],
+    "Giygas's Lair": [
+        0,
+        3,
+        30,
+        33,
+        36,
+        37,
+        50,
+        67,
+        83,
+        84,
+        111,
+        128,
+        132,
+        139,
+        160,
+        164    
+    ],
+    "Onett": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        42,
+        105,
+        106,
+        107,
+        109,
+        116    
+    ],
+    "Twoson": [
+        4,
+        5,
+        7,
+        9,
+        11,
+        12,
+        13,
+        14,
+        22,
+        42,
+        59,
+        62,
+        63,
+        107,
+        116    
+    ],
+    "Happy-Happy Village": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        21,
+        22,
+        42,
+        47,
+        59,
+        62    
+    ],
+    "Happy-Happy Clear": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        21,
+        22,
+        42,
+        47,
+        59,
+        62    
+    ],
+    "Tunnel Outdoors": [
+        1,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        25,
+        26,
+        42,
+        59,
+        62,
+        63,
+        79,
+        86,
+        92,
+        95,
+        96,
+        104,
+        105,
+        106,
+        107,
+        109,
+        116,
+        141,
+        154    
+    ],
+    "Threed": [
+        4,
+        5,
+        7,
+        9,
+        11,
+        12,
+        13,
+        14,
+        42,
+        62,
+        116    
+    ],
+    "Threed Daytime": [
+        4,
+        5,
+        7,
+        9,
+        11,
+        12,
+        13,
+        14,
+        42,
+        62,
+        116    
+    ],
+    "Fourside": [
+        4,
+        5,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        42,
+        109,
+        116    
+    ],
+    "Moonside": [
+        4,
+        5,
+        7,
+        9,
+        11,
+        12,
+        13,
+        14,
+        21,
+        22,
+        42,
+        63,
+        109,
+        116    
+    ],
+    "Magicant": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Tunnels": [
+        0,
+        1,
+        8,
+        9,
+        10,
+        11,
+        12,
+        16,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        33,
+        38,
+        40,
+        41,
+        43,
+        48,
+        49,
+        57,
+        59,
+        61,
+        62,
+        63,
+        68,
+        70,
+        71,
+        75,
+        78,
+        82,
+        85,
+        86,
+        90,
+        92,
+        94,
+        95,
+        99,
+        100,
+        101,
+        104,
+        105,
+        111,
+        117,
+        119,
+        120,
+        128,
+        129,
+        131,
+        135,
+        136,
+        137,
+        140,
+        141,
+        142,
+        146,
+        147,
+        148,
+        149,
+        150,
+        151,
+        152,
+        153,
+        154,
+        156,
+        157,
+        158,
+        159    
+    ],
+    "Magicant Interiors": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        25,
+        26,
+        27,
+        32,
+        33,
+        34,
+        38,
+        39,
+        40,
+        41,
+        42,
+        44,
+        51,
+        52,
+        54,
+        58,
+        62,
+        71,
+        75,
+        79,
+        81,
+        82,
+        86,
+        88,
+        91,
+        101,
+        103,
+        105,
+        107,
+        109,
+        112,
+        115,
+        116,
+        120,
+        123,
+        132,
+        146,
+        147,
+        157,
+        160,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Tents": [
+        18,
+        20,
+        29,
+        42,
+        63,
+        79,
+        80,
+        93,
+        107,
+        109,
+        116,
+        146,
+        147,
+        157    
+    ],
+    "Peaceful Rest Valley": [
+        4,
+        5,
+        13,
+        14,
+        19,
+        21,
+        22,
+        42,
+        62,
+        63,
+        82,
+        116    
+    ],
+    "Grapefruit Falls": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        19,
+        20,
+        21,
+        22,
+        23,
+        24,
+        25,
+        42,
+        62,
+        63,
+        101,
+        109,
+        112,
+        133    
+    ],
+    "Saturn Valley": [
+        4,
+        5,
+        7,
+        9,
+        11,
+        12,
+        13,
+        14,
+        21,
+        22,
+        42,
+        59,
+        63,
+        116    
+    ],
+    "Deep Darkness": [
+        22,
+        42,
+        47,
+        62,
+        112,
+        116    
+    ],
+    "Lilliput Steps Sanctuary": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        19,
+        20,
+        21,
+        22,
+        23,
+        24,
+        42,
+        59,
+        61,
+        62,
+        63,
+        101,
+        112    
+    ],
+    "Milky Well": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        12,
+        13,
+        14,
+        21,
+        22,
+        24,
+        42,
+        59,
+        62,
+        63,
+        116    
+    ],
+    "Deep Darkness Darkness": [
+        25    
+    ],
+    "Summers": [
+        14,
+        26,
+        27,
+        42,
+        57,
+        59,
+        62,
+        91,
+        93,
+        107,
+        109,
+        112,
+        115,
+        116,
+        118    
+    ],
+    "Dusty Dunes Desert": [
+        27,
+        38,
+        39,
+        42,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        68,
+        71,
+        75,
+        78,
+        80,
+        90,
+        92,
+        93,
+        104,
+        109,
+        112,
+        115,
+        116,
+        119,
+        120,
+        130,
+        133,
+        163    
+    ],
+    "The Sky": [
+        0,
+        1,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        25,
+        26,
+        27,
+        28,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        45,
+        46,
+        47,
+        48,
+        49,
+        50,
+        51,
+        52,
+        53,
+        54,
+        55,
+        56,
+        57,
+        58,
+        59,
+        62,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        71,
+        72,
+        74,
+        75,
+        76,
+        77,
+        78,
+        79,
+        80,
+        81,
+        82,
+        83,
+        84,
+        85,
+        86,
+        87,
+        88,
+        89,
+        90,
+        91,
+        92,
+        93,
+        94,
+        95,
+        96,
+        97,
+        98,
+        99,
+        100,
+        101,
+        102,
+        103,
+        104,
+        105,
+        106,
+        107,
+        108,
+        109,
+        110,
+        111,
+        112,
+        113,
+        114,
+        115,
+        117,
+        118,
+        119,
+        120,
+        121,
+        122,
+        123,
+        124,
+        125,
+        126,
+        127,
+        128,
+        129,
+        130,
+        131,
+        132,
+        133,
+        134,
+        139,
+        140,
+        141,
+        154,
+        159,
+        160,
+        161,
+        162,
+        165,
+        166    
+    ],
+    "Dalaam": [
+        14,
+        22,
+        29,
+        32,
+        42,
+        62,
+        109,
+        115,
+        116    
+    ],
+    "Dalaam Palace": [
+        3,
+        14,
+        30,
+        31,
+        132,
+        162    
+    ],
+    "Cave of the Present": [
+        31,
+        72    
+    ],
+    "Pink Cloud Sanctuary": [
+        9,
+        32,
+        42,
+        62,
+        73,
+        87,
+        93,
+        98,
+        99,
+        100,
+        103,
+        109,
+        119,
+        120,
+        130    
+    ],
+    "The Sea": [
+        9,
+        33,
+        34,
+        42,
+        107,
+        109,
+        112,
+        116,
+        118    
+    ],
+    "Monotoli Offices": [
+        35,
+        38,
+        39,
+        41,
+        42,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        63,
+        71,
+        80,
+        82,
+        88,
+        90,
+        102,
+        104,
+        107,
+        109,
+        116,
+        120,
+	    128
+    ],
+    "Onett Hotel": [
+        14,
+        36,
+        42,
+        44,
+        51,
+        57,
+        58,
+        62,
+        63,
+        65,
+        70,
+        71,
+        74,
+        79,
+        102,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Threed Red-Wall House": [
+        14,
+        37,
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        70,
+        71,
+        75,
+        78,
+        81,
+        82,
+        90,
+        104,
+        112,
+        116,
+        120    
+    ],
+    "Electra's Room": [
+        14,
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        48,
+        50,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        78,
+        80,
+        81,
+        82,
+        90,
+        93,
+        109,
+        112,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Threed Green-Wall House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        53,
+        57,
+        62,
+        63,
+        70,
+        71,
+        75,
+        78,
+        82,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Threed Blue-Wall House": [
+        14,
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        67,
+        69,
+        70,
+        71,
+        74,
+        75,
+        78,
+        81,
+        88,
+        90,
+        107,
+        109,
+        112,
+        116,
+        118,
+        120    
+    ],
+    "Pokey's House": [
+        14,
+        38,
+        41,
+        42,
+        44,
+        57,
+        70,
+        71,
+        75,
+        78,
+        90,
+        109,
+        112,
+        115,
+        116,
+        120    
+    ],
+    "Moonside Hospital": [
+        14,
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        71,
+        73,
+        74,
+        75,
+        76,
+        78,
+        80,
+        81,
+        82,
+        88,
+        90,
+        91,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Green-Wall House": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        80,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Blue-Wall House": [
+        38,
+        41,
+        42,
+        43,
+        44,
+        51,
+        53,
+        57,
+        62,
+        63,
+        70,
+        71,
+        75,
+        78,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Seafoam-Wall House": [
+        42,
+        45,
+        50,
+        51,
+        54,
+        56,
+        62,
+        63,
+        66,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Peach-Wall House": [
+        36,
+        42,
+        46,
+        50,
+        55,
+        56,
+        62,
+        65,
+        66,
+        67,
+        71,
+        75,
+        76,
+        78,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Light Blue-Wall House": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        70,
+        71,
+        75,
+        78,
+        79,
+        82,
+        83,
+        85,
+        86,
+        90,
+        104,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Pink-Wall House": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        48,
+        50,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        78,
+        81,
+        88,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett White-Wall House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        48,
+        49,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        67,
+        71,
+        72,
+        73,
+        74,
+        75,
+        76,
+        78,
+        79,
+        81,
+        83,
+        86,
+        87,
+        109,
+        112,
+        116    
+    ],
+    "Hospitals": [
+        41,
+        42,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        68,
+        71,
+        82,
+        88,
+        90,
+        93,
+        107,
+        109,
+        112,
+        115,
+        116,
+        119,
+        120
+    ],
+    "Apple Kid's House": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        69,
+        70,
+        71,
+        75,
+        78,
+        80,
+        81,
+        82,
+        88,
+        90,
+        102,
+        109,
+        116,
+        119,
+        120    
+    ],
+    "Tracy's Room": [
+        38,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        90,
+        109,
+        112,
+        115,
+        116,
+        118,
+        120    
+    ],
+    "Orange Kid's House": [
+        42,
+        47,
+        50,
+        51,
+        54,
+        62,
+        63,
+        70,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Everdred's House": [
+        36,
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        55,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        67,
+        68,
+        70,
+        71,
+        75,
+        76,
+        78,
+        82,
+        83,
+        90,
+        109,
+        112,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Twoson Green-Wall House": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        90,
+        109,
+        112,
+        115,
+        116,
+        120
+    ],
+    "Ness's Room": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        71,
+        75,
+        76,
+        78,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Police Station Backroom": [
+        6,
+        9,
+        14,
+        36,
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        45,
+        46,
+        48,
+        49,
+        50,
+        51,
+        53,
+        55,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        74,
+        75,
+        76,
+        78,
+        79,
+        80,
+        81,
+        82,
+        83,
+        84,
+        85,
+        86,
+        87,
+        88,
+        90,
+        102,
+        103,
+        104,
+        107,
+        109,
+        112,
+        116,
+        118,
+        119,
+        120,
+        128,
+        131,
+        132    
+    ],
+    "Winters": [
+        4,
+        5,
+        7,
+        9,
+        12,
+        13,
+        14,
+        21,
+        22,
+        42,
+        59,
+        60,
+        61,
+        62,
+        63,
+        82,
+        109,
+        116,
+        162    
+    ],
+    "Rainy Circle Sanctuary": [
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        15,
+        17,
+        19,
+        20,
+        21,
+        22,
+        26,
+        27,
+        42,
+        50,
+        51,
+        59,
+        61,
+        62,
+        63,
+        79,
+        86,
+        96,
+        97,
+        101,
+        105,
+        107,
+        108,
+        116,
+        118,
+        123,
+        167    
+    ],
+    "Hospital Rooms": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        81,
+        88,
+        90,
+        109,
+        112,
+        116    
+    ],
+    "Twoson Peach-Wall House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        71,
+        72,
+        75,
+        76,
+        78,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Twoson Pink-Wall House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        78,
+        90,
+        109,
+        112,
+        115,
+        116,
+        120    
+    ],
+    "Twoson Gray-Wall House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        81,
+        109,
+        112,
+        116    
+    ],
+    "Gold Office": [
+        42,
+        47,
+        50,
+        51,
+        57,
+        62,
+        63,
+        67,
+        71,
+        75,
+        78,
+        83,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Happy-Happy Guardhouse": [
+        14,
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        78,
+        81,
+        90,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Happy-Happy Hospital": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        57,
+        58,
+        62,
+        63,
+        67,
+        69,
+        70,
+        71,
+        75,
+        78,
+        81,
+        90,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Happy-Happy Hospital Clear": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        57,
+        58,
+        62,
+        63,
+        67,
+        69,
+        70,
+        71,
+        75,
+        78,
+        81,
+        90,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Onett Town Hall": [
+        14,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        54,
+        57,
+        58,
+        63,
+        66,
+        67,
+        68,
+        70,
+        71,
+        75,
+        83,
+        88,
+        90,
+        100,
+        102,
+        104,
+        105,
+        107,
+        109,
+        112,
+        116,
+        118,
+        120    
+    ],
+    "Onett Hotel Bedrooms": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        78,
+        81,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Fourside Hotel Bedrooms": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        48,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        77,
+        78,
+        81,
+        88,
+        90,
+        102,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Happy-Happy Saturn House": [
+        42,
+        56,
+        62,
+        74,
+        75,
+        90,
+        109,
+        112,
+        116,
+        119,
+        120    
+    ],
+    "Happy-Happy Hotel": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        71,
+        75,
+        78,
+        90,
+        109,
+        112,
+        116    
+    ],
+    "Twoson Hotel Bedrooms": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        70,
+        71,
+        75,
+        76,
+        78,
+        109,
+        112,
+        116,
+        120
+    ],
+    "Threed Hotel Bedrooms": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        48,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        64,
+        65,
+        66,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        75,
+        76,
+        77,
+        78,
+        81,
+        88,
+        90,
+        102,
+        109,
+        112,
+        120
+    ],
+    "Happy-Happy Hotel Clear": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        51,
+        53,
+        56,
+        57,
+        58,
+        62,
+        63,
+        71,
+        75,
+        78,
+        90,
+        109,
+        112,
+        116    
+    ],
+    "Monotoli Building": [
+        38,
+        42,
+        51,
+        57,
+        62,
+        63,
+        79,
+        109,
+        112,
+        116,
+        120
+    ],
+    "Paula's House": [
+        42,
+        51,
+        63,
+        80,
+        109,
+        112,
+        116,
+        118,
+        120    
+    ],
+    "Paula's Room": [
+        38,
+        39,
+        40,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        62,
+        63,
+        66,
+        69,
+        70,
+        71,
+        75,
+        78,
+        81,
+        90,
+        109,
+        112,
+        116,
+        120
+    ],
+    "Ness's House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        50,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        71,
+        82,
+        90,
+        109,
+        112,
+        116    
+    ],
+    "Twoson Hotel": [
+        38,
+        39,
+        41,
+        42,
+        44,
+        50,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        70,
+        71,
+        72,
+        75,
+        83,
+        90,
+        109,
+        112,
+        116,
+        118,
+        120    
+    ],
+    "Threed Hotel": [
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        70,
+        71,
+        75,
+        78,
+        79,
+        83,
+        84,
+        88,
+        90,
+        107,
+        109,
+        112,
+        116,
+        120
+    ],
+    "Fourside Hotel": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        70,
+        71,
+        75,
+        78,
+        79,
+        82,
+        83,
+        85,
+        86,
+        90,
+        104,
+        109,
+        112,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Monotoli Elevators": [
+        6,
+        7,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        22,
+        36,
+        37,
+        41,
+        42,
+        51,
+        53,
+        54,
+        57,
+        58,
+        62,
+        63,
+        67,
+        68,
+        69,
+        70,
+        79,
+        82,
+        83,
+        84,
+        85,
+        86,
+        88,
+        89,
+        90,
+        92,
+        93,
+        98,
+        99,
+        101,
+        102,
+        103,
+        104,
+        105,
+        106,
+        107,
+        109,
+        112,
+        116,
+        119,
+        120,
+        123,
+        127,
+        132,
+        160    
+    ],
+    "Fourside Dept. Store Office": [
+        42,
+        45,
+        50,
+        57,
+        62,
+        66,
+        67,
+        87,
+        88,
+        109,
+        112,
+        116,
+        120,
+        161
+    ],
+    "Onett Library": [
+        39,
+        41,
+        42,
+        43,
+        44,
+        47,
+        50,
+        51,
+        57,
+        58,
+        62,
+        63,
+        70,
+        71,
+        75,
+        78,
+        88,
+        90,
+        102,
+        107,
+        109,
+        112,
+        116,
+        118,
+        120
+    ],
+    "Paula's House Rooms": [
+        42,
+        51,
+        63,
+        89,
+        109,
+        112,
+        115,
+        116,
+        120
+    ],
+    "Onett Police Station": [
+        14,
+        41,
+        42,
+        50,
+        62,
+        63,
+        66,
+        71,
+        75,
+        78,
+        82,
+        90,
+        102,
+        104,
+        105,
+        106,
+        107,
+        109,
+        112,
+        116,
+        119,
+        120    
+    ],
+    "Scaraba": [
+        27,
+        42,
+        47,
+        56,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        91,
+        108,
+        109,
+        112,
+        115,
+        116,
+        118,
+        120,
+        133    
+    ],
+    "Dalaam House": [
+        42,
+        63,
+        91,
+        92,
+        107,
+        109,
+        112,
+        115,
+        116,
+        120
+    ],
+    "Scaraba House": [
+        36,
+        42,
+        47,
+        51,
+        63,
+        93,
+        108,
+        112,
+        116,
+	    120
+    ],
+    "Happy-Happy HQ": [
+        14,
+        21,
+        42,
+        71,
+        74,
+        75,
+        78,
+        85,
+        90,
+        94,
+        107,
+        108,
+        109,
+        110,
+        112,
+        114,
+        115,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Fourside Cafe": [
+        42,
+        74,
+        75,
+        78,
+        90,
+        93,
+        95,
+        96,
+        107,
+        109,
+        111,
+        112,
+        113,
+        114,
+        115,
+        116,
+        118,
+        119,
+        120
+    ],
+    "Moonside Cafe": [
+        14,
+        42,
+        71,
+        75,
+        78,
+        90,
+        93,
+        95,
+        96,
+        107,
+        108,
+        109,
+        111,
+        112,
+        113,
+        114,
+        115,
+        116,
+        118,
+        119,
+        120
+    ],
+    "Scaraba Hospital": [
+        42,
+        44,
+        57,
+        79,
+        97,
+        109,
+        112,
+        116
+    ],
+    "Scaraba Shop": [
+        42,
+        50,
+        53,
+        57,
+        62,
+        71,
+        72,
+        73,
+        76,
+        90,
+        98,
+        104,
+        109,
+        120    
+    ],
+    "Twoson Dept. Store": [
+        13,
+        21,
+        27,
+        42,
+        62,
+        63,
+        99,
+        100,
+        103,
+        104,
+        106,
+        107,
+        109,
+        112,
+        116,
+        121,
+        123,
+        130,
+        132,
+        160    
+    ],
+    "Fourside Dept. Store": [
+        13,
+        21,
+        62,
+        100,
+        107,
+        109,
+	    121,
+        123,
+        160
+    ],
+    "Bakery": [
+        42,
+        99,
+        100,
+        101,
+        103,
+        107,
+        109,
+        112,
+        116,
+        120,
+        160
+    ],
+    "Mach Pizza": [
+        13,
+        19,
+        42,
+        50,
+        102,
+        109,
+        116    
+    ],
+    "Burger Shop": [
+        42,
+        62,
+        103,
+        104,
+        105,
+        106,
+        107,
+        109,
+        112,
+        119,
+        120    
+    ],
+    "Onett Drugstore": [
+        13,
+        99,
+        100,
+        101,
+        104,
+        105,
+        106,
+        109,
+        116,
+        160
+    ],
+    "Threed Drugstore": [
+        13,
+        101,
+        103,
+        104,
+        105,
+        106,
+        109,
+        116,
+        160
+    ],
+    "Winters Drugstore": [
+        13,
+        62,
+        99,
+        100,
+        101,
+        104,
+        105,
+        106,
+        109,
+        122,
+        160    
+    ],
+    "Chaos Theater": [
+        14,
+        42,
+        71,
+        75,
+        78,
+        90,
+        93,
+        96,
+        107,
+        109,
+        112,
+        115,
+        116,
+        118,
+        119,
+        120,
+        130    
+    ],
+    "Fourside Museum": [
+        42,
+        108,
+        109,
+        116
+    ],
+    "Summers Hotel": [
+        14,
+        42,
+        107,
+        109,
+        112,
+        115,
+        116,
+        118,
+        120
+    ],
+    "Summers Shop": [
+        14,
+        42,
+        107,
+        109,
+        110,
+        112,
+        114,
+        115,
+        116,
+        118,
+        120    
+    ],
+    "Snow Wood Boarding School": [
+        14,
+        42,
+        57,
+        71,
+        90,
+        107,
+        109,
+        112,
+        116,
+        120    
+    ],
+    "Summers Harbor House": [
+        42,
+        107,
+        109,
+        112,
+        114,
+        115,
+        116,
+        120
+    ],
+    "Summers Restaurant": [
+        14,
+        42,
+        74,
+        75,
+        78,
+        90,
+        93,
+        107,
+        109,
+        112,
+        113,
+        115,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Moonside Museum": [
+        42,
+        109,
+        112,
+        116,
+        119,
+        120    
+    ],
+    "Stoic Club": [
+        14,
+        41,
+        42,
+        57,
+        70,
+        71,
+        75,
+        78,
+        90,
+        93,
+        95,
+        96,
+        107,
+        109,
+        111,
+        112,
+        114,
+        115,
+        116,
+        117,
+        118,
+        119,
+        120,
+        130
+    ],
+    "Andonuts Lab": [
+        14,
+        41,
+        42,
+        57,
+        75,
+        78,
+        90,
+        93,
+        107,
+        109,
+        112,
+        116,
+        118,
+        119,
+        120    
+    ],
+    "Topolla Theater": [
+        42,
+        75,
+        78,
+        90,
+        93,
+        107,
+        109,
+        112,
+        115,
+        116,
+        119,
+        120    
+    ],
+    "Summers Museum": [
+        42,
+        78,
+        90,
+        107,
+        109,
+        112,
+        115,
+        120
+    ],
+    "Onett Arcade": [
+        14,
+        42,
+        109,
+        112,
+        116,
+        121    
+    ],
+    "Twoson Bus Station": [
+        42,
+        50,
+        51,
+        62,
+        67,
+        71,
+        86,
+        104,
+        118,
+        122,
+        123    
+    ],
+    "Twoson Bike Shop": [
+        13,
+        27,
+        62,
+        91,
+        100,
+        101,
+        103,
+        104,
+        105,
+        106,
+        109,
+        116,
+        123
+    ],
+    "Hint Shop": [
+        14,
+        42,
+        47,
+        51,
+        63,
+        79,
+        80,
+        91,
+        93,
+        94,
+        107,
+        108,
+        109,
+        110,
+        112,
+        114,
+        115,
+        116,
+        118,
+        120,
+        122,
+        124,
+        133,
+        159    
+    ],
+    "Fourside Dept. Store Rooms": [
+        62,
+        90,
+        95,
+        96,
+        102,
+        103,
+        104,
+        105,
+        106,
+        116,
+        161
+    ],
+    "Threed Tent": [
+        26,
+        42,
+        107,
+        109,
+        115,
+        120,
+        126
+    ],
+    "Onett Treehouse": [
+        6,
+        9,
+        36,
+        41,
+        42,
+        62,
+        63,
+        66,
+        67,
+        79,
+        86,
+        93,
+        99,
+        103,
+        104,
+        107,
+        112,
+        116,
+        119,
+        120,
+        127,
+        132,
+        133    
+    ],
+    "Lier's House": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        50,
+        51,
+        53,
+        54,
+        57,
+        58,
+        62,
+        63,
+        68,
+        70,
+        71,
+        82,
+        88,
+        90,
+        102,
+        107,
+        109,
+        112,
+        115,
+        116,
+        120,
+        128,
+        130,
+        132    
+    ],
+    "Run-down House": [
+        14,
+        42,
+        62,
+        109,
+        116,
+        129
+    ],
+    "Paula's Cabin": [
+        42,
+        50,
+        62,
+        82,
+        93,
+        109,
+        112,
+        119,
+        120
+    ],
+    "Dusty Dunes Drugstore": [
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        62,
+        102,
+        107,
+        109,
+        112,
+        131,
+        132    
+    ],
+    "Dusty Dunes Miner Shack": [
+        38,
+        39,
+        41,
+        42,
+        43,
+        44,
+        50,
+        53,
+        57,
+        58,
+        62,
+        68,
+        70,
+        71,
+        74,
+        75,
+        76,
+        82,
+        90,
+        102,
+        107,
+        109,
+        112,
+        116,
+        120,
+        132    
+    ],
+    "Traveler's Shack": [
+        42,
+        63,
+        109,
+        112,
+        115,
+        133
+    ],
+    "Lumine Hall": [
+        134,
+        136,
+        140    
+    ],
+    "Connector Caves": [
+        0,
+        33,
+        34,
+        110,
+        134,
+        135,
+        136,
+        137,
+        140,
+        141,
+        145,
+        149,
+        150,
+        153,
+        154,
+        156,
+        158    
+    ],
+    "Lumine Hall Sanctuary": [
+        110,
+        134,
+        136,
+        137,
+        140,
+        150,
+        153    
+    ],
+    "Fire Spring": [
+        134,
+        136,
+        137,
+        140,
+        150,
+        153
+    ],
+    "Sea of Eden": [
+        42,
+        70,
+        91,
+        107,
+        109,
+        112,
+        115,
+        138    
+    ],
+    "Monkey Caves Treasure Rooms": [
+        139
+    ],
+    "Dungeon Man": [
+        19,
+        42,
+        107,
+        109,
+        110,
+        114,
+        115,
+        116,
+        134,
+        136,
+        140,
+        159    
+    ],
+    "Threed Underground": [
+        1,
+        21,
+        71,
+        75,
+        78,
+        79,
+        80,
+        85,
+        95,
+        97,
+        107,
+        108,
+        109,
+        110,
+        112,
+        114,
+        115,
+        119,
+        120,
+        141,
+        154
+    ],
+    "Lier's Cave": [
+        42,
+        107,
+        109,
+        112,
+        114,
+        115,
+        116,
+        142,
+        146,
+        151,
+        157,
+        159
+    ],
+    "Stonehenge Balcony Room": [
+        5,
+        19,
+        21,
+        42,
+        51,
+        54,
+        57,
+        62,
+        63,
+        80,
+        102,
+        107,
+        109,
+        112,
+        115,
+        120,
+        143,
+        144,
+        146,
+        147,
+        148,
+        157
+    ],
+    "Stonehenge Balcony Off": [
+        5,
+        19,
+        21,
+        42,
+        51,
+        54,
+        57,
+        62,
+        63,
+        80,
+        102,
+        107,
+        109,
+        112,
+        115,
+        120,
+        143,
+        144,
+        146,
+        147,
+        148,
+        157
+    ],
+    "Brickroad Maze": [
+        0,
+        1,
+        4,
+        5,
+        6,
+        7,
+        8,
+        10,
+        14,
+        16,
+        19,
+        20,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        33,
+        41,
+        42,
+        43,
+        45,
+        47,
+        53,
+        57,
+        59,
+        61,
+        62,
+        67,
+        68,
+        69,
+        70,
+        71,
+        75,
+        79,
+        85,
+        91,
+        92,
+        93,
+        96,
+        97,
+        99,
+        100,
+        101,
+        106,
+        108,
+        111,
+        112,
+        113,
+        114,
+        115,
+        116,
+        118,
+        119,
+        126,
+        128,
+        130,
+        133,
+        134,
+        135,
+        136,
+        137,
+        140,
+        141,
+        142,
+        145,
+        146,
+        147,
+        148,
+        149,
+        150,
+        151,
+        152,
+        153,
+        154,
+        156,
+        157,
+        158,
+        159    
+    ],
+    "Rainy Circle": [
+        42,
+        107,
+        109,
+        112,
+        114,
+        115,
+        146
+    ],
+    "Belch's Factory": [
+        5,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        38,
+        42,
+        51,
+        52,
+        54,
+        63,
+        80,
+        88,
+        89,
+        102,
+        107,
+        109,
+        112,
+        115,
+        118,
+        120,
+        143,
+        144,
+        146,
+        147,
+        157,
+        160    
+    ],
+    "Milky Well Caves": [
+        14,
+        38,
+        41,
+        42,
+        57,
+        71,
+        75,
+        78,
+        93,
+        107,
+        109,
+        112,
+        115,
+        119,
+        120,
+        146,
+        148
+    ],
+    "Lilliput Steps": [
+        9,
+        26,
+        41,
+        42,
+        57,
+        71,
+        75,
+        78,
+        79,
+        80,
+        85,
+        86,
+        93,
+        97,
+        107,
+        108,
+        109,
+	    112,
+        115,
+        116,
+	    118,
+        119,
+        120,
+        140,
+        146,
+        148,
+        149,
+        157,
+        158
+    ],
+    "Monkey Caves Hallway": [
+        42,
+        62,
+        79,
+        107,
+        109,
+        110,
+        112,
+        115,
+        116,
+        120,
+        133,
+        134,
+        136,
+        137,
+        140,
+        142,
+        146,
+        150,
+        151,
+        153,
+        157
+    ],
+    "Giant Step": [
+        14,
+        22,
+        25,
+        42,
+        53,
+        62,
+        79,
+        80,
+        107,
+        109,
+        110,
+        112,
+        115,
+        116,
+        124,
+        129,
+        134,
+        136,
+        137,
+        140,
+        142,
+        146,
+        150,
+        151,
+        153,
+        157,
+        159    
+    ],
+    "Pink Cloud": [
+        0,
+        16,
+        19,
+        20,
+        26,
+        27,
+        38,
+        41,
+        42,
+        43,
+        47,
+        59,
+        62,
+        63,
+        67,
+        69,
+        70,
+        71,
+        75,
+        78,
+        79,
+        80,
+        82,
+        85,
+        90,
+        91,
+        93,
+        95,
+        104,
+        105,
+        106,
+        107,
+        108,
+        109,
+        112,
+        113,
+        114,
+        115,
+        118,
+        119,
+        120,
+        124,
+        127,
+        130,
+        133,
+        134,
+        135,
+        136,
+        137,
+        140,
+        141,
+        142,
+        145,
+        146,
+        147,
+        148,
+        149,
+        150,
+        151,
+        152,
+        153,
+        154,
+        155,
+        157,
+        158,
+        159
+    ],
+    "Saturn Caves": [
+        22,
+        42,
+        53,
+        62,
+        79,
+        80,
+        94,
+        107,
+        109,
+        110,
+        112,
+        114,
+        115,
+        116,
+        118,
+        120,
+        133,
+        134,
+        136,
+        137,
+        140,
+        142,
+        146,
+        150,
+        151,
+        153,
+        157    
+    ],
+    "Stonehenge Tunnels": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        13,
+        19,
+        21,
+        26,
+        51,
+        58,
+        62,
+        63,
+        66,
+        67,
+        70,
+        75,
+        79,
+        82,
+        83,
+        84,
+        85,
+        88,
+        89,
+        94,
+        107,
+        111,
+        112,
+        113,
+        115,
+        123,
+        124,
+        126,
+        127,
+        128,
+        129,
+        130,
+        131,
+        132,
+        141,
+        154,
+        159
+    ],
+    "Gold Mine": [
+        42,
+        107,
+        109,
+        112,
+        115,
+        118,
+        119,
+        120,
+        146,
+        157
+    ],
+    "Sewer": [
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        16,
+        18,
+        19,
+        20,
+        21,
+        22,
+        25,
+        26,
+        27,
+        33,
+        34,
+        38,
+        41,
+        42,
+        43,
+        53,
+        57,
+        58,
+        62,
+        63,
+        67,
+        68,
+        70,
+        71,
+        75,
+        81,
+        84,
+        85,
+        86,
+        89,
+        90,
+        91,
+        92,
+        93,
+        96,
+        97,
+        101,
+        103,
+        104,
+        105,
+        106,
+        107,
+        108,
+        109,
+        112,
+        113,
+        115,
+        116,
+        118,
+        119,
+        120,
+        122,
+        123,
+        126,
+        127,
+        128,
+        130,
+        140,
+        146,
+        147,
+        148,
+        149,
+        157,
+        158,
+        160,
+        164    
+    ],
+    "Tenda Village": [
+        21,
+        42,
+        71,
+        75,
+        78,
+        80,
+        93,
+        107,
+        108,
+        109,
+        112,
+        114,
+        115,
+        116,
+        118,
+        120,
+        133,
+        159    
+    ],
+    "Fourside Dept. Store Blackout": [
+        13,
+        21,
+        62,
+        100,
+        107,
+        109,
+	    121,
+        123,
+        160
+    ],
+    "Fourside Dept. Store Blackout Rooms": [
+        42,
+        50,
+        62,
+        104,
+        112,
+        116,
+        161
+    ],
+    "Magicant Manly Fish": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Magicant Ness": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Magicant Rabbit": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Magicant Belch": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ],
+    "Magicant Mom": [
+        15,
+        42,
+        63,
+        79,
+        89,
+        97,
+        112,
+        115,
+        116,
+        118,
+        162,
+        163,
+        164,
+        165,
+        166,
+        167    
+    ]
+}
+
+ugly_palettes = {
+    "Pyramid": [
+        1,
+        3,
+        5,
+        7,
+        8,
+        9,
+        13,
+        14,
+        15,
+        19,
+        21,
+        22,
+        35,
+        49,
+        56,
+        58,
+        59,
+        60,
+        61,
+        63,
+        71,
+        74,
+        83,
+        86,
+        89,
+        91,
+        97,
+        102,
+        104,
+        105,
+        108,
+        115,
+        116,
+        117,
+        120,
+        123,
+        126,
+        127,
+        134,
+        166    
+    ],
+    "Lost Underworld": [
+        0,
+        8,
+        14,
+        15,
+        21,
+        33,
+        34,
+        38,
+        41,
+        42,
+        50,
+        53,
+        58,
+        59,
+        63,
+        65,
+        69,
+        82,
+        83,
+        87,
+        90,
+        95,
+        97,
+        104,
+        105,
+        118,
+        120,
+        123,
+        126,
+        127,
+        128,
+        129,
+        131,
+        136,
+        140,
+        159,
+        160    
+    ],
+    "Cave of the Past": [
+        4,
+        5,
+        13,
+        16,
+        18,
+        19,
+        22,
+        33,
+        38,
+        39,
+        44,
+        47,
+        51,
+        57,
+        63,
+        67,
+        68,
+        70,
+        75,
+        78,
+        82,
+        87,
+        91,
+        97,
+        111,
+        114,
+        121,
+        128,
+        131,
+        134,
+        136,
+        141,
+        150,
+        153,
+        156,
+        161    
+    ],
+    "Giygas's Lair": [
+        5,
+        6,
+        10,
+        11,
+        12,
+        26,
+        31,
+        34,
+        58,
+        62,
+        63,
+        79,
+        82,
+        95,
+        99,
+        107,
+        117,
+        124,
+        129,
+        131,
+        154    
+    ],
+    "Onett": [
+        0,
+        1,
+        2,
+        6,
+        8,
+        26,
+        27,
+        38,
+        41,
+        43,
+        51,
+        53,
+        59,
+        61,
+        62,
+        63,
+        70,
+        82,
+        83,
+        91,
+        92,
+        93,
+        99,
+        104,
+        108,
+        112,
+        120,
+        126,
+        130,
+        132,
+        133    
+    ],
+    "Twoson": [
+        6,
+        8,
+        10,
+        19,
+        21,
+        38,
+        47,
+        51,
+        57,
+        82,
+        91,
+        96,
+        104    
+    ],
+    "Happy-Happy Village": [
+        10,
+        19,
+        53,
+        61,
+        63,
+        89,
+        107,
+        109,
+        112,
+        116,
+        124,
+        130,
+        133    
+    ],
+    "Happy-Happy Clear": [
+        10,
+        19,
+        53,
+        61,
+        63,
+        89,
+        107,
+        109,
+        112,
+        116,
+        124,
+        130,
+        133    
+    ],
+    "Tunnel Outdoors": [
+        0,
+        2,
+        27,
+        33,
+        34,
+        38,
+        39,
+        41,
+        43,
+        47,
+        51,
+        57,
+        58,
+        61,
+        67,
+        70,
+        71,
+        91,
+        93,
+        99,
+        100,
+        101,
+        108,
+        112,
+        113,
+        121,
+        126,
+        127,
+        129,
+        134,
+        136,
+        140,
+        156,
+        160,
+        164    
+    ],
+    "Threed": [
+        8,
+        10,
+        19,
+        21,
+        22,
+        26,
+        47,
+        59,
+        63,
+        104,
+        105,
+        107,
+        109,
+        112,
+        133    
+    ],
+    "Threed Daytime": [
+        8,
+        10,
+        19,
+        21,
+        22,
+        26,
+        47,
+        59,
+        63,
+        104,
+        105,
+        107,
+        109,
+        112,
+        133    
+    ],
+    "Fourside": [
+        7,
+        8,
+        21,
+        22,
+        53,
+        54,
+        57,
+        59,
+        62,
+        104,
+        105,
+        106,
+        107,
+        131,
+        132,
+        133,
+        162    
+    ],
+    "Moonside": [
+        8,
+        10,
+        39,
+        41,
+        54,
+        59,
+        61,
+        64,
+        67,
+        81,
+        107,
+        132,
+        163,
+        164    
+    ],
+    "Magicant": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ],
+    "Tunnels": [
+        2,
+        4,
+        5,
+        7,
+        13,
+        27,
+        34,
+        35,
+        42,
+        52,
+        53,
+        54,
+        58,
+        66,
+        69,
+        74,
+        79,
+        80,
+        87,
+        91,
+        93,
+        107,
+        113,
+        114,
+        115,
+        118,
+        121,
+        127,
+        133,
+        162,
+        164    
+    ],
+    "Magicant Interiors": [
+        29,
+        36,
+        37,
+        43,
+        50,
+        59,
+        63,
+        64,
+        67,
+        74,
+        78,
+        83,
+        97,
+        98,
+        126    
+    ],
+    "Tents": [
+        4,
+        5,
+        6,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        17,
+        19,
+        22,
+        26,
+        32,
+        38,
+        39,
+        41,
+        43,
+        44,
+        45,
+        47,
+        52,
+        53,
+        54,
+        57,
+        58,
+        59,
+        61,
+        62,
+        66,
+        68,
+        70,
+        75,
+        78,
+        81,
+        88,
+        100,
+        101,
+        102,
+        103,
+        108,
+        112,
+        113,
+        119,
+        120,
+        126,
+        128,
+        133,
+        162    
+    ],
+    "Peaceful Rest Valley": [
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        25,
+        38,
+        39,
+        47,
+        59,
+        61,
+        79,
+        91,
+        101,
+        105,
+        107,
+        109,
+        112    
+    ],
+    "Grapefruit Falls": [
+        2,
+        6,
+        10,
+        15,
+        26,
+        27,
+        47,
+        57,
+        59,
+        61,
+        79,
+        90,
+        91,
+        94,
+        99,
+        107,
+        108,
+        146    
+    ],
+    "Saturn Valley": [
+        8,
+        10,
+        19,
+        61,
+        62,
+        89,
+        105,
+        107,
+        109,
+        112,
+        164    
+    ],
+    "Deep Darkness": [
+        4,
+        5,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        19,
+        26,
+        27,
+        41,
+        44,
+        61,
+        63,
+        70,
+        71,
+        82,
+        106,
+        107,
+        109,
+        115,
+        129    
+    ],
+    "Lilliput Steps Sanctuary": [
+        10,
+        51,
+        57,
+        58,
+        71,
+        92,
+        94,
+        107,
+        109    
+    ],
+    "Milky Well": [
+        10,
+        11,
+        19,
+        51,
+        58,
+        61,
+        71,
+        82,
+        107,
+        146    
+    ],
+    "Deep Darkness Darkness": [
+        25    
+    ],
+    "Summers": [
+        4,
+        5,
+        19,
+        21,
+        38,
+        41,
+        43,
+        50,
+        51,
+        58,
+        61,
+        63,
+        70,
+        71,
+        80,
+        89,
+        104    
+    ],
+    "Dusty Dunes Desert": [
+        5,
+        14,
+        15,
+        19,
+        21,
+        22,
+        26,
+        41,
+        43,
+        44,
+        50,
+        65,
+        67,
+        70,
+        82,
+        83,
+        91,
+        99,
+        100,
+        105,
+        106,
+        108,
+        118,
+        164,
+        165,
+        167    
+    ],
+    "The Sky": [
+        30,
+        63,
+        64,
+        136,
+        164    
+    ],
+    "Dalaam": [
+        4,
+        5,
+        9,
+        13,
+        36,
+        47,
+        48,
+        50,
+        56,
+        64,
+        65,
+        66,
+        68,
+        70,
+        73,
+        78,
+        81,
+        82,
+        89,
+        105,
+        112,
+        126,
+        160    
+    ],
+    "Dalaam Palace": [
+        0,
+        1,
+        2,
+        19,
+        21,
+        22,
+        25,
+        36,
+        42,
+        59,
+        62,
+        63,
+        67,
+        68,
+        69,
+        70,
+        75,
+        82,
+        85,
+        86,
+        90,
+        92,
+        93,
+        94,
+        95,
+        116,
+        126,
+        131,
+        140,
+        141,
+        160    
+    ],
+    "Cave of the Present": [
+        14,
+        22,
+        25,
+        39,
+        73,
+        97,
+        100,
+        105,
+        106,
+        110,
+        132    
+    ],
+    "Pink Cloud Sanctuary": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        12,
+        13,
+        50,
+        56,
+        57,
+        64,
+        68,
+        72,
+        80,
+        81,
+        82,
+        83,
+        91,
+        102,
+        104,
+        105,
+        106,
+        111,
+        112,
+        115,
+        118,
+        121,
+        126,
+        129    
+    ],
+    "The Sea": [
+        6,
+        41,
+        44,
+        63,
+        70,
+        75,
+        78,
+        79,
+        86,
+        90,
+        115,
+        120    
+    ],
+    "Monotoli Offices": [
+        9,
+        11,
+        13,
+        14,
+        19,
+        21,
+        27,
+        36,
+        37,
+        40,
+        43,
+        44,
+        47,
+        48,
+        52,
+        54,
+        55,
+        64,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        72,
+        73,
+        74,
+        75,
+        77,
+        78,
+        81,
+        83,
+        91,
+        105,
+        106,
+        115,
+        118,
+        130,
+        131,
+        132    
+    ],
+    "Onett Hotel": [
+        13,
+        27,
+        37,
+        38,
+        39,
+        40,
+        41,
+        43,
+        46,
+        47,
+        49,
+        50,
+        52,
+        53,
+        54,
+        56,
+        64,
+        66,
+        67,
+        68,
+        72,
+        73,
+        75,
+        76,
+        81,
+        83,
+        84,
+        88,
+        89,
+        100,
+        101    
+    ],
+    "Threed Red-Wall House": [
+        47,
+        54,
+        67,
+        68,
+        69,
+        83,
+        102,
+        105,
+        106,
+        107    
+    ],
+    "Electra's Room": [
+        21,
+        27,
+        35,
+        36,
+        37,
+        51,
+        52,
+        67,
+        83,
+        88,
+        91,
+        102,
+        103,
+        104,
+        107,
+        130    
+    ],
+    "Threed Green-Wall House": [
+        14,
+        40,
+        47,
+        51,
+        67,
+        88,
+        107,
+        115    
+    ],
+    "Threed Blue-Wall House": [
+        13,
+        21,
+        27,
+        68,
+        82,
+        83,
+        93,
+        99,
+        100,
+        104,
+        105,
+        119,
+        130    
+    ],
+    "Pokey's House": [
+        27,
+        40,
+        43,
+        47,
+        52,
+        53,
+        54,
+        56,
+        58,
+        62,
+        63,
+        69,
+        81,
+        83,
+        88,
+        99,
+        102,
+        104,
+        106,
+        107,
+        118,
+        119,
+        121,
+        130    
+    ],
+    "Moonside Hospital": [
+        7,
+        9,
+        10,
+        12,
+        13,
+        22,
+        26,
+        27,
+        37,
+        72,
+        83,
+        89,
+        93,
+        102,
+        103,
+        104,
+        105,
+        106,
+        107,
+        115,
+        118,
+        119    
+    ],
+    "Onett Green-Wall House": [
+        13,
+        14,
+        27,
+        47,
+        54,
+        67,
+        68,
+        69,
+        74,
+        81,
+        82,
+        91,
+        99,
+        104,
+        106,
+        107,
+        119,
+        126,
+        130    
+    ],
+    "Onett Blue-Wall House": [
+        27,
+        37,
+        39,
+        40,
+        47,
+        50,
+        52,
+        54,
+        56,
+        58,
+        67,
+        68,
+        74,
+        82,
+        89,
+        90,
+        91,
+        115    
+    ],
+    "Onett Seafoam-Wall House": [
+        14,
+        27,
+        37,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        49,
+        52,
+        53,
+        57,
+        58,
+        67,
+        70,
+        71,
+        74,
+        75,
+        78,
+        79,
+        81,
+        83,
+        88,
+        90,
+        91    
+    ],
+    "Onett Peach-Wall House": [
+        14,
+        27,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        48,
+        49,
+        51,
+        52,
+        53,
+        54,
+        57,
+        58,
+        63,
+        64,
+        68,
+        70,
+        72,
+        73,
+        74,
+        81,
+        83,
+        87,
+        88,
+        89,
+        91,
+        102,
+        104,
+        107    
+    ],
+    "Onett Light Blue-Wall House": [
+        14,
+        27,
+        37,
+        45,
+        69,
+        88,
+        91,
+        115    
+    ],
+    "Onett Pink-Wall House": [
+        14,
+        27,
+        36,
+        37,
+        67,
+        74,
+        80,
+        82,
+        83,
+        89,
+        91,
+        104,
+        105,
+        106,
+        107    
+    ],
+    "Onett White-Wall House": [
+        14,
+        21,
+        36,
+        37,
+        40,
+        45,
+        46,
+        52,
+        55,
+        68,
+        69,
+        70,
+        85,
+        88,
+        89,
+        90,
+        91,
+        101,
+        102,
+        104,
+        107    
+    ],
+    "Hospitals": [
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        22,
+        38,
+        39,
+        43,
+        50,
+        54,
+        70,
+        91,
+        102,
+        103,
+        104,
+        105,
+        106
+    ],
+    "Apple Kid's House": [
+        4,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        14,
+        27,
+        36,
+        37,
+        74,
+        93,
+        99,
+        100,
+        103,
+        104,
+        106,
+        107,
+        112,
+        115,
+        128    
+    ],
+    "Tracy's Room": [
+        14,
+        27,
+        39,
+        40,
+        47,
+        48,
+        67,
+        69,
+        74,
+        80,
+        81,
+        82,
+        83,
+        88,
+        91,
+        99,
+        100,
+        102,
+        103,
+        104,
+        105    
+    ],
+    "Orange Kid's House": [
+        14,
+        27,
+        37,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        48,
+        52,
+        53,
+        56,
+        57,
+        58,
+        66,
+        69,
+        71,
+        75,
+        78,
+        81,
+        83,
+        88,
+        91,
+        102,
+        105,
+        106,
+        115    
+    ],
+    "Everdred's House": [
+        14,
+        26,
+        27,
+        37,
+        40,
+        47,
+        72,
+        73,
+        88,
+        89,
+        91,
+        93,
+        102,
+        104,
+        107,
+        115,
+        121    
+    ],
+    "Twoson Green-Wall House": [
+        13,
+        14,
+        27,
+        52,
+        67,
+        69,
+        74,
+        81,
+        88,
+        104,
+        105,
+        106
+    ],
+    "Ness's Room": [
+        14,
+        27,
+        36,
+        40,
+        47,
+        54,
+        55,
+        67,
+        70,
+        72,
+        73,
+        74,
+        82,
+        88,
+        90,
+        102,
+        107,
+        115,
+        119    
+    ],
+    "Police Station Backroom": [
+        2,
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        35,
+        37,
+        40,
+        47,
+        52,
+        54,
+        77,
+        89,
+        91,
+        99,
+        100,
+        101,
+        105,
+        106,
+        115,
+        121,
+        130    
+    ],
+    "Winters": [
+        8,
+        11,
+        15,
+        19,
+        20,
+        26,
+        27,
+        32,
+        37,
+        38,
+        39,
+        41,
+        47,
+        50,
+        51,
+        52,
+        53,
+        54,
+        57,
+        58,
+        65,
+        67,
+        69,
+        71,
+        75,
+        78,
+        80,
+        81,
+        87,
+        88,
+        91,
+        93,
+        104,
+        107,
+        108,
+        112,
+        115,
+        119,
+        121,
+        129,
+        131,
+	    146,
+        160,
+        161,
+        163,
+        164,
+        166    
+    ],
+    "Rainy Circle Sanctuary": [
+        4,
+        18,
+        32,
+        35,
+        36,
+        37,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        52,
+        53,
+        56,
+        57,
+        58,
+        64,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        71,
+        73,
+        74,
+        75,
+        76,
+        77,
+        78,
+        80,
+        81,
+        82,
+        83,
+        85,
+        87,
+        91,
+        98,
+        104,
+        111,
+        121    
+    ],
+    "Hospital Rooms": [
+        14,
+        27,
+        37,
+        40,
+        51,
+        52,
+        68,
+        69,
+        80,
+        82,
+        83,
+        91,
+        102,
+        103,
+        104,
+        105,
+        106,
+        115,
+        119    
+    ],
+    "Twoson Peach-Wall House": [
+        14,
+        27,
+        36,
+        37,
+        40,
+        47,
+        52,
+        54,
+        55,
+        67,
+        68,
+        70,
+        73,
+        74,
+        82,
+        83,
+        88,
+        89,
+        91,
+        98,
+        102    
+    ],
+    "Twoson Pink-Wall House": [
+        14,
+        36,
+        40,
+        47,
+        52,
+        54,
+        67,
+        69,
+        74,
+        81,
+        88,
+        89,
+        91,
+        107,
+        118    
+    ],
+    "Twoson Gray-Wall House": [
+        14,
+        27,
+        37,
+        40,
+        52,
+        54,
+        67,
+        69,
+        74,
+        82,
+        88,
+        90,
+        104,
+        106,
+        118,
+        120    
+    ],
+    "Gold Office": [
+        14,
+        27,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        52,
+        53,
+        54,
+        56,
+        58,
+        66,
+        68,
+        69,
+        70,
+        74,
+        89,
+        107    
+    ],
+    "Happy-Happy Guardhouse": [
+        36,
+        37,
+        40,
+        48,
+        52,
+        55,
+        67,
+        74,
+        80,
+        88,
+        89,
+        91,
+        102,
+        105,
+        106,
+        107    
+    ],
+    "Happy-Happy Hospital": [
+        14,
+        27,
+        37,
+        52,
+        56,
+        66,
+        68,
+        82,
+        88,
+        93,
+        99,
+        100,
+        103,
+        104,
+        106,
+        130    
+    ],
+    "Happy-Happy Hospital Clear": [
+        14,
+        27,
+        37,
+        52,
+        56,
+        66,
+        68,
+        82,
+        88,
+        93,
+        99,
+        100,
+        103,
+        104,
+        106,
+        130    
+    ],
+    "Onett Town Hall": [
+        13,
+        27,
+        38,
+        40,
+        47,
+        52,
+        56,
+        69,
+        74,
+        80,
+        81,
+        82,
+        89,
+        91,
+        103    
+    ],
+    "Onett Hotel Bedrooms": [
+        14,
+        27,
+        36,
+        37,
+        40,
+        48,
+        52,
+        67,
+        69,
+        74,
+        83,
+        89,
+        90,
+        91,
+        104,
+        105    
+    ],
+    "Fourside Hotel Bedrooms": [
+        9,
+        14,
+        36,
+        37,
+        40,
+        52,
+        67,
+        104,
+        105,
+        106,
+        107,
+        115,
+        128,
+        132    
+    ],
+    "Happy-Happy Saturn House": [
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        57,
+        63,
+        66,
+        67,
+        70,
+        71,
+        78,
+        81,
+        82,
+        88,
+        91,
+        102,
+        103,
+        107,
+        115    
+    ],
+    "Happy-Happy Hotel": [
+        14,
+        40,
+        47,
+        52,
+        54,
+        67,
+        70,
+        89,
+        91,
+        104,
+        105,
+        106,
+        115,
+        120    
+    ],
+    "Twoson Hotel Bedrooms": [
+        27,
+        36,
+        37,
+        40,
+        47,
+        48,
+        52,
+        54,
+        67,
+        72,
+        73,
+        81,
+        83,
+        88,
+        89,
+        90,
+        91,
+        115
+    ],
+    "Threed Hotel Bedrooms": [
+        14,
+        40,
+        47,
+        52,
+        67,
+        74,
+        104,
+        106,
+        115,
+        116
+    ],
+    "Happy-Happy Hotel Clear": [
+        14,
+        40,
+        47,
+        52,
+        54,
+        67,
+        70,
+        89,
+        91,
+        104,
+        105,
+        106,
+        115,
+        120    
+    ],
+    "Monotoli Building": [
+        14,
+        21,
+        27,
+        37,
+        40,
+        41,
+        43,
+        44,
+        45,
+        50,
+        53,
+        54,
+        56,
+        58,
+        66,
+        67,
+        70,
+        71,
+        75,
+        78,
+        82,
+        83,
+        85,
+        86,
+        89,
+        90,
+        104,
+        105,
+        106,
+        107,
+        115
+    ],
+    "Paula's House": [
+        27,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        50,
+        53,
+        56,
+        57,
+        62,
+        64,
+        65,
+        66,
+        67,
+        68,
+        69,
+        70,
+        71,
+        72,
+        73,
+        74,
+        75,
+        76,
+        78,
+        81,
+        83,
+        88,
+        89,
+        90,
+        91,
+        93,
+        98,
+        102,
+        103,
+        104,
+        107,
+        115    
+    ],
+    "Paula's Room": [
+        14,
+        27,
+        37,
+        68,
+        80,
+        82,
+        88,
+        91,
+        102,
+        107
+    ],
+    "Ness's House": [
+        14,
+        26,
+        27,
+        37,
+        40,
+        52,
+        54,
+        69,
+        70,
+        83,
+        88,
+        104,
+        105,
+        106,
+        107,
+        115,
+        120
+    ],
+    "Twoson Hotel": [
+        14,
+        40,
+        43,
+        47,
+        52,
+        54,
+        56,
+        66,
+        68,
+        78,
+        82,
+        88,
+        104,
+        107    
+    ],
+    "Threed Hotel": [
+        6,
+        13,
+        14,
+        27,
+        38,
+        40,
+        69,
+        85,
+        86,
+        100,
+        101,
+        104,
+        105,
+        106,
+        118,
+        160
+    ],
+    "Fourside Hotel": [
+        14,
+        35,
+        37,
+        40,
+        54,
+        69,
+        89,
+        93,
+        105,
+        106,
+        107    
+    ],
+    "Monotoli Elevators": [
+        4,
+        5,
+        8,
+        14,
+        21,
+        26,
+        27,
+        35,
+        38,
+        39,
+        40,
+        43,
+        49,
+        50,
+        52,
+        59,
+        61,
+        64,
+        65,
+        66,
+        71,
+        72,
+        73,
+        74,
+        75,
+        76,
+        77,
+        78,
+        80,
+        81,
+        87,
+        91,
+        97,
+        100,
+        115,
+        117,
+        118,
+        122,
+        131,
+        163,
+        164,
+        165    
+    ],
+    "Fourside Dept. Store Office": [
+        14,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        51,
+        53,
+        54,
+        63,
+        68,
+        70,
+        71,
+        75,
+        78,
+        81,
+        82,
+        90,
+        91,
+        118
+    ],
+    "Onett Library": [
+        12,
+        13,
+        14,
+        27,
+        38,
+        40,
+        52,
+        53,
+        54,
+        56,
+        66,
+        67,
+        74,
+        81,
+        104,
+        105,
+        106
+    ],
+    "Paula's House Rooms": [
+        14,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        50,
+        52,
+        54,
+        57,
+        58,
+        62,
+        67,
+        68,
+        70,
+        71,
+        74,
+        75,
+        78,
+        81,
+        83,
+        102,
+        104,
+        105,
+        106
+    ],
+    "Onett Police Station": [
+        37,
+        38,
+        39,
+        40,
+        43,
+        44,
+        47,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        67,
+        68,
+        69,
+        70,
+        74,
+        80,
+        81,
+        83,
+        88,
+        89,
+        91,
+        93,
+        99,
+        100,
+        103,
+        114,
+        115,
+        117,
+        121    
+    ],
+    "Scaraba": [
+        5,
+        7,
+        9,
+        10,
+        14,
+        19,
+        21,
+        22,
+        26,
+        41,
+        44,
+        51,
+        52,
+        53,
+        54,
+        57,
+        58,
+        62,
+        67,
+        68,
+        74,
+        93,
+        104,
+        121,
+        130    
+    ],
+    "Dalaam House": [
+        14,
+        27,
+        38,
+        40,
+        41,
+        43,
+        44,
+        47,
+        50,
+        51,
+        54,
+        57,
+        58,
+        62,
+        66,
+        67,
+        71,
+        74,
+        75,
+        78,
+        81,
+        88,
+        89,
+        93,
+        102,
+        104,
+        105,
+        106
+    ],
+    "Scaraba House": [
+        41,
+        44,
+        50,
+        56,
+        62,
+        66,
+        67,
+        71,
+        75,
+        76,
+        78,
+        81,
+        91,
+        98,
+        115
+    ],
+    "Happy-Happy HQ": [
+        6,
+        8,
+        9,
+        11,
+        13,
+        22,
+        27,
+        38,
+        41,
+        43,
+        44,
+        57,
+        62,
+        63,
+        68,
+        70,
+        79,
+        80,
+        86,
+        88,
+        91,
+        93,
+        97,
+        104,
+        105,
+        106,
+        117,
+        130,
+        133    
+    ],
+    "Fourside Cafe": [
+        14,
+        21,
+        41,
+        43,
+        44,
+        47,
+        51,
+        54,
+        57,
+        62,
+        63,
+        71,
+        82,
+        108
+    ],
+    "Moonside Cafe": [
+        38,
+        41,
+        57,
+        62,
+        63,
+        67,
+        70,
+        91
+    ],
+    "Scaraba Hospital": [
+        26,
+        38,
+        41,
+        47,
+        54,
+        56,
+        58,
+        62,
+        63,
+        66,
+        67,
+        71,
+        75,
+        78,
+        80,
+        82,
+        85,
+        86,
+        90,
+        107,
+        115,
+        120,
+        130
+    ],
+    "Scaraba Shop": [
+        26,
+        38,
+        41,
+        44,
+        47,
+        54,
+        56,
+        63,
+        64,
+        74,
+        78,
+        106,
+        107,
+        116    
+    ],
+    "Twoson Dept. Store": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        14,
+        19,
+        22,
+        26,
+        40,
+        41,
+        47,
+        50,
+        51,
+        58,
+        59,
+        70,
+        75,
+        78,
+        82,
+        83,
+        88,
+        90,
+        91,
+        93,
+        105,
+        115,
+        120,
+        163    
+    ],
+    "Fourside Dept. Store": [
+        9,
+        19,
+        27,
+        42,
+        47,
+        50,
+        51,
+        58,
+        59,
+        63,
+        70,
+        71,
+        75,
+        78,
+        88,
+        90,
+        91,
+        99,
+        102,
+        103,
+        104,
+        105,
+        106,
+        112,
+        115,
+        120
+    ],
+    "Bakery": [
+        9,
+        14,
+        41,
+        58,
+        62,
+        63,
+        67,
+        75,
+        78,
+        79,
+        80,
+        82,
+        83,
+        85,
+        86,
+        88,
+        89,
+        90,
+        93,
+        102,
+        104,
+        105,
+        106,
+        108,
+        115,
+        119,
+        121,
+        122,
+        123
+    ],
+    "Mach Pizza": [
+        14,
+        21,
+        27,
+        40,
+        41,
+        58,
+        62,
+        70,
+        71,
+        75,
+        90,
+        91,
+        100,
+        103,
+        105,
+        106,
+        107,
+        112,
+        120,
+        132,
+        160    
+    ],
+    "Burger Shop": [
+        7,
+        13,
+        22,
+        27,
+        41,
+        47,
+        50,
+        51,
+        54,
+        58,
+        63,
+        67,
+        70,
+        71,
+        78,
+        88,
+        90,
+        93,
+        99,
+        100,
+        102,
+        116,
+        118,
+        132    
+    ],
+    "Onett Drugstore": [
+        14,
+        41,
+        42,
+        62,
+        67,
+        70,
+        75,
+        78,
+        79,
+        82,
+        86,
+        103,
+        112,
+        120
+    ],
+    "Threed Drugstore": [
+        9,
+        14,
+        42,
+        62,
+        67,
+        79,
+        82,
+        85,
+        86,
+        88,
+        99,
+        100,
+        107,
+        112,
+        120,
+        123
+    ],
+    "Winters Drugstore": [
+        9,
+        14,
+        41,
+        42,
+        50,
+        51,
+        58,
+        79,
+        85,
+        86,
+        88,
+        90,
+        103,
+        107,
+        112,
+        115,
+        116,
+        123    
+    ],
+    "Chaos Theater": [
+        38,
+        41,
+        43,
+        57,
+        88,
+        114,
+        121,
+        133    
+    ],
+    "Fourside Museum": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        38,
+        41,
+        47,
+        57,
+        62,
+        63,
+        66,
+        70,
+        71,
+        75,
+        78,
+        82,
+        93,
+        99,
+        100,
+        104,
+        105,
+        106,
+        111,
+        112,
+        114,
+        115,
+        117,
+        118,
+        119,
+        120,
+        130
+    ],
+    "Summers Hotel": [
+        38,
+        41,
+        57,
+        62,
+        63,
+        67,
+        70,
+        71,
+        75,
+        78,
+        91,
+        133
+    ],
+    "Summers Shop": [
+        57,
+        62,
+        63,
+        71,
+        78,
+        79,
+        86,
+        93,
+        94,
+        101,
+        133    
+    ],
+    "Snow Wood Boarding School": [
+        26,
+        38,
+        41,
+        43,
+        44,
+        62,
+        70,
+        75,
+        78,
+        115,
+        118,
+        119    
+    ],
+    "Summers Harbor House": [
+        22,
+        41,
+        44,
+        62,
+        63,
+        71,
+        74,
+        75,
+        78,
+        91,
+        118,
+        133
+    ],
+    "Summers Restaurant": [
+        22,
+        38,
+        41,
+        57,
+        71,
+        80,
+        96,
+        103,
+        111,
+        130,
+        133    
+    ],
+    "Moonside Museum": [
+        14,
+        38,
+        41,
+        43,
+        44,
+        52,
+        53,
+        54,
+        57,
+        62,
+        63,
+        66,
+        70,
+        71,
+        74,
+        75,
+        78,
+        88,
+        90,
+        93,
+        96,
+        105,
+        106,
+        107,
+        115    
+    ],
+    "Stoic Club": [
+        8,
+        9,
+        27,
+        38,
+        44,
+        47,
+        53,
+        62,
+        63,
+        67,
+        69,
+        88,
+        91,
+        104,
+        106,
+        113
+    ],
+    "Andonuts Lab": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        21,
+        26,
+        38,
+        43,
+        47,
+        53,
+        62,
+        63,
+        69,
+        70,
+        71,
+        91,
+        100,
+        103,
+        104,
+        105,
+        106,
+        121    
+    ],
+    "Topolla Theater": [
+        14,
+        22,
+        38,
+        41,
+        44,
+        57,
+        63,
+        70,
+        71,
+        74,
+        91,
+        96,
+        118    
+    ],
+    "Summers Museum": [
+        8,
+        9,
+        14,
+        21,
+        38,
+        41,
+        44,
+        57,
+        62,
+        71,
+        75,
+        88,
+        116
+    ],
+    "Onett Arcade": [
+        9,
+        21,
+        22,
+        27,
+        41,
+        50,
+        51,
+        53,
+        54,
+        62,
+        102,
+        104,
+        106,
+        107,
+        130    
+    ],
+    "Twoson Bus Station": [
+        22,
+        63,
+        66,
+        79,
+        90,
+        99,
+        100,
+        103,
+        105,
+        106,
+        109,
+        116,
+        119    
+    ],
+    "Twoson Bike Shop": [
+        9,
+        12,
+        42,
+        47,
+        58,
+        79,
+        99,
+        107,
+        112,
+        115,
+        119,
+        120,
+        121,
+        126,
+        160
+    ],
+    "Hint Shop": [
+        4,
+        5,
+        11,
+        12,
+        26,
+        27,
+        38,
+        40,
+        41,
+        43,
+        44,
+        52,
+        54,
+        57,
+        58,
+        62,
+        66,
+        67,
+        71,
+        74,
+        75,
+        81,
+        84,
+        85,
+        97,
+        99,
+        101,
+        102,
+        103,
+        104,
+        105,
+        106,
+        111,
+        121,
+        123,
+        126,
+        134    
+    ],
+    "Fourside Dept. Store Rooms": [
+        7,
+        10,
+        27,
+        37,
+        41,
+        47,
+        50,
+        51,
+        54,
+        56,
+        58,
+        63,
+        68,
+        70,
+        71,
+        88,
+        107,
+        108,
+        109,
+        112,
+        117,
+        119,
+        120
+    ],
+    "Threed Tent": [
+        7,
+        9,
+        10,
+        11,
+        12,
+        13,
+        51,
+        59,
+        68,
+        80,
+        93,
+        99,
+        100,
+        104,
+        105,
+        106,
+        112,
+        118
+    ],
+    "Onett Treehouse": [
+        19,
+        21,
+        22,
+        35,
+        37,
+        38,
+        43,
+        44,
+        51,
+        54,
+        56,
+        58,
+        64,
+        65,
+        68,
+        70,
+        71,
+        74,
+        78,
+        83,
+        84,
+        85,
+        89,
+        91,
+        92,
+        98,
+        100,
+        102,
+        105,
+        106,
+        108,
+        109,
+        118,
+        123,
+        128,
+        131    
+    ],
+    "Lier's House": [
+        11,
+        14,
+        27,
+        36,
+        44,
+        47,
+        48,
+        52,
+        64,
+        65,
+        66,
+        67,
+        69,
+        72,
+        73,
+        74,
+        75,
+        76,
+        77,
+        78,
+        80,
+        81,
+        83,
+        89,
+        103,
+        104,
+        105,
+        106    
+    ],
+    "Run-down House": [
+        38,
+        43,
+        44,
+        47,
+        50,
+        51,
+        53,
+        54,
+        56,
+        57,
+        58,
+        63,
+        70,
+        71,
+        74,
+        75,
+        78,
+        81,
+        82,
+        90,
+        91,
+        93,
+        108,
+        112,
+        120,
+        130,
+        133
+    ],
+    "Paula's Cabin": [
+        21,
+        27,
+        35,
+        38,
+        39,
+        40,
+        41,
+        43,
+        47,
+        51,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        63,
+        66,
+        71,
+        80,
+        81,
+        88,
+        90,
+        91,
+        98,
+        102,
+        103,
+        104,
+        105,
+        106,
+        107,
+        115,
+        116
+    ],
+    "Dusty Dunes Drugstore": [
+        14,
+        26,
+        27,
+        37,
+        38,
+        40,
+        47,
+        54,
+        57,
+        58,
+        63,
+        70,
+        75,
+        82,
+        88,
+        90,
+        91,
+        93,
+        103,
+        104,
+        105,
+        106,
+        115,
+        116,
+        119,
+        120    
+    ],
+    "Dusty Dunes Miner Shack": [
+        9,
+        11,
+        14,
+        27,
+        36,
+        37,
+        40,
+        47,
+        48,
+        51,
+        52,
+        54,
+        56,
+        63,
+        65,
+        66,
+        67,
+        73,
+        77,
+        78,
+        80,
+        81,
+        83,
+        88,
+        89,
+        91,
+        103,
+        106,
+        115,
+        119,
+        128,
+        130    
+    ],
+    "Traveler's Shack": [
+        5,
+        14,
+        41,
+        43,
+        54,
+        56,
+        62,
+        66,
+        70,
+        71,
+        74,
+        75,
+        78,
+        90,
+        91,
+        107,
+        120,
+        130
+    ],
+    "Lumine Hall": [
+        25,
+        34,
+        62,
+        79,
+        86,
+        92,
+        94,
+        97,
+        107,
+        110,
+        114,
+        120,
+	    121,
+        133,
+        159    
+    ],
+    "Connector Caves": [
+        23,
+        26,
+        41,
+        53,
+        62,
+        63,
+        67,
+        69,
+        71,
+        75,
+        82,
+        91,
+        97,
+        99,
+        100,
+        101,
+        105,
+        106,
+        107,
+        109,
+        112,
+        113,
+        119,
+        124,
+        127,
+        129,
+        130,
+        142,
+        146,
+        148,
+        151,
+        152,
+        157,
+        159    
+    ],
+    "Lumine Hall Sanctuary": [
+        0,
+        1,
+        20,
+        25,
+        33,
+        34,
+        42,
+        62,
+        79,
+        91,
+        92,
+        97,
+        109,
+        114,
+        129,
+        133,
+        141,
+        142,
+        146,
+        147,
+        149,
+        156,
+        164    
+    ],
+    "Fire Spring": [
+        26,
+        41,
+        59,
+        62,
+        91,
+        107,
+        108,
+        109,
+        110,
+        114,
+        142,
+        146,
+        151,
+        157,
+        159
+    ],
+    "Sea of Eden": [
+        19,
+        26,
+        27,
+        29,
+        41,
+        56,
+        57,
+        62,
+        69,
+        74,
+        79,
+        93,
+        108,
+        111,
+        118,
+        120,
+        163,
+        164    
+    ],
+    "Monkey Caves Treasure Rooms": [
+        0,
+        31,
+        42,
+        56,
+        67,
+        92,
+        94,
+        97,
+        107,
+        111,
+        114,
+        116,
+        127,
+        134,
+        136,
+        140,
+        141,
+        154,
+        160,
+        162
+    ],
+    "Dungeon Man": [
+        0,
+        1,
+        4,
+        5,
+        12,
+        21,
+        22,
+        33,
+        41,
+        43,
+        47,
+        59,
+        62,
+        67,
+        70,
+        94,
+        112,
+        118,
+        126,
+        137,
+        141,
+        147,
+        150,
+        153,
+        154,
+        157    
+    ],
+    "Threed Underground": [
+        0,
+        8,
+        22,
+        25,
+        41,
+        44,
+        62,
+        74,
+        90,
+        93,
+        94,
+        111,
+        117,
+        118,
+        124,
+        127,
+        130,
+        140,
+        159
+    ],
+    "Lier's Cave": [
+        14,
+        16,
+        19,
+        22,
+        38,
+        41,
+        43,
+        53,
+        56,
+        57,
+        58,
+        59,
+        62,
+        63,
+        67,
+        68,
+        69,
+        70,
+        71,
+        75,
+        78,
+        118,
+        120,
+        121,
+        123,
+        130,
+        133
+    ],
+    "Stonehenge Balcony Room": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        22,
+        26,
+        38,
+        40,
+        41,
+        43,
+        50,
+        52,
+        53,
+        56,
+        58,
+        66,
+        68,
+        70,
+        71,
+        75,
+        78,
+        81,
+        88,
+        89,
+        91,
+        93,
+        103,
+        105,
+        106,
+        160
+    ],
+    "Stonehenge Balcony Off": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        22,
+        26,
+        38,
+        40,
+        41,
+        43,
+        50,
+        52,
+        53,
+        56,
+        58,
+        66,
+        68,
+        70,
+        71,
+        75,
+        78,
+        81,
+        88,
+        89,
+        91,
+        93,
+        103,
+        105,
+        106,
+        160
+    ],
+    "Brickroad Maze": [
+        2,
+        11,
+        12,
+        13,
+        21,
+        34,
+        35,
+        38,
+        44,
+        49,
+        52,
+        63,
+        66,
+        74,
+        78,
+        87,
+        95,
+        103,
+        105,
+        107,
+        120,
+        121,
+        129,
+        131,
+        164    
+    ],
+    "Rainy Circle": [
+        14,
+        19,
+        21,
+        38,
+        41,
+        53,
+        62,
+        80,
+        91,
+        116,
+        120,
+        130,
+        133
+    ],
+    "Belch's Factory": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        40,
+        41,
+        43,
+        44,
+        53,
+        56,
+        57,
+        58,
+        64,
+        65,
+        66,
+        70,
+        71,
+        72,
+        73,
+        77,
+        78,
+        81,
+        82,
+        91,
+        93,
+        103,
+        104,
+        105,
+        106,
+        108,
+        121    
+    ],
+    "Milky Well Caves": [
+        44,
+        63,
+        74,
+        80,
+        90,
+        118,
+        130,
+        133
+    ],
+    "Lilliput Steps": [
+        6,
+        10,
+        11,
+        14,
+        33,
+        34,
+        38,
+        43,
+        44,
+        53,
+        58,
+        62,
+        63,
+        67,
+        69,
+        70,
+        74,
+        81,
+        87,
+        91,
+        113,
+        118,
+        130,
+        133,
+        160
+    ],
+    "Monkey Caves Hallway": [
+        16,
+        20,
+        22,
+        23,
+        24,
+        27,
+        40,
+        41,
+        43,
+        44,
+        47,
+        49,
+        53,
+        54,
+        57,
+        63,
+        66,
+        67,
+        69,
+        70,
+        71,
+        74,
+        75,
+        78,
+        80,
+        86,
+        88,
+        91,
+        94,
+        114,
+        118,
+        124,
+        130,
+        159
+    ],
+    "Giant Step": [
+        12,
+        16,
+        19,
+        23,
+        24,
+        44,
+        97,
+        108,
+        114,
+        120    
+    ],
+    "Pink Cloud": [
+        1,
+        2,
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        21,
+        22,
+        23,
+        33,
+        34,
+        40,
+        44,
+        45,
+        53,
+        56,
+        57,
+        58,
+        68,
+        81,
+        87,
+        94,
+        99,
+        100,
+        101,
+        110,
+        117,
+        122,
+        123,
+        126,
+        129,
+        156,
+        160,
+        164
+    ],
+    "Saturn Caves": [
+        2,
+        14,
+        16,
+        19,
+        20,
+        24,
+        26,
+        38,
+        41,
+        43,
+        44,
+        45,
+        47,
+        54,
+        57,
+        58,
+        63,
+        66,
+        67,
+        69,
+        70,
+        74,
+        75,
+        81,
+        82,
+        87,
+        91,
+        97,
+        99,
+        100,
+        101,
+        117,
+        147,
+        159    
+    ],
+    "Stonehenge Tunnels": [
+        0,
+        12,
+        22,
+        33,
+        34,
+        35,
+        37,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        45,
+        47,
+        50,
+        53,
+        54,
+        56,
+        57,
+        59,
+        69,
+        71,
+        78,
+        81,
+        86,
+        90,
+        91,
+        92,
+        93,
+        95,
+        97,
+        100,
+        101,
+        102,
+        103,
+        104,
+        105,
+        106,
+        108,
+        109,
+        114,
+        117,
+        118,
+        119,
+        120,
+        121,
+        122,
+        133,
+        136,
+        155,
+        156
+    ],
+    "Gold Mine": [
+        14,
+        38,
+        41,
+        43,
+        44,
+        47,
+        52,
+        53,
+        54,
+        57,
+        62,
+        63,
+        71,
+        74,
+        75,
+        78,
+        80,
+        93,
+        114,
+        129,
+        147
+    ],
+    "Sewer": [
+        0,
+        1,
+        2,
+        4,
+        5,
+        23,
+        24,
+        35,
+        39,
+        44,
+        47,
+        51,
+        59,
+        61,
+        69,
+        82,
+        99,
+        100,
+        102,
+        121,
+        129,
+        135,
+        156,
+        162,
+        166    
+    ],
+    "Tenda Village": [
+        5,
+        8,
+        12,
+        13,
+        14,
+        19,
+        22,
+        38,
+        41,
+        43,
+        44,
+        52,
+        53,
+        54,
+        57,
+        60,
+        62,
+        63,
+        66,
+        67,
+        88,
+        91,
+        106,
+        121,
+        128,
+        129,
+        130,
+        160,
+        164    
+    ],
+    "Fourside Dept. Store Blackout": [
+        9,
+        19,
+        27,
+        42,
+        47,
+        50,
+        51,
+        58,
+        59,
+        63,
+        70,
+        71,
+        75,
+        78,
+        88,
+        90,
+        91,
+        99,
+        102,
+        103,
+        104,
+        105,
+        106,
+        112,
+        115,
+        120
+    ],
+    "Fourside Dept. Store Blackout Rooms": [
+        41,
+        47,
+        51,
+        54,
+        56,
+        58,
+        63,
+        66,
+        70,
+        71,
+        78,
+        88,
+        90,
+        107,
+        109,
+        120
+    ],
+    "Magicant Manly Fish": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ],
+    "Magicant Ness": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ],
+    "Magicant Rabbit": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ],
+    "Magicant Belch": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ],
+    "Magicant Mom": [
+        4,
+        5,
+        9,
+        19,
+        21,
+        22,
+        25,
+        26,
+        32,
+        36,
+        38,
+        39,
+        41,
+        44,
+        46,
+        47,
+        48,
+        49,
+        51,
+        54,
+        55,
+        56,
+        57,
+        59,
+        65,
+        66,
+        72,
+        75,
+        76,
+        80,
+        81,
+        86,
+        92,
+        98,
+        101,
+        104,
+        108,
+        109,
+        120,
+        130,
+        133    
+    ]
+    
+}
+
+nonsense_palettes = {
+    "Pyramid": [
+        2,
+        4,
+        11,
+        12,
+        20,
+        27,
+        30,
+        32,
+        37,
+        40,
+        45,
+        52,
+        54,
+        65,
+        66,
+        80,
+        81,
+        88,
+        90,
+        94,
+        103,
+        106,
+        121,
+        122,
+        140,
+        141,
+        154,
+        162,
+        164,
+        167    
+    ],
+    "Lost Underworld": [
+        4,
+        5,
+        6,
+        9,
+        11,
+        12,
+        13,
+        26,
+        39,
+        47,
+        51,
+        57,
+        67,
+        68,
+        70,
+        71,
+        75,
+        85,
+        94,
+        100,
+        108,
+        111,
+        112,
+        113,
+        119,
+        163,
+        164,
+        166    
+    ],
+    "Cave of the Past": [
+        0,
+        1,
+        8,
+        11,
+        12,
+        20,
+        23,
+        24,
+        27,
+        41,
+        43,
+        50,
+        53,
+        74,
+        94,
+        126,
+        159,
+        163    
+    ],
+    "Giygas's Lair": [
+        4,
+        8,
+        14,
+        20,
+        21,
+        27,
+        35,
+        54,
+        59,
+        64,
+        92,
+        94,
+        108,
+        109,
+        114,
+        118,
+        121,
+        136,
+        140,
+        141,
+        156    
+    ],
+    "Onett": [
+        34,
+        39,
+        47,
+        57,
+        58,
+        65,
+        67,
+        68,
+        69,
+        74,
+        75,
+        111,
+        114,
+        117,
+        118,
+        121,
+        129,
+        131,
+        160,
+        161,
+        162,
+        164    
+    ],
+    "Twoson": [
+        1,
+        2,
+        26,
+        27,
+        39,
+        58,
+        68,
+        74,
+        88,
+        89,
+        90,
+        93,
+        99    
+    ],
+    "Happy-Happy Village": [
+        27,
+        38,
+        39,
+        41,
+        58,
+        88,
+        91,
+        106,
+        121,
+        160    
+    ],
+    "Happy-Happy Clear": [
+        27,
+        38,
+        39,
+        41,
+        58,
+        88,
+        91,
+        106,
+        121,
+        160    
+    ],
+    "Tunnel Outdoors": [
+        44,
+        53,
+        68,
+        74,
+        85,
+        94,
+        114,
+        128,
+        159    
+    ],
+    "Threed": [
+        27,
+        38,
+        39,
+        41,
+        43,
+        44,
+        51,
+        61,
+        67,
+        68,
+        82,
+        88,
+        91,
+        99,
+        102,
+        121,
+        126,
+        160,
+        164    
+    ],
+    "Threed Daytime": [
+        27,
+        38,
+        39,
+        41,
+        43,
+        44,
+        51,
+        61,
+        67,
+        68,
+        82,
+        88,
+        91,
+        99,
+        102,
+        121,
+        126,
+        160,
+        164    
+    ],
+    "Fourside": [
+        19,
+        26,
+        27,
+        32,
+        38,
+        39,
+        40,
+        41,
+        47,
+        50,
+        51,
+        52,
+        61,
+        63,
+        67,
+        68,
+        71,
+        74,
+        75,
+        81,
+        91,
+        100,
+        103,
+        112,
+        121,
+        130,
+        160,
+        163    
+    ],
+    "Moonside": [
+        19,
+        26,
+        27,
+        51,
+        52,
+        53,
+        56,
+        62,
+        65,
+        69,
+        74,
+        76,
+        81,
+        82,
+        88,
+        91,
+        99,
+        100,
+        112,
+        121,
+        126,
+        130,
+        133,
+        166    
+    ],
+    "Magicant": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ],
+    "Tunnels": [
+        6,
+        15,
+        17,
+        126,
+        145    
+    ],
+    "Magicant Interiors": [
+        61,
+        68,
+        84,
+        121,
+        140,
+        143,
+        144    
+    ],
+    "Tents": [
+        7,
+        21,
+        25,
+        27,
+        33,
+        34,
+        37,
+        40,
+        50,
+        71,
+        82,
+        85,
+        89,
+        91,
+        97,
+        99,
+        114,
+        115,
+        118,
+        123,
+        130    
+    ],
+    "Peaceful Rest Valley": [
+        2,
+        26,
+        27,
+        41,
+        43,
+        51,
+        53,
+        58,
+        67,
+        70,
+        71,
+        74,
+        86,
+        92,
+        99,
+        100,
+        104,
+        121,
+        123,
+        133,
+        160    
+    ],
+    "Grapefruit Falls": [
+        38,
+        39,
+        41,
+        43,
+        58,
+        67,
+        71,
+        74,
+        89,
+        93,
+        117,
+        121,
+        123,
+        124,
+        129,
+        136,
+        140,
+        151,
+        159,
+        160,
+        164    
+    ],
+    "Saturn Valley": [
+        26,
+        27,
+        39,
+        41,
+        47,
+        51,
+        53,
+        58,
+        67,
+        70,
+        74,
+        82,
+        88,
+        90,
+        91,
+        93,
+        99,
+        103,
+        104,
+        108,
+        121,
+        126,
+        160,
+        161    
+    ],
+    "Deep Darkness": [
+        7,
+        10,
+        21,
+        43,
+        51,
+        57,
+        58,
+        59,
+        74,
+        91,
+        99,
+        100,
+        102,
+        103,
+        104,
+        114,
+        120,
+        121,
+        160,
+        163,
+        164,
+        165,
+        167    
+    ],
+    "Lilliput Steps Sanctuary": [
+        2,
+        6,
+        15,
+        26,
+        27,
+        39,
+        41,
+        47,
+        68,
+        74,
+        79,
+        82,
+        90,
+        91,
+        93,
+        100,
+        106,
+        130,
+        131,
+        132,
+        133,
+        160,
+        164,
+        165    
+    ],
+    "Milky Well": [
+        15,
+        26,
+        27,
+        38,
+        39,
+        41,
+        43,
+        47,
+        57,
+        70,
+        74,
+        91,
+        93,
+        105,
+        109,
+        126,
+        131,
+        133    
+    ],
+    "Deep Darkness Darkness": [
+        25    
+    ],
+    "Summers": [
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        22,
+        52,
+        53,
+        82,
+        88,
+        102,
+        126,
+        160,
+        164,
+        165    
+    ],
+    "Dusty Dunes Desert": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        37,
+        40,
+        52,
+        54,
+        60,
+        74,
+        81,
+        89,
+        103,
+        107,
+        114,
+        121,
+        123,
+        160,
+        161,
+        166    
+    ],
+    "The Sky": [
+        135    
+    ],
+    "Dalaam": [
+        7,
+        8,
+        10,
+        11,
+        12,
+        15,
+        19,
+        21,
+        26,
+        27,
+        39,
+        40,
+        41,
+        43,
+        52,
+        63,
+        74,
+        88,
+        90,
+        91,
+        98,
+        99,
+        100,
+        106,
+        107,
+        121    
+    ],
+    "Dalaam Palace": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        26,
+        27,
+        33,
+        34,
+        35,
+        37,
+        66,
+        71,
+        79,
+        80,
+        91,
+        99,
+        100,
+        101,
+        104,
+        105,
+        106,
+        107,
+        108,
+        109,
+        110,
+        111,
+        112,
+        113,
+        114,
+        115,
+        117,
+        118,
+        119,
+        120,
+        136    
+    ],
+    "Cave of the Present": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        27,
+        33,
+        34,
+        40,
+        41,
+        42,
+        53,
+        54,
+        62,
+        63,
+        67,
+        68,
+        69,
+        70,
+        71,
+        79,
+        86,
+        88,
+        90,
+        91,
+        93,
+        94,
+        99,
+        101,
+        104,
+        107,
+        109,
+        112,
+        134    
+    ],
+    "Pink Cloud Sanctuary": [
+        11,
+        19,
+        21,
+        22,
+        27,
+        35,
+        36,
+        37,
+        41,
+        43,
+        44,
+        47,
+        48,
+        52,
+        54,
+        55,
+        59,
+        65,
+        66,
+        107    
+    ],
+    "The Sea": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        25,
+        26,
+        27,
+        47,
+        53,
+        54,
+        58,
+        62,
+        68,
+        71,
+        74,
+        85,
+        88,
+        91,
+        97,
+        99,
+        100,
+        101,
+        103,
+        104,
+        105,
+        106,
+        121    
+    ],
+    "Monotoli Offices": [
+        4,
+        5,
+        7,
+        8,
+        12,
+        22,
+        26,
+        93,
+        98,
+        99,
+        112,
+        113,
+        121,
+        123    
+    ],
+    "Onett Hotel": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        26,
+        80,
+        91,
+        99,
+        104,
+        105,
+        106    
+    ],
+    "Threed Red-Wall House": [
+        52,
+        74,
+        88,
+        91,
+        99,
+        100,
+        119,
+        121,
+        130    
+    ],
+    "Electra's Room": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        22,
+        26,
+        96,
+        121    
+    ],
+    "Threed Green-Wall House": [
+        37,
+        52,
+        54,
+        56,
+        58,
+        68,
+        69,
+        83,
+        102,
+        121    
+    ],
+    "Threed Blue-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        22,
+        26,
+        37,
+        59,
+        80,
+        91,
+        96,
+        106,
+        121,
+        126    
+    ],
+    "Pokey's House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59,
+        68,
+        91,
+        105,
+        114,
+        117,
+        126,
+        133    
+    ],
+    "Moonside Hospital": [
+        4,
+        5,
+        8,
+        11,
+        19,
+        21,
+        59,
+        98,
+        99,
+        100,
+        111,
+        114,
+        121,
+        123,
+        126,
+        130,
+        133    
+    ],
+    "Onett Green-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        26,
+        52,
+        59,
+        96    
+    ],
+    "Onett Blue-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        59,
+        69,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106    
+    ],
+    "Onett Seafoam-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59,
+        99,
+        100,
+        101,
+        102,
+        104,
+        105,
+        118    
+    ],
+    "Onett Peach-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        45,
+        69,
+        99,
+        100,
+        103,
+        105,
+        106    
+    ],
+    "Onett Light Blue-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        99,
+        100,
+        102,
+        103,
+        106    
+    ],
+    "Onett Pink-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        26,
+        59,
+        99,
+        100,
+        102,
+        103    
+    ],
+    "Onett White-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        22,
+        26,
+        27,
+        99,
+        100,
+        105,
+        106,
+        126    
+    ],
+    "Hospitals": [
+        4,
+        5,
+        7,
+        8,
+        21,
+        26,
+        27,
+        52,
+        99,
+        100
+    ],
+    "Apple Kid's House": [
+        5,
+        9,
+        19,
+        21,
+        22,
+        26,
+        68,
+        91    
+    ],
+    "Tracy's Room": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        37,
+        52,
+        54,
+        106    
+    ],
+    "Orange Kid's House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        99,
+        100,
+        104,
+        118    
+    ],
+    "Everdred's House": [
+        2,
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        48,
+        52,
+        54,
+        59,
+        69,
+        74,
+        80,
+        81,
+        99,
+        100,
+        103,
+        105,
+        106,
+        123    
+    ],
+    "Twoson Green-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        26,
+        99,
+        100,
+        102,
+        103
+    ],
+    "Ness's Room": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        48,
+        52,
+        69,
+        91,
+        99    
+    ],
+    "Police Station Backroom": [
+        1    
+    ],
+    "Winters": [
+        3,
+        6,
+        40,
+        43,
+        68,
+        74,
+        89,
+        90,
+        99,
+        100,
+        102,
+        103,
+        111,
+        123,
+        133,
+	    148,
+        157,
+        167    
+    ],
+    "Rainy Circle Sanctuary": [
+        16,
+        29,
+        33,
+        92,
+        93    
+    ],
+    "Hospital Rooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        98,
+        99,
+        100    
+    ],
+    "Twoson Peach-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106,
+        107    
+    ],
+    "Twoson Pink-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        48,
+        98,
+        99,
+        100,
+        102,
+        103,
+        104,
+        105,
+        106    
+    ],
+    "Twoson Gray-Wall House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        91,
+        99,
+        100,
+        102,
+        103,
+        105    
+    ],
+    "Gold Office": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        88,
+        91,
+        99,
+        100,
+        102,
+        103,
+        104,
+        105,
+        106,
+        121,
+        126    
+    ],
+    "Happy-Happy Guardhouse": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        59,
+        98,
+        99,
+        100,
+        104    
+    ],
+    "Happy-Happy Hospital": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59,
+        91    
+    ],
+    "Happy-Happy Hospital Clear": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59,
+        91    
+    ],
+    "Onett Town Hall": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        25,
+        26,
+        59,
+        61,
+        62,
+        121,
+        133    
+    ],
+    "Onett Hotel Bedrooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        99,
+        100,
+        102,
+        103,
+        106    
+    ],
+    "Fourside Hotel Bedrooms": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        59,
+        91,
+        99,
+        100,
+        103,
+        121    
+    ],
+    "Happy-Happy Saturn House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        27,
+        99,
+        100,
+        104,
+        105,
+        106,
+        126    
+    ],
+    "Happy-Happy Hotel": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        26,
+        27,
+        74,
+        88,
+        99,
+        100,
+        102,
+        103    
+    ],
+    "Twoson Hotel Bedrooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        59,
+        74,
+        99,
+        100,
+        102,
+        105,
+        106
+    ],
+    "Threed Hotel Bedrooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        59,
+        99,
+        100
+    ],
+    "Happy-Happy Hotel Clear": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        26,
+        27,
+        74,
+        88,
+        99,
+        100,
+        102,
+        103    
+    ],
+    "Monotoli Building": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        22,
+        26,
+        52,
+        91,
+        99,
+        100,
+        101,
+        102,
+        103
+    ],
+    "Paula's House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        48,
+        52,
+        54,
+        99,
+        100,
+        105,
+        106,
+        121    
+    ],
+    "Paula's Room": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106,
+        126
+    ],
+    "Ness's House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        59,
+        91,
+        99,
+        100,
+        102,
+        103,
+        121,
+        123    
+    ],
+    "Twoson Hotel": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        69,
+        91,
+        99,
+        100,
+        102,
+        103,
+        105,
+        106,
+        126,
+        130    
+    ],
+    "Threed Hotel": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        26,
+        59,
+        91,
+        164
+    ],
+    "Fourside Hotel": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        91,
+        99,
+        100,
+        102,
+        103    
+    ],
+    "Monotoli Elevators": [
+        96,
+        121,
+        126    
+    ],
+    "Fourside Dept. Store Office": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        99,
+        100,
+        101,
+        102,
+        103,
+        104,
+        105,
+        106
+    ],
+    "Onett Library": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        19,
+        21,
+        22,
+        26,
+        89,
+        91,
+        99,
+        100
+    ],
+    "Paula's House Rooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        59,
+        91,
+        99,
+        100,
+        107
+    ],
+    "Onett Police Station": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        52,
+        59,
+        126,
+        133    
+    ],
+    "Scaraba": [
+        4,
+        8,
+        11,
+        12,
+        13,
+        38,
+        43,
+        83,
+        100,
+        101,
+        107,
+        126,
+        129,
+        164    
+    ],
+    "Dalaam House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        59
+    ],
+    "Scaraba House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        83,
+        99,
+        100,
+        104,
+        105,
+        106
+    ],
+    "Happy-Happy HQ": [
+        2,
+        4,
+        5,
+        7,
+        10,
+        12,
+        19,
+        25,
+        26,
+        33,
+        34,
+        40,
+        45,
+        47,
+        49,
+        52,
+        53,
+        54,
+        58,
+        59,
+        61,
+        66,
+        67,
+        69,
+        81,
+        82,
+        87,
+        92,
+        99,
+        100,
+        101,
+        103,
+        121,
+        122,
+        123,
+        126,
+        129,
+        160,
+        164,
+        166    
+    ],
+    "Fourside Cafe": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        22,
+        26,
+        27,
+        35,
+        40,
+        58,
+        91,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106
+    ],
+    "Moonside Cafe": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        43,
+        44,
+        47,
+        52,
+        54,
+        59,
+        100,
+        103,
+        104,
+        105,
+        106
+    ],
+    "Scaraba Hospital": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        27,
+        91,
+        99,
+        100,
+        101,
+        104,
+        105,
+        106
+    ],
+    "Scaraba Shop": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        14,
+        19,
+        21,
+        22,
+        27,
+        36,
+        37,
+        39,
+        40,
+        43,
+        52,
+        65,
+        66,
+        68,
+        69,
+        70,
+        91,
+        99,
+        100,
+        102,
+        103,
+        112,
+        115    
+    ],
+    "Twoson Dept. Store": [
+        56,
+        66,
+        67,
+        69,
+        97,
+        108,
+        161,
+        162,
+        164    
+    ],
+    "Fourside Dept. Store": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        26,
+        41
+    ],
+    "Bakery": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        27,
+        47,
+        50,
+        51,
+        54,
+        56,
+        91,
+        126
+    ],
+    "Mach Pizza": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        22,
+        26,
+        47,
+        54,
+        59,
+        63,
+        66,
+        82,
+        88,
+        98,
+        99,
+        123    
+    ],
+    "Burger Shop": [
+        4,
+        5,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        26,
+        80,
+        82,
+        83,
+        89    
+    ],
+    "Onett Drugstore": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        27,
+        47,
+        60,
+        63,
+        68,
+        91
+    ],
+    "Threed Drugstore": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        27,
+        41,
+        47,
+        51,
+        63,
+        70,
+        78,
+        90,
+        91
+    ],
+    "Winters Drugstore": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        19,
+        21,
+        22,
+        25,
+        27,
+        47,
+        59,
+        60,
+        61,
+        63,
+        68,
+        70,
+        75,
+        78,
+        80,
+        82,
+        83,
+        91,
+        121,
+        126    
+    ],
+    "Chaos Theater": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        40,
+        44,
+        52,
+        53,
+        54,
+        58,
+        63,
+        66,
+        67,
+        68,
+        69,
+        70,
+        74,
+        81,
+        82,
+        91,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106,
+        123    
+    ],
+    "Fourside Museum": [
+        19,
+        21,
+        22,
+        27,
+        53,
+        91
+    ],
+    "Summers Hotel": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        40,
+        43,
+        47,
+        52,
+        53,
+        54,
+        56,
+        100,
+        104,
+        105,
+        106,
+        121,
+        126
+    ],
+    "Summers Shop": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        38,
+        40,
+        41,
+        43,
+        44,
+        47,
+        53,
+        54,
+        58,
+        66,
+        68,
+        69,
+        70,
+        74,
+        75,
+        88,
+        91,
+        99,
+        100,
+        105,
+        106    
+    ],
+    "Snow Wood Boarding School": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        27,
+        50,
+        51,
+        52,
+        53,
+        58,
+        59,
+        63,
+        81,
+        82,
+        88,
+        91,
+        99,
+        100,
+        105,
+        106    
+    ],
+    "Summers Harbor House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        26,
+        27,
+        40,
+        43,
+        47,
+        52,
+        54,
+        57,
+        67,
+        70,
+        100,
+        104,
+        105,
+        106,
+        121,
+        126,
+        164
+    ],
+    "Summers Restaurant": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        26,
+        27,
+        35,
+        43,
+        44,
+        53,
+        54,
+        56,
+        58,
+        59,
+        62,
+        63,
+        66,
+        67,
+        68,
+        69,
+        70,
+        81,
+        82,
+        88,
+        91,
+        99,
+        100,
+        104,
+        105,
+        106,
+        108,
+        117,
+        126    
+    ],
+    "Moonside Museum": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        35,
+        40,
+        47,
+        58,
+        82,
+        91,
+        99,
+        100,
+        103,
+        104    
+    ],
+    "Stoic Club": [
+        4,
+        5,
+        7,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        100
+    ],
+    "Andonuts Lab": [
+        5,
+        19,
+        22,
+        27,
+        35,
+        40,
+        68,
+        99,
+        130    
+    ],
+    "Topolla Theater": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        26,
+        27,
+        35,
+        40,
+        43,
+        47,
+        53,
+        56,
+        58,
+        62,
+        68,
+        69,
+        80,
+        81,
+        82,
+        88,
+        99,
+        100,
+        104,
+        105,
+        106    
+    ],
+    "Summers Museum": [
+        4,
+        5,
+        7,
+        10,
+        11,
+        12,
+        13,
+        19,
+        22,
+        26,
+        27,
+        43,
+        47,
+        53,
+        59,
+        63,
+        67,
+        70,
+        82,
+        91,
+        99,
+        100,
+        103,
+        104,
+        105,
+        106,
+        126,
+        130,
+        133
+    ],
+    "Onett Arcade": [
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        13,
+        19,
+        26,
+        39,
+        40,
+        43,
+        57,
+        58,
+        59,
+        63,
+        70,
+        71,
+        78,
+        80,
+        82,
+        88,
+        89,
+        90,
+        91,
+        99,
+        100,
+        103    
+    ],
+    "Twoson Bus Station": [
+        22,
+        63,
+        66,
+        79,
+        90,
+        94,
+        99,
+        100,
+        103,
+        105,
+        106,
+        109,
+        116,
+        119    
+    ],
+    "Twoson Bike Shop": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        19,
+        21,
+        22,
+        41,
+        63,
+        70,
+        71,
+        75,
+        78,
+        82,
+        90
+    ],
+    "Hint Shop": [
+        7,
+        8,
+        9,
+        10,
+        13,
+        19,
+        50,
+        53,
+        82,
+        86    
+    ],
+    "Fourside Dept. Store Rooms": [
+        2,
+        4,
+        5,
+        8,
+        9,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        35,
+        36,
+        59,
+        99,
+        100
+    ],
+    "Threed Tent": [
+        4,
+        5,
+        8,
+        19,
+        21,
+        22,
+        27,
+        40,
+        41,
+        63,
+        88,
+        89,
+        91,
+        102,
+        121,
+        160
+    ],
+    "Onett Treehouse": [
+        4,
+        5,
+        7,
+        8,
+        11,
+        12,
+        13,
+        14,
+        26,
+        53,
+        80,
+        90,
+        101,
+        130    
+    ],
+    "Lier's House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        37,
+        40,
+        59,
+        91,
+        99,
+        100    
+    ],
+    "Run-down House": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        41,
+        99,
+        100,
+        103,
+        105,
+        106,
+        107,
+        126
+    ],
+    "Paula's Cabin": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        19,
+        22,
+        26,
+        29,
+        99,
+        100,
+        126
+    ],
+    "Dusty Dunes Drugstore": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        52,
+        53,
+        56,
+        74,
+        83,
+        89,
+        99,
+        100    
+    ],
+    "Dusty Dunes Miner Shack": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        12,
+        13,
+        19,
+        21    
+    ],
+    "Traveler's Shack": [
+        4,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        38,
+        40,
+        47,
+        52,
+        59,
+        99,
+        100,
+        105,
+        106
+    ],
+    "Lumine Hall": [
+        1,
+        14,
+        18,
+        21,
+        26,
+        33,
+        40,
+        41,
+        44,
+        47,
+	    54,
+        61,
+        68,
+        70,
+        74,
+        75,
+        101,
+        104,
+        109,
+        111,
+        115,
+        118,
+        126,
+        128,
+        162,
+        164    
+    ],
+    "Connector Caves": [
+        1,
+        2,
+        7,
+        11,
+        12,
+        13,
+        15,
+        19,
+        20,
+        21,
+        22,
+        24,
+        27,
+        38,
+        43,
+        44,
+        49,
+        52,
+        57,
+        59,
+        70,
+        74,
+        78,
+        80,
+        81,
+        94,
+        108,
+        115,
+        117,
+        118,
+        120,
+        121,
+        122,
+        123,
+        126,
+        147    
+    ],
+    "Lumine Hall Sanctuary": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        16,
+        18,
+        19,
+        21,
+        22,
+        23,
+        24,
+        26,
+        27,
+        38,
+        40,
+        41,
+        43,
+        44,
+        47,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        63,
+        67,
+        68,
+        69,
+        70,
+        74,
+        75,
+        78,
+        81,
+        82,
+        83,
+        85,
+        86,
+        87,
+        88,
+        90,
+        93,
+        99,
+        100,
+        101,
+        103,
+        104,
+        105,
+        106,
+        107,
+        108,
+        112,
+        115,
+        117,
+        118,
+        119,
+        120,
+        121,
+        126,
+        128,
+        162    
+    ],
+    "Fire Spring": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        16,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        24,
+        27,
+        43,
+        44,
+        63,
+        70,
+        71,
+        75,
+        78,
+        99,
+        100,
+        104,
+        105,
+        112,
+        121
+    ],
+    "Sea of Eden": [
+        4,
+        5,
+        7,
+        9,
+        12,
+        15,
+        21,
+        22,
+        40,
+        52,
+        126    
+    ],
+    "Monkey Caves Treasure Rooms": [
+        1,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        19,
+        21,
+        22,
+        26,
+        27,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        43,
+        44,
+        47,
+        51,
+        52,
+        53,
+        55,
+        63,
+        64,
+        71,
+        72,
+        73,
+        82,
+        83,
+        88,
+        89,
+        90,
+        91,
+        99,
+        100,
+        102,
+        103,
+        104,
+        105,
+        106,
+        108,
+        109,
+        110,
+        112,
+        113,
+        119,
+        120,
+        126,
+        130,
+        131,
+        132,
+        133
+    ],
+    "Dungeon Man": [
+        2,
+        7,
+        11,
+        14,
+        26,
+        29,
+        58,
+        93    
+    ],
+    "Threed Underground": [
+        4,
+        5,
+        6,
+        7,
+        10,
+        11,
+        12,
+        13,
+        19,
+        26,
+        27,
+        33,
+        35,
+        38,
+        40,
+        42,
+        45,
+        47,
+        52,
+        53,
+        54,
+        56,
+        57,
+        58,
+        63,
+        66,
+        67,
+        69,
+        70,
+        91,
+        99,
+        100,
+        104,
+        105,
+        106,
+        156
+    ],
+    "Lier's Cave": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        21,
+        26,
+        27,
+        44,
+        47,
+        52,
+        74,
+        80,
+        81,
+        91,
+        99,
+        100,
+        104,
+        105,
+        106,
+        126
+    ],
+    "Stonehenge Balcony Room": [
+        16,
+        67,
+        99,
+        100,
+        118,
+        164
+    ],
+    "Stonehenge Balcony Off": [
+        16,
+        67,
+        99,
+        100,
+        118,
+        164
+    ],
+    "Brickroad Maze": [
+        18,
+        54,
+        58    
+    ],
+    "Rainy Circle": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        22,
+        26,
+        27,
+        43,
+        44,
+        47,
+        52,
+        54,
+        56,
+        57,
+        59,
+        63,
+        66,
+        67,
+        69,
+        70,
+        71,
+        74,
+        75,
+        78,
+        81,
+        99,
+        100,
+        104,
+        105,
+        106,
+        126,
+        160
+    ],
+    "Belch's Factory": [
+        14,
+        15,
+        16,
+        29,
+        98,
+        99,
+        100,
+        116,
+        126    
+    ],
+    "Milky Well Caves": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        26,
+        27,
+        35,
+        40,
+        43,
+        47,
+        52,
+        53,
+        54,
+        56,
+        62,
+        66,
+        67,
+        68,
+        69,
+        70,
+        81,
+        82,
+        91,
+        129
+    ],
+    "Lilliput Steps": [
+        4,
+        5,
+        7,
+        8,
+        12,
+        13,
+        19,
+        20,
+        21,
+        22,
+        27,
+        35,
+        40,
+        59,
+        82,
+        99,
+        100,
+        101,
+        103,
+        104,
+        105,
+        106,
+        126
+    ],
+    "Monkey Caves Hallway": [
+        2,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        38,
+        99,
+        100,
+        101,
+        104,
+        106
+    ],
+    "Giant Step": [
+        1,
+        2,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        13,
+        15,
+        20,
+        21,
+        26,
+        43,
+        45,
+        47,
+        49    
+    ],
+    "Pink Cloud": [
+        6,
+        35,
+        74,
+        121
+    ],
+    "Saturn Caves": [
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        21,
+        23,
+        27,
+        52,
+        56,
+        71,
+        78,
+        126    
+    ],
+    "Stonehenge Tunnels": [
+        1,
+        27,
+        42,
+        52,
+        74,
+        99
+    ],
+    "Gold Mine": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        16,
+        19,
+        21,
+        22,
+        26,
+        27,
+        40,
+        56,
+        66,
+        67,
+        88,
+        91,
+        100,
+        103,
+        104,
+        105,
+        106,
+        117,
+        123
+    ],
+    "Sewer": [
+        32,
+        74,
+        79,
+        80,
+        111    
+    ],
+    "Tenda Village": [
+        4,
+	    7,
+        11,
+        15,
+        26,
+        27,
+        29,
+        32,
+        40,
+        47,
+        56,
+        58,
+        65,
+        68,
+        74,
+        92,
+        99,
+        102,
+        104,
+        105,
+        123,
+        126,
+        162    
+    ],
+    "Fourside Dept. Store Blackout": [
+        4,
+        5,
+        7,
+        8,
+        10,
+        11,
+        12,
+        26,
+        41
+    ],
+    "Fourside Dept. Store Blackout Rooms": [
+        4,
+        5,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        19,
+        21,
+        22,
+        27,
+        37,
+        59,
+        82,
+        91,
+        99,
+        100,
+        102,
+        103,
+        105,
+        106
+    ],
+    "Magicant Manly Fish": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ],
+    "Magicant Ness": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ],
+    "Magicant Rabbit": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ],
+    "Magicant Belch": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ],
+    "Magicant Mom": [
+        7,
+        8,
+        10,
+        12,
+        14,
+        27,
+        37,
+        43,
+        50,
+        79,
+        82,
+        99,
+        100,
+        103,
+        107,
+        121,
+        122,
+        123,
+        129,
+        131,
+        146,
+        160    
+    ]
+}
diff --git a/worlds/earthbound/game_data/static_location_data.py b/worlds/earthbound/game_data/static_location_data.py
new file mode 100644
index 0000000000..b04d854d10
--- /dev/null
+++ b/worlds/earthbound/game_data/static_location_data.py
@@ -0,0 +1,1407 @@
+location_ids = {
+    "Onett - Tracy Gift": 0xEB0000,
+    "Onett - Tracy's Room Present": 0xEB0001,
+    "Onett - Hilltop Present": 0xEB0002,
+    "Onett - Meteor Item": 0xEB0003,
+    "Onett - Buzz Buzz": 0xEB0004,
+    "Onett - Mani Mani Statue": 0xEB0005,
+    "Onett - Library Counter": 0xEB0006,
+    "Onett - Library Bookshelf": 0xEB0007,
+    "Onett - Burger Shop Trashcan": 0xEB0008,
+    "Onett - Treehouse Guy": 0xEB0009,
+    "Onett - South Road Present": 0xEB000A,
+    "Onett - Hotel Trashcan": 0xEB000B,
+    "Onett - Arcade Trashcan": 0xEB000C,
+    "Onett - Mayor Pirkle": 0xEB000D,
+    "Onett - Traveling Entertainer": 0xEB000E,
+    "Giant Step - First Cave Present": 0xEB000F,
+    "Giant Step - Floor 2 Cave Present": 0xEB0010,
+    "Giant Step - Floor 3 Present": 0xEB0011,
+    "Twoson - Bike Shop Rental": 0xEB0012,
+    "Twoson - Antique Shop": 0xEB0013,
+    "Twoson - Paula's Room Present": 0xEB0014,
+    "Twoson - Apple Kid Trashcan": 0xEB0015,
+    "Twoson - South of Town Present": 0xEB0016,
+    "Twoson - Orange Kid Donation": 0xEB0017,
+    "Twoson - Apple Kid Invention": 0xEB0018,
+    "Twoson - Apple Kid's Mouse": 0xEB0019,
+    "Twoson - Paula's Mother": 0xEB001A,
+    "Twoson - Everdred Meeting": 0xEB001B,
+    "Twoson - Insignificant Location": 0xEB001C,
+    "Peaceful Rest Valley - Split Hill Present": 0xEB001D,
+    "Peaceful Rest Valley - Hill Nook Present": 0xEB001E,
+    "Peaceful Rest Valley - South of Bridge Present": 0xEB001F,
+    "Peaceful Rest Valley - Dead End Present": 0xEB0020,
+    "Peaceful Rest Valley - River Overlook Present": 0xEB0021,
+    "Peaceful Rest Valley - North Side Present": 0xEB0022,
+    "Happy-Happy Village - Donation Lady": 0xEB0023,
+    "Happy-Happy Village - Right HQ Present": 0xEB0024,
+    "Happy-Happy Village - Left HQ Present": 0xEB0025,
+    "Happy-Happy Village - Prisoner Item": 0xEB0026,
+    "Happy-Happy Village - Prisoner": 0xEB0027,
+    "Happy-Happy Village - Defeat Carpainter": 0xEB0028,
+    "Lilliput Steps - Southwest Pool Present": 0xEB0029,
+    "Lilliput Steps - East Cliff Present": 0xEB002A,
+    "Lilliput Steps - North Stream Present": 0xEB002B,
+    "Threed - Boogey Tent Trashcan": 0xEB002C,
+    "Threed - Cemetery Trashcan": 0xEB002D,
+    "Threed - Downtown Trashcan": 0xEB002E,
+    "Threed - East Side Trashcan": 0xEB002F,
+    "Threed - Northeast Shack Trashcan": 0xEB0030,
+    "Threed - Hospital Drawer": 0xEB0031,
+    "Threed - Zombie Prisoner": 0xEB0032,
+    "Threed Underground - Left Coffin": 0xEB0033,
+    "Threed Underground - Right Coffin": 0xEB0034,
+    "Grapefruit Falls - South Present": 0xEB0035,
+    "Grapefruit Falls - North Present": 0xEB0036,
+    "Grapefruit Falls - Saturn Cave Present": 0xEB0037,
+    "Saturn Valley - Ladder Present": 0xEB0038,
+    "Saturn Valley - Trashcan #1": 0xEB0039,
+    "Saturn Valley - Trashcan #2": 0xEB003A,
+    "Saturn Valley - Trashcan #3": 0xEB003B,
+    "Saturn Valley - Saturn Coffee": 0xEB003C,
+    "Saturn Valley - Post Belch Gift #1": 0xEB003D,
+    "Saturn Valley - Post Belch Gift #2": 0xEB003E,
+    "Saturn Valley - Post Belch Gift #3": 0xEB003F,
+    "Milky Well - Cavern Present": 0xEB0040,
+    "Belch's Factory - Top Right Room Trashcan": 0xEB0041,
+    "Belch's Factory - Pit Room Trashcan #1": 0xEB0042,
+    "Belch's Factory - Pit Room Trashcan #2": 0xEB0043,
+    "Belch's Factory - Balcony Room Trashcan #1": 0xEB0044,
+    "Belch's Factory - Balcony Room Trashcan #2": 0xEB0045,
+    "Belch's Factory - Balcony Room Trashcan #3": 0xEB0046,
+    "Dusty Dunes - Northwest Corner Present": 0xEB0047,
+    "Dusty Dunes - South Side Present": 0xEB0048,
+    "Dusty Dunes - Surrounding Rocks Present": 0xEB0049,
+    "Dusty Dunes - Black Sesame Present": 0xEB004A,
+    "Dusty Dunes - Oasis Present": 0xEB004B,
+    "Dusty Dunes - Northeast Corner Present": 0xEB004C,
+    "Dusty Dunes - North Central Present": 0xEB004D,
+    "Dusty Dunes - Shining Spot": 0xEB004E,
+    "Dusty Dunes - East Peninsula Present": 0xEB004F,
+    "Dusty Dunes - Mine Reward": 0xEB0050,
+    "Snow Wood - Many Present Room Present #1": 0xEB0051,
+    "Snow Wood - Many Present Room Present #2": 0xEB0052,
+    "Snow Wood - Many Present Room Present #3": 0xEB0053,
+    "Snow Wood - Many Present Room Present #4": 0xEB0054,
+    "Snow Wood - Many Present Room Present #5": 0xEB0055,
+    "Snow Wood - Many Present Room Present #6": 0xEB0056,
+    "Snow Wood - Many Present Room Present #7": 0xEB0057,
+    "Scaraba - Snake Bag Salesman": 0xEB0058,
+    "Snow Wood - Upper Right Locker": 0xEB0059,
+    "Snow Wood - Upper Left Locker": 0xEB005A,
+    "Snow Wood - Bottom Right Locker": 0xEB005B,
+    "Snow Wood - Bottom Left Locker": 0xEB005C,
+    "Snow Wood - Maxwell Item": 0xEB005D,
+    "Snow Wood - Bedroom": 0xEB005E,
+    "Winters - Drugstore Saleswoman": 0xEB005F,
+    "Brick Road Maze - Top Path Present": 0xEB0060,
+    "Brick Road Maze - Guarded Present": 0xEB0061,
+    "Brick Road Maze - Out of the Way Present": 0xEB0062,
+    "Brick Road Maze - Alcove Present": 0xEB0063,
+    "Brick Road Maze - Near Exit Present": 0xEB0064,
+    "Rainy Circle - Isolated Present": 0xEB0065,
+    "Rainy Circle - East Cliff Present": 0xEB0066,
+    "Rainy Circle - Near Ropes Present": 0xEB0067,
+    "Andonuts Lab - Present": 0xEB0068,
+    "Andonuts Lab - Mouse": 0xEB0069,
+    "Stonehenge - Purple Maze Present": 0xEB006A,
+    "Stonehenge - Dead End Present": 0xEB006B,
+    "Stonehenge - Near End of the Maze Present": 0xEB006C,
+    "Stonehenge - Bridge Room East Balcony Present": 0xEB006D,
+    "Stonehenge - Bridge Room Lower Present": 0xEB006E,
+    "Stonehenge - Flashing Room Right Path Present": 0xEB006F,
+    "Stonehenge - Flashing Room Center Present": 0xEB0070,
+    "Stonehenge - Flashing Room Upper Present": 0xEB0071,
+    "Stonehenge - Kidnapped Mr. Saturn": 0xEB0072,
+    "Stonehenge - Tony Item": 0xEB0073,
+    "Gold Mine - Mouse Crossroad Present #1": 0xEB0074,
+    "Gold Mine - Mouse Crossroad Present #2": 0xEB0075,
+    "Gold Mine - B1F Lonely Mole Present": 0xEB0076,
+    "Gold Mine - South Hall Present": 0xEB0077,
+    "Gold Mine - South Corner Present": 0xEB0078,
+    "Gold Mine - South Mole Present #1": 0xEB0079,
+    "Gold Mine - South Mole Present #2": 0xEB007A,
+    "Gold Mine - North Crossroad Detour Present": 0xEB007B,
+    "Gold Mine - North Mole Present": 0xEB007C,
+    "Gold Mine - West Mole Present": 0xEB007D,
+    "Gold Mine - B1F Isolated Present": 0xEB007E,
+    "Gold Mine - West Crossroad Detour Present": 0xEB007F,
+    "Gold Mine - B1F Junction Present": 0xEB0080,
+    "Gold Mine - B1F Junction Mole Present": 0xEB0081,
+    "Monkey Caves - 1F Right Chest": 0xEB00F1,
+    "Monkey Caves - 1F Left Chest": 0xEB00F2,
+    "Monkey Caves - West 2F Left Chest": 0xEB00F3,
+    "Monkey Caves - West 2F Right Chest #1": 0xEB00F4,
+    "Monkey Caves - West 2F Right Chest #2": 0xEB00F5,
+    "Monkey Caves - East 2F Left Chest": 0xEB00F6,
+    "Monkey Caves - East 2F Right Chest": 0xEB00F7,
+    "Monkey Caves - East West 3F Right Chest #1": 0xEB00F8,
+    "Monkey Caves - East West 3F Right Chest #2": 0xEB00F9,
+    "Monkey Caves - West End Chest": 0xEB0082,
+    "Monkey Caves - West End Trashcan": 0xEB0083,
+    "Monkey Caves - East End Chest": 0xEB0084,
+    "Monkey Caves - East End Trashcan": 0xEB0085,
+    "Monkey Caves - Bow Monkey Gift": 0xEB0086,
+    "Monkey Caves - Talah Rama Chest #1": 0xEB0087,
+    "Monkey Caves - Talah Rama Chest #2": 0xEB0088,
+    "Monkey Caves - Talah Rama Gift": 0xEB0089,
+    "Monkey Caves - Monkey Power": 0xEB008A,
+    "Fourside - Venus Gift": 0xEB008B,
+    "Fourside - Post-Moonside Delivery": 0xEB008C,
+    "Fourside - Bakery 2F Gift": 0xEB008D,
+    "Moonside - Two Trees Present": 0xEB008E,
+    "Moonside - East Island Present": 0xEB008F,
+    "Moonside - Businessman Present": 0xEB0090,
+    "Moonside - West Island Present": 0xEB0091,
+    "Moonside - Hospital Present": 0xEB0092,
+    "Fourside - Department Store Blackout": 0xEB0093,
+    "Magnet Hill - West Entrance Trashcan": 0xEB0094,
+    "Magnet Hill - First Room Free Door Trashcan": 0xEB0095,
+    "Magnet Hill - First Room Barrel Door Trashcan": 0xEB0096,
+    "Magnet Hill - Second Room Dead End Trashcan": 0xEB0097,
+    "Magnet Hill - Final Room Door Trashcan": 0xEB0098,
+    "Fourside - Magnet Hill Chest": 0xEB0099,
+    "Monotoli Building - One Table Present": 0xEB009A,
+    "Monotoli Building - Two Table Present": 0xEB009B,
+    "Monotoli Building - Electra Gift": 0xEB009C,
+    "Monotoli Building - Monotoli Gift": 0xEB009D,
+    "Monotoli Building - Monotoli Character": 0xEB009E,
+    "Summers - Museum Item": 0xEB009F,
+    "Summers - Magic Cake": 0xEB00A0,
+    "Dalaam - Throne Room Chest #1": 0xEB00A1,
+    "Dalaam - Throne Room Chest #2": 0xEB00A2,
+    "Dalaam - Throne Room Chest #3": 0xEB00A3,
+    "Dalaam - Trial of Mu": 0xEB00A4,
+    "Dalaam - Restaurant Chest #1": 0xEB00A5,
+    "Dalaam - Restaurant Chest #2": 0xEB00A6,
+    "Dalaam - Do Do Guy's House Chest": 0xEB00A7,
+    "Dalaam - Upper House Chest": 0xEB00A8,
+    "Dalaam - Throne Character": 0xEB00A9,
+    "Poo - Starting Item": 0xEB00AA,
+    "Pink Cloud - Three Holes Present": 0xEB00AB,
+    "Pink Cloud - Left Hole Present": 0xEB00AC,
+    "Pink Cloud - Ground Floor Present": 0xEB00AD,
+    "Pyramid - Anteroom Sarcophagus": 0xEB00AE,
+    "Pyramid - Northwest Door Sarcophagus": 0xEB00AF,
+    "Pyramid - Hallway Sarcophagus #1": 0xEB00B0,
+    "Pyramid - Hallway Sarcophagus #2": 0xEB00B1,
+    "Pyramid - Switch Room Sarcophagus": 0xEB00B2,
+    "Pyramid - Pedestal Item": 0xEB00B3,
+    "Pyramid - Way Out Sarcophagus": 0xEB00B4,
+    "Scaraba - Star Master": 0xEB00B5,
+    "Scaraba - Key Holder": 0xEB00B6,
+    "Dungeon Man - 1F Dead End Present": 0xEB00B7,
+    "Dungeon Man - 1F Long Walk Present": 0xEB00B8,
+    "Dungeon Man - 1F Disappointing Present": 0xEB00B9,
+    "Dungeon Man - 1F Opinion Present": 0xEB00BA,
+    "Dungeon Man - 1F No Sign Present": 0xEB00BB,
+    "Dungeon Man - 2F Unnecessary Billboard Present": 0xEB00BC,
+    "Dungeon Man - 2F Dungeon Exploration Present": 0xEB00BD,
+    "Dungeon Man - 2F South Ledge Present": 0xEB00BE,
+    "Dungeon Man - 2F North Alcove Present": 0xEB00BF,
+    "Dungeon Man - 3F Present": 0xEB00C0,
+    "Dungeon Man - 2F Hole Present": 0xEB00C1,
+    "Dungeon Man - 1F Exit Ledge Present": 0xEB00C2,
+    "Deep Darkness - Teleporting Monkey": 0xEB00C3,
+    "Deep Darkness - Crest of Darkness Present": 0xEB00C4,
+    "Deep Darkness - Helicopter Present": 0xEB00C5,
+    "Deep Darkness - Yellow Bird Present": 0xEB00C6,
+    "Deep Darkness - Swamp Present": 0xEB00C7,
+    "Deep Darkness - Corner Present": 0xEB00C8,
+    "Deep Darkness - Alcove Present": 0xEB00C9,
+    "Deep Darkness - North Alcove Truffle": 0xEB00CA,
+    "Deep Darkness - Near Land Truffle": 0xEB00CB,
+    "Deep Darkness - Present Truffle": 0xEB00CC,
+    "Deep Darkness - Village Truffle": 0xEB00CD,
+    "Deep Darkness - Entrance Truffle": 0xEB00CE,
+    "Deep Darkness - Barf Character": 0xEB00CF,
+    "Tenda Village - Trashcan": 0xEB00D0,
+    "Tenda Village - Tenda Tea": 0xEB00D1,
+    "Tenda Village - Tenda Gift": 0xEB00D2,
+    "Tenda Village - Tenda Gift #2": 0xEB00D3,
+    "Lumine Hall - B1F Non-Talkative Rock Present": 0xEB00D4,
+    "Lumine Hall - 1F North Path Present": 0xEB00D5,
+    "Lumine Hall - B1F Thankful Rock Corner Present": 0xEB00D6,
+    "Lumine Hall - B1F Thankful Rock Junction Present": 0xEB00D7,
+    "Lumine Hall - 1F Above Belly Button Present": 0xEB00D8,
+    "Lumine Hall - B1F Belly Button Present": 0xEB00D9,
+    "Lumine Hall - 1F Near Exit Present": 0xEB00DA,
+    "Lumine Hall - 1F Dead End Present": 0xEB00DB,
+    "Lumine Hall - B1F West Alcove Present": 0xEB00DC,
+    "Lost Underworld - Talking Rock": 0xEB00DD,
+    "Lost Underworld - East Present": 0xEB00DE,
+    "Lost Underworld - Northeast Present": 0xEB00DF,
+    "Lost Underworld - Northeast of Tenda Tribe Present": 0xEB00E0,
+    "Lost Underworld - Southwest of Tenda Tribe Present": 0xEB00E1,
+    "Lost Underworld - Evacuation Present": 0xEB00E2,
+    "Fire Spring - 1st Cave Present": 0xEB00E3,
+    "Fire Spring - East Corner Present": 0xEB00E4,
+    "Fire Spring - Volcano Present": 0xEB00E5,
+    "Fire Spring - Lone Cave Present": 0xEB00E6,
+    "Fire Spring - Upper Volcano Present": 0xEB00E7,
+    "Magicant - Ness's Gift": 0xEB00E8,
+    "Magicant - Present Near Ness": 0xEB00E9,
+    "Magicant - Lonely Present": 0xEB00EA,
+    "Magicant - North Present": 0xEB00EB,
+    "Magicant - Hills Present": 0xEB00EC,
+    "Magicant - Town Present": 0xEB00FA,
+    "Magicant - Ness's Nightmare": 0xEB00ED,
+    "Cave of the Present - Star Master": 0xEB00EE,
+    "Cave of the Present - Broken Phase Distorter": 0xEB00EF,
+    "Cave of the Past - Present": 0xEB00F0,
+    ##########################################
+    # Shop checks are denoted by an ID of
+    # 0x1000 | Each shop has 7 allocated ID spaces in memory
+    "Onett Drugstore - Right Counter Slot 1": 0xEB1000,
+    "Onett Drugstore - Right Counter Slot 2": 0xEB1001,
+    "Onett Drugstore - Right Counter Slot 3": 0xEB1002,
+    "Onett Drugstore - Right Counter Slot 4": 0xEB1003,
+    "Onett Drugstore - Right Counter Slot 5": 0xEB1004,
+
+    "Onett Drugstore - Left Counter": 0xEB1007,
+
+    "Summers - Beach Cart": 0xEB100E,
+
+    "Onett Burger Shop - Slot 1": 0xEB1015,
+    "Onett Burger Shop - Slot 2": 0xEB1016,
+    "Onett Burger Shop - Slot 3": 0xEB1017,
+    "Onett Burger Shop - Slot 4": 0xEB1018,
+
+    "Onett Bakery - Slot 1": 0xEB101C,
+    "Onett Bakery - Slot 2": 0xEB101D,
+    "Onett Bakery - Slot 3": 0xEB101E,
+    "Onett Bakery - Slot 4": 0xEB101F,
+
+    "Twoson Department Store Burger Shop - Slot 1": 0xEB1023,
+    "Twoson Department Store Burger Shop - Slot 2": 0xEB1024,
+    "Twoson Department Store Burger Shop - Slot 3": 0xEB1025,
+    "Twoson Department Store Burger Shop - Slot 4": 0xEB1026,
+
+    "Twoson Department Store Bakery - Slot 1": 0xEB102A,  # Force This slot needs to always be a local food item
+    "Twoson Department Store Bakery - Slot 2": 0xEB102B,
+    "Twoson Department Store Bakery - Slot 3": 0xEB102C,
+    "Twoson Department Store Bakery - Slot 4": 0xEB102D,
+
+    "Twoson Department Store Top Floor - Right Counter Slot 1": 0xEB1031,
+    "Twoson Department Store Top Floor - Right Counter Slot 2": 0xEB1032,
+    "Twoson Department Store Top Floor - Right Counter Slot 3": 0xEB1033,
+    "Twoson Department Store Top Floor - Right Counter Slot 4": 0xEB1034,
+    "Twoson Department Store Top Floor - Right Counter Slot 5": 0xEB1035,
+    "Twoson Department Store Top Floor - Right Counter Slot 6": 0xEB1036,
+
+    "Twoson Department Store Top Floor - Left Counter Slot 1": 0xEB1038,
+    "Twoson Department Store Top Floor - Left Counter Slot 2": 0xEB1039,
+
+    "Summers - Magic Cake Cart Shop Slot": 0xEB103F,
+
+    "Burglin Park Junk Shop - Slot 1": 0xEB1046,
+    "Burglin Park Junk Shop - Slot 2": 0xEB1047,
+    "Burglin Park Junk Shop - Slot 3": 0xEB1048,
+    "Burglin Park Junk Shop - Slot 4": 0xEB1049,
+    "Burglin Park Junk Shop - Slot 5": 0xEB104A,
+    "Burglin Park Junk Shop - Slot 6": 0xEB104B,
+
+    "Burglin Park Bread Stand - Slot 1": 0xEB105B,
+    "Burglin Park Bread Stand - Slot 2": 0xEB105C,
+    "Burglin Park Bread Stand - Slot 3": 0xEB105D,
+    "Burglin Park Bread Stand - Slot 4": 0xEB105E,
+    "Burglin Park Bread Stand - Slot 5": 0xEB105F,
+    "Burglin Park Bread Stand - Slot 6": 0xEB1060,
+
+    "Burglin Park - Banana Stand": 0xEB1062,
+
+    "Happy-Happy Village Drugstore - Right Counter Slot 1": 0xEB1069,
+    "Happy-Happy Village Drugstore - Right Counter Slot 2": 0xEB106A,
+    "Happy-Happy Village Drugstore - Right Counter Slot 3": 0xEB106B,
+    "Happy-Happy Village Drugstore - Right Counter Slot 4": 0xEB106C,
+    "Happy-Happy Village Drugstore - Right Counter Slot 5": 0xEB106D,
+
+    "Threed Drugstore - Right Counter Slot 1": 0xEB1070,
+    "Threed Drugstore - Right Counter Slot 2": 0xEB1071,
+    "Threed Drugstore - Right Counter Slot 3": 0xEB1072,
+    "Threed Drugstore - Right Counter Slot 4": 0xEB1073,
+    "Threed Drugstore - Right Counter Slot 5": 0xEB1074,
+
+    "Threed Drugstore - Left Counter Slot 1": 0xEB1077,
+    "Threed Drugstore - Left Counter Slot 2": 0xEB1078,
+    "Threed Drugstore - Left Counter Slot 3": 0xEB1079,
+    "Threed Drugstore - Left Counter Slot 4": 0xEB107A,
+    "Threed Drugstore - Left Counter Slot 5": 0xEB107B,
+
+    "Threed - Arms Dealer Slot 1": 0xEB107E,
+    "Threed - Arms Dealer Slot 2": 0xEB107F,
+    "Threed - Arms Dealer Slot 3": 0xEB1080,
+    "Threed - Arms Dealer Slot 4": 0xEB1081,
+
+    "Threed Bakery - Slot 1": 0xEB1085,
+    "Threed Bakery - Slot 2": 0xEB1086,
+    "Threed Bakery - Slot 3": 0xEB1087,
+    "Threed Bakery - Slot 4": 0xEB1088,
+    "Threed Bakery - Slot 5": 0xEB1089,
+    "Threed Bakery - Slot 6": 0xEB108A,
+    "Threed Bakery - Slot 7": 0xEB108B,
+
+    "Scaraba - Expensive Water Guy": 0xEB108C,
+
+    "Winters Drugstore - Slot 1": 0xEB1093,
+    "Winters Drugstore - Slot 2": 0xEB1094,
+    "Winters Drugstore - Slot 3": 0xEB1095,
+    "Winters Drugstore - Slot 4": 0xEB1096,
+    "Winters Drugstore - Slot 5": 0xEB1097,
+    "Winters Drugstore - Slot 6": 0xEB1098,
+    "Winters Drugstore - Slot 7": 0xEB1099,
+
+    "Saturn Valley Shop - Center Saturn Slot 1": 0xEB109A,
+    "Saturn Valley Shop - Center Saturn Slot 2": 0xEB109B,
+    "Saturn Valley Shop - Center Saturn Slot 3": 0xEB109C,
+    "Saturn Valley Shop - Center Saturn Slot 4": 0xEB109D,
+    "Saturn Valley Shop - Center Saturn Slot 5": 0xEB109E,
+
+    "Dusty Dunes Drugstore - Counter Slot 1": 0xEB10A1,
+    "Dusty Dunes Drugstore - Counter Slot 2": 0xEB10A2,
+    "Dusty Dunes Drugstore - Counter Slot 3": 0xEB10A3,
+    "Dusty Dunes Drugstore - Counter Slot 4": 0xEB10A4,
+    "Dusty Dunes Drugstore - Counter Slot 5": 0xEB10A5,
+
+    "Dusty Dunes - Arms Dealer Slot 1": 0xEB10A8,
+    "Dusty Dunes - Arms Dealer Slot 2": 0xEB10A9,
+    "Dusty Dunes - Arms Dealer Slot 3": 0xEB10AA,
+    "Dusty Dunes - Arms Dealer Slot 4": 0xEB10AB,
+
+    "Fourside Bakery - Slot 1": 0xEB10AF,
+    "Fourside Bakery - Slot 2": 0xEB10B0,
+    "Fourside Bakery - Slot 3": 0xEB10B1,
+    "Fourside Bakery - Slot 4": 0xEB10B2,  # Force this slot to be repel sandwich in monkey caves mode
+    "Fourside Bakery - Slot 5": 0xEB10B3,
+    "Fourside Bakery - Slot 6": 0xEB10B4,
+
+    "Fourside Department Store - Tool Shop Slot 1": 0xEB10B6,
+    "Fourside Department Store - Tool Shop Slot 2": 0xEB10B7,
+    "Fourside Department Store - Tool Shop Slot 3": 0xEB10B8,
+    "Fourside Department Store - Tool Shop Slot 4": 0xEB10B9,
+    "Fourside Department Store - Tool Shop Slot 5": 0xEB10BA,
+    "Fourside Department Store - Tool Shop Slot 6": 0xEB10BB,
+    "Fourside Department Store - Tool Shop Slot 7": 0xEB10BC,  # Force this slot to be ruler in monkey caves mode
+
+    "Fourside Department Store - Shop Shop Slot 1": 0xEB10BD,
+    "Fourside Department Store - Shop Shop Slot 2": 0xEB10BE,
+    "Fourside Department Store - Shop Shop Slot 3": 0xEB10BF,  # Force this slot to be Protein drink in monkey caves mod
+    "Fourside Department Store - Shop Shop Slot 4": 0xEB10C0,
+
+    "Fourside Department Store - Food Shop Slot 1": 0xEB10C4,
+    "Fourside Department Store - Food Shop Slot 2": 0xEB10C5,
+    "Fourside Department Store - Food Shop Slot 3": 0xEB10C6,
+    "Fourside Department Store - Food Shop Slot 4": 0xEB10C7,
+    "Fourside Department Store - Food Shop Slot 5": 0xEB10C8,  # Force this slot to be Picnic lunch in monkey caves mode
+
+    "Fourside Department Store - 2F Cart Slot 1": 0xEB10CB,
+    "Fourside Department Store - 2F Cart Slot 2": 0xEB10CC,
+    "Fourside Department Store - 2F Cart Slot 3": 0xEB10CD,
+    "Fourside Department Store - 2F Cart Slot 4": 0xEB10CE,
+    "Fourside Department Store - 2F Cart Slot 5": 0xEB10CF,
+    "Fourside Department Store - 2F Cart Slot 6": 0xEB10D0,
+    "Fourside Department Store - 2F Cart Slot 7": 0xEB10D1,
+
+    "Fourside Department Store - Toys Shop Slot 1": 0xEB10D2,
+    "Fourside Department Store - Toys Shop Slot 2": 0xEB10D3,
+    "Fourside Department Store - Toys Shop Slot 3": 0xEB10D4,
+    "Fourside Department Store - Toys Shop Slot 4": 0xEB10D5,
+    "Fourside Department Store - Toys Shop Slot 5": 0xEB10D6,
+    "Fourside Department Store - Toys Shop Slot 6": 0xEB10D7,
+
+    "Fourside Department Store - Sports Shop Slot 1": 0xEB10D9,
+    "Fourside Department Store - Sports Shop Slot 2": 0xEB10DA,
+    "Fourside Department Store - Sports Shop Slot 3": 0xEB10DB,
+    "Fourside Department Store - Sports Shop Slot 4": 0xEB10DC,
+
+    "Fourside Department Store - Burger Shop Slot 1": 0xEB10E0,
+    "Fourside Department Store - Burger Shop Slot 2": 0xEB10E1,
+    "Fourside Department Store - Burger Shop Slot 3": 0xEB10E2,
+    "Fourside Department Store - Burger Shop Slot 4": 0xEB10E3,  # Force this slot to be Hamburger
+    "Fourside Department Store - Burger Shop Slot 5": 0xEB10E4,
+
+    "Fourside Department Store - Arms Dealer Slot 1": 0xEB10E7,
+    "Fourside Department Store - Arms Dealer Slot 2": 0xEB10E8,
+    "Fourside Department Store - Arms Dealer Slot 3": 0xEB10E9,
+    "Fourside Department Store - Arms Dealer Slot 4": 0xEB10EA,
+    "Fourside Department Store - Arms Dealer Slot 5": 0xEB10EB,
+
+    "Fourside - Northeast Alley Junk Shop Slot 1": 0xEB10EE,
+    "Fourside - Northeast Alley Junk Shop Slot 2": 0xEB10EF,
+    "Fourside - Northeast Alley Junk Shop Slot 3": 0xEB10F0,
+    "Fourside - Northeast Alley Junk Shop Slot 4": 0xEB10F1,
+
+    "Magicant - Shop Slot 1": 0xEB10F5,
+    "Magicant - Shop Slot 2": 0xEB10F6,
+
+    "Summers - Scam Shop Slot 1": 0xEB1103,
+    "Summers - Scam Shop Slot 2": 0xEB1104,
+    "Summers - Scam Shop Slot 3": 0xEB1105,
+    "Summers - Scam Shop Slot 4": 0xEB1106,
+    "Summers - Scam Shop Slot 5": 0xEB1107,
+    "Summers - Scam Shop Slot 6": 0xEB1108,
+    "Summers - Scam Shop Slot 7": 0xEB1109,
+
+    "Summers Harbor - Shop Slot 1": 0xEB110A,
+    "Summers Harbor - Shop Slot 2": 0xEB110B,
+    "Summers Harbor - Shop Slot 3": 0xEB110C,
+    "Summers Harbor - Shop Slot 4": 0xEB110D,
+    "Summers Harbor - Shop Slot 5": 0xEB110E,
+    "Summers Harbor - Shop Slot 6": 0xEB110F,
+    "Summers Harbor - Shop Slot 7": 0xEB1110,
+
+    "Summers Restaurant - Slot 1": 0xEB1111,
+    "Summers Restaurant - Slot 2": 0xEB1112,
+    "Summers Restaurant - Slot 3": 0xEB1113,
+    "Summers Restaurant - Slot 4": 0xEB1114,
+    "Summers Restaurant - Slot 5": 0xEB1115,
+    "Summers Restaurant - Slot 6": 0xEB1116,
+
+    "Scaraba - Indoors Shop Slot 1": 0xEB1118,
+    "Scaraba - Indoors Shop Slot 2": 0xEB1119,
+    "Scaraba - Indoors Shop Slot 3": 0xEB111A,
+    "Scaraba - Indoors Shop Slot 4": 0xEB111B,
+    "Scaraba - Indoors Shop Slot 5": 0xEB111C,
+    "Scaraba - Indoors Shop Slot 6": 0xEB111D,
+
+    "Scaraba Bazaar - Red Snake Carpet Slot 1": 0xEB1126,
+    "Scaraba Bazaar - Red Snake Carpet Slot 2": 0xEB1127,
+    "Scaraba Bazaar - Red Snake Carpet Slot 3": 0xEB1128,
+
+    "Scaraba Bazaar - Bottom Left Carpet Slot 1": 0xEB112D,
+    "Scaraba Bazaar - Bottom Left Carpet Slot 2": 0xEB112E,
+    "Scaraba Bazaar - Bottom Left Carpet Slot 3": 0xEB112F,
+    "Scaraba Bazaar - Bottom Left Carpet Slot 4": 0xEB1130,
+    "Scaraba Bazaar - Bottom Left Carpet Slot 5": 0xEB1131,
+    "Scaraba Bazaar - Bottom Left Carpet Slot 6": 0xEB1132,
+
+    "Scaraba Hotel - Arms Dealer Slot 1": 0xEB1134,
+    "Scaraba Hotel - Arms Dealer Slot 2": 0xEB1135,
+    "Scaraba Hotel - Arms Dealer Slot 3": 0xEB1136,
+    "Scaraba Hotel - Arms Dealer Slot 4": 0xEB1137,
+
+    "Deep Darkness - Businessman Slot 1": 0xEB113B,
+    "Deep Darkness - Businessman Slot 2": 0xEB113C,
+    "Deep Darkness - Businessman Slot 3": 0xEB113D,
+    "Deep Darkness - Businessman Slot 4": 0xEB113E,
+    "Deep Darkness - Businessman Slot 5": 0xEB113F,
+    "Deep Darkness - Businessman Slot 6": 0xEB1140,
+    "Deep Darkness - Businessman Slot 7": 0xEB1141,
+    
+    "Saturn Valley Shop - Post-Belch Saturn Slot 1": 0xEB1157,
+    "Saturn Valley Shop - Post-Belch Saturn Slot 2": 0xEB1158,
+    "Saturn Valley Shop - Post-Belch Saturn Slot 3": 0xEB1159,
+    "Saturn Valley Shop - Post-Belch Saturn Slot 4": 0xEB115A,
+
+    "Scaraba - Southern Camel Shop Slot 1": 0xEB115E,
+    "Scaraba - Southern Camel Shop Slot 2": 0xEB115F,
+    "Scaraba - Southern Camel Shop Slot 3": 0xEB1160,
+    "Scaraba - Southern Camel Shop Slot 4": 0xEB1161,
+    "Scaraba - Southern Camel Shop Slot 5": 0xEB1162,
+    "Scaraba - Southern Camel Shop Slot 6": 0xEB1163,
+    "Scaraba - Southern Camel Shop Slot 7": 0xEB1164,
+
+    "Deep Darkness - Arms Dealer Slot 1": 0xEB1165,
+    "Deep Darkness - Arms Dealer Slot 2": 0xEB1166,
+    "Deep Darkness - Arms Dealer Slot 3": 0xEB1167,
+    "Deep Darkness - Arms Dealer Slot 4": 0xEB1168,
+
+    "Lost Underworld - Tenda Camp Shop Slot 1": 0xEB116C,
+    "Lost Underworld - Tenda Camp Shop Slot 2": 0xEB116D,
+    "Lost Underworld - Tenda Camp Shop Slot 3": 0xEB116E,
+    "Lost Underworld - Tenda Camp Shop Slot 4": 0xEB116F,
+    "Lost Underworld - Tenda Camp Shop Slot 5": 0xEB1170,
+    "Lost Underworld - Tenda Camp Shop Slot 6": 0xEB1171,
+    "Lost Underworld - Tenda Camp Shop Slot 7": 0xEB1172,
+
+    "Happy-Happy Village Drugstore - Left Counter Slot 1": 0xEB117A,
+    "Happy-Happy Village Drugstore - Left Counter Slot 2": 0xEB117B,
+    "Happy-Happy Village Drugstore - Left Counter Slot 3": 0xEB117C,
+    "Happy-Happy Village Drugstore - Left Counter Slot 4": 0xEB117D,
+    "Happy-Happy Village Drugstore - Left Counter Slot 5": 0xEB117E,
+    "Happy-Happy Village Drugstore - Left Counter Slot 6": 0xEB117F,
+    "Happy-Happy Village Drugstore - Left Counter Slot 7": 0xEB1180,
+
+    "Grapefruit Falls - Hiker Shop Slot 1": 0xEB1181,
+    "Grapefruit Falls - Hiker Shop Slot 2": 0xEB1182,
+    "Grapefruit Falls - Hiker Shop Slot 3": 0xEB1183,
+
+    "Saturn Valley Shop - Top Saturn Slot 1": 0xEB1188,
+    "Saturn Valley Shop - Top Saturn Slot 2": 0xEB1189,
+    "Saturn Valley Shop - Top Saturn Slot 3": 0xEB118A,
+    "Saturn Valley Shop - Top Saturn Slot 4": 0xEB118B,
+    "Saturn Valley Shop - Top Saturn Slot 5": 0xEB118C,
+    "Saturn Valley Shop - Top Saturn Slot 6": 0xEB118D,
+    "Saturn Valley Shop - Top Saturn Slot 7": 0xEB118E,
+
+    "Dusty Dunes Drugstore - Left Shop Slot 1": 0xEB118F,  # Force this slot to be a wet towel in monkey caves
+    "Dusty Dunes Drugstore - Left Shop Slot 2": 0xEB1190,
+    "Dusty Dunes Drugstore - Left Shop Slot 3": 0xEB1191,
+    "Dusty Dunes Drugstore - Left Shop Slot 4": 0xEB1192,
+    "Dusty Dunes Drugstore - Left Shop Slot 5": 0xEB1193,
+    "Dusty Dunes Drugstore - Left Shop Slot 6": 0xEB1194,
+    "Dusty Dunes Drugstore - Left Shop Slot 7": 0xEB1195,
+
+    "Dusty Dunes - Mine Food Cart Slot 1": 0xEB1196,
+    "Dusty Dunes - Mine Food Cart Slot 2": 0xEB1197,
+    "Dusty Dunes - Mine Food Cart Slot 3": 0xEB1198,
+    "Dusty Dunes - Mine Food Cart Slot 4": 0xEB1199,
+    "Dusty Dunes - Mine Food Cart Slot 5": 0xEB119A,
+    "Dusty Dunes - Mine Food Cart Slot 6": 0xEB119B,
+    "Dusty Dunes - Mine Food Cart Slot 7": 0xEB119C,
+
+    "Moonside Hotel - Shop Slot 1": 0xEB119D,
+    "Moonside Hotel - Shop Slot 2": 0xEB119E,
+    "Moonside Hotel - Shop Slot 3": 0xEB119F,
+    "Moonside Hotel - Shop Slot 4": 0xEB11A0,
+    "Moonside Hotel - Shop Slot 5": 0xEB11A1,
+
+    "Dalaam Restaurant - Slot 1": 0xEB11A4,
+    "Dalaam Restaurant - Slot 2": 0xEB11A5,
+    "Dalaam Restaurant - Slot 3": 0xEB11A6,
+    "Dalaam Restaurant - Slot 4": 0xEB11A7,
+
+    "Scaraba Bazaar - Delicacy Shop Slot 1": 0xEB11AB,
+    "Scaraba Bazaar - Delicacy Shop Slot 2": 0xEB11AC,
+    "Scaraba Bazaar - Delicacy Shop Slot 3": 0xEB11AD,
+    "Scaraba Bazaar - Delicacy Shop Slot 4": 0xEB11AE,
+    "Scaraba Bazaar - Delicacy Shop Slot 5": 0xEB11AF,
+    "Scaraba Bazaar - Delicacy Shop Slot 6": 0xEB11B0,
+    "Scaraba Bazaar - Delicacy Shop Slot 7": 0xEB11B1,
+
+    "Twoson/Scaraba - Shared Condiment Shop Slot 1": 0xEB11B2,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 2": 0xEB11B3,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 3": 0xEB11B4,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 4": 0xEB11B5,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 5": 0xEB11B6,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 6": 0xEB11B7,
+    "Twoson/Scaraba - Shared Condiment Shop Slot 7": 0xEB11B8,
+
+    # Make sure this shop uses the earlier one
+    "Andonuts Lab - Caveman Shop Slot 1": 0xEB11C0,
+    "Andonuts Lab - Caveman Shop Slot 2": 0xEB11C1,
+    "Andonuts Lab - Caveman Shop Slot 3": 0xEB11C2,
+    "Andonuts Lab - Caveman Shop Slot 4": 0xEB11C3,
+    "Andonuts Lab - Caveman Shop Slot 5": 0xEB11C4
+}
+
+
+location_groups = {
+    "Poo's Inventory": {
+        "Poo - Starting Item"
+    },
+
+    "Northern Onett": {
+        "Onett - Tracy Gift",
+        "Onett - Tracy's Room Present",
+        "Onett - Meteor Item",
+        "Onett - Buzz Buzz",
+        "Onett - Mani Mani Statue",
+        "Onett - Hilltop Present"
+    },
+
+    "Onett": {
+        "Onett - Library Counter",
+        "Onett - Library Bookshelf",
+        "Onett - Burger Shop Trashcan",
+        "Onett - Treehouse Guy",
+        "Onett - South Road Present",
+        "Onett - Hotel Trashcan",
+        "Onett - Mayor Pirkle",
+        "Onett - Traveling Entertainer",
+        "Onett - Arcade Trashcan",
+        "Onett Drugstore - Right Counter Slot 1",
+        "Onett Drugstore - Right Counter Slot 2",
+        "Onett Drugstore - Right Counter Slot 3",
+        "Onett Drugstore - Right Counter Slot 4",
+        "Onett Drugstore - Right Counter Slot 5",
+        "Onett Drugstore - Left Counter",
+        "Onett Burger Shop - Slot 1",
+        "Onett Burger Shop - Slot 2",
+        "Onett Burger Shop - Slot 3",
+        "Onett Burger Shop - Slot 4",
+        "Onett Bakery - Slot 1",
+        "Onett Bakery - Slot 2",
+        "Onett Bakery - Slot 3",
+        "Onett Bakery - Slot 4"
+    },
+
+    "Giant Step": {
+        "Giant Step - First Cave Present",
+        "Giant Step - Floor 2 Cave Present",
+        "Giant Step - Floor 3 Present"
+    },
+
+    "Twoson": {
+        "Twoson - Bike Shop Rental",
+        "Twoson - Antique Shop",
+        "Twoson - Paula's Room Present",
+        "Twoson - Apple Kid Trashcan",
+        "Twoson - South of Town Present",
+        "Twoson - Orange Kid Donation",
+        "Twoson - Apple Kid Invention",
+        "Twoson - Apple Kid's Mouse",
+        "Twoson - Paula's Mother",
+        "Twoson - Everdred Meeting",
+        "Twoson - Insignificant Location",
+        "Twoson Department Store Burger Shop - Slot 1",
+        "Twoson Department Store Burger Shop - Slot 2",
+        "Twoson Department Store Burger Shop - Slot 3",
+        "Twoson Department Store Burger Shop - Slot 4",
+        "Twoson Department Store Bakery - Slot 1",
+        "Twoson Department Store Bakery - Slot 2",
+        "Twoson Department Store Bakery - Slot 3",
+        "Twoson Department Store Bakery - Slot 4",
+        "Twoson Department Store Top Floor - Right Counter Slot 1",
+        "Twoson Department Store Top Floor - Right Counter Slot 2",
+        "Twoson Department Store Top Floor - Right Counter Slot 3",
+        "Twoson Department Store Top Floor - Right Counter Slot 4",
+        "Twoson Department Store Top Floor - Right Counter Slot 5",
+        "Twoson Department Store Top Floor - Right Counter Slot 6",
+        "Twoson Department Store Top Floor - Left Counter Slot 1",
+        "Twoson Department Store Top Floor - Left Counter Slot 2",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 1",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 2",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 3",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 4",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 5",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 6",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 7"
+    },
+
+    "Peaceful Rest Valley": {
+        "Peaceful Rest Valley - Split Hill Present",
+        "Peaceful Rest Valley - Hill Nook Present",
+        "Peaceful Rest Valley - South of Bridge Present",
+        "Peaceful Rest Valley - Dead End Present",
+        "Peaceful Rest Valley - River Overlook Present",
+        "Peaceful Rest Valley - North Side Present"
+    },
+
+    "Happy-Happy Village": {
+        "Happy-Happy Village - Donation Lady",
+        "Happy-Happy Village - Prisoner Item",
+        "Happy-Happy Village - Prisoner",
+        "Happy-Happy Village Drugstore - Right Counter Slot 1",
+        "Happy-Happy Village Drugstore - Right Counter Slot 2",
+        "Happy-Happy Village Drugstore - Right Counter Slot 3",
+        "Happy-Happy Village Drugstore - Right Counter Slot 4",
+        "Happy-Happy Village Drugstore - Right Counter Slot 5",
+        "Happy-Happy Village Drugstore - Left Counter Slot 1",
+        "Happy-Happy Village Drugstore - Left Counter Slot 2",
+        "Happy-Happy Village Drugstore - Left Counter Slot 3",
+        "Happy-Happy Village Drugstore - Left Counter Slot 4",
+        "Happy-Happy Village Drugstore - Left Counter Slot 5",
+        "Happy-Happy Village Drugstore - Left Counter Slot 6",
+        "Happy-Happy Village Drugstore - Left Counter Slot 7"
+    },
+
+    "the Happy-Happy HQ": {
+        "Happy-Happy Village - Right HQ Present",
+        "Happy-Happy Village - Left HQ Present",
+        "Happy-Happy Village - Defeat Carpainter"
+    },
+
+    "Lilliput Steps": {
+        "Lilliput Steps - Southwest Pool Present",
+        "Lilliput Steps - East Cliff Present",
+        "Lilliput Steps - North Stream Present"
+    },
+
+    "Threed": {
+        "Threed - Boogey Tent Trashcan",
+        "Threed - Cemetery Trashcan",
+        "Threed - Downtown Trashcan",
+        "Threed - East Side Trashcan",
+        "Threed - Northeast Shack Trashcan",
+        "Threed - Hospital Drawer",
+        "Threed - Zombie Prisoner",
+        "Threed Drugstore - Right Counter Slot 1",
+        "Threed Drugstore - Right Counter Slot 2",
+        "Threed Drugstore - Right Counter Slot 3",
+        "Threed Drugstore - Right Counter Slot 4",
+        "Threed Drugstore - Right Counter Slot 5",
+        "Threed Drugstore - Left Counter Slot 1",
+        "Threed Drugstore - Left Counter Slot 2",
+        "Threed Drugstore - Left Counter Slot 3",
+        "Threed Drugstore - Left Counter Slot 4",
+        "Threed Drugstore - Left Counter Slot 5",
+        "Threed - Arms Dealer Slot 1",
+        "Threed - Arms Dealer Slot 2",
+        "Threed - Arms Dealer Slot 3",
+        "Threed - Arms Dealer Slot 4",
+        "Threed Bakery - Slot 1",
+        "Threed Bakery - Slot 2",
+        "Threed Bakery - Slot 3",
+        "Threed Bakery - Slot 4",
+        "Threed Bakery - Slot 5",
+        "Threed Bakery - Slot 6",
+        "Threed Bakery - Slot 7"
+    },
+
+    "the Threed Underground Passage": {
+        "Threed Underground - Left Coffin",
+        "Threed Underground - Right Coffin"
+    },
+
+    "Grapefruit Falls": {
+        "Grapefruit Falls - South Present",
+        "Grapefruit Falls - North Present",
+        "Grapefruit Falls - Saturn Cave Present",
+        "Grapefruit Falls - Hiker Shop Slot 1",
+        "Grapefruit Falls - Hiker Shop Slot 2",
+        "Grapefruit Falls - Hiker Shop Slot 3"
+    },
+
+    "Saturn Valley": {
+        "Saturn Valley - Ladder Present",
+        "Saturn Valley - Trashcan #1",
+        "Saturn Valley - Trashcan #2",
+        "Saturn Valley - Trashcan #3",
+        "Saturn Valley - Saturn Coffee",
+        "Saturn Valley - Post Belch Gift #1",
+        "Saturn Valley - Post Belch Gift #2",
+        "Saturn Valley - Post Belch Gift #3",
+        "Saturn Valley Shop - Center Saturn Slot 1",
+        "Saturn Valley Shop - Center Saturn Slot 2",
+        "Saturn Valley Shop - Center Saturn Slot 3",
+        "Saturn Valley Shop - Center Saturn Slot 4",
+        "Saturn Valley Shop - Center Saturn Slot 5",
+        "Saturn Valley Shop - Top Saturn Slot 1",
+        "Saturn Valley Shop - Top Saturn Slot 2",
+        "Saturn Valley Shop - Top Saturn Slot 3",
+        "Saturn Valley Shop - Top Saturn Slot 4",
+        "Saturn Valley Shop - Top Saturn Slot 5",
+        "Saturn Valley Shop - Top Saturn Slot 6",
+        "Saturn Valley Shop - Top Saturn Slot 7",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 1",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 2",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 3",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 4"
+    },
+
+    "Milky Well": {
+        "Milky Well - Cavern Present"  # this is a very good location group :^)
+    },
+
+    "Belch's Factory": {
+        "Belch's Factory - Top Right Room Trashcan",
+        "Belch's Factory - Pit Room Trashcan #1",
+        "Belch's Factory - Pit Room Trashcan #2",
+        "Belch's Factory - Balcony Room Trashcan #1",
+        "Belch's Factory - Balcony Room Trashcan #2",
+        "Belch's Factory - Balcony Room Trashcan #3"
+    },
+
+    "Dusty Dunes Desert": {
+        "Dusty Dunes - Northwest Corner Present",
+        "Dusty Dunes - South Side Present",
+        "Dusty Dunes - Surrounding Rocks Present",
+        "Dusty Dunes - Black Sesame Present",
+        "Dusty Dunes - Oasis Present",
+        "Dusty Dunes - Northeast Corner Present",
+        "Dusty Dunes - North Central Present",
+        "Dusty Dunes - Shining Spot",
+        "Dusty Dunes - East Peninsula Present",
+        "Dusty Dunes - Mine Reward",
+        "Dusty Dunes Drugstore - Left Shop Slot 1",
+        "Dusty Dunes Drugstore - Left Shop Slot 2",
+        "Dusty Dunes Drugstore - Left Shop Slot 3",
+        "Dusty Dunes Drugstore - Left Shop Slot 4",
+        "Dusty Dunes Drugstore - Left Shop Slot 5",
+        "Dusty Dunes Drugstore - Left Shop Slot 6",
+        "Dusty Dunes Drugstore - Left Shop Slot 7",
+        "Dusty Dunes - Mine Food Cart Slot 1",
+        "Dusty Dunes - Mine Food Cart Slot 2",
+        "Dusty Dunes - Mine Food Cart Slot 3",
+        "Dusty Dunes - Mine Food Cart Slot 4",
+        "Dusty Dunes - Mine Food Cart Slot 5",
+        "Dusty Dunes - Mine Food Cart Slot 6",
+        "Dusty Dunes - Mine Food Cart Slot 7",
+        "Dusty Dunes Drugstore - Counter Slot 1",
+        "Dusty Dunes Drugstore - Counter Slot 2",
+        "Dusty Dunes Drugstore - Counter Slot 3",
+        "Dusty Dunes Drugstore - Counter Slot 4",
+        "Dusty Dunes Drugstore - Counter Slot 5",
+        "Dusty Dunes - Arms Dealer Slot 1",
+        "Dusty Dunes - Arms Dealer Slot 2",
+        "Dusty Dunes - Arms Dealer Slot 3",
+        "Dusty Dunes - Arms Dealer Slot 4"
+    },
+
+    "the Snow Wood locker room": {
+        "Snow Wood - Upper Right Locker",
+        "Snow Wood - Upper Left Locker",
+        "Snow Wood - Bottom Right Locker",
+        "Snow Wood - Bottom Left Locker"
+    },
+
+    "Snow Wood Boarding School": {
+        "Snow Wood - Many Present Room Present #1",
+        "Snow Wood - Many Present Room Present #2",
+        "Snow Wood - Many Present Room Present #3",
+        "Snow Wood - Many Present Room Present #4",
+        "Snow Wood - Many Present Room Present #5",
+        "Snow Wood - Many Present Room Present #6",
+        "Snow Wood - Many Present Room Present #7",
+        "Snow Wood - Maxwell Item",
+        "Snow Wood - Bedroom",
+        "Snow Wood - Upper Right Locker",
+        "Snow Wood - Upper Left Locker",
+        "Snow Wood - Bottom Right Locker",
+        "Snow Wood - Bottom Left Locker"
+    },
+
+    "Winters": {
+        "Winters - Drugstore Saleswoman",
+        "Winters Drugstore - Slot 1",
+        "Winters Drugstore - Slot 2",
+        "Winters Drugstore - Slot 3",
+        "Winters Drugstore - Slot 4",
+        "Winters Drugstore - Slot 5",
+        "Winters Drugstore - Slot 6",
+        "Winters Drugstore - Slot 7"
+    },
+
+    "the Brick Road Maze": {
+        "Brick Road Maze - Top Path Present",
+        "Brick Road Maze - Guarded Present",
+        "Brick Road Maze - Out of the Way Present",
+        "Brick Road Maze - Alcove Present",
+        "Brick Road Maze - Near Exit Present"
+    },
+
+    "Rainy Circle": {
+        "Rainy Circle - Isolated Present",
+        "Rainy Circle - East Cliff Present",
+        "Rainy Circle - Near Ropes Present"
+    },
+
+    "Dr. Andonuts's Lab": {
+        "Andonuts Lab - Present",
+        "Andonuts Lab - Mouse",
+        "Andonuts Lab - Caveman Shop Slot 1",
+        "Andonuts Lab - Caveman Shop Slot 2",
+        "Andonuts Lab - Caveman Shop Slot 3",
+        "Andonuts Lab - Caveman Shop Slot 4",
+        "Andonuts Lab - Caveman Shop Slot 5"
+    },
+
+    "Stonehenge Maze Area": {
+        "Stonehenge - Purple Maze Present",
+        "Stonehenge - Dead End Present",
+        "Stonehenge - Near End of the Maze Present"
+    },
+
+    "Stonehenge Bridge Area": {
+        "Stonehenge - Bridge Room East Balcony Present",
+        "Stonehenge - Bridge Room Lower Present"
+    },
+
+    "Stonehenge Flashing Area": {
+        "Stonehenge - Flashing Room Right Path Present",
+        "Stonehenge - Flashing Room Center Present",
+        "Stonehenge - Flashing Room Upper Present"
+    },
+
+    "Stonehenge Tube Room": {
+        "Stonehenge - Kidnapped Mr. Saturn",
+        "Stonehenge - Tony Item"
+    },
+
+    "Gold Mine 1F": {
+        "Gold Mine - Mouse Crossroad Present #1",
+        "Gold Mine - Mouse Crossroad Present #2",
+        "Gold Mine - South Hall Present",
+        "Gold Mine - South Corner Present",
+        "Gold Mine - South Mole Present #1",
+        "Gold Mine - South Mole Present #2",
+        "Gold Mine - North Crossroad Detour Present",
+        "Gold Mine - North Mole Present",
+        "Gold Mine - West Mole Present",
+        "Gold Mine - West Crossroad Detour Present"
+
+    },
+
+    "Gold Mine B1F": {
+        "Gold Mine - B1F Lonely Mole Present",
+        "Gold Mine - B1F Isolated Present",
+        "Gold Mine - B1F Junction Present",
+        "Gold Mine - B1F Junction Mole Present"
+        
+    },
+
+    "Monkey Caves West Wing": {
+        "Monkey Caves - 1F Left Chest",
+        "Monkey Caves - West 2F Left Chest",
+        "Monkey Caves - West 2F Right Chest #1",
+        "Monkey Caves - West 2F Right Chest #2",
+        "Monkey Caves - West End Chest",
+        "Monkey Caves - West End Trashcan",
+
+        
+    },
+
+    "Monkey Caves East Wing": {
+        "Monkey Caves - 1F Right Chest",
+        "Monkey Caves - East 2F Left Chest",
+        "Monkey Caves - East 2F Right Chest",
+        "Monkey Caves - East West 3F Right Chest #1",
+        "Monkey Caves - East West 3F Right Chest #2",
+        "Monkey Caves - East End Chest",
+        "Monkey Caves - East End Trashcan",
+        "Monkey Caves - Bow Monkey Gift"
+        
+    },
+
+    "Monkey Caves Talah Rama Room": {
+        "Monkey Caves - Talah Rama Chest #1",
+        "Monkey Caves - Talah Rama Chest #2",
+        "Monkey Caves - Talah Rama Gift",
+        "Monkey Caves - Monkey Power"
+        
+    },
+
+    "Fourside": {
+        "Fourside - Venus Gift",
+        "Fourside - Bakery 2F Gift",
+        "Fourside - Department Store Blackout",
+        "Fourside Department Store - Tool Shop Slot 1",
+        "Fourside Department Store - Tool Shop Slot 2",
+        "Fourside Department Store - Tool Shop Slot 3",
+        "Fourside Department Store - Tool Shop Slot 4",
+        "Fourside Department Store - Tool Shop Slot 5",
+        "Fourside Department Store - Tool Shop Slot 6",
+        "Fourside Department Store - Tool Shop Slot 7",
+        "Fourside Department Store - Shop Shop Slot 1",
+        "Fourside Department Store - Shop Shop Slot 2",
+        "Fourside Department Store - Shop Shop Slot 3",
+        "Fourside Department Store - Shop Shop Slot 4",
+        "Fourside Department Store - Food Shop Slot 1",
+        "Fourside Department Store - Food Shop Slot 2",
+        "Fourside Department Store - Food Shop Slot 3",
+        "Fourside Department Store - Food Shop Slot 4",
+        "Fourside Department Store - Food Shop Slot 5",
+        "Fourside Department Store - 2F Cart Slot 1",
+        "Fourside Department Store - 2F Cart Slot 2",
+        "Fourside Department Store - 2F Cart Slot 3",
+        "Fourside Department Store - 2F Cart Slot 4",
+        "Fourside Department Store - 2F Cart Slot 5",
+        "Fourside Department Store - 2F Cart Slot 6",
+        "Fourside Department Store - 2F Cart Slot 7",
+        "Fourside Department Store - Toys Shop Slot 1",
+        "Fourside Department Store - Toys Shop Slot 2",
+        "Fourside Department Store - Toys Shop Slot 3",
+        "Fourside Department Store - Toys Shop Slot 4",
+        "Fourside Department Store - Toys Shop Slot 5",
+        "Fourside Department Store - Toys Shop Slot 6",
+        "Fourside Department Store - Sports Shop Slot 1",
+        "Fourside Department Store - Sports Shop Slot 2",
+        "Fourside Department Store - Sports Shop Slot 3",
+        "Fourside Department Store - Sports Shop Slot 4",
+        "Fourside Department Store - Burger Shop Slot 1",
+        "Fourside Department Store - Burger Shop Slot 2",
+        "Fourside Department Store - Burger Shop Slot 3",
+        "Fourside Department Store - Burger Shop Slot 4",
+        "Fourside Department Store - Burger Shop Slot 5",
+        "Fourside Department Store - Arms Dealer Slot 1",
+        "Fourside Department Store - Arms Dealer Slot 2",
+        "Fourside Department Store - Arms Dealer Slot 3",
+        "Fourside Department Store - Arms Dealer Slot 4",
+        "Fourside Department Store - Arms Dealer Slot 5",
+        "Fourside - Northeast Alley Junk Shop Slot 1",
+        "Fourside - Northeast Alley Junk Shop Slot 2",
+        "Fourside - Northeast Alley Junk Shop Slot 3",
+        "Fourside - Northeast Alley Junk Shop Slot 4",
+        "Fourside Bakery - Slot 1",
+        "Fourside Bakery - Slot 2",
+        "Fourside Bakery - Slot 3",
+        "Fourside Bakery - Slot 4",
+        "Fourside Bakery - Slot 5",
+        "Fourside Bakery - Slot 6"
+    },
+
+    "Moonside": {
+        "Moonside - Two Trees Present",
+        "Moonside - East Island Present",
+        "Moonside - Businessman Present",
+        "Moonside - West Island Present",
+        "Moonside - Hospital Present",
+        "Fourside - Post-Moonside Delivery",
+        "Moonside Hotel - Shop Slot 1",
+        "Moonside Hotel - Shop Slot 2",
+        "Moonside Hotel - Shop Slot 3",
+        "Moonside Hotel - Shop Slot 4",
+        "Moonside Hotel - Shop Slot 5"
+        
+    },
+
+    "Magnet Hill": {
+        "Magnet Hill - West Entrance Trashcan",
+        "Magnet Hill - First Room Free Door Trashcan",
+        "Magnet Hill - First Room Barrel Door Trashcan",
+        "Magnet Hill - Second Room Dead End Trashcan",
+        "Magnet Hill - Final Room Door Trashcan",
+        "Fourside - Magnet Hill Chest"
+        
+    },
+
+    "Monotoli Building": {
+        "Monotoli Building - One Table Present",
+        "Monotoli Building - Two Table Present",
+        "Monotoli Building - Electra Gift",
+        "Monotoli Building - Monotoli Gift",
+        "Monotoli Building - Monotoli Character"
+        
+    },
+
+    "Summers": {
+        "Summers - Museum Item",
+        "Summers - Magic Cake",
+        "Summers - Beach Cart",
+        "Summers - Magic Cake Cart Shop Slot",
+        "Summers - Scam Shop Slot 1",
+        "Summers - Scam Shop Slot 2",
+        "Summers - Scam Shop Slot 3",
+        "Summers - Scam Shop Slot 4",
+        "Summers - Scam Shop Slot 5",
+        "Summers - Scam Shop Slot 6",
+        "Summers - Scam Shop Slot 7",
+        "Summers Harbor - Shop Slot 1",
+        "Summers Harbor - Shop Slot 2",
+        "Summers Harbor - Shop Slot 3",
+        "Summers Harbor - Shop Slot 4",
+        "Summers Harbor - Shop Slot 5",
+        "Summers Harbor - Shop Slot 6",
+        "Summers Harbor - Shop Slot 7",
+        "Summers Restaurant - Slot 1",
+        "Summers Restaurant - Slot 2",
+        "Summers Restaurant - Slot 3",
+        "Summers Restaurant - Slot 4",
+        "Summers Restaurant - Slot 5",
+        "Summers Restaurant - Slot 6"
+    },
+
+    "Dalaam": {
+        "Dalaam - Throne Room Chest #1",
+        "Dalaam - Throne Room Chest #2",
+        "Dalaam - Throne Room Chest #3",
+        "Dalaam - Trial of Mu",
+        "Dalaam - Restaurant Chest #1",
+        "Dalaam - Restaurant Chest #2",
+        "Dalaam - Do Do Guy's House Chest",
+        "Dalaam - Upper House Chest",
+        "Dalaam - Throne Character",
+        "Dalaam Restaurant - Slot 1",
+        "Dalaam Restaurant - Slot 2",
+        "Dalaam Restaurant - Slot 3",
+        "Dalaam Restaurant - Slot 4"
+        
+    },
+
+    "Pink Cloud": {
+        "Pink Cloud - Three Holes Present",
+        "Pink Cloud - Left Hole Present",
+        "Pink Cloud - Ground Floor Present"
+    },
+
+    "Scaraba": {
+        "Scaraba - Snake Bag Salesman",
+        "Scaraba - Star Master",
+        "Scaraba - Key Holder",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 1",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 2",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 3",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 4",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 5",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 6",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 7",
+        "Scaraba - Expensive Water Guy",
+        "Scaraba - Indoors Shop Slot 1",
+        "Scaraba - Indoors Shop Slot 2",
+        "Scaraba - Indoors Shop Slot 3",
+        "Scaraba - Indoors Shop Slot 4",
+        "Scaraba - Indoors Shop Slot 5",
+        "Scaraba - Indoors Shop Slot 6",
+        "Scaraba Hotel - Arms Dealer Slot 1",
+        "Scaraba Hotel - Arms Dealer Slot 2",
+        "Scaraba Hotel - Arms Dealer Slot 3",
+        "Scaraba Hotel - Arms Dealer Slot 4",
+        "Scaraba - Southern Camel Shop Slot 1",
+        "Scaraba - Southern Camel Shop Slot 2",
+        "Scaraba - Southern Camel Shop Slot 3",
+        "Scaraba - Southern Camel Shop Slot 4",
+        "Scaraba - Southern Camel Shop Slot 5",
+        "Scaraba - Southern Camel Shop Slot 6",
+        "Scaraba - Southern Camel Shop Slot 7"
+    },
+
+    "the Pyramid": {
+        "Pyramid - Anteroom Sarcophagus",
+        "Pyramid - Northwest Door Sarcophagus",
+        "Pyramid - Hallway Sarcophagus #1",
+        "Pyramid - Hallway Sarcophagus #2",
+        "Pyramid - Switch Room Sarcophagus",
+        "Pyramid - Pedestal Item",
+        "Pyramid - Way Out Sarcophagus"
+    },
+
+    "Dungeon Man 1F": {
+        "Dungeon Man - 1F Dead End Present",
+        "Dungeon Man - 1F Long Walk Present",
+        "Dungeon Man - 1F Disappointing Present",
+        "Dungeon Man - 1F Opinion Present",
+        "Dungeon Man - 1F No Sign Present",
+        "Dungeon Man - 1F Exit Ledge Present"
+    },
+
+    "Dungeon Man 2F": {
+        "Dungeon Man - 2F Unnecessary Billboard Present",
+        "Dungeon Man - 2F Dungeon Exploration Present",
+        "Dungeon Man - 2F South Ledge Present",
+        "Dungeon Man - 2F North Alcove Present",
+        "Dungeon Man - 2F Hole Present"
+    },
+
+    "Dungeon Man 3F": {
+        "Dungeon Man - 3F Present"
+    },
+
+    "Deep Darkness": {
+        "Deep Darkness - Teleporting Monkey",
+        "Deep Darkness - Crest of Darkness Present",
+        "Deep Darkness - Helicopter Present",
+        "Deep Darkness - Yellow Bird Present",
+        "Deep Darkness - Swamp Present",
+        "Deep Darkness - Corner Present",
+        "Deep Darkness - Alcove Present",
+        "Deep Darkness - Barf Character",
+        "Deep Darkness - Businessman Slot 1",
+        "Deep Darkness - Businessman Slot 2",
+        "Deep Darkness - Businessman Slot 3",
+        "Deep Darkness - Businessman Slot 4",
+        "Deep Darkness - Businessman Slot 5",
+        "Deep Darkness - Businessman Slot 6",
+        "Deep Darkness - Businessman Slot 7",
+        "Deep Darkness - Arms Dealer Slot 1",
+        "Deep Darkness - Arms Dealer Slot 2",
+        "Deep Darkness - Arms Dealer Slot 3",
+        "Deep Darkness - Arms Dealer Slot 4"
+    },
+
+    "Deep Darkness Truffles": {
+        "Deep Darkness - North Alcove Truffle",
+        "Deep Darkness - Near Land Truffle",
+        "Deep Darkness - Present Truffle",
+        "Deep Darkness - Village Truffle",
+        "Deep Darkness - Entrance Truffle"
+    },
+
+    "Tenda Village": {
+        "Tenda Village - Trashcan",
+        "Tenda Village - Tenda Tea",
+        "Tenda Village - Tenda Gift",
+        "Tenda Village - Tenda Gift #2"
+    },
+
+    "Lumine Hall 1F": {
+        "Lumine Hall - 1F North Path Present",
+        "Lumine Hall - 1F Above Belly Button Present",
+        "Lumine Hall - 1F Near Exit Present",
+        "Lumine Hall - 1F Dead End Present"
+    },
+
+    "Lumine Hall B1F": {
+        "Lumine Hall - B1F Non-Talkative Rock Present",
+        "Lumine Hall - B1F Thankful Rock Corner Present",
+        "Lumine Hall - B1F Thankful Rock Junction Present",
+        "Lumine Hall - B1F Belly Button Present",
+        "Lumine Hall - B1F West Alcove Present"
+    },
+    
+    "Lost Underworld": {
+        "Lost Underworld - Talking Rock",
+        "Lost Underworld - East Present",
+        "Lost Underworld - Northeast Present",
+        "Lost Underworld - Northeast of Tenda Tribe Present",
+        "Lost Underworld - Southwest of Tenda Tribe Present",
+        "Lost Underworld - Evacuation Present",
+        "Lost Underworld - Tenda Camp Shop Slot 1",
+        "Lost Underworld - Tenda Camp Shop Slot 2",
+        "Lost Underworld - Tenda Camp Shop Slot 3",
+        "Lost Underworld - Tenda Camp Shop Slot 4",
+        "Lost Underworld - Tenda Camp Shop Slot 5",
+        "Lost Underworld - Tenda Camp Shop Slot 6",
+        "Lost Underworld - Tenda Camp Shop Slot 7"
+    },
+
+    "Fire Spring": {
+        "Fire Spring - 1st Cave Present",
+        "Fire Spring - East Corner Present",
+        "Fire Spring - Volcano Present",
+        "Fire Spring - Lone Cave Present",
+        "Fire Spring - Upper Volcano Present"
+    },
+
+    "Magicant": {
+        "Magicant - Ness's Gift",
+        "Magicant - Present Near Ness",
+        "Magicant - Lonely Present",
+        "Magicant - North Present",
+        "Magicant - Hills Present",
+        "Magicant - Town Present",
+        "Magicant - Shop Slot 1",
+        "Magicant - Shop Slot 2"
+    },
+    
+
+    "Sea of Eden": {
+        "Magicant - Ness's Nightmare"
+    },
+
+    "Cave of the Present": {
+        "Cave of the Present - Star Master",
+        "Cave of the Present - Broken Phase Distorter"
+    },
+
+    "Cave of the Past": {
+        "Cave of the Past - Present"
+    },
+    
+    "Burglin Park": {
+        "Burglin Park Junk Shop - Slot 1",
+        "Burglin Park Junk Shop - Slot 2",
+        "Burglin Park Junk Shop - Slot 3",
+        "Burglin Park Junk Shop - Slot 4",
+        "Burglin Park Junk Shop - Slot 5",
+        "Burglin Park Junk Shop - Slot 6",
+        "Burglin Park Bread Stand - Slot 1",
+        "Burglin Park Bread Stand - Slot 2",
+        "Burglin Park Bread Stand - Slot 3",
+        "Burglin Park Bread Stand - Slot 4",
+        "Burglin Park Bread Stand - Slot 5",
+        "Burglin Park Bread Stand - Slot 6",
+        "Burglin Park - Banana Stand",
+        "Twoson - Everdred Meeting",
+        "Twoson - Apple Kid Invention",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 1",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 2",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 3",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 4",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 5",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 6",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 7"
+    },
+
+    "the Scaraba Bazaar": {
+        "Scaraba Bazaar - Delicacy Shop Slot 1",
+        "Scaraba Bazaar - Delicacy Shop Slot 2",
+        "Scaraba Bazaar - Delicacy Shop Slot 3",
+        "Scaraba Bazaar - Delicacy Shop Slot 4",
+        "Scaraba Bazaar - Delicacy Shop Slot 5",
+        "Scaraba Bazaar - Delicacy Shop Slot 6",
+        "Scaraba Bazaar - Delicacy Shop Slot 7",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 1",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 2",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 3",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 4",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 5",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 6",
+        "Twoson/Scaraba - Shared Condiment Shop Slot 7",
+        "Scaraba Bazaar - Red Snake Carpet Slot 1",
+        "Scaraba Bazaar - Red Snake Carpet Slot 2",
+        "Scaraba Bazaar - Red Snake Carpet Slot 3",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 1",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 2",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 3",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 4",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 5",
+        "Scaraba Bazaar - Bottom Left Carpet Slot 6"
+    },
+
+    "the Twoson Department Store": {
+        "Twoson Department Store Burger Shop - Slot 1",
+        "Twoson Department Store Burger Shop - Slot 2",
+        "Twoson Department Store Burger Shop - Slot 3",
+        "Twoson Department Store Burger Shop - Slot 4",
+        "Twoson Department Store Bakery - Slot 1",
+        "Twoson Department Store Bakery - Slot 2",
+        "Twoson Department Store Bakery - Slot 3",
+        "Twoson Department Store Bakery - Slot 4",
+        "Twoson Department Store Top Floor - Right Counter Slot 1",
+        "Twoson Department Store Top Floor - Right Counter Slot 2",
+        "Twoson Department Store Top Floor - Right Counter Slot 3",
+        "Twoson Department Store Top Floor - Right Counter Slot 4",
+        "Twoson Department Store Top Floor - Right Counter Slot 5",
+        "Twoson Department Store Top Floor - Right Counter Slot 6",
+        "Twoson Department Store Top Floor - Left Counter Slot 1",
+        "Twoson Department Store Top Floor - Left Counter Slot 2"
+    },
+    
+    "the Fourside Department Store": {
+        "Fourside Department Store - Tool Shop Slot 1",
+        "Fourside Department Store - Tool Shop Slot 2",
+        "Fourside Department Store - Tool Shop Slot 3",
+        "Fourside Department Store - Tool Shop Slot 4",
+        "Fourside Department Store - Tool Shop Slot 5",
+        "Fourside Department Store - Tool Shop Slot 6",
+        "Fourside Department Store - Tool Shop Slot 7",
+        "Fourside Department Store - Shop Shop Slot 1",
+        "Fourside Department Store - Shop Shop Slot 2",
+        "Fourside Department Store - Shop Shop Slot 3",
+        "Fourside Department Store - Shop Shop Slot 4",
+        "Fourside Department Store - Food Shop Slot 1",
+        "Fourside Department Store - Food Shop Slot 2",
+        "Fourside Department Store - Food Shop Slot 3",
+        "Fourside Department Store - Food Shop Slot 4",
+        "Fourside Department Store - Food Shop Slot 5",
+        "Fourside Department Store - 2F Cart Slot 1",
+        "Fourside Department Store - 2F Cart Slot 2",
+        "Fourside Department Store - 2F Cart Slot 3",
+        "Fourside Department Store - 2F Cart Slot 4",
+        "Fourside Department Store - 2F Cart Slot 5",
+        "Fourside Department Store - 2F Cart Slot 6",
+        "Fourside Department Store - 2F Cart Slot 7",
+        "Fourside Department Store - Toys Shop Slot 1",
+        "Fourside Department Store - Toys Shop Slot 2",
+        "Fourside Department Store - Toys Shop Slot 3",
+        "Fourside Department Store - Toys Shop Slot 4",
+        "Fourside Department Store - Toys Shop Slot 5",
+        "Fourside Department Store - Toys Shop Slot 6",
+        "Fourside Department Store - Sports Shop Slot 1",
+        "Fourside Department Store - Sports Shop Slot 2",
+        "Fourside Department Store - Sports Shop Slot 3",
+        "Fourside Department Store - Sports Shop Slot 4",
+        "Fourside Department Store - Burger Shop Slot 1",
+        "Fourside Department Store - Burger Shop Slot 2",
+        "Fourside Department Store - Burger Shop Slot 3",
+        "Fourside Department Store - Burger Shop Slot 4",
+        "Fourside Department Store - Burger Shop Slot 5",
+        "Fourside Department Store - Arms Dealer Slot 1",
+        "Fourside Department Store - Arms Dealer Slot 2",
+        "Fourside Department Store - Arms Dealer Slot 3",
+        "Fourside Department Store - Arms Dealer Slot 4",
+        "Fourside Department Store - Arms Dealer Slot 5",
+        "Fourside - Department Store Blackout"
+    },
+
+    "the Saturn Valley Shop": {
+        "Saturn Valley Shop - Center Saturn Slot 1",
+        "Saturn Valley Shop - Center Saturn Slot 2",
+        "Saturn Valley Shop - Center Saturn Slot 3",
+        "Saturn Valley Shop - Center Saturn Slot 4",
+        "Saturn Valley Shop - Center Saturn Slot 5",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 1",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 2",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 3",
+        "Saturn Valley Shop - Post-Belch Saturn Slot 4",
+        "Saturn Valley Shop - Top Saturn Slot 1",
+        "Saturn Valley Shop - Top Saturn Slot 2",
+        "Saturn Valley Shop - Top Saturn Slot 3",
+        "Saturn Valley Shop - Top Saturn Slot 4",
+        "Saturn Valley Shop - Top Saturn Slot 5",
+        "Saturn Valley Shop - Top Saturn Slot 6",
+        "Saturn Valley Shop - Top Saturn Slot 7"
+    }
+}
diff --git a/worlds/earthbound/game_data/text_data.py b/worlds/earthbound/game_data/text_data.py
new file mode 100644
index 0000000000..7ec7e856e3
--- /dev/null
+++ b/worlds/earthbound/game_data/text_data.py
@@ -0,0 +1,297 @@
+region_text = {
+    "Northern Onett": "Onett",
+    "Onett": "Onett",
+    "Giant Step": "Giant Step",
+    "Twoson": "Twoson",
+    "Peaceful Rest Valley": "Peaceful Rest Valley",
+    "Happy-Happy Village": "Happy-Happy Village",
+    "Lilliput Steps": "Lilliput Steps",
+    "Threed": "Threed",
+    "Belch's Factory": "Belch's factory",
+    "Saturn Valley": "Saturn Valley",
+    "Upper Saturn Valley": "Saturn Valley",
+    "Milky Well": "Milky Well",
+    "Dusty Dunes Desert": "the Dusty Dunes Desert",
+    "Gold Mine": "the gold mine",
+    "Monkey Caves": "the monkey caves",
+    "Fourside": "Fourside",
+    "Magnet Hill": "Fourside's sewers",
+    "Monotoli Building": "the Monotoli Building",
+    "Winters": "Winters",
+    "Snow Wood Boarding School": "the Snow Wood Boarding School",
+    "Southern Winters": "Winters",
+    "Rainy Circle": "Rainy Circle",
+    "Stonehenge Base": "Stonehenge",
+    "Summers": "Summers",
+    "Dalaam": "Dalaam",
+    "Pink Cloud": "Pink Cloud",
+    "Scaraba": "Scaraba",
+    "Pyramid": "the Pyramid",
+    "Southern Scaraba": "Scaraba",
+    "Dungeon Man": "Dungeon Man",
+    "Deep Darkness": "the Deep Darkness",
+    "Tenda Village": "Tenda Village",
+    "Lumine Hall": "Lumine Hall",
+    "Lost Underworld": "the Lost Underworld",
+    "Fire Spring": "Fire Spring",
+    "Magicant": "Magicant",
+    "Cave of the Present": "Cave of the Past",
+    "Cave of the Past": "Cave of the Past"
+}
+
+barf_text = {
+    "Paula": [0xE0, 0xC2, 0xEE, 0xBD, 0xC3, 0xEE],
+    "Jeff": [0xFA, 0xC2, 0xEE, 0x10, 0xC4, 0xEE],
+    "Poo": [0x1A, 0x74, 0xEF, 0x3E, 0xC4, 0xEE],
+    "Flying Man": [0x17, 0xC3, 0xEE, 0x95, 0xC4, 0xEE],
+    "Ness": [0x16, 0x07, 0xF3, 0x2B, 0x07, 0xF3],
+    "Photograph": [0x2F, 0x99, 0xC9, 0x2F, 0x99, 0xC9]
+}
+
+eb_text_table = {" ": ([0x50]), "!": ([0x51]), '"': ([0x52]), "■": ([0x53]), "$": ([0x54]), "%": ([0x55]),
+                 "°": ([0x56]), "'": ([0x57]), "(": ([0x58]), ")": ([0x59]), "*": ([0x5A]), "+": ([0x5B]),
+                 ",": ([0x5C]), "-": ([0x5D]), ".": ([0x5E]), "/": ([0x5F]), "0": ([0x60]), "1": ([0x61]),
+                 "2": ([0x62]), "3": ([0x63]), "4": ([0x64]), "5": ([0x65]), "6": ([0x66]), "7": ([0x67]),
+                 "8": ([0x68]), "9": ([0x69]), ":": ([0x6A]), ";": ([0x6B]), "“": ([0x6C]), "=": ([0x6D]),
+                 "”": ([0x6E]), "?": ([0x6F]), "@": ([0x70]), "A": ([0x71]), "B": ([0x72]), "C": ([0x73]),
+                 "D": ([0x74]), "E": ([0x75]), "F": ([0x76]), "G": ([0x77]), "H": ([0x78]), "I": ([0x79]),
+                 "J": ([0x7A]), "K": ([0x7B]), "L": ([0x7C]), "M": ([0x7D]), "N": ([0x7E]), "O": ([0x7F]),
+                 "P": ([0x80]), "Q": ([0x81]), "R": ([0x82]), "S": ([0x83]), "T": ([0x84]), "U": ([0x85]),
+                 "V": ([0x86]), "W": ([0x87]), "X": ([0x88]), "Y": ([0x89]), "Z": ([0x8A]), "α": ([0x8B]),
+                 "β": ([0x8C]), "γ": ([0x8D]), "Σ": ([0x8E]), "Ω": ([0x8F]), "a": ([0x91]), "b": ([0x92]),
+                 "c": ([0x93]), "d": ([0x94]), "e": ([0x95]), "f": ([0x96]), "g": ([0x97]), "h": ([0x98]),
+                 "i": ([0x99]), "j": ([0x9A]), "k": ([0x9B]), "l": ([0x9C]), "m": ([0x9D]), "n": ([0x9E]),
+                 "o": ([0x9F]), "p": ([0xA0]), "q": ([0xA1]), "r": ([0xA2]), "s": ([0xA3]), "t": ([0xA4]),
+                 "u": ([0xA5]), "v": ([0xA6]), "w": ([0xA7]), "x": ([0xA8]), "y": ([0xA9]), "z": ([0xAA]),
+                 "[": ([0xAB]), "♪": ([0xAC]), "]": ([0xAD]), "~": ([0xAE]), "◯": ([0xAF]), "_": ([0xB0]),
+                 "<": ([0xB1]), " ": ([0x90]), "&": ([0xB6]), "#": ([0xB7]), "\n": ([0x03, 0x00]), "ñ": ([0xB9]),
+                 "ä": ([0xBA]), "é": ([0xBB])}
+# 0x90 is a half-width space
+
+pixel_width_table = {" ": 2, "!": 2, '"': 3, "■": 2, "$": 5, "%": 9,
+                     "°": 7, "'": 2, "(": 3, ")": 3, "*": 3, "+": 5,
+                     ",": 2, "-": 2, ".": 2, "/": 4, "0": 5, "1": 5,
+                     "2": 5, "3": 5, "4": 5, "5": 5, "6": 5, "7": 5,
+                     "8": 5, "9": 5, ":": 2, ";": 3, "“": 3, "=": 5,
+                     "”": 3, "?": 4, "@": 5, "A": 6, "B": 5, "C": 5,
+                     "D": 5, "E": 4, "F": 4, "G": 5, "H": 5, "I": 1,
+                     "J": 4, "K": 5, "L": 4, "M": 7, "N": 5, "O": 5,
+                     "P": 5, "Q": 5, "R": 5, "S": 5, "T": 5, "U": 5,
+                     "V": 6, "W": 7, "X": 5, "Y": 5, "Z": 4, "α": 5,
+                     "β": 4, "γ": 6, "Σ": 4, "Ω": 5, "a": 4, "b": 4,
+                     "c": 4, "d": 4, "e": 4, "f": 3, "g": 4, "h": 4,
+                     "i": 1, "j": 2, "k": 4, "l": 1, "m": 7, "n": 4,
+                     "o": 4, "p": 4, "q": 4, "r": 3, "s": 4, "t": 3,
+                     "u": 4, "v": 5, "w": 7, "x": 4, "y": 4, "z": 4,
+                     "[": 2, "♪": 5, "]": 2, "~": 6, "◯": 7, "_": 5,
+                     "<": 4, " ": 1, "&": 6, "#": 6, "ñ": 6, "ä": 5,
+                     "é": 5}
+
+
+lumine_hall_text = [
+    "You paid 350 bucks for this seed",
+    "You could be playing Mario is Missing!",
+    "youtu.be/dQw4w9WgXcQ",
+    "Please help I am in BK mode",
+    "But anyways, its not about the glitch, its not about that its a video game, its because you don't care about how this is affecting other people, your heartless, you can apparently live with yourself with this.",
+    "Do you still remember your pin? It's the price of a cheese pizza and and a large soda back where I used to work; Panucci's Pizza.",
+    "Did you remember to clear your sphere 1?",
+    "You should use a tracker, personally I recommend Poptracker",
+    "You should try Mario Is Missing AP, its fun and funny.",
+    "Despite everything, you're still you.",
+    "Bababooey",
+    "Reticulating Splines",
+    "You only have one shot.",
+    "human.. i remember you're genocides.",
+    '"May your woes be many, and your days few."',
+    "For you, the day Pokey graced your village was the most important day of your life. But for me, it was Tuesday.",
+    "To shreds you say?",
+    "Hey player, I'm in BK, can you get my item at Starman Super Drop Sword of Kings?  It's my go mode.",
+    "Why did you make me do this? You're fighting so you can watch everyone around you die! Think, Player Name! You'll outlast every fragile, insignificant being on this planet.",
+    "Is this thing on?  Testing.  Oh hey, its me, Tony!  Is Jeff doing okay?  I worry about him a lot, and he's like, on my mind a lot.  Maybe stop by Winters sometime!  Pretty please?",
+    "If you have your club card, please scan it now.",
+    "Come on Reggie, give us MOTHER 3!",
+    "Growing up, Man I spent hours of my life stomping................................................................................................................................................ Koopas.",
+    "We've been trying to reach you about your car's extended warranty...",
+    "YOU MUST CONSTRUCT ADDITIONAL PYLONS!!!",
+    "It all start on the day the Happy Happyists attacked...",
+    "You just lost the game.",
+    "ERROR 404: HALL TEXT NOT FOUND.",
+    "Long ago, two races ruled over Earth: HUMANS and MONSTERS. One day, war broke out between the two races. After a long battle, the humans were victorious. They sealed the monsters underground with a magic spell.",
+    "Once upon a time, a LEGEND was whispered among shadows. It was a LEGEND of HOPE. It was a LEGEND of DREAMS. It was a LEGEND of LIGHT. It was a LEGEND of DARK.",
+    "OwO? What's This?",
+    "What about now it's time to rock with the Bickedy Buck Buzz Buzz! What about now it's time to rock with the Bickedy Buck Buzz Buzz! Bum to the bum to the bum to the bass to the bum to the boom to the Buzz Buzz!",
+    "HOW ARE YOU GENTLEMEN !! ALL YOUR BASE ARE BELONG TO US.",
+    "You're just the delivery boy. Sorry, your parts over now. Here, go play hero with this.",
+    "My friends are my power, and I'm theirs!",
+    "Did somebody mention the Door to Darkness?",
+    "We hope you'll be a great asset to the company. Great asset to the company. Asset-Great-Great-Asset to the Company.",
+    "So thanks, goat-bunny-cat lady.",
+    "It's dangerous to go alone, take this!",
+    "The rabbit virus got so happy that it exploded!!",
+    "Steve tried to swim in lava.",
+    "The flow of time is always cruel... its speed seems different for each person, but no one can change it... A thing that does not change with time is a memory of younger days...",
+    "Hah! You better have BURN HEAL!",
+    "..and so she left, heart still racing.",
+    "I've found you faker! Faker? I think you're the fake hedgehog around here. In fact, you're not even good enough be my fake. I'll make you eat those words!",
+    "Don't ask about Mother 3 AP.",
+    "Hello. This is Punk-Sure. I've been trying to reach you about your bicycle's extended warranty.",
+    "Who's that kid with blue hair whose name sounds like evil? Who suspiciously showed up to say we'd die like wretches? Surely HE'S not the bad guy, right? Nah, not when he has such a cool violin. Perish the thought!",
+    "I wonder if xfisjmg1 is going to release another Ninten Speaks video anytime soon?",
+    "weedle",
+    "hi",
+    "Look Ma, I'm in Lumine Hall!",
+    "Did you check Aginah?",
+    "Eat at Joe's",
+    "FOR A GOOD TIME, CALL 555-...",
+    "!hint Moon Pearl",
+    "'); DROP TABLE Lumine Hall Text;--",
+    "No, no! We can't! This baby is a demon child!",
+    "Rhydon Earthquake vs. Mr. Mime: 169-199 (59.7 - 70.3%) -- guaranteed 2HKO",
+    "Dakota",
+    "Ness, I am your father.",
+    "Hello, it's your dad. You've been out there for a long time now... It may be none of my business, but don't you think it would be a good idea if you took a break?",
+    "RIP AND TEAR",
+    "Sorry Ness, Pokey died of ligma",
+    "A horrible chill goes down your spine...",
+    "You feel an evil presence watching you...",
+    "Going to BK, BRB.",
+    "My favorite Mr. Saturn... It... cute... lovely... smart... plus... amazing... you think so? Hug it... when... sleeping... warm and cuddly... spectacular... ravishing... Oops! Look at the time! I kept you too long!",
+    "THE CLUMSY ROBOT IN NAME ONLY, FOR IT IS NEITHER.",
+    "The Arcana is the means by which all is revealed.",
+    "Say the password!                                                                                                                                                                                  ",
+    "Hello?  Is there anybody in there?  Just nod if you can hear me.  Is there anyone home?",
+    "I bought my sneakers from a drug dealer in Fourside.  I don't know what they were laced with but I've been tripping all day.",
+    "Sans Is Ness",
+    "Your Goal This Game: Join Happy Happyism",
+    "There's only junk items that way.",
+    "GET OUT WHILE YOU STILL CAN",
+    "Why isn't my SNI connecting?",
+    "It's 10 p.m.  Do you know where your kids are?",
+    "If they censored what the adults were drinking to coffee, then what did Mr. Saturn give Ness originally?",
+    "Fourside Frappuccino.  Work can wait.",
+    "Let's do an Archibald seed !",
+    "WARNING! Scheduled Maintenance in 4 Minutes...",
+    "I'm still stuck in BK",
+    "John Madden! John Madden! John Madden! John Madden! John Madden! John Madden! John Madden! ",
+    "Did you know that by reading this message you are wasting time not getting checks?",
+    "Your text here! Check the game's design thread on the Archipelago Server for how to submit!",
+    "WITNESS JOKE HERE",
+    "Also try The Witness!",
+    "Also try Adventure!",
+    "Also try DOOM 1993!",
+    "Also try Super Mario World!",
+    "Also try Yoshi's Island!",
+    "Also try Castlevania 64!",
+    "Hi Mom! I'm on AP!",
+    "Looking for hot multiworlds in your area?",
+    "Paleontologists do it in the dirt.",
+    "Wait... something seems off...   Things seem more random than usual...",
+    "Shoutouts to SimpleFlips.",
+    "How long have you been BK?",
+    "Also try PK Scramble!",
+    "Also try Ancient Cave!",
+    "I am playing this on AP version 1.0 and it is amazing.",
+    "WHAT A HORRIBLE NIGHT TO HAVE A CURSE.",
+    "It's so jover",
+    "The National Weather Service has issued a severe thunderstorm warning for the following areas, starting at 7:49 PM Eastern Daylight Time and ending at 7:49 PM Eastern Daylight Time.",
+    "Where is everyone? I've done most of my checks and I still can't find my friends, it's so lonely here.",
+    "Can you hurry up and go to Ness's Nightmare it has my Morph Ball for my Super Metroid seed Thanks in advance Berserker",
+    "gottem",
+    "Dear Ness,      please come to the house. I've baked a steak for you.       Yours truly,       mom.",
+    "Phar why",
+    "Tell Figment to check POD!",
+    "Congratulations, you're the Lumine Hall's 100th visitor! Click here for $2 off your next order at the Onett Burger Shop!",
+    "Well, that's never happened before...",
+    "99 bottles of DXWater on the wall, 99 bottles of DXWater. Take one down, pass it around, 98 bottles of DXWater on the wall!",
+    "After all these years. Finally, I have them all.",
+    "If there were two guys on the moon and one killed the other with a rock would that be screwed up or what",
+    "Help, I'm trapped in a Lumine Hall factory!",
+    "They say that Ice Palace can be found at Ice Palace...",
+    "Hey Mom, I'm in AP!",
+    "It says “gullible” on the wall",
+    "64 bits! 32 bits! 16 bits! 8 bits! 4 bits! 2 bits! 1 bit! Half bit! Quarter bit! THE WRIST GAME!!!",
+    "Where did YOU learn to teleport?",
+    "My statistics show about 70% of kids these days don't stop to read bulletin boards anymore. Well, I had to shell out a lot of money for this, but let's see you ignore THIS one, suckers!          ...Brick Road",
+    "I'm Ness... I could go for a burger right about now... That girl from Twoson sure is cute... I wonder if I should ask her out on a date... W...wha...? What's...? H-HEY! These thoughts are PRIVATE!",
+    "Chris, when is Parasite Eve in AP?",
+    "Praise the Fool!",
+    "Am I the only one who likes Sonic Unleashed?"
+]
+
+spoiler_psi = {
+    "Special": "PSI Rockin",
+    "Fire": "PSI Fire",
+    "Freeze": "PSI Freeze",
+    "Thunder": "PSI Thunder",
+    "Flash": "PSI Flash",
+    "Starstorm": "PSI Starstorm",
+    "Shield": "Shield",
+    "PSI Shield": "PSI Shield",
+    "Offense Up": "Offense up",
+    "Defense Down": "Defense down",
+    "Hypnosis": "Hypnosis",
+    "Paralysis": "Paralysis",
+    "Brainshock": "Brainshock",
+    "Blast": "PSI Blast",
+    "Missile": "PSI Missile",
+    "Stop": "Stop",
+    "Drain": "Drain",
+    "Defense up": "Defense up",
+    "Neutralize": "Neutralize",
+    "Disable": "Disable"
+}
+
+spoiler_starts = [
+    "Ness's House",
+    "Onett Downtown",
+    "Twoson",
+    "Happy-Happy Village",
+    "Threed",
+    "Saturn Valley",
+    "Fourside",
+    "Winters",
+    "Summers",
+    "Dalaam",
+    "Scaraba",
+    "Deep Darkness",
+    "Tenda Village",
+    "Lost Underworld",
+    "Magicant"
+]
+
+spoiler_badges = {
+    "special": "Rockin",
+    "fire": "Fire",
+    "freeze": "Freeze",
+    "flash": "Flash",
+    "starstorm": "Starstorm",
+    "explosive": "Bomb",
+    "thunder": "Thunder",
+}
+
+
+def text_encoder(text: str, textcap: int) -> bytearray:
+    """Return an encoded bytearray of in-game text from a string. Unknown characters will be replaced with a ?.
+       textcap is the maximum allowed length of the text."""
+    encoded_text = bytearray()
+    for char in text[:textcap]:
+        if char in eb_text_table:
+            encoded_text.extend(eb_text_table[char])
+        else:
+            encoded_text.extend([0x6F])
+    return encoded_text
+
+
+def calc_pixel_width(text: str) -> int:
+    """Return the in-game width of a string. EarthBound uses a VWF, and some text strings
+       need to be shortened to fit within in-game menus."""
+    width = 0
+    for char in text:
+        if char in pixel_width_table:
+            width += pixel_width_table[char]
+        else:
+            width += 4
+        width += 1
+    width -= 1
+    return width
diff --git a/worlds/earthbound/gifting/__init__.py b/worlds/earthbound/gifting/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/earthbound/gifting/gift_tags.py b/worlds/earthbound/gifting/gift_tags.py
new file mode 100644
index 0000000000..8aff19866e
--- /dev/null
+++ b/worlds/earthbound/gifting/gift_tags.py
@@ -0,0 +1,606 @@
+from dataclasses import dataclass
+from typing import List
+
+gift_qualities = {
+    "Super Plush Bear": {"MeatShield": 3},
+    "Cracked Bat": {"Weapon": 0.07},
+    "Tee Ball Bat": {"Weapon": 0.14},
+    "Sand Lot Bat": {"Weapon": 0.27},
+    "Minor League Bat": {"Weapon": 0.48},
+    "Mr. Baseball Bat": {"Weapon": 0.70},
+    "Big League Bat": {"Weapon": 0.90},
+    "Hall of Fame Bat": {"Weapon": 1.14},
+    "Magicant Bat": {"Weapon": 1.48},
+    "Legendary Bat": {"Weapon": 2.03},
+    "Gutsy Bat": {"Weapon": 4.0},
+    "Casey Bat": {"Weapon": 0.1},
+    "T-Rex's Bat": {"Weapon": 0.88},
+    "Ultimate Bat": {"Weapon": 1.25},
+
+    "Fry Pan": {"Weapon": 0.24},
+    "Thick Fry Pan": {"Weapon": 0.48},
+    "Deluxe Fry Pan": {"Weapon": 0.73},
+    "Chef's Fry Pan": {"Weapon": 0.97},
+    "Non-Stick Frypan": {"Weapon": 1.19},
+    "French Fry Pan": {"Weapon": 1.46},
+    "Holy Fry Pan": {"Weapon": 1.90},
+    "Magic Frypan": {"Weapon": 2.5},
+
+    "Pop Gun": {"Weapon": 0.25},
+    "Stun Gun": {"Weapon": 0.34},
+    "Toy Air Gun": {"Weapon": 0.50},
+    "Magnum Air Gun": {"Weapon": 0.57},
+    "Zip Gun": {"Weapon": 0.63},
+    "Laser Gun": {"Weapon": 0.76},
+    "Hyper Beam": {"Weapon": 0.92},
+    "Double Beam": {"Weapon": 1.04},
+    "Crusher Beam": {"Weapon": 1.14},
+    "Spectrum Beam": {"Weapon": 1.24},
+    "Death Ray": {"Weapon": 1.42},
+    "Baddest Beam": {"Weapon": 1.55},
+    "Moon Beam Gun": {"Weapon": 1.74},
+    "Gaia Beam": {"Weapon": 1.98},
+    "Sword of Kings": {"Weapon": 2.00},
+
+    "Bag of Fries": {"Heal": 0.24},
+    "Banana": {"Heal": 0.22},
+    "Bean Croquette": {"Heal": 0.42},
+    "Beef Jerky": {"Heal": 1.50},
+    "Boiled Egg": {"Heal": 0.42},
+    "Bowl of Rice Gruel": {"Heal": 2.16},
+    "Brain Food Lunch": {"Heal": 3.00, "Mana": 1.42},
+    "Bread Roll": {"Heal": 0.30},
+    "Calorie Stick": {"Heal": 0.60},
+    "Can of Fruit Juice": {"Heal": 0.06},
+    "Chef's Special": {"Heal": 2.16},
+    "Cookie": {"Heal": 0.06},
+    "Croissant": {"Heal": 0.60},
+    "Cup of Coffee": {"Heal": 0.12},
+    "Cup of Noodles": {"Heal": 0.42},
+    "Double Burger": {"Heal": 0.96},
+    "Fresh Egg": {"Heal": 0.84},
+    "Hamburger": {"Heal": 0.48},
+    "Kabob": {"Heal": 1.26},
+    "Kraken Soup": {"Heal": 9.99},
+    "Large Pizza": {"Heal": 2.40},
+    "Lucky Sandwich": {"Heal": 0.60, "Mana": 0.57},
+    "Luxury Jerky": {"Heal": 3.00},
+    "Mammoth Burger": {"Heal": 2.05},
+    "Molokheiya Soup": {"Heal": 0.84},
+    "Pasta di Summers": {"Heal": 1.10},
+    "Peanut Cheese Bar": {"Heal": 1.00},
+    "Picnic Lunch": {"Heal": 0.80},
+    "Piggy Jelly": {"Heal": 3.00},
+    "Pizza": {"Heal": 1.20},
+    "Plain Roll": {"Heal": 0.80},
+    "Plain Yogurt": {"Heal": 1.60},
+    "Popsicle": {"Heal": 0.18},
+    "Protein Drink": {"Heal": 0.80},
+    "Royal Iced Tea": {"Heal": 0.60},
+    "Repel Sandwich": {"Heal": 0.06},
+    "Repel Superwich": {"Heal": 0.06},
+    "Spicy Jerky": {"Heal": 2.52},
+    "Trout Yogurt": {"Heal": 0.30},
+    "Hand-Aid": {"Heal": 9.99},
+
+    "Cold Remedy": {"Cure": 0.10},
+    "Vial of Serum": {"Cure": 0.25},
+    "Wet Towel": {"Cure": 0.50},
+    "Refreshing Herb": {"Cure": 1.00},
+    "Secret Herb": {"Cure": 2.00, "Life": 0.50},
+    "Horn of Life": {"Cure": 3.00, "Life": 1.00},
+    "Cup of Lifenoodles": {"Cure": 3.00, "Life": 1.00},
+
+    "Bottle of Water": {"Mana": 0.28},
+    "Bottle of DXwater": {"Mana": 1.14},
+    "Magic Pudding": {"Mana": 1.14},
+    "Magic Tart": {"Mana": 0.57},
+    "Magic Truffle": {"Mana": 2.28},
+    "PSI Caramel": {"Mana": 0.57},
+
+    "Cheap Bracelet": {"Armor": 0.12},
+    "Copper Bracelet": {"Armor": 0.25},
+    "Silver Bracelet": {"Armor": 0.37},
+    "Gold Bracelet": {"Armor": 0.75},
+    "Platinum Band": {"Armor": 1.00},
+    "Diamond Band": {"Armor": 1.25},
+    "Pixie's Bracelet": {"Armor": 1.50},
+    "Cherub's Band": {"Armor": 1.75},
+    "Goddess Band": {"Armor": 2.00},
+    "Bracer of Kings": {"Armor": 0.87, "Fire": 0.50},
+
+    "Ribbon": {"Armor": 0.35},
+    "Red Ribbon": {"Armor": 0.43},
+    "Defense Ribbon": {"Armor": 0.70},
+    "Talisman Ribbon": {"Armor": 1.05},
+    "Saturn Ribbon": {"Armor": 1.57},
+    "Goddess Ribbon": {"Armor": 1.92},
+
+    "Yo-yo": {"Weapon": 0.06},
+    "Slingshot": {"Weapon": 0.12},
+    "Bionic Slingshot": {"Weapon": 0.32},
+    "Trick Yo-yo": {"Weapon": 0.46},
+    "Combat Yo-yo": {"Weapon": 0.54},
+
+    "Travel Charm": {"AntiNumb": 0.25},
+    "Great Charm": {"Armor": 0.01, "AntiNumb": 0.50},
+    "Crystal Charm": {"Armor": 0.02, "AntiNumb": 1.00},
+    "Rabbit's Foot": {"Armor": 0.03, "AntiNumb": 1.00, "Speed": 2.00},
+
+    "Flame Pendant": {"Armor": 1.00, "Fire": 1.00},
+    "Rain Pendant": {"Armor": 1.00, "Ice": 1.00},
+    "Night Pendant": {"Armor": 1.00, "Light": 1.00},
+    "Sea Pendant": {"Armor": 2.00, "Fire": 1.00, "Ice": 1.00, "Light": 1.00},
+    "Star Pendant": {"Armor": 3.00, "Fire": 1.00, "Ice": 1.00, "Light": 1.00, "AntiNumb": 1.00},
+    "Earth Pendant": {"Armor": 1.50, "Fire": 0.50, "Ice": 0.50, "Light": 0.50},
+    "Cloak of Kings": {"Armor": 0.50},
+
+    "Shield Killer": {"Neutralizing": 0.50},
+    "Neutralizer": {"Neutralizing": 1.00},
+    "HP-Sucker": {"Draining": 0.50},
+    "Hungry HP-Sucker": {"Draining": 1.00},
+
+    "Baseball Cap": {"Armor": 0.13},
+    "Holmes Hat": {"Armor": 0.27},
+    "Mr. Baseball Cap": {"Armor": 0.16},
+    "Hard Hat": {"Armor": 0.41},
+    "Coin of Slumber": {"Armor": 0.83},
+    "Coin of Defense": {"Armor": 1.11},
+    "Lucky Coin": {"Armor": 1.38},
+    "Talisman Coin": {"Armor": 1.66},
+    "Shiny Coin": {"Armor": 1.94},
+    "Souvenir Coin": {"Armor": 2.22},
+    "Coin of Silence": {"Armor": 1.25},
+    "Mr. Saturn Coin": {"Armor": 1.30},
+    "Diadem of Kngs": {"Armor": 0.50, "Fire": 0.25, "Ice": 0.25, "Light": 0.25, "AntiNumb": 0.25}
+} 
+
+
+@dataclass
+class EarthBoundGift:
+    name: str
+    value: int
+    traits: list[str]
+
+
+def make_trait(trait: str, name: str) -> dict[str, str | int]:
+    if name in gift_qualities and trait in gift_qualities[name]:
+        quality = gift_qualities[name][trait]
+    else:
+        quality = None
+
+    if quality:
+        return {"trait": trait, "quality": quality}
+    else:
+        return {"trait": trait}
+
+
+def make_default_traits(traits: list[str], name: str) -> list[dict[str, str | int]]:
+    return [make_trait(trait, name) for trait in traits]
+
+
+def create_gift(name: str, value: int, traits: list[str]) -> EarthBoundGift:
+    """Create a Gift with the specified tag and values."""
+    return EarthBoundGift(name, value, make_default_traits(traits, name))
+
+
+gift_properties = {
+    2: create_gift("Teddy Bear", 178, ["Toy", "Doll"]),
+
+    3: create_gift("Super Plush Bear", 1198, ["Toy", "Doll"]),
+
+    4: create_gift("Broken Machine", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    5: create_gift("Broken Gadget", 109, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    6: create_gift("Broken Air Gun", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    7: create_gift("Broken Spray Can", 189, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    8: create_gift("Broken Laser", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    9: create_gift("Broken Iron", 149, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    10: create_gift("Broken Pipe", 149, ["Broken", "Machine", "Metal", "Material", "Resource", "Pipe", "Trash"]),
+
+    11: create_gift("Broken Cannon", 218, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    12: create_gift("Broken Tube", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    13: create_gift("Broken Bazooka", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Weapon", "Trash"]),
+
+    14: create_gift("Broken Trumpet", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Instrument",
+                                          "Trash"]),
+
+    15: create_gift("Broken Harmonica", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Instrument",
+                                            "Trash"]),
+
+    16: create_gift("Broken Antenna", 0, ["Broken", "Machine", "Metal", "Material", "Resource", "Trash"]),
+
+    17: create_gift("Cracked Bat", 18, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    18: create_gift("Tee Ball Bat", 48, ["MeleeWeapon", "Metal", "Toy", "Weapon"]),
+
+    19: create_gift("Sand Lot Bat", 98, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    20: create_gift("Minor League Bat", 399, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    21: create_gift("Mr. Baseball Bat", 498, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    22: create_gift("Big League Bat", 3080, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    23: create_gift("Hall of Fame Bat", 1880, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    24: create_gift("Magicant Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon", "Dreamlike"]),
+
+    25: create_gift("Legendary Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon", "Legendary"]),
+
+    26: create_gift("Gutsy Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon", "Guts"]),
+
+    27: create_gift("Casey Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    28: create_gift("Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    29: create_gift("Thick Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    30: create_gift("Deluxe Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    31: create_gift("Chef's Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    32: create_gift("French Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    33: create_gift("Magic Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    34: create_gift("Holy Fry Pan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    35: create_gift("Sword of Kings", 0, ["Weapon"]),
+
+    36: create_gift("Pop Gun", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    37: create_gift("Stun Gun", 0, ["RangedWeapon", "Weapon"]),
+
+    38: create_gift("Toy Air Gun", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    39: create_gift("Magnum Air Gun", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    40: create_gift("Zip Gun", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    41: create_gift("Laser Gun", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    42: create_gift("Hyper Beam", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    43: create_gift("Crusher Beam", 0, ["RangedWeapon", "Beam", "Weapon"]),
+    
+    44: create_gift("Spectrum Beam", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    45: create_gift("Death Ray", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    46: create_gift("Baddest Beam", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    47: create_gift("Moon Beam Gun", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    48: create_gift("Gaia Beam", 0, ["RangedWeapon", "Beam", "Weapon"]),
+
+    49: create_gift("Yo-yo", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    50: create_gift("Slingshot", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    51: create_gift("Bionic Slingshot", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    52: create_gift("Trick Yo-yo", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    53: create_gift("Combat Yo-yo", 0, ["RangedWeapon", "Toy", "Weapon"]),
+
+    54: create_gift("Travel Charm", 0, ["Jewelry"]),
+
+    55: create_gift("Great Charm", 0, ["Jewelry", "Defense", "Armor"]),
+
+    56: create_gift("Crystal Charm", 0, ["Jewelry", "Defense", "Armor", "Crystal"]),
+
+    57: create_gift("Rabbit's Foot", 0, ["Armor", "Jewelry", "Defense", "Speed"]),
+
+    58: create_gift("Flame Pendant", 0, ["Armor", "Jewelry", "Defense", "Fire"]),
+
+    59: create_gift("Rain Pendant", 0, ["Armor", "Jewelry", "Defense", "Water"]),
+
+    60: create_gift("Night Pendant", 0, ["Armor", "Jewelry", "Defense", "Light"]),
+
+    61: create_gift("Sea Pendant", 0, ["Armor", "Jewelry", "Defense", "Light", "Fire", "Water"]),
+
+    62: create_gift("Star Pendant", 0, ["Armor", "Jewelry", "Defense", "Light", "Fire", "Water"]),
+
+    63: create_gift("Cloak of Kings", 0, ["Armor", "Jewelry", "Defense"]),
+
+    64: create_gift("Cheap Bracelet", 0, ["Armor", "Jewelry", "Defense", "Plastic"]),
+
+    65: create_gift("Copper Bracelet", 0, ["Armor", "Jewelry", "Defense", "Copper"]),
+
+    66: create_gift("Silver Bracelet", 0, ["Armor", "Jewelry", "Defense", "Silver"]),
+
+    67: create_gift("Gold Bracelet", 0, ["Armor", "Jewelry", "Defense", "Gold"]),
+
+    68: create_gift("Platinum Band", 0, ["Armor", "Jewelry", "Defense", "Platinum"]),
+
+    69: create_gift("Diamond Band", 0, ["Armor", "Jewelry", "Defense", "Diamond"]),
+
+    70: create_gift("Pixie's Bracelet", 0, ["Armor", "Jewelry", "Defense"]),
+
+    71: create_gift("Cherub's Band", 0, ["Armor", "Jewelry", "Defense"]),
+
+    72: create_gift("Goddess Band", 0, ["Armor", "Jewelry", "Defense"]),
+
+    73: create_gift("Bracer of Kings", 0, ["Armor", "Jewelry", "Defense", "Fire"]),
+
+    74: create_gift("Baseball Cap", 0, ["Armor", "Baseball", "Defense", "Hat"]),
+
+    75: create_gift("Holmes Hat", 0, ["Armor", "Defense", "Hat"]),
+
+    76: create_gift("Mr. Baseball Cap", 0, ["Armor", "Defense", "Hat", "Baseball"]),
+
+    77: create_gift("Hard Hat", 0, ["Armor", "Defense", "Hat"]),
+
+    78: create_gift("Ribbon", 0, ["Armor", "Cloth", "Defense"]),
+
+    79: create_gift("Red Ribbon", 0, ["Armor", "Cloth", "Defense", "Red"]),
+
+    80: create_gift("Goddess Ribbon", 0, ["Armor", "Cloth", "Defense"]),
+
+    81: create_gift("Coin of Slumber", 0, ["Armor", "Defense"]),
+
+    82: create_gift("Coin of Defense", 0, ["Armor", "Defense"]),
+
+    83: create_gift("Lucky Coin", 0, ["Armor", "Defense", "Luck"]),
+
+    84: create_gift("Talisman Coin", 0, ["Armor", "Defense"]),
+
+    85: create_gift("Shiny Coin", 0, ["Armor", "Defense"]),
+
+    86: create_gift("Souvenir Coin", 0, ["Armor", "Defense"]),
+
+    87: create_gift("Diadem of Kings", 0, ["Armor", "Jewelry", "Defense", "Fire", "Water", "Light"]),
+
+    88: create_gift("Cookie", 7, ["Confectionary", "Comsumable", "Heal", "Food"]),
+
+    89: create_gift("Bag of Fries", 8, ["FastFood", "Comsumable", "Heal", "Food"]),
+
+    90: create_gift("Hamburger", 14, ["FastFood", "Comsumable", "Heal", "Food", "Beef", "Meat"]),
+
+    91: create_gift("Boiled Egg", 0, ["Egg", "Comsumable", "Heal", "Food", "White"]),
+
+    92: create_gift("Fresh Egg", 0, ["Egg", "Comsumable", "Heal", "Food", "White"]),
+
+    93: create_gift("Picnic Lunch", 24, ["Comsumable", "Heal", "Food"]),
+
+    94: create_gift("Pasta di Summers", 0, ["Pasta", "Comsumable", "Heal", "Food", "Cooking"]),
+
+    95: create_gift("Pizza", 0, ["Comsumable", "Heal", "Food"]),
+
+    96: create_gift("Chef's Special", 0, ["Comsumable", "Heal", "Food"]),
+
+    97: create_gift("Large Pizza", 0, ["Comsumable", "Heal", "Food"]),
+
+    98: create_gift("PSI Caramel", 0, ["Comsumable", "Mana", "Food", "Candy"]),
+
+    99: create_gift("Magic Truffle", 0, ["Comsumable", "Mana", "Food", "Candy"]),
+
+    100: create_gift("Brain Food Lunch", 0, ["Comsumable", "Mana", "Food", "Heal", "ExoticFood"]),
+
+    101: create_gift("Rock Candy", 0, ["Comsumable", "Candy", "Food", "Buff"]),
+
+    102: create_gift("Croissant", 0, ["Comsumable", "Food", "Heal", "Bread"]),
+
+    103: create_gift("Bread Roll", 0, ["Comsumable", "Food", "Heal", "Bread"]),
+
+    106: create_gift("Can of Fruit Juice", 0, ["Comsumable", "Heal", "Drink", "Liquid", "Fruit", "Juice"]),
+
+    107: create_gift("Royal Iced Tea", 0, ["Comsumable", "Heal", "Drink", "Liquid"]),
+
+    108: create_gift("Protein Drink", 0, ["Comsumable", "Heal", "Drink", "Liquid"]),
+
+    109: create_gift("Kraken Soup", 0, ["Comsumable", "Heal", "Food", "Liquid", "Cooking"]),
+
+    110: create_gift("Bottle of Water", 0, ["Comsumable", "Mana", "Drink", "Liquid", "Water"]),
+
+    111: create_gift("Cold Remedy", 0, ["Comsumable", "Medicine", "Drink", "Liquid", "Cure"]),
+
+    112: create_gift("Vial of Serum", 0, ["Comsumable", "Medicine", "Drink", "Liquid", "Cure"]),
+
+    113: create_gift("IQ Capsule", 0, ["Comsumable", "Medicine", "IQ", "Buff"]),
+
+    114: create_gift("Guts Capsule", 0, ["Comsumable", "Medicine", "Guts", "Buff"]),
+
+    115: create_gift("Speed Capsule", 0, ["Comsumable", "Medicine", "Speed", "Buff"]),
+
+    116: create_gift("Vital Capsule", 0, ["Comsumable", "Medicine", "Buff", "Life"]),
+
+    117: create_gift("Luck Capsule", 0, ["Comsumable", "Medicine", "Buff", "Luck"]),
+
+    118: create_gift("Ketchup Packet", 0, ["Comsumable", "Heal", "Food", "Condiment", "Red"]),
+
+    119: create_gift("Sugar Packet", 0, ["Comsumable", "Heal", "Food", "Condiment", "White"]),
+
+    120: create_gift("Tin of Cocoa", 0, ["Comsumable", "Heal", "Food", "Condiment", "Brown", "Chocolate"]),
+
+    121: create_gift("Carton of Cream", 0, ["Comsumable", "Heal", "Food", "Condiment", "White", "Liquid"]),
+
+    122: create_gift("Sprig of Parsley", 0, ["Comsumable", "Heal", "Food", "Condiment", "Green", "Plant"]),
+
+    123: create_gift("Jar of Hot Sauce", 0, ["Comsumable", "Heal", "Food", "Condiment", "Orange", "Spicy"]),
+
+    124: create_gift("Salt Packet", 0, ["Comsumable", "Heal", "Food", "Condiment", "White", "Salted"]),
+
+    126: create_gift("Jar of Delisauce", 0, ["Comsumable", "Heal", "Food", "Condiment", "Green"]),
+
+    127: create_gift("Wet Towel", 0, ["Comsumable", "Cure"]),
+
+    128: create_gift("Refreshing Herb", 0, ["Comsumable", "Cure", "Food", "Herb"]),
+
+    129: create_gift("Secret Herb", 0, ["Comsumable", "Cure", "Food", "Life", "Herb"]),
+
+    130: create_gift("Horn of Life", 0, ["Comsumable", "Cure", "Life"]),
+
+    131: create_gift("Counter-PSI Unit", 0, ["Machine", "Electronics", "Metal"]),
+
+    132: create_gift("Shield Killer", 0, ["Machine", "Electronics", "Metal", "Neutralizing"]),
+
+    133: create_gift("Bazooka", 0, ["Machine", "Weapon", "Electronics", "Explosive", "RangedWeapon"]),
+
+    134: create_gift("Heavy Bazooka", 0, ["Machine", "Weapon", "Electronics", "Explosive", "RangedWeapon"]),
+
+    135: create_gift("HP-Sucker", 0, ["Machine", "Draining", "Electronics"]),
+
+    136: create_gift("Hungry HP-Sucker", 0, ["Machine", "Draining", "Electronics"]),
+
+    137: create_gift("Xterminator Spray", 0, ["Can", "Metal", "Insect", "Weapon", "Chemicals"]),
+
+    138: create_gift("Slime Generator", 0, ["Machine", "Slime", "Electronics"]),
+
+    140: create_gift("Ruler", 0, ["Long", "Wood", "Trash", "IQ"]),
+
+    141: create_gift("Snake Bag", 0, ["Animal", "Container", "Throwing"]),
+
+    142: create_gift("Mummy Wrap", 0, ["Ancient", "Paper", "Weapon", "Throwing", "Consumable"]),
+
+    143: create_gift("Protractor", 0, ["Metal", "Trash", "IQ"]),
+
+    144: create_gift("Bottle Rocket", 0, ["Weapon", "Explosive", "Rocket", "Fireworks", "Consumable"]),
+
+    145: create_gift("Big Bottle Rocket", 0, ["Weapon", "Explosive", "Rocket", "Fireworks", "Consumable"]),
+
+    146: create_gift("Multi Bottle Rocket", 0, ["Weapon", "Explosive", "Rocket", "Fireworks", "Consumable"]),
+
+    147: create_gift("Bomb", 0, ["Weapon", "Explosive", "Throwing", "Consumable", "Bomb"]),
+
+    148: create_gift("Super Bomb", 0, ["Weapon", "Explosive", "Throwing", "Consumable", "Bomb"]),
+
+    149: create_gift("Insecticide Spray", 0, ["Can", "Metal", "Insect", "Weapon", "Consumable", "Chemicals"]),
+
+    150: create_gift("Rust Promoter", 0, ["Can", "Metal", "Rusting", "Weapon", "Consumable", "Chemicals"]),
+
+    151: create_gift("Rust Promoter DX", 0, ["Can", "Metal", "Rusting", "Weapon", "Consumable", "Chemicals", "Insect"]),
+
+    152: create_gift("Pair of Dirty Socks", 0, ["Consumable", "Throwing", "Stinky", "Clothing"]),
+
+    153: create_gift("Stag Beetle", 0, ["Consumable", "Throwing", "Animal", "Insect"]),
+
+    154: create_gift("Toothbrush", 0, ["Consumable", "Tool"]),
+
+    155: create_gift("Handbag Strap", 0, ["Consumable", "Weapon", "Throwing", "Leather"]),
+
+    156: create_gift("Pharaoh's Curse", 0, ["Consumable", "Weapon", "Throwing", "Goo", "Slime", "Poison", "Chemicals"]),
+
+    157: create_gift("Defense Shower", 0, ["Can", "Machine", "Chemicals", "Buff", "Defense", "Liquid"]),
+
+    159: create_gift("Sudden Guts Pill", 0, ["Consumable", "Guts", "Buff"]),
+
+    160: create_gift("Bag of Dragonite", 0, ["Consumable", "Weapon", "Powder"]),
+
+    161: create_gift("Defense Spray", 0, ["Can", "Consumable", "Chemicals", "Buff", "Defense", "Liquid"]),
+
+    165: create_gift("Picture Postcard", 0, ["Paper", "Trash"]),
+
+    168: create_gift("Chick", 0, ["Animal", "Yellow", "Chicken"]),
+
+    169: create_gift("Chicken", 0, ["Animal", "White", "Chicken"]),
+
+    186: create_gift("Meteotite", 0, ["Mineral", "Artifact", "Brown", "Gem"]),
+
+    188: create_gift("Hand-Aid", 0, ["Consumable", "Heal", "Cloth"]),
+
+    189: create_gift("Trout Yogurt", 0, ["Consumable", "Heal", "Food", "Fish", "Dairy"]),
+
+    190: create_gift("Banana", 0, ["Consumable", "Heal", "Food", "Fruit", "Yellow"]),
+
+    191: create_gift("Calorie Stick", 0, ["Consumable", "Heal", "Food", "Jerky"]),
+
+    194: create_gift("Earth Pendant", 0, ["Armor", "Jewelry", "Fire", "Ice", "Light"]),
+
+    195: create_gift("Neutralizer", 0, ["Machine", "Electronics", "Metal", "Neutralizing"]),
+
+    198: create_gift("Gelato de Resort", 0, ["Consumable", "Food", "Heal", "Dairy", "FrozenFood"]),
+
+    199: create_gift("Snake", 0, ["Animal", "Weapon", "Throwing", "Consumable"]),
+
+    200: create_gift("Viper", 0, ["Animal", "Weapon", "Throwing", "Poison", "Consumable"]),
+
+    201: create_gift("Brain Stone", 0, ["Stone", "Mineral", "Trash"]),
+
+    207: create_gift("Magic Tart", 0, ["Food", "Consumable", "Mana", "Confectionary"]),
+
+    209: create_gift("Monkey's Love", 0, ["Weapon", "Animal"]),
+
+    212: create_gift("T-Rex's Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    213: create_gift("Big League Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    214: create_gift("Ultimate Bat", 0, ["MeleeWeapon", "Wood", "Baseball", "Toy", "Weapon"]),
+
+    215: create_gift("Double Beam", 0, ["RangedWeapon", "Gun", "Beam", "Weapon"]),
+
+    216: create_gift("Platinum Band", 0, ["Armor", "Defense", "Platinum", "Jewelry"]),
+
+    217: create_gift("Diamond Band", 0, ["Armor", "Defense", "Diamond", "Jewelry"]),
+
+    218: create_gift("Defense Ribbon", 0, ["Armor", "Cloth", "Defense"]),
+
+    219: create_gift("Talisman Ribbon", 0, ["Armor", "Cloth", "Defense"]),
+
+    220: create_gift("Saturn Ribbon", 0, ["Armor", "Cloth", "Defense"]),
+
+    221: create_gift("Coin of Silence", 0, ["Armor", "Defense"]),
+
+    222: create_gift("Charm Coin", 0, ["Armor", "Defense"]),
+
+    223: create_gift("Cup of Noodles", 0, ["Food", "Consumable", "Heal", "FastFood", "Pasta"]),
+
+    224: create_gift("Repel Sandwich", 0, ["Food", "Consumable", "Heal", "Repellant", "Sandwich"]),
+
+    225: create_gift("Repel Superwich", 0, ["Food", "Consumable", "Heal", "Repellant", "Sandwich"]),
+
+    226: create_gift("Lucky Sandwich", 0, ["Food", "Consumable", "Heal", "Luck", "Mana", "Sandwich"]),
+
+    232: create_gift("Cup of Coffee", 0, ["Drink", "Consumable", "Heal", "Liquid", "Coffee"]),
+
+    233: create_gift("Double Burger", 0, ["FastFood", "Comsumable", "Heal", "Food", "Beef", "Meat"]),
+
+    234: create_gift("Peanut Cheese Bar", 0, ["Comsumable", "Heal", "Food", "Candy", "ExoticFood"]),
+
+    235: create_gift("Piggy Jelly", 0, ["Comsumable", "Heal", "Food", "ExoticFood", "Gelatin", "Jelly"]),
+
+    236: create_gift("Bowl of Rice Gruel", 0, ["Comsumable", "Heal", "Food", "Cooking", "ExoticFood", "Liquid"]),
+
+    237: create_gift("Bean Croquette", 0, ["Comsumable", "Heal", "Food", "Cooking", "ExoticFood"]),
+
+    238: create_gift("Molokheiya Soup", 0, ["Comsumable", "Heal", "Food", "Cooking", "ExoticFood", "Vegetable",
+                                            "Liquid"]),
+
+    239: create_gift("Plain Roll", 0, ["Comsumable", "Heal", "Food", "Bread"]),
+
+    240: create_gift("Kabob", 0, ["Comsumable", "Heal", "Food", "ExoticFood", "Meat"]),
+
+    241: create_gift("Plain Yogurt", 0, ["Comsumable", "Heal", "Food", "Slime", "Dairy"]),
+
+    242: create_gift("Beef Jerky", 0, ["Comsumable", "Heal", "Food", "Meat", "Dried", "Jerky"]),
+
+    243: create_gift("Mammoth Burger", 0, ["FastFood", "Comsumable", "Heal", "Food", "Beef", "Meat"]),
+
+    244: create_gift("Spicy Jerky", 0, ["Comsumable", "Heal", "Food", "Meat", "Dried", "Jerky", "Spicy"]),
+
+    245: create_gift("Luxury Jerky", 0, ["Comsumable", "Heal", "Food", "Meat", "Dried", "Jerky", "Luxury"]),
+
+    246: create_gift("Bottle of DXwater", 0, ["Comsumable", "Mana", "Drink", "Liquid", "Water"]),
+
+    247: create_gift("Magic Pudding", 0, ["Comsumable", "Mana", "Food", "Candy"]),
+
+    248: create_gift("Non-Stick Frypan", 0, ["MeleeWeapon", "Metal", "Tool", "Weapon"]),
+
+    249: create_gift("Mr. Saturn Coin", 0, ["Armor", "Defense"]),
+
+    250: create_gift("Meteornium", 0, ["Mineral", "Artifact", "SpaceMineral"]),
+
+    251: create_gift("Popsicle", 0, ["Consumable", "Food", "Heal", "FrozenFood"]),
+
+    252: create_gift("Cup of Lifenoodles", 0, ["Consumable", "Food", "Cure", "Life", "Pasta"])
+    # Todo; separate traits for GoodWeapon and BadWeapon
+    # Todo; Satus heals should be Medicine, Cure
+}
diff --git a/worlds/earthbound/gifting/trait_parser.py b/worlds/earthbound/gifting/trait_parser.py
new file mode 100644
index 0000000000..c721be44ab
--- /dev/null
+++ b/worlds/earthbound/gifting/trait_parser.py
@@ -0,0 +1,454 @@
+from ..game_data.local_data import item_id_table
+import random
+from typing import Any
+
+gift_exclusions = [
+    "Franklin Badge",
+    "Pak of Bubble Gum",
+    "Jar of Fly Honey",
+    "Tiny Key",
+    "Yogurt Dispenser",
+    "UFO Engine",
+    "Piggy Nose",
+    "Shyness Book",
+    "King Banana",
+    "Letter For Tony",
+    "Key to the Shack",
+    "Key to the Cabin",
+    "Bad Key Machine",
+    "Zombie Paper",
+    "Hawk Eye",
+    "ATM Card",
+    "Show Ticket",
+    "Tenda Lavapants",
+    "Wad of Bills",
+    "Receiver Phone",
+    "Diamond",
+    "Signed Banana",
+    "Pencil Eraser",
+    "Hieroglyph Copy",
+    "Contact Lens",
+    "Key to the Tower",
+    "Meteorite Piece",
+    "Sound Stone",
+    "Police Badge",
+    "Mining Permit",
+    "Key to the Locker",
+    "Insignificant Item",
+    "Tiny Ruby",
+    "Eraser Eraser",
+    "Tendakraut",
+    "Progressive Bat",
+    "Progressive Fry Pan",
+    "Progressive Gun",
+    "Progressive Bracelet",
+    "Progressive Other",
+    "Carrot Key"
+]
+
+wanted_traits = [
+    "Armor",
+    "Weapon",
+    "Cure",
+    "Bomb",
+    "Mana",
+    "Heal",
+    "Life",
+    "Neutralizing",
+    "Draining",
+    "Beef",
+    "Jerky",
+    "Egg",
+    "Chicken",
+    "Spicy",
+    "Broken",
+    "Pasta",
+    "Pizza",
+    "Condiment",
+    "Dairy",
+    "AnimalProduct",
+    "Copper",
+    "Silver",
+    "Gold",
+    "Diamond",
+    "Plastic",
+    "Herb",
+    "Repellant",
+    "Slime",
+    "Animal",
+    "Juice",
+    "Meat",
+    "Water",
+    "Drink",
+    "FastFood",
+    "Bread",
+    "FrozenFood",
+    "Fruit",
+    "Toy",
+    "Salted",
+    "Speed",
+    "Guts",
+    "Luck",
+    "Doll",
+    "Legendary",
+    "Buff",
+    "Pipe",
+    "Hat",
+    "Trash",
+    "ExoticFood",
+    "Insect",
+    "Fire",
+    "Ice",
+    "Light",
+    "Food",
+    "Consumable",
+    "Electronics",
+    "Candy",
+    "Medicine",
+    "Coffee",
+    "Artifact",
+    "Fireworks",
+    "Confectionary",
+    "Explosive",
+    "Jewelry",
+    "Rock",
+    "Metal"
+]
+
+# If these traits are in the item, then pick randomly from the results
+# If multiple fit, pick the combined highest quality.
+secondary_trait_list = {
+    "Beef": ["Hamburger", "Double Burger", "Mammoth Burger", "Beef Jerky"],
+    "Jerky": ["Beef Jerky", "Spicy Jerky", "Luxury Jerky"],
+    "Egg": ["Fresh Egg", "Boiled Egg"],
+    "Chicken": ["Chicken"],
+    "Spicy": ["Jar of Hot Sauce", "Spicy Jerky"],
+    "Broken": ["Broken Machine", "Broken Gadget", "Broken Air Gun", "Broken Spray Can",
+               "Broken Laser", "Broken Iron", "Broken Pipe", "Broken Cannon", "Broken Tube",
+               "Broken Bazooka", "Broken Trumpet", "Broken Harmonica", "Broken Antenna"],
+    "Pasta": ["Pasta di Summers", "Cup of Noodles", "Cup of Lifenoodles"],
+    "Pizza": ["Pizza", "Large Pizza"],
+    "Condiment": ["Ketchup Packet", "Sugar Packet", "Salt Packet", "Tin of Cocoa",
+                  "Carton of Cream", "Sprig of Parsley", "Jar of Delisauce", "Jar of Hot Sauce"],
+    "Dairy": ["Plain Yogurt", "Trout Yogurt", "Gelato de Resort"],
+    "AnimalProduct": ["Fresh Egg"],
+    "Copper": ["Copper Bracelet"],
+    "Silver": ["Silver Bracelet"],
+    "Gold": ["Gold Bracelet"],
+    "Diamond": ["Diamond Band"],
+    "Plastic": ["Cheap Bracelet", "Bottle of Water", "Bottle of DXwater"],
+    "Herb": ["Refreshing Herb", "Secret Herb"],
+    "Repellant": ["Repel Sandwich", "Repel Superwich"],
+    "Slime": ["Slime Generator"],
+    "Animal": ["Chicken", "Chick", "Snake", "Viper"],
+    "Juice": ["Can of Fruit Juice"],
+    "Meat": ["Hamburger", "Double Burger", "Mammoth Burger", "Beef Jerky",
+             "Spicy Jerky", "Luxury Jerky", "Kabob"],
+    "Water": ["Bottle of Water", "Bottle of DXwater"],
+    "Drink": ["Bottle of Water", "Bottle of DXwater", "Cup of Coffee", "Can of Fruit Juice", "Protein Drink",
+              "Royal Iced Tea"],
+    "FastFood": ["Hamburger", "Ketchup Packet", "Double Burger", "Bag of Fries"],
+    "Bread": ["Plain Roll", "Bread Roll", "Croissant"],
+    "FrozenFood": ["Popsicle", "Gelato de Resort"],
+    "Fruit": ["Banana", "Can of Fruit Juice"],
+    "Toy": ["Toy Air Gun", "Teddy Bear", "Super Plush Bear", "Yo-yo", "Slingshot"],
+    "Salted": ["Salt Packet"],
+    "Speed": ["Speed Capsule", "Rabbit's Foot"],
+    "Guts": ["Guts Capsule", "Sudden Guts Pill", "Gutsy Bat"],
+    "Luck": ["Lucky Coin", "Luck Capsule", "Lucky Sandwich"],
+    "Doll": ["Teddy Bear", "Super Plush Bear"],
+    "Legendary": ["Legendary Bat"],
+    "Buff": ["Sudden Guts Pill", "Guts Capsule", "Speed Capsule", "IQ Capsule", "Luck Capsule", "Vital Capsule",
+             "Defense Spray", "Defense Shower", "Rock Candy"],
+    "Pipe": ["HP-Sucker", "Hungry HP-Sucker", "Broken Pipe"],
+    "Hat": ["Holmes Hat", "Hard Hat", "Baseball Cap", "Mr. Baseball Cap"],
+    "Trash": ["Broken Machine", "Broken Gadget", "Broken Air Gun", "Broken Spray Can",
+              "Broken Laser", "Broken Iron", "Broken Pipe", "Broken Cannon", "Broken Tube",
+              "Broken Bazooka", "Broken Trumpet", "Broken Harmonica", "Broken Antenna",
+              "Ruler", "Pair of Dirty Socks", "Protractor"],
+    "ExoticFood": ["Piggy Jelly", "Peanut Cheese Bar", "Bowl of Rice Gruel",
+                   "Molokheiya Soup", "Kabob", "Bean Croquette", "Brain Food Lunch"],
+    "Insect": ["Insecticde Spray", "Xterminator Spray", "Stag Beetle"],
+    "Fire": ["Flame Pendant"],
+    "Ice": ["Rain Pendant"],
+    "Light": ["Night Pendant"],
+    "Electronics": ["Slime Generator", "Shield Killer", "Neutralizer", "Defense Shower", "Counter-PSI Unit",
+                    "HP-Sucker", "Hungry HP-Sucker"],
+    "Candy": ["PSI Caramel", "Magic Truffle", "Rock Candy", "Magic Pudding", "Peanut Cheese Bar"],
+    "Medicine": ["Vial of Serum", "Cold Remedy", "IQ Capsule", "Guts Capsule", "Speed Capsule", "Vital Capsule", "Luck Capsule"],
+    "Coffee": ["Cup of Coffee"],
+    "Artifact": ["Metotite", "Meteornium"],
+    "Fireworks": ["Bottle Rocket", "Big Bottle Rocket", "Multi Bottle Rocket"],
+    "Confectionary": ["Cookie", "Magic Tart"],
+    "Explosive": ["Bottle Rocket", "Big Bottle Rocket", "Multi Bottle Rocket", "Heavy Bazooka",
+                  "Bazooka", "Bomb", "Super Bomb"],
+    "Jewelry": ["Cheap Bracelet", "Copper Bracelet", "Silver Bracelet", "Gold Bracelet",
+                "Platinum Band", "Diamond Band", "Flame Pendant", "Sea Pendant", "Star Pendant", "Earth Pendant",
+                "Rain Pendant", "Night Pendant"],
+    "Rock": ["Rock Candy", "Brain Stone"],
+    "Metal": ["Broken Machine", "Broken Gadget", "Broken Air Gun", "Broken Spray Can",
+              "Broken Laser", "Broken Iron", "Broken Pipe", "Broken Cannon", "Broken Tube",
+              "Broken Bazooka", "Broken Trumpet", "Broken Harmonica", "Broken Antenna", "Slime Generator",
+              "Fry Pan", "Magic Fry Pan", "Thick Fry Pan", "Deluxe Fry Pan", "Chef's Fry Pan",
+              "French Fry Pan", "Holy Fry Pan", "Non-Stick Frypan"],
+
+    "Food": ["Cookie", "Bag of Fries", "Hamburger", "Boiled Egg", "Fresh Egg", "Picnic Lunch",
+             "Pasta di Summers", "Pizza", "Chef's Special", "Large Pizza", "PSI Caramel", "Magic Truffle",
+             "Brain Food Lunch", "Rock Candy", "Croissant", "Bread Roll", "Kraken Soup",
+             "Trout Yogurt", "Banana", "Calorie Stick", "Gelato de Resort", "Magic Tart",
+             "Cup of Noodles", "Repel Sandwich", "Repel Superwich", "Lucky Sandwich", "Double Burger",
+             "Peanut Cheese Bar", "Piggy Jelly", "Bowl of Rice Gruel", "Bean Croquette",
+             "Molokheiya Soup", "Plain Roll", "Kabob", "Plain Yogurt", "Beef Jerky",
+             "Mammoth Burger", "Spicy Jerky", "Luxury Jerky", "Magic Pudding",
+             "Popsicle"]
+
+}
+
+tertiary_trait_list = {
+    "Consumable": ["Cookie", "Bag of Fries", "Hamburger", "Boiled Egg", "Fresh Egg", "Picnic Lunch",
+                   "Pasta di Summers", "Pizza", "Chef's Special", "Large Pizza", "PSI Caramel", "Magic Truffle",
+                   "Brain Food Lunch", "Rock Candy", "Croissant", "Bread Roll", "Kraken Soup",
+                   "Trout Yogurt", "Banana", "Calorie Stick", "Gelato de Resort", "Magic Tart",
+                   "Cup of Noodles", "Repel Sandwich", "Repel Superwich", "Lucky Sandwich", "Double Burger",
+                   "Peanut Cheese Bar", "Piggy Jelly", "Bowl of Rice Gruel", "Bean Croquette",
+                   "Molokheiya Soup", "Plain Roll", "Kabob", "Plain Yogurt", "Beef Jerky",
+                   "Mammoth Burger", "Spicy Jerky", "Luxury Jerky", "Magic Pudding",
+                   "Popsicle", "Can of Fruit Juice", "Royal Iced Tea", "Protein Drink",
+                   "Bottle of Water", "Cold Remedy", "Vial of Serum", "IQ Capsule",
+                   "Guts Capsule", "Speed Capsule", "Vital Capsule", "Luck Capsule",
+                   "Ketchup Packet", "Sugar Packet", "Tin of Cocoa", "Carton of Cream", "Sprig of Parsley",
+                   "Jar of Hot Sauce", "Salt Packet", "Jar of Delisauce", "Wet Towel", "Refreshing Herb",
+                   "Secret Herb", "Horn of Life", "Mummy Wrap", "Bottle Rocket", "Big Bottle Rocket",
+                   "Multi Bottle Rocket", "Bomb", "Super Bomb", "Insecticide Spray", "Rust Promoter",
+                   "Rust Promoter DX", "Pair of Dirty Socks", "Stag Beetle", "Toothbrush",
+                   "Handbag Strap", "Pharaoh's Curse", "Sudden Guts Pill", "Bag of Dragonite",
+                   "Defense Spray", "Chick", "Chicken", "Hand-Aid", "Snake", "Viper",
+                   "Cup of Coffee", "Bottle of DXwater", "Cup of Lifenoodles"]
+}
+
+scaled_traits = [
+    "Armor",
+    "Weapon",
+    "Cure",
+    "Bomb",
+    "Mana",
+    "Heal",
+    "Life",
+    "Neutralizing",
+    "Draining"
+]
+
+gift_by_quality = {
+    "Heal": {
+        0.06: "Cookie",
+        0.08: "Can of Fruit Juice",
+        0.12: "Cup of Coffee",
+        0.18: "Popsicle",
+        0.22: "Banana",
+        0.24: "Bag of Fries",
+        0.30: "Trout Yogurt",
+        0.35: "Bread Roll",
+        0.42: "Bean Croquette",
+        0.43: "Cup of Noodles",
+        0.45: "Boiled Egg",
+        0.48: "Hamburger",
+        0.60: "Royal Iced Tea",
+        0.63: "Calorie Stick",
+        0.65: "Croissant",
+        0.70: "Lucky Sandwich",
+        0.80: "Picnic Lunch",
+        0.82: "Plain Roll",
+        0.84: "Fresh Egg",
+        0.88: "Molokheiya Soup",
+        0.96: "Double Burger",
+        1.00: "Peanut Cheese Bar",
+        1.10: "Pasta di Summers",
+        1.20: "Pizza",
+        1.26: "Kabob",
+        1.50: "Beef Jerky",
+        1.60: "Plain Yogurt",
+        2.05: "Mammoth Burger",
+        2.16: "Bowl of Rice Gruel",
+        2.20: "Chef's Special",
+        2.52: "Spicy Jerky",
+        2.40: "Large Pizza",
+        3.00: "Piggy Jelly",
+        3.10: "Luxury Jerky",
+        3.50: "Brain Food Lunch",
+        4.00: "Kraken Soup",
+        4.01: "Hand-Aid"
+    },
+
+    "Armor": {
+        0.05: "Travel Charm",
+        0.10: "Great Charm",
+        0.12: "Cheap Bracelet",
+        0.13: "Baseball Cap",
+        0.14: "Mr. Baseball Cap",
+        0.24: "Copper Bracelet",
+        0.26: "Holmes Hat",
+        0.20: "Crystal Charm",
+        0.36: "Silver Bracelet",
+        0.38: "Hard Hat",
+        0.48: "Ribbon",
+        0.50: "Diadem of Kings",
+        0.60: "Red Ribbon",
+        0.73: "Gold Bracelet",
+        0.75: "Bracer of Kings",
+        0.78: "Coin of Slumber",
+        0.97: "Platinum Band",
+        0.98: "Defense Ribbon",
+        0.99: "Coin of Defense",
+        1.00: "Cloak of Kings",
+        1.21: "Diamond Band",
+        1.25: "Lucky Coin",
+        1.46: "Pixie's Bracelet",
+        1.48: "Talisman Coin",
+        1.50: "Talisman Ribbon",
+        1.70: "Cherub's Band",
+        1.75: "Shiny Coin",
+        1.95: "Goddess Band",
+        2.00: "Souvenir Coin",
+        2.19: "Saturn Ribbon",
+        2.68: "Goddess Ribbon"
+    },
+
+    "Draining": {
+        0.50: "HP-Sucker",
+        1.00: "Hungry HP-Sucker"
+    },
+    
+    "Bomb": {
+        0.50: "Bomb",
+        1.00: "Super Bomb"
+    },
+
+    "Neutralizing": {
+        0.50: "Shield Killer",
+        1.00: "Neutralizer"
+    },
+
+    "Cure": {
+        0.10: "Cold Remedy",
+        0.25: "Vial of Serum",
+        0.50: "Wet Towel",
+        1.00: "Refreshing Herb",
+        2.00: "Secret Herb",
+        3.00: "Horn of Life",
+        3.01: "Cup of Lifenoodles"
+    },
+
+    "Life": {
+        0.50: "Secret Herb",
+        1.00: "Cup of Lifenoodles",
+        1.01: "Horn of Life",
+    },
+
+    "Weapon": {
+        0.01: "Casey Bat",
+        0.04: "Cracked Bat",
+        0.11: "Yo-yo",
+        0.15: "Tee Ball Bat",
+        0.19: "Fy Pan",
+        0.23: "Slingshot",
+        0.28: "Sand Lot Bat",
+        0.30: "Pop Gun",
+        0.38: "Thick Fry Pan",
+        0.40: "Bionic Slingshot",
+        0.46: "Stun Gun",
+        0.50: "Minor League Bat",
+        0.57: "Deluxe Fry Pan",
+        0.61: "Toy Air Gun",
+        0.69: "Magnum Air Gun",
+        0.73: "Mr. Baseball Bat",
+        0.76: "Chef's Fry Pan",
+        0.78: "Zip Gun",
+        0.88: "Trick Yo-yo",
+        0.92: "Laser Gun",
+        0.95: "T-Rex's Bat",
+        0.96: "Non-Stick Frypan",
+        1.00: "Big League Bat",
+        1.03: "Combat Yo-yo",
+        1.11: "Hyper Beam",
+        1.15: "French Fry Pan",
+        1.19: "Hall of Fame Bat",
+        1.26: "Double Beam",
+        1.32: "Ultimate Bat",
+        1.38: "Crusher Beam",
+        1.50: "Spectrum Beam",
+        1.53: "Magicant Bat",
+        1.73: "Death Ray",
+        1.80: "Sword of Kings",
+        1.88: "Baddest Beam",
+        2.00: "Magic Fry Pan",
+        2.11: "Legendary Bat",
+        2.15: "Moon Beam Gun",
+        2.40: "Holy Fry Pan",
+        2.45: "Gaia Beam",
+        2.55: "Gutsy Bat",
+    },
+
+    "Mana": {
+        0.28: "Bottle of Water",
+        0.50: "PSI Caramel",
+        0.51: "Magic Tart",
+        1.14: "Bottle of DXwater",
+        1.20: "Magic Pudding",
+        2.28: "Magic Truffle"
+    }
+}
+
+
+def trait_interpreter(gift: dict[str, Any]) -> int:
+    """Converts received gifts into in-game items.
+       If the item name perfectly matches an in-game item, that item will be received.
+       If any of the traits can be scaled i.e. a healing item, the gift will be converted into an item of roughly that value.
+       If any of the traits are not scaled, but are in the secondary trait list i.e. a food item, it will be converted into a random appropriate item.
+       If none of the traits are applicable, return a random consumable."""
+    item = None
+    trait_list = []
+    got_trait = False
+    if "Traits" in gift:
+        gift["traits"] = gift.pop("Traits")
+
+    for trait in gift["traits"]:
+        if "Trait" in trait:
+            trait["trait"] = trait.pop("Trait")
+
+        if "Quality" in trait:
+            trait["quality"] = trait.pop("Quality")
+
+        if "quality" not in trait:
+            trait["quality"] = 1
+
+        trait_list.append(trait["trait"])
+        if trait["trait"] in scaled_traits:
+            item_quality_table = gift_by_quality[trait["trait"]]
+            quality = min(item_quality_table.keys(), key=lambda x: abs(x - trait["quality"]))
+            item = item_quality_table[quality]
+            got_trait = True
+            break
+
+    if not got_trait:
+        for trait in trait_list:
+            if trait in secondary_trait_list:
+                item = random.choice(secondary_trait_list[trait])
+                got_trait = True
+                break
+
+    if not got_trait:
+        for trait in trait_list:
+            if trait in tertiary_trait_list:
+                item = random.choice(tertiary_trait_list[trait])
+                break
+                
+    if item is not None:
+        item = item_id_table[item]
+    else:
+        item = random.choice(secondary_trait_list["Consumable"])
+        item = item_id_table[item]
+    return item
+
+
+# IF trait is in special traits, give that item.
+# Else if the trait is in a Scaled trait (Food, Armor, etc., then break them up by scaling)
diff --git a/worlds/earthbound/modules/__init__.py b/worlds/earthbound/modules/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/earthbound/modules/area_scaling.py b/worlds/earthbound/modules/area_scaling.py
new file mode 100644
index 0000000000..a29380f9a0
--- /dev/null
+++ b/worlds/earthbound/modules/area_scaling.py
@@ -0,0 +1,603 @@
+from ..modules.enemy_data import combat_regions
+from ..Options import MagicantMode
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+
+
+expected_level_gains = {
+    "Ness's Mind": 0,
+    "Global ATM Access": 0,
+    "Northern Onett": 1,
+    "Onett": 1,
+    "Arcade": 0,
+    "Giant Step": 2,
+    "Twoson": 0,
+    "Everdred's House": 1,
+    "Common Condiment Shop": 0,
+    "Peaceful Rest Valley": 2,
+    "Happy-Happy Village": 0,
+    "Happy-Happy HQ": 1,
+    "Lilliput Steps": 2,
+    "Threed": 0,
+    "Boogey Tent": 0,
+    "Threed Underground": 2,
+    "Grapefruit Falls": 1,
+    "Saturn Valley": 0,
+    "Belch's Factory": 2,
+    "Upper Saturn Valley": 0,
+    "Milky Well": 3,
+    "Dusty Dunes Desert": 2,
+    "Gold Mine": 2,
+    "Monkey Caves": 2,
+    "Fourside": 0,
+    "Fourside Dept. Store": 1,
+    "Moonside": 1,
+    "Monotoli Building": 2,
+    "Magnet Hill": 2,
+    "Winters": 2,
+    "Snow Wood Boarding School": 0,
+    "Southern Winters": 1,
+    "Brickroad Maze": 1,
+    "Andonuts Lab Area": 0,
+    "Rainy Circle": 2,
+    "Stonehenge Base": 2,
+    "Summers": 0,
+    "Summers Museum": 0,
+    "Dalaam": 0,
+    "Pink Cloud": 2,
+    "Scaraba": 0,
+    "Pyramid": 2,
+    "Southern Scaraba": 1,
+    "Dungeon Man": 2,
+    "Deep Darkness": 0,
+    "Deep Darkness Darkness": 2,
+    "Tenda Village": 0,
+    "Lumine Hall": 2,
+    "Lost Underworld": 2,
+    "Fire Spring": 2,
+    "Magicant": 1,
+    "Sea of Eden": 1,
+    "Cave of the Present": 0,
+    "Cave of the Past": 2,
+    "Endgame": 0
+}
+
+locations_with_item_requirements = [
+    "Onett - Traveling Entertainer",
+    "Onett - South Road Present",
+    "Onett - Tracy Gift",
+    "Twoson - Paula's Mother",
+    "Twoson - Everdred Meeting",
+    "Twoson - Insignificant Location",
+    "Happy-Happy Village - Defeat Carpainter",
+    "Happy-Happy Village - Prisoner",
+    "Threed - Boogey Tent Trashcan",
+    "Threed - Zombie Prisoner",
+    "Saturn Valley - Post Belch Gift #1",
+    "Saturn Valley - Post Belch Gift #2",
+    "Saturn Valley - Post Belch Gift #3",
+    "Saturn Valley - Saturn Coffee",
+    "Monkey Caves - Talah Rama Chest #1",
+    "Monkey Caves - Talah Rama Chest #2",
+    "Monkey Caves - Talah Rama Gift",
+    "Monkey Caves - Monkey Power",
+    "Dusty Dunes - Mine Reward",
+    "Snow Wood - Upper Right Locker",
+    "Snow Wood - Upper Left Locker",
+    "Snow Wood - Bottom Right Locker",
+    "Snow Wood - Bottom Left Locker",
+    "Fourside - Bakery 2F Gift",
+    "Fourside - Department Store Blackout",
+    "Fourside - Venus Gift",
+    "Summers - Museum Item",
+    "Dalaam - Trial of Mu",
+    "Deep Darkness - North Alcove Truffle",
+    "Deep Darkness - Near Land Truffle",
+    "Deep Darkness - Present Truffle",
+    "Deep Darkness - Village Truffle",
+    "Deep Darkness - Entrance Truffle",
+    "Tenda Village - Tenda Tea",
+    "Tenda Village - Tenda Gift",
+    "Tenda Village - Tenda Gift #2",
+    "Lost Underworld - Talking Rock",
+    "Lost Underworld - Tenda Camp Shop Slot 1",
+    "Lost Underworld - Tenda Camp Shop Slot 2",
+    "Lost Underworld - Tenda Camp Shop Slot 3",
+    "Lost Underworld - Tenda Camp Shop Slot 4",
+    "Lost Underworld - Tenda Camp Shop Slot 5",
+    "Lost Underworld - Tenda Camp Shop Slot 6",
+    "Lost Underworld - Tenda Camp Shop Slot 7",
+    "Dusty Dunes - Mine Food Cart Slot 1",
+    "Dusty Dunes - Mine Food Cart Slot 2",
+    "Dusty Dunes - Mine Food Cart Slot 3",
+    "Dusty Dunes - Mine Food Cart Slot 4",
+    "Dusty Dunes - Mine Food Cart Slot 5",
+    "Dusty Dunes - Mine Food Cart Slot 6",
+    "Dusty Dunes - Mine Food Cart Slot 7",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 1",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 2",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 3",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 4",
+    "Deep Darkness - Arms Dealer Slot 1",
+    "Deep Darkness - Arms Dealer Slot 2",
+    "Deep Darkness - Arms Dealer Slot 3",
+    "Deep Darkness - Arms Dealer Slot 4",
+    "Deep Darkness - Businessman Slot 1",
+    "Deep Darkness - Businessman Slot 2",
+    "Deep Darkness - Businessman Slot 3",
+    "Deep Darkness - Businessman Slot 4",
+    "Deep Darkness - Businessman Slot 5",
+    "Deep Darkness - Businessman Slot 6",
+    "Deep Darkness - Businessman Slot 7",
+    "Dalaam Restaurant - Slot 1",
+    "Dalaam Restaurant - Slot 2",
+    "Dalaam Restaurant - Slot 3",
+    "Dalaam Restaurant - Slot 4"]
+
+
+def calculate_scaling(world: "EarthBoundWorld") -> None:
+    """Calculates the individual scaled level of each region/major area."""
+    arcade = world.dungeon_connections["Arcade"]
+    giant_step = world.dungeon_connections["Giant Step"]
+    lilliput_steps = world.dungeon_connections["Lilliput Steps"]
+    happy_happy_hq = world.dungeon_connections["Happy-Happy HQ"]
+    belch_factory = world.dungeon_connections["Belch's Factory"]
+    milky_well = world.dungeon_connections["Milky Well"]
+    gold_mine = world.dungeon_connections["Gold Mine"]
+    monotoli_building = world.dungeon_connections["Monotoli Building"]
+    magnet_hill = world.dungeon_connections["Magnet Hill"]
+    moonside = world.dungeon_connections["Moonside"]
+    pink_cloud = world.dungeon_connections["Pink Cloud"]
+    rainy_circle = world.dungeon_connections["Rainy Circle"]
+    stonehenge_base = world.dungeon_connections["Stonehenge Base"]
+    brickroad_maze = world.dungeon_connections["Brickroad Maze"]
+    pyramid = world.dungeon_connections["Pyramid"]
+    dungeon_man = world.dungeon_connections["Dungeon Man"]
+    lumine_hall = world.dungeon_connections["Lumine Hall"]
+    fire_spring = world.dungeon_connections["Fire Spring"]
+    sea_of_eden = world.dungeon_connections["Sea of Eden"]
+    world.area_exits = {
+        "Ness's Mind": ["Onett", "Twoson", "Happy-Happy Village", "Threed", "Saturn Valley", "Dusty Dunes Desert",
+                        "Fourside", "Winters", "Summers", "Dalaam", "Scaraba", "Deep Darkness", "Tenda Village",
+                        "Lost Underworld", "Magicant"],
+        "Northern Onett": ["Onett"],
+        "Onett": ["Northern Onett", "Twoson", giant_step, arcade, "Global ATM Access"],
+        arcade: [arcade],
+        "Giant Step": ["Giant Step"],
+        "Twoson": ["Onett", "Peaceful Rest Valley", "Threed", "Everdred's House", "Common Condiment Shop", "Global ATM Access"],
+        "Everdred's House": ["Everdred's House"],
+        "Peaceful Rest Valley": ["Twoson", "Happy-Happy Village"],
+        "Happy-Happy Village": ["Peaceful Rest Valley", lilliput_steps, happy_happy_hq, "Global ATM Access"],
+        "Happy-Happy HQ": ["Happy-Happy HQ"],
+        "Lilliput Steps": ["Lilliput Steps"],
+        "Threed": ["Twoson", "Dusty Dunes Desert", "Andonuts Lab Area", "Threed Underground", "Boogey Tent", "Winters", "Global ATM Access"],
+        "Boogey Tent": ["Boogey Tent"],
+        "Threed Underground": ["Grapefruit Falls"],
+        "Grapefruit Falls": [belch_factory, "Saturn Valley", "Threed Underground"],
+        "Saturn Valley": ["Grapefruit Falls", "Cave of the Present", "Global ATM Access"],
+        belch_factory: ["Upper Saturn Valley"],
+        "Upper Saturn Valley": ["Saturn Valley", world.dungeon_connections["Milky Well"]],
+        "Milky Well": ["Milky Well"],
+        "Dusty Dunes Desert": ["Threed", "Monkey Caves", gold_mine, "Fourside", "Global ATM Access"],
+        "Monkey Caves": ["Monkey Caves"],
+        "Gold Mine": ["Gold Mine"],
+        "Fourside": ["Dusty Dunes Desert", monotoli_building, magnet_hill, "Threed", "Fourside Dept. Store", moonside, "Global ATM Access"],
+        "Moonside": ["Moonside", "Global ATM Access"],
+        "Monotoli Building": ["Monotoli Building"],
+        "Fourside Dept. Store": ["Fourside Dept. Store"],
+        "Magnet Hill": ["Magnet Hill"],
+        "Winters": ["Snow Wood Boarding School", "Southern Winters", "Global ATM Access"],
+        "Snow Wood Boarding School": ["Snow Wood Boarding School"],
+        "Southern Winters": [brickroad_maze],
+        brickroad_maze: [rainy_circle, "Southern Winters"],
+        "Stonehenge Base": ["Stonehenge Base"],
+        rainy_circle: [brickroad_maze, "Andonuts Lab Area"],
+        "Andonuts Lab Area": [rainy_circle, "Winters", stonehenge_base],
+        "Summers": ["Scaraba", "Summers Museum", "Global ATM Access"],
+        "Summers Museum": ["Summers Museum"],
+        "Dalaam": [pink_cloud],
+        "Pink Cloud": ["Pink Cloud"],
+        "Scaraba": [pyramid, "Common Condiment Shop", "Global ATM Access"],
+        pyramid: ["Southern Scaraba"],
+        "Southern Scaraba": [dungeon_man],
+        "Dungeon Man": ["Deep Darkness"],
+        "Deep Darkness": ["Deep Darkness Darkness"],
+        "Deep Darkness Darkness": ["Tenda Village", "Deep Darkness"],
+        "Tenda Village": [lumine_hall, "Deep Darkness Darkness"],
+        "Lumine Hall": ["Lost Underworld"],
+        "Lost Underworld": [fire_spring],
+        "Fire Spring": ["Fire Spring"],
+        "Magicant": [sea_of_eden, "Global ATM Access"],
+        "Sea of Eden": ["Sea of Eden"],
+        "Cave of the Present": ["Cave of the Past"],
+        "Cave of the Past": ["Endgame"],
+        "Endgame": ["Endgame"],
+        "Global ATM Access": ["Global ATM Access"],
+        "Common Condiment Shop": ["Common Condiment Shop"]
+    }
+
+    world.area_rules = {
+        "Ness's Mind": {"Onett": [["Onett Teleport"]],
+                        "Twoson": [["Twoson Teleport"]],
+                        "Happy-Happy Village": [["Happy-Happy Village Teleport"]],
+                        "Threed": [["Threed Teleport"]],
+                        "Saturn Valley": [["Saturn Valley Teleport"]],
+                        "Dusty Dunes Desert": [["Dusty Dunes Teleport"]],
+                        "Fourside": [["Fourside Teleport"]],
+                        "Winters": [["Winters Teleport"]],
+                        "Summers": [["Summers Teleport"]],
+                        "Dalaam": [["Dalaam Teleport"]],
+                        "Scaraba": [["Scaraba Teleport"]],
+                        "Deep Darkness": [["Deep Darkness Teleport"]],
+                        "Tenda Village": [["Tenda Village Teleport"]],
+                        "Lost Underworld": [["Lost Underworld Teleport"]],
+                        "Magicant": [["Magicant Teleport"], ["Magicant Unlock"]]
+                        },
+
+        "Northern Onett": {"Onett": [["Nothing"]]},
+        "Onett": 
+            {"Northern Onett": [["Police Badge"]],
+             "Twoson": [["Police Badge"]],
+             giant_step: [["Key to the Shack"]],
+             arcade: [["Nothing"]],
+             "Global ATM Access": [["Nothing"]]},
+        
+        arcade: {arcade: [["Nothing"]]},
+        "Giant Step": {"Giant Step": [["Nothing"]]},
+
+        "Twoson": {"Onett": [["Police Badge"]],
+                   "Peaceful Rest Valley": [["Pencil Eraser"], ["Valley Bridge Repair"]],
+                   "Threed": [["Wad of Bills"], ["Threed Tunnels Clear"]],
+                   "Everdred's House": [["Paula"]],
+                   "Common Condiment Shop": [["Nothing"]],
+                   "Global ATM Access": [["Nothing"]]},
+
+        "Everdred's House": {"Everdred's House": [["Nothing"]]},
+
+        "Peaceful Rest Valley": {"Twoson": [["Pencil Eraser"], ["Valley Bridge Repair"]],
+                                 "Happy-Happy Village": [["Nothing"]]},
+
+        "Happy-Happy Village": {"Peaceful Rest Valley": [["Nothing"]],
+                                lilliput_steps: [["Nothing"]],
+                                happy_happy_hq: [["Nothing"]],
+                                "Global ATM Access": [["Nothing"]]},
+
+        "Happy-Happy HQ": {"Happy-Happy HQ": [["Nothing"]]},
+
+        "Lilliput Steps": {"Lilliput Steps": [["Nothing"]]},
+
+        "Threed": {"Twoson": [["Threed Tunnels Clear"]],
+                   "Dusty Dunes Desert": [["Threed Tunnels Clear"]],
+                   "Andonuts Lab Area": [["UFO Engine", "Bad Key Machine"]],
+                   "Threed Underground": [["Zombie Paper"]],
+                   "Boogey Tent": [["Jeff"]],
+                   "Winters": [["UFO Engine", "Bad Key Machine"]],
+                   "Global ATM Access": [["Nothing"]]},
+
+        "Boogey Tent": {"Boogey Tent": [["Nothing"]]},
+
+        "Threed Underground": {"Grapefruit Falls": [["Nothing"]]},
+                                
+        "Grapefruit Falls": {belch_factory: [["Jar of Fly Honey"]],
+                             "Saturn Valley": [["Nothing"]],
+                             "Threed Underground": [["Nothing"]]},
+
+        "Saturn Valley": {"Grapefruit Falls": [["Nothing"]],
+                          "Cave of the Present": [["Meteorite Piece"]],
+                          "Global ATM Access": [["Nothing"]]},
+
+        belch_factory: {"Upper Saturn Valley": [["Threed Tunnels Clear"]]},
+
+        "Upper Saturn Valley": {"Saturn Valley": [["Nothing"]],
+                                milky_well: [["Nothing"]]},
+
+        "Milky Well": {"Milky Well": [["Nothing"]]},
+
+        "Dusty Dunes Desert": {"Threed": [["Threed Tunnels Clear"]],
+                               "Monkey Caves": [["King Banana"]],
+                               gold_mine: [["Mining Permit"]],
+                               "Fourside": [["Nothing"]],
+                               "Global ATM Access": [["Nothing"]]},
+
+        "Monkey Caves": {"Monkey Caves": [["Nothing"]]},
+
+        "Gold Mine": {"Gold Mine": [["Nothing"]]},
+
+        "Fourside": {"Dusty Dunes Desert": [["Nothing"]],
+                     monotoli_building: [["Yogurt Dispenser"]],
+                     "Threed": [["Diamond"]],
+                     magnet_hill: [["Signed Banana"]],
+                     "Fourside Dept. Store": [["Jeff"]],
+                     moonside: [["Nothing"]],
+                     "Global ATM Access": [["Nothing"]]},
+
+        "Monotoli Building": {"Monotoli Building": [["Nothing"]]},
+
+        "Moonside": {"Moonside": [["Nothing"]],
+                     "Global ATM Access": [["Nothing"]]},
+
+        "Fourside Dept. Store": {"Fourside Dept. Store": [["Nothing"]]},
+
+        "Magnet Hill": {"Magnet Hill": [["Nothing"]]},
+
+        "Winters": {"Snow Wood Boarding School": [["Letter For Tony"]],
+                    "Southern Winters": [["Pak of Bubble Gum"]],
+                    "Global ATM Access": [["Nothing"]]},
+
+        "Snow Wood Boarding School": {"Snow Wood Boarding School": [["Nothing"]]},
+
+        "Southern Winters": {brickroad_maze: [["Nothing"]]},
+
+        brickroad_maze: {rainy_circle: [["Nothing"]],
+                         "Southern Winters": [["Nothing"]],
+                         brickroad_maze: [["Nothing"]]},
+
+        rainy_circle: {rainy_circle: [["Nothing"]],
+                       "Andonuts Lab Area": [["Nothing"]],
+                       brickroad_maze: [["Nothing"]]},
+
+        "Andonuts Lab Area": {rainy_circle: [["Nothing"]],
+                              stonehenge_base: [["Eraser Eraser"]],
+                              "Winters": [["Nothing"]]},
+
+        "Stonehenge Base": {"Stonehenge Base": [["Nothing"]]},
+
+        "Summers": {"Scaraba": [["Nothing"]],
+                    "Summers Museum": [["Tiny Ruby"]],
+                    "Global ATM Access": [["Nothing"]]},
+        
+        "Summers Museum": {"Summers Museum": [["Nothing"]]},
+
+        "Dalaam": {pink_cloud: [["Carrot Key"]]},
+
+        "Pink Cloud": {"Pink Cloud": [["Nothing"]]},
+
+        "Scaraba": {pyramid: [["Hieroglyph Copy"]],
+                    "Common Condiment Shop": [["Nothing"]],
+                    "Global ATM Access": [["Nothing"]]},
+
+        pyramid: {"Southern Scaraba": [["Nothing"]]},
+        
+        "Southern Scaraba": {dungeon_man: [["Key to the Tower"]]},
+
+        "Dungeon Man": {"Deep Darkness": [["Submarine to Deep Darkness"]]},
+
+        "Deep Darkness": {"Deep Darkness Darkness": [["Hawk Eye"]]},
+
+        "Deep Darkness Darkness": {"Tenda Village": [["Nothing"]],
+                                   "Deep Darkness": [["Nothing"]]},
+
+        "Tenda Village": {lumine_hall: [["Shyness Book"]],
+                          "Deep Darkness Darkness": [["Hawk Eye"]]},
+
+        "Lumine Hall": {"Lost Underworld": [["Nothing"]]},
+
+        "Lost Underworld": {fire_spring: [["Nothing"]]},
+
+        "Fire Spring": {"Fire Spring": [["Nothing"]]},
+
+        "Magicant": {sea_of_eden: [["Ness"]],
+                     "Global ATM Access": [["Nothing"]]},
+
+        "Sea of Eden": {"Sea of Eden": [["Nothing"]]},
+
+        "Cave of the Present": {"Cave of the Past": [["Power of the Earth"]]},
+
+        "Cave of the Past": {"Endgame": [["Paula"]]},
+
+        "Endgame": {"Endgame": [["Nothing"]]},
+
+        "Common Condiment Shop": {"Common Condiment Shop": [["Nothing"]]},
+
+        "Global ATM Access": {"Global ATM Access": [["Nothing"]]}
+        
+    }
+
+    teleports = {
+        "Onett Teleport": "Onett",
+        "Twoson Teleport": "Twoson",
+        "Happy-Happy Village Teleport": "Happy-Happy Village",
+        "Threed Teleport": "Threed",
+        "Saturn Valley Teleport": "Saturn Valley",
+        "Dusty Dunes Teleport": "Dusty Dunes Desert",
+        "Fourside Teleport": "Fourside",
+        "Winters Teleport": "Winters",
+        "Summers Teleport": "Summers",
+        "Scaraba Teleport": "Scaraba",
+        "Dalaam Teleport": "Dalaam",
+        "Deep Darkness Teleport": "Deep Darkness",
+        "Tenda Village Teleport": "Tenda Village",
+        "Lost Underworld Teleport": "Lost Underworld",
+        "Magicant Teleport": "Magicant"
+    }
+
+    if world.options.no_free_sanctuaries:
+        world.area_rules["Happy-Happy Village"][lilliput_steps] = [["Tiny Key"]]
+        world.area_rules["Lost Underworld"][fire_spring] = [["Tenda Lavapants"]]
+    else:
+        world.area_rules["Happy-Happy Village"][lilliput_steps] = [["Nothing"]]
+        world.area_rules["Lost Underworld"][fire_spring] = [["Nothing"]]
+
+    inventory = {0: ["Nothing"]}  # Nothing means no item needed for connection
+    item_regions = {}
+
+    for item in world.multiworld.precollected_items[world.player]:
+        inventory[0].append(item.name)
+
+    unconnected_regions = [world.starting_region, "Ness's Mind"]
+    world.accessible_regions = [world.starting_region, "Ness's Mind"]
+    if world.options.random_start_location:
+        unconnected_regions.append(teleports[world.starting_teleport])
+        world.accessible_regions.append(teleports[world.starting_teleport])
+
+    world.scaled_area_order = []
+    passed_connections = []
+    local_prog = []
+    ness_scaled = False
+    paula_scaled = False
+    jeff_scaled = False
+    poo_scaled = False
+    badge_scaled = False
+    scaled_chars = {
+        "Ness": ness_scaled,
+        "Paula": paula_scaled,
+        "Jeff": jeff_scaled,
+        "Poo": poo_scaled
+    }
+
+    sphere_count = 0
+    last_region = "Ness's Mind"
+    regions_that_were_already_scaled = []
+    early_regions = []
+    world.Ness_region = "Ness's Mind"
+    world.Paula_region = "Ness's Mind"
+    world.Jeff_region = "Ness's Mind"
+    world.Poo_region = "Ness's Mind"
+    world.Badge_region = "Ness's Mind"
+    for item in world.multiworld.precollected_items[world.player]:
+        if item.name in ["Ness", "Paula", "Jeff", "Poo"]:
+            scaled_chars[item.name] = True
+
+        if item.name == "Franklin Badge":
+            badge_scaled = True
+
+    for num, sphere in enumerate(world.multiworld.earthbound_locations_by_sphere):
+        if num + 1 not in inventory:
+            inventory[num + 1] = []
+
+        for location in sorted(sphere):
+            if num == 0:
+                if location.parent_region.name not in world.accessible_regions and location.player == world.player:
+                    early_regions.append(location.parent_region.name)
+                    world.accessible_regions.append(location.parent_region.name)
+                    unconnected_regions.append(location.parent_region.name)
+
+            if location.item.player == world.player and location.item.advancement:
+                inventory[num + 1].append(location.item.name)
+                if location.player == world.player:
+                    local_prog.append(location.item.name)
+                if location.item.name not in item_regions:
+                    item_regions[location.item.name] = []
+                item_regions[location.item.name].append(location.parent_region.name)
+
+            # TODO; all areas have levels now, so I can skip the combat regions check
+            if location.player == world.player and location.parent_region.name in combat_regions and (
+                    location.parent_region.name not in regions_that_were_already_scaled):
+                last_region = location.parent_region.name
+            
+            regions_that_were_already_scaled.append(last_region)
+
+            if location.item.player == world.player and location.item.name == "Ness" and not scaled_chars["Ness"]:
+                if location.parent_region.name in combat_regions and (location.player == world.player) and (
+                        location.name not in locations_with_item_requirements):
+                    world.Ness_region = location.parent_region.name
+                else:
+                    world.Ness_region = last_region
+                scaled_chars["Ness"] = True
+
+            if location.item.player == world.player and location.item.name == "Paula" and not scaled_chars["Paula"]:
+                if location.parent_region.name in combat_regions and (location.player == world.player) and (
+                        location.name not in locations_with_item_requirements):
+                    world.Paula_region = location.parent_region.name
+                else:
+                    world.Paula_region = last_region
+                scaled_chars["Paula"] = True
+
+            if location.item.player == world.player and location.item.name == "Jeff" and not scaled_chars["Jeff"]:
+                if location.parent_region.name in combat_regions and (location.player == world.player) and (
+                        location.name not in locations_with_item_requirements):
+                    world.Jeff_region = location.parent_region.name
+                else:
+                    world.Jeff_region = last_region
+                scaled_chars["Jeff"] = True
+
+            if location.item.player == world.player and location.item.name == "Poo" and not scaled_chars["Poo"]:
+                if location.parent_region.name in combat_regions and (location.player == world.player) and (
+                        location.name not in locations_with_item_requirements):
+                    world.Poo_region = location.parent_region.name
+                else:
+                    world.Poo_region = last_region
+                scaled_chars["Poo"] = True
+
+            if location.item.player == world.player and location.item.name == "Franklin Badge" and not badge_scaled:
+                if location.parent_region.name in combat_regions and (location.player == world.player) and (
+                        location.name not in locations_with_item_requirements):
+                    world.Badge_region = location.parent_region.name
+                else:
+                    world.Badge_region = last_region
+                    badge_scaled = True
+
+        sphere_count = num
+
+    for item in range(1, len(inventory)):
+        if item in inventory:
+            inventory[item] = inventory[item - 1] + inventory[item]
+        else:
+            inventory[item] = inventory[item - 1]
+
+    for i in range(sphere_count):
+        # Ness's mind needs to be calculated last, always. (Players are more likely to walk around
+        # and explore areas than suddenly leave with a teleport)
+        # Shuffle it to the end of the list on each loop so it gets deprioritized
+        # Is there a better way to do this?
+        if "Ness's Mind" in unconnected_regions:
+            unconnected_regions.remove("Ness's Mind")
+            unconnected_regions.append("Ness's Mind")  # probably do this differently earlier
+        for region in unconnected_regions:
+            for connection in world.area_exits[region]:
+                if f"{region} -> {connection}" not in passed_connections:
+                    for rule_set in world.area_rules[region][connection]:
+                        # check if this sphere has the items needed to make this connection
+                        if all(item in inventory[i] for item in rule_set):
+                            passed_connections.append(f"{region} -> {connection}")
+                            if connection not in world.accessible_regions:
+                                world.accessible_regions.append(connection)
+                                unconnected_regions.append(connection)
+                else:
+                    world.area_exits[region].remove(connection)
+        if "Endgame" in unconnected_regions:
+            unconnected_regions.remove("Endgame")
+            unconnected_regions.insert(0, "Endgame")
+
+    for region in world.multiworld.get_regions(world.player):
+        if region.name not in world.accessible_regions and region.name != "Menu":
+            world.accessible_regions.append(region.name)
+
+    if world.options.magicant_mode == MagicantMode.option_alternate_goal and world.options.giygas_required:
+        # If magicant is an alternate goal it should be scaled after Giygas
+        world.accessible_regions.remove("Magicant")
+        world.accessible_regions.append("Sea of Eden")
+        world.accessible_regions.insert(world.accessible_regions.index("Endgame") + 1, "Magicant")
+    elif world.options.magicant_mode == MagicantMode.option_optional_boost and world.options.giygas_required:
+        world.accessible_regions.insert(world.accessible_regions.index("Endgame") - 1, "Magicant")
+    elif world.options.magicant_mode == MagicantMode.option_optional_boost and not world.options.giygas_required:
+        # Just add it to the end of scaling
+        world.accessible_regions.append("Magicant")
+        world.accessible_regions.append("Sea of Eden")
+
+    # calculate which areas need to have enemies scaled
+    for region in world.accessible_regions:
+        if region in world.regional_enemies:
+            world.scaled_area_order.append(region)
+
+    current_level = 1
+    world.area_levels = {}
+    for region in world.accessible_regions:
+        world.area_levels[region] = current_level
+        current_level += expected_level_gains[region]
+
+    if world.Ness_region == "Ness's Mind":
+        world.Ness_region = world.scaled_area_order[0]
+
+    if world.Paula_region == "Ness's Mind":
+        world.Paula_region = world.scaled_area_order[0]
+
+    if world.Jeff_region == "Ness's Mind":
+        world.Jeff_region = world.scaled_area_order[0]
+
+    if world.Poo_region == "Ness's Mind":
+        world.Poo_region = world.scaled_area_order[0]
+
+    if world.Badge_region == "Ness's Mind":
+        world.Badge_region = world.scaled_area_order[0]
diff --git a/worlds/earthbound/modules/boss_shuffle.py b/worlds/earthbound/modules/boss_shuffle.py
new file mode 100644
index 0000000000..3a6e8708eb
--- /dev/null
+++ b/worlds/earthbound/modules/boss_shuffle.py
@@ -0,0 +1,411 @@
+from typing import NamedTuple, TYPE_CHECKING
+from logging import warning
+import struct
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+import struct
+
+boss_sprite_pointers = {
+    "Frank": 0xEF2B69,
+    "Frankystein Mark II": 0xEF43F9,
+    "Titanic Ant": 0xEF3B57,
+    "Captain Strong": 0xEF23A9,
+    "Everdred": 0xEF2BCD,
+    "Mr. Carpainter": 0xEF2BFF,
+    "Mondo Mole": 0xEF4557,
+    "Boogey Tent": 0xEF3748,
+    "Mini Barf": 0xEF3B89,
+    "Master Belch": 0xEF3CD6,
+    "Trillionage Sprout": 0xEF3BBB,
+    "Guardian Digger": 0xEF45BB,
+    "Dept. Store Spook": 0xEF495F,
+    "Evil Mani-Mani": 0xEF395F,
+    "Clumsy Robot": 0xEF45A2,
+    "Shrooom!": 0xEF392B,
+    "Plague Rat of Doom": 0xEF4570,
+    "Thunder and Storm": 0xEF3C70,
+    "Kraken": 0xEF3991,
+    "Guardian General": 0xEF3C3C,
+    "Master Barf": 0xEF39F5,
+    "Starman Deluxe": 0xEF3A59,
+    "Electro Specter": 0xEF45ED,
+    "Carbon Dog": 0xEF3D08,
+    "Ness's Nightmare": 0xEF395F,
+    "Heavily Armed Pokey": 0xEF49AA,
+    "Starman Junior": 0xEF3A59,
+    "Diamond Dog": 0xEF3D08,
+    "Giygas": 0xEF40F2
+
+}
+
+boss_plando_keys = {
+    "Frank",
+    "Frankystein Mark II",
+    "Frankystein",
+    "Captain Strong",
+    "Strong",
+    "Everdred",
+    "Mr. Carpainter",
+    "Mr Carpainter",
+    "Carpainter",
+    "Mondo Mole",
+    "Boogey Tent",
+    "Mini Barf",
+    "Master Belch",
+    "Belch",
+    "Trillionage Sprout",
+    "Guardian Digger",
+    "Dept. Store Spook",
+    "Dept Store Spook",
+    "Evil Mani Mani",
+    "Mani Mani",
+    "Clumsy Robot",
+    "Shrooom!",
+    "Shrooom",
+    "Shroom!",
+    "Shroooooom!",
+    "Shroom",
+    "Plague Rat of Doom",
+    "Thunder and Storm",
+    "Kraken",
+    "The Kraken",
+    "Guardian General",
+    "Master Barf",
+    "Starman Deluxe",
+    "Starman DX",
+    "Electro Specter",
+    "Carbon Dog",
+    "Ness's Nightmare",
+    "Nesss Nightmare",
+    "Heavily Armed Pokey",
+    "Pokey"
+    "Starman Junior",
+    "Diamond Dog",
+    "Giygas"
+}
+
+boss_typo_key = {
+    "Frankystein": "Frankystein Mark II",
+    "Strong": "Captain Strong",
+    "Mr Carpainter": "Mr. Carpainter",
+    "Carpainter": "Mr. Carpainter",
+    "Belch": "Master Belch",
+    "Dept Store Spook": "Dept. Store Spook",
+    "Evil Mani Mani": "Evil Mani-Mani",
+    "Mani Mani": "Evil Mani-Mani",
+    "Shroom": "Shrooom!",
+    "Shrooom": "Shrooom!",
+    "Shroom!": "Shrooom!",
+    "Shroooooom!": "Shrooom!",
+    "The Kraken": "Kraken",
+    "Starman DX": "Starman Deluxe",
+    "Nesss Nightmare": "Ness's Nightmare",
+    "Pokey": "Heavily Armed Pokey"
+}
+
+banned_transformations = ["Master Belch", "Master Barf", "Kraken", "Heavily Armed Pokey"]
+hard_final_bosses = ["Carbon Dog", "Kraken", "Clumsy Robot", "Starman Junior", "Starman Deluxe", "Giygas", "Thunder and Storm", "Electro Specter",
+                     "Evil Mani-Mani", "Ness's Nightmare", "Shrooom!", "Master Belch"]
+
+
+class SlotInfo(NamedTuple):
+    sprite_addrs: list[int]
+    short_names: list[int]
+    long_names: list[int]
+    battle_data: list[int]
+
+
+class BossData(NamedTuple):
+    sprite_pointer: int
+    short_name_pointer: int
+    long_name_pointer: int
+    battle_group: int
+    enemy_id: int
+    music: int
+
+
+def initialize_bosses(world: "EarthBoundWorld") -> None:
+    from ..Options import BossShuffle
+     
+    world.boss_list = [
+        "Frank",
+        "Frankystein Mark II",
+        "Titanic Ant",
+        "Captain Strong",
+        "Everdred",
+        "Mr. Carpainter",
+        "Mondo Mole",
+        "Boogey Tent",
+        "Mini Barf",
+        "Master Belch",
+        "Trillionage Sprout",
+        "Guardian Digger",
+        "Dept. Store Spook",
+        "Evil Mani-Mani",
+        "Clumsy Robot",
+        "Shrooom!",
+        "Plague Rat of Doom",
+        "Thunder and Storm",
+        "Kraken",
+        "Guardian General",
+        "Master Barf",
+        "Starman Deluxe",
+        "Electro Specter",
+        "Carbon Dog",
+        "Ness's Nightmare",
+        "Heavily Armed Pokey",
+        "Starman Junior",
+        "Diamond Dog",
+        "Giygas"
+    ]
+
+    world.boss_slots = {
+        "Frank": SlotInfo([0x0F9338],
+                          [0x066111, 0x066198, 0x0661AC],
+                          [0x065F11, 0x065F20, 0x066482, 0x0660C5, 0x0746E2, 0x074BC1, 0x074E1D],
+                          [0x0683FF]),
+        "Frankystein Mark II": SlotInfo([0x0F96F0], [], [0x066146, 0x06648B, 0x0664FC], [0x068406]),
+        "Titanic Ant": SlotInfo([], [], [], [0x06840D]),
+        "Captain Strong": SlotInfo([], [0x5FC2B, 0x05FCF7, 0x065F88, 0x066085],
+                                   [0x05FC59, 0x3317DB], [0x068468]),
+        "Everdred": SlotInfo([0x0F9A64, 0x0F9FB4], [0x2EEEEA], [0x095C70], [0x06846F]),
+        "Mr. Carpainter": SlotInfo([0x0FA27E, 0x0FA5D0],
+                                   [0x0990DA, 0x0684D0],
+                                   [0x0993DB, 0x09945E, 0x099311, 0x099364, 0x098EF6, 0x099143, 0x099028,
+                                    0x0983BB, 0x09840C, 0x09835B, 0x09056F, 0x0794EC],
+                                   [0x0684FD]),
+        "Mondo Mole": SlotInfo([], [], [], [0x068414]),
+        "Boogey Tent": SlotInfo([0x0FACEB], [], [], [0x06853C]),
+        "Mini Barf": SlotInfo([0x0FB0B4], [], [], [0x2F9515]),
+        "Master Belch": SlotInfo([0x0FB7CF],
+                                 [0x09E64D, 0x09E690, 0x2EEED7, 0x08EF21, 0x08EF38],
+                                 [0x2F6297, 0x2F62B3, 0x2F6910, 0x2F6973],
+                                 [0x068558]),
+        "Trillionage Sprout": SlotInfo([], [], [], [0x068422]),
+        "Guardian Digger": SlotInfo([0x0FC11B, 0x0FC0B5, 0x0FC12C, 0x0FC0D7, 0x0FC0C6],
+                                    [],
+                                    [],
+                                    [0x06858E, 0x068595, 0x06859C, 0x0685A3, 0x0685AA]),
+        "Dept. Store Spook": SlotInfo([0x0FC803], [], [], [0x06855F]),
+        "Evil Mani-Mani": SlotInfo([0x0FE6E4], [], [0x0978AD, 0x09782D, 0x097998], [0x068587]),
+        "Clumsy Robot": SlotInfo([0x0FC429], [], [], [0x06856D]),
+        "Shrooom!": SlotInfo([], [], [], [0x06841B]),
+        "Plague Rat of Doom": SlotInfo([], [], [], [0x068429]),
+        "Thunder and Storm": SlotInfo([], [], [], [0x068430]),
+        "Kraken": SlotInfo([0x092CD0, 0x0FE370, 0x0FE381, 0x0FE392, 0x092D13],
+                           [0x092D4D],
+                           [0x086061, 0x086139, 0x08B430, 0x08B6FC, 0x08B8B4, 0x08B591, 0x09AB2B],
+                           [0x0685B1, 0x2F9472, 0x2F9491, 0x2F94B0]),
+        "Guardian General": SlotInfo([0x0FD7E2], [], [], [0x2F9453]),
+        "Master Barf": SlotInfo([0x0FDB23], [], [], [0x068574]),
+        "Starman Deluxe": SlotInfo([0x0FB626], [], [0x092C29], [0x2F942F]),
+        "Electro Specter": SlotInfo([], [], [], [0x068437]),
+        "Carbon Dog": SlotInfo([], [], [], [0x06843E]),
+        "Ness's Nightmare": SlotInfo([0x0FE3B4], [], [], [0x068580]),
+        "Heavily Armed Pokey": SlotInfo([0x09C2EC], [0x2EEEC3, 0x2EEECC], [], []),
+        "Starman Junior": SlotInfo([], [], [], []),
+        "Diamond Dog": SlotInfo([], [], [], []),
+        "Giygas": SlotInfo([0x09C2BF, 0x09C2E5], [0x2EF0A9], [0x2EF09F], [])
+    }
+
+    world.boss_info = {
+        "Frank": BossData(0x0099, 0xEEEEBC, 0xEEEEBC, 0x01C0, 0x83, 0x64),
+        "Frankystein Mark II": BossData(0x0191, 0xEEEF0A, 0xEEEEF6, 0x01C1, 0x82, 0x66),
+        "Titanic Ant": BossData(0x0139, 0xEEEF1E, 0xEEEF16, 0x01C2, 0x25, 0x67),
+        "Captain Strong": BossData(0x004B, 0xEEEF2A, 0xEEEF22, 0x01C4, 0xE4, 0x66),
+        "Everdred": BossData(0x009D, 0xEEEF31, 0xEEEF31, 0x01C5, 0x6E, 0x62),
+        "Mr. Carpainter": BossData(0x009F, 0xEEEF3E, 0xEEEF3A, 0x01C6, 0x1A, 0x94),
+        "Mondo Mole": BossData(0x019F, 0xEEEF4F, 0xEEEF49, 0x01C7, 0x29, 0x67),
+        "Boogey Tent": BossData(0x0110, 0xEEEF5B, 0xEEEF54, 0x01CA, 0x66, 0x66),
+        "Mini Barf": BossData(0x013B, 0xEEEF65, 0xEEEF60, 0x01E2, 0xE2, 0x63),
+        "Master Belch": BossData(0x0148, 0xEEEF71, 0xEEEF6A, 0x01C8, 0x5D, 0x63),
+        "Trillionage Sprout": BossData(0x013D, 0xEEEF83, 0xEEEF77, 0x01C9, 0x5A, 0x67),
+        "Guardian Digger": BossData(0x01A3, 0xEEEF93, 0xEEEF8A, 0x01CB, 0x2A, 0x67),
+        "Dept. Store Spook": BossData(0x01C7, 0xEEEFA6, 0xEEEF9A, 0x01CC, 0x02, 0x66),
+        "Evil Mani-Mani": BossData(0x0125, 0xEEEFC1, 0xEEEFAC, 0x01CD, 0x89, 0x94),
+        "Clumsy Robot": BossData(0x01A2, 0xEEEFD2, 0xEEEFCB, 0x01CE, 0x92, 0x94),
+        "Shrooom!": BossData(0x0123, 0xEEEFD8, 0xEEEFD8, 0x01D1, 0x27, 0x67),
+        "Plague Rat of Doom": BossData(0x01A0, 0xEEEFEE, 0xEEEFE0, 0x01CF, 0x28, 0x67),
+        "Thunder and Storm": BossData(0x0144, 0xEEEFFF, 0xEEEFF3, 0x01D0, 0x80, 0x68),
+        "Kraken": BossData(0x0127, 0xEEF005, 0xEEF005, 0x01D3, 0x31, 0x68),
+        "Guardian General": BossData(0x0142, 0xEEF015, 0xEEF00C, 0x01D4, 0x49, 0x67),
+        "Master Barf": BossData(0x012B, 0xEEEF65, 0xEEF01D, 0x01D5, 0x5F, 0x63),
+        "Starman Deluxe": BossData(0x012F, 0xEEF034, 0xEEF029, 0x01D2, 0x4A, 0x61),
+        "Electro Specter": BossData(0x01A5, 0xEEF043, 0xEEF03B, 0x01D6, 0x74, 0x68),
+        "Carbon Dog": BossData(0x014A, 0xEEF052, 0xEEF04B, 0x01D7, 0x1B, 0x67),
+        "Ness's Nightmare": BossData(0x0125, 0xEEF070, 0xEEF06A, 0x01D8, 0x15, 0x94),
+        "Heavily Armed Pokey": BossData(0x01CA, 0xEEF064, 0xEEF056, 0x000E, 0xD8, 0x69),
+        "Starman Junior": BossData(0x012F, 0xEEF082, 0xEEF07A, 0x01DA, 0xD6, 0x94),
+        "Diamond Dog": BossData(0x014A, 0xEEF052, 0xEEF089, 0x01D9, 0x53, 0x61),
+        "Giygas": BossData(0x0172, 0xEEF095, 0xEEF095, 0x01DD, 0xDC, 0x49)
+    }
+
+    if world.options.skip_prayer_sequences:
+        # Boss shuffle sprites needs to apply to the skip prayer cleanup too
+        world.boss_slots["Giygas"].sprite_addrs.append(0x07B9AC)
+        world.boss_slots["Heavily Armed Pokey"].sprite_addrs.append(0x07B9A7)
+
+    # mole/rat text
+    # todo; Giygas sprites/text
+
+    world.boss_slot_order = world.boss_list.copy()
+    if type(world.options.boss_shuffle.value) == str:
+        boss_plando = world.options.boss_shuffle.value.split(";")
+        shuffle_result = boss_plando.pop()
+    else:
+        boss_plando = []
+        shuffle_result = world.options.boss_shuffle.value
+
+    if shuffle_result == "true" or shuffle_result == 1:
+        world.random.shuffle(world.boss_list)
+
+        if not world.options.decouple_diamond_dog:
+            world.boss_list.remove("Diamond Dog")
+            insert_index = 28 if not world.options.boss_shuffle_add_giygas else 27
+            world.boss_list.insert(insert_index, "Diamond Dog")
+
+        if not world.options.boss_shuffle_add_giygas:
+            world.boss_list.remove("Giygas")
+            world.boss_list.insert(29, "Giygas")
+
+    if world.options.safe_final_boss:
+        while world.boss_list[25] in hard_final_bosses:
+            i = world.random.randrange(len(world.boss_list))
+            if (world.boss_list[i] == "Diamond Dog" and not world.options.decouple_diamond_dog) or (
+                world.boss_list[i] == "Giygas" and not world.options.boss_shuffle_add_giygas
+            ):
+                continue
+            world.boss_list[25], world.boss_list[i] = world.boss_list[i], world.boss_list[25]
+
+    did_plando_diam_dog = False
+    diamond_dog_plando_slot = None
+
+    for item in boss_plando:
+        boss_block = item.split("-")
+        boss = boss_block[0].title()  # Boss is what's being placed
+        slot = boss_block[1].title()  # SLot is where the boss is going.
+        if boss in boss_typo_key:
+            boss = boss_typo_key[boss]
+
+        if slot in boss_typo_key:
+            slot = boss_typo_key[boss]
+
+        if slot == "Diamond Dog":
+            did_plando_diam_dog = True
+            diamond_dog_plando_slot = boss
+
+        old_index = world.boss_list.index(boss)  # This should be the slot where the chosen boss currently is
+        new_index = world.boss_slot_order.index(slot)  # Boss slots should use the original position
+
+        world.boss_list[old_index] = world.boss_list[new_index]  # We want to replace the boss that was originally there with the boss we're swapping with
+        world.boss_list[new_index] = boss
+
+    if world.boss_list[25] == "Carbon Dog" and world.boss_list[27] in banned_transformations:
+        if did_plando_diam_dog:
+            warning(f"""Unable to plando {diamond_dog_plando_slot} for {world.multiworld.get_player_name(world.player)}'s EarthBound world.
+This boss cannot be placed onto Diamond Dog's slot if Carbon Dog is on Heavily Armed Pokey's slot.
+This message is likely the result of randomization and can be safely ignored.""")  # Why is this spacing the only way to get the message to render legibly
+        original_boss = world.boss_list[27]
+        transformation_replacement = world.random.randint(0, 24)
+        while world.boss_list[transformation_replacement] in banned_transformations:
+            transformation_replacement = world.random.randint(0, 24)
+        world.boss_list[27] = world.boss_list[transformation_replacement]
+        world.boss_list[transformation_replacement] = original_boss
+
+def write_bosses(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    rom.write_bytes(0x15E527, bytearray([0x00, 0x00]))  # Blank out Pokey's end battle action
+    rom.write_bytes(0x15B8B9, bytearray([0x00, 0x00]))
+    rom.write_bytes(0x15DD13, bytearray([0x00, 0x00]))  # Blank out barf's end battle script
+    rom.write_bytes(0x15E69F, bytearray([0x00, 0x00]))  # Blank giygas
+    if world.boss_list[25] == "Carbon Dog":  # Heavily armed Pokey
+        pokey_adjust = 27
+    else:
+        pokey_adjust = 25
+
+    rom.write_bytes(world.enemies[world.boss_list[pokey_adjust]].address + 78, bytearray([0x13, 0x01]))
+    for i in range(1, world.enemies[world.boss_list[pokey_adjust]].attack_extensions):
+        enemy_new = f"{world.enemies[world.boss_list[pokey_adjust]].name} ({i + 1})"
+        rom.write_bytes(world.enemies[enemy_new].address + 78, bytearray([0x13, 0x01]))
+
+    if world.boss_list[20] == "Carbon Dog":  # Master Barf
+        barf_adjust = 27
+    else:
+        barf_adjust = 20
+        
+    rom.write_bytes(world.enemies[world.boss_list[barf_adjust]].address + 78, bytearray([0xF4, 0x00]))
+    for i in range(1, world.enemies[world.boss_list[barf_adjust]].attack_extensions):
+        enemy_new = f"{world.enemies[world.boss_list[barf_adjust]].name} ({i + 1})"
+        rom.write_bytes(world.enemies[enemy_new].address + 78, bytearray([0xF4, 0x00]))
+
+    if world.boss_list[28] == "Carbon Dog":  # Giygas 2
+        # I should probably just hard stop Carbon Dog from being here
+        giygas_2_adjust = 27  # Set to the diamond dog slot
+    else:
+
+        giygas_2_adjust = 28
+
+    rom.write_bytes(world.enemies[world.boss_list[giygas_2_adjust]].address + 78, bytearray([0x16, 0x01]))
+    for i in range(1, world.enemies[world.boss_list[giygas_2_adjust]].attack_extensions):
+        enemy_new = f"{world.enemies[world.boss_list[giygas_2_adjust]].name} ({i + 1})"
+        rom.write_bytes(world.enemies[enemy_new].address + 78, bytearray([0x16, 0x01]))
+
+    if world.boss_list[25] != "Heavily Armed Pokey":
+        rom.write_bytes(0x15E50A, bytearray([0x19, 0x6E, 0xEF]))
+        rom.write_bytes(0x15E4FE, bytearray([0x70, 0x11, 0x01]))  # Add to the scaling list?
+
+    for slot, boss in enumerate(world.boss_slot_order):
+        for address in world.boss_slots[boss].sprite_addrs:  # sprite
+            rom.write_bytes(address, struct.pack("H", world.boss_info[world.boss_list[slot]].sprite_pointer))
+
+        for address in world.boss_slots[boss].short_names:  # short name
+            rom.write_bytes(address, struct.pack("I", world.boss_info[world.boss_list[slot]].short_name_pointer))
+
+        for address in world.boss_slots[boss].long_names:  # long name
+            rom.write_bytes(address, struct.pack("I", world.boss_info[world.boss_list[slot]].long_name_pointer))
+
+        for address in world.boss_slots[boss].battle_data:  # battle
+            rom.write_bytes(address, struct.pack("H", world.boss_info[world.boss_list[slot]].battle_group))
+
+    rom.write_bytes(0x10DF7F, struct.pack("H", world.boss_info[world.boss_list[25]].enemy_id))
+    rom.write_bytes(0x10DF86, struct.pack("H", world.boss_info[world.boss_list[25]].enemy_id))
+    # rom.write_bytes(0x10DF8D, struct.pack("H", world.boss_info[world.boss_list[25]].enemy_id))
+    rom.write_bytes(0x10DFA2, struct.pack("H", world.boss_info[world.boss_list[25]].enemy_id))
+    rom.write_bytes(0x10D563, struct.pack("H", world.boss_info[world.boss_list[25]].enemy_id))
+    rom.write_bytes(world.enemies[world.boss_list[25]].address + 91, bytearray([0x00]))  # Row of the enemy
+
+    rom.write_bytes(0x10DF83, struct.pack("H", world.boss_info[world.boss_list[28]].enemy_id))
+    rom.write_bytes(0x02C4FD, struct.pack("H", world.boss_info[world.boss_list[28]].enemy_id))
+    rom.write_bytes(0x10D560, struct.pack("H", world.boss_info[world.boss_list[28]].enemy_id))
+
+    rom.write_bytes(0x159FC7, struct.pack("H", world.boss_info[world.boss_list[27]].enemy_id))
+    rom.write_bytes(0x15D5C1, struct.pack("H", world.boss_info[world.boss_list[27]].enemy_id))
+    # carbon dog's transformation
+    rom.write_bytes(0x10DF69, struct.pack("H", world.boss_info[world.boss_list[27]].enemy_id))
+    rom.write_bytes(0x02C503, bytearray([world.boss_info[world.boss_list[28]].music]))  # music
+
+    rom.write_bytes(0x2F188F, struct.pack("I", boss_sprite_pointers[world.boss_list[3]]))
+
+    rom.write_bytes(0x0302CE, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05F870, struct.pack("H", 0x0154))
+    rom.write_bytes(0x0F8E3D, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05F886, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05F8A1, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05F8E3, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05FB0E, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05FBFC, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05FD08, struct.pack("H", 0x0154))
+    rom.write_bytes(0x05FD5C, struct.pack("H", 0x0154))
+    rom.copy_bytes(0x10DF7B, 6, 0x2FFF10)
+    if world.boss_list[25] == "Carbon Dog":
+        rom.write_bytes(0x2FFF16, bytearray([0x00]))  # Count of enemies
+        rom.write_bytes(0x2FFF17, struct.pack("H", world.boss_info[world.boss_list[27]].enemy_id))  # Add diamond dog
+        rom.write_bytes(0x2FFF19, bytearray([0xFF]))
+        rom.write_bytes(world.enemies[world.boss_list[27]].address + 91, bytearray([0x00]))  # Force to front row
+    elif world.boss_list[25] == "Giygas":
+        rom.write_bytes(0x0121DF, bytearray([0x00]))
+        rom.write_bytes(0x2FFF16, bytearray([0xFF]))
+    else:
+        rom.write_bytes(0x2FFF16, bytearray([0xFF]))
+    
+    # c2c505 sets the song
diff --git a/worlds/earthbound/modules/dungeon_er.py b/worlds/earthbound/modules/dungeon_er.py
new file mode 100644
index 0000000000..34bf429556
--- /dev/null
+++ b/worlds/earthbound/modules/dungeon_er.py
@@ -0,0 +1,212 @@
+import struct
+from typing import Optional, TYPE_CHECKING
+from dataclasses import dataclass
+from ..game_data.local_data import item_id_table
+from typing import Optional, TYPE_CHECKING
+from dataclasses import dataclass
+from ..game_data.local_data import item_id_table
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+
+
+@dataclass
+class EBDungeonDoor:
+    address: int
+    copyaddress: int
+    direction: int
+    is_script: bool = False # Script warps invert the x and y coordinate
+
+
+def shuffle_dungeons(world: "EarthBoundWorld") -> None:
+    # Is the dept. store a dungeon
+    single_exit_dungeons = [
+        "Giant Step",
+        "Happy-Happy HQ",
+        "Lilliput Steps",
+        "Milky Well",
+        "Gold Mine",
+        "Moonside",
+        "Monotoli Building",
+        "Magnet Hill",
+        "Pink Cloud",
+        "Dungeon Man",
+        "Stonehenge Base",
+        "Lumine Hall",
+        "Fire Spring",
+        "Sea of Eden"
+    ]
+
+    double_exit_dungeons = [
+        "Arcade",
+        "Brickroad Maze",
+        "Rainy Circle",
+        "Belch's Factory",
+        "Pyramid"
+        ]
+
+    world.dungeon_connections = {
+        "Arcade": "Arcade",
+        "Giant Step": "Giant Step",
+        "Happy-Happy HQ": "Happy-Happy HQ",
+        "Lilliput Steps": "Lilliput Steps",
+        "Belch's Factory": "Belch's Factory",
+        "Milky Well": "Milky Well",
+        "Gold Mine": "Gold Mine",
+        "Moonside": "Moonside",
+        "Monotoli Building": "Monotoli Building",
+        "Magnet Hill": "Magnet Hill",
+        "Pink Cloud": "Pink Cloud",
+        "Dungeon Man": "Dungeon Man",
+        "Stonehenge Base": "Stonehenge Base",
+        "Brickroad Maze": "Brickroad Maze",
+        "Rainy Circle": "Rainy Circle",
+        "Pyramid": "Pyramid",
+        "Lumine Hall": "Lumine Hall",
+        "Fire Spring": "Fire Spring",
+        "Sea of Eden": "Sea of Eden"
+    }
+    if world.options.magicant_mode:
+        # Don't shuffle Magicant when it's important
+        single_exit_dungeons.remove("Sea of Eden")
+
+    shuffled_single_dungeons = single_exit_dungeons.copy()
+    shuffled_double_dungeons = double_exit_dungeons.copy()
+
+    if world.options.dungeon_shuffle:
+        world.random.shuffle(shuffled_single_dungeons)
+        world.random.shuffle(shuffled_double_dungeons)
+
+    for index, entrance in enumerate(single_exit_dungeons):
+        world.dungeon_connections[entrance] = shuffled_single_dungeons[index]
+
+    for index, entrance in enumerate(double_exit_dungeons):
+        world.dungeon_connections[entrance] = shuffled_double_dungeons[index]
+
+
+def write_dungeon_entrances(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    dungeon_entrances = {
+        "Arcade": ["Arcade Entrance", "Arcade Exit", "Arcade Back Exit", "Arcade Back Entrance"],
+        "Giant Step": ["Giant Step Entrance", "Giant Step Exit"],
+        "Happy-Happy HQ": ["Happy-Happy HQ Entrance", "Happy-Happy HQ Exit"],
+        "Lilliput Steps": ["Lilliput Steps Entrance", "Lilliput Steps Exit"],
+        "Belch's Factory": ["Factory Script Warp", "Factory Exit", "Factory Back Exit", "Factory Back Entrance"],
+        "Milky Well": ["Milky Well Entrance", "Milky Well Exit"],
+        "Gold Mine": ["Mine Entrance", "Mine Exit"],
+        "Monotoli Building": ["Monotoli Entrance", "Monotoli Exit"],
+        "Moonside": ["Cafe Entrance", "Cafe Exit"],
+        "Brickroad Maze": ["Maze Entrance", "Maze Exit", "Maze Back Exit", "Maze Back Entrance"],
+        "Rainy Circle": ["Rainy Entrance", "Rainy Exit", "Rainy Back Exit", "Rainy Back Entrance"],
+        "Magnet Hill": ["Sewer Entrance", "Sewer Exit"],
+        "Pink Cloud": ["Pink Cloud Entrance", "Pink Cloud Exit"],
+        "Pyramid": ["Pyramid Entrance", "Pyramid Exit", "Pyramid Back Exit", "Pyramid Back Entrance"],
+        "Dungeon Man": ["D.M. Entrance Script", "D.M. Exit Script"],
+        "Stonehenge Base": ["Stonehenge Entrance", "Stonehenge Exit"],
+        "Lumine Hall": ["Lumine Entrance", "Lumine Exit"],
+        "Fire Spring": ["Fire Spring Entrance", "Fire Spring Exit"],
+        "Sea of Eden": ["Sea Entrance Script", "Sea Exit Script"]
+    }
+
+    all_dungeon_doors = {
+        "Arcade Entrance": EBDungeonDoor(0x0F00CC, 0x321000, 7),
+        "Arcade Exit": EBDungeonDoor(0x0F029A, 0x321010, 5),
+        "Arcade Back Exit": EBDungeonDoor(0x0F026E, 0x321020, 1),
+        "Arcade Back Entrance": EBDungeonDoor(0x0F00C1, 0x321030, 5),
+        "Giant Step Entrance": EBDungeonDoor(0x0F0032, 0x321040, 7),
+        "Giant Step Exit": EBDungeonDoor(0x0F04B5, 0x321050, 5),
+        "Happy-Happy HQ Entrance": EBDungeonDoor(0x0F09E9, 0x321060, 7),
+        "Happy-Happy HQ Exit": EBDungeonDoor(0x0F0A99, 0x321070, 5),
+        "Lilliput Steps Entrance": EBDungeonDoor(0x0F09F4, 0x321080, 3),
+        "Lilliput Steps Exit": EBDungeonDoor(0x0F0B1A, 0x321090, 7),
+        "Factory Entrance": EBDungeonDoor(0x0F1277, 0x3210A0, 5),
+        "Factory Script Warp": EBDungeonDoor(0x15EECB, 0x3210B0, 5, True),
+        "Factory Exit": EBDungeonDoor(0x0F1159, 0x3210C0, 5),
+        "Factory Back Exit": EBDungeonDoor(0x0F11BC, 0x3210D0, 5),
+        "Factory Back Entrance": EBDungeonDoor(0x0F11FE, 0x3210E0, 3),
+        "Milky Well Entrance": EBDungeonDoor(0x0F12E9, 0x3210F0, 3),
+        "Milky Well Exit": EBDungeonDoor(0x0F11E8, 0x321100, 5),
+        "Mine Entrance": EBDungeonDoor(0x0F1378, 0x321110, 7),
+        "Mine Exit": EBDungeonDoor(0x0F1400, 0x321120, 5),
+        "Cafe Entrance": EBDungeonDoor(0x0F165D, 0x321150, 3),
+        "Cafe Exit": EBDungeonDoor(0x0F1A25, 0x321160, 7),
+        "Monotoli Entrance": EBDungeonDoor(0x0F1928, 0x321170, 7),
+        "Monotoli Exit": EBDungeonDoor(0x0F1862, 0x321180, 3),
+        "Maze Entrance": EBDungeonDoor(0x0F0EB6, 0x321190, 3),
+        "Maze Exit": EBDungeonDoor(0x0F0FD8, 0x3211A0, 5),
+        "Maze Back Exit": EBDungeonDoor(0x0F0FE3, 0x3211B0, 5),
+        "Maze Back Entrance": EBDungeonDoor(0x0F0EC1, 0x3211C0, 7),
+        "Rainy Entrance": EBDungeonDoor(0x0F0ED7, 0x3211D0, 7),
+        "Rainy Exit": EBDungeonDoor(0x0F1030, 0x3211E0, 5),
+        "Rainy Back Exit": EBDungeonDoor(0x0F0FEE, 0x3211F0, 5),
+        "Rainy Back Entrance": EBDungeonDoor(0x0F0EAB, 0x321200, 3),
+        "Sewer Entrance": EBDungeonDoor(0x0F1A3B, 0x321210, 5),
+        "Sewer Exit": EBDungeonDoor(0x0F1A9E, 0x321220, 1),
+        "Pink Cloud Entrance": EBDungeonDoor(0x0F1E32, 0x321230, 7),
+        "Pink Cloud Exit": EBDungeonDoor(0x0F1EAB, 0x321240, 5),
+        "Pyramid Entrance": EBDungeonDoor(0x0F1F3A, 0x321250, 3),
+        "Pyramid Exit": EBDungeonDoor(0x0F1FA9, 0x321260, 5),
+        "Pyramid Back Exit": EBDungeonDoor(0x0F20E8, 0x321290, 5),
+        "Pyramid Back Entrance": EBDungeonDoor(0x0F1F45, 0x3212A0, 3),
+        "D.M. Entrance Script": EBDungeonDoor(0x15F0A3, 0x321270, 7, True),
+        "D.M. Exit Script": EBDungeonDoor(0x15F0CB, 0x321280, 5, True),
+        "Stonehenge Entrance": EBDungeonDoor(0x0F105C, 0x3212B0, 7),
+        "Stonehenge Exit": EBDungeonDoor(0x0F1072, 0x3212C0, 3),
+        "Lumine Entrance": EBDungeonDoor(0x0F239C, 0x3212D0, 7),
+        "Lumine Exit": EBDungeonDoor(0x0F2318, 0x3212E0, 3),
+        "Fire Spring Entrance": EBDungeonDoor(0x0F23D4, 0x3212F0, 3),
+        "Fire Spring Exit": EBDungeonDoor(0x0F2437, 0x321300, 5),
+        "Sea Entrance Script": EBDungeonDoor(0x15F25B, 0x321310, 3, True),
+        "Sea Exit Script": EBDungeonDoor(0x15ECEB, 0x321320, 5, True),
+        "Post-Nightmare Script": EBDungeonDoor(0x15ED4B, 0x321330, 5, True),
+        "Carpainter Failure Script": EBDungeonDoor(0x15EEF3, 0x321340, 7, True)
+    }
+
+    paired_doors = {}
+
+    for door in all_dungeon_doors:
+        rom.copy_bytes(all_dungeon_doors[door].address, 6, all_dungeon_doors[door].copyaddress)  # Copy 6 bytes at the source of the door to the destination of the door
+
+    for door in world.dungeon_connections:
+        for index, entrance in enumerate(dungeon_entrances[door]):
+            if "Exit" in entrance:
+                paired_doors[dungeon_entrances[world.dungeon_connections[door]][index]] = entrance
+            else:
+                paired_doors[entrance] = dungeon_entrances[world.dungeon_connections[door]][index]
+
+    paired_doors["Post-Nightmare Script"] = paired_doors["Sea Exit Script"]
+    paired_doors["Carpainter Failure Script"] = paired_doors["Happy-Happy HQ Exit"]
+
+    for door in paired_doors:
+        destination = all_dungeon_doors[paired_doors[door]]
+        source = all_dungeon_doors[door]
+        if source.is_script:
+            if destination.is_script:
+                rom.copy_bytes(destination.copyaddress, 6, source.address)
+            else:
+                rom.copy_bytes(destination.copyaddress + 2, 2, source.address)
+                rom.copy_bytes(destination.copyaddress, 2, source.address + 2)
+                rom.write_bytes(source.address + 4, bytearray([destination.direction]))
+                rom.copy_bytes(destination.copyaddress + 4, 1, source.address + 5)
+        else:
+            if destination.is_script:
+                rom.copy_bytes(destination.copyaddress + 2, 2, source.address)
+                rom.copy_bytes(destination.copyaddress, 2, source.address + 2)
+                rom.copy_bytes(destination.copyaddress + 5, 1, source.address + 4)
+            else:
+                rom.copy_bytes(destination.copyaddress, 5, source.address)
+
+    rom.write_bytes(0x101664, struct.pack("H", 0x041F))  # Flag controlling the Saturn Valley ladder
+    rom.write_bytes(0x0F19C7, struct.pack("I", 0xF3104C))  # Replacement for the Moonside deliveryman
+    rom.write_bytes(0x0F0A93, struct.pack("I", 0x000000))  # Skip Pokey walking up after HHHQ
+    rom.write_bytes(0x086DFC, struct.pack("H", 0x00C7))  # Flag-independent Moonside entry
+    rom.write_bytes(0x0F1657, struct.pack("I", 0xF311A7))  # Fourside Cafe Door Script
+    rom.write_bytes(0x0F165B, struct.pack("H", 0x8091))  # Lock Cafe
+    rom.write_bytes(0x0FC8C6, struct.pack("I", 0xF3120B))  # Everdred script
+    rom.write_bytes(0x10784A, struct.pack("H", 0x0000))  # Mook spawn in stonehenge anteroom
+    rom.write_bytes(0x0FC51E, bytearray([0x00]))  # Moonside sparkle always active
+
+    rom.write_bytes(0x0FA4D6, bytearray([0xC7, 0x00, 0x01]))
+
+    moonside_reward = world.multiworld.get_location("Fourside - Post-Moonside Delivery", world.player).item
+    if (moonside_reward.player != world.player) or world.options.remote_items or moonside_reward.name not in item_id_table:
+        rom.write_bytes(0x3310F7, struct.pack("I", 0xF310FB))
diff --git a/worlds/earthbound/modules/enemizer/__init__.py b/worlds/earthbound/modules/enemizer/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/earthbound/modules/enemizer/enemy_attributes.py b/worlds/earthbound/modules/enemizer/enemy_attributes.py
new file mode 100644
index 0000000000..af4b2d30d7
--- /dev/null
+++ b/worlds/earthbound/modules/enemizer/enemy_attributes.py
@@ -0,0 +1,1024 @@
+enemy_species = [
+    "Cultist",
+    "Spook",
+    "Frog",
+    "Buffalo",
+    "Antoid",
+    "Mushroom",
+    "Fungus",
+    "Mobile Sprout",
+    "Fire Plug",
+    "Record",
+    "Power Robot",
+    "Reactor Robot",
+    "Hieroglyph",
+    "Asp Hieroglyph",
+    "Swoosh",
+    "Menace",
+    "Spirit",
+    "Elemental",
+    "Party Man",
+    "Reveler",
+    "Local Guy",
+    "Hippie",
+    "Bear",
+    "Bear Seven",
+    "Moldyman",
+    "Mite",
+    "Lady",
+    "Ant",
+    "Coffee Cup",
+    "Dice",
+    "Little Pile",
+    "Kraken",
+    "Robo",
+    "Cop",
+    "Coil Snake",
+    "Batty",
+    "Roach",
+    "Sign",
+    "Shambler",
+    "Punk",
+    "Skelpion",
+    "Starman",
+    "Sphere",
+    "Royal Guard",
+    "General",
+    "Zombie",
+    "Possessor",
+    "Dog",
+    "Oak",
+    "Octobot",
+    "Duck",
+    "Clock",
+    "Wolf",
+    "Musica",
+    "Pile of Puke",
+    "Kiss of Death",
+    "Eel",
+    "Tangoo",
+    "Arachnid",
+    "Demon",
+    "Fobby",
+    "Foppy",
+    "Booka",
+    "Mook",
+    "Ghost",
+    "Slug",
+    "Mouse",
+    "Bomb",
+    "Tom",
+    "Sam",
+    "Fish",
+    "Fish's Brother",
+    "Kid",
+    "Boy",
+    "Art",
+    "Shattered Man",
+    "Orb",
+    "Man Junior",
+    "Li'l UFO",
+    "UFO",
+    "Guy",
+    "Taxi",
+    "Molecule",
+    "Protoplasm",
+    "Robot",
+    "Psycho",
+    "Goat",
+    "Mole",
+    "Flame",
+    "Petunia",
+    "Ranboob",
+    "Noose",
+    "Pump",
+    "Crocodile",
+    "Fly",
+    "Crow",
+    "Caterpillar",
+    "Eye",
+    "Worm",
+    "Statue",
+    "Rat of Doom",
+    "Specter",
+    "Chief",
+    "Bot",
+    "Gangster",
+    "Storm",
+    "Dino",
+    "Painter",
+    "Burglar",
+    "Tank",
+]
+
+enemy_adjectives = [
+    "",
+    "Insane ",
+    "Dept. Store ",
+    "Armored ",
+    "Bad ",
+    "Black ",
+    "Red ",
+    "Ramblin' ",
+    "Struttin' ",
+    "Tough ",
+    "Enraged ",
+    "Mystical ",
+    "Atomic ",
+    "Nuclear ",
+    "Guardian ",
+    "Lethal ",
+    "Electro ",
+    "Conducting ",
+    "Evil ",
+    "Annoying Old ",
+    "Annoying ",
+    "Unassuming ",
+    "New Age Retro ",
+    "Carbon ",
+    "Mighty ",
+    "Putrid ",
+    "Thunder ",
+    "Cranky ",
+    "Extra Cranky ",
+    "Titanic ",
+    "Gigantic ",
+    "Mondo ",
+    "Scalding ",
+    "Loaded ",
+    "Slimy ",
+    "Even Slimier ",
+    "Bionic ",
+    "Spinning ",
+    "Whirling ",
+    "Hyper Spinning ",
+    "Coil ",
+    "Thirsty ",
+    "Mr. ",
+    "Elder ",
+    "Violent ",
+    "Filthy Attack ",
+    "Crazed ",
+    "Wooly ",
+    "Wild 'n Wooly ",
+    "Skate ",
+    "Dread ",
+    "Super ",
+    "Ghost of ",
+    "Smilin' ",
+    "Uncontrollable ",
+    "Petrified ",
+    "Urban ",
+    "Zombie ",
+    "Crooked ",
+    "Over Zealous ",
+    "Territorial ",
+    "Hostile Elder ",
+    "Diamond ",
+    "Marauder ",
+    "Military ",
+    "Mechanical ",
+    "Ultimate ",
+    "Mad ",
+    "Dali's ",
+    "Trillionage ",
+    "Desert ",
+    "Big ",
+    "French ",
+    "Zap ",
+    "Squatter ",
+    "Crested ",
+    "Great Crested ",
+    "Lesser ",
+    "Smelly ",
+    "Stinky ",
+    "Attack ",
+    "Pit Bull ",
+    "Rowdy ",
+    "Deadly ",
+    "Care Free ",
+    "Electro ",
+    "Handsome ",
+    "Manly ",
+    "Runaway ",
+    "Trick or Trick ",
+    "Cave ",
+    "Abstract ",
+    "Shattered ",
+    "Fierce ",
+    "Ego ",
+    "Yes ",
+    "Cute ",
+    "Beautiful ",
+    "Pogo ",
+    "Tough ",
+    "Worthless ",
+    "Sentry ",
+    "Heavily Armed ",
+    "Psychic ",
+    "Major Psychic ",
+    "Gruff ",
+    "Clumsy ",
+    "Soul Consuming ",
+    "Demonic ",
+    "High-class ",
+    "Robo-",
+    "Plain ",
+    "Strong ",
+    "Hard ",
+    "No Good ",
+    "Mostly Bad ",
+    "Spiteful ",
+    "Farm ",
+    "Criminal ",
+    "Master Criminal ",
+    "Final ",
+    "Plague ",
+    "Disingenuous ",
+    "Disgusting ",
+    "Inadequate ",
+    "Dr. ",
+    "Electronic ",
+    "Jealous ",
+    "Bald ",
+    "Baked ",
+    "Magic ",
+    "Polar ",
+    "Depressed ",
+    "Clean ",
+    "Elderly ",
+    "Banned ",
+    "Grumpy ",
+    "Whelmed ",
+    "Loud ",
+    "Mushy ",
+    "Randomized ",
+    "Homesick ",
+    "Mecha ",
+    "Ramblin' Evil ",
+    "Master ",
+    "Secret ",
+    "Platinum ",
+    "Armed ",
+    "Condemned ",
+    "Rad ",
+    "Hangry ",
+    "Moonsidian ",
+    "No. 3 ",
+    "Legal ",
+    "Copyrighted ",
+    "Cyanotic ",
+    "Serendipitous ",
+    "Disgruntled "
+]
+
+battle_sprites = {
+    "Antoid": [0x01],
+    "Dog": [0x02, 0x42],
+    "Frog": [0x03],
+    "Sphere": [0x04],
+    "Mushroom": [0x05],
+    "Bomb": [0x06],
+    "Octobot": [0x07],
+    "Musica": [0x08],
+    "Ranboob": [0x09],
+    "Moldyman": [0x0A],
+    "Fungus": [0x0B],
+    "Booka": [0x0C],
+    "Shambler": [0x0D],
+    "Dino": [0x0E, 0x41],
+    "Art": [0x0F],
+    "Crow": [0x10],
+    "Fobby": [0x11],
+    "Foppy": [0x11],
+    "Duck": [0x12],
+    "Batty": [0x13],
+    "Mouse": [0x14],
+    "Kiss of Death": [0x15],
+    "Swoosh": [0x16],
+    "Petunia": [0x17],
+    "Flame": [0x18],
+    "Coil Snake": [0x19],
+    "Sign": [0x1A],
+    "Kid": [0x1B],
+    "Sam": [0x1C],
+    "Tom": [0x1C],
+    "Psycho": [0x1D],
+    "Mite": [0x1E],
+    "Fish": [0x1F],
+    "Fish's Brother": [0x1F],
+    "Burglar": [0x20],
+    "Painter": [0x21],
+    "Party Man": [0x22],
+    "Reveler": [0x22],
+    "Local Guy": [0x23],
+    "Menace": [0x24],
+    "Spirit": [0x24],
+    "Gangster": [0x25],
+    "Guy": [0x26],
+    "Storm": [0x27],
+    # Carbon
+    "Kraken": [0x29],
+    # Pokey
+    "Li'l UFO": [0x2B],
+    "Coffee Cup": [0x2C],
+    "Molecule": [0x2D],
+    "Record": [0x2E],
+    "Slug": [0x2F],
+    "Elemental": [0x30],
+    "UFO": [0x31],
+    "Possessor": [0x32],
+    "Cop": [0x33],
+    "Robo": [0x34],
+    "Ghost": [0x35],
+    "Robot": [0x36],
+    "Starman": [0x37, 0x6A],
+    "Shattered Man": [0x38],
+    "Specter": [0x39],
+    "Dice": [0x3A],
+    "Fire Plug": [0x3B],
+    "Protoplasm": [0x3C],
+    "Mook": [0x3D],
+    "Spook": [0x3D],
+    "Pump": [0x3E],
+    "Cultist": [0x3F],
+    "Man Junior": [0x40],
+    "Asp Hieroglyph": [0x43],
+    "Eel": [0x44],
+    "Chief": [0x45],
+    "Hieroglyph": [0x46],
+    "Bot": [0x47],
+    "Zombie": [0x48],
+    "Ant": [0x49],
+    "Buffalo": [0x4A],
+    "Rat of Doom": [0x4B],
+    # iamond Dog
+    "Arachnid": [0x4D],
+    "Mole": [0x4E],
+    "Statue": [0x4F],
+    "Roach": [0x50],
+    "Noose": [0x51],
+    "Tangoo": [0x52],
+    # "Digger": [0x53],
+    "Crocodile": [0x54],
+    "Taxi": [0x55],
+    "Demon": [0x56],
+    "General": [0x57],
+    "Royal Guard": [0x57],
+    # Trillionage sprout
+    "Fly": [0x59],
+    "Mobile Sprout": [0x5A],
+    "Little Pile": [0x5B],
+    "Skelpion": [0x5C],
+    "Clock": [0x5D],
+    "Goat": [0x5E],
+    "Oak": [0x5F],
+    "Punk": [0x60, 0x64],
+    "Tank": [0x61],
+    "Pile of Puke": [0x62],
+    "Lady": [0x63],
+    "Boy": [0x65],
+    "Orb": [0x66],
+    "Wolf": [0x67],
+    "Bear": [0x68],
+    "Bear Seven": [0x68],
+    "Power Robot": [0x69],
+    "Reactor Robot": [0x69],
+    "Hippie": [0x6B],
+    "Worm": [0x6D],
+    "Caterpillar": [0x6D],
+    "Eye": [0x6E]
+
+
+}
+
+field_sprites = [
+    0x00,
+    0x013C,
+    0x014A,
+    0x0118,
+    0x012E,
+    0x0123,
+    0x0115,
+    0x0132,
+    0xC3,
+    0x0124,
+    0x011D,
+    0x0123,
+    0x0128,
+    0x0132,
+    0x012A,
+    0x012C,
+    0x011A,
+    0x0116,
+    0x011F,
+    0x0112,
+    0x01A0,
+    0x0144,
+    0x0114,
+    0x0122,
+    0x0117,
+    0x011B,
+    0x0135,
+    0x01BC,
+    0x011E,
+    0x0117,
+    0x0144,
+    0x0120,
+    0x9D,
+    0x9F,
+    0x0187,
+    0x0184,
+    0x0144,
+    0x99,
+    0x0186,
+    0x0144,
+    0x014A,
+    0x0132,
+    0x2C,
+    0x0130,
+    0xC3,
+    0x0115,
+    0xC3,
+    0x013C,
+    0x0117,
+    0x0130,
+    0x0131,
+    0x0182,
+    0x0132,
+    0x011D,
+    0x0136,
+    0x012F,
+    0x0133,
+    0x0144,
+    0xC3,
+    0x0117,
+    0xC3,
+    0x0132,
+    0x0117,
+    0x65,
+    0x011C,
+    0x0138,
+    0x016C,
+    0x0140,
+    0x012D,
+    0x0183,
+    0x0145,
+    0x01A2,
+    0x0134,
+    0x0139,
+    0x0137,
+    0x01A0,
+    0x014A,
+    0x013A,
+    0x019F,
+    0x0125,
+    0x013A,
+    0x0143,
+    0x0144,
+    0x019F,
+    0x014C,
+    0x0121,
+    0x0132,
+    0x0142,
+    0x013D,
+    0x013E,
+    0x013D,
+    0x013B,
+    0x013F,
+    0x0146,
+    0x0126,
+    0x0129,
+    0x011C,
+    0x0191,
+    0x0148,
+    0x0188,
+    0x011C,
+    0x0149,
+    0x0147,
+    0x014A,
+    0x014B,
+    0x0132,
+    0x0132,
+    0x0185,
+    0x0132,
+    0x01A1,
+    0x0132,
+]
+
+excluded_enemies = [
+    "Dept. Store Spook",
+    "Ness's Nightmare",
+    "Mr. Carpainter",
+    "Carbon Dog",
+    "Titanic Ant",
+    "Shrooom!",
+    "Plague Rat of Doom",
+    "Mondo Mole",
+    "Guardian Digger",
+    "Kraken",
+    "Guardian General",
+    "Starman Deluxe",
+    "Diamond Dog",
+    "Trillionage Sprout",
+    "Master Belch",
+    "Master Barf",
+    "Electro Specter",
+    "Boogey Tent",
+    "Everdred",
+    "Thunder and Storm",
+    "Frankystein Mark II",
+    "Frank",
+    "Evil Mani-Mani",
+    "Clumsy Robot",
+    "Dept. Store Spook (2)",
+    "Ness's Nightmare (2)",
+    "Mr. Carpainter (2)",
+    "Carbon Dog (2)",
+    "Chomposaur (2)",
+    "Titanic Ant (2)",
+    "Gigantic Ant (2)",
+    "Shrooom! (2)",
+    "Plague Rat of Doom (2)",
+    "Mondo Mole (2)",
+    "Guardian Digger (2)",
+    "Kraken (2)",
+    "Starman (2)",
+    "Starman Super (2)",
+    "Ghost of Starman (2)",
+    "Starman Deluxe (2)",
+    "Final Starman (2)",
+    "Diamond Dog (2)",
+    "Trillionage Sprout (2)",
+    "Master Belch (2)",
+    "Master Barf (2)",
+    "Boogey Tent (2)",
+    "Everdred (2)",
+    "Electro Specter (2)",
+    "Thunder and Storm (2)",
+    "Frankystein Mark II (2)",
+    "Evil Mani-Mani (2)",
+    "Clumsy Robot (2)",
+    "Robo-pump (2)",
+    "Guardian General (2)",
+    "Struttin' Evil Mushroom (2)",
+    "Runaway Dog (2)",
+    "Tiny Li'l Ghost",
+    "Starman Junior",
+    "Buzz Buzz",
+    "Heavily Armed Pokey",
+    "Giygas (2)",
+    "Giygas (3)",
+    "Giygas (4)",
+    "Giygas (5)",
+    "Mini Barf",
+    "Captain Strong",
+    "Giygas (6)",
+    "Clumsy Robot (3)",
+    "Giygas"
+]
+
+robots = [
+    "Power Robot",
+    "Reactor Robot",
+    "Robo",
+    "Sign",
+    "Shambler",
+    "Sphere",
+    "Octobot",
+    "Bomb",
+    "Li'l UFO",
+    "UFO",
+    "Taxi",
+    "Bot",
+    "Pump",
+    "Robot"
+]
+
+insects = [
+    "Antoid",
+    "Ant",
+    "Arachnid",
+    "Roach",
+    "Skelpion",
+    "Slug",
+    "Fly",
+    "Caterpillar",
+    "Worm"
+]
+
+movement_patterns = {
+    0x65: 21,
+    0x99: 21,
+    0x9D: 21,
+    0x9F: 21,
+    0xC3: 31,
+    0x0112: 25,
+    0x01A2: 27,
+    0x0114: 27,
+    0x0115: 27,
+    0x0116: 21,
+    0x0117: 27,
+    0x0118: 21,
+    0x011A: 25,
+    0x011B: 20,
+    0x011C: 21,
+    0x011D: 24,
+    0x011E: 24,
+    0x011F: 21,
+    0x0120: 21,
+    0x0121: 30,
+    0x0122: 29,
+    0x0123: 24,
+    0x0124: 21,
+    0x0125: 21,
+    0x0126: 22,
+    0x0128: 20,
+    0x0129: 29,
+    0x012A: 29,
+    0x012C: 27,
+    0x012D: 20,
+    0x012E: 23,
+    0x012F: 26,
+    0x0130: 23,
+    0x0131: 27,
+    0x0132: 23,
+    0x0133: 24,
+    0x0134: 21,
+    0x0135: 28,
+    0x0136: 30,
+    0x0137: 29,
+    0x0138: 29,
+    0x0139: 20,
+    0x013A: 20,
+    0x013B: 20,
+    0x013C: 20,
+    0x013D: 24,
+    0x013E: 23,
+    0x013F: 20,
+    0x0140: 21,
+    0x0142: 28,
+    0x0143: 21,
+    0x0144: 23,
+    0x0145: 21,
+    0x0146: 27,
+    0x0147: 30,
+    0x0148: 29,
+    0x0149: 29,
+    0x014A: 22,
+    0x014B: 29,
+    0x014C: 29,
+    0x016C: 22,
+    0x0182: 21,
+    0x0183: 21,
+    0x0184: 21,
+    0x0185: 21,
+    0x0186: 21,
+    0x0187: 21,
+    0x0188: 21,
+    0x0191: 30,
+    0x019F: 20,
+    0x01A0: 20,
+    0x01A1: 27,
+    0x01BC: 21,
+}
+
+start_texts = [
+    0xEF7858,  # attacked
+    0xEF7866,  # blocked the way
+    0xEF7879,  # came after you
+    0xEF788B,  # trapped you
+    0xEF789C,  # you encounter
+    0xEF78AB,  # you meet
+    0xEF78B8,  # you engage
+    0xEF78C7,  # you confront
+]
+
+death_texts = [
+    0xEF6D71,
+    0xEF6D83,  # Stopped moving
+    0xEF6D96,
+    0xEF6DA7,  # disappeared
+    0xEF6DB8,  # melted into thin air
+    0xEF6DD8,  # broken into pieces
+    0xEF6DF0,  # destroyed
+    0xEF6E03,  # totally scrapped
+    0xEF6E19,  # turned back to normal
+    0xEF6E31,  # dust of the earth
+
+]
+
+
+weakness_table = {
+    "Fire": {
+             "Frog": 0,
+             "Buffalo": 0,
+             "Antoid": 0,
+             "Mushroom": 0,
+             "Fungus": 0,
+             "Mobile Sprout": 0,
+             "Fire Plug": 3,
+             "Record": 0,
+             "Power Robot": 3,
+             "Reactor Robot": 3,
+             "Hieroglyph": 0,
+             "Asp Hieroglyph": 2,
+             "Swoosh": 2,
+             "Elemental": 0,
+             "Moldyman": 3,
+             "Mite": 0, 
+             "Ant": 0,
+             "Coffee Cup": 2,
+             "Dice": 0,
+             "Kraken": 2,
+             "Robo": 3,
+             "Roach": 0,
+             "Sign": 2,
+             "Shambler": 2,
+             "Skelpion": 0,
+             "Sphere": 0,
+             "Zombie": 0,
+             "Possessor": 3,
+             "Dog": 0,
+             "Oak": 0,
+             "Octobot": 0,
+             "Duck": 0,
+             "Wolf": 0,
+             "Eel": 0,
+             "Arachnid": 0,
+             "Demon": 0,
+             "Fobby": 0,
+             "Foppy": 0,
+             "Booka": 3,
+             "Mook": 0,
+             "Ghost": 0, 
+             "Slug": 0,
+             "Mouse": 0,
+             "Bomb": 2,
+             "Tom": 0,
+             "Sam": 0,
+             "Fish": 3,
+             "Kid": 0,
+             "Boy": 0,
+             "Shattered Man": 2,
+             "Orb": 2,
+             "Li'l UFO": 0,
+             "UFO": 2,
+             "Taxi": 2,
+             "Molecule": 0,
+             "Protoplasm": 0,
+             "Robot": 2,
+             "Psycho": 3,
+             "Goat": 0,
+             "Flame": 3,
+             "Petunia": 0,
+             "Ranboob": 0,
+             "Noose": 0,
+             "Pump": 2,
+             "Crocodile": 2,
+             "Fly": 0,
+             "Crow": 0,
+             "Caterpillar": 0,
+             "Eye": 3,
+             "Worm": 0,
+             "Bot": 2,
+             "Gangster": 0,
+             "Tank": 0
+             },
+
+    "Freeze": {
+             "Frog": 0,
+             "Antoid": 0,
+             "Mushroom": 0,
+             "Fungus": 2,
+             "Mobile Sprout": 0,
+             "Fire Plug": 0,
+             "Power Robot": 0,
+             "Hieroglyph": 2,
+             "Asp Hieroglyph": 0,
+             "Elemental": 3,
+             "Moldyman": 0,
+             "Mite": 0,
+             "Ant": 0,
+             "Coffee Cup": 0,
+             "Dice": 0,
+             "Robo": 0,
+             "Coil Snake": 0,
+             "Roach": 0,
+             "Skelpion": 0,
+             "Sphere": 3,
+             "Royal Guard": 2,
+             "General": 2,
+             "Zombie": 3,
+             "Possessor": 0,
+             "Dog": 0,
+             "Oak": 2,
+             "Octobot": 2,
+             "Duck": 0,
+             "Wolf": 0,
+             "Pile of Puke": 2,
+             "Arachnid": 0,
+             "Demon": 3,
+             "Fobby": 0,
+             "Foppy": 0,
+             "Mook": 3,
+             "Ghost": 2,
+             "Slug": 0,
+             "Mouse": 0,
+             "Tom": 2,
+             "Sam": 2,
+             "Fish's Brother": 3,
+             "Kid": 0,
+             "Boy": 3,
+             "Orb": 0,
+             "Li'l UFO": 2,
+             "UFO": 2,
+             "Taxi": 2,
+             "Molecule": 0,
+             "Protoplasm": 0,
+             "Robot": 2,
+             "Goat": 0,
+             "Flame": 0,
+             "Petunia": 3,
+             "Ranboob": 2,
+             "Noose": 2,
+             "Pump": 2,
+             "Fly": 0,
+             "Crow": 0,
+             "Caterpillar": 0,
+             "Eye": 0,
+             "Worm": 0,
+             "Rat of Doom": 2,
+             "Bot": 2,
+             "Gangster": 0,
+             "Tank": 0
+             },
+            
+    "Flash": {
+            "Fire Plug": 3,
+            "Record": 3,
+            "Power Robot": 2,
+            "Reactor Robot": 2,
+            "Swoosh": 0,
+            "Menace": 3,
+            "Spirit": 3,
+            "Elemental": 0,
+            "Mite": 3,
+            "Coffee Cup": 2,
+            "Dice": 2,
+            "Sign": 3,
+            "Starman": 2,
+            "Sphere": 3,
+            "Zombie": 0,
+            "Possessor": 0,
+            "Dog": 0,
+            "Octobot": 3, 
+            "Musica": 2,
+            "Kiss of Death": 2,
+            "Tangoo": 0,
+            "Ghost": 0,
+            "Tom": 0,
+            "Sam": 0,
+            "Fish's Brother": 2,
+            "Kid": 0,
+            "Orb": 2,
+            "Li'l UFO": 2,
+            "UFO": 2,
+            "Taxi": 2,
+            "Molecule": 2,
+            "Robot": 3,
+            "Mole": 0, 
+            "Pump": 2,
+            "Crow": 0,
+            "Caterpillar": 0,
+            "Eye": 3,
+            "Worm": 0,
+            "Specter": 3,
+            "Bot": 2,
+            "Storm": 0,
+            "Tank": 2
+            },
+
+    "Paralysis": {
+            "Spook": 2,
+            "Buffalo": 0,
+            "Antoid": 0,
+            "Fungus": 3,
+            "Mobile Sprout": 0,
+            "Power Robot": 3,
+            "Reactor Robot": 3,
+            "Asp Hieroglyph": 0,
+            "Elemental": 3,
+            "Bear": 2,
+            "Bear Seven": 2,
+            "Moldyman": 2,
+            "Dice": 0,
+            "Little Pile": 0, 
+            "Coil Snake": 0,
+            "Batty": 0,
+            "Roach": 0,
+            "Starman": 2, 
+            "Royal Guard": 0,
+            "General": 2,
+            "Clock": 3,
+            "Arachnid": 0,
+            "Demon": 3,
+            "Fobby": 0,
+            "Foppy": 0,
+            "Booka": 2,
+            "Mook": 2,
+            "Ghost": 0,
+            "Slug": 0,
+            "Fish's Brother": 2,
+            "Boy": 3,
+            "Art": 0,
+            "Shattered Man": 0,
+            "Orb": 3,
+            "Taxi": 0,
+            "Molecule": 0,
+            "Protoplasm": 0,
+            "Psycho": 2,
+            "Mole": 0,
+            "Petunia": 3, 
+            "Fly": 0,
+            "Crow": 0,
+            "Caterpillar": 0,
+            "Eye": 2,
+            "Worm": 0,
+            "Statue": 3,
+            "Rat of Doom": 2,
+            "Specter": 3,
+            "Storm": 3,
+            "Dino": 2,
+            "Tank": 2
+            },
+
+    "Hypnosis": {
+            "Buffalo": 2,
+            "Antoid": 0,
+            "Mushroom": 3,
+            "Mobile Sprout": 3,
+            "Fire Plug": 3,
+            "Record": 3,
+            "Power Robot": 2,
+            "Reactor Robot": 2,
+            "Hieroglyph": 0,
+            "Asp Hieroglyph": 0,
+            "Menace": 2,
+            "Spirit": 2,
+            "Elemental": 0,
+            "Moldyman": 0,
+            "Coffee Cup": 2,
+            "Dice": 3,
+            "Kraken": 2,
+            "Coil Snake": 0,
+            "Batty": 3,
+            "Roach": 3,
+            "Sign": 0,
+            "Skelpion": 0,
+            "Sphere": 0,
+            "Dog": 0,
+            "Octobot": 2,
+            "Duck": 2,
+            "Clock": 0, 
+            "Pile of Puke": 2,
+            "Kiss of Death": 0,
+            "Eel": 2,
+            "Arachnid": 3,
+            "Demon": 2,
+            "Fobby": 3,
+            "Foppy": 3,
+            "Booka": 0,
+            "Mook": 0,
+            "Ghost": 0,
+            "Slug": 3,
+            "Mouse": 2,
+            "Bomb": 2,
+            "Tom": 3,
+            "Fish": 2,
+            "Fish's Brother": 2,
+            "Kid": 0,
+            "Boy": 2,
+            "Art": 2,
+            "Orb": 2,
+            "Li'l UFO": 3,
+            "UFO": 3,
+            "Taxi": 2,
+            "Molecule": 3,
+            "Protoplasm": 3,
+            "Psycho": 3,
+            "Goat": 0,
+            "Mole": 2,
+            "Flame": 2,
+            "Petunia": 2, 
+            "Noose": 3,
+            "Pump": 2,
+            "Fly": 3,
+            "Caterpillar": 0,
+            "Worm": 0,
+            "Rat of Doom": 2,
+            "Specter": 2,
+            "Bot": 2,
+            "Tank": 2
+            }
+}
diff --git a/worlds/earthbound/modules/enemizer/randomize_enemy_attacks.py b/worlds/earthbound/modules/enemizer/randomize_enemy_attacks.py
new file mode 100644
index 0000000000..01745a8fe4
--- /dev/null
+++ b/worlds/earthbound/modules/enemizer/randomize_enemy_attacks.py
@@ -0,0 +1,236 @@
+import struct
+from .enemy_attributes import excluded_enemies
+from ..enemy_data import spell_breaks
+from ..enemy_shuffler import enemy_ids
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from ... import EarthBoundWorld
+    from ...Rom import LocalRom
+
+battle_actions = {  # Actions in camel case are scaled
+    "Attack": 0x04,
+    "Shoot": 0x05,
+    "Spy": 0x06,
+    "Defend": 0x08,
+    "None": 0x09,
+    "Magnet Alpha": 0x36,
+    "Magnet Omega": 0x37,
+    "Call": 0x3E,
+    "Sow Seeds": 0x3F,
+    "Steal": 0x42,
+    "Freeze in Time": 0x43,
+    "diamond_eyes": 0x44,
+    "Strange Beam": 0x46,
+    "nauseous_breath": 0x47,
+    "poison_stinger": 0x48,
+    "kiss_of_death": 0x49,
+    "Arctic Breath": 0x4A,
+    "Mushroom Spores": 0x4B,
+    "Possess": 0x4C,
+    "Sprinkle Powder": 0x4D,
+    "Mold Spores": 0x4E,
+    "Binding Attack": 0x4F,
+    "Sticky Mucus": 0x50,
+    "Spew Fly Honey": 0x51,
+    "Shoot Silk": 0x52,
+    "Say Something Scary": 0x53,
+    "Do Something Mysterious": 0x54,
+    "Disrupt Sense": 0x55,
+    "Size Up Situation": 0x56,
+    "Exhale Stinky": 0x57,
+    "summon_storm": 0x58,
+    "scalding_espresso": 0x59,
+    "Haunting Melody": 0x5A,
+    "extinguishing_blast": 0x5B,
+    "crashing_boom_bang": 0x5C,
+    "spray_fire": 0x5D,
+    "breathe_fire": 0x5E,
+    "Spin Around": 0x5F,
+    "Lose Temper": 0x60,
+    "Say Nasty": 0x61,
+    "Vacuum Attack": 0x62,
+    # "Replenish Fuel",
+    "poisonous_fangs": 0x64,
+    # Dizzy Missile
+    "Continuous Attack": 0x66,
+    "Guard": 0x67,
+    "flaming_fireball": 0x68,
+    "Intertwine": 0x69,
+    "Crushing Chop": 0x6A,
+    "Submission Hold": 0x6B,
+    "Rev and Accelerate": 0x6C,
+    "Brandish a Knife": 0x6D,
+    "Tear Into": 0x6E,
+    "Bite": 0x6F,
+    "Claw with Nails": 0x70,
+    "Swing Tail": 0x71,
+    "Lunge": 0x72,
+    "Shopping Bag": 0x73,
+    "Swing Club": 0x74,
+    "Tornado": 0x75,
+    "Spray Water": 0x76,
+    "Flash a Menacing Smile": 0x77,
+    "Laugh Hysterically": 78,
+    "Edge Closer": 0x79,
+    "Whisper 3": 0x7A,
+    "Murmur 2": 0x7B,
+    "Mutter 1": 0x7C,
+    "Fall down": 0x7D,
+    "Be Absentminded": 0x7E,
+    "Burst of Steam": 0x7F,
+    "Wobble": 0x80,
+    "Reel": 0x81,
+    "Big Grin": 0x82,
+    "Take Breath": 0x83,
+    "Greeting": 0x84,
+    "Howl": 0x85,
+    "Tick Tock": 0x86,
+    # "Eat Food": 0x8A,
+    "PSI Food": 0x8E,
+    # Counter PSI: 0x9F World.gadget actions?
+    # Shield Killer
+    # HP Sucker
+    "Yogurt Dispenser": 0xAA,
+    "Toothbrush": 0xAE,
+    "Sudden Guts": 0xB6,
+    "Ruler": 0xBA,
+    "Protractor": 0xBB,
+    "Fly Honey": 0xBD,
+    "glorious_light": 0xC9,
+    "electrical_shock": 0xCA,
+    "paralyzing_pollen": 0xCB,
+    "Icy Hand": 0xCC,
+    "poison_flute": 0xCD,
+    "Exhaust Fumes": 0xCE,
+    "Laugh Maniacally": 0xCF,
+    "Breathe Flute": 0xD0,
+    "Leap and Spread Wings": 0xD1,
+    "Become Friendly": 0xD2,
+    "Rumble": 0xD3,
+    "Give Hug": 0xD4,
+    "hacking_cough": 0xD5,
+    "Misery Attack": 0xD6,
+    "Paint Attack": 0xD7,
+    "Come Out Swinging": 0xD8,
+    "Scratch with Claws": 0xD9,
+    "Peck at Eyes": 0xDA,
+    "Ram and Trample": 0xDB,
+    "Punch": 0xDC,
+    "Spit Seeds": 0xDD,
+    "Fire a Beam": 0xDE,
+    "Spear": 0xDF,
+    "Stomp with Foot": 0xE0,
+    "Hula Hoop": 0xE1,
+    "Charge Forward": 0xE2,
+    "Shred on Skateboard": 0xE3,
+    "diamond_bite": 0xE4,
+    "Grumble": 0xE5,
+    "Lecture": 0xE6,
+    "Scow": 0xE7,
+    "Vent Odor": 0xE8,
+    "Shout": 0xE9,
+    "Shriek": 0xEA,
+    "Knit Brow": 0xEB,
+    "scatter_spores": 0xED,
+    "Bite Attack": 0xEE,
+    "stuffiness_beam": 0xF1,
+    "Coil Around": 0xF2,
+    "Emit Light": 0xF8,
+    "Homesick": 0xFB,
+    "Fake PSI": 0x0100,
+    "Bark": 0x0108,
+    "Chant": 0x0109,
+    "Scratch Head": 0x010B,
+    "Discharge Gas": 0x0111,
+    "Monkey Love": 0x011B,
+    "Lost Bolts": 0x013A,
+    "Clean Area": 0x013C,
+    "Want Battery": 0x013D,
+    "throw_bomb": 0x01FC,
+    "shoot_rocket": 0x0203
+
+}
+
+needs_argument = {
+    "PSI Food": [0xCF, 0xF7, 0x6E, 0xF6, 0x63, 0x62],
+    "Ruler": [0x8C],
+    "Protractor": [0x8F],
+    "Toothbrush": [0x9A],
+    "Monkey Love": [0xD1],
+    "Sudden Guts": [0x9F],
+    "Shield Alpha": [0x1F],
+    "Shield Beta": [0x21],
+    "PSI Shield Alpha": [0x23],
+    "PSI Shield Beta": [0x25],
+    "Offense Up Alpha": [0x27],
+    "Offense Up Omega": [0x28],
+    "Defense Down Alpha": [0x29],
+    "Defense Down Omega": [0x2A],
+    "Hypnosis Alpha": [0x2B],
+    "Hypnosis Omega": [0x2C],
+    "Brainshock": [0x31],
+    "Magnet Alpha": [0x2D],
+    "Magnet Omega": [0x2E],
+    "Yogurt Dispenser": [0x8B],
+    "Fake PSI": [0x55, 0x04, 0x14, 0x16, 0x30, 0x32, 0x4D, 0x57]
+}
+
+psi_actions = {
+    "special": 0x0A,
+    "fire": 0x0E,
+    "freeze": 0x12,
+    "thunder": 0x16,
+    "flash": 0x1A,
+    "starstorm": 0x1E,
+    "lifeup": 0x20,
+    "healing": 0x24,
+    "Shield Alpha": 0x28,
+    "Shield Beta": 0x29,
+    "PSI Shield Alpha": 0x2C,
+    "PSI Shield Beta": 0x2D,
+    "Offense Up Alpha": 0x30,
+    "Offense Up Omega": 0x31,
+    "Defense Down Alpha": 0x32,
+    "Defense Down Omega": 0x33,
+    "Hypnosis Alpha": 0x34,
+    "Hypnosis Omega": 0x35,
+    "paralysis": 0x38,
+    "Brainshock": 0x3A,
+    "blast": 0x01A4,
+    "missile": 0x01A8
+}
+
+
+
+def randomize_enemy_attacks(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    """Generates random attacks for enemies.
+       Certain attacks need to have an argument variable attached.
+       PSI moves have a 19% chance of being rolled only if the enemy has a non-zero max PP stat."""
+    for enemy in world.enemies:
+        if enemy not in excluded_enemies:
+            enemy_ai = world.random.randint(0, 3)
+            world.enemy_psi[enemy] = ["null", "null", "null", "null"]
+            max_calls = 0
+            for i in range(4):
+                if world.enemies[enemy].pp and world.random.randint(1, 100) < 20:
+                    attack = world.random.choice(list(psi_actions.keys()))
+                    attack_id = psi_actions[attack]
+                else:
+                    attack = world.random.choice(list(battle_actions.keys()))
+                    attack_id = battle_actions[attack]
+                if attack in spell_breaks:
+                    world.enemy_psi[enemy][i] = attack
+                
+                if attack in needs_argument:
+                    argument = world.random.choice(needs_argument[attack])
+                elif attack in ["Sow Seeds", "Call"]:
+                    argument = enemy_ids[enemy]
+                    max_calls = world.random.randint(1, 4)
+                else:
+                    argument = 0
+                
+                rom.write_bytes(world.enemies[enemy].address + (0x46 + (i * 2)), struct.pack("H", attack_id))
+                rom.write_bytes(world.enemies[enemy].address + (0x50 + (i)), bytearray([argument]))
+                rom.write_bytes(world.enemies[enemy].address + 0x5C, bytearray([max_calls]))
+                rom.write_bytes(world.enemies[enemy].address + 0x45, bytearray([enemy_ai]))
+                # Todo; attack extenders?
diff --git a/worlds/earthbound/modules/enemizer/randomize_enemy_attributes.py b/worlds/earthbound/modules/enemizer/randomize_enemy_attributes.py
new file mode 100644
index 0000000000..b38200c30f
--- /dev/null
+++ b/worlds/earthbound/modules/enemizer/randomize_enemy_attributes.py
@@ -0,0 +1,143 @@
+import struct
+from .enemy_attributes import (enemy_species, enemy_adjectives, battle_sprites, field_sprites, excluded_enemies,
+                               insects, robots, movement_patterns, start_texts, death_texts, weakness_table)
+from ...game_data.text_data import calc_pixel_width, text_encoder
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from ... import EarthBoundWorld
+    from ...Rom import LocalRom
+shield_statuses = [
+    "phys_1",
+    "phys_2",
+    "psi_1",
+    "psi_2"
+]
+
+battle_songs = [
+    0x60,
+    0x61,
+    0x62,
+    0x63,
+    0x64,
+    0x65,
+    0x66,
+    0x67,
+    0x68,
+    0x69,
+    0x8D,
+    0x94
+]
+
+
+def randomize_enemy_attributes(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    """Randomizes various attributes of enemies. This includes the name,
+       gender, sprite, color, etc. Data can be found in enemy_attributes."""
+    taken_names = []
+    for enemy in world.enemies:
+        if enemy not in excluded_enemies and " (" not in enemy:
+            new_name = "FFFFFFFFFFFFFFFFFFFFFFFFFF"
+            pixel_width = calc_pixel_width(new_name)
+            species = "Null"
+            while not (len(new_name) <= 25 and new_name not in taken_names and pixel_width <= 95):
+                species = world.random.choice(enemy_species)
+                adjective = world.random.choice(enemy_adjectives)
+                new_name = adjective + species
+                pixel_width = calc_pixel_width(new_name)
+            taken_names.append(new_name)
+            sprite = world.random.choice(battle_sprites[species])
+            field_sprite = field_sprites[sprite]
+            world.enemy_sprites[enemy] = field_sprite
+            movement_pattern = movement_patterns[field_sprite]
+            palette = world.random.randint(1, 31)
+            gender = world.random.randint(1, 3)
+            if species in robots:
+                enemy_type = 2
+            elif species in insects:
+                enemy_type = 1
+            else:
+                enemy_type = 0
+            row = world.random.randint(0, 1)
+            mirror_chance = world.random.randint(0, 100)
+            start_text = world.random.choice(start_texts)
+            death_text = world.random.choice(death_texts)
+            if species in ["Power Robot", "Reactor Robot", "Sphere"]:
+                death_action = 0x0040
+            elif species == "Oak":
+                death_action = 0x0041
+            else:
+                death_action = 0x0000
+            music = world.random.choice(battle_songs)
+            drop_rate = world.random.randint(0, 7)
+            base_drop = world.random.choice(world.filler_drops)
+            if world.random.randint(1, 100) < 6:
+                status = world.random.randint(1, 7)
+                if status < 5:
+                    world.enemies[enemy].has_shield = shield_statuses[status - 1]
+            else:
+                status = 0
+
+            if species in ["Party Man", "Reveler"]:
+                miss_rate = 6
+            elif species == "Boy":
+                miss_rate = 8
+            elif species == "Bot":
+                miss_rate = 5
+            else:
+                miss_rate = world.random.randint(0, 4)
+                
+            fire_weakness = get_weakness("Fire", species)
+
+            freeze_weakness = get_weakness("Freeze", species)
+
+            flash_weakness = get_weakness("Flash", species)
+
+            paralysis_weakness = get_weakness("Paralysis", species)
+
+            hypnosis_weakness = get_weakness("Hypnosis", species)
+
+            address = world.enemies[enemy].address
+            new_name = text_encoder(new_name, 0x18)
+            if len(new_name) < 0x18:
+                new_name.extend([0x00])
+
+            if world.enemies[enemy].attack_extensions > 1:
+                num_enemies = world.enemies[enemy].attack_extensions
+            else:
+                num_enemies = 1
+
+            for i in range(num_enemies):
+                rom.write_bytes(address, bytearray([0x01]))
+                rom.write_bytes(address + 1, new_name)
+                rom.write_bytes(address + 0x1A, bytearray([gender]))
+                rom.write_bytes(address + 0x1B, bytearray([enemy_type]))
+                rom.write_bytes(address + 0x1C, struct.pack("H", sprite))
+                rom.write_bytes(address + 0x1E, struct.pack("H", field_sprite))
+                rom.write_bytes(address + 0x2B, struct.pack("H", movement_pattern))
+                rom.write_bytes(address + 0x2D, struct.pack("I", start_text))
+                rom.write_bytes(address + 0x31, struct.pack("I", death_text))
+                rom.write_bytes(address + 0x35, bytearray([palette]))
+                rom.write_bytes(address + 0x37, bytearray([music]))
+                rom.write_bytes(address + 0x3F, bytearray([fire_weakness]))
+                rom.write_bytes(address + 0x40, bytearray([freeze_weakness]))
+                rom.write_bytes(address + 0x41, bytearray([flash_weakness]))
+                rom.write_bytes(address + 0x42, bytearray([paralysis_weakness]))
+                rom.write_bytes(address + 0x43, bytearray([hypnosis_weakness]))
+                rom.write_bytes(address + 0x43, bytearray([miss_rate]))
+                rom.write_bytes(address + 0x4E, struct.pack("H", death_action))
+                rom.write_bytes(address + 0x57, bytearray([drop_rate]))
+                rom.write_bytes(address + 0x58, bytearray([base_drop]))
+                rom.write_bytes(address + 0x59, bytearray([status]))
+                rom.write_bytes(address + 0x5B, bytearray([row]))
+                rom.write_bytes(address + 0x5D, bytearray([mirror_chance]))
+                if world.enemies[enemy].attack_extensions > 1:
+                    address = world.enemies[f"{enemy} ({i + 2})"].address
+                    enemy = f"{enemy} ({i + 2})"
+
+
+def get_weakness(element: str, species: str) -> int:
+    """Returns a weakness to given element, given the enemy's base species."""
+    if species in weakness_table[element]:
+        weakness = weakness_table[element][species]
+    else:
+        weakness = 1
+    return weakness
diff --git a/worlds/earthbound/modules/enemizer/randomize_enemy_stats.py b/worlds/earthbound/modules/enemizer/randomize_enemy_stats.py
new file mode 100644
index 0000000000..382919aa48
--- /dev/null
+++ b/worlds/earthbound/modules/enemizer/randomize_enemy_stats.py
@@ -0,0 +1,68 @@
+from .enemy_attributes import excluded_enemies
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from ... import EarthBoundWorld
+    from ...Rom import LocalRom
+
+
+class EnemyStatCopy:
+    def __init__(self, hp: int, exp: int, money: int, speed: int, offense: int,
+                      defense: int, level: int, guts: int, luck: int):
+        self.hp = hp
+        self.exp = exp
+        self.money = money
+        self.speed = speed
+        self.offense = offense
+        self.defense = defense
+        self.level = level
+        self.guts = guts
+        self.luck = luck
+
+
+def randomize_enemy_stats(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    """Randomizes enemy stats. It does not actually randomize them, rather it gives enemies the stats of a random other enemy.
+       Enemies have a 19% chance to have PP."""
+    stat_copies = {}
+    for enemy in world.enemies:
+        if enemy not in excluded_enemies:
+            stat_copies[enemy] = EnemyStatCopy(
+                hp=world.enemies[enemy].hp,
+                exp=world.enemies[enemy].exp,
+                money=world.enemies[enemy].money,
+                speed=world.enemies[enemy].speed,
+                offense=world.enemies[enemy].offense,
+                defense=world.enemies[enemy].defense,
+                level=world.enemies[enemy].level,
+                guts=world.enemies[enemy].guts,
+                luck=world.enemies[enemy].luck
+            )
+
+    for enemy in world.enemies:
+        if enemy not in excluded_enemies:
+            copied_stat_base = world.random.choice(list(stat_copies))
+            world.enemies[enemy].hp = stat_copies[copied_stat_base].hp
+            if world.random.randint(1, 100) < 20:
+                world.enemies[enemy].pp = int(world.random.randint(10, 500) / 2)
+            else:
+                world.enemies[enemy].pp = 0
+            world.enemies[enemy].offense = stat_copies[copied_stat_base].offense
+            world.enemies[enemy].defense = stat_copies[copied_stat_base].defense
+            world.enemies[enemy].speed = stat_copies[copied_stat_base].speed
+            world.enemies[enemy].level = stat_copies[copied_stat_base].level
+            world.enemies[enemy].exp = stat_copies[copied_stat_base].exp
+            world.enemies[enemy].money = stat_copies[copied_stat_base].money
+            world.enemies[enemy].guts = stat_copies[copied_stat_base].guts
+            world.enemies[enemy].luck = stat_copies[copied_stat_base].luck
+            rom.write_bytes(world.enemies[enemy].address + 0x3D, bytearray([world.enemies[enemy].guts]))
+            rom.write_bytes(world.enemies[enemy].address + 0x3E, bytearray([world.enemies[enemy].luck]))
+            if world.enemies[enemy].attack_extensions > 0:
+                world.enemies[f"{enemy} (2)"].hp = world.enemies[enemy].hp
+                world.enemies[f"{enemy} (2)"].pp = world.enemies[enemy].pp
+                world.enemies[f"{enemy} (2)"].offense = world.enemies[enemy].offense
+                world.enemies[f"{enemy} (2)"].defense = world.enemies[enemy].defense
+                world.enemies[f"{enemy} (2)"].speed = world.enemies[enemy].speed
+                world.enemies[f"{enemy} (2)"].level = world.enemies[enemy].level
+                world.enemies[f"{enemy} (2)"].exp = world.enemies[enemy].exp
+                world.enemies[f"{enemy} (2)"].money = world.enemies[enemy].money
+                rom.write_bytes(world.enemies[f"{enemy} (2)"].address + 0x3D, bytearray([world.enemies[enemy].guts]))
+                rom.write_bytes(world.enemies[f"{enemy} (2)"].address + 0x3E, bytearray([world.enemies[enemy].luck]))
diff --git a/worlds/earthbound/modules/enemy_data.py b/worlds/earthbound/modules/enemy_data.py
new file mode 100644
index 0000000000..210a38645f
--- /dev/null
+++ b/worlds/earthbound/modules/enemy_data.py
@@ -0,0 +1,1320 @@
+from typing import Dict
+from collections import Counter
+import struct
+import math
+from typing import TYPE_CHECKING
+from logging import warning
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+
+
+
+class EarthBoundEnemy:
+    def __init__(self, name: str, address: int, hp: int, pp: int, exp: int, money: int, speed: int, offense: int,
+                 defense: int, level: int, guts: int, luck: int, is_scaled: bool, shield: str | None = None,
+                 attack_extensions: int = 0):
+        self.name = name
+        self.address = address
+        self.hp = hp
+        self.pp = pp
+        self.exp = exp
+        self.money = money
+        self.speed = speed
+        self.offense = offense
+        self.defense = defense
+        self.level = level
+        self.guts = guts
+        self.luck = luck
+        self.is_scaled = is_scaled
+        self.shield = shield
+        self.attack_extensions = attack_extensions
+
+
+def initialize_enemies(world: "EarthBoundWorld") -> None:
+    world.enemy_psi = {
+        "Dept. Store Spook": ["freeze", "fire", "lifeup", "null"],
+        "Dept. Store Spook (2)": ["null", "null", "freeze", "null"],
+        "Black Antoid": ["null", "null", "null", "lifeup"],
+        "Struttin' Evil Mushroom": ["null", "null", "null", "scatter_spores"],
+        "Mobile Sprout": ["null", "null", "null", "lifeup"],
+        "Tough Mobile Sprout": ["null", "null", "null", "lifeup"],
+        "Mystical Record": ["null", "null", "lifeup", "null"],
+        "Guardian Hieroglyph": ["hacking_cough", "thunder_minus", "flash", "thunder"],
+        "Electro Swoosh": ["null", "electrical_shock", "electrical_shock", "null"],
+        "Conducting Menace": ["flash_minus", "flash", "thunder_minus", "thunder"],
+        "Conducting Spirit": ["flash_minus", "flash", "thunder_minus", "thunder"],
+        "Ness's Nightmare": ["null", "special", "glorious_light", "null"],
+        "Mr. Carpainter": ["crashing_boom_bang", "lifeup", "null", "null"],
+        "Carbon Dog": ["flaming_fireball", "null", "null", "null"],
+        "Thunder Mite": ["thunder_minus", "thunder_minus", "thunder", "thunder"],
+        "Chomposaur": ["fire", "fire", "null", "null"],
+        "Gigantic Ant": ["null", "poison_stinger", "null", "null"],
+        "Shrooom!": ["null", "lifeup", "scatter_spores", "null"],
+        "Plague Rat of Doom": ["poisonous_fangs", "null", "null", "null"],
+        "Mondo Mole": ["lifeup", "null", "null", "null"],
+        "Scalding Coffee Cup": ["scalding_espresso", "scalding_espresso", "scalding_espresso", "scalding_espresso"],
+        "Arachnid!": ["null", "null", "null", "poison_stinger"],
+        "Arachnid!!!": ["poison_stinger", "null", "null", "null"],
+        "Slimy Little Pile": ["hacking_cough", "null", "null", "null"],
+        "Even Slimier Little Pile": ["null", "null", "null", "hacking_cough"],
+        "Kraken": ["breathe_fire", "null", "crashing_boom_bang", "null"],
+        "Bionic Kraken": ["null", "crashing_boom_bang", "breathe_fire", "null"],  # Generate tornado?
+        "Spinning Robo": ["null", "null", "stuffiness_beam", "null"],
+        "Whirling Robo": ["null", "stuffiness_beam", "null", "null"],
+        "Thirsty Coil Snake": ["poisonous_fangs", "null", "null", "null"],
+        "Crazed Sign": ["null", "null", "paralysis", "null"],
+        "Wooly Shambler": ["null", "null", "null", "flash"],
+        "Wild 'n Wooly Shambler": ["null", "null", "null", "flash"],
+        "Skelpion": ["null", "poison_stinger", "null", "thunder"],
+        "Dread Skelpion": ["poison_stinger", "null", "thunder", "thunder"],
+        "Ghost of Starman": ["starstorm_minus", "null", "null", "null"],
+        "Smilin' Sphere": ["null", "fire", "null", "null"],
+        "Uncontrollable Sphere": ["null", "fire", "fire", "null"],
+        "Starman Deluxe": ["null", "null", "starstorm", "null"],
+        "Final Starman": ["null", "null", "starstorm", "null"],
+        "Urban Zombie": ["null", "null", "nauseous_breath", "null"],
+        "Zombie Dog": ["null", "null", "null", "poisonous_fangs"],
+        "Diamond Dog": ["null", "null", "null", "glorious_light"],
+        "Trillionage Sprout": ["null", "null", "flash", "paralysis"],
+        "Musica": ["electrical_shock", "null", "null", "electrical_shock"],
+        "Desert Wolf": ["null", "null", "null", "poisonous_fangs"],
+        "Master Belch": ["nauseous_breath", "nauseous_breath", "null", "null"],
+        "Big Pile of Puke": ["null", "hacking_cough", "null", "nauseous_breath"],
+        "Master Barf": ["nauseous_breath", "null", "null", "null"],
+        "Kiss of Death": ["null", "null", "kiss_of_death", "null"],
+        "French Kiss of Death": ["kiss_of_death", "kiss_of_death", "kiss_of_death", "kiss_of_death"],
+        "Zap Eel": ["electrical_shock", "electrical_shock", "electrical_shock", "electrical_shock"],
+        "Tangoo": ["null", "null", "poison_flute", "null"],
+        "Squatter Demon": ["poisonous_fangs", "diamond_bite", "null", "null"],
+        "Lesser Mook": ["freeze", "freeze", "null", "diamond_eyes"],
+        "Mook Senior": ["freeze", "fire", "lifeup", "diamond_eyes"],
+        "Smelly Ghost": ["null", "null", "lifeup", "null"],
+        "Deadly Mouse": ["poisonous_fangs", "null", "null", "null"],
+        "Care Free Bomb": ["throw_bomb_minus", "throw_bomb_minus", "throw_bomb_minus", "throw_bomb"],
+        "Electro Specter": ["electrical_shock", "null", "electrical_shock", "null"],
+        "Smilin' Sam": ["null", "null", "null", "lifeup"],
+        "Manly Fish's Brother": ["null", "paralysis", "freeze", "healing"],
+        "Thunder and Storm": ["crashing_boom_bang", "null", "null", "null"],
+        "Cute Li'l UFO": ["null", "null", "null", "lifeup"],
+        "Beautiful UFO": ["null", "null", "null", "lifeup"],
+        "Evil Mani-Mani": ["null", "paralysis", "null", "null"],
+        "Mr. Molecule": ["thunder", "flash", "fire", "freeze"],
+        "Sentry Robot": ["null", "null", "null", "shoot_rocket"],
+        "Psychic Psycho": ["fire", "fire", "fire", "fire"],
+        "Major Psychic Psycho": ["fire", "null", "paralysis", "fire"],
+        "Soul Consuming Flame": ["null", "breathe_fire", "flaming_fireball", "spray_fire"],
+        "Demonic Petunia": ["null", "extinguishing_blast", "null", "paralyzing_pollen"],
+        "Li'l UFO": ["null", "null", "stuffiness_beam", "null"],
+        "Robo-Pump (2)": ["throw_bomb", "null", "null", "null"],
+        "Ness's Nightmare (2)": ["special", "lifeup", "special", "null"],
+        "Mr. Carpainter (2)": ["crashing_boom_bang", "null", "null", "null"],
+        "Carbon Dog (2)": ["spray_fire", "null", "null", "null"],
+        "Gigantic Ant (2)": ["paralysis", "null", "null", "null"],
+        "Chomposaur (2)": ["null", "null", "fire", "fire"],
+        "Guardian Digger (2)": ["null", "null", "null", "lifeup"],
+        "Kraken (2)": ["flash", "breathe_fire", "null", "null"],  # tornado?
+        "Starman Super (2)": ["null", "healing", "null", "null"],
+        "Ghost of Starman (2)": ["null", "null", "starstorm", "null"],
+        "Final Starman (2)": ["starstorm", "null", "healing", "null"],
+        "Diamond Dog (2)": ["null", "null", "null", "diamond_bite"],
+        "Trillionage Sprout (2)": ["null", "null", "diamond_eyes", "null"],
+        "Master Belch (2)": ["nauseous_breath", "null", "null", "null"],
+        "Master Barf (2)": ["null", "null", "nauseous_breath", "null"],
+        "Boogey Tent (2)": ["null", "null", "flash", "null"],
+        "Electro Specter (2)": ["null", "null", "electrical_shock", "null"],
+        "Thunder and Storm (2)": ["summon_storm", "null", "crashing_boom_bang", "null"],
+        "Evil Mani-Mani (2)": ["null", "null", "glorious_light", "null"],
+        "Black Antoid (2)": ["lifeup", "lifeup", "lifeup", "lifeup"],
+        "Giygas (2)": ["special", "special", "special", "special"],
+        "Farm Zombie": ["null", "null", "nauseous_breath", "null"],
+        "Criminal Caterpillar": ["fire", "fire", "fire", "fire"],
+        "Evil Eye": ["null", "diamond_eyes", "paralysis", "null"],
+        "Master Criminal Worm": ["fire", "fire", "fire", "fire"],
+        "Giygas": ["giygas_phase2_thunder", "giygas_phase2_freeze", "giygas_phase2_flash", "null"],
+        "Giygas (5)": ["giygas_phase3_thunder", "giygas_phase3_freeze", "giygas_phase3_flash", "null"],
+        "Giygas (6)": ["giygas_phase4_thunder", "giygas_phase4_freeze", "giygas_phase4_flash", "null"],
+        "Starman Junior": ["fire", "null", "freeze", "fire"],
+        "Ultimate Octobot": ["null", "stuffiness_beam", "null", "stuffiness_beam"],
+        "Mechanical Octobot": ["null", "null", "null", "stuffiness_beam"]
+    }
+
+    world.enemy_sprites = {
+        "Insane Cultist": 0x0065,
+        "Armored Frog": 0x0118,
+        "Bad Buffalo": 0x0137,
+        "Black Antoid": 0x013C,
+        "Black Antoid (2)": 0x013C,
+        "Red Antoid": 0x013C,
+        "Ramblin' Evil Mushroom": 0x0123,
+        "Struttin' Evil Mushroom": 0x0123,
+        "Mobile Sprout": 0x013D,
+        "Tough Mobile Sprout": 0x013D,
+        "Enraged Fire Plug": 0x0117,
+        "Mystical Record": 0x00C3,
+        "Atomic Power Robot": 0x0132,
+        "Nuclear Reactor Robot": 0x0132,
+        "Guardian Hieroglyph": 0x0145,
+        "Lethal Asp Hieroglyph": 0x0140,
+        "Electro Swoosh": 0x0114,
+        "Conducting Menace": 0x0144,
+        "Conducting Spirit": 0x0144,
+        "Evil Elemental": 0x0117,
+        "Annoying Old Party Man": 0x0187,
+        "Annoying Reveler": 0x0187,
+        "Unassuming Local Guy": 0x0045,
+        "New Age Retro Hippie": 0x0169,
+        "Mighty Bear": 0x014B,
+        "Mighty Bear Seven": 0x014B,
+        "Putrid Moldyman": 0x011D,
+        "Thunder Mite": 0x0144,
+        "Cranky Lady": 0x0188,
+        "Extra Cranky Lady": 0x0188,
+        "Wetnosaur": 0x012A,
+        "Chomposaur": 0x0138,
+        "Gigantic Ant": 0x0139,
+        "Scalding Coffee Cup": 0x00C3,
+        "Loaded Dice": 0x00C3,
+        "Slimy Little Pile": 0x013B,
+        "Even Slimier Little Pile": 0x013B,
+        "Arachnid!": 0x013A,
+        "Arachnid!!!": 0x013A,
+        "Bionic Kraken": 0x0132,
+        "Spinning Robo": 0x0132,
+        "Whirling Robo": 0x0132,
+        "Hyper Spinning Robo": 0x0132,
+        "Cop": 0x004A, 
+        "Coil Snake": 0x011B,
+        "Thirsty Coil Snake": 0x011B,
+        "Mr. Batty": 0x0112,
+        "Elder Batty": 0x0112,
+        "Violent Roach": 0x013A,
+        "Filthy Attack Roach": 0x013A,
+        "Crazed Sign": 0x0135,
+        "Wooly Shambler": 0x0132,
+        "Wild 'n Wooly Shambler": 0x0132,
+        "Skate Punk": 0x011C,
+        "Skelpion": 0x013F, 
+        "Dread Skelpion": 0x013F,
+        "Starman": 0x012F,
+        "Starman Super": 0x012F,
+        "Ghost of Starman": 0x0132,
+        "Smilin' Sphere": 0x012E,
+        "Uncontrollable Sphere": 0x012E,
+        "Petrified Royal Guard": 0x0142,
+        "Final Starman": 0x0132,
+        "Urban Zombie": 0x0134,
+        "Zombie Possessor": 0x0131,
+        "Zombie Dog": 0x016C,
+        "Over Zealous Cop": 0x0182,
+        "Territorial Oak": 0x0129,
+        "Hostile Elder Oak": 0x0129,
+        "Marauder Octobot": 0x0132,
+        "Military Octobot": 0x0132,
+        "Mechanical Octobot": 0x0132,
+        "Ultimate Octobot": 0x0132,
+        "Mad Duck": 0x011F,
+        "Dali's Clock": 0x0146,
+        "Musica": 0x00C3,
+        "Desert Wolf": 0x014A,
+        "Big Pile of Puke": 0x0148,
+        "Kiss of Death": 0x0144,
+        "French Kiss of Death": 0x0115,
+        "Foppy": 0x0116,
+        "Fobby": 0x0116,
+        "Zap Eel": 0x012D,
+        "Tangoo": 0x0144,
+        "Squatter Demon": 0x0132,
+        "Crested Booka": 0x0128,
+        "Great Crested Booka": 0x0128,
+        "Lesser Mook": 0x0132,
+        "Mook Senior": 0x0132,
+        "Smelly Ghost": 0x011D,
+        "Stinky Ghost": 0x011D,
+        "Attack Slug": 0x013C,
+        "Pit Bull Slug": 0x013C,
+        "Rowdy Mouse": 0x01A0,
+        "Deadly Mouse": 0x01A0,
+        "Care Free Bomb": 0x0115,
+        "Handsome Tom": 0x011E,
+        "Smilin' Sam": 0x011E,
+        "Manly Fish": 0x0120,
+        "Manly Fish's Brother": 0x0120,
+        "Runaway Dog": 0x014A,
+        "Trick or Trick Kid": 0x01BC,
+        "Cave Boy": 0x0149,
+        "Abstract Art": 0x012C,
+        "Shattered Man": 0x0142,
+        "Fierce Shattered Man": 0x0133,
+        "Ego Orb": 0x0147,
+        "Yes Man Junior": 0x011C,
+        "Cute Li'l UFO": 0x0130,
+        "Beautiful UFO": 0x0130,
+        "Pogo Punk": 0x011C,
+        "Tough Guy": 0x0186,
+        "Mad Taxi": 0x0121,
+        "Mr. Molecule": 0x0115,
+        "Worthless Protoplasm": 0x00C3,
+        "Sentry Robot": 0x0136,
+        "Psychic Psycho": 0x0117,
+        "Major Psychic Psycho": 0x0117,
+        "Mole Playing Rough": 0x019F,
+        "Gruff Goat": 0x0126,
+        "Soul Consuming Flame": 0x0117,
+        "Demonic Petunia": 0x0122,
+        "Ranboob": 0x0124,
+        "Li'l UFO": 0x0130,
+        "High-class UFO": 0x0130,
+        "Noose Man": 0x0143,
+        "Robo-pump": 0x0117,
+        "Plain Crocodile": 0x014C,
+        "Strong Crocodile": 0x014C,
+        "Hard Crocodile": 0x014C,
+        "No Good Fly": 0x013E,
+        "Mostly Bad Fly": 0x013E,
+        "Spiteful Crow": 0x011A,
+        "Farm Zombie": 0x0134,
+        "Criminal Caterpillar": 0x01A1,
+        "Evil Eye": 0x0132,
+        "Master Criminal Worm": 0x01CD,
+        "Loaded Dice 2": 0x00C3,
+}
+
+    world.enemies = {
+        "Insane Cultist": EarthBoundEnemy("Insane Cultist", 0x1595e7, 94, 0, 353, 33, 8, 19, 25, 13, 20, 64, False),
+        "Dept. Store Spook": EarthBoundEnemy("Dept. Store Spook", 0x159645, 610, 290, 24291, 1648, 19, 82, 135, 42, 24, 62, False, None, 2),
+        "Armored Frog": EarthBoundEnemy("Armored Frog", 0x1596a3, 202, 0, 1566, 77, 7, 37, 108, 22, 5, 8, False),
+        "Bad Buffalo": EarthBoundEnemy("Bad Buffalo", 0x159701, 341, 0, 4108, 172, 11, 64, 104, 34, 5, 5, False),
+        "Black Antoid": EarthBoundEnemy("Black Antoid", 0x15975f, 34, 25, 37, 7, 4, 14, 13, 7, 3, 0, False),
+        "Red Antoid": EarthBoundEnemy("Red Antoid", 0x1597bd, 112, 30, 1175, 35, 10, 29, 27, 20, 4, 0, False),
+        "Ramblin' Evil Mushroom": EarthBoundEnemy("Ramblin' Evil Mushroom", 0x15981b, 60, 0, 95, 15, 5, 15, 10, 7, 5, 1, False),
+        "Struttin' Evil Mushroom": EarthBoundEnemy("Struttin' Evil Mushroom", 0x159879, 157, 0, 1492, 95, 28, 29, 22, 17, 7, 1, False),
+        "Mobile Sprout": EarthBoundEnemy("Mobile Sprout", 0x1598d7, 79, 9, 133, 13, 6, 17, 12, 10, 5, 1, False),
+        "Tough Mobile Sprout": EarthBoundEnemy("Tough Mobile Sprout", 0x159935, 179, 13, 1865, 119, 18, 33, 27, 21, 6, 1, False),
+        "Enraged Fire Plug": EarthBoundEnemy("Enraged Fire Plug", 0x159993, 309, 0, 4321, 346, 14, 60, 81, 32, 5, 4, False),
+        "Mystical Record": EarthBoundEnemy("Mystical Record", 0x1599f1, 263, 35, 2736, 310, 20, 63, 78, 33, 12, 7, False),
+        "Atomic Power Robot": EarthBoundEnemy("Atomic Power Robot", 0x159a4f, 594, 0, 26937, 730, 25, 119, 133, 56, 8, 12, False),
+        "Nuclear Reactor Robot": EarthBoundEnemy("Nuclear Reactor Robot", 0x159aad, 798, 0, 53142, 820, 46, 142, 185, 64, 8, 12, False),
+        "Guardian Hieroglyph": EarthBoundEnemy("Guardian Hieroglyph", 0x159b0b, 470, 126, 13064, 470, 20, 94, 106, 48, 20, 38, False),
+        "Lethal Asp Hieroglyph": EarthBoundEnemy("Lethal Asp Hieroglyph", 0x159b69, 458, 0, 11321, 625, 21, 89, 94, 46, 5, 36, False),
+        "Electro Swoosh": EarthBoundEnemy("Electro Swoosh", 0x159bc7, 543, 338, 17075, 791, 40, 140, 156, 62, 5, 10, False),
+        "Conducting Menace": EarthBoundEnemy("Conducting Menace", 0x159c25, 445, 238, 14792, 574, 20, 107, 107, 52, 5, 8, False),
+        "Conducting Spirit": EarthBoundEnemy("Conducting Spirit", 0x159c83, 587, 329, 30390, 804, 26, 130, 139, 59, 5, 8, False),
+        "Evil Elemental": EarthBoundEnemy("Evil Elemental", 0x159ce1, 564, 0, 35737, 853, 30, 121, 136, 57, 7, 16, False),
+        "Ness's Nightmare": EarthBoundEnemy("Ness's Nightmare", 0x159d3f, 1654, 882, 89004, 4442, 31, 172, 253, 71, 1, 80, False, "psi_1", 2),
+        "Annoying Old Party Man": EarthBoundEnemy("Annoying Old Party Man", 0x159d9d, 99, 0, 130, 32, 6, 20, 25, 13, 50, 15, False),
+        "Annoying Reveler": EarthBoundEnemy("Annoying Reveler", 0x159dfb, 288, 0, 2373, 268, 17, 58, 77, 31, 50, 15, False),
+        "Unassuming Local Guy": EarthBoundEnemy("Unassuming Local Guy", 0x159e59, 73, 0, 146, 19, 5, 18, 13, 9, 1, 14, False),
+        "New Age Retro Hippie": EarthBoundEnemy("New Age Retro Hippie", 0x159eb7, 87, 0, 160, 23, 5, 19, 14, 11, 10, 16, False),
+        "Mr. Carpainter": EarthBoundEnemy("Mr. Carpainter", 0x159f15, 262, 70, 1412, 195, 8, 33, 45, 21, 13, 72, False, None, 2),
+        "Carbon Dog": EarthBoundEnemy("Carbon Dog", 0x159f73, 1672, 0, 0, 0, 31, 159, 174, 70, 52, 53, False, None, 2),
+        "Mighty Bear": EarthBoundEnemy("Mighty Bear", 0x159fd1, 167, 0, 609, 49, 7, 29, 31, 16, 1, 5, False),
+        "Mighty Bear Seven": EarthBoundEnemy("Mighty Bear Seven", 0x15a02f, 367, 0, 8884, 440, 11, 85, 76, 42, 1, 4, False),
+        "Putrid Moldyman": EarthBoundEnemy("Putrid Moldyman", 0x15a08d, 203, 0, 830, 53, 9, 36, 41, 21, 5, 17, False),
+        "Thunder Mite": EarthBoundEnemy("Thunder Mite", 0x15a0eb, 293, 200, 10798, 430, 20, 85, 83, 43, 13, 8, False),
+        "Cranky Lady": EarthBoundEnemy("Cranky Lady", 0x15a149, 95, 0, 200, 17, 6, 16, 18, 8, 3, 32, False),
+        "Extra Cranky Lady": EarthBoundEnemy("Extra Cranky Lady", 0x15a1a7, 277, 0, 3651, 134, 17, 48, 70, 27, 5, 32, False),
+        "Wetnosaur": EarthBoundEnemy("Wetnosaur", 0x15a263, 1030, 0, 33098, 745, 17, 126, 172, 59, 2, 16, False),
+        "Chomposaur": EarthBoundEnemy("Chomposaur", 0x15a2c1, 1288, 320, 44378, 896, 17, 139, 183, 62, 3, 16, False, "phys_2", 2),
+        "Titanic Ant": EarthBoundEnemy("Titanic Ant", 0x15a31f, 235, 102, 685, 150, 6, 19, 23, 13, 9, 72, False, None, 2),
+        "Gigantic Ant": EarthBoundEnemy("Gigantic Ant", 0x15a37d, 308, 81, 3980, 304, 17, 54, 112, 30, 5, 6, False, None, 2),
+        "Shrooom!": EarthBoundEnemy("Shrooom!", 0x15a3db, 1700, 112, 96323, 4086, 18, 95, 154, 48, 32, 72, False, None, 2),
+        "Plague Rat of Doom": EarthBoundEnemy("Plague Rat of Doom", 0x15a439, 1827, 60, 115272, 4464, 19, 71, 180, 47, 250, 45, False, None, 2),
+        "Mondo Mole": EarthBoundEnemy("Mondo Mole", 0x15a497, 498, 161, 5791, 400, 9, 37, 50, 23, 15, 36, False, None, 2),
+        "Guardian Digger": EarthBoundEnemy("Guardian Digger", 0x15a4f5, 386, 110, 17301, 1467, 17, 59, 129, 32, 21, 55, False, "phys_2", 2),
+        "Scalding Coffee Cup": EarthBoundEnemy("Scalding Coffee Cup", 0x15a553, 190, 0, 2462, 280, 23, 55, 20, 30, 5, 1, False),
+        "Loaded Dice": EarthBoundEnemy("Loaded Dice", 0x15a5b1, 307, 0, 10672, 703, 77, 146, 113, 59, 75, 6, False, None),
+        "Slimy Little Pile": EarthBoundEnemy("Slimy Little Pile", 0x15a60f, 224, 0, 1978, 124, 15, 42, 61, 24, 7, 38, False),
+        "Even Slimier Little Pile": EarthBoundEnemy("Even Slimier Little Pile", 0x15a66d, 326, 0, 15075, 579, 22, 103, 101, 49, 9, 38, False),
+        "Arachnid!": EarthBoundEnemy("Arachnid!", 0x15a6cb, 216, 0, 4933, 296, 23, 61, 30, 32, 3, 0, False),
+        "Arachnid!!!": EarthBoundEnemy("Arachnid!!!", 0x15a729, 344, 0, 10449, 412, 20, 87, 86, 45, 4, 0, False),
+        "Kraken": EarthBoundEnemy("Kraken", 0x15a787, 1097, 176, 79267, 3049, 21, 105, 166, 54, 1, 32, False, None, 2),
+        "Bionic Kraken": EarthBoundEnemy("Bionic Kraken", 0x15a7e5, 900, 60, 50308, 960, 42, 155, 195, 70, 1, 32, False),
+        "Spinning Robo": EarthBoundEnemy("Spinning Robo", 0x15a843, 113, 17, 297, 21, 7, 21, 22, 14, 5, 12, False),
+        "Whirling Robo": EarthBoundEnemy("Whirling Robo", 0x15a8a1, 374, 36, 5782, 256, 18, 78, 90, 39, 5, 12, False),
+        "Hyper Spinning Robo": EarthBoundEnemy("Hyper Spinning Robo", 0x15a8ff, 553, 83, 28866, 756, 28, 122, 130, 56, 5, 12, False),
+        "Cop": EarthBoundEnemy("Cop", 0x15a95d, 75, 0, 86, 18, 5, 15, 18, 7, 7, 16, False),
+        "Coil Snake": EarthBoundEnemy("Coil Snake", 0x15a9bb, 18, 0, 1, 4, 2, 3, 4, 1, 0, 6, False),
+        "Thirsty Coil Snake": EarthBoundEnemy("Thirsty Coil Snake", 0x15aa19, 270, 0, 2786, 276, 18, 52, 80, 28, 5, 7, False),
+        "Mr. Batty": EarthBoundEnemy("Mr. Batty", 0x15aa77, 86, 0, 304, 30, 29, 25, 5, 15, 4, 3, False),
+        "Elder Batty": EarthBoundEnemy("Elder Batty", 0x15aad5, 294, 0, 4177, 371, 33, 66, 72, 35, 8, 4, False),
+        "Violent Roach": EarthBoundEnemy("Violent Roach", 0x15ab33, 209, 0, 1757, 80, 35, 30, 26, 18, 9, 24, False),
+        "Filthy Attack Roach": EarthBoundEnemy("Filthy Attack Roach", 0x15ab91, 399, 0, 10543, 432, 77, 84, 33, 42, 9, 24, False),
+        "Crazed Sign": EarthBoundEnemy("Crazed Sign", 0x15abef, 295, 98, 3618, 244, 17, 64, 96, 34, 5, 11, False),
+        "Wooly Shambler": EarthBoundEnemy("Wooly Shambler", 0x15ac4d, 391, 140, 5397, 458, 18, 81, 91, 40, 5, 63, False),
+        "Wild 'n Wooly Shambler": EarthBoundEnemy("Wild 'n Wooly Shambler", 0x15acab, 722, 212, 33818, 906, 38, 144, 171, 65, 5, 63, False),
+        "Skate Punk": EarthBoundEnemy("Skate Punk", 0x15ad09, 31, 0, 12, 17, 5, 7, 8, 3, 0, 13, False),
+        "Skelpion": EarthBoundEnemy("Skelpion", 0x15ad67, 137, 21, 1823, 140, 37, 41, 23, 24, 80, 7, False),
+        "Dread Skelpion": EarthBoundEnemy("Dread Skelpion", 0x15adc5, 214, 125, 9908, 609, 40, 82, 57, 41, 88, 8, False),
+        "Starman": EarthBoundEnemy("Starman", 0x15ae23, 545, 155, 23396, 720, 24, 103, 126, 55, 25, 16, False, None, 2),
+        "Starman Super": EarthBoundEnemy("Starman Super", 0x15ae81, 568, 310, 30145, 735, 24, 112, 129, 56, 25, 16, False, "psi_2", 1),
+        "Ghost of Starman": EarthBoundEnemy("Ghost of Starman", 0x15aedf, 750, 462, 48695, 807, 46, 152, 170, 68, 43, 16, False, None, 2),
+        "Smilin' Sphere": EarthBoundEnemy("Smilin' Sphere", 0x15af3d, 233, 60, 2218, 191, 17, 50, 65, 27, 5, 13, False),
+        "Uncontrollable Sphere": EarthBoundEnemy("Uncontrollable Sphere", 0x15af9b, 577, 180, 20389, 796, 27, 116, 134, 56, 5, 15, False, "psi_1"),
+        "Petrified Royal Guard": EarthBoundEnemy("Petrified Royal Guard", 0x15aff9, 573, 0, 19163, 628, 12, 106, 173, 53, 5, 5, False),
+        "Guardian General": EarthBoundEnemy("Guardian General", 0x15b057, 831, 6, 95390, 3235, 21, 109, 214, 55, 1, 7, False, None, 2),
+        "Starman Deluxe": EarthBoundEnemy("Starman Deluxe", 0x15b0b5, 1400, 418, 160524, 3827, 27, 143, 186, 65, 43, 21, False, "psi_2", 2),
+        "Final Starman": EarthBoundEnemy("Final Starman", 0x15b113, 840, 860, 61929, 915, 47, 178, 187, 71, 25, 24, False, "psi_2", 2),
+        "Urban Zombie": EarthBoundEnemy("Urban Zombie", 0x15b171, 171, 0, 700, 58, 10, 31, 24, 19, 15, 24, False),
+        "Zombie Possessor": EarthBoundEnemy("Zombie Possessor", 0x15b1cf, 176, 0, 950, 81, 30, 28, 19, 17, 9, 6, False),
+        "Zombie Dog": EarthBoundEnemy("Zombie Dog", 0x15b22d, 210, 0, 1354, 54, 30, 39, 51, 22, 10, 11, False),
+        "Over Zealous Cop": EarthBoundEnemy("Over Zealous Cop", 0x15b2e9, 325, 0, 7448, 420, 18, 69, 75, 36, 7, 16, False),
+        "Territorial Oak": EarthBoundEnemy("Territorial Oak", 0x15b347, 145, 41, 356, 29, 5, 26, 30, 15, 9, 4, False),
+        "Hostile Elder Oak": EarthBoundEnemy("Hostile Elder Oak", 0x15b3a5, 609, 76, 17567, 690, 14, 134, 146, 59, 11, 5, False),
+        "Diamond Dog": EarthBoundEnemy("Diamond Dog", 0x15b403, 3344, 154, 337738, 6968, 31, 167, 230, 70, 10, 47, False, "phys_2", 2),
+        "Marauder Octobot": EarthBoundEnemy("Marauder Octobot", 0x15b461, 482, 0, 14475, 499, 23, 99, 121, 49, 8, 24, False),
+        "Military Octobot": EarthBoundEnemy("Military Octobot", 0x15b4bf, 604, 0, 25607, 637, 26, 138, 147, 61, 8, 18, False),
+        "Mechanical Octobot": EarthBoundEnemy("Mechanical Octobot", 0x15b51d, 768, 0, 41738, 744, 43, 147, 176, 66, 8, 24, False),
+        "Ultimate Octobot": EarthBoundEnemy("Ultimate Octobot", 0x15b57b, 792, 0, 47876, 815, 44, 163, 181, 70, 8, 24, False),
+        "Mad Duck": EarthBoundEnemy("Mad Duck", 0x15b5d9, 51, 0, 41, 12, 30, 12, 24, 8, 5, 1, False),
+        "Dali's Clock": EarthBoundEnemy("Dali's Clock", 0x15b637, 296, 0, 2503, 314, 4, 65, 66, 34, 5, 4, False),
+        "Trillionage Sprout": EarthBoundEnemy("Trillionage Sprout", 0x15b695, 1048, 240, 30303, 1358, 16, 54, 88, 29, 21, 71, False, None, 2),
+        "Musica": EarthBoundEnemy("Musica", 0x15b6f3, 292, 0, 3748, 341, 21, 69, 85, 35, 20, 8, False),
+        "Desert Wolf": EarthBoundEnemy("Desert Wolf", 0x15b751, 247, 0, 3740, 114, 33, 57, 67, 30, 2, 11, False),
+        "Master Belch": EarthBoundEnemy("Master Belch", 0x15b7af, 650, 0, 12509, 664, 16, 50, 88, 27, 20, 61, False, None, 2),  # Real one
+        "Big Pile of Puke": EarthBoundEnemy("Big Pile of Puke", 0x15b80d, 631, 0, 19659, 728, 16, 120, 158, 57, 26, 32, False),
+        "Master Barf": EarthBoundEnemy("Master Barf", 0x15b86b, 1319, 0, 125056, 3536, 24, 136, 177, 60, 39, 64, False, None, 2),
+        "Kiss of Death": EarthBoundEnemy("Kiss of Death", 0x15b8c9, 333, 0, 10354, 528, 19, 91, 100, 46, 7, 16, False),
+        "French Kiss of Death": EarthBoundEnemy("French Kiss of Death", 0x15b927, 588, 0, 19210, 879, 30, 160, 160, 70, 7, 16, False),
+        "Foppy": EarthBoundEnemy("Foppy", 0x15b985, 120, 10, 1311, 93, 1, 29, 9, 16, 5, 3, False),
+        "Fobby": EarthBoundEnemy("Fobby", 0x15b9e3, 240, 19, 18348, 620, 5, 98, 84, 48, 5, 3, False),
+        "Zap Eel": EarthBoundEnemy("Zap Eel", 0x15ba41, 370, 0, 12170, 611, 29, 97, 93, 48, 5, 8, False),
+        "Tangoo": EarthBoundEnemy("Tangoo", 0x15ba9f, 371, 5, 14718, 572, 19, 96, 99, 48, 20, 16, False),
+        "Boogey Tent": EarthBoundEnemy("Boogey Tent", 0x15bafd, 579, 56, 5500, 407, 10, 43, 69, 25, 16, 32, False, None, 2),
+        "Squatter Demon": EarthBoundEnemy("Squatter Demon", 0x15bb5b, 774, 60, 48311, 897, 45, 158, 192, 69, 25, 32, False),
+        "Crested Booka": EarthBoundEnemy("Crested Booka", 0x15bbb9, 265, 0, 3011, 130, 17, 53, 73, 28, 24, 37, False),
+        "Great Crested Booka": EarthBoundEnemy("Great Crested Booka", 0x15bc17, 452, 0, 16365, 604, 20, 100, 110, 49, 28, 40, False),
+        "Lesser Mook": EarthBoundEnemy("Lesser Mook", 0x15bc75, 401, 190, 7640, 467, 17, 76, 102, 39, 7, 16, False),
+        "Mook Senior": EarthBoundEnemy("Mook Senior", 0x15bcd3, 501, 700, 21056, 715, 25, 108, 122, 54, 7, 16, False),
+        "Smelly Ghost": EarthBoundEnemy("Smelly Ghost", 0x15bd31, 194, 50, 606, 71, 10, 35, 89, 21, 2, 9, False),
+        "Stinky Ghost": EarthBoundEnemy("Stinky Ghost", 0x15bd8f, 444, 0, 13179, 541, 18, 90, 179, 46, 4, 7, False),
+        "Everdred": EarthBoundEnemy("Everdred", 0x15bded, 182, 0, 986, 171, 6, 25, 35, 15, 10, 40, False, None, 2),
+        "Attack Slug": EarthBoundEnemy("Attack Slug", 0x15be4b, 30, 6, 27, 6, 1, 9, 2, 5, 0, 3, False),
+        "Pit Bull Slug": EarthBoundEnemy("Pit Bull Slug", 0x15bea9, 217, 11, 9994, 543, 2, 79, 77, 39, 5, 7, False),
+        "Rowdy Mouse": EarthBoundEnemy("Rowdy Mouse", 0x15bf07, 36, 0, 34, 9, 5, 7, 20, 6, 225, 2, False),
+        "Deadly Mouse": EarthBoundEnemy("Deadly Mouse", 0x15bf65, 416, 0, 9225, 406, 18, 63, 98, 38, 225, 13, False),
+        "Care Free Bomb": EarthBoundEnemy("Care Free Bomb", 0x15bfc3, 504, 0, 14941, 641, 31, 135, 215, 60, 15, 8, False),
+        "Electro Specter": EarthBoundEnemy("Electro Specter", 0x15c021, 3092, 80, 261637, 6564, 29, 148, 203, 67, 47, 56, False, "psi_2", 2),
+        "Handsome Tom": EarthBoundEnemy("Handsome Tom", 0x15c07f, 133, 16, 520, 45, 11, 27, 25, 16, 5, 8, False),
+        "Smilin' Sam": EarthBoundEnemy("Smilin' Sam", 0x15c0dd, 161, 55, 712, 48, 17, 34, 44, 20, 16, 16, False),
+        "Manly Fish": EarthBoundEnemy("Manly Fish", 0x15c13b, 500, 0, 15826, 624, 22, 83, 114, 42, 9, 20, False),
+        "Manly Fish's Brother": EarthBoundEnemy("Manly Fish's Brother", 0x15c199, 526, 210, 15970, 686, 24, 114, 123, 56, 11, 24, False),
+        "Runaway Dog": EarthBoundEnemy("Runaway Dog", 0x15c1f7, 21, 0, 4, 3, 26, 4, 5, 2, 0, 1, False),
+        "Trick or Trick Kid": EarthBoundEnemy("Trick or Trick Kid", 0x15c255, 142, 0, 570, 47, 7, 30, 37, 18, 12, 12, False),
+        "Cave Boy": EarthBoundEnemy("Cave Boy", 0x15c2b3, 314, 0, 618, 17, 79, 21, 33, 14, 0, 80, False),
+        "Abstract Art": EarthBoundEnemy("Abstract Art", 0x15c311, 301, 60, 4361, 255, 19, 67, 79, 35, 7, 7, False),
+        "Shattered Man": EarthBoundEnemy("Shattered Man", 0x15c36f, 694, 0, 44690, 2630, 18, 104, 138, 51, 25, 38, False),
+        "Fierce Shattered Man": EarthBoundEnemy("Fierce Shattered Man", 0x15c3cd, 516, 0, 17423, 577, 12, 101, 116, 50, 5, 4, False),
+        "Ego Orb": EarthBoundEnemy("Ego Orb", 0x15c42b, 592, 0, 24180, 836, 17, 125, 140, 58, 1, 8, False),
+        "Thunder and Storm": EarthBoundEnemy("Thunder and Storm", 0x15c489, 2065, 70, 129026, 4736, 21, 111, 178, 56, 35, 55, False, None, 2),
+        "Yes Man Junior": EarthBoundEnemy("Yes Man Junior", 0x15c4e7, 33, 0, 13, 18, 4, 8, 9, 4, 0, 14, False),
+        "Frankystein Mark II": EarthBoundEnemy("Frankystein Mark II", 0x15c545, 91, 0, 76, 31, 4, 15, 18, 7, 0, 40, False, None, 2),
+        "Frank": EarthBoundEnemy("Frank", 0x15c5a3, 63, 0, 50, 48, 7, 12, 17, 6, 5, 32, False),
+        "Cute Li'l UFO": EarthBoundEnemy("Cute Li'l UFO", 0x15c601, 162, 25, 1519, 110, 58, 49, 32, 27, 1, 70, False),
+        "Beautiful UFO": EarthBoundEnemy("Beautiful UFO", 0x15c65f, 339, 15, 8257, 426, 59, 86, 87, 44, 1, 71, False),
+        "Pogo Punk": EarthBoundEnemy("Pogo Punk", 0x15c6bd, 35, 0, 15, 18, 3, 8, 10, 4, 0, 15, False),
+        "Tough Guy": EarthBoundEnemy("Tough Guy", 0x15c71b, 342, 0, 9310, 525, 18, 72, 92, 37, 20, 16, False),
+        "Mad Taxi": EarthBoundEnemy("Mad Taxi", 0x15c779, 253, 0, 2336, 216, 38, 53, 68, 28, 5, 8, False),
+        "Evil Mani-Mani": EarthBoundEnemy("Evil Mani-Mani", 0x15c7d7, 860, 88, 28139, 1852, 15, 86, 145, 45, 1, 80, False, None, 2),
+        "Mr. Molecule": EarthBoundEnemy("Mr. Molecule", 0x15c835, 280, 21, 8708, 659, 18, 118, 97, 56, 5, 4, False),
+        "Worthless Protoplasm": EarthBoundEnemy("Worthless Protoplasm", 0x15c893, 38, 0, 17, 11, 27, 11, 21, 7, 0, 1, False),
+        "Sentry Robot": EarthBoundEnemy("Sentry Robot", 0x15c8f1, 372, 0, 5034, 392, 17, 77, 105, 39, 10, 4, False),
+        # "Heavily Armed Pokey ": EarthBoundEnemy("Heavily Armed Pokey", 0x15c94f, 1746, 999, 0, 0, 51, 150, 274, 72, False), Unused
+        "Psychic Psycho": EarthBoundEnemy("Psychic Psycho", 0x15c9ad, 591, 252, 30094, 682, 30, 124, 144, 58, 1, 24, False),
+        "Major Psychic Psycho": EarthBoundEnemy("Major Psychic Psycho", 0x15ca0b, 618, 574, 39247, 862, 31, 145, 152, 65, 1, 24, False),
+        "Mole Playing Rough": EarthBoundEnemy("Mole Playing Rough", 0x15ca69, 103, 0, 456, 36, 9, 22, 28, 14, 2, 8, False),
+        "Gruff Goat": EarthBoundEnemy("Gruff Goat", 0x15cac7, 45, 0, 20, 9, 12, 8, 23, 7, 0, 16, False),
+        "Clumsy Robot": EarthBoundEnemy("Clumsy Robot", 0x15cb25, 962, 0, 32378, 2081, 83, 88, 137, 46, 30, 49, False, "psi_1", 3),
+        "Soul Consuming Flame": EarthBoundEnemy("Soul Consuming Flame", 0x15cb83, 602, 0, 37618, 768, 30, 131, 262, 59, 14, 8, False),
+        "Demonic Petunia": EarthBoundEnemy("Demonic Petunia", 0x15cbe1, 478, 0, 15171, 724, 26, 102, 111, 50, 5, 9, False),
+        "Ranboob": EarthBoundEnemy("Ranboob", 0x15cc3f, 232, 42, 2486, 158, 20, 41, 63, 24, 1, 9, False),
+        "Li'l UFO": EarthBoundEnemy("Li'l UFO", 0x15cc9d, 82, 0, 223, 14, 53, 18, 17, 12, 13, 8, False),
+        "High-class UFO": EarthBoundEnemy("High-class UFO", 0x15ccfb, 433, 72, 12385, 456, 60, 93, 103, 47, 15, 24, False, "phys_1"),
+        "Noose Man": EarthBoundEnemy("Noose Man", 0x15cd59, 231, 0, 1990, 220, 18, 47, 52, 26, 5, 4, False),
+        "Robo-pump": EarthBoundEnemy("Robo-pump", 0x15cdb7, 431, 0, 4797, 349, 19, 70, 113, 36, 5, 4, False, None, 2),
+        "Plain Crocodile": EarthBoundEnemy("Plain Crocodile", 0x15ce15, 234, 0, 1928, 62, 10, 40, 55, 24, 1, 5, False),
+        "Strong Crocodile": EarthBoundEnemy("Strong Crocodile", 0x15ce73, 417, 0, 10122, 495, 17, 85, 131, 43, 5, 6, False),
+        "Hard Crocodile": EarthBoundEnemy("Hard Crocodile", 0x15ced1, 522, 0, 19484, 692, 23, 110, 128, 55, 10, 4, False),
+        "No Good Fly": EarthBoundEnemy("No Good Fly", 0x15cf2f, 100, 0, 415, 26, 10, 23, 13, 15, 3, 0, False),
+        "Mostly Bad Fly": EarthBoundEnemy("Mostly Bad Fly", 0x15cf8d, 141, 0, 1116, 84, 15, 32, 16, 19, 4, 0, False),
+        "Spiteful Crow": EarthBoundEnemy("Spiteful Crow", 0x15cfeb, 24, 0, 3, 5, 77, 5, 3, 3, 0, 1, False),
+        # "Master Belch": EarthBoundEnemy("Master Belch", 0x15d397, 650, 0, 12509, 664, 16, 50, 88, 27, False), Unused
+        # "Insane Cultist (2)": EarthBoundEnemy("Insane Cultist", 0x15d3f5, 94, 0, 353, 33, 8, 19, 25, 13, False),
+        "Dept. Store Spook (2)": EarthBoundEnemy("Dept. Store Spook (2)", 0x15d453, 610, 290, 24291, 1648, 19, 82, 135, 42, 24, 62, False),
+        "Ness's Nightmare (2)": EarthBoundEnemy("Ness's Nightmare (2)", 0x15d4b1, 1654, 882, 89004, 4442, 31, 172, 253, 71, 1, 80, False),
+        "Mr. Carpainter (2)": EarthBoundEnemy("Mr. Carpainter (2)", 0x15d50f, 262, 70, 1412, 195, 8, 33, 45, 21, 13, 72, False),
+        "Carbon Dog (2)": EarthBoundEnemy("Carbon Dog (2)", 0x15d56d, 1672, 0, 0, 0, 31, 159, 174, 70, 52, 53, False),
+        "Chomposaur (2)": EarthBoundEnemy("Chomposaur (2)", 0x15d5cb, 1288, 320, 44378, 896, 17, 139, 183, 62, 3, 16, False),
+        "Titanic Ant (2)": EarthBoundEnemy("Titanic Ant (2)", 0x15d629, 235, 102, 685, 150, 6, 19, 23, 13, 9, 72, False),
+        "Gigantic Ant (2)": EarthBoundEnemy("Gigantic Ant (2)", 0x15d687, 308, 81, 3980, 304, 17, 54, 112, 30, 5, 6, False),
+        "Shrooom! (2)": EarthBoundEnemy("Shrooom! (2)", 0x15d6e5, 1700, 112, 96323, 4086, 18, 95, 154, 48, 32, 72, False),
+        "Plague Rat of Doom (2)": EarthBoundEnemy("Plague Rat of Doom (2)", 0x15d743, 1827, 60, 115272, 4464, 19, 71, 180, 47, 250, 45, False),
+        "Mondo Mole (2)": EarthBoundEnemy("Mondo Mole (2)", 0x15d7a1, 498, 161, 5791, 400, 9, 37, 50, 23, 15, 36, False),
+        "Guardian Digger (2)": EarthBoundEnemy("Guardian Digger (2)", 0x15d7ff, 386, 110, 17301, 1467, 17, 59, 129, 32, 21, 55, False),
+        "Kraken (2)": EarthBoundEnemy("Kraken (2)", 0x15d85d, 1097, 176, 79267, 3049, 21, 105, 166, 54, 1, 32, False),
+        # "Bionic Kraken (2)": EarthBoundEnemy("Bionic Kraken", 0x15d8bb, 900, 60, 50308, 960, 42, 155, 195, 70, False),
+        "Starman (2)": EarthBoundEnemy("Starman (2)", 0x15d919, 545, 155, 23396, 720, 24, 103, 126, 55, 25, 16, False),
+        "Starman Super (2)": EarthBoundEnemy("Starman Super (2)", 0x15d977, 568, 310, 30145, 735, 24, 112, 129, 56, 25, 16, False),
+        "Ghost of Starman (2)": EarthBoundEnemy("Ghost of Starman (2)", 0x15d9d5, 750, 462, 48695, 807, 46, 152, 170, 68, 43, 16, False),
+        "Starman Deluxe (2)": EarthBoundEnemy("Starman Deluxe (2)", 0x15da33, 1400, 418, 160524, 3827, 27, 143, 186, 65, 43, 21, False),
+        "Final Starman (2)": EarthBoundEnemy("Final Starman (2)", 0x15da91, 840, 860, 61929, 915, 47, 178, 187, 71, 25, 24, False),
+        "Diamond Dog (2)": EarthBoundEnemy("Diamond Dog (2)", 0x15db4d, 3344, 154, 337738, 6968, 31, 167, 230, 70, 15, 24, False),
+        "Trillionage Sprout (2)": EarthBoundEnemy("Trillionage Sprout (2)", 0x15dbab, 1048, 240, 30303, 1358, 16, 54, 88, 29, 21, 71, False),
+        "Master Belch (2)": EarthBoundEnemy("Master Belch (2)", 0x15dc09, 650, 0, 12509, 664, 16, 50, 88, 27, 20, 61, False),
+        "Master Barf (2)": EarthBoundEnemy("Master Barf (2)", 0x15dcc5, 1319, 0, 125056, 3536, 24, 136, 177, 60, 39, 64, False),
+        "Loaded Dice 2": EarthBoundEnemy("Loaded Dice 2", 0x15dd23, 307, 0, 10672, 703, 77, 146, 113, 59, 75, 6, False),
+        "Boogey Tent (2)": EarthBoundEnemy("Boogey Tent (2)", 0x15dddf, 579, 56, 5500, 407, 10, 43, 69, 25, 16, 32, False),
+        "Everdred (2)": EarthBoundEnemy("Everdred (2)", 0x15de9b, 182, 0, 986, 171, 6, 25, 35, 15, 10, 40, False),
+        "Electro Specter (2)": EarthBoundEnemy("Electro Specter (2)", 0x15def9, 3092, 80, 261637, 6564, 29, 148, 203, 67, 47, 56, False),
+        "Thunder and Storm (2)": EarthBoundEnemy("Thunder and Storm (2)", 0x15df57, 2065, 70, 129026, 4736, 21, 111, 178, 56, 35, 55, False),
+        "Frankystein Mark II (2)": EarthBoundEnemy("Frankystein Mark II (2)", 0x15dfb5, 91, 0, 76, 31, 4, 15, 18, 7, 0, 40, False),
+        "Evil Mani-Mani (2)": EarthBoundEnemy("Evil Mani-Mani (2)", 0x15e013, 860, 88, 28139, 1852, 15, 86, 145, 45, 1, 80, False),
+        # "Heavily Armed Pokey": EarthBoundEnemy("Heavily Armed Pokey", 0x15e071, 1746, 999, 0, 0, 51, 150, 274, 72, False),
+        "Clumsy Robot (2)": EarthBoundEnemy("Clumsy Robot (2)", 0x15e0cf, 962, 0, 32378, 2081, 83, 88, 137, 46, 30, 49, False),
+        "Robo-pump (2)": EarthBoundEnemy("Robo-pump (2)", 0x15e12d, 431, 0, 4797, 349, 19, 70, 113, 36, 5, 4, False),
+        "Guardian General (2)": EarthBoundEnemy("Guardian General (2)", 0x15e1e9, 831, 6, 95390, 3235, 21, 109, 214, 55, 1, 7, False),
+        "Black Antoid (2)": EarthBoundEnemy("Black Antoid (2)", 0x15e247, 34, 25, 37, 7, 4, 14, 13, 7, 3, 0, False),  # Separate enemy used in the titanic ant fight
+        "Runaway Dog (2)": EarthBoundEnemy("Runaway Dog", 0x15e303, 21, 0, 4, 3, 26, 4, 5, 73, 0, 1, False),
+        # "Cave Boy (2)": EarthBoundEnemy("Cave Boy (2)", 0x15e361, 314, 0, 618, 17, 5, 21, 33, 11, False),
+        "Tiny Li'l Ghost": EarthBoundEnemy("Tiny Li'l Ghost", 0x15e3bf, 90, 0, 1, 162, 100, 19, 7, 18, 25, 24, False),
+        "Starman Junior": EarthBoundEnemy("Starman Junior", 0x15e41d, 200, 999, 16, 20, 1, 11, 10, 6, 0, 80, False),
+        "Buzz Buzz": EarthBoundEnemy("Buzz Buzz", 0x15e47b, 2000, 999, 0, 0, 100, 40, 92, 20, 1, 80, False),
+        "Heavily Armed Pokey": EarthBoundEnemy("Heavily Armed Pokey", 0x15e4d9, 2000, 999, 70000, 0, 60, 145, 255, 80, 5, 255, False),
+        # "Heavily Armed Pokey": EarthBoundEnemy("Heavily Armed Pokey", 0x15e537, 1746, 999, 0, 0, 51, 150, 274, 72, False), Cutscene?
+        "Giygas (2)": EarthBoundEnemy("Giygas (2)", 0x15e595, 9999, 999, 70000, 0, 80, 255, 255, 80, 5, 255, False),
+        "Giygas (3)": EarthBoundEnemy("Giygas (3)", 0x15e5f3, 9999, 0, 0, 0, 80, 255, 255, 80, 5, 255, False),
+        "Giygas": EarthBoundEnemy("Giygas", 0x15e651, 2000, 0, 0, 0, 80, 255, 255, 80, 5, 255, False),
+        "Giygas (5)": EarthBoundEnemy("Giygas (5)", 0x15e6af, 9999, 0, 0, 0, 80, 255, 255, 80, 5, 255, False),
+        "Farm Zombie": EarthBoundEnemy("Farm Zombie", 0x15e70d, 171, 0, 700, 58, 10, 31, 24, 19, 15, 24, False),
+        "Criminal Caterpillar": EarthBoundEnemy("Criminal Caterpillar", 0x15e76b, 250, 168, 30384, 0, 134, 37, 16, 23, 0, 0, False),
+        "Evil Eye": EarthBoundEnemy("Evil Eye", 0x15e7c9, 720, 400, 46376, 896, 38, 141, 162, 63, 25, 16, False),
+        "Mini Barf": EarthBoundEnemy("Mini Barf", 0x15e885, 616, 0, 7521, 460, 10, 45, 71, 26, 19, 30, False),
+        "Master Criminal Worm": EarthBoundEnemy("Master Criminal Worm", 0x15e8e3, 377, 300, 82570, 0, 136, 73, 40, 37, 0, 0, False),
+        "Captain Strong": EarthBoundEnemy("Captain Strong", 0x15e941, 140, 0, 492, 159, 15, 20, 24, 13, 8, 18, False),
+        "Giygas (6)": EarthBoundEnemy("Giygas (6)", 0x15e99f, 9999, 0, 0, 0, 80, 255, 127, 80, 5, 255, False),
+        "Clumsy Robot (3)": EarthBoundEnemy("Clumsy Robot (3)", 0x15e9fd, 962, 0, 32378, 2081, 83, 88, 137, 46, 30, 49, False)
+    }
+
+    shuffled_enemies = {}
+    for enemy in world.acting_enemy_list:
+        shuffled_enemies[enemy] = world.enemies[world.acting_enemy_list[enemy]]
+
+    flunkies = {
+        "Titanic Ant": shuffled_enemies["Black Antoid (2)"],
+        "Master Belch": shuffled_enemies["Slimy Little Pile"],
+        "Trillionage Sprout": shuffled_enemies["Tough Mobile Sprout"],
+        "Master Barf": shuffled_enemies["Even Slimier Little Pile"],
+        "Starman Deluxe": [shuffled_enemies["Starman"], shuffled_enemies["Starman Super"]],
+        "Carbon Dog": world.enemies[world.boss_list[27]],  # This should be the enemy that gets shuffled WITH carbon dog, right? Fix???
+        "Skate Punk": [shuffled_enemies["Pogo Punk"], shuffled_enemies["Yes Man Junior"]],
+        "Loaded Dice": [shuffled_enemies["Care Free Bomb"], shuffled_enemies["Beautiful UFO"], shuffled_enemies["High-class UFO"]],
+        "Loaded Dice 2": [shuffled_enemies["Electro Swoosh"], shuffled_enemies["Fobby"], shuffled_enemies["Uncontrollable Sphere"]],
+        "Starman Super": [shuffled_enemies["Starman"]]
+    }
+
+    world.regional_enemies = {"Northern Onett": {shuffled_enemies["Spiteful Crow"], shuffled_enemies["Runaway Dog"], shuffled_enemies["Coil Snake"]},
+                              "Onett": {shuffled_enemies["Pogo Punk"], shuffled_enemies["Skate Punk"], shuffled_enemies["Yes Man Junior"], world.enemies[world.boss_list[0]], world.enemies[world.boss_list[1]]},
+                              "Arcade": {shuffled_enemies["Pogo Punk"], shuffled_enemies["Skate Punk"], shuffled_enemies["Yes Man Junior"]},
+                              "Giant Step": {shuffled_enemies["Attack Slug"], shuffled_enemies["Black Antoid"], shuffled_enemies["Rowdy Mouse"], world.enemies[world.boss_list[2]]},
+                              "Twoson": {shuffled_enemies["Black Antoid"], shuffled_enemies["Cop"], world.enemies[world.boss_list[3]], shuffled_enemies["Ramblin' Evil Mushroom"],
+                                         shuffled_enemies["Annoying Old Party Man"], shuffled_enemies["Cranky Lady"], shuffled_enemies["Mobile Sprout"], shuffled_enemies["New Age Retro Hippie"], shuffled_enemies["Unassuming Local Guy"],
+                                         shuffled_enemies["Runaway Dog"]},
+                              "Everdred's House": {world.enemies[world.boss_list[4]]},
+                              "Peaceful Rest Valley": {shuffled_enemies["Li'l UFO"], shuffled_enemies["Mobile Sprout"], shuffled_enemies["Spinning Robo"], shuffled_enemies["Territorial Oak"]},
+                              "Happy-Happy Village": {shuffled_enemies["Coil Snake"], shuffled_enemies["Insane Cultist"], shuffled_enemies["Spiteful Crow"], shuffled_enemies["Unassuming Local Guy"]},
+                              "Happy-Happy HQ": {shuffled_enemies["Insane Cultist"], world.enemies[world.boss_list[5]]},
+                              "Lilliput Steps": {shuffled_enemies["Mighty Bear"], shuffled_enemies["Mole Playing Rough"], shuffled_enemies["Mr. Batty"], world.enemies[world.boss_list[6]]},
+                              "Threed": {shuffled_enemies["Coil Snake"], shuffled_enemies["Handsome Tom"], shuffled_enemies["Smilin' Sam"], shuffled_enemies["Trick or Trick Kid"],
+                                         shuffled_enemies["Zombie Dog"], shuffled_enemies["Putrid Moldyman"], shuffled_enemies["Smelly Ghost"]},
+                              "Threed Underground": {shuffled_enemies["No Good Fly"], shuffled_enemies["Urban Zombie"], shuffled_enemies["Zombie Possessor"], world.enemies[world.boss_list[8]], shuffled_enemies["Zombie Dog"]},
+                              "Grapefruit Falls": {shuffled_enemies["Armored Frog"], shuffled_enemies["Black Antoid"], shuffled_enemies["Coil Snake"], shuffled_enemies["Farm Zombie"],
+                                                   shuffled_enemies["Plain Crocodile"], shuffled_enemies["Red Antoid"], shuffled_enemies["Violent Roach"], shuffled_enemies["Mad Duck"], shuffled_enemies["Black Antoid (2)"]},
+                              "Belch's Factory": {shuffled_enemies["Farm Zombie"], shuffled_enemies["Foppy"], shuffled_enemies["Mostly Bad Fly"], shuffled_enemies["Slimy Little Pile"], world.enemies[world.boss_list[9]]},
+                              "Milky Well": {shuffled_enemies["Mad Duck"], shuffled_enemies["Ranboob"], shuffled_enemies["Struttin' Evil Mushroom"], shuffled_enemies["Tough Mobile Sprout"], world.enemies[world.boss_list[10]]},
+                              "Dusty Dunes Desert": {shuffled_enemies["Bad Buffalo"], shuffled_enemies["Crested Booka"], shuffled_enemies["Criminal Caterpillar"], shuffled_enemies["Cute Li'l UFO"], shuffled_enemies["Desert Wolf"], shuffled_enemies["Mole Playing Rough"],
+                                                     shuffled_enemies["Skelpion"], shuffled_enemies["Smilin' Sphere"]},
+                              "Fourside": {shuffled_enemies["Annoying Reveler"], shuffled_enemies["Crazed Sign"], shuffled_enemies["Extra Cranky Lady"], shuffled_enemies["Mad Taxi"]},
+                              "Moonside": {shuffled_enemies["Abstract Art"], shuffled_enemies["Dali's Clock"], shuffled_enemies["Enraged Fire Plug"], shuffled_enemies["Robo-pump"], world.enemies[world.boss_list[13]]},
+                              "Gold Mine": {shuffled_enemies["Gigantic Ant"], shuffled_enemies["Mad Duck"], shuffled_enemies["Noose Man"], shuffled_enemies["Thirsty Coil Snake"], world.enemies[world.boss_list[11]]},
+                              "Fourside Dept. Store": {shuffled_enemies["Musica"], shuffled_enemies["Mystical Record"], shuffled_enemies["Scalding Coffee Cup"], world.enemies[world.boss_list[12]]},
+                              "Monkey Caves": {shuffled_enemies["Struttin' Evil Mushroom"], shuffled_enemies["Tough Mobile Sprout"]},
+                              "Monotoli Building": {shuffled_enemies["Sentry Robot"], world.enemies[world.boss_list[14]]},
+                              "Rainy Circle": {shuffled_enemies["Arachnid!"], shuffled_enemies["Elder Batty"], shuffled_enemies["Strong Crocodile"], world.enemies[world.boss_list[15]]},
+                              "Andonuts Lab Area": {shuffled_enemies["Cave Boy"], shuffled_enemies["Mighty Bear Seven"]},
+                              "Summers": {shuffled_enemies["Crazed Sign"], shuffled_enemies["Mad Taxi"], shuffled_enemies["Mole Playing Rough"], shuffled_enemies["Over Zealous Cop"], shuffled_enemies["Tough Guy"], world.enemies[world.boss_list[18]]},
+                              "Summers Museum": {shuffled_enemies["Shattered Man"]},
+                              "Magnet Hill": {shuffled_enemies["Deadly Mouse"], shuffled_enemies["Filthy Attack Roach"], shuffled_enemies["Stinky Ghost"], world.enemies[world.boss_list[16]]},
+                              "Pink Cloud": {shuffled_enemies["Conducting Menace"], shuffled_enemies["Kiss of Death"], shuffled_enemies["Tangoo"], shuffled_enemies["Thunder Mite"], world.enemies[world.boss_list[17]]},
+                              "Scaraba": {shuffled_enemies["Beautiful UFO"], shuffled_enemies["Dread Skelpion"], shuffled_enemies["Great Crested Booka"], shuffled_enemies["High-class UFO"], shuffled_enemies["Master Criminal Worm"]},
+                              "Pyramid": {shuffled_enemies["Arachnid!!!"], shuffled_enemies["Fierce Shattered Man"], shuffled_enemies["Guardian Hieroglyph"], shuffled_enemies["Lethal Asp Hieroglyph"], shuffled_enemies["Petrified Royal Guard"],
+                                          world.enemies[world.boss_list[19]]},
+                              "Southern Scaraba": {shuffled_enemies["Beautiful UFO"], shuffled_enemies["High-class UFO"], shuffled_enemies["Marauder Octobot"]},
+                              "Dungeon Man": {shuffled_enemies["Dali's Clock"], shuffled_enemies["Mystical Record"], shuffled_enemies["Lesser Mook"], shuffled_enemies["Mystical Record"], shuffled_enemies["Scalding Coffee Cup"], shuffled_enemies["Worthless Protoplasm"], shuffled_enemies["Cute Li'l UFO"]},
+                              "Deep Darkness": {shuffled_enemies["Mole Playing Rough"]},
+                              "Winters": {shuffled_enemies["Lesser Mook"], shuffled_enemies["Whirling Robo"], shuffled_enemies["Wooly Shambler"]},
+                              "Deep Darkness Darkness": {shuffled_enemies["Big Pile of Puke"], shuffled_enemies["Demonic Petunia"], shuffled_enemies["Even Slimier Little Pile"], shuffled_enemies["Hard Crocodile"], shuffled_enemies["Hostile Elder Oak"],
+                                                         shuffled_enemies["Manly Fish"], shuffled_enemies["Manly Fish's Brother"], shuffled_enemies["Pit Bull Slug"], shuffled_enemies["Zap Eel"], world.enemies[world.boss_list[20]]},
+                              "Boogey Tent": {world.enemies[world.boss_list[7]]},
+                              "Southern Winters": {shuffled_enemies["Lesser Mook"], shuffled_enemies["Whirling Robo"], shuffled_enemies["Wooly Shambler"]},
+                              "Brickroad Maze": {shuffled_enemies["Rowdy Mouse"], shuffled_enemies["Worthless Protoplasm"], shuffled_enemies["Mad Duck"]},
+                              "Stonehenge Base": {shuffled_enemies["Atomic Power Robot"], shuffled_enemies["Military Octobot"], shuffled_enemies["Mook Senior"], shuffled_enemies["Starman"], shuffled_enemies["Starman Super"], world.enemies[world.boss_list[21]]},
+                              "Lumine Hall": {shuffled_enemies["Conducting Spirit"], shuffled_enemies["Fobby"], shuffled_enemies["Hyper Spinning Robo"], shuffled_enemies["Uncontrollable Sphere"], world.enemies[world.boss_list[22]]},
+                              "Lost Underworld": {shuffled_enemies["Chomposaur"], shuffled_enemies["Ego Orb"], shuffled_enemies["Wetnosaur"]},
+                              "Fire Spring": {shuffled_enemies["Evil Elemental"], shuffled_enemies["Major Psychic Psycho"], shuffled_enemies["Psychic Psycho"], shuffled_enemies["Soul Consuming Flame"], world.enemies[world.boss_list[23]]},
+                              "Magicant": {shuffled_enemies["Care Free Bomb"], shuffled_enemies["Electro Swoosh"], shuffled_enemies["French Kiss of Death"], shuffled_enemies["Loaded Dice"], shuffled_enemies["Mr. Molecule"], shuffled_enemies["Loaded Dice 2"]},
+                              "Sea of Eden": {world.enemies[world.boss_list[18]], world.enemies[world.boss_list[24]]},
+                              "Cave of the Past": {shuffled_enemies["Bionic Kraken"], shuffled_enemies["Final Starman"], shuffled_enemies["Ghost of Starman"], shuffled_enemies["Nuclear Reactor Robot"], shuffled_enemies["Squatter Demon"],
+                                                   shuffled_enemies["Ultimate Octobot"], shuffled_enemies["Wild 'n Wooly Shambler"]},
+                              "Endgame": {world.enemies[world.boss_list[25]], world.enemies["Giygas (2)"], world.enemies[world.boss_list[28]], world.enemies["Giygas (3)"], world.enemies["Giygas (5)"], world.enemies["Giygas (6)"]},
+                        
+                              }
+
+    if world.options.randomize_enemy_attacks:
+        del flunkies["Loaded Dice 2"]
+        del flunkies["Skate Punk"]
+        del flunkies["Loaded Dice"]
+        del flunkies["Starman Super"]
+
+    for region in world.regional_enemies:
+        enemy_list = world.regional_enemies[region]
+        updated_list = set(enemy_list)
+        for enemy in enemy_list:
+            if enemy.name == "Carbon Dog":
+                updated_list.add(world.enemies[world.boss_list[27]])
+                for i in range(1, world.enemies[world.boss_list[27]].attack_extensions):
+                    updated_list.add(world.enemies[f"{world.enemies[world.boss_list[27]].name} ({i + 1})"])
+                # todo; option to not have in Giygas/Mine
+
+            if enemy.name in flunkies:
+                # Can I just always update instead of doing an add? Would probably need to make singulars a list of one item...
+                if enemy.name in ["Starman Deluxe", "Skate Punk", "Loaded Dice", "Loaded Dice 2", "Starman Super"]:
+                    updated_list.update(flunkies[enemy.name])
+                else:
+                    updated_list.add(flunkies[enemy.name])
+
+            if enemy.attack_extensions > 1:
+                for i in range(1, enemy.attack_extensions):
+                    updated_list.add(world.enemies[f"{enemy.name} ({i + 1})"])
+        world.regional_enemies[region] = updated_list
+
+
+combat_regions = [
+    "Northern Onett",
+    "Onett",
+    "Arcade",
+    "Giant Step",
+    "Twoson",
+    "Happy-Happy Village",
+    "Happy-Happy HQ"
+    "Lilliput Steps",
+    "Winters",
+    "Threed",
+    "Milky Well",
+    "Dusty Dunes Desert",
+    "Fourside",
+    "Moonside",
+    "Gold Mine",
+    "Monkey Caves",
+    "Monotoli Building",
+    "Rainy Circle",
+    "Summers",
+    "Magnet Hill",
+    "Pink Cloud",
+    "Scaraba",
+    "Pyramid",
+    "Southern Scaraba",
+    "Dungeon Man",
+    "Deep Darkness",
+    "Deep Darkness Darkness",
+    "Stonehenge Base",
+    "Lumine Hall",
+    "Lost Underworld",
+    "Fire Spring",
+    "Magicant",
+    "Cave of the Past",
+    "Endgame",
+    "Grapefruit Falls",
+    "Peaceful Rest Valley",
+    "Everdred's House",
+    "Belch's Factory",
+    "Southern Winters",
+    "Brickroad Maze"
+    "Summers Museum",
+    "Fourside Dept. Store",
+    "Threed Underground",
+    "Boogey Tent"
+]
+
+
+levels = [
+    1,  # north onett
+    2,  # south onett
+    3,  # giant step
+    5,  # twoson
+    7,  # everdred
+    9,  # peaceful rest
+    10,  # happy happy
+    12,  # lilliput steps
+    13,  # threed
+    14,  # threed caverns
+    15,  # grapefruit falls
+    17,  # belch base
+    18,  # milky well
+    19,  # duty dunes
+    21,  # fourside
+    23,  # gold mine
+    24,  # dept store
+    25,  # monkey cabves
+    26,  # monotoli building
+    28,  # winters
+    29,  # southern winters
+    31,  # rainy circle
+    32,  # summers
+    33,  # museum
+    35,  # Moonside
+    36,  # magnet hill
+    38,  # pink cloud
+    39,  # scaraba
+    42,  # pyramid
+    43,  # scaraba south
+    45,  # dungeon man
+    47,  # deep darkness
+    49,  # deep darkness swamp
+    51,  # Happy-Happy HQ
+    52,  # stonehenge
+    54,  # Arcade
+    56,  # lumine hall
+    59,  # lost underworld
+    61,  # fire spring
+    63,  # magicant
+    65,  # cave of the past
+    68,  # Sea of Eden
+    70,
+    73,
+    74,
+    75]  # gigyas
+
+spell_breaks: dict[str, dict[int, str]] = {
+    "freeze": {8: "zeta", 12: "epsilon", 20: "delta", 25: "lambda", 40: "alpha", 65: "beta", 70: "gamma", 100: "omega"},
+    "fire": {5: "zeta", 10: "epsilon", 20: "alpha", 50: "beta", 70: "gamma", 100: "omega"},  # zeta needs to do less damage
+    "lifeup": {20: "alpha", 100: "beta"},
+    "thunder": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 45: "beta", 60: "gamma", 100: "omega"},
+    "flash": {25: "alpha", 60: "beta", 70: "gamma", 100: "omega"},
+    "special": {5: "zeta", 10: "epsilon", 30: "alpha", 65: "beta", 80: "gamma", 100: "omega"},
+    "healing": {20: "alpha", 40: "beta", 60: "gamma", 100: "omega"},
+    "starstorm": {5: "zeta", 12: "epsilon", 20: "delta", 45: "lambda", 70: "alpha", 100: "beta"},
+    "diamond_eyes": {35: "alpha", 40: "beta", 100: "gamma"},
+    "nauseous_breath": {25: "alpha", 100: "beta"},
+    "poison_stinger": {25: "alpha", 100: "beta"},
+    "kiss_of_death": {25: "alpha", 100: "beta"},
+    "summon_storm": {25: "alpha", 45: "beta", 60: "gamma", 100: "omega"},
+    "scalding_espresso": {5: "zeta", 10: "epsilon", 20: "alpha", 30: "beta", 40: "gamma", 100: "omega"},
+    "extinguishing_blast": {5: "zeta", 10: "epsilon", 20: "alpha", 30: "beta", 40: "gamma", 100: "omega"},
+    "spray_fire": {5: "zeta", 10: "epsilon", 20: "alpha", 30: "beta", 40: "gamma", 100: "omega"},
+    "breathe_fire": {5: "zeta", 10: "epsilon", 20: "alpha", 30: "beta", 40: "gamma", 100: "omega"},
+    "poisonous_fangs": {25: "alpha", 100: "beta"},
+    "flaming_fireball": {5: "zeta", 10: "epsilon", 20: "alpha", 30: "beta", 40: "gamma", 100: "omega"},
+    "glorious_light": {25: "alpha", 45: "beta", 60: "gamma", 100: "omega"},
+    "poison_flute": {25: "alpha", 100: "beta"},
+    "diamond_bite": {35: "alpha", 40: "beta", 100: "gamma"},
+    "scatter_spores": {25: "alpha", 100: "beta"},
+    "hacking_cough": {25: "alpha", 100: "beta"},
+    "stuffiness_beam": {25: "alpha", 100: "beta"},
+    "crashing_boom_bang": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 45: "beta", 60: "gamma", 100: "omega"},
+    "paralysis": {30: "lambda", 60: "alpha", 100: "omega"},
+    "electrical_shock": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 45: "beta", 60: "gamma", 100: "omega"},
+    "giygas_phase2_thunder": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 100: "beta"},
+    "giygas_phase3_thunder": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 100: "beta"},
+    "giygas_phase4_thunder": {5: "zeta", 10: "epsilon", 15: "delta", 20: "lambda", 35: "alpha", 100: "beta"},
+    "giygas_phase2_freeze": {8: "zeta", 12: "epsilon", 20: "delta", 25: "lambda", 100: "alpha"},
+    "giygas_phase3_freeze": {8: "zeta", 12: "epsilon", 20: "delta", 25: "lambda", 100: "alpha"},
+    "giygas_phase4_freeze": {8: "zeta", 12: "epsilon", 20: "delta", 25: "lambda", 100: "alpha"},
+    "giygas_phase2_flash": {25: "alpha", 60: "beta", 100: "gamma"},
+    "giygas_phase3_flash": {25: "alpha", 60: "beta", 100: "gamma"},
+    "giygas_phase4_flash": {25: "alpha", 60: "beta", 100: "gamma"},
+    "thunder_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 45: "alpha", 60: "beta", 100: "gamma", 200: "omega"},
+    "starstorm_minus": {12: "zeta", 20: "epsilon", 45: "delta", 70: "lambda", 100: "alpha", 200: "beta"},
+    "flash_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "blast": {10: "zeta", 20: "epsilon", 30: "alpha", 40: "beta", 50: "gamma", 100: "omega"},
+    "missile": {5: "zeta", 12: "epsilon", 20: "alpha", 50: "beta", 73: "gamma", 100: "omega"},
+    "throw_bomb": {10: "zeta", 20: "epsilon", 30: "alpha", 40: "beta", 50: "gamma", 100: "omega"},
+    "throw_bomb_minus": {20: "zeta", 30: "epsilon", 40: "alpha", 50: "beta", 100: "gamma", 200: "omega"},
+    "shoot_rocket": {5: "zeta", 12: "epsilon", 20: "alpha", 50: "beta", 73: "gamma", 100: "omega"},
+    "paralyzing_pollen": {30: "lambda", 60: "alpha", 100: "omega"},
+
+    "electrical_shock_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 45: "alpha", 60: "beta", 100: "gamma", 200: "omega"},
+    "crashing_boom_bang_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 45: "alpha", 60: "beta", 100: "gamma", 200: "omega"},
+    "giygas_phase2_thunder_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 100: "alpha", 200: "beta"},
+    "giygas_phase3_thunder_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 100: "alpha", 200: "beta"},
+    "giygas_phase4_thunder_minus": {10: "zeta", 15: "epsilon", 20: "delta", 35: "lambda", 100: "alpha", 200: "beta"},
+    "thunder_minus_minus": {15: "zeta", 20: "epsilon", 35: "delta", 45: "lambda", 60: "alpha", 100: "beta", 200: "gamma", 300: "omega"},
+
+    "starstorm_minus_minus": {20: "zeta", 45: "epsilon", 70: "delta", 100: "lambda", 200: "alpha", 300: "beta"},
+
+    "giygas_phase2_flash_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "giygas_phase3_flash_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "giygas_phase4_flash_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "summon_storm_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "glorious_light_minus": {60: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "flash_minus_minus": {70: "alpha", 100: "beta", 200: "gamma", 300: "omega"},
+
+    "fire_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "spray_fire_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "breathe_fire_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "scalding_espresso_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "flaming_fireball_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "extinguishing_blast_minus": {10: "zeta", 20: "epsilon", 50: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+
+    "throw_bomb_minus_minus": {30: "zeta", 40: "epsilon", 50: "alpha", 100: "beta", 200: "gamma", 300: "omega"},
+
+    "shoot_rocket_minus": {12: "zeta", 20: "epsilon", 50: "alpha", 73: "beta", 100: "gamma", 200: "omega"},
+
+    "freeze_minus": {12: "zeta", 20: "epsilon", 25: "delta", 40: "lambda", 65: "alpha", 70: "beta", 100: "gamma", 200: "omega"},
+    "giygas_phase2_freeze_minus": {12: "zeta", 20: "epsilon", 25: "delta", 100: "lambda", 200: "alpha"},
+    "giygas_phase3_freeze_minus": {12: "zeta", 20: "epsilon", 25: "delta", 100: "lambda", 200: "alpha"},
+    "giygas_phase4_freeze_minus": {12: "zeta", 20: "epsilon", 25: "delta", 100: "lambda", 200: "alpha"},
+
+    "special_minus": {10: "zeta", 30: "epsilon", 65: "alpha", 80: "beta", 100: "gamma", 200: "omega"},
+    "blast_minus": {20: "zeta", 30: "epsilon", 40: "alpha", 50: "beta", 100: "gamma", 200: "omega"},
+
+}
+
+
+def get_psi_levels(level: int, breaks: dict[str, dict[int, str]]):
+  for top_level, psi_val in breaks.items():
+    if level <= top_level:
+      return psi_val
+  return breaks[max(breaks)]
+
+
+spell_elements = {
+    "thunder": "thunder",
+    "giygas_phase2_thunder": "thunder",
+    "giygas_phase3_thunder": "thunder",
+    "giygas_phase4_thunder": "thunder",
+    "crashing_boom_bang": "thunder",
+    "electrical_shock": "thunder",
+    "thunder_minus": "thunder",
+
+    "freeze": "freeze",
+    "giygas_phase2_freeze": "freeze",
+    "giygas_phase3_freeze": "freeze",
+    "giygas_phase4_freeze": "freeze",
+
+    "fire": "fire",
+    "scalding_espresson": "fire",
+    "extinguishing_blast": "fire",
+    "spray_fire": "fire",
+    "breathe_fire": "fire",
+    "flaming_fireball": "fire",
+
+    "flash": "flash",
+    "summon_storm": "flash",
+    "glorious_light": "flash",
+    "giygas_phase2_flash": "flash",
+    "giygas_phase3_flash": "flash",
+    "giygas_phase4_flash": "flash",
+    "flash_minus": "flash",
+
+    "starstorm": "starstorm",
+    "starstorm_minus": "starstorm",
+
+    "special": "special",
+
+    "blast": "explosive",
+    "throw_bomb": "explosive",
+    "throw_bomb_minus": "explosive"
+}
+
+spell_data = {
+    "freeze": {
+        "zeta": [0x62, 0x01, 0x37],
+        "epsilon": [0x63, 0x01, 0x38],
+        "delta": [0x64, 0x01, 0x39],
+        "lambda": [0x65, 0x01, 0x3A],
+        "alpha": [0x12, 0x00, 0x09],
+        "beta": [0x13, 0x00, 0x0A],
+        "gamma": [0x14, 0x00, 0x0B],
+        "omega": [0x15, 0x00, 0x0C]
+    },
+    "fire": {
+        "zeta": [0x60, 0x01, 0x35],
+        "epsilon": [0x61, 0x01, 0x36],
+        "alpha": [0x0E, 0x00, 0x05],
+        "beta": [0x0F, 0x00, 0x06],
+        "gamma": [0x10, 0x00, 0x07],
+        "omega": [0x11, 0x00, 0x08]
+    },
+    "lifeup": {
+        "alpha": [0x20, 0x00, 0x17],
+        "beta": [0x21, 0x00, 0x18]
+    },
+    "flash": {
+        "alpha": [0x1A, 0x00, 0x11],
+        "beta": [0x1B, 0x00, 0x12],
+        "gamma": [0x1C, 0x00, 0x13],
+        "omega": [0x1D, 0x00, 0x14]
+    },
+    "thunder": {
+        "zeta": [0x69, 0x01, 0x3E],
+        "epsilon": [0x6A, 0x01, 0x3F],
+        "delta": [0x6B, 0x01, 0x40],
+        "lambda": [0x6C, 0x01, 0x41],
+        "alpha": [0x16, 0x00, 0x0D],
+        "beta": [0x17, 0x00, 0x0E],
+        "gamma": [0x18, 0x00, 0x0F],
+        "omega": [0x19, 0x00, 0x10]
+    },
+    "special": {
+        "zeta": [0x66, 0x01, 0x3B],
+        "epsilon": [0x67, 0x01, 0x3C],
+        "alpha": [0x0A, 0x00, 0x01],
+        "beta": [0x0B, 0x00, 0x02],
+        "gamma": [0x0C, 0x00, 0x03],
+        "omega": [0x0D, 0x00, 0x04]
+    },
+    "healing": {
+        "alpha": [0x24, 0x00, 0x1B],
+        "beta": [0x25, 0x00, 0x1C],
+        "gamma": [0x26, 0x00, 0x1D],
+        "omega": [0x27, 0x00, 0x1E]
+    },
+    "starstorm": {
+        "zeta": [0x6D, 0x01, 0x42],
+        "epsilon": [0x6E, 0x01, 0x43],
+        "delta": [0x6F, 0x01, 0x44],
+        "lambda": [0x70, 0x01, 0x45],
+        "alpha": [0x1E, 0x00, 0x15],
+        "beta": [0x1F, 0x00, 0x16]
+    },
+    "scatter_spores": {
+        "alpha": [0x3F, 0x01, 0x00],
+        "beta": [0xED, 0x00, 0x00],
+    },
+    "nauseous_breath": {
+        "alpha": [0x4A, 0x00, 0x00],
+        "beta": [0x47, 0x00, 0x00]
+    },
+    "diamond_eyes": {
+        "alpha": [0x40, 0x01, 0x00],
+        "beta": [0x41, 0x01, 0x00],
+        "gamma": [0x44, 0x00, 0x00]
+    },
+    "glorious_light": {
+        "alpha": [0x42, 0x01, 0x00],
+        "beta": [0x43, 0x01, 0x00],
+        "gamma": [0xC9, 0x00, 0x00],
+        "omega": [0x44, 0x01, 0x00],
+    },
+    "flaming_fireball": {
+        "zeta": [0x73, 0x01, 0x00],
+        "epsilon": [0x74, 0x01, 0x00],
+        "alpha": [0x47, 0x01, 0x00],
+        "beta": [0x46, 0x01, 0x00],
+        "gamma": [0x45, 0x01, 0x00],
+        "omega": [0x68, 0x00, 0x00],
+    },
+    "breathe_fire": {
+        "zeta": [0x71, 0x01, 0x00],
+        "epsilon": [0x72, 0x01, 0x00],
+        "alpha": [0x48, 0x01, 0x00],
+        "beta": [0x49, 0x01, 0x00],
+        "gamma": [0x5E, 0x00, 0x00],
+        "omega": [0x4A, 0x01, 0x00],
+    },
+    "spray_fire": {
+        "zeta": [0x75, 0x01, 0x00],
+        "epsilon": [0x76, 0x01, 0x00],
+        "alpha": [0x4B, 0x01, 0x00],
+        "beta": [0x4C, 0x01, 0x00],
+        "gamma": [0x4D, 0x01, 0x00],
+        "omega": [0x5D, 0x00, 0x00],
+    },
+    "paralysis": {
+        "lambda": [0x68, 0x01, 0x3D],
+        "alpha": [0x38, 0x00, 0x2F],
+        "omega": [0x39, 0x00, 0x30]
+    },
+    "poisonous_fangs": {
+        "alpha": [0x4E, 0x01, 0x00],
+        "beta": [0x64, 0x00, 0x00]
+    },
+    "poison_stinger": {
+        "alpha": [0x4F, 0x01, 0x00],
+        "beta": [0x48, 0x00, 0x00]
+    },
+    "crashing_boom_bang": {
+        "zeta": [0x7D, 0x01, 0x00],
+        "epsilon": [0x7E, 0x01, 0x00],
+        "delta": [0x7F, 0x01, 0x00],
+        "lambda": [0x80, 0x01, 0x00],
+        "alpha": [0x50, 0x01, 0x00],
+        "beta": [0x5C, 0x00, 0x00],
+        "gamma": [0x51, 0x01, 0x00],
+        "omega": [0x52, 0x01, 0x00]
+    },
+
+    "electrical_shock": {
+        "zeta": [0x79, 0x01, 0x00],
+        "epsilon": [0x7A, 0x01, 0x00],
+        "delta": [0x7C, 0x01, 0x00],
+        "lambda": [0x7B, 0x01, 0x00],
+        "alpha": [0x53, 0x01, 0x00],
+        "beta": [0xCA, 0x00, 0x00],
+        "gamma": [0x54, 0x01, 0x00],
+        "omega": [0x55, 0x01, 0x00]
+    },
+
+    "scalding_espresso": {
+        "zeta": [0x77, 0x01, 0x00],
+        "epsilon": [0x78, 0x01, 0x00],
+        "alpha": [0x59, 0x00, 0x00],
+        "beta": [0x56, 0x01, 0x00],
+        "gamma": [0x57, 0x01, 0x00],
+        "omega": [0x58, 0x01, 0x00]
+    },
+    "extinguishing_blast": {
+        "zeta": [0x81, 0x01, 0x00],
+        "epsilon": [0x82, 0x01, 0x00],
+        "alpha": [0x59, 0x01, 0x00],
+        "beta": [0x5A, 0x01, 0x00],
+        "gamma": [0x5B, 0x00, 0x00],
+        "omega": [0x5B, 0x01, 0x00]
+    },
+
+    "diamond_bite": {
+        "alpha": [0x5C, 0x01, 0x00],
+        "beta": [0x5D, 0x01, 0x00],
+        "gamma": [0xE4, 0x00, 0x00]
+    },
+    "poison_flute": {
+        "alpha": [0x5E, 0x01, 0x00],
+        "beta": [0xCD, 0x00, 0x00]
+    },
+    "kiss_of_death": {
+        "alpha": [0x5F, 0x01, 0x00],
+        "beta": [0x49, 0x00, 0x00]
+    },
+    "stuffiness_beam": {
+        "alpha": [0xF1, 0x00, 0x00],
+        "beta": [0x45, 0x00, 0x00]
+    },
+    "hacking_cough": {
+        "alpha": [0xD5, 0x00, 0x00],
+        "beta": [0x57, 0x00, 0x00]
+    },
+    "giygas_phase2_thunder": {
+        "zeta": [0x87, 0x01, 0x00],
+        "epsilon": [0x86, 0x01, 0x00],
+        "delta": [0x85, 0x01, 0x00],
+        "lambda": [0x84, 0x01, 0x00],
+        "alpha": [0x83, 0x01, 0x00],
+        "beta": [0x12, 0x01, 0x00]
+    },
+
+    "giygas_phase3_thunder": {
+        "zeta": [0x8C, 0x01, 0x00],
+        "epsilon": [0x8B, 0x01, 0x00],
+        "delta": [0x8A, 0x01, 0x00],
+        "lambda": [0x89, 0x01, 0x00],
+        "alpha": [0x88, 0x01, 0x00],
+        "beta": [0x2E, 0x01, 0x00]
+    },
+
+    "giygas_phase4_thunder": {
+        "zeta": [0x91, 0x01, 0x00],
+        "epsilon": [0x90, 0x01, 0x00],
+        "delta": [0x8F, 0x01, 0x00],
+        "lambda": [0x8E, 0x01, 0x00],
+        "alpha": [0x8D, 0x01, 0x00],
+        "beta": [0x31, 0x01, 0x00]
+    },
+
+
+    "giygas_phase2_freeze": {
+        "zeta": [0x92, 0x01, 0x00],
+        "epsilon": [0x93, 0x01, 0x00],
+        "delta": [0x94, 0x01, 0x00],
+        "lambda": [0x95, 0x01, 0x00],
+        "alpha": [0x2C, 0x01, 0x00]
+    },
+
+    "giygas_phase3_freeze": {
+        "zeta": [0x96, 0x01, 0x00],
+        "epsilon": [0x97, 0x01, 0x00],
+        "delta": [0x98, 0x01, 0x00],
+        "lambda": [0x99, 0x01, 0x00],
+        "alpha": [0x2F, 0x01, 0x00]
+    },
+
+    "giygas_phase4_freeze": {
+        "zeta": [0x9A, 0x01, 0x00],
+        "epsilon": [0x9B, 0x01, 0x00],
+        "delta": [0x9C, 0x01, 0x00],
+        "lambda": [0x9D, 0x01, 0x00],
+        "alpha": [0x32, 0x01, 0x00]
+    },
+
+
+    "giygas_phase2_flash": {
+        "alpha": [0x9E, 0x01, 0x00],
+        "beta": [0x9F, 0x01, 0x00],
+        "gamma": [0x2D, 0x01, 0x00]
+    },
+
+    "giygas_phase3_flash": {
+        "alpha": [0xA0, 0x01, 0x00],
+        "beta": [0xA1, 0x01, 0x00],
+        "gamma": [0x30, 0x01, 0x00]
+    },
+
+    "giygas_phase4_flash": {
+        "alpha": [0xA2, 0x01, 0x00],
+        "beta": [0xA3, 0x01, 0x00],
+        "gamma": [0x33, 0x01, 0x00]
+    },
+    
+    "explosion_damage": {
+        "alpha": [0xA7, 0x00, 0x00],
+        "beta": [0xA3, 0x01, 0x00],
+        "gamma": [0x33, 0x01, 0x00]
+    },
+    "thunder_minus": {
+        "zeta": [0x69, 0x01, 0x3E],
+        "epsilon": [0x6A, 0x01, 0x3F],
+        "delta": [0x6B, 0x01, 0x40],
+        "lambda": [0x6C, 0x01, 0x41],
+        "alpha": [0x16, 0x00, 0x0D],
+        "beta": [0x17, 0x00, 0x0E],
+        "gamma": [0x18, 0x00, 0x0F],
+        "omega": [0x19, 0x00, 0x10]
+    },
+
+    "flash_minus": {
+        "alpha": [0x1A, 0x00, 0x11],
+        "beta": [0x1B, 0x00, 0x12],
+        "gamma": [0x1C, 0x00, 0x13],
+        "omega": [0x1D, 0x00, 0x14]
+    },
+
+    "starstorm_minus": {
+        "zeta": [0x6D, 0x01, 0x42],
+        "epsilon": [0x6E, 0x01, 0x43],
+        "delta": [0x6F, 0x01, 0x44],
+        "lambda": [0x70, 0x01, 0x45],
+        "alpha": [0x1E, 0x00, 0x15],
+        "beta": [0x1F, 0x00, 0x16]
+    },
+    "blast": {
+        "zeta": [0xF7, 0x01, 0x58],
+        "epsilon": [0xF8, 0x01, 0x59],
+        "alpha": [0xA4, 0x01, 0x46],
+        "beta": [0xA5, 0x01, 0x47],
+        "gamma": [0xA6, 0x01, 0x48],
+        "omega": [0xA7, 0x01, 0x48]
+    },
+    "missile": {
+        "zeta": [0xF9, 0x01, 0x5A],
+        "epsilon": [0xFA, 0x01, 0x5B],
+        "alpha": [0xA8, 0x01, 0x4A],
+        "beta": [0xA9, 0x01, 0x4B],
+        "gamma": [0xAA, 0x01, 0x4C],
+        "omega": [0xAB, 0x01, 0x4D]
+    },
+    "summon_storm": {
+        "alpha": [0xF4, 0x01, 0x00],
+        "beta": [0xF5, 0x01, 0x00],
+        "gamma": [0x58, 0x00, 0x00],
+        "omega": [0xF6, 0x01, 0x00]
+    },
+    "throw_bomb": {
+        "zeta": [0xFC, 0x01, 0x00],
+        "epsilon": [0xFB, 0x01, 0x00],
+        "alpha": [0xFD, 0x01, 0x00],
+        "beta": [0xFE, 0x01, 0x00],
+        "gamma": [0xFF, 0x01, 0x00],
+        "omega": [0x00, 0x02, 0x00]
+    },
+
+    "throw_bomb_minus": {
+        "zeta": [0xFC, 0x01, 0x00],
+        "epsilon": [0xFB, 0x01, 0x00],
+        "alpha": [0xFD, 0x01, 0x00],
+        "beta": [0xFE, 0x01, 0x00],
+        "gamma": [0xFF, 0x01, 0x00],
+        "omega": [0x00, 0x02, 0x00]
+    },
+    "shoot_rocket": {
+        "zeta": [0x01, 0x02, 0x00],
+        "epsilon": [0x02, 0x02, 0x00],
+        "alpha": [0x03, 0x02, 0x00],
+        "beta": [0x04, 0x02, 0x00],
+        "gamma": [0x05, 0x02, 0x00],
+        "omega": [0x06, 0x02, 0x00]
+    },
+
+    "paralyzing_pollen": {
+        "lambda": [0x07, 0x02, 0x00],
+        "alpha": [0xCB, 0x00, 0x00],
+        "omega": [0x08, 0x02, 0x00]
+    },
+
+
+}
+
+shield_table = {
+    "disabled": 0x00,
+    "phys_1": 0x03,
+    "phys_2": 0x04,
+    "psi_1": 0x01,
+    "psi_2": 0x02
+}
+
+
+def assumed_player_speed_for_level(level: int) -> int:
+    return 2 + 58 * (level - 1) / 80
+
+
+def scale_enemy_speed(enemy: EarthBoundEnemy, new_level: int) -> int:
+    normal_dodge_chance = (2 * enemy.speed - assumed_player_speed_for_level(enemy.level)) / 500
+
+    enemy_scaled_speed = (normal_dodge_chance * 500 + assumed_player_speed_for_level(new_level)) / 2
+    return enemy_scaled_speed
+
+
+def scale_exp_2(base_exp: int, base_level: int, new_level: int, world: "EarthBoundWorld") -> int:
+    base_scaled_exp = calculate_exp(base_level)
+    scaled_exp = calculate_exp(new_level)
+    new_exp = base_exp * scaled_exp / base_scaled_exp
+    new_exp = max(new_exp, scaled_exp)  # maybe remove? if early scaled
+    new_exp = math.ceil(new_exp * world.options.experience_modifier / 100)
+    return new_exp
+
+
+def calculate_exp(level: int) -> float:
+    if level > 30:
+        return 1000 * math.exp(0.05 * level)
+    else:
+        return 50 * math.exp(0.15 * level)
+        # return 10 * math.exp(0.2 * level) if not boosted
+
+
+def scale_shield(level: int, shield: str | None) -> str:
+    if shield is not None:
+        if level < 10:
+            enemy_shield = "disabled"
+        elif shield in ["phys_1", "phys_2"]:
+            if level < 25:
+                enemy_shield = "phys_1"
+            else:
+                enemy_shield = "phys_2"
+        elif shield in ["psi_1", "psi_2"]:
+            if level < 25:
+                enemy_shield = "psi_1"
+            else:
+                enemy_shield = "psi_2"
+        else:
+            warning(f"Could not scale shield, found initial value of {shield}, this is probably a typo")
+            enemy_shield = "disabled"
+        return enemy_shield
+
+
+guardian_text = [
+    0xEEFAA0,
+    0xEEFAA6,
+    0xEEFAAD,
+    0xEEFAB3,
+    0xEEFABA,
+    0xEEFAC0,
+    0xEEFAC6,
+    0xEEFACE
+]
+
+guardian_intro = {
+    "Giant Step": 0x066699,
+    "Lilliput Steps": 0x2F97CB,
+    "Milky Well": 0x2F67C3,
+    "Rainy Circle": 0x2EFAD6,
+    "Magnet Hill": 0x083D4D,
+    "Pink Cloud": 0x09D2E3,
+    "Lumine Hall": 0x09E2A4,
+    "Fire Spring": 0x2EFADF
+}
+
+
+def scale_enemies(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    additional_party_members = 0
+    if world.options.auto_scale_party_members:
+        if world.starting_character != "Ness":
+            rom.write_bytes(0x15F5FB, bytearray([max(levels[world.scaled_area_order.index(world.Ness_region)] + world.random.randint(-3, 3), 1)]))
+
+        if world.starting_character != "Paula":
+            rom.write_bytes(0x15F60F, bytearray([max(levels[world.scaled_area_order.index(world.Paula_region)] + world.random.randint(-3, 3), 1)]))  # Paula starting level
+
+        if world.starting_character != "Jeff":  
+            rom.write_bytes(0x15F623, bytearray([max(levels[world.scaled_area_order.index(world.Jeff_region)] + world.random.randint(-3, 3), 1)]))  # Jeff starting level
+
+        if world.starting_character != "Poo":
+            rom.write_bytes(0x15F637, bytearray([max(levels[world.scaled_area_order.index(world.Poo_region)] + world.random.randint(-3, 3), 1)]))  # Poo starting level
+
+    melody_number = 1
+    has_badge = False
+    c = Counter([world.Ness_region, world.Paula_region, world.Jeff_region, world.Poo_region])
+    # for region, level in zip(world.scaled_area_order, levels):
+    for region in world.scaled_area_order:
+        level = world.area_levels[region]
+        if world.options.easy_combat:
+            level = max(1, int(level / 2))
+        if region in ["Giant Step", "Lilliput Steps", "Milky Well",
+                      "Rainy Circle", "Magnet Hill", "Pink Cloud",
+                      "Lumine Hall", "Fire Spring"]:
+            rom.write_bytes(guardian_intro[region], struct.pack("I", guardian_text[melody_number - 1]))
+            melody_number += 1
+
+        if region == world.Badge_region:
+            has_badge = True
+
+        additional_party_members += c[region]
+        for enemy in world.regional_enemies[region]:
+            if enemy.is_scaled is False:
+                enemy_hp = int(enemy.hp * level / enemy.level)
+                if not world.options.easy_combat:
+                    enemy_hp = int(enemy_hp + (enemy_hp * (0.10 * (additional_party_members - 1))))
+                enemy_pp = int(enemy.pp * level / enemy.level)
+                enemy_exp = int(scale_exp_2(enemy.exp, enemy.level, level, world))
+                enemy_money = min(65535, int((enemy.money * level / enemy.level) * world.options.money_drop_multiplier))
+                enemy_speed = max(2, int(scale_enemy_speed(enemy, level)))
+                enemy_offense = int(enemy.offense * level / enemy.level)
+                enemy_defense = int(enemy.defense * level / enemy.level)
+                enemy_level = int(enemy.level * level / enemy.level)
+                enemy_shield = scale_shield(level, enemy.shield)
+                rom.write_bytes(enemy.address + 33, enemy_hp.to_bytes(2, "little"))
+                rom.write_bytes(enemy.address + 35, enemy_pp.to_bytes(2, "little"))
+                rom.write_bytes(enemy.address + 37, enemy_exp.to_bytes(4, "little"))
+                rom.write_bytes(enemy.address + 41, enemy_money.to_bytes(2, "little"))
+                rom.write_bytes(enemy.address + 60, enemy_speed.to_bytes(1, "little"))
+                rom.write_bytes(enemy.address + 56, enemy_offense.to_bytes(2, "little"))
+                rom.write_bytes(enemy.address + 58, enemy_defense.to_bytes(2, "little"))
+                rom.write_bytes(enemy.address + 54, enemy_level.to_bytes(1, "little"))
+                if enemy.shield is not None:
+                    rom.write_bytes(enemy.address + 89, shield_table[enemy_shield].to_bytes(1, "little"))
+                
+                if enemy.name in world.enemy_psi:
+                    for index, spell in [(i, s) for i, s in enumerate(world.enemy_psi[enemy.name]) if s != "null"]:
+                        if spell == "special":
+                            spell = world.offensive_psi_slots[0].lower()
+
+                        if spell in spell_elements:
+                            element = spell_elements[spell]
+                        else:
+                            element = "None"
+                        
+                        if element == world.franklin_protection and not has_badge:
+                            spell = f"{spell}_minus"
+                        psi_level = get_psi_levels(level, spell_breaks[spell])
+                        filtered_spell = spell.replace("_minus", "")
+                        rom.write_bytes(enemy.address + 70 + (index * 2), bytearray(spell_data[filtered_spell][psi_level][0:2]))
+                        rom.write_bytes(enemy.address + 80 + index, bytearray([spell_data[filtered_spell][psi_level][2]]))
+                if world.options.shuffle_enemy_drops:
+                    rom.write_bytes(enemy.address + 88, bytearray([world.random.choice(world.filler_drops)]))
+                enemy.is_scaled = True
diff --git a/worlds/earthbound/modules/enemy_shuffler.py b/worlds/earthbound/modules/enemy_shuffler.py
new file mode 100644
index 0000000000..9751cb225c
--- /dev/null
+++ b/worlds/earthbound/modules/enemy_shuffler.py
@@ -0,0 +1,1372 @@
+import struct
+from ..game_data.text_data import text_encoder
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+
+enemy_ids = {
+    "Insane Cultist": 0x01,
+    "Armored Frog": 0x03,
+    "Bad Buffalo": 0x04,
+    "Black Antoid": 0x05,
+    "Red Antoid": 0x06,
+    "Ramblin' Evil Mushroom": 0x07,
+    "Struttin' Evil Mushroom": 0x08,
+    "Mobile Sprout": 0x09,
+    "Tough Mobile Sprout": 0x0a,
+    "Enraged Fire Plug": 0x0b,
+    "Mystical Record": 0x0c,
+    "Atomic Power Robot": 0x0d,
+    "Nuclear Reactor Robot": 0x0e,
+    "Guardian Hieroglyph": 0x0f,
+    "Lethal Asp Hieroglyph": 0x10,
+    "Electro Swoosh": 0x11,
+    "Conducting Menace": 0x12,
+    "Conducting Spirit": 0x13,
+    "Evil Elemental": 0x14,
+    "Annoying Old Party Man": 0x16,
+    "Annoying Reveler": 0x17,
+    "Unassuming Local Guy": 0x18,
+    "New Age Retro Hippie": 0x19,
+    "Mighty Bear": 0x1c,
+    "Mighty Bear Seven": 0x1d,
+    "Putrid Moldyman": 0x1e,
+    "Thunder Mite": 0x1f,
+    "Cranky Lady": 0x20,
+    "Extra Cranky Lady": 0x21,
+    "Wetnosaur": 0x23,
+    "Chomposaur": 0x24,
+    "Gigantic Ant": 0x26,
+    "Scalding Coffee Cup": 0x2b,
+    "Loaded Dice": 0x2c,
+    "Slimy Little Pile": 0x2d,
+    "Even Slimier Little Pile": 0x2e,
+    "Arachnid!": 0x2f,
+    "Arachnid!!!": 0x30,
+    "Kraken": 0x31,
+    "Bionic Kraken": 0x32,
+    "Spinning Robo": 0x33,
+    "Whirling Robo": 0x34,
+    "Hyper Spinning Robo": 0x35,
+    "Cop": 0x36,
+    "Coil Snake": 0x37,
+    "Thirsty Coil Snake": 0x38,
+    "Mr. Batty": 0x39,
+    "Elder Batty": 0x3a,
+    "Violent Roach": 0x3b,
+    "Filthy Attack Roach": 0x3c,
+    "Crazed Sign": 0x3d,
+    "Wooly Shambler": 0x3e,
+    "Wild 'n Wooly Shambler": 0x3f,
+    "Skate Punk": 0x40,
+    "Skelpion": 0x41,
+    "Dread Skelpion": 0x42,
+    "Starman": 0x43,
+    "Starman Super": 0x44,
+    "Ghost of Starman": 0x45,
+    "Smilin' Sphere": 0x46,
+    "Uncontrollable Sphere": 0x47,
+    "Petrified Royal Guard": 0x48,
+    "Final Starman": 0x4b,
+    "Urban Zombie": 0x4c,
+    "Zombie Possessor": 0x4d,
+    "Zombie Dog": 0x4e,
+    "Over Zealous Cop": 0x50,
+    "Territorial Oak": 0x51,
+    "Hostile Elder Oak": 0x52,
+    "Marauder Octobot": 0x54,
+    "Military Octobot": 0x55,
+    "Mechanical Octobot": 0x56,
+    "Ultimate Octobot": 0x57,
+    "Mad Duck": 0x58,
+    "Dali's Clock": 0x59,
+    "Musica": 0x5b,
+    "Desert Wolf": 0x5c,
+    "Big Pile of Puke": 0x5e,
+    "Kiss of Death": 0x60,
+    "French Kiss of Death": 0x61,
+    "Foppy": 0x62,
+    "Fobby": 0x63,
+    "Zap Eel": 0x64,
+    "Tangoo": 0x65,
+    "Squatter Demon": 0x67,
+    "Crested Booka": 0x68,
+    "Great Crested Booka": 0x69,
+    "Lesser Mook": 0x6a,
+    "Mook Senior": 0x6b,
+    "Smelly Ghost": 0x6c,
+    "Stinky Ghost": 0x6d,
+    "Everdred": 0x6e,
+    "Attack Slug": 0x6f,
+    "Pit Bull Slug": 0x70,
+    "Rowdy Mouse": 0x71,
+    "Deadly Mouse": 0x72,
+    "Care Free Bomb": 0x73,
+    "Handsome Tom": 0x75,
+    "Smilin' Sam": 0x76,
+    "Manly Fish": 0x77,
+    "Manly Fish's Brother": 0x78,
+    "Runaway Dog": 0x79,
+    "Trick or Trick Kid": 0x7a,
+    "Abstract Art": 0x7c,
+    "Shattered Man": 0x7d,
+    "Fierce Shattered Man": 0x7e,
+    "Ego Orb": 0x7f,
+    "Yes Man Junior": 0x81,
+    "Frank": 0x83,
+    "Cute Li'l UFO": 0x84,
+    "Beautiful UFO": 0x85,
+    "Pogo Punk": 0x86,
+    "Tough Guy": 0x87,
+    "Mad Taxi": 0x88,
+    "Mr. Molecule": 0x8a,
+    "Worthless Protoplasm": 0x8b,
+    "Sentry Robot": 0x8c,
+    "Psychic Psycho": 0x8e,
+    "Major Psychic Psycho": 0x8f,
+    "Mole Playing Rough": 0x90,
+    "Gruff Goat": 0x91,
+    "Clumsy Robot": 0x92,
+    "Soul Consuming Flame": 0x93,
+    "Demonic Petunia": 0x94,
+    "Ranboob": 0x95,
+    "Li'l UFO": 0x96,
+    "High-class UFO": 0x97,
+    "Noose Man": 0x98,
+    "Robo-pump": 0x99,
+    "Plain Crocodile": 0x9a,
+    "Strong Crocodile": 0x9b,
+    "Hard Crocodile": 0x9c,
+    "No Good Fly": 0x9d,
+    "Mostly Bad Fly": 0x9e,
+    "Spiteful Crow": 0x9f,
+    "Loaded Dice 2": 0xC3,
+    "Black Antoid (2)": 0xD1,
+    "Cave Boy": 0x7B,
+    "Farm Zombie": 0xde,
+    "Criminal Caterpillar": 0xdf,
+    "Evil Eye": 0xe0,
+    "Master Criminal Worm": 0xe3
+}
+
+base_enemy_table = [
+    "Insane Cultist",
+    "Armored Frog",
+    "Bad Buffalo",
+    "Black Antoid",
+    "Red Antoid",
+    "Ramblin' Evil Mushroom",
+    "Struttin' Evil Mushroom",
+    "Mobile Sprout",
+    "Tough Mobile Sprout",
+    "Enraged Fire Plug",
+    "Mystical Record",
+    "Atomic Power Robot",
+    "Nuclear Reactor Robot",
+    "Guardian Hieroglyph",
+    "Lethal Asp Hieroglyph",
+    "Electro Swoosh",
+    "Conducting Menace",
+    "Conducting Spirit",
+    "Evil Elemental",
+    "Annoying Old Party Man",
+    "Annoying Reveler",
+    "Unassuming Local Guy",
+    "New Age Retro Hippie",
+    "Mighty Bear",
+    "Mighty Bear Seven",
+    "Putrid Moldyman",
+    "Thunder Mite",
+    "Cranky Lady",
+    "Extra Cranky Lady",
+    "Wetnosaur",
+    "Chomposaur",
+    "Gigantic Ant",
+    "Scalding Coffee Cup",
+    "Loaded Dice",
+    "Slimy Little Pile",
+    "Even Slimier Little Pile",
+    "Arachnid!",
+    "Arachnid!!!",
+    "Bionic Kraken",
+    "Spinning Robo",
+    "Whirling Robo",
+    "Hyper Spinning Robo",
+    "Cop",
+    "Coil Snake",
+    "Thirsty Coil Snake",
+    "Mr. Batty",
+    "Elder Batty",
+    "Violent Roach",
+    "Filthy Attack Roach",
+    "Crazed Sign",
+    "Wooly Shambler",
+    "Wild 'n Wooly Shambler",
+    "Skate Punk",
+    "Skelpion",
+    "Dread Skelpion",
+    "Starman",
+    "Starman Super",
+    "Ghost of Starman",
+    "Smilin' Sphere",
+    "Uncontrollable Sphere",
+    "Petrified Royal Guard",
+    "Final Starman",
+    "Urban Zombie",
+    "Zombie Possessor",
+    "Zombie Dog",
+    "Over Zealous Cop",
+    "Territorial Oak",
+    "Hostile Elder Oak",
+    "Marauder Octobot",
+    "Military Octobot",
+    "Mechanical Octobot",
+    "Ultimate Octobot",
+    "Mad Duck",
+    "Dali's Clock",
+    "Musica",
+    "Desert Wolf",
+    "Big Pile of Puke",
+    "Kiss of Death",
+    "French Kiss of Death",
+    "Foppy",
+    "Fobby",
+    "Zap Eel",
+    "Tangoo",
+    "Squatter Demon",
+    "Crested Booka",
+    "Great Crested Booka",
+    "Lesser Mook",
+    "Mook Senior",
+    "Smelly Ghost",
+    "Stinky Ghost",
+    "Attack Slug",
+    "Pit Bull Slug",
+    "Rowdy Mouse",
+    "Deadly Mouse",
+    "Care Free Bomb",
+    "Handsome Tom",
+    "Smilin' Sam",
+    "Manly Fish",
+    "Manly Fish's Brother",
+    "Runaway Dog",
+    "Trick or Trick Kid",
+    "Abstract Art",
+    "Shattered Man",
+    "Fierce Shattered Man",
+    "Ego Orb",
+    "Yes Man Junior",
+    "Cute Li'l UFO",
+    "Beautiful UFO",
+    "Pogo Punk",
+    "Tough Guy",
+    "Mad Taxi",
+    "Mr. Molecule",
+    "Worthless Protoplasm",
+    "Sentry Robot",
+    "Psychic Psycho",
+    "Major Psychic Psycho",
+    "Mole Playing Rough",
+    "Gruff Goat",
+    "Soul Consuming Flame",
+    "Demonic Petunia",
+    "Ranboob",
+    "Li'l UFO",
+    "High-class UFO",
+    "Noose Man",
+    "Robo-pump",
+    "Plain Crocodile",
+    "Strong Crocodile",
+    "Hard Crocodile",
+    "No Good Fly",
+    "Mostly Bad Fly",
+    "Spiteful Crow",
+    "Black Antoid (2)",
+    "Struttin' Evil Mushroom",
+    "Cave Boy",
+    "Farm Zombie",
+    "Criminal Caterpillar",
+    "Evil Eye",
+    "Master Criminal Worm",
+    "Loaded Dice 2"
+]
+
+enemy_descriptions = {
+    "Insane Cultist": "@They are friendly if you give them blue gifts.",
+    "Armored Frog": "@Their hard shell makes them very resistant.",
+    "Bad Buffalo": "@It really is a bad kind of buffalo.",
+    "Black Antoid": "@Be careful not to step on him.",
+    "Black Antoid (2)": "@Be careful not to step on him.",
+    "Red Antoid": "@Collectors dig that bright red hue.",
+    "Ramblin' Evil Mushroom": "@He is a really fun guy.",
+    "Struttin' Evil Mushroom": "@Watch the spores!",
+    "Mobile Sprout": "@The next evolution of plant.",
+    "Tough Mobile Sprout": "@This plant is actually made of stainless steel.",
+    "Enraged Fire Plug": "@A little hot-tempered.",
+    "Mystical Record": "@It has all your least favorite songs.",
+    "Atomic Power Robot": "@Handle with care!",
+    "Nuclear Reactor Robot": "@Handle with care!",
+    "Guardian Hieroglyph": "@I found him at the Pyramid north of here.",
+    "Lethal Asp Hieroglyph": "@I found him at the Pyramid north of here.",
+    "Electro Swoosh": "@Don't stare directly at it.",
+    "Conducting Menace": "@Shield your eyes from his light.",
+    "Conducting Spirit": "@Shield your eyes from his light.",
+    "Evil Elemental": "@What is the element of evil?",
+    "Annoying Old Party Man": "@He really knows how to throw a good party.",
+    "Annoying Reveler": "@This is my friend, Dave.",
+    "Unassuming Local Guy": "@What is he so unassuming about?",
+    "New Age Retro Hippie": "@I like him better than the Old Age Modern Urbanite.",
+    "Mighty Bear": "@He's stronger than the average bear.",
+    "Mighty Bear Seven": "@I wonder what happened to two through six?",
+    "Putrid Moldyman": "@I think this one's kinda cute.",
+    "Thunder Mite": "@He mite rain on your parade.",
+    "Cranky Lady": "@There aren't enough stores in the desert.",
+    "Extra Cranky Lady": "@There aren't enough stores in the desert.",
+    "Wetnosaur": "@Reminds me of a fossil I saw once.",
+    "Chomposaur": "@Reminds me of a fossil I saw once.",
+    "Gigantic Ant": "@No relation to the Titanic Ant.",
+    "Scalding Coffee Cup": "@It's a little too hot for me.",
+    "Loaded Dice": "@Always fun at parties.",
+    "Even Slimier Little Pile": "@Smells worse than the Slimy Little Pile.",
+    "Arachnid!": "@I think he just lives here.",
+    "Arachnid!!!": "@How did it get the extra exclamation points?",
+    "Bionic Kraken": "@The bionics make better soup.",
+    "Spinning Robo": "@Look at it go!",
+    "Whirling Robo": "@Look at it go!",
+    "Hyper Spinning Robo": "@Look at it go!",
+    "Cop": "@He said I wasn't paying taxes.",
+    "Coil Snake": "@Not a tool for modding.",
+    "Thirsty Coil Snake": "@What could he be thirsting for?",
+    "Mr. Batty": "@They make for good pets if you're careful.",
+    "Elder Batty": "@They make for good pets if you're careful.",
+    "Violent Roach": "@They make for good pets.",
+    "Filthy Attack Roach": "@They make for good pets.",
+    "Crazed Sign": "@That actually seems like a pretty reasonable speed limit.",
+    "Wooly Shambler": "@These are not actually Earth sheep.",
+    "Wild 'n Wooly Shambler": "@These are not actually Earth sheep.",
+    "Skate Punk": "@I saw him do a sick flip once.",
+    "Skelpion": "@How can scorpions shoot lightning?",
+    "Dread Skelpion": "@How can scorpions shoot lightning?",
+    "Starman": "@Famous for their fan-made websites.",
+    "Starman Super": "@My own personal sword farm.",
+    "Ghost of Starman": "@Are Starmen aliens or robots, anyways?",
+    "Smilin' Sphere": "@I don't like how it smiles at me.",
+    "Uncontrollable Sphere": "@Fortunately, these ones are controlled",
+    "Petrified Royal Guard": "@He isn't guarding this place.",
+    "Final Starman": "@Watch yourself around this one.",
+    "Urban Zombie": "@An import from the big city.",
+    "Zombie Possessor": "@Did you hear something just now?",
+    "Zombie Dog": "@He's more dog than zombie.",
+    "Over Zealous Cop": "@He is overstaying his welcome.",
+    "Territorial Oak": "@Don't worry, this one is just a model.",
+    "Hostile Elder Oak": "@Don't worry, this one is just a model.",
+    "Marauder Octobot": "@Watch out for your valuables!",
+    "Military Octobot": "@Watch out for your valuables!",
+    "Mechanical Octobot": "@Watch out for your valuables!",
+    "Ultimate Octobot": "@Watch out for your valuables!",
+    "Dali's Clock": "@I can never tell what time he's showing.",
+    "Musica": "@His soothing music puts me to sleep.",
+    "Desert Wolf": "@He is a surprisingly good pet.",
+    "Big Pile of Puke": "@How did this one get in here?",
+    "Kiss of Death": "@Despite the name, I wouldn't recommend kissing it.",
+    "French Kiss of Death": "@Despite the name, I wouldn't recommend kissing it.",
+    "Foppy": "@I can't even tell what this thing is.",
+    "Fobby": "@I wonder what color they are?",
+    "Zap Eel": "@How can eels live on land, anyway?",
+    "Tangoo": "@Watch out for his poisonous breath.",
+    "Squatter Demon": "@I don't know what to say about this one.",
+    "Crested Booka": "@The classic desert animal.",
+    "Great Crested Booka": "@The classic desert animal.",
+    "Lesser Mook": "@These aliens live here.",
+    "Mook Senior": "@These aliens live here.",
+    "Smelly Ghost": "@This exhibit needs some air freshener.",
+    "Stinky Ghost": "@This exhibit needs some air freshener.",
+    "Attack Slug": "@Cute when alone.",
+    "Pit Bull Slug": "@It is neither pit bull nor slug.",
+    "Rowdy Mouse": "@They're good pets if you don't let them SMAAAASH you.",
+    "Deadly Mouse": "@They're good pets if you don't let them SMAAAASH you.",
+    "Care Free Bomb": "@Don't get too close!",
+    "Handsome Tom": "@Not really all that handsome.",
+    "Smilin' Sam": "@He usually doesn't smile.",
+    "Manly Fish": "@Not related to Manly Fish's Brother.",
+    "Manly Fish's Brother": "@They are not actually related.",
+    "Runaway Dog": "@Don't worry, this one is adopted.",
+    "Trick or Trick Kid": "@He likes to play Clique.",
+    "Cave Boy": "@Not quite a Cave Man.",
+    "Abstract Art": "@Looks good in any gallery.",
+    "Shattered Man": "@He doesn't look so shattered to me.",
+    "Fierce Shattered Man": "@He doesn't look so shattered to me.",
+    "Ego Orb": "@I'll get back to you on that one.",
+    "Yes Man Junior": "@Not that bad of a guy.",
+    "Cute Li'l UFO": "@The ribbon is actually biological.",
+    "Beautiful UFO": "@Personally, I'm a bigger fan of the Li'l UFO.",
+    "Pogo Punk": "@He knows some sick tricks.",
+    "Tough Guy": "@Likes to chew gum and kick butt.",
+    "Mad Taxi": "@It has surprisingly good mental health.",
+    "Mr. Molecule": "@His whole family is here.",
+    "Worthless Protoplasm": "@He's actually kind of worthwhile.",
+    "Sentry Robot": "@Built by a crafty engineer.",
+    "Psychic Psycho": "@Watch out for Fire attacks!",
+    "Major Psychic Psycho": "@Watch out for Fire attacks!",
+    "Mole Playing Rough": "@They like to show up in the most random places.",
+    "Soul Consuming Flame": "@This one can't affect me.",
+    "Demonic Petunia": "@Looks beautiful from a distance.",
+    "Ranboob": "@Yeah I've got nothing to say on this one.",
+    "Li'l UFO": "@Personally, I'm a bigger fan of the High-class UFO.",
+    "High-class UFO": "@Personally, I'm a bigger fan of the Beautiful UFO.",
+    "Noose Man": "@How was this approved for a family game?",
+    "Robo-pump": "@It causes fires more than it puts them out.",
+    "Plain Crocodile": "@Also known as the vanilla crocodile.",
+    "Strong Crocodile": "@Stronger than the weak crocodile",
+    "Hard Crocodile": "@Slightly harder than the soft crocodile.",
+    "No Good Fly": "@They are often mistaken for bees.",
+    "Mostly Bad Fly": "@He's not all bad.",
+    "Spiteful Crow": "@Keep your valuables in your pocket!",
+    "Farm Zombie": "@Easily subdued by plants.",
+    "Criminal Caterpillar": "@He is wanted in seventeen countries for his crimes.",
+    "Evil Eye": "@Third-year staring contest champion.",
+    "Master Criminal Worm": "@He is wanted in seventeen countries for his crimes.",
+    "Loaded Dice 2": "@Always dangerous at parties.",
+}
+
+can_walkthrough = [
+    0x0045,
+    0x004A,
+    0x0065,
+    0x00C3,
+    0x0112,
+    0x0114,
+    0x0115,
+    0x0116,
+    0x0117,
+    0x0118,
+    0x011A,
+    0x011B,
+    0x011C,
+    0x011D,
+    0x011E,
+    0x011F,
+    0x0120,
+    0x0123,
+    0x0124,
+    0x012D,
+    0x012E,
+    0x012F,
+    0x0130,
+    0x0131,
+    0x0132,
+    0x0133,
+    0x0134,
+    0x0135,
+    0x0136,
+    0x0139,
+    0x013A,
+    0x013B,
+    0x013C,
+    0x013D,
+    0x013E,
+    0x013F,
+    0x0140,
+    0x0142,
+    0x0143,
+    0x0144,
+    0x0145,
+    0x0146,
+    0x0169,
+    0x0182,
+    0x0185,
+    0x0186,
+    0x0187,
+    0x0188,
+    0x019F,
+    0x01A0,
+    0x01A1,
+    0x01BC,
+    0x01CD
+]
+
+
+def shuffle_enemies(world: "EarthBoundWorld") -> None:
+    """Shuffles the global enemy table."""
+    world.acting_enemy_list = {}
+    shuffled_enemies = base_enemy_table.copy()
+    if world.options.enemy_shuffle:
+        world.random.shuffle(shuffled_enemies)
+    for index, enemy in enumerate(shuffled_enemies):
+        world.acting_enemy_list[base_enemy_table[index]] = enemy
+
+
+def apply_enemy_shuffle(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    """Writes the shuffled enemy table into ROM."""
+    rom.write_bytes(0x10d54d, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10d551, bytearray([enemy_ids[world.acting_enemy_list["Runaway Dog"]]]))
+    rom.write_bytes(0x10d555, bytearray([enemy_ids[world.acting_enemy_list["Coil Snake"]]]))
+    rom.write_bytes(0x10d559, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10d55c, bytearray([enemy_ids[world.acting_enemy_list["Evil Eye"]]]))
+    rom.write_bytes(0x10d567, bytearray([enemy_ids[world.acting_enemy_list["Evil Eye"]]]))
+    rom.write_bytes(0x10d56a, bytearray([enemy_ids[world.acting_enemy_list["Mechanical Octobot"]]]))
+    rom.write_bytes(0x10d56e, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10d571, bytearray([enemy_ids[world.acting_enemy_list["Mechanical Octobot"]]]))
+    rom.write_bytes(0x10d574, bytearray([enemy_ids[world.acting_enemy_list["Evil Eye"]]]))
+    rom.write_bytes(0x10d578, bytearray([enemy_ids[world.acting_enemy_list["Skate Punk"]]]))
+    rom.write_bytes(0x10d57b, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10d57e, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10d582, bytearray([enemy_ids[world.acting_enemy_list["Skate Punk"]]]))
+    rom.write_bytes(0x10d585, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10d588, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10d58c, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10d58f, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10d593, bytearray([enemy_ids[world.acting_enemy_list["Skate Punk"]]]))
+    rom.write_bytes(0x10d596, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10d599, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10d5a1, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10d5a9, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5ac, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5b0, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5b3, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5b7, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5ba, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5be, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5c1, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5c4, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5c8, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10d5cc, bytearray([enemy_ids[world.acting_enemy_list["Gruff Goat"]]]))
+    rom.write_bytes(0x10d5d4, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5d7, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5db, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5de, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5e2, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5e5, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5e9, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10d5ec, bytearray([enemy_ids[world.acting_enemy_list["Wooly Shambler"]]]))
+    rom.write_bytes(0x10d5ef, bytearray([enemy_ids[world.acting_enemy_list["Whirling Robo"]]]))
+    rom.write_bytes(0x10d5f7, bytearray([enemy_ids[world.acting_enemy_list["Cave Boy"]]]))
+    rom.write_bytes(0x10d5fa, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear Seven"]]]))
+    rom.write_bytes(0x10d5fe, bytearray([enemy_ids[world.acting_enemy_list["Cave Boy"]]]))
+    rom.write_bytes(0x10d601, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear Seven"]]]))
+    rom.write_bytes(0x10d605, bytearray([enemy_ids[world.acting_enemy_list["Cave Boy"]]]))
+    rom.write_bytes(0x10d608, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear Seven"]]]))
+    rom.write_bytes(0x10d60c, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d610, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d614, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d618, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d61b, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d61f, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d623, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d627, bytearray([enemy_ids[world.acting_enemy_list["Runaway Dog"]]]))
+    rom.write_bytes(0x10d62a, bytearray([enemy_ids[world.acting_enemy_list["Cop"]]]))
+    rom.write_bytes(0x10d62e, bytearray([enemy_ids[world.acting_enemy_list["Cranky Lady"]]]))
+    rom.write_bytes(0x10d632, bytearray([enemy_ids[world.acting_enemy_list["Annoying Old Party Man"]]]))
+    rom.write_bytes(0x10d636, bytearray([enemy_ids[world.acting_enemy_list["Unassuming Local Guy"]]]))
+    rom.write_bytes(0x10d63a, bytearray([enemy_ids[world.acting_enemy_list["New Age Retro Hippie"]]]))
+    rom.write_bytes(0x10d63e, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d641, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d645, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d649, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d64c, bytearray([enemy_ids[world.acting_enemy_list["Territorial Oak"]]]))
+    rom.write_bytes(0x10d650, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d653, bytearray([enemy_ids[world.acting_enemy_list["Territorial Oak"]]]))
+    rom.write_bytes(0x10d657, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d65a, bytearray([enemy_ids[world.acting_enemy_list["Li'l UFO"]]]))
+    rom.write_bytes(0x10d65e, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d662, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d666, bytearray([enemy_ids[world.acting_enemy_list["Territorial Oak"]]]))
+    rom.write_bytes(0x10d66a, bytearray([enemy_ids[world.acting_enemy_list["Spinning Robo"]]]))
+    rom.write_bytes(0x10d66e, bytearray([enemy_ids[world.acting_enemy_list["Li'l UFO"]]]))
+    rom.write_bytes(0x10d672, bytearray([enemy_ids[world.acting_enemy_list["Li'l UFO"]]]))
+    rom.write_bytes(0x10d675, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10d679, bytearray([enemy_ids[world.acting_enemy_list["Li'l UFO"]]]))
+    rom.write_bytes(0x10d67c, bytearray([enemy_ids[world.acting_enemy_list["Spinning Robo"]]]))
+    rom.write_bytes(0x10d680, bytearray([enemy_ids[world.acting_enemy_list["Li'l UFO"]]]))
+    rom.write_bytes(0x10d684, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10d688, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10d68c, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10d690, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10d694, bytearray([enemy_ids[world.acting_enemy_list["Cranky Lady"]]]))
+    rom.write_bytes(0x10d698, bytearray([enemy_ids[world.acting_enemy_list["Annoying Old Party Man"]]]))
+    rom.write_bytes(0x10d69c, bytearray([enemy_ids[world.acting_enemy_list["New Age Retro Hippie"]]]))
+    rom.write_bytes(0x10d6a0, bytearray([enemy_ids[world.acting_enemy_list["Trick or Trick Kid"]]]))
+    rom.write_bytes(0x10d6a3, bytearray([enemy_ids[world.acting_enemy_list["Handsome Tom"]]]))
+    rom.write_bytes(0x10d6a7, bytearray([enemy_ids[world.acting_enemy_list["Trick or Trick Kid"]]]))
+    rom.write_bytes(0x10d6ab, bytearray([enemy_ids[world.acting_enemy_list["Handsome Tom"]]]))
+    rom.write_bytes(0x10d6ae, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sam"]]]))
+    rom.write_bytes(0x10d6b2, bytearray([enemy_ids[world.acting_enemy_list["Handsome Tom"]]]))
+    rom.write_bytes(0x10d6b6, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sam"]]]))
+    rom.write_bytes(0x10d6ba, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10d6be, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10d6c1, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10d6c5, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10d6c8, bytearray([enemy_ids[world.acting_enemy_list["Putrid Moldyman"]]]))
+    rom.write_bytes(0x10d6cc, bytearray([enemy_ids[world.acting_enemy_list["Putrid Moldyman"]]]))
+    rom.write_bytes(0x10d6cf, bytearray([enemy_ids[world.acting_enemy_list["Smelly Ghost"]]]))
+    rom.write_bytes(0x10d6d3, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10d6d6, bytearray([enemy_ids[world.acting_enemy_list["Putrid Moldyman"]]]))
+    rom.write_bytes(0x10d6da, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10d6dd, bytearray([enemy_ids[world.acting_enemy_list["Smelly Ghost"]]]))
+    rom.write_bytes(0x10d6e1, bytearray([enemy_ids[world.acting_enemy_list["Putrid Moldyman"]]]))
+    rom.write_bytes(0x10d6e4, bytearray([enemy_ids[world.acting_enemy_list["Smelly Ghost"]]]))
+    rom.write_bytes(0x10d6e8, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10d6eb, bytearray([enemy_ids[world.acting_enemy_list["Putrid Moldyman"]]]))
+    rom.write_bytes(0x10d6ef, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10d6f2, bytearray([enemy_ids[world.acting_enemy_list["Smelly Ghost"]]]))
+    rom.write_bytes(0x10d6f6, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10d6fa, bytearray([enemy_ids[world.acting_enemy_list["Zombie Dog"]]]))
+    rom.write_bytes(0x10d6fe, bytearray([enemy_ids[world.acting_enemy_list["Zombie Dog"]]]))
+    rom.write_bytes(0x10d701, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10d705, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d70c, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d713, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d716, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d719, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d71d, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d720, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d724, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d727, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d72b, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d72e, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d732, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d735, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d739, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d73d, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d740, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d744, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d747, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d74b, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d74e, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d751, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d755, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d758, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d75c, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d75f, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10d763, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d769, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d76d, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d770, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid (2)"]]]))
+    rom.write_bytes(0x10d766, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid (2)"]]]))
+    rom.write_bytes(0x10d774, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d777, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid (2)"]]]))
+    rom.write_bytes(0x10d77b, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d77e, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d781, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d785, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d788, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d78c, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d78f, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d793, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d796, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d79a, bytearray([enemy_ids[world.acting_enemy_list["Red Antoid"]]]))
+    rom.write_bytes(0x10d79d, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d7a1, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d7a5, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d7a9, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d7ac, bytearray([enemy_ids[world.acting_enemy_list["Armored Frog"]]]))
+    rom.write_bytes(0x10d7b0, bytearray([enemy_ids[world.acting_enemy_list["Plain Crocodile"]]]))
+    rom.write_bytes(0x10d7b4, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10d7b8, bytearray([enemy_ids[world.acting_enemy_list["Violent Roach"]]]))
+    rom.write_bytes(0x10d7bc, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10d7c0, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10d7c3, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10d7c7, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10d7cb, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10d7ce, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10d7d1, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10d7d5, bytearray([enemy_ids[world.acting_enemy_list["Bad Buffalo"]]]))
+    rom.write_bytes(0x10d7d8, bytearray([enemy_ids[world.acting_enemy_list["Desert Wolf"]]]))
+    rom.write_bytes(0x10d7dc, bytearray([enemy_ids[world.acting_enemy_list["Bad Buffalo"]]]))
+    rom.write_bytes(0x10d7df, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sphere"]]]))
+    rom.write_bytes(0x10d7e3, bytearray([enemy_ids[world.acting_enemy_list["Bad Buffalo"]]]))
+    rom.write_bytes(0x10d7e7, bytearray([enemy_ids[world.acting_enemy_list["Desert Wolf"]]]))
+    rom.write_bytes(0x10d7eb, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d7ee, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10d7f2, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d7f5, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sphere"]]]))
+    rom.write_bytes(0x10d7f9, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d7fc, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sphere"]]]))
+    rom.write_bytes(0x10d7ff, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10d803, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d806, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d80a, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d80e, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10d812, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d815, bytearray([enemy_ids[world.acting_enemy_list["Bad Buffalo"]]]))
+    rom.write_bytes(0x10d819, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d81c, bytearray([enemy_ids[world.acting_enemy_list["Desert Wolf"]]]))
+    rom.write_bytes(0x10d820, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d823, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10d826, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sphere"]]]))
+    rom.write_bytes(0x10d82a, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d82d, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10d831, bytearray([enemy_ids[world.acting_enemy_list["Crested Booka"]]]))
+    rom.write_bytes(0x10d834, bytearray([enemy_ids[world.acting_enemy_list["Smilin' Sphere"]]]))
+    rom.write_bytes(0x10d838, bytearray([enemy_ids[world.acting_enemy_list["Mad Taxi"]]]))
+    rom.write_bytes(0x10d83c, bytearray([enemy_ids[world.acting_enemy_list["Extra Cranky Lady"]]]))
+    rom.write_bytes(0x10d840, bytearray([enemy_ids[world.acting_enemy_list["Annoying Reveler"]]]))
+    rom.write_bytes(0x10d844, bytearray([enemy_ids[world.acting_enemy_list["Crazed Sign"]]]))
+    rom.write_bytes(0x10d848, bytearray([enemy_ids[world.acting_enemy_list["Dali's Clock"]]]))
+    rom.write_bytes(0x10d84c, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10d850, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10d854, bytearray([enemy_ids[world.acting_enemy_list["Abstract Art"]]]))
+    rom.write_bytes(0x10d858, bytearray([enemy_ids[world.acting_enemy_list["Robo-pump"]]]))
+    rom.write_bytes(0x10d85c, bytearray([enemy_ids[world.acting_enemy_list["Robo-pump"]]]))
+    rom.write_bytes(0x10d85f, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10d863, bytearray([enemy_ids[world.acting_enemy_list["Mad Taxi"]]]))
+    rom.write_bytes(0x10d867, bytearray([enemy_ids[world.acting_enemy_list["Mad Taxi"]]]))
+    rom.write_bytes(0x10d86a, bytearray([enemy_ids[world.acting_enemy_list["Crazed Sign"]]]))
+    rom.write_bytes(0x10d86e, bytearray([enemy_ids[world.acting_enemy_list["Crazed Sign"]]]))
+    rom.write_bytes(0x10d872, bytearray([enemy_ids[world.acting_enemy_list["Tough Guy"]]]))
+    rom.write_bytes(0x10d876, bytearray([enemy_ids[world.acting_enemy_list["Over Zealous Cop"]]]))
+    rom.write_bytes(0x10d879, bytearray([enemy_ids[world.acting_enemy_list["Tough Guy"]]]))
+    rom.write_bytes(0x10d87d, bytearray([enemy_ids[world.acting_enemy_list["Over Zealous Cop"]]]))
+    rom.write_bytes(0x10d881, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d884, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d888, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d88c, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d890, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d894, bytearray([enemy_ids[world.acting_enemy_list["Dread Skelpion"]]]))
+    rom.write_bytes(0x10d897, bytearray([enemy_ids[world.acting_enemy_list["Great Crested Booka"]]]))
+    rom.write_bytes(0x10d89b, bytearray([enemy_ids[world.acting_enemy_list["Dread Skelpion"]]]))
+    rom.write_bytes(0x10d89f, bytearray([enemy_ids[world.acting_enemy_list["Great Crested Booka"]]]))
+    rom.write_bytes(0x10d8a3, bytearray([enemy_ids[world.acting_enemy_list["Great Crested Booka"]]]))
+    rom.write_bytes(0x10d8a6, bytearray([enemy_ids[world.acting_enemy_list["Dread Skelpion"]]]))
+    rom.write_bytes(0x10d8aa, bytearray([enemy_ids[world.acting_enemy_list["Great Crested Booka"]]]))
+    rom.write_bytes(0x10d8ae, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d8b1, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d8b5, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d8b8, bytearray([enemy_ids[world.acting_enemy_list["Marauder Octobot"]]]))
+    rom.write_bytes(0x10d8bb, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d8bf, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+    rom.write_bytes(0x10d8c2, bytearray([enemy_ids[world.acting_enemy_list["Marauder Octobot"]]]))
+    rom.write_bytes(0x10d8c6, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d8ca, bytearray([enemy_ids[world.acting_enemy_list["Marauder Octobot"]]]))
+    rom.write_bytes(0x10d8ce, bytearray([enemy_ids[world.acting_enemy_list["Hostile Elder Oak"]]]))
+    rom.write_bytes(0x10d8d2, bytearray([enemy_ids[world.acting_enemy_list["Pit Bull Slug"]]]))
+    rom.write_bytes(0x10d8d6, bytearray([enemy_ids[world.acting_enemy_list["Demonic Petunia"]]]))
+    rom.write_bytes(0x10d8da, bytearray([enemy_ids[world.acting_enemy_list["Big Pile of Puke"]]]))
+    rom.write_bytes(0x10d8dd, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+    rom.write_bytes(0x10d8e1, bytearray([enemy_ids[world.acting_enemy_list["Big Pile of Puke"]]]))
+    rom.write_bytes(0x10d8e4, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+    rom.write_bytes(0x10d8e8, bytearray([enemy_ids[world.acting_enemy_list["Hostile Elder Oak"]]]))
+    rom.write_bytes(0x10d8ec, bytearray([enemy_ids[world.acting_enemy_list["Zap Eel"]]]))
+    rom.write_bytes(0x10d8ef, bytearray([enemy_ids[world.acting_enemy_list["Hard Crocodile"]]]))
+    rom.write_bytes(0x10d8f3, bytearray([enemy_ids[world.acting_enemy_list["Zap Eel"]]]))
+    rom.write_bytes(0x10d8f7, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+    rom.write_bytes(0x10d8fa, bytearray([enemy_ids[world.acting_enemy_list["Zap Eel"]]]))
+    rom.write_bytes(0x10d8fe, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+    rom.write_bytes(0x10d901, bytearray([enemy_ids[world.acting_enemy_list["Hard Crocodile"]]]))
+    rom.write_bytes(0x10d905, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+    rom.write_bytes(0x10d908, bytearray([enemy_ids[world.acting_enemy_list["Manly Fish"]]]))
+    rom.write_bytes(0x10d90c, bytearray([enemy_ids[world.acting_enemy_list["Manly Fish"]]]))
+    rom.write_bytes(0x10d90f, bytearray([enemy_ids[world.acting_enemy_list["Hard Crocodile"]]]))
+    rom.write_bytes(0x10d913, bytearray([enemy_ids[world.acting_enemy_list["Manly Fish"]]]))
+    rom.write_bytes(0x10d916, bytearray([enemy_ids[world.acting_enemy_list["Manly Fish's Brother"]]]))
+    rom.write_bytes(0x10d91a, bytearray([enemy_ids[world.acting_enemy_list["Pit Bull Slug"]]]))
+    rom.write_bytes(0x10d91e, bytearray([enemy_ids[world.acting_enemy_list["Demonic Petunia"]]]))
+    rom.write_bytes(0x10d922, bytearray([enemy_ids[world.acting_enemy_list["Demonic Petunia"]]]))
+    rom.write_bytes(0x10d925, bytearray([enemy_ids[world.acting_enemy_list["Hostile Elder Oak"]]]))
+    rom.write_bytes(0x10d929, bytearray([enemy_ids[world.acting_enemy_list["Wetnosaur"]]]))
+    rom.write_bytes(0x10d92d, bytearray([enemy_ids[world.acting_enemy_list["Chomposaur"]]]))
+    rom.write_bytes(0x10d931, bytearray([enemy_ids[world.acting_enemy_list["Ego Orb"]]]))
+    rom.write_bytes(0x10d935, bytearray([enemy_ids[world.acting_enemy_list["Care Free Bomb"]]]))
+    rom.write_bytes(0x10d938, bytearray([enemy_ids[world.acting_enemy_list["Mr. Molecule"]]]))
+    rom.write_bytes(0x10d93c, bytearray([enemy_ids[world.acting_enemy_list["Care Free Bomb"]]]))
+    rom.write_bytes(0x10d940, bytearray([enemy_ids[world.acting_enemy_list["French Kiss of Death"]]]))
+    rom.write_bytes(0x10d944, bytearray([enemy_ids[world.acting_enemy_list["Loaded Dice"]]]))
+    rom.write_bytes(0x10d947, bytearray([enemy_ids[world.acting_enemy_list["Care Free Bomb"]]]))
+    rom.write_bytes(0x10d94a, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+    rom.write_bytes(0x10d94d, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+
+    rom.write_bytes(0x10d951, bytearray([enemy_ids[world.acting_enemy_list["Loaded Dice 2"]]]))
+    rom.write_bytes(0x10d954, bytearray([enemy_ids[world.acting_enemy_list["Electro Swoosh"]]]))
+    rom.write_bytes(0x10d957, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10d95a, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10d95e, bytearray([enemy_ids[world.acting_enemy_list["Electro Swoosh"]]]))
+    rom.write_bytes(0x10d962, bytearray([enemy_ids[world.acting_enemy_list["Electro Swoosh"]]]))
+    rom.write_bytes(0x10d965, bytearray([enemy_ids[world.acting_enemy_list["French Kiss of Death"]]]))
+    rom.write_bytes(0x10d969, bytearray([enemy_ids[world.acting_enemy_list["Mr. Molecule"]]]))
+    rom.write_bytes(0x10d96d, bytearray([enemy_ids[world.acting_enemy_list["Mr. Molecule"]]]))
+    rom.write_bytes(0x10d971, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d974, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d978, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d97f, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d98b, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d98f, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d993, bytearray([enemy_ids[world.acting_enemy_list["Elder Batty"]]]))
+    rom.write_bytes(0x10d996, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!"]]]))
+    rom.write_bytes(0x10d99a, bytearray([enemy_ids[world.acting_enemy_list["Elder Batty"]]]))
+    rom.write_bytes(0x10d99e, bytearray([enemy_ids[world.acting_enemy_list["Elder Batty"]]]))
+    rom.write_bytes(0x10d9a1, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!"]]]))
+    rom.write_bytes(0x10d9a5, bytearray([enemy_ids[world.acting_enemy_list["Elder Batty"]]]))
+    rom.write_bytes(0x10d9a8, bytearray([enemy_ids[world.acting_enemy_list["Strong Crocodile"]]]))
+    rom.write_bytes(0x10d9ac, bytearray([enemy_ids[world.acting_enemy_list["Strong Crocodile"]]]))
+    rom.write_bytes(0x10d9af, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!"]]]))
+    rom.write_bytes(0x10d9b3, bytearray([enemy_ids[world.acting_enemy_list["Strong Crocodile"]]]))
+    rom.write_bytes(0x10d9b7, bytearray([enemy_ids[world.acting_enemy_list["Strong Crocodile"]]]))
+    rom.write_bytes(0x10d9bb, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!"]]]))
+    rom.write_bytes(0x10d9bf, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d9c2, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d9c6, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d9c9, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d9cd, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d9d1, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d9d4, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d9d8, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid"]]]))
+    rom.write_bytes(0x10d9dc, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d9e0, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10d9e4, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d9e8, bytearray([enemy_ids[world.acting_enemy_list["Attack Slug"]]]))
+    rom.write_bytes(0x10d9ec, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10d9f0, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10d9f4, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10d9f7, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10d9fb, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10d9fe, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear"]]]))
+    rom.write_bytes(0x10da02, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10da06, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10da0a, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10da0d, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear"]]]))
+    rom.write_bytes(0x10da11, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear"]]]))
+    rom.write_bytes(0x10da15, bytearray([enemy_ids[world.acting_enemy_list["Mighty Bear"]]]))
+    rom.write_bytes(0x10da18, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10da1c, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10da1f, bytearray([enemy_ids[world.acting_enemy_list["Zombie Dog"]]]))
+    rom.write_bytes(0x10da23, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10da27, bytearray([enemy_ids[world.acting_enemy_list["Zombie Dog"]]]))
+    rom.write_bytes(0x10da2a, bytearray([enemy_ids[world.acting_enemy_list["No Good Fly"]]]))
+    rom.write_bytes(0x10da2e, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10da32, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10da35, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10da39, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10da3c, bytearray([enemy_ids[world.acting_enemy_list["Urban Zombie"]]]))
+    rom.write_bytes(0x10da40, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10da44, bytearray([enemy_ids[world.acting_enemy_list["Violent Roach"]]]))
+    rom.write_bytes(0x10da48, bytearray([enemy_ids[world.acting_enemy_list["Foppy"]]]))
+    rom.write_bytes(0x10da4c, bytearray([enemy_ids[world.acting_enemy_list["Foppy"]]]))
+    rom.write_bytes(0x10da50, bytearray([enemy_ids[world.acting_enemy_list["Foppy"]]]))
+    rom.write_bytes(0x10da54, bytearray([enemy_ids[world.acting_enemy_list["Foppy"]]]))
+    rom.write_bytes(0x10da58, bytearray([enemy_ids[world.acting_enemy_list["Foppy"]]]))
+    rom.write_bytes(0x10da5c, bytearray([enemy_ids[world.acting_enemy_list["Mostly Bad Fly"]]]))
+    rom.write_bytes(0x10da60, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10da63, bytearray([enemy_ids[world.acting_enemy_list["Mostly Bad Fly"]]]))
+    rom.write_bytes(0x10da67, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10da6a, bytearray([enemy_ids[world.acting_enemy_list["Mostly Bad Fly"]]]))
+    rom.write_bytes(0x10da6e, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10da72, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10da76, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10da7a, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10da7e, bytearray([enemy_ids[world.acting_enemy_list["Farm Zombie"]]]))
+    rom.write_bytes(0x10da82, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10da85, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10da89, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10da8c, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10da8f, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10da93, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10da97, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10da9a, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10da9e, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10daa1, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10daa5, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10daa8, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10daac, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10daaf, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10dab2, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10dab6, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10dab9, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10dabc, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10dac0, bytearray([enemy_ids[world.acting_enemy_list["Ranboob"]]]))
+    rom.write_bytes(0x10dac4, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10dac7, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10dacb, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10dace, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10dad2, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10dad6, bytearray([enemy_ids[world.acting_enemy_list["Struttin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10dada, bytearray([enemy_ids[world.acting_enemy_list["Gigantic Ant"]]]))
+    rom.write_bytes(0x10dade, bytearray([enemy_ids[world.acting_enemy_list["Gigantic Ant"]]]))
+    rom.write_bytes(0x10dae2, bytearray([enemy_ids[world.acting_enemy_list["Thirsty Coil Snake"]]]))
+    rom.write_bytes(0x10dae5, bytearray([enemy_ids[world.acting_enemy_list["Gigantic Ant"]]]))
+    rom.write_bytes(0x10dae9, bytearray([enemy_ids[world.acting_enemy_list["Thirsty Coil Snake"]]]))
+    rom.write_bytes(0x10daed, bytearray([enemy_ids[world.acting_enemy_list["Thirsty Coil Snake"]]]))
+    rom.write_bytes(0x10daf1, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10daf4, bytearray([enemy_ids[world.acting_enemy_list["Thirsty Coil Snake"]]]))
+    rom.write_bytes(0x10daf8, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10dafc, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10daff, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db03, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db06, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db0a, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db0d, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db11, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db14, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db18, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db1b, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db1f, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db22, bytearray([enemy_ids[world.acting_enemy_list["Gigantic Ant"]]]))
+    rom.write_bytes(0x10db26, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db29, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db2d, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db30, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10db34, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db38, bytearray([enemy_ids[world.acting_enemy_list["Noose Man"]]]))
+    rom.write_bytes(0x10db3b, bytearray([enemy_ids[world.acting_enemy_list["Gigantic Ant"]]]))
+    rom.write_bytes(0x10db3f, bytearray([enemy_ids[world.acting_enemy_list["Musica"]]]))
+    rom.write_bytes(0x10db42, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10db46, bytearray([enemy_ids[world.acting_enemy_list["Musica"]]]))
+    rom.write_bytes(0x10db49, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10db4d, bytearray([enemy_ids[world.acting_enemy_list["Musica"]]]))
+    rom.write_bytes(0x10db51, bytearray([enemy_ids[world.acting_enemy_list["Scalding Coffee Cup"]]]))
+    rom.write_bytes(0x10db54, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10db58, bytearray([enemy_ids[world.acting_enemy_list["Scalding Coffee Cup"]]]))
+    rom.write_bytes(0x10db5b, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10db5f, bytearray([enemy_ids[world.acting_enemy_list["Scalding Coffee Cup"]]]))
+    rom.write_bytes(0x10db63, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10db67, bytearray([enemy_ids[world.acting_enemy_list["Stinky Ghost"]]]))
+    rom.write_bytes(0x10db6b, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10db6e, bytearray([enemy_ids[world.acting_enemy_list["Stinky Ghost"]]]))
+    rom.write_bytes(0x10db72, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10db76, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10db7a, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10db7e, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10db81, bytearray([enemy_ids[world.acting_enemy_list["Stinky Ghost"]]]))
+    rom.write_bytes(0x10db85, bytearray([enemy_ids[world.acting_enemy_list["Stinky Ghost"]]]))
+    rom.write_bytes(0x10db89, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10db8c, bytearray([enemy_ids[world.acting_enemy_list["Stinky Ghost"]]]))
+    rom.write_bytes(0x10db90, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10db94, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10db98, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10db9c, bytearray([enemy_ids[world.acting_enemy_list["Filthy Attack Roach"]]]))
+    rom.write_bytes(0x10dba0, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10dba4, bytearray([enemy_ids[world.acting_enemy_list["Deadly Mouse"]]]))
+    rom.write_bytes(0x10dba8, bytearray([enemy_ids[world.acting_enemy_list["Thunder Mite"]]]))
+    rom.write_bytes(0x10dbac, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbb0, bytearray([enemy_ids[world.acting_enemy_list["Thunder Mite"]]]))
+    rom.write_bytes(0x10dbb3, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbb7, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbba, bytearray([enemy_ids[world.acting_enemy_list["Kiss of Death"]]]))
+    rom.write_bytes(0x10dbbe, bytearray([enemy_ids[world.acting_enemy_list["Thunder Mite"]]]))
+    rom.write_bytes(0x10dbc1, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbc5, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbc9, bytearray([enemy_ids[world.acting_enemy_list["Thunder Mite"]]]))
+    rom.write_bytes(0x10dbcd, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbd0, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbd4, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbd8, bytearray([enemy_ids[world.acting_enemy_list["Kiss of Death"]]]))
+    rom.write_bytes(0x10dbdc, bytearray([enemy_ids[world.acting_enemy_list["Kiss of Death"]]]))
+    rom.write_bytes(0x10dbdf, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbe3, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbe7, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbea, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbee, bytearray([enemy_ids[world.acting_enemy_list["Conducting Menace"]]]))
+    rom.write_bytes(0x10dbf1, bytearray([enemy_ids[world.acting_enemy_list["Tangoo"]]]))
+    rom.write_bytes(0x10dbf4, bytearray([enemy_ids[world.acting_enemy_list["Kiss of Death"]]]))
+    rom.write_bytes(0x10dbf8, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dbfc, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc00, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc04, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc07, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc0b, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc0f, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc13, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc17, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc1b, bytearray([enemy_ids[world.acting_enemy_list["Petrified Royal Guard"]]]))
+    rom.write_bytes(0x10dc1e, bytearray([enemy_ids[world.acting_enemy_list["Lethal Asp Hieroglyph"]]]))
+    rom.write_bytes(0x10dc22, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc25, bytearray([enemy_ids[world.acting_enemy_list["Guardian Hieroglyph"]]]))
+    rom.write_bytes(0x10dc29, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc2d, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc30, bytearray([enemy_ids[world.acting_enemy_list["Petrified Royal Guard"]]]))
+    rom.write_bytes(0x10dc34, bytearray([enemy_ids[world.acting_enemy_list["Petrified Royal Guard"]]]))
+    rom.write_bytes(0x10dc38, bytearray([enemy_ids[world.acting_enemy_list["Lethal Asp Hieroglyph"]]]))
+    rom.write_bytes(0x10dc3c, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc40, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc44, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc48, bytearray([enemy_ids[world.acting_enemy_list["Arachnid!!!"]]]))
+    rom.write_bytes(0x10dc4c, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc50, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc53, bytearray([enemy_ids[world.acting_enemy_list["Petrified Royal Guard"]]]))
+    rom.write_bytes(0x10dc57, bytearray([enemy_ids[world.acting_enemy_list["Petrified Royal Guard"]]]))
+    rom.write_bytes(0x10dc5a, bytearray([enemy_ids[world.acting_enemy_list["Lethal Asp Hieroglyph"]]]))
+    rom.write_bytes(0x10dc5e, bytearray([enemy_ids[world.acting_enemy_list["Fierce Shattered Man"]]]))
+    rom.write_bytes(0x10dc61, bytearray([enemy_ids[world.acting_enemy_list["Guardian Hieroglyph"]]]))
+    rom.write_bytes(0x10dc65, bytearray([enemy_ids[world.acting_enemy_list["Scalding Coffee Cup"]]]))
+    rom.write_bytes(0x10dc68, bytearray([enemy_ids[world.acting_enemy_list["Mystical Record"]]]))
+    rom.write_bytes(0x10dc6b, bytearray([enemy_ids[world.acting_enemy_list["Worthless Protoplasm"]]]))
+    rom.write_bytes(0x10dc6f, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10dc73, bytearray([enemy_ids[world.acting_enemy_list["Cute Li'l UFO"]]]))
+    rom.write_bytes(0x10dc77, bytearray([enemy_ids[world.acting_enemy_list["Dali's Clock"]]]))
+    rom.write_bytes(0x10dc7b, bytearray([enemy_ids[world.acting_enemy_list["Robo-pump"]]]))
+    rom.write_bytes(0x10dc7e, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10dc82, bytearray([enemy_ids[world.acting_enemy_list["Robo-pump"]]]))
+    rom.write_bytes(0x10dc86, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10dc8a, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dc8e, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dc92, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dc95, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dc99, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dc9d, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dca1, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dca5, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dca9, bytearray([enemy_ids[world.acting_enemy_list["Lesser Mook"]]]))
+    rom.write_bytes(0x10dcad, bytearray([enemy_ids[world.acting_enemy_list["Worthless Protoplasm"]]]))
+    rom.write_bytes(0x10dcb1, bytearray([enemy_ids[world.acting_enemy_list["Worthless Protoplasm"]]]))
+    rom.write_bytes(0x10dcb5, bytearray([enemy_ids[world.acting_enemy_list["Worthless Protoplasm"]]]))
+    rom.write_bytes(0x10dcb9, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcbd, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcc1, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcc5, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcc9, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dccd, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcd1, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcd5, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcd8, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcdc, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcdf, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dce3, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dce7, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dceb, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcee, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcf2, bytearray([enemy_ids[world.acting_enemy_list["Mook Senior"]]]))
+    rom.write_bytes(0x10dcf5, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcf9, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dcfd, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd00, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd04, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd07, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd0b, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd0f, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd12, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd16, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd19, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd1d, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd20, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd24, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd27, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd2a, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd2e, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd31, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10dd34, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd38, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd3b, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd3f, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd42, bytearray([enemy_ids[world.acting_enemy_list["Military Octobot"]]]))
+    rom.write_bytes(0x10dd46, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd49, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10dd4d, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd50, bytearray([enemy_ids[world.acting_enemy_list["Military Octobot"]]]))
+    rom.write_bytes(0x10dd54, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd57, bytearray([enemy_ids[world.acting_enemy_list["Military Octobot"]]]))
+    rom.write_bytes(0x10dd5b, bytearray([enemy_ids[world.acting_enemy_list["Atomic Power Robot"]]]))
+    rom.write_bytes(0x10dd5e, bytearray([enemy_ids[world.acting_enemy_list["Military Octobot"]]]))
+    rom.write_bytes(0x10dd62, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd66, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd6a, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd6e, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd72, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10dd75, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd79, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd7d, bytearray([enemy_ids[world.acting_enemy_list["Hyper Spinning Robo"]]]))
+    rom.write_bytes(0x10dd80, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd84, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd88, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd8c, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10dd8f, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+    rom.write_bytes(0x10dd93, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10dd96, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10dd9a, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10dd9e, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10dda2, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10dda6, bytearray([enemy_ids[world.acting_enemy_list["Hyper Spinning Robo"]]]))
+    rom.write_bytes(0x10dda9, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10ddad, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10ddb1, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10ddb4, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10ddb8, bytearray([enemy_ids[world.acting_enemy_list["Hyper Spinning Robo"]]]))
+    rom.write_bytes(0x10ddbb, bytearray([enemy_ids[world.acting_enemy_list["Conducting Spirit"]]]))
+    rom.write_bytes(0x10ddbf, bytearray([enemy_ids[world.acting_enemy_list["Hyper Spinning Robo"]]]))
+    rom.write_bytes(0x10ddc3, bytearray([enemy_ids[world.acting_enemy_list["Hyper Spinning Robo"]]]))
+    rom.write_bytes(0x10ddc6, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+    rom.write_bytes(0x10ddca, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10ddce, bytearray([enemy_ids[world.acting_enemy_list["Psychic Psycho"]]]))
+    rom.write_bytes(0x10ddd2, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10ddd6, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10ddd9, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10dddd, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10dde0, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10dde4, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10dde8, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10ddeb, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10ddef, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10ddf3, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10ddf7, bytearray([enemy_ids[world.acting_enemy_list["Psychic Psycho"]]]))
+    rom.write_bytes(0x10ddfa, bytearray([enemy_ids[world.acting_enemy_list["Major Psychic Psycho"]]]))
+    rom.write_bytes(0x10ddfe, bytearray([enemy_ids[world.acting_enemy_list["Evil Elemental"]]]))
+    rom.write_bytes(0x10de01, bytearray([enemy_ids[world.acting_enemy_list["Psychic Psycho"]]]))
+    rom.write_bytes(0x10de05, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10de08, bytearray([enemy_ids[world.acting_enemy_list["Major Psychic Psycho"]]]))
+    rom.write_bytes(0x10de0c, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10de0f, bytearray([enemy_ids[world.acting_enemy_list["Major Psychic Psycho"]]]))
+    rom.write_bytes(0x10de13, bytearray([enemy_ids[world.acting_enemy_list["Soul Consuming Flame"]]]))
+    rom.write_bytes(0x10de17, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10de1a, bytearray([enemy_ids[world.acting_enemy_list["Nuclear Reactor Robot"]]]))
+    rom.write_bytes(0x10de1e, bytearray([enemy_ids[world.acting_enemy_list["Wild 'n Wooly Shambler"]]]))
+    rom.write_bytes(0x10de21, bytearray([enemy_ids[world.acting_enemy_list["Ultimate Octobot"]]]))
+    rom.write_bytes(0x10de25, bytearray([enemy_ids[world.acting_enemy_list["Ultimate Octobot"]]]))
+    rom.write_bytes(0x10de28, bytearray([enemy_ids[world.acting_enemy_list["Nuclear Reactor Robot"]]]))
+    rom.write_bytes(0x10de2c, bytearray([enemy_ids[world.acting_enemy_list["Squatter Demon"]]]))
+    rom.write_bytes(0x10de30, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10de33, bytearray([enemy_ids[world.acting_enemy_list["Wild 'n Wooly Shambler"]]]))
+    rom.write_bytes(0x10de37, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10de3a, bytearray([enemy_ids[world.acting_enemy_list["Nuclear Reactor Robot"]]]))
+    rom.write_bytes(0x10de3e, bytearray([enemy_ids[world.acting_enemy_list["Nuclear Reactor Robot"]]]))
+    rom.write_bytes(0x10de41, bytearray([enemy_ids[world.acting_enemy_list["Final Starman"]]]))
+    rom.write_bytes(0x10de45, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10de48, bytearray([enemy_ids[world.acting_enemy_list["Final Starman"]]]))
+    rom.write_bytes(0x10de4c, bytearray([enemy_ids[world.acting_enemy_list["Ghost of Starman"]]]))
+    rom.write_bytes(0x10de4f, bytearray([enemy_ids[world.acting_enemy_list["Final Starman"]]]))
+    rom.write_bytes(0x10de52, bytearray([enemy_ids[world.acting_enemy_list["Nuclear Reactor Robot"]]]))
+    rom.write_bytes(0x10de56, bytearray([enemy_ids[world.acting_enemy_list["Bionic Kraken"]]]))
+    rom.write_bytes(0x10de5a, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10de5d, bytearray([enemy_ids[world.acting_enemy_list["Ramblin' Evil Mushroom"]]]))
+    rom.write_bytes(0x10de61, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10de65, bytearray([enemy_ids[world.acting_enemy_list["Mobile Sprout"]]]))
+    rom.write_bytes(0x10de69, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10de6d, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10de71, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10de75, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10de79, bytearray([enemy_ids[world.acting_enemy_list["Mr. Batty"]]]))
+    rom.write_bytes(0x10de7c, bytearray([enemy_ids[world.acting_enemy_list["Zombie Possessor"]]]))
+    rom.write_bytes(0x10de80, bytearray([enemy_ids[world.acting_enemy_list["Skelpion"]]]))
+    rom.write_bytes(0x10de84, bytearray([enemy_ids[world.acting_enemy_list["Mad Taxi"]]]))
+    rom.write_bytes(0x10de88, bytearray([enemy_ids[world.acting_enemy_list["Criminal Caterpillar"]]]))
+    rom.write_bytes(0x10de8c, bytearray([enemy_ids[world.acting_enemy_list["Master Criminal Worm"]]]))
+    rom.write_bytes(0x10de94, bytearray([enemy_ids[world.acting_enemy_list["Coil Snake"]]]))
+    rom.write_bytes(0x10de98, bytearray([enemy_ids[world.acting_enemy_list["Coil Snake"]]]))
+    rom.write_bytes(0x10de9c, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10dea0, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10dea4, bytearray([enemy_ids[world.acting_enemy_list["Mole Playing Rough"]]]))
+    rom.write_bytes(0x10dea8, bytearray([enemy_ids[world.acting_enemy_list["Skate Punk"]]]))
+    rom.write_bytes(0x10deab, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10deae, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10deb2, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+    rom.write_bytes(0x10deb6, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))
+    rom.write_bytes(0x10deba, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10debe, bytearray([enemy_ids[world.acting_enemy_list["Unassuming Local Guy"]]]))
+    rom.write_bytes(0x10dec2, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10dec5, bytearray([enemy_ids[world.acting_enemy_list["Spiteful Crow"]]]))
+    rom.write_bytes(0x10dec9, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10decd, bytearray([enemy_ids[world.acting_enemy_list["Enraged Fire Plug"]]]))
+    rom.write_bytes(0x10ded1, bytearray([enemy_ids[world.acting_enemy_list["Robo-pump"]]]))
+    rom.write_bytes(0x10ded5, bytearray([enemy_ids[world.acting_enemy_list["Abstract Art"]]]))
+    rom.write_bytes(0x10ded9, bytearray([enemy_ids[world.acting_enemy_list["Sentry Robot"]]]))
+    rom.write_bytes(0x10dedd, bytearray([enemy_ids[world.acting_enemy_list["Shattered Man"]]]))
+    rom.write_bytes(0x10dee1, bytearray([enemy_ids[world.acting_enemy_list["Guardian Hieroglyph"]]]))
+    rom.write_bytes(0x10dee5, bytearray([enemy_ids[world.acting_enemy_list["Lethal Asp Hieroglyph"]]]))
+    rom.write_bytes(0x10dee9, bytearray([enemy_ids[world.acting_enemy_list["Mad Duck"]]]))
+    rom.write_bytes(0x10deed, bytearray([enemy_ids[world.acting_enemy_list["Worthless Protoplasm"]]]))
+    rom.write_bytes(0x10def1, bytearray([enemy_ids[world.acting_enemy_list["Rowdy Mouse"]]]))
+    rom.write_bytes(0x10dF00, bytearray([enemy_ids[world.acting_enemy_list["Black Antoid (2)"]]]))
+    rom.write_bytes(0x10df04, bytearray([enemy_ids[world.acting_enemy_list["Cop"]]]))
+    rom.write_bytes(0x10df1b, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+    rom.write_bytes(0x10df22, bytearray([enemy_ids[world.acting_enemy_list["Tough Mobile Sprout"]]]))
+    rom.write_bytes(0x10df31, bytearray([enemy_ids[world.acting_enemy_list["Insane Cultist"]]]))
+    rom.write_bytes(0x10df4c, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))
+    rom.write_bytes(0x10df4f, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+    rom.write_bytes(0x10df5e, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))
+
+    # Calls for help
+
+    if not world.options.randomize_enemy_attacks:
+        rom.write_bytes(0x15A601, bytearray([enemy_ids[world.acting_enemy_list["Care Free Bomb"]]]))  # Loaded Dice
+        rom.write_bytes(0x15A602, bytearray([enemy_ids[world.acting_enemy_list["Beautiful UFO"]]]))
+        rom.write_bytes(0x15A603, bytearray([enemy_ids[world.acting_enemy_list["High-class UFO"]]]))
+        rom.write_bytes(0x15A604, bytearray([enemy_ids[world.acting_enemy_list["Care Free Bomb"]]]))
+
+        rom.write_bytes(0x15DD73, bytearray([enemy_ids[world.acting_enemy_list["Electro Swoosh"]]]))  # Loaded Dice 2
+        rom.write_bytes(0x15DD74, bytearray([enemy_ids[world.acting_enemy_list["Fobby"]]]))
+        rom.write_bytes(0x15DD75, bytearray([enemy_ids[world.acting_enemy_list["Uncontrollable Sphere"]]]))
+        rom.write_bytes(0x15DD76, bytearray([enemy_ids[world.acting_enemy_list["Electro Swoosh"]]]))
+
+        rom.write_bytes(0x15AD5B, bytearray([enemy_ids[world.acting_enemy_list["Yes Man Junior"]]]))  # Skate Punk
+        rom.write_bytes(0x15AD5C, bytearray([enemy_ids[world.acting_enemy_list["Pogo Punk"]]]))
+
+        rom.write_bytes(0x15AED2, bytearray([enemy_ids[world.acting_enemy_list["Starman"]]]))  # S Super
+
+    rom.write_bytes(0x15B108, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))  # SDX
+    rom.write_bytes(0x15DA86, bytearray([enemy_ids[world.acting_enemy_list["Starman Super"]]]))
+
+    rom.write_bytes(0x15DC5B, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))  # Belch
+    rom.write_bytes(0x15B801, bytearray([enemy_ids[world.acting_enemy_list["Slimy Little Pile"]]]))
+
+    rom.write_bytes(0x15DD15, bytearray([enemy_ids[world.acting_enemy_list["Even Slimier Little Pile"]]]))  # Barf
+
+    rom.write_bytes(0x0F92F4, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Skate Punk"]]))
+    rom.write_bytes(0x0F9305, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Pogo Punk"]]))
+    rom.write_bytes(0x0F8997, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Yes Man Junior"]]))
+    rom.write_bytes(0x0F89A8, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Pogo Punk"]]))
+    rom.write_bytes(0x0F89B9, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Skate Punk"]]))
+    rom.write_bytes(0x0F89CA, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Pogo Punk"]]))
+    rom.write_bytes(0x0F89DB, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Yes Man Junior"]]))
+    rom.write_bytes(0x0F89FD, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Skate Punk"]]))
+
+    rom.write_bytes(0x0FA2A0, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA2B1, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA2C2, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA2D3, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA2E4, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA2F5, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA306, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA317, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA328, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA339, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA34A, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA35B, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA36C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA37D, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA38E, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA39F, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA427, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA6BE, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA6CF, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA6E0, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Spiteful Crow"]]))
+    rom.write_bytes(0x0FA4E2, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Unassuming Local Guy"]]))
+    rom.write_bytes(0x0FA3B0, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA3C1, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+    rom.write_bytes(0x0FA3D2, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]]))
+
+    rom.write_bytes(0x0FCE85, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Shattered Man"]]))
+    rom.write_bytes(0x0FCE96, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Shattered Man"]]))
+
+    rom.write_bytes(0x0FB6D0, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Rowdy Mouse"]]))
+    rom.write_bytes(0x0FB6E1, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Rowdy Mouse"]]))
+    rom.write_bytes(0x0FB6AE, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Worthless Protoplasm"]]))
+    rom.write_bytes(0x0FB6BF, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Worthless Protoplasm"]]))
+    rom.write_bytes(0x0FB68C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Mad Duck"]]))
+    rom.write_bytes(0x0FB69D, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Mad Duck"]]))
+
+    rom.write_bytes(0x0FD716, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD727, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD738, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD749, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD75A, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD76B, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD77C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD78D, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD79E, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD7AF, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD7C0, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD7D1, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD7F3, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD804, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD815, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD826, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD837, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD848, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD859, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD86A, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD87B, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD88C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Guardian Hieroglyph"]]))
+    rom.write_bytes(0x0FD89D, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+    rom.write_bytes(0x0FD8AE, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Lethal Asp Hieroglyph"]]))
+
+    rom.write_bytes(0x0F8E1B, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8E2C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8E5F, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8E70, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8E81, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8E92, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F8EA3, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F9316, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+    rom.write_bytes(0x0F9327, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Cop"]]))
+
+    rom.write_bytes(0x0FE409, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Robo-pump"]]))
+    rom.write_bytes(0x0FE491, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Robo-pump"]]))
+    rom.write_bytes(0x0FE43C, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Abstract Art"]]))
+
+    rom.write_bytes(0x0FD9F1, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Mad Duck"]]))
+    rom.write_bytes(0x0FDA02, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Mad Duck"]]))
+    rom.write_bytes(0x0FDA13, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Mad Duck"]]))
+    rom.write_bytes(0x0FDA24, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FDA35, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FDA46, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FDA57, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Gruff Goat"]]))
+    rom.write_bytes(0x0FDA68, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Gruff Goat"]]))
+
+    rom.write_bytes(0x0FB736, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FB747, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FB758, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FB769, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+    rom.write_bytes(0x0FB77A, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Slimy Little Pile"]]))
+
+    rom.write_bytes(0x0FC3E5, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Sentry Robot"]]))
+    rom.write_bytes(0x0FC3F6, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Sentry Robot"]]))
+    rom.write_bytes(0x0FC407, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Sentry Robot"]]))
+    rom.write_bytes(0x0FC418, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Sentry Robot"]]))
+    rom.write_bytes(0x0FC48F, struct.pack("H", world.enemy_sprites[world.acting_enemy_list["Sentry Robot"]]))
+
+    dungeon_zoo = [
+        "Mad Duck",
+        "Gruff Goat",
+        "Slimy Little Pile"
+    ]
+
+    name_addresses = [
+        0x330544,
+        0x330555,
+        0x330566
+    ]
+
+    desc_addresses = [
+        0x33054B,
+        0x33055C,
+        0x33056D
+    ]
+
+    normal_pointers = {
+        "Mad Duck": 0xC8796C,
+        "Gruff Goat": 0xC879A3,
+        "Slimy Little Pile": 0xC87A31
+    }
+
+    pointer = 0x313000
+
+    if world.enemy_sprites[world.acting_enemy_list["Insane Cultist"]] not in can_walkthrough:
+        rom.write_bytes(0x0983D2, bytearray([0x1f, 0x1e, 0x7A, 0x01, 0x00, 0x00, 0x00, 0x00]))
+        rom.write_bytes(0x098459, bytearray([0x1f, 0x1e, 0x7B, 0x01, 0x00, 0x00, 0x00, 0x00]))
+        rom.write_bytes(0x0984D1, bytearray([0x1f, 0x1e, 0x7C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                             0x00, 0x00]))
+        rom.write_bytes(0x09855F, bytearray([0x1f, 0x1e, 0x7D, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                             0x00, 0x00]))
+        rom.write_bytes(0x0985CE, bytearray([0x1f, 0x1e, 0x7E, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                             0x00, 0x00]))
+        rom.write_bytes(0x098625, bytearray([0x1f, 0x1e, 0x7F, 0x01, 0x00, 0x00, 0x00, 0x00]))
+        rom.write_bytes(0x09869E, bytearray([0x1f, 0x1e, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                             0x00, 0x00]))
+
+        rom.write_bytes(0x098375, bytearray([0x44]))
+        rom.write_bytes(0x098425, bytearray([0x44]))
+        rom.write_bytes(0x098480, bytearray([0x44]))
+        rom.write_bytes(0x098518, bytearray([0x44]))
+        rom.write_bytes(0x098599, bytearray([0x44]))
+        rom.write_bytes(0x098603, bytearray([0x44]))
+        rom.write_bytes(0x09864C, bytearray([0x44]))
+
+    for i in range(3):
+
+        name = text_encoder(world.acting_enemy_list[dungeon_zoo[i]].replace(" (2)", ""), 255)
+        name.append(0x02)
+
+        if world.acting_enemy_list[dungeon_zoo[i]] not in dungeon_zoo:
+            text = text_encoder(enemy_descriptions[world.acting_enemy_list[dungeon_zoo[i]]], 255)
+            text.append(0x02)
+        else:
+            text = text_encoder("ERROR", 255)
+        rom.write_bytes(pointer, name)
+        rom.write_bytes(name_addresses[i], struct.pack("I", pointer + 0xC00000))
+        pointer += len(name)
+        rom.write_bytes(pointer, text)
+        if world.acting_enemy_list[dungeon_zoo[i]] not in dungeon_zoo:
+            rom.write_bytes(desc_addresses[i], struct.pack("I", pointer + 0xC00000))
+        else:
+            rom.write_bytes(desc_addresses[i], struct.pack("I",
+                                                           normal_pointers[world.acting_enemy_list[dungeon_zoo[i]]]))
+        pointer += len(text)
+    # Todo; action scripts for npc enemies?
diff --git a/worlds/earthbound/modules/equipamizer.py b/worlds/earthbound/modules/equipamizer.py
new file mode 100644
index 0000000000..5c7bdebd7d
--- /dev/null
+++ b/worlds/earthbound/modules/equipamizer.py
@@ -0,0 +1,994 @@
+from dataclasses import dataclass
+import copy
+from ..game_data.text_data import text_encoder, calc_pixel_width
+from ..Options import Armorizer, Weaponizer
+from operator import attrgetter
+import struct
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+
+@dataclass
+class EBArmor:
+    address: int
+    equip_type: str
+    defense: int = 0
+    aux_stat: int = 0
+    poo_def: int = 0
+    flash_res: int = 0
+    freeze_res: int = 0
+    fire_res: int = 0
+    par_res: int = 0
+    sleep_res: int = 0
+    name: str = "None"
+    can_equip: str = "All"
+    total_resistance = 0
+    double_price_item: str = "None"
+
+
+@dataclass
+class EBWeapon:
+    can_equip: str
+    equip_type: str
+    address: int
+    name: str = "None"
+    offense: int = 0
+    aux_stat: int = 0
+    poo_off: int = 0
+    miss_rate: int = 0
+    double_price_item: str = "None"
+
+
+def roll_resistances(world: "EarthBoundWorld", element: str, armor: EBArmor) -> None:
+    chance = world.random.randint(0, 100)
+    if chance < world.options.armorizer_resistance_chance.value:
+        setattr(armor, element, world.random.randint(1, 3))
+    else:
+        setattr(armor, element, 0)
+
+
+def price_weapons(world: "EarthBoundWorld", weapons: list[EBWeapon], rom: "LocalRom") -> None:
+    for index, weapon in enumerate(weapons):
+        if weapon.can_equip == "Poo":
+            price = 10 * weapon.poo_off
+        else:
+            price = 10 * weapon.offense
+
+        if price > 300:
+            price = price * 2
+        
+        price += (20 * weapon.aux_stat)
+        price -= (50 * weapon.miss_rate)
+        price += world.random.randint(-20, 20)
+        price = max(5, price)
+        rom.write_bytes((weapon.address + 26), struct.pack("H", price))
+        if weapon.double_price_item in summers_addresses:
+            price = min(0xFFFF, price * 2)
+            rom.write_bytes((summers_addresses[weapon.double_price_item] + 26), struct.pack("H", price))
+
+
+def price_armors(world: "EarthBoundWorld", armor_pricing_list: list[EBArmor], rom: "LocalRom") -> None:
+    for index, armor in enumerate(armor_pricing_list):
+        if armor.can_equip == "Poo":
+            price = 10 * armor.poo_def
+        else:
+            price = 10 * armor.defense
+        
+        if price > 300:
+            price = price * 2
+        price += (20 * armor.aux_stat)
+        price += (50 * armor.fire_res)
+        price += (50 * armor.freeze_res)
+        price += (50 * armor.flash_res)
+        price += (50 * armor.par_res)
+        price += world.random.randint(-20, 20)
+        price = max(5, price)
+        rom.write_bytes((armor.address + 26), struct.pack("H", price))
+        if armor.double_price_item in summers_addresses:
+            price = min(0xFFFF, price * 2)
+            rom.write_bytes((summers_addresses[armor.double_price_item] + 26), struct.pack("H", price))
+
+
+def apply_progressive_weapons(world: "EarthBoundWorld", weapons: list[str], progressives: list[str], rom: "LocalRom") -> None:
+    for index, item in enumerate(weapons):
+        weapon = world.weapon_list[item]
+        weapon.offense = progressives[index].offense
+        rom.write_bytes(weapon.address + 31, bytearray([weapon.offense]))
+
+
+def apply_progressive_armor(world: "EarthBoundWorld", armors: list[str], progressives: list[str], rom: "LocalRom") -> None:
+    for index, item in enumerate(armors):
+        armor = world.armor_list[item]
+        armor.defense = progressives[index].defense
+        rom.write_bytes(armor.address + 31, bytearray([armor.defense]))
+
+
+adjectives = [
+    "Hard",
+    "Wild",
+    "Boring",
+    "Lavish",
+    "Grouchy",
+    "Elastic",
+    "Unsightly",
+    "Long",
+    "Wide",
+    "Cheap",
+    "Copper",
+    "Silver",
+    "Gold",
+    "Platinum",
+    "Diamond",
+    "Jade",
+    "Ruby",
+    "Sapphire",
+    "Pearl",
+    "Dull",
+    "Cold",
+    "Fair",
+    "Awful",
+    "Bad",
+    "Dry",
+    "Wet",
+    "Shiny",
+    "Damp",
+    "Elite",
+    "Beefy",
+    "Better",
+    "Alright",
+    "Okay",
+    "Metal",
+    "Pixie's",
+    "Cherub's",
+    "Demon's",
+    "Goddess",
+    "Sprite's",
+    "Fairy's",
+    "Devil's",
+    "Best",
+    "Spiteful",
+    "Travel",
+    "Great",
+    "Crystal",
+    "Baseball",
+    "Holmes",
+    "Red",
+    "Talisman",
+    "Defense",
+    "Mr. Saturn",
+    "Slumber",
+    "Lucky",
+    "Shiny",
+    "Souvenir",
+    "Silence",
+    "Ultimate",
+    "Charm",
+    "Saturn",
+    "Tenda",
+    "Sturdy",
+    "Sleek",
+    "Green",
+    "Blue",
+    "White",
+    "Yellow",
+    "Azure",
+    "Emerald",
+    "Handmade",
+    "Hank's",
+    "Real",
+    "Peace",
+    "Magic",
+    "Protect",
+    "Brass",
+    "Cursed",
+    "Rabbit's",
+    "Odd",
+    "Cheese",
+    "Casual",
+    "Silk",
+    "Gutsy",
+    "Hyper",
+    "Crusher",
+    "Thick",
+    "Deluxe",
+    "Chef's",
+    "Cracked",
+    "Plastic",
+    "Cotton",
+    "Mr. Baseball",
+    "Razor",
+    "Gilded",
+    "Master",
+    "Fighter's",
+    "Worn",
+    "Magicant",
+    "Happy",
+    "Well-Done",
+    "Rare",
+    "Gnarly",
+    "Wicked",
+    "Bionic",
+    "Combat",
+    "Tee ball",
+    "Sand lot",
+    "Minor league",
+    "Big league",
+    "Hall of fame",
+    "Famous",
+    "Legendary",
+    "Casey",
+    "French",
+    "Holy",
+    "Pop",
+    "Zip",
+    "Gaia",
+    "Baddest",
+    "Death",
+    "Spectrum",
+    "Laser",
+    "Moon",
+    "Toy",
+    "Magnum",
+    "Stun",
+    "Trick",
+    "Dirty",
+    "Washed",
+    "Laundered",
+    "Fresh",
+    "New",
+    "Old",
+    "Alien",
+    "T-rex's",
+    "Double",
+    "Non-stick",
+    "Football",
+    "Tennis",
+    "Golf",
+    "Hockey",
+    "Burnt",
+    "Boiled"
+]
+
+char_nums = {
+    "Ness": 0x01,
+    "Paula": 0x02,
+    "Jeff": 0x03,
+    "Poo": 0x04
+}
+
+usage_bytes = {
+    "All": 0x0F,
+    "Ness": 0x01,
+    "Paula": 0x02,
+    "Jeff": 0x04,
+    "Poo": 0x08
+}
+
+type_bytes = {
+    "body": 0x14,
+    "arm": 0x18,
+    "other": 0x1C,
+    "Bash": 0x10,
+    "Shoot": 0x11
+}
+
+summers_addresses = {
+    "Platinum Band": 0x155A5C,
+    "Diamond Band": 0x155A83,
+    "Big League Bat": 0x15535A
+}
+
+royal_names = [
+    "of kings",
+    "of dukes",
+    "of princes",
+    "of barons",
+    "of lords",
+    "of sultans",
+    "of counts",
+    "of England"
+]
+
+
+def randomize_armor(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    if world.options.equipamizer_cap_stats:
+        armor_caps = {
+            "body": 30,
+            "arm": 80,
+            "other": 110
+
+        }
+    else:
+        armor_caps = {
+            "body": 127,
+            "arm": 127,
+            "other": 127
+        }
+
+    other_adjectives = adjectives.copy()
+    arm_adjectives = adjectives.copy()
+    body_adjectives = adjectives.copy()
+    taken_names = []
+
+    armor_dict = {
+        "arm": arm_adjectives,
+        "body": body_adjectives,
+        "other": other_adjectives
+    }
+
+    equalized_names = [
+        "Mild",
+        "Earth",
+        "Sea"
+    ]
+
+    ult_names = [
+        "Day",
+        "Sun",
+        "Star"
+    ]
+
+    elemental_names = {
+        "Flash": [
+            "Dark",
+            "Cloud",
+            "Night"
+        ],
+        "Freeze": [
+            "Puddle",
+            "Drizzle",
+            "Rain"
+        ],
+
+        "Fire": [
+            "Smoke",
+            "Ember",
+            "Flame"
+        ]
+    }
+
+    plain_elemental_names = [
+        "Dark",
+        "Cloud",
+        "Night",
+        "Puddle",
+        "Drizzle",
+        "Rain",
+        "Smoke",
+        "Ember",
+        "Flame",
+        "Mild",
+        "Earth",
+        "Sea",
+        "Day",
+        "Sun",
+        "Star"
+    ]
+
+    all_armor = [
+        "Travel Charm",
+        "Great Charm",
+        "Crystal Charm",
+        "Rabbit's Foot",
+        "Flame Pendant",
+        "Rain Pendant",
+        "Night Pendant",
+        "Sea Pendant",
+        "Star Pendant",
+        "Cloak of Kings",
+        "Cheap Bracelet",
+        "Copper Bracelet",
+        "Silver Bracelet",
+        "Gold Bracelet",
+        "Platinum Band",
+        "Diamond Band",
+        "Pixie's Bracelet",
+        "Cherub's Band",
+        "Goddess Band",
+        "Bracer of Kings",
+        "Baseball Cap",
+        "Mr. Baseball Cap",
+        "Holmes Hat",
+        "Hard Hat",
+        "Coin of Slumber",
+        "Coin of Defense",
+        "Coin of Silence",
+        "Mr. Saturn Coin",
+        "Charm Coin",
+        "Lucky Coin",
+        "Talisman Coin",
+        "Shiny Coin",
+        "Souvenir Coin",
+        "Diadem of Kings",
+        "Earth Pendant",
+        "Saturn Ribbon",
+        "Ribbon",
+        "Red Ribbon",
+        "Defense Ribbon",
+        "Talisman Ribbon",
+        "Goddess Ribbon",
+    ]
+
+    char_armor_names = {
+        "Ness": {
+            "body": "tee",
+            "arm": "mitt",
+            "other": "pack"
+        },
+
+        "Paula": {
+            "body": "dress",
+            "arm": "ring",
+            "other": "ribbon"
+        },
+
+        "Jeff": {
+            "body": "tie",
+            "arm": "watch",
+            "other": "glasses"
+        },
+    }
+
+    aux_stat = {
+        "arm": "Luck",
+        "body": "Speed",
+        "other": "Luck"
+    }
+
+    armor_names = {
+        "body": ["pendant", "charm", "foot", "brooch", "shirt",
+                 "amulet", "cloak", "suit", "plate", "vest", "coat", "jersey", "poncho"],
+        "arm": ["bracelet", "band", "bracer", "gauntlet", "sleeve", "glove", "bangle", "armlet", "sweatband"],
+        "other": ["cap", "hat", "coin", "crown", "diadem", "helmet", "mask", "wig", "pants", "jeans", "greaves", "boot"]
+    }
+
+    res_strength = [
+        ", just a little bit",
+        " somewhat",
+        ""
+    ]
+
+    progressive_bracelets = [
+    ]
+
+    progressive_others = [
+    ]
+
+    world.armor_list = {
+        "Travel Charm": EBArmor(0x15583A, "body"),
+        "Great Charm": EBArmor(0x155861, "body"),
+        "Crystal Charm": EBArmor(0x155888, "body"),
+        "Rabbit's Foot": EBArmor(0x1558AF, "body"),
+        "Flame Pendant": EBArmor(0x1558D6, "body"),
+        "Rain Pendant": EBArmor(0x1558FD, "body"),
+        "Night Pendant": EBArmor(0x155924, "body"),
+        "Sea Pendant": EBArmor(0x15594B, "body"),
+        "Star Pendant": EBArmor(0x155972, "body"),
+        "Cloak of Kings": EBArmor(0x155999, "body"),
+        "Cheap Bracelet": EBArmor(0x1559C0, "arm"),
+        "Copper Bracelet": EBArmor(0x1559E7, "arm"),
+        "Silver Bracelet": EBArmor(0x155A0E, "arm"),
+        "Gold Bracelet": EBArmor(0x155A35, "arm"),
+        "Platinum Band": EBArmor(0x1570E8, "arm"),
+        "Diamond Band": EBArmor(0x15710F, "arm"),
+        "Pixie's Bracelet": EBArmor(0x155AAA, "arm"),
+        "Cherub's Band": EBArmor(0x155AD1, "arm"),
+        "Goddess Band": EBArmor(0x155AF8, "arm"),
+        "Bracer of Kings": EBArmor(0x155B1F, "arm"),
+        "Baseball Cap": EBArmor(0x155B46, "other"),
+        "Mr. Baseball Cap": EBArmor(0x155B94, "other"),
+        "Holmes Hat": EBArmor(0x155B6D, "other"),
+        "Hard Hat": EBArmor(0x155BBB, "other"),
+        "Ribbon": EBArmor(0x155BE2, "other"),
+        "Red Ribbon": EBArmor(0x155C09, "other"),
+        "Goddess Ribbon": EBArmor(0x155C30, "other"),
+        "Coin of Slumber": EBArmor(0x155C57, "other"),
+        "Coin of Defense": EBArmor(0x155C7E, "other"),
+        "Coin of Silence": EBArmor(0x1571AB, "other"),
+        "Mr. Saturn Coin": EBArmor(0x1575EF, "other"),
+        "Lucky Coin": EBArmor(0x155CA5, "other"),
+        "Charm Coin": EBArmor(0x1571D2, "other"),
+        "Talisman Coin": EBArmor(0x155CCC, "other"),
+        "Shiny Coin": EBArmor(0x155CF3, "other"),
+        "Souvenir Coin": EBArmor(0x155D1A, "other"),
+        "Diadem of Kings": EBArmor(0x155D41, "other"),
+        "Earth Pendant": EBArmor(0x156D8E, "body"),
+        "Defense Ribbon": EBArmor(0x157136, "other"),
+        "Talisman Ribbon": EBArmor(0x15715D, "other"),
+        "Saturn Ribbon": EBArmor(0x157184, "other"),
+    }
+
+    for item in all_armor:
+        armor = world.armor_list[item]
+        if world.options.armorizer == Armorizer.option_chaos:
+            armor.equip_type = world.random.choice(["arm", "body", "other"])
+
+        if armor.equip_type == "arm":
+            progressive_bracelets.append(item)
+        elif armor.equip_type == "other" and armor.can_equip == "All":
+            progressive_others.append(item)
+
+        if item in summers_addresses:
+            armor.double_price_item = item
+        armor.defense = world.random.randint(1, armor_caps[armor.equip_type])
+
+        chance = world.random.randint(0, 100)
+        if chance < 8:
+            armor.aux_stat = world.random.randint(1, 127)
+        else:
+            armor.aux_stat = 0
+
+        if armor.equip_type != "arm":
+            roll_resistances(world, "flash_res", armor)
+            roll_resistances(world, "freeze_res", armor)
+            roll_resistances(world, "fire_res", armor)
+            roll_resistances(world, "par_res", armor)
+            armor.sleep_res = 0
+        else:
+            armor.flash_res = 0
+            armor.freeze_res = 0
+            armor.fire_res = 0
+            armor.par_res = 0
+            # Only Arm gear can have sleep resistance; arm gear cannot have elemental resistance
+            roll_resistances(world, "sleep_res", armor)
+
+        if armor.flash_res + armor.freeze_res + armor.fire_res == 0:
+            # If no resistances are active use a normal name
+            front_name = world.random.choice(armor_dict[armor.equip_type])
+            armor_dict[armor.equip_type].remove(front_name)
+        elif armor.flash_res == armor.freeze_res == armor.fire_res:
+            # Get a combined name for the level
+            front_name = equalized_names[armor.flash_res - 1]
+        elif armor.par_res == armor.flash_res == armor.freeze_res == armor.fire_res:
+            # Should be used if Paralysis + the others all succeed
+            front_name = ult_names[armor.flash_res - 1]
+        else:
+            # If resistances are inequal, use the strongest as the name and pull a name from its strength
+            # If 2 are equal pick a random of them
+            names = ("Flash", "Freeze", "Fire")
+            strengths = (armor.flash_res, armor.freeze_res, armor.fire_res)
+            best_elements = [(name, strength) for name, strength in zip(names, strengths) if strength == max(strengths)]
+            best_name, best_strength = world.random.choice(best_elements)
+            front_name = elemental_names[best_name][best_strength - 1]
+
+        chance = world.random.randint(0, 100)
+        if chance < 10:
+            armor.can_equip = world.random.choice(["Ness", "Paula", "Jeff", "Poo"])
+        else:
+            armor.can_equip = "All"
+
+        if armor.can_equip == "Poo":
+            back_name = world.random.choice(royal_names)
+            front_name = world.random.choice(armor_names[armor.equip_type]).capitalize()
+        elif armor.can_equip in ["Ness", "Paula", "Jeff"]:
+            back_name = char_armor_names[armor.can_equip][armor.equip_type]
+        else:
+            back_name = world.random.choice(armor_names[armor.equip_type])
+
+        armor.name = front_name + " " + back_name
+        if armor.name in taken_names:
+            front_name = world.random.choice(armor_dict[armor.equip_type])
+            armor_dict[armor.equip_type].remove(front_name)
+            armor.name = front_name + " " + back_name
+
+        pixel_length = calc_pixel_width(armor.name)
+        first_armor = False
+        if armor.can_equip == "Poo":
+            names_to_try = royal_names.copy()
+        else:
+            names_to_try = armor_names[armor.equip_type].copy()
+
+        while pixel_length > 70 or armor.name in taken_names:
+            # First we replace any spaces with half-width spaces, a common tech used in vanilla to fix long names
+            if first_armor is False:
+                armor.name = armor.name.replace(" ", " ")
+                first_armor = True
+            else:
+                if names_to_try and front_name not in plain_elemental_names:
+                    # If it's still too long, change the second part of the name to try and roll a shorter name
+                    back_name = world.random.choice(names_to_try)
+                    names_to_try.remove(back_name)
+                else:
+                    # If it's *STILL* too long, chop a letter off the end of the front
+                    front_name = front_name[:-1]
+                    if front_name == "":
+                        # we ran out of letters rip
+                        front_name = "Long"
+                first_armor = False
+                armor.name = front_name + " " + back_name
+
+            pixel_length = calc_pixel_width(armor.name)
+            
+        taken_names.append(armor.name)
+        armor.total_resistance = (1 * armor.fire_res) + (4 * armor.freeze_res) + (16 * armor.flash_res) + (64 * armor.par_res)
+        rom.write_bytes(armor.address + 28, bytearray([usage_bytes[armor.can_equip]]))
+        rom.write_bytes(armor.address + 25, bytearray([type_bytes[armor.equip_type]]))
+    
+    sortable_armor = copy.deepcopy(world.armor_list)
+    sorted_armor = sorted(sortable_armor.values(), key=attrgetter("defense"))
+
+    sorted_arm_gear = [armor for armor in sorted_armor if armor.equip_type == "arm"]
+    sorted_body_gear = [armor for armor in sorted_armor if armor.equip_type == "body"]
+    sorted_other_gear = [armor for armor in sorted_armor if armor.equip_type == "other"]
+
+    sorts = [
+        sorted_arm_gear,
+        sorted_other_gear,
+        sorted_body_gear,
+    ]
+
+    prog_armors = [
+        progressive_bracelets,
+        progressive_others
+    ]
+    
+    if world.options.progressive_armor:
+        for i in range(2):
+            apply_progressive_armor(world, prog_armors[i], sorts[i], rom)
+
+    for i in range(3):
+        price_armors(world, sorts[i], rom)
+
+    for item in all_armor:
+        armor = world.armor_list[item]
+
+        if armor.can_equip != "Poo":
+            armor.poo_def = 216  # defense is signed, all non-kings equipment has this value
+        else:
+            armor.poo_def = armor.defense
+        
+        rom.write_bytes(armor.address + 31, bytearray([armor.defense, armor.poo_def, armor.aux_stat, armor.total_resistance]))
+
+        item_name = text_encoder(armor.name, 25)
+        item_name.extend([0x00])
+
+        description = f" “{armor.name}”\n"
+        if armor.can_equip != "All":
+            description += f"@♪'s {armor.equip_type} equipment.\n"
+        else:
+            if armor.equip_type == "other":
+                description += "@Must be equipped as “other”.\n"
+            else:
+                description += f"@Must be equipped on your {armor.equip_type}.\n"
+
+        if armor.can_equip == "Poo":
+            description += f"@+{armor.poo_def} Defense.\n"
+        else:
+            description += f"@+{armor.defense} Defense.\n"
+        if armor.aux_stat > 0:
+            description += f"@+{armor.aux_stat} {aux_stat[armor.equip_type]}. \n"
+
+        if armor.flash_res > 0:
+            description += f"@Protects against Flash attacks{res_strength[armor.flash_res - 1]}.\n"
+
+        if armor.freeze_res > 0:
+            description += f"@Protects against Freeze attacks{res_strength[armor.freeze_res - 1]}.\n"
+        
+        if armor.fire_res > 0:
+            description += f"@Protects against Fire attacks{res_strength[armor.fire_res - 1]}.\n"
+
+        if armor.par_res > 0:
+            description += f"@Protects against Paralysis{res_strength[armor.par_res - 1]}.\n"
+
+        if armor.sleep_res > 0:
+            description += f"@Protects against Sleep{res_strength[armor.sleep_res - 1]}.\n"
+
+        description = text_encoder(description, 0x100)
+        description = description[:-2]
+        description.extend([0x13, 0x02])
+
+        if armor.can_equip != "All":
+            index = description.index(0xAC)
+            description[index:index + 1] = bytearray([0x1C, 0x02, char_nums[armor.can_equip]])
+
+        rom.write_bytes(armor.address, item_name)
+        rom.write_bytes((0x310000 + world.description_pointer), description)
+        rom.write_bytes((armor.address + 35), struct.pack("I", (0xF10000 + world.description_pointer)))
+        if item in ["Platinum Band", "Diamond Band"]:
+            rom.write_bytes(summers_addresses[item] + 28, bytearray([usage_bytes[armor.can_equip]]))
+            rom.write_bytes(summers_addresses[item] + 31, bytearray([armor.defense, armor.poo_def, armor.aux_stat, armor.total_resistance]))
+            rom.write_bytes(summers_addresses[item] + 25, bytearray([type_bytes[armor.equip_type]]))
+            rom.write_bytes(summers_addresses[item], item_name)
+            rom.write_bytes((summers_addresses[item] + 35), struct.pack("I", (0xF10000 + world.description_pointer)))
+        world.description_pointer += len(description)
+
+
+def randomize_weapons(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    if world.options.equipamizer_cap_stats:
+        weapon_cap = 120
+    else:
+        weapon_cap = 127
+
+    weapon_names = {
+        "Ness": ["bat", "stick", "club", "board", "racket", "cue", "pole", "paddle"],
+        "Paula": ["fry pan", "frypan", "skillet", "whisk", "saucepan", "pin"],
+        "Jeff": ["gun", "beam", "air gun", "beam gun", "cannon", "blaster", "pistol", "revolver", "shotgun", "rifle"],
+        "Poo": ["Sword", "Katana", "Knife", "Scissor", "Cutter", "Blade", "Chisel", "Saw", "Axe", "Scalpel", "Sabre"],
+        "All": ["yo-yo", "slingshot", "boomerang", "chakram", "bow"]
+    }
+
+    taken_names = []
+
+    miss_rates = {
+        "Ness": 1,
+        "Paula": 1,
+        "Jeff": 0,
+        "Poo": 0,
+        "All": 3
+    }
+
+    progressive_bats = [
+    ]
+
+    progressive_pans = [
+    ]
+
+    progressive_guns = [
+    ]
+
+    progressive_alls = [
+    ]
+
+    starting_weapons = {
+        "Ness": "Tee Ball Bat",
+        "Paula": "Fry Pan",
+        "Jeff": "Pop Gun",
+        "Poo": "None"
+    }
+    
+    starting_weapon = starting_weapons[world.starting_character]
+
+    world.weapon_list = {
+        "Cracked Bat": EBWeapon("Ness", "Bash", 0x155297),
+        "Tee Ball Bat": EBWeapon("Ness", "Bash", 0x1552BE),
+        "Sand Lot Bat": EBWeapon("Ness", "Bash", 0x1552E5),
+        "Minor League Bat": EBWeapon("Ness", "Bash", 0x15530C),
+        "Mr. Baseball Bat": EBWeapon("Ness", "Bash", 0x155333),
+        "Big League Bat": EBWeapon("Ness", "Bash", 0x157073),
+        "Hall of Fame Bat": EBWeapon("Ness", "Bash", 0x155381),
+        "Magicant Bat": EBWeapon("Ness", "Bash", 0x1553A8),
+        "Legendary Bat": EBWeapon("Ness", "Bash", 0x1553CF),
+        "Gutsy Bat": EBWeapon("Ness", "Bash", 0x1553F6),
+        "Casey Bat": EBWeapon("Ness", "Bash", 0x15541D),
+        "Fry Pan": EBWeapon("Paula", "Bash", 0x155444),
+        "Thick Fry Pan": EBWeapon("Paula", "Bash", 0x15546B),
+        "Deluxe Fry Pan": EBWeapon("Paula", "Bash", 0x155492),
+        "Chef's Fry Pan": EBWeapon("Paula", "Bash", 0x1554B9),
+        "French Fry Pan": EBWeapon("Paula", "Bash", 0x1554E0),
+        "Magic Fry Pan": EBWeapon("Paula", "Bash", 0x155507),
+        "Holy Fry Pan": EBWeapon("Paula", "Bash", 0x15552E),
+        "Sword of Kings": EBWeapon("Poo", "Bash", 0x155555),
+        "Pop Gun": EBWeapon("Jeff", "Shoot", 0x15557C),
+        "Stun Gun": EBWeapon("Jeff", "Shoot", 0x1555A3),
+        "Toy Air Gun": EBWeapon("Jeff", "Shoot", 0x1555CA),
+        "Magnum Air Gun": EBWeapon("Jeff", "Shoot", 0x1555F1),
+        "Zip Gun": EBWeapon("Jeff", "Shoot", 0x155618),
+        "Laser Gun": EBWeapon("Jeff", "Shoot", 0x15563F),
+        "Hyper Beam": EBWeapon("Jeff", "Shoot", 0x155666),
+        "Crusher Beam": EBWeapon("Jeff", "Shoot", 0x15568D),
+        "Spectrum Beam": EBWeapon("Jeff", "Shoot", 0x1556B4),
+        "Death Ray": EBWeapon("Jeff", "Shoot", 0x1556DB),
+        "Baddest Beam": EBWeapon("Jeff", "Shoot", 0x155702),
+        "Moon Beam Gun": EBWeapon("Jeff", "Shoot", 0x155729),
+        "Gaia Beam": EBWeapon("Jeff", "Shoot", 0x155750),
+        "Yo-yo": EBWeapon("All", "Shoot", 0x155777),
+        "Slingshot": EBWeapon("All", "Shoot", 0x15579E),
+        "Bionic Slingshot": EBWeapon("All", "Shoot", 0x1557C5),
+        "Trick Yo-yo": EBWeapon("All", "Shoot", 0x1557EC),
+        "Combat Yo-yo": EBWeapon("All", "Shoot", 0x155813),
+        "T-Rex's Bat": EBWeapon("Ness", "Bash", 0x15704C),
+        "Ultimate Bat": EBWeapon("Ness", "Bash", 0x15709A),
+        "Double Beam": EBWeapon("Jeff", "Shoot", 0x1570C1),
+        "Non-stick Frypan": EBWeapon("Paula", "Bash", 0x1575C8)
+    }
+
+    all_weapons = [
+        "Cracked Bat",
+        "Tee Ball Bat",
+        "Sand Lot Bat",
+        "Minor League Bat",
+        "Mr. Baseball Bat",
+        "T-Rex's Bat",
+        "Big League Bat",
+        "Hall of Fame Bat",
+        "Ultimate Bat",
+        "Casey Bat",
+        "Magicant Bat",
+        "Legendary Bat",
+        "Gutsy Bat",
+        
+        "Fry Pan",
+        "Thick Fry Pan",
+        "Deluxe Fry Pan",
+        "Chef's Fry Pan",
+        "Non-stick Frypan",
+        "French Fry Pan",
+        "Holy Fry Pan",
+        "Magic Fry Pan",
+
+        "Sword of Kings",
+        "Pop Gun",
+        "Stun Gun",
+        "Toy Air Gun",
+        "Magnum Air Gun",
+        "Zip Gun",
+        "Laser Gun",
+        "Hyper Beam",
+        "Double Beam",
+        "Crusher Beam",
+        "Spectrum Beam",
+        "Death Ray",
+        "Baddest Beam",
+        "Moon Beam Gun",
+        "Gaia Beam",
+        "Yo-yo",
+        "Slingshot",
+        "Bionic Slingshot",
+        "Trick Yo-yo",
+        "Combat Yo-yo"
+    ]
+
+    for item in all_weapons:
+        weapon = world.weapon_list[item]
+
+        if world.options.weaponizer == Weaponizer.option_chaos:
+            chance = world.random.randint(1, 100)
+            if chance < 8:
+                weapon.can_equip = "All"
+            else:
+                weapon.can_equip = world.random.choice(["Ness", "Paula", "Jeff", "Poo"])
+
+            if item == starting_weapon:
+                weapon.can_equip = world.starting_character
+
+        if item in summers_addresses:
+            weapon.double_price_item = item
+
+        if weapon.can_equip == "Ness":
+            progressive_bats.append(item)
+        elif weapon.can_equip == "Paula":
+            progressive_pans.append(item)
+        elif weapon.can_equip == "Jeff":
+            progressive_guns.append(item)
+
+        if item == starting_weapon and not world.options.progressive_weapons:  # Todo; remove not progressive weapons
+            weapon.offense = 10
+        else:
+            if world.options.progressive_weapons:
+                weapon.offense = world.random.randint(10, weapon_cap)
+            else:
+                weapon.offense = world.random.randint(1, weapon_cap)
+
+        if weapon.can_equip == "Poo":
+            front_name = world.random.choice(weapon_names[weapon.can_equip])
+            back_name = world.random.choice(royal_names)
+        else:
+            front_name = world.random.choice(adjectives)
+            back_name = world.random.choice(weapon_names[weapon.can_equip])
+
+        chance = world.random.randint(0, 100)
+        if chance < 8:
+            weapon.aux_stat = world.random.randint(1, 127)
+        else:
+            weapon.aux_stat = 0
+
+        if weapon.can_equip in ["Jeff", "All"]:
+            weapon.equip_type = "Shoot"
+        else:
+            weapon.equip_type = "Bash"
+
+        chance = world.random.randint(1, 100)
+        if chance < 4 and item != starting_weapon:
+            weapon.miss_rate = 12
+        else:
+            weapon.miss_rate = miss_rates[weapon.can_equip]
+
+        weapon.name = front_name + " " + back_name
+
+        pixel_length = calc_pixel_width(weapon.name)
+        half_space = False
+
+        if weapon.can_equip == "Poo":
+            names_to_try = royal_names.copy()
+        else:
+            names_to_try = weapon_names[weapon.can_equip].copy()
+
+        while pixel_length > 70 or weapon.name in taken_names:
+            # First we replace any spaces with half-width spaces, a common tech used in vanilla to fix long names
+            if half_space is False:
+                weapon.name = weapon.name.replace(" ", " ")
+                half_space = True
+            else:
+                if names_to_try:
+                    # If it's still too long, change the second part of the name to try and roll a shorter name
+                    back_name = world.random.choice(names_to_try)
+                    names_to_try.remove(back_name)
+                else:
+                    # If it's *STILL* too long, chop a letter off the end of the front
+                    front_name = front_name[:-1]
+                    if front_name == "":
+                        # we ran out of letters rip
+                        front_name = "Long"
+                half_space = False
+                weapon.name = front_name + " " + back_name
+            pixel_length = calc_pixel_width(weapon.name)
+        rom.write_bytes(weapon.address + 28, bytearray([usage_bytes[weapon.can_equip]]))
+        rom.write_bytes(weapon.address + 25, bytearray([type_bytes[weapon.equip_type]]))
+        taken_names.append(weapon.name)
+
+    sortable_weapons = copy.deepcopy(world.weapon_list)
+    sorted_weapons = sorted(sortable_weapons.values(), key=attrgetter("offense"))
+
+    sorted_bats = [weapon for weapon in sorted_weapons if weapon.can_equip == "Ness"]
+    sorted_pans = [weapon for weapon in sorted_weapons if weapon.can_equip == "Paula"]
+    sorted_guns = [weapon for weapon in sorted_weapons if weapon.can_equip == "Jeff"]
+    sorted_swords = [weapon for weapon in sorted_weapons if weapon.can_equip == "Poo"]
+    sorted_alls = [weapon for weapon in sorted_weapons if weapon.can_equip == "All"]
+
+    sorts = [
+        sorted_bats,
+        sorted_pans,
+        sorted_guns,
+        sorted_alls,
+        sorted_swords
+    ]
+
+    prog_weapons = [
+        progressive_bats,
+        progressive_pans,
+        progressive_guns,
+        progressive_alls
+    ]
+
+    for i in range(5):
+        price_weapons(world, sorts[i], rom)
+
+    if world.options.progressive_weapons:
+        for i in range(4):
+            apply_progressive_weapons(world, prog_weapons[i], sorts[i], rom)
+
+    for item in all_weapons:
+        weapon = world.weapon_list[item]
+
+        if weapon.can_equip == "Poo":
+            weapon.poo_off = weapon.offense
+        else:
+            weapon.poo_off = 250
+
+        rom.write_bytes(weapon.address + 31, bytearray([
+            weapon.offense, weapon.poo_off, weapon.aux_stat, weapon.miss_rate]))
+
+        item_name = text_encoder(weapon.name, 25)
+        item_name.extend([0x00])
+        
+        description = f" “{weapon.name}”\n"
+        if weapon.can_equip != "All":
+            description += f"@♪ can equip this weapon.\n"
+
+        description += f"@+{weapon.offense} Offense.\n"
+        if weapon.aux_stat > 0:
+            description += f"@+{weapon.aux_stat} Guts.\n"
+        
+        if weapon.miss_rate == 12:
+            description += "@If you use this, you might just whiff.\n"
+
+        description = text_encoder(description, 0x100)
+        description = description[:-2]
+        description.extend([0x13, 0x02])
+
+        if weapon.can_equip != "All":
+            index = description.index(0xAC)
+            description[index:index + 1] = bytearray([0x1C, 0x02, char_nums[weapon.can_equip]])
+
+        rom.write_bytes(weapon.address, item_name)
+        rom.write_bytes((0x310000 + world.description_pointer), description)
+        rom.write_bytes((weapon.address + 35), struct.pack("I", (0xF10000 + world.description_pointer)))
+        if item == "Big League Bat":
+            rom.write_bytes(summers_addresses[item] + 28, bytearray([usage_bytes[weapon.can_equip]]))
+            rom.write_bytes(summers_addresses[item] + 31, bytearray([weapon.offense, weapon.poo_off, weapon.aux_stat, weapon.miss_rate]))
+            rom.write_bytes(summers_addresses[item] + 25, bytearray([type_bytes[weapon.equip_type]]))
+            rom.write_bytes(summers_addresses[item], item_name)
+            rom.write_bytes((summers_addresses[item] + 35), struct.pack("I", (0xF10000 + world.description_pointer)))
+        world.description_pointer += len(description)
+            
diff --git a/worlds/earthbound/modules/flavor_data.py b/worlds/earthbound/modules/flavor_data.py
new file mode 100644
index 0000000000..f04f235586
--- /dev/null
+++ b/worlds/earthbound/modules/flavor_data.py
@@ -0,0 +1,328 @@
+from ..game_data.text_data import eb_text_table
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+
+random_flavors = [
+    "Mint flavor",
+    "Strawberry flavor",
+    "Banana flavor",
+    "Peanut flavor",
+    "Crystal flavor",
+    "Cherry flavor",
+    "Grape flavor",
+    "Blueberry flavor",
+    "Handheld flavor",
+    "Rotten flavor",
+    "Golden flavor",
+    "Herbal flavor",
+    "Cherry Cola flavor",
+    "Salt and Pepper flavor",
+    "Pizza flavor",
+    "Cotton Candy flavor",
+    "Potato flavor",
+    "Lemon-lime flavor",
+    "Raisin flavor",
+    "Chocolate flavor",
+    "Ginger Ale flavor",
+    "Orange Cream flavor",
+    "Choco Cream flavor",
+    "Doomed flavor",
+    "Farm flavor",
+    "Negative flavor",
+    "Astral flavor",
+    "Sunflower flavor",
+    "Encore flavor",
+    "Experimental flavor",
+    "Blueblue flavor",
+    "Deeppurple flavor",
+    "Rivalry flavor",
+    "Sugar flavor",
+    "Faith flavor",
+    "Wisdom flavor",
+    "Hamburger flavor",
+    "Spearmint flavor",
+    "Tuna flavor",
+    "Milk flavor",
+    "Peppermint flavor",
+    "Toothpaste flavor",
+    "Barbecue flavor",
+    "Lavender flavor",
+    "Apple flavor",
+    "Peach flavor",
+    "Bubblegum flavor",
+    "Orange flavor",
+    "Toilet flavor",
+    "Lemonade flavor",
+    "Garlic flavor"
+]
+
+
+flavor_data = {
+    "Cherry flavor": [0x00, 0x00, 0xde, 0x5f, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0xf2, 0x41, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0xda, 0x28, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xba, 0x49, 0x3f, 0x56, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xde, 0x5f, 0x44, 0x06, 0x44, 0x2a, 0x80, 0x3b, 0x7f, 0x67, 0xda, 0x28, 0xaa, 0x28],
+
+    "Grape flavor": [0x00, 0x00, 0xde, 0x5f, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x2f, 0x4a, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0x13, 0x4c, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0xc8, 0x40, 0x2f, 0x55, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                     0x80, 0x3b, 0xde, 0x5f, 0x44, 0x30, 0x44, 0x30, 0x80, 0x3b, 0x5f, 0x63, 0xb2, 0x69, 0xc7, 0x28],
+
+    "Blueberry flavor": [0x00, 0x00, 0xde, 0x5f, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x4d, 0x4a, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0x86, 0x7d, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0x04, 0x41, 0x04, 0x56, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x80, 0x3b, 0xbd, 0x77, 0x63, 0x30, 0x63, 0x30, 0x80, 0x3b, 0xb9, 0x77, 0xa4, 0x55, 0xc4, 0x28],
+
+    "Handheld flavor": [0x00, 0x00, 0xff, 0x7f, 0xab, 0x29, 0xa3, 0x0c, 0x80, 0x3b, 0xff, 0x77, 0x6f, 0x36, 0xa3, 0x0c,
+                        0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xd4, 0x4e, 0xeb, 0x25, 0xa3, 0x0c,
+                        0x80, 0x3b, 0xff, 0x77, 0xec, 0x2d, 0x57, 0x5f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x80, 0x3b, 0xff, 0x77, 0x89, 0x25, 0xa3, 0x0c, 0x80, 0x3b, 0x50, 0x3e, 0xab, 0x29, 0x47, 0x1d],
+
+    "Rotten flavor": [0x00, 0x00, 0xbf, 0x57, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xa8, 0x42, 0x84, 0x31, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbe, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0x16, 0x56, 0x84, 0x18, 0xc7, 0x24, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0x16, 0x56, 0x10, 0x20, 0x10, 0x20, 0x80, 0x3b, 0x18, 0x42, 0x8a, 0x30, 0x44, 0x20],
+
+    "Golden flavor": [0x00, 0x00, 0xbf, 0x57, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xbf, 0x4b, 0x18, 0x22, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbe, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0xff, 0x6f, 0x50, 0x08, 0x58, 0x11, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xff, 0x6f, 0x9f, 0x30, 0x9f, 0x30, 0x80, 0x3b, 0xff, 0x63, 0xfd, 0x2a, 0xaa, 0x1c],
+
+    "Herbal flavor": [0x00, 0x00, 0xbf, 0x57, 0x9c, 0x2d, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x6d, 0x46, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbe, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0xdd, 0x6f, 0x86, 0x21, 0x69, 0x22, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xdd, 0x6f, 0x48, 0x6e, 0x48, 0x6e, 0x80, 0x3b, 0xba, 0x63, 0xaa, 0x2a, 0x06, 0x29],
+
+    "Cherry Cola flavor": [0x00, 0x00, 0xde, 0x5f, 0x9c, 0x2d, 0x08, 0x14, 0x80, 0x3b, 0x9f, 0x2d, 0x76, 0x24, 0x08, 0x14,
+                           0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0x9f, 0x2d, 0x08, 0x14,
+                           0x80, 0x3b, 0xff, 0x5e, 0x73, 0x04, 0x89, 0x00, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                           0x80, 0x3b, 0xff, 0x5e, 0x89, 0x00, 0x89, 0x00, 0x80, 0x3b, 0x9f, 0x2d, 0x89, 0x00, 0x08, 0x14],
+
+    "Salt and Pepper flavor": [0x00, 0x00, 0xff, 0x7f, 0x39, 0x67, 0xa5, 0x20, 0x80, 0x3b, 0xff, 0x77, 0x0d, 0x4e, 0xa5, 0x20,
+                               0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0x51, 0x4e, 0xdd, 0x7f, 0xa5, 0x20,
+                               0x00, 0x00, 0xff, 0x7f, 0x31, 0x52, 0x59, 0x77, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                               0x80, 0x3b, 0xff, 0x7f, 0x00, 0x00, 0x40, 0x10, 0x80, 0x3b, 0x30, 0x46, 0x6a, 0x2d, 0x83, 0x14],
+
+    "Pizza flavor": [0x00, 0x00, 0xde, 0x5f, 0x39, 0x67, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x1e, 0x0e, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                     0x00, 0x00, 0x7f, 0x5b, 0xb5, 0x10, 0xbe, 0x2a, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                     0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x7f, 0x5b, 0xbe, 0x2a, 0xc7, 0x28],
+
+    "Cotton Candy flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x7f, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x6a, 0x56, 0x25, 0x14,
+                            0x80, 0x3b, 0xde, 0x5f, 0x1b, 0x1c, 0x1b, 0x1c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                            0x00, 0x00, 0x9f, 0x73, 0xf1, 0x62, 0xfe, 0x3d, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                            0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x9f, 0x73, 0xfe, 0x3d, 0xc7, 0x28],
+
+    "Crystal flavor": [0x00, 0x00, 0xde, 0x5f, 0x8c, 0x31, 0x02, 0x28, 0x80, 0x3b, 0xff, 0x77, 0x6d, 0x3a, 0x02, 0x28,
+                       0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x02, 0x28,
+                       0x80, 0x3b, 0xff, 0x7f, 0x00, 0x40, 0x00, 0x40, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                       0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0xad, 0x35, 0x5a, 0x6b, 0xc6, 0x18],
+
+    "Potato flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x7b, 0x55, 0x4e, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0x48, 0x10, 0x57, 0x4a, 0x1b, 0x57, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0x48, 0x10, 0x18, 0x19, 0x18, 0x15, 0x80, 0x3b, 0xff, 0x73, 0x1c, 0x57, 0xca, 0x28],
+
+    "Lemon-lime flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x5b, 0x9e, 0x17, 0x25, 0x14,
+                          0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x25, 0x0a, 0x25, 0x14,
+                          0x80, 0x3b, 0x25, 0x0a, 0xfd, 0x37, 0xaf, 0x17, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                          0x80, 0x3b, 0x25, 0x0a, 0xcf, 0x17, 0xcf, 0x17, 0x80, 0x3b, 0x25, 0x0a, 0xcf, 0x17, 0xc7, 0x28],
+
+    "Raisin flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0x94, 0x61, 0x0a, 0x41, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0xfb, 0x6e, 0x44, 0x18, 0xc7, 0x20, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xfb, 0x6e, 0x95, 0x20, 0x95, 0x20, 0x80, 0x3b, 0xfb, 0x6e, 0x0c, 0x55, 0x84, 0x20],
+
+    "Chocolate flavor": [0x00, 0x00, 0xde, 0x5f, 0x8e, 0x09, 0x43, 0x0c, 0x80, 0x3b, 0x37, 0x3a, 0x10, 0x21, 0x43, 0x0c,
+                         0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x43, 0x0c,
+                         0x80, 0x3b, 0x3c, 0x57, 0x25, 0x0c, 0x8a, 0x10, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x80, 0x3b, 0x3c, 0x57, 0x38, 0x32, 0x38, 0x32, 0x80, 0x3b, 0xd2, 0x31, 0x88, 0x14, 0x43, 0x0c],
+
+    "Ginger Ale flavor": [0x00, 0x00, 0xde, 0x5f, 0x8e, 0x09, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x6f, 0x6d, 0x3a, 0x25, 0x14,
+                          0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0xed, 0x12, 0x25, 0x14,
+                          0x80, 0x3b, 0x9f, 0x57, 0xed, 0x12, 0x80, 0x11, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                          0x80, 0x3b, 0x9f, 0x57, 0xb6, 0x09, 0xb6, 0x09, 0x80, 0x3b, 0x9f, 0x57, 0x80, 0x11, 0xe0, 0x00],
+
+    "Orange Cream flavor": [0x00, 0x00, 0xde, 0x5f, 0x8e, 0x09, 0x25, 0x14, 0x80, 0x3b, 0x9f, 0x6b, 0x9f, 0x2a, 0x25, 0x14,
+                            0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0x5f, 0x12, 0x25, 0x14,
+                            0x80, 0x3b, 0xda, 0x09, 0x3f, 0x53, 0x5f, 0x12, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                            0x00, 0x00, 0xda, 0x09, 0x3f, 0x53, 0x3f, 0x53, 0x80, 0x3b, 0x9f, 0x6b, 0x5f, 0x12, 0x89, 0x00],
+
+    "Amethyst flavor": [0x00, 0x00, 0xde, 0x5f, 0x8e, 0x09, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0xf2, 0x41, 0x25, 0x14,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xdf, 0x67, 0x3c, 0x78, 0x25, 0x14,
+                        0x80, 0x3b, 0xde, 0x73, 0xaf, 0x40, 0x3c, 0x78, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0xde, 0x73, 0x1f, 0x68, 0x1f, 0x68, 0x80, 0x3b, 0x7f, 0x67, 0x3c, 0x78, 0xaf, 0x40],
+
+    "Choco Cream flavor": [0x00, 0x00, 0xde, 0x5f, 0x8e, 0x09, 0x25, 0x14, 0x28, 0x21, 0xee, 0x39, 0x08, 0x25, 0x25, 0x14,
+                           0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xdf, 0x67, 0x4f, 0x79, 0x25, 0x14,
+                           0x80, 0x3b, 0xc8, 0x28, 0x18, 0x6b, 0xdf, 0x77, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                           0x00, 0x00, 0xc8, 0x28, 0x70, 0x4b, 0x70, 0x4b, 0x80, 0x3b, 0xdf, 0x7b, 0xf8, 0x5e, 0x06, 0x29],
+
+    "Doomed flavor": [0x00, 0x00, 0x1f, 0x00, 0x8e, 0x09, 0x25, 0x14, 0x00, 0x00, 0x19, 0x00, 0x0a, 0x00, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xdf, 0x67, 0x1f, 0x00, 0x25, 0x14,
+                      0x80, 0x3b, 0x1f, 0x00, 0x4a, 0x29, 0x2a, 0x29, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x00, 0x00, 0x19, 0x18, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3b, 0xef, 0x3d, 0x6b, 0x2d, 0x84, 0x10],
+
+    "Farm flavor": [0x00, 0x00, 0xbd, 0x32, 0x8e, 0x09, 0x4a, 0x04, 0x00, 0x00, 0xde, 0x32, 0x1a, 0x1e, 0x4a, 0x04,
+                    0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xdf, 0x67, 0x7f, 0x02, 0x4a, 0x04,
+                    0x80, 0x3b, 0x4a, 0x00, 0x1f, 0x3b, 0x9d, 0x2e, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                    0x00, 0x00, 0x5f, 0x43, 0xbb, 0x3a, 0xbb, 0x3a, 0x80, 0x3b, 0x5e, 0x02, 0x36, 0x01, 0xf0, 0x04],
+
+    "Inverted flavor": [0x00, 0x00, 0x00, 0x00, 0x8e, 0x09, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f,
+                        0x80, 0x3b, 0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x80, 0x3b, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x00],
+
+    "Negative flavor": [0x00, 0x00, 0xff, 0x7f, 0x8e, 0x09, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x00,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00,
+                        0x80, 0x3b, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3b, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00],
+
+    "Astral flavor": [0x00, 0x00, 0x5b, 0x7f, 0x8e, 0x09, 0x21, 0x14, 0x00, 0x00, 0xff, 0x77, 0xed, 0x58, 0x21, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xfa, 0x7a, 0x92, 0x6c, 0x21, 0x14,
+                      0x80, 0x3b, 0x5b, 0x7f, 0xed, 0x58, 0x87, 0x38, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x00, 0x00, 0x5b, 0x7f, 0xd3, 0x79, 0xd3, 0x79, 0x80, 0x3b, 0xfa, 0x7a, 0xa8, 0x38, 0x21, 0x1c],
+
+    "Sunflower flavor": [0x00, 0x00, 0xdf, 0x63, 0x8e, 0x09, 0x65, 0x04, 0x00, 0x00, 0xbf, 0x57, 0xb3, 0x15, 0x65, 0x04,
+                         0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xdf, 0x57, 0x9a, 0x12, 0x65, 0x04,
+                         0x80, 0x3b, 0xdf, 0x63, 0x1c, 0x37, 0xdf, 0x37, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x00, 0x00, 0xdf, 0x63, 0x70, 0x09, 0x70, 0x09, 0x80, 0x3b, 0xdf, 0x57, 0xdb, 0x26, 0x4e, 0x15],
+
+    "Encore flavor": [0x00, 0x00, 0xff, 0x7f, 0x73, 0x4e, 0x84, 0x1c, 0x00, 0x00, 0xbd, 0x7f, 0x8b, 0x45, 0x84, 0x1c,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0x5f, 0x6f, 0x4a, 0x59, 0x84, 0x1c,
+                      0x80, 0x3b, 0xff, 0x7f, 0x12, 0x7e, 0xbf, 0x27, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x00, 0x00, 0xff, 0x7f, 0x7f, 0x3c, 0x7f, 0x3c, 0x80, 0x3b, 0x5f, 0x6f, 0x7e, 0x40, 0x31, 0x1c],
+
+    "Experimental flavor": [0x00, 0x00, 0x9e, 0x5f, 0x80, 0x65, 0x64, 0x08, 0x00, 0x00, 0xff, 0x77, 0x2c, 0x15, 0x64, 0x08,
+                            0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0x35, 0x7f, 0x0a, 0x7a, 0x64, 0x08,
+                            0x80, 0x3b, 0x9e, 0x5f, 0x50, 0x19, 0xec, 0x10, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                            0x00, 0x00, 0x9e, 0x5f, 0x4a, 0x7a, 0x4a, 0x7a, 0x80, 0x3b, 0x35, 0x7f, 0x47, 0x76, 0xe4, 0x38],
+
+    "Blueblue flavor": [0x00, 0x00, 0x97, 0x7b, 0x00, 0x4c, 0x21, 0x14, 0x00, 0x00, 0x0c, 0x66, 0xc3, 0x28, 0x21, 0x14,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0x08, 0x6e, 0x24, 0x55, 0x21, 0x14,
+                        0x80, 0x3b, 0x97, 0x7b, 0x82, 0x20, 0x62, 0x45, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0x97, 0x7b, 0x27, 0x71, 0x27, 0x71, 0x80, 0x3b, 0x08, 0x6e, 0x43, 0x49, 0x82, 0x1c],
+
+    "Deeppurple flavor": [0x00, 0x00, 0xfb, 0x7a, 0x13, 0x4c, 0x25, 0x10, 0x00, 0x00, 0x16, 0x69, 0x8b, 0x40, 0x25, 0x10,
+                          0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0xeb, 0x33, 0x73, 0x70, 0x2b, 0x44, 0x21, 0x14,
+                          0x80, 0x3b, 0xfb, 0x7a, 0x29, 0x30, 0x4c, 0x44, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                          0x00, 0x00, 0xfb, 0x7a, 0x17, 0x6c, 0x17, 0x6c, 0x80, 0x3b, 0x73, 0x70, 0x6c, 0x48, 0x45, 0x1c],
+
+    "Rivalry flavor": [0x00, 0x00, 0xfe, 0x5e, 0x0c, 0x7c, 0x25, 0x04, 0x00, 0x00, 0x5e, 0x1d, 0x70, 0x0c, 0x25, 0x04,
+                       0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0xeb, 0x33, 0x15, 0x7f, 0xb3, 0x14, 0x25, 0x04,
+                       0x80, 0x3b, 0xfe, 0x5e, 0xea, 0x59, 0x6d, 0x6a, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                       0x00, 0x00, 0xfe, 0x5e, 0xc0, 0x6d, 0xc0, 0x6d, 0x80, 0x3b, 0x15, 0x7f, 0x86, 0x55, 0xe4, 0x34],
+
+    "Sugar flavor": [0x00, 0x00, 0x9c, 0x73, 0x39, 0x67, 0x63, 0x0c, 0x00, 0x00, 0x9c, 0x73, 0x52, 0x4a, 0x63, 0x0c,
+                     0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0xeb, 0x33, 0x9c, 0x73, 0x4a, 0x29, 0x63, 0x0c,
+                     0x80, 0x3b, 0x42, 0x08, 0xff, 0x7f, 0x39, 0x67, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                     0x00, 0x00, 0x9c, 0x73, 0x42, 0x08, 0x42, 0x08, 0xe0, 0x33, 0x9c, 0x73, 0xf7, 0x5e, 0x8c, 0x31],
+
+    "Faith flavor": [0x00, 0x00, 0xfe, 0x77, 0x3f, 0x67, 0x45, 0x10, 0x00, 0x00, 0xbe, 0x63, 0x7b, 0x3e, 0x45, 0x10,
+                     0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0xeb, 0x33, 0x5d, 0x43, 0x9f, 0x40, 0x45, 0x10,
+                     0xec, 0x33, 0xfe, 0x77, 0xdd, 0x72, 0x3c, 0x66, 0x80, 0x3b, 0x4a, 0x29, 0x08, 0x21, 0xa5, 0x14,
+                     0x00, 0x00, 0xdf, 0x77, 0x1d, 0x28, 0x1d, 0x28, 0xe0, 0x33, 0xdf, 0x6a, 0x9f, 0x51, 0x4e, 0x1c],
+
+    "Wisdom flavor": [0x00, 0x00, 0xfe, 0x77, 0x80, 0x19, 0x40, 0x04, 0x00, 0x00, 0xb3, 0x46, 0x89, 0x1d, 0x40, 0x04,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0xeb, 0x33, 0xb3, 0x46, 0x20, 0x1d, 0x40, 0x04,
+                      0xec, 0x33, 0xc1, 0x10, 0x24, 0x2e, 0x80, 0x25, 0x80, 0x3b, 0x4a, 0x29, 0x08, 0x21, 0xa5, 0x14,
+                      0x00, 0x00, 0xfe, 0x77, 0x29, 0x25, 0x29, 0x25, 0xe0, 0x33, 0xcc, 0x46, 0x24, 0x2e, 0x20, 0x11],
+    
+    "Hamburger flavor": [0x00, 0x00, 0xbf, 0x6b, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0xdc, 0x36, 0xd1, 0x19, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x6b, 0xfd, 0x1a, 0x25, 0x14,
+                         0x80, 0x3b, 0x00, 0x00, 0x54, 0x08, 0x9f, 0x2f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x80, 0x3b, 0xff, 0x77, 0x0d, 0x1b, 0x0d, 0x1b, 0x80, 0x3b, 0x50, 0x11, 0x16, 0x2e, 0x85, 0x10],
+
+    "Spearmint flavor": [0x00, 0x00, 0xde, 0x5f, 0x07, 0x1f, 0x25, 0x14, 0x00, 0x00, 0xff, 0x77, 0x8f, 0x3e, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0x4e, 0x7d, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0xa6, 0x1e, 0x6e, 0x3f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x00, 0x00, 0xde, 0x5f, 0x50, 0x71, 0x50, 0x71, 0x80, 0x3b, 0xf9, 0x67, 0x4d, 0x3b, 0x88, 0x24],
+
+    "Tuna flavor": [0x00, 0x00, 0xde, 0x5f, 0x07, 0x1f, 0x25, 0x14, 0x00, 0x00, 0xff, 0x77, 0x93, 0x42, 0x25, 0x14,
+                    0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0x4e, 0x7d, 0x25, 0x14,
+                    0x80, 0x3b, 0xde, 0x5f, 0x58, 0x29, 0x14, 0x21, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                    0x00, 0x00, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x1f, 0x63, 0x9b, 0x31, 0x68, 0x14],
+
+    "Milk flavor": [0x00, 0x00, 0xde, 0x5f, 0x07, 0x1f, 0x25, 0x14, 0x00, 0x00, 0xff, 0x77, 0x73, 0x4e, 0x25, 0x14,
+                    0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0x4e, 0x7d, 0x25, 0x14,
+                    0x80, 0x3b, 0x42, 0x08, 0xb5, 0x4e, 0x7b, 0x67, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                    0x00, 0x00, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0xbd, 0x77, 0xf7, 0x5e, 0xc7, 0x28],
+
+    "Peppermint flavor": [0x00, 0x00, 0xfe, 0x73, 0xde, 0x5f, 0x25, 0x14, 0x45, 0x1a, 0x7f, 0x4e, 0xd9, 0x00, 0x25, 0x14,
+                          0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xff, 0x7f, 0xd9, 0x00, 0x25, 0x14,
+                          0x80, 0x3b, 0x42, 0x08, 0xff, 0x7f, 0xd9, 0x00, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                          0x00, 0x00, 0xff, 0x7f, 0x13, 0x18, 0x13, 0x00, 0x80, 0x3b, 0xff, 0x7f, 0xdf, 0x18, 0x68, 0x14],
+    
+    "Toothpaste flavor": [0x00, 0x00, 0xfe, 0x73, 0xde, 0x5f, 0x25, 0x14, 0x45, 0x1a, 0xf3, 0x7f, 0x20, 0x7f, 0x25, 0x14,
+                          0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xff, 0x7f, 0x20, 0x7f, 0x25, 0x14,
+                          0x80, 0x3b, 0x42, 0x08, 0xec, 0x7f, 0x26, 0x7f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                          0x00, 0x00, 0xff, 0x7f, 0x66, 0x7e, 0x66, 0x7e, 0x80, 0x3b, 0xf3, 0x7f, 0x20, 0x67, 0x68, 0x14],
+    
+    "Barbecue flavor": [0x00, 0x00, 0xde, 0x5f, 0x4c, 0x00, 0x06, 0x00, 0x45, 0x1a, 0xd3, 0x00, 0x4c, 0x00, 0x06, 0x00,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xd3, 0x00, 0x0c, 0x00, 0x06, 0x00,
+                        0x80, 0x3b, 0xff, 0x7f, 0x0c, 0x00, 0x99, 0x01, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0x7f, 0x02, 0x4c, 0x00, 0x4c, 0x00, 0x80, 0x3b, 0xb0, 0x14, 0x4c, 0x00, 0x06, 0x00],
+
+    "Lavender flavor": [0x00, 0x00, 0xde, 0x5f, 0x39, 0x7f, 0x25, 0x14, 0x45, 0x1a, 0xff, 0x77, 0x93, 0x3e, 0x25, 0x14,
+                        0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x00, 0x00, 0xbf, 0x57, 0x79, 0x7e, 0x25, 0x14,
+                        0x80, 0x3b, 0x86, 0x10, 0x39, 0x7f, 0x3f, 0x7f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                        0x00, 0x00, 0xde, 0x5f, 0x73, 0x7e, 0x73, 0x7e, 0x80, 0x3b, 0x3f, 0x7f, 0x39, 0x7f, 0x25, 0x14],
+    
+    "Apple flavor": [0x00, 0x00, 0xde, 0x5f, 0x1F, 0x00, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x6d, 0x3a, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0xdf, 0x18, 0x19, 0x00, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                     0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x3f, 0x67, 0xdf, 0x18, 0xc7, 0x28],
+
+    "Orange flavor": [0x00, 0x00, 0xde, 0x5f, 0x9F, 0x01, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x6d, 0x3a, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0x0c, 0x00, 0x9f, 0x19, 0x7f, 0x1a, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xde, 0x5f, 0x79, 0x02, 0x79, 0x02, 0x80, 0x3b, 0x3f, 0x67, 0xff, 0x2a, 0xc7, 0x28],
+
+    "Toilet flavor": [0x00, 0x00, 0xde, 0x5f, 0xff, 0x7f, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x67, 0x93, 0x01, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                      0x80, 0x3b, 0x32, 0x01, 0x33, 0x7f, 0x66, 0x7e, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0x8c, 0x01, 0x3f, 0x1b, 0x3f, 0x1b, 0x80, 0x3b, 0xff, 0x7f, 0x9c, 0x7f, 0xc7, 0x28],
+
+    "Peach flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x1b, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x77, 0x6d, 0x3a, 0x25, 0x14,
+                     0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                     0x80, 0x3b, 0xc6, 0x00, 0x7f, 0x32, 0x3f, 0x33, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                     0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x3f, 0x4f, 0x7f, 0x32, 0xc7, 0x28],
+
+    "Bubblegum flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0x3f, 0x67, 0x7f, 0x7e, 0x25, 0x14,
+                         0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xbf, 0x57, 0x4f, 0x79, 0x25, 0x14,
+                         0x80, 0x3b, 0x86, 0x10, 0x3f, 0x7f, 0x79, 0x7e, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                         0x80, 0x3b, 0x86, 0x10, 0x9f, 0x65, 0x9f, 0x65, 0x80, 0x3b, 0x3f, 0x7f, 0x7f, 0x7e, 0xc7, 0x28],
+
+    "Lemonade flavor": [0x00, 0x00, 0xde, 0x5f, 0x3f, 0x67, 0x25, 0x14, 0x80, 0x3b, 0xde, 0x63, 0x1e, 0x5f, 0x25, 0x14,
+                             0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0x3f, 0x67, 0x4e, 0x7d, 0x25, 0x14,
+                             0x80, 0x3b, 0xc6, 0x00, 0x1e, 0x5f, 0xff, 0x4f, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                             0x80, 0x3b, 0xde, 0x5f, 0x52, 0x79, 0x52, 0x79, 0x80, 0x3b, 0x9e, 0x5f, 0x1e, 0x5f, 0xc7, 0x28],
+
+    "Garlic flavor": [0x00, 0x00, 0xff, 0x03, 0xff, 0x03, 0x25, 0x14, 0x80, 0x3b, 0xff, 0x33, 0x19, 0x64, 0x25, 0x14,
+                      0x80, 0x3b, 0xde, 0x5f, 0xbf, 0x4c, 0xbf, 0x4c, 0x80, 0x3b, 0xff, 0x1b, 0x13, 0x4c, 0x25, 0x14,
+                      0x80, 0x3b, 0xc6, 0x00, 0x79, 0x02, 0x3f, 0x1b, 0x80, 0x3b, 0xe7, 0x1c, 0xa5, 0x14, 0x42, 0x08,
+                      0x80, 0x3b, 0xde, 0x5f, 0x13, 0x4c, 0x13, 0x4c, 0x80, 0x3b, 0xff, 0x33, 0x19, 0x64, 0xc7, 0x28]
+
+}
+
+vanilla_flavor_pointers = {
+    "Mint flavor": [0x202008, 0x34B000, 0x34B110],
+    "Strawberry flavor": [0x202048, 0x34B040, 0x34B112],
+    "Banana flavor": [0x202088, 0x34B080, 0x34B114],
+    "Peanut flavor": [0x2020C8, 0x34B0C0, 0x34B116]
+}
+
+
+def create_flavors(world: "EarthBoundWorld") -> None:
+    """Shuffle flavors (textbox palettes). Vanilla flavors are copied from the ROM itself and not stored here."""
+    world.flavor_text = []
+    world.flavor_pointer = [0x01F72B, 0x01F746, 0x01F761, 0x01F77C]
+    flavor_num = 0
+    for flavor in world.available_flavors:
+        encoded_flavor = []
+        for char in flavor:
+            encoded_flavor.extend(eb_text_table[char])
+        encoded_flavor.extend([0x00])
+        world.flavor_text.append(encoded_flavor)
+        flavor_num += 1
diff --git a/worlds/earthbound/modules/hint_data.py b/worlds/earthbound/modules/hint_data.py
new file mode 100644
index 0000000000..033894c220
--- /dev/null
+++ b/worlds/earthbound/modules/hint_data.py
@@ -0,0 +1,365 @@
+from ..game_data.local_data import item_id_table, character_item_table, party_id_nums
+from ..game_data.text_data import text_encoder
+from ..game_data.static_location_data import location_groups
+from ..modules.shopsanity import shop_locations
+from ..Options import ShopRandomizer, MagicantMode
+import struct
+from BaseClasses import Location
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .. import EarthBoundWorld
+    from ..Rom import LocalRom
+    
+def setup_hints(world: "EarthBoundWorld") -> None:
+    hint_types = [
+        # gives a hint for a specific out of the way location in this player's world, regardless of what item it is
+        "item_at_location",
+        "region_progression_check", # woth or foolish hint, checks specific location groups of this world so as to be more helpful.
+        "hint_for_good_item",  # gives the exact location and sender of a good item for the local player
+        "item_in_local_region",  # Hints a random item that can be found in a specific local location group
+        "prog_item_at_region",  # Hints the region that a good item can be found for this player
+        "joke_hint",  # Doesn't hint anything
+        "dungeon_location"  # Hints what dungeon can be found at a specific entrance
+    ]
+    world.in_game_hint_types = []
+    world.hinted_locations = {}
+    world.hinted_items = {}
+    world.hinted_regions = {}
+    world.hinted_dungeons = {}
+
+    # may not need to be world.
+    world.local_hintable_locations = [
+        "Onett - Mayor Pirkle",
+        "Onett - South Road Present",
+        "Onett - Meteor Item",
+        "Onett - Treehouse Guy",
+        "Twoson - Orange Kid Donation",
+        "Twoson - Everdred Meeting",
+        "Twoson - Apple Kid Invention",
+        "Fourside - Post-Moonside Delivery",
+        "Lost Underworld - Talking Rock",
+        "Dungeon Man - 2F Hole Present",
+        "Poo - Starting Item",
+        "Summers - Magic Cake",
+        "Deep Darkness - Teleporting Monkey",
+        "Twoson - Insignificant Location",
+        "Peaceful Rest Valley - North Side Present",
+        "Twoson - Paula's Mother",
+        "Happy-Happy Village - Prisoner",
+        "Threed - Boogey Tent Trashcan",
+        "Threed - Zombie Prisoner",
+        "Grapefruit Falls - Saturn Cave Present",
+        "Saturn Valley - Saturn Coffee",
+        "Dusty Dunes - South Side Present",
+        "Stonehenge - Tony Item",
+        "Stonehenge - Kidnapped Mr. Saturn",
+        "Stonehenge - Dead End Present",
+        "Stonehenge - Near End of the Maze Present",
+        "Stonehenge - Bridge Room East Balcony Present",
+        "Gold Mine - B1F Isolated Present",
+        "Fourside - Venus Gift",
+        "Fourside - Bakery 2F Gift",
+        "Fourside - Department Store Blackout",
+        "Monotoli Building - Monotoli Character",
+        "Dungeon Man - 1F Exit Ledge Present",
+        "Deep Darkness - Barf Character",
+        "Lumine Hall - B1F West Alcove Present",
+        "Cave of the Present - Star Master",
+        "Cave of the Present - Broken Phase Distorter",
+        "Fire Spring - 1st Cave Present",
+        "Tenda Village - Tenda Tea",
+        "Deep Darkness - Barf Character",
+        "Dalaam - Trial of Mu",
+        "Pyramid - Northwest Door Sarcophagus"
+    ]
+
+    world.local_hintable_items = [
+        "Franklin Badge",
+        "Key to the Shack",
+        "Key to the Cabin",
+        "Key to the Tower",
+        "Key to the Locker",
+        "Bad Key Machine",
+        "Pencil Eraser",
+        "Eraser Eraser",
+        "UFO Engine",
+        "Yogurt Dispenser",
+        "Zombie Paper",
+        "King Banana",
+        "Signed Banana",
+        "Tendakraut",
+        "Jar of Fly Honey",
+        "Wad of Bills",
+        "Tiny Ruby",
+        "Diamond",
+        "Meteorite Piece",
+        "Hieroglyph Copy",
+        "Piggy Nose",
+        "Carrot Key",
+        "Police Badge",
+        "Letter For Tony",
+        "Mining Permit",
+        "Contact Lens",
+        "Insignificant Item",
+        "Pak of Bubble Gum",
+        "Sea Pendant",
+        "Shyness Book",
+        "Hawk Eye",
+        "Ness",
+        "Paula",
+        "Jeff",
+        "Poo",
+        "Onett Teleport",
+        "Twoson Teleport",
+        "Happy-Happy Village Teleport",
+        "Threed Teleport",
+        "Saturn Valley Teleport",
+        "Dusty Dunes Teleport",
+        "Fourside Teleport",
+        "Winters Teleport",
+        "Summers Teleport",
+        "Scaraba Teleport",
+        "Dalaam Teleport",
+        "Deep Darkness Teleport",
+        "Tenda Village Teleport",
+        "Lost Underworld Teleport"
+    ]
+
+    world.joke_hints = [
+        "you can find 6 hint shops around the world.",
+        "if you want to hint for an item, use !hint in your text client!",
+        "the mouse at the Fourside Department Store knows what the Spook has.",
+        "my business may be a scam.",
+        "there's a guy near Threed's hotel who saw the Zombies take someone away.",
+        "you can use the Y button to run or mash through text.",
+        "you can submit custom window flavors in the game's Archipelago thread.",
+        "you can buy a ruler at the Fourside Department Store.",
+        "you can store a lot of items in your backpack with the R button.",
+        "Giygas's guard may actually be from another seed...",
+        "if you have multiple of something important, you can throw away the extras.",
+        "the chicken crossed the road because it was trying to use Teleport α.",
+        "Figment's Ice Palace can probably be found in Ice Palace.",
+        "you can talk to the hint shop owners for a hint.",
+        "deliveryman are bad at using keys.",
+        "PK scramble is a pretty good time.",
+        "Apple Kid researched the Power of the Earth with Dr. Andonuts.",
+        "you can find beta Archipelago games on the Archipelago discord.",
+        "you can randomize EarthBound with Archipelago.",
+        "hint prices double with each one bought.",
+        "you probably should have kept your money.",
+        "there's a secret option to plando Lumine Hall's text.",
+        "this isn't a very good hint.",
+        "some hints are good hints.\n@But not this one."
+    ]
+
+    hintable_location_groups = location_groups.copy()
+
+    if world.options.shop_randomizer != ShopRandomizer.option_shopsanity:
+        hintable_location_groups["Onett"] = hintable_location_groups["Onett"] - shop_locations
+        hintable_location_groups["Twoson"] = hintable_location_groups["Twoson"] - shop_locations
+        hintable_location_groups["Happy-Happy Village"] = hintable_location_groups["Happy-Happy Village"] - shop_locations
+        hintable_location_groups["Threed"] = hintable_location_groups["Threed"] - shop_locations
+        hintable_location_groups["Grapefruit Falls"] = hintable_location_groups["Grapefruit Falls"] - shop_locations
+        hintable_location_groups["Saturn Valley"] = hintable_location_groups["Saturn Valley"] - shop_locations
+        hintable_location_groups["Dusty Dunes Desert"] = hintable_location_groups["Dusty Dunes Desert"] - shop_locations
+        hintable_location_groups["Winters"] = hintable_location_groups["Winters"] - shop_locations
+        hintable_location_groups["Dr. Andonuts's Lab"] = hintable_location_groups["Dr. Andonuts's Lab"] - shop_locations
+        hintable_location_groups["Fourside"] = hintable_location_groups["Fourside"] - shop_locations
+        hintable_location_groups["Moonside"] = hintable_location_groups["Moonside"] - shop_locations
+        hintable_location_groups["Summers"] = hintable_location_groups["Summers"] - shop_locations
+        hintable_location_groups["Dalaam"] = hintable_location_groups["Dalaam"] - shop_locations
+        hintable_location_groups["Scaraba"] = hintable_location_groups["Scaraba"] - shop_locations
+        hintable_location_groups["Deep Darkness"] = hintable_location_groups["Deep Darkness"] - shop_locations
+        hintable_location_groups["Lost Underworld"] = hintable_location_groups["Lost Underworld"] - shop_locations
+        hintable_location_groups["Magicant"] = hintable_location_groups["Magicant"] - shop_locations
+
+        del hintable_location_groups["Burglin Park"]
+        del hintable_location_groups["the Scaraba Bazaar"]
+        del hintable_location_groups["the Twoson Department Store"]
+        del hintable_location_groups["the Fourside Department Store"]
+        del hintable_location_groups["the Saturn Valley Shop"]
+
+    if world.options.magicant_mode >= 2:
+        del hintable_location_groups["Magicant"]
+
+    if not world.options.giygas_required:
+        del hintable_location_groups["Cave of the Past"]
+
+    if world.options.magicant_mode.value in [0, 3]:
+        world.local_hintable_items.append("Magicant Teleport")
+
+    for item in world.multiworld.precollected_items[world.player]:
+        if item.name in world.local_hintable_items:
+            world.local_hintable_items.remove(item.name)
+
+    for item in world.options.start_hints.value:
+        if item in world.local_hintable_items:
+            world.local_hintable_items.remove(item)
+
+    if world.starting_area_teleport in world.local_hintable_items:
+        world.local_hintable_items.remove(world.starting_area_teleport)
+
+    if world.local_hintable_items == []:
+        hint_types.remove("hint_for_good_item")
+        hint_types.remove("prog_item_at_region")
+
+    if not world.options.dungeon_shuffle:
+        hint_types.remove("dungeon_location")
+
+    if world.options.giygas_required:
+        world.local_hintable_locations.append("Cave of the Past - Present")
+    
+    if world.options.magicant_mode == MagicantMode.option_psi_location:
+        world.local_hintable_locations.append("Magicant - Ness's Nightmare")
+
+    for i in range(6):
+        world.in_game_hint_types.append(world.random.choice(hint_types))
+
+    for index, hint in enumerate(world.in_game_hint_types):
+        if hint == "item_at_location":
+            location = world.random.choice(world.local_hintable_locations)
+            world.hinted_locations[index] = location
+        
+        elif hint == "region_progression_check":
+            group, group_locs = world.random.choice(list(hintable_location_groups.items()))
+            world.hinted_regions[index] = group
+
+        elif hint == "hint_for_good_item" or hint == "prog_item_at_region":
+            item = world.random.choice(world.local_hintable_items)
+            world.hinted_items[index] = item
+
+        elif hint == "item_in_local_region":
+            group, group_locs = world.random.choice(list(hintable_location_groups.items()))
+            location = world.random.choice(sorted(group_locs))
+            world.hinted_regions[index] = group
+            world.hinted_locations[index] = location
+
+        elif hint == "dungeon_location":
+            dungeon = world.random.choice(list(world.dungeon_connections.keys()))
+            world.hinted_dungeons[index] = dungeon
+
+
+def parse_hint_data(world: "EarthBoundWorld", location: Location, rom: "LocalRom", hint: str, index: int) -> None:
+    if hint == "item_at_location":
+        if world.player == location.item.player and location.item.name in character_item_table and location.item.name != "Photograph":
+            player_text = "your friend "
+            item_text = bytearray([0x1C, 0x02, party_id_nums[location.item.name]]) # In-game text command to display party member names
+        elif world.player == location.item.player:
+            player_text = "your "
+            if location.item.name in item_id_table:
+                item_text = bytearray([0x1C, 0x05, item_id_table[location.item.name]]) # In-game text command to display item names
+            else:
+                # if the item doesn't have a name (e.g it's PSI)
+                item_text = text_encoder(location.item.name, 128)
+        else:
+            player_text = f"{world.multiworld.get_player_name(location.item.player)}'s "
+            item_text = text_encoder(location.item.name, 128)
+
+        player_text = text_encoder(player_text, 255)
+        location_text = text_encoder(f" can be found at\n@{location.name}.", 255)
+        text = player_text + item_text + location_text
+        # [player]'s [item] can be found at [location].
+        text.append(0x02)
+
+    elif hint == "region_progression_check":
+        if world.progression_count == 1:
+            text = f"you can find {world.progression_count} important item at {world.hinted_area}."
+        else:
+            text = f"you can find {world.progression_count} important items at {world.hinted_area}."
+        text = text_encoder(text, 255)
+        text.append(0x02)
+        
+    elif hint == "hint_for_good_item" or hint == "prog_item_at_region" or hint == "item_in_local_region":
+        if location.item.name in character_item_table and location.item.player == world.player and location.item.name != "Photograph":
+            item_text = text_encoder("your friend ", 255)
+            item_text.extend([0x1C, 0x02, party_id_nums[location.item.name]])
+        elif location.item.name in item_id_table and location.item.player == world.player:
+            item_text = text_encoder("your ", 255)
+            item_text.extend([0x1C, 0x05, item_id_table[location.item.name]])
+        elif location.item.player == world.player:
+            item_text = text_encoder(f"your {location.item.name}", 128)
+        else:
+            item_text = f"{world.multiworld.get_player_name(location.item.player)}'s {location.item.name}"
+            item_text = text_encoder(item_text, 255)
+        item_text.extend(text_encoder(" can be found ", 255))
+        
+        if location.player != world.player:
+            player_text = text_encoder(f"by {world.multiworld.get_player_name(location.player)}\n", 255)
+        else:
+            player_text = text_encoder("\n", 255)
+        
+        if hint == "hint_for_good_item":
+            location_text = text_encoder(f"@at {location.name}.", 255)
+            # your [item] can be found by [player] at [location]
+
+        else:
+            location_name_groups = world.multiworld.worlds[location.player].location_name_groups
+            possible_location_groups = [
+                group_name for group_name, group_locations in location_name_groups.items()
+                if location.name in group_locations and group_name != "Everywhere"
+            ]
+            if not possible_location_groups:
+                if location.parent_region.name == "Menu":
+                    area = ""
+                else:
+                    area = f" near {location.parent_region.name}"
+            else:
+                area = f" near {world.random.choice(possible_location_groups)}"
+            location_text = text_encoder(f"@somewhere{area}.", 255)
+            # your [item] can be found by [player] somewhere near [location group]
+        text = item_text + player_text + location_text
+        text.append(0x02)
+
+    elif hint == "joke_hint":
+        text = world.random.choice(world.joke_hints)
+        text = text_encoder(text, 255)
+        text.append(0x02)
+
+    elif hint == "dungeon_location":
+        dungeon = world.hinted_dungeons[index]
+        text = f"{dungeon} leads to {world.dungeon_connections[dungeon]}."
+        text = text_encoder(text, 255)
+        text.append(0x02)
+
+    else:
+        text = 0x00
+
+    hint_addresses = [
+        0x070376,
+        0x0703A8,
+        0x0703DA,
+        0x07040C,
+        0x07043E,
+        0x070470
+    ]
+
+    scoutable_hint_addresses = [
+        0x2EF3D5,
+        0x2EF3EB,
+        0x2EF401,
+        0x2EF417,
+        0x2EF42D,
+        0x2EF443
+    ]
+    rom.write_bytes(0x310000 + world.hint_pointer, text)
+    rom.write_bytes(hint_addresses[world.hint_number], struct.pack("I", 0xF10000 + world.hint_pointer))
+
+    if hint in ["item_at_location", "hint_for_good_item"]:
+        rom.write_bytes(scoutable_hint_addresses[world.hint_number], struct.pack("I", 0xEEF451))
+        rom.write_bytes(0x310252 + (world.hint_number * 3), bytearray([0x01]))
+        world.hint_man_hints.append((location.address, location.player))
+    else:
+        rom.write_bytes(scoutable_hint_addresses[world.hint_number], struct.pack("I", 0xEEF4B2))
+        world.hint_man_hints.append(("NULL", 0))
+
+    world.hint_pointer = world.hint_pointer + len(text)
+    world.hint_number += 1
+
+    # Word on the street is that PLAYER's ITEM can be found at LOCATION
+    # Word on the street is that REGION has X important items
+    # Word on the street is that your ITEM can be found by PLAYER at LOCATION
+    # Word on the street is that PLAYER's ITEM can be found somewhere near REGION...
+    # Word on the street is that your ITEM can be found somewhere near REGION...
+    # char item hint?
+    # That's all for today.
+    # Like text part 1, extend 0x1C 0x05 0xItem Item, extend (the rest of the string)
diff --git a/worlds/earthbound/modules/music_rando.py b/worlds/earthbound/modules/music_rando.py
new file mode 100644
index 0000000000..4b3cb82d8d
--- /dev/null
+++ b/worlds/earthbound/modules/music_rando.py
@@ -0,0 +1,305 @@
+from ..Options import RandomizeOverworldMusic, RandomizeFanfares
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+    from .Rom import LocalRom
+
+town_songs = [
+    0x2E,
+    0x2F,
+    0x30,
+    0x38,
+    0x3B,
+    0x3D,
+    0x41,
+    0x42,
+    0x52,
+    0x80,
+    0x81,
+    0x82
+]
+
+overworld_songs = [
+    0x1D,
+    0x2C,
+    0x33,
+    0x34,
+    0x35,
+    0x36,
+    0x3E,
+    0x40,
+    0x43,
+    0x44,
+    0x6B,
+    0x72,
+    0x79,
+    0x88,
+    0x92,
+    0x97,
+    0x99,
+    0x9A,
+    0x9F
+    ]
+
+dungeon_songs = [
+    0x28,
+    0x29,
+    0x2A,
+    0x2B,
+    0x2D,
+    0x31,
+    0x32,
+    0x37,
+    0x2D,
+    0x3F,
+    0x46,
+    0x6A,
+    0x6C,
+    0x75,
+    0x84,
+    0x85
+]
+
+interior_songs = [
+    0x10,
+    0x11,
+    0x12,
+    0x13,
+    0x14,
+    0x15,
+    0x16,
+    0x17,
+    0x18,
+    0x19,
+    0x1A,
+    0x1C,
+    0x39,
+    0x70,
+    0x78,
+    0x7D,
+    0x83,
+    0x8C,
+    0x98
+    ]
+
+cutscene_songs = [
+    0x3A,
+    0x3C,
+    0x48,
+    0x4C,
+    0x4D,
+    0x4E,
+    0x4F,
+    0x50,
+    0x51,
+    0x53,
+    0x55,
+    0x56,
+    0x57,
+    0x58,
+    0x59,
+    0x5C,
+    0x77,
+    0x86,
+    0x90,
+    0x9B,
+    0xA9,
+    0xAA,
+    0xAB,
+    0xAC,
+    0xBB
+]
+
+wakeup_songs = [
+    0x1B,
+    0x5A,
+    0xAD,
+    0xB2,
+    0xB5,
+    0xBC,
+]
+
+rare_songs = [
+    0x1E,
+    0x1F,
+    0x45,
+    0x47,
+    0x70,
+    0x74,
+    0x76,
+    0x96,
+
+]
+
+non_randomized = [
+    0x01,
+    0x02,
+    0x03,
+    0x04,
+    0x06,
+    0x07,
+    0x0A,
+    0x0D,
+    0x0E,
+    0x20,
+    0x21,
+    0x22,
+    0x23,
+    0x24,
+    0x25,
+    0x26,
+    0x27,
+    0x4B,
+    0x5D,
+    0x5E,
+    0x5F,
+    0x73,
+    0x7A,
+    0x87,
+    0x89,
+    0x8A,
+    0x8B,
+    0x9D,
+    0xAE,
+    0xAF,
+    0xB6,
+    0xBE,
+    0xBF
+]
+
+battle_songs = [
+    0x49,
+    0x4A,
+    0x60,
+    0x61,
+    0x62,
+    0x63,
+    0x64,
+    0x65,
+    0x66,
+    0x67,
+    0x68,
+    0x69,
+    0x8D,
+    0x94,
+    0x95,
+    0xB9,
+    0xBA
+]
+
+
+def music_randomizer(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    fanfares = [
+        0x05,
+        0x08,
+        0x09,
+        0x0B,
+        0x0C,
+        0x0F,
+        0x54,
+        0x5B,
+        0x6D,
+        0x6E,
+        0x6F,
+        0x71,
+        0x7B,
+        0x7C,
+        0x7E,
+        0x7F,
+        0xB7,
+        0xB8,
+        0x8E,
+        0x8F,
+        0x91,
+        0x93,
+        0x9C,
+        0x9E,
+        0xA0,
+        0xA1,
+        0xA2,
+        0xA3,
+        0xA4,
+        0xA5,
+        0xA6,
+        0xA7,
+        0xA8,
+        0xB0,
+        0xB1,
+        0xB3,
+        0xB4,
+        0xB7,
+        0xB8,
+        0xBD
+    ]
+
+    # Todo; options here
+    global_tracklist = list(range(0xC0))  # Initialize the list; this ideally should be vanilla
+
+    if world.options.randomize_fanfares == RandomizeFanfares.option_on_no_sound_stone_fanfares:
+        for i in range(9):
+            fanfares.remove(0xA0 + i)
+
+    if world.options.randomize_fanfares:
+        shuffled_fanfares = fanfares.copy()
+        world.random.shuffle(shuffled_fanfares)
+        for track_id, song in enumerate(fanfares):
+            global_tracklist[song] = shuffled_fanfares[track_id]
+    
+    if world.options.randomize_battle_music:
+        shuffled_battle_songs = battle_songs.copy()
+        world.random.shuffle(shuffled_battle_songs)
+        for track_id, song in enumerate(battle_songs):
+            global_tracklist[song] = shuffled_battle_songs[track_id]
+
+    if world.options.randomize_overworld_music == RandomizeOverworldMusic.option_match_type:
+        shuffled_town_songs = town_songs.copy()
+        shuffled_overworld_songs = overworld_songs.copy()
+        shuffled_interior_songs = interior_songs.copy()
+        shuffled_dungeon_songs = dungeon_songs.copy()
+        shuffled_cutscene_songs = cutscene_songs.copy()
+        shuffled_rare_songs = rare_songs.copy()
+        shuffled_wakeup_songs = wakeup_songs.copy()
+
+        world.random.shuffle(shuffled_town_songs)
+        world.random.shuffle(shuffled_overworld_songs)
+        world.random.shuffle(shuffled_interior_songs)
+        world.random.shuffle(shuffled_dungeon_songs)
+        world.random.shuffle(shuffled_cutscene_songs)
+        world.random.shuffle(shuffled_rare_songs)
+        world.random.shuffle(shuffled_wakeup_songs)
+
+        for track_id, song in enumerate(town_songs):
+            global_tracklist[song] = shuffled_town_songs[track_id]
+
+        for track_id, song in enumerate(overworld_songs):
+            global_tracklist[song] = shuffled_overworld_songs[track_id]
+
+        for track_id, song in enumerate(interior_songs):
+            global_tracklist[song] = shuffled_interior_songs[track_id]
+
+        for track_id, song in enumerate(dungeon_songs):
+            global_tracklist[song] = shuffled_dungeon_songs[track_id]
+
+        for track_id, song in enumerate(cutscene_songs):
+            global_tracklist[song] = shuffled_cutscene_songs[track_id]
+
+        for track_id, song in enumerate(rare_songs):
+            global_tracklist[song] = shuffled_rare_songs[track_id]
+
+        for track_id, song in enumerate(wakeup_songs):
+            global_tracklist[song] = shuffled_wakeup_songs[track_id]
+
+    elif world.options.randomize_overworld_music == RandomizeOverworldMusic.option_full:
+        all_overworld_songs = (town_songs + overworld_songs + interior_songs +
+                               dungeon_songs + cutscene_songs + rare_songs + wakeup_songs)
+
+        shuffled_overworld_songs = all_overworld_songs.copy()
+        world.random.shuffle(shuffled_overworld_songs)
+
+        for track_id, song in enumerate(all_overworld_songs):
+            global_tracklist[song] = shuffled_overworld_songs[track_id]
+
+    rom.write_bytes(0x17FDA0, bytearray(global_tracklist))
+
+
+# Should the Melodies be fanfares?
diff --git a/worlds/earthbound/modules/palette_shuffle.py b/worlds/earthbound/modules/palette_shuffle.py
new file mode 100644
index 0000000000..0ecb81af8e
--- /dev/null
+++ b/worlds/earthbound/modules/palette_shuffle.py
@@ -0,0 +1,52 @@
+from ..game_data.palettes_organized import map_palettes, nice_palettes, ugly_palettes, nonsense_palettes
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+    from .Rom import LocalRom
+
+
+event_palettes = {
+    "Happy-Happy Village": 0x8367,
+    "Threed": 0x85A7,
+    "Deep Darkness": 0x8F67
+    }
+
+
+def randomize_psi_palettes(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    spell_palettes = []
+    for i in range(34):
+        spell_palettes.append(0x0CF47F + (i * 8))
+    
+    for i in range(7):
+        spell_palettes.append(0x360710 + (i * 8))
+        
+    shuffled_palettes = spell_palettes.copy()
+
+    if world.options.randomize_psi_palettes == 1:
+        world.random.shuffle(shuffled_palettes)
+
+    elif world.options.randomize_psi_palettes == 2:
+        for i in range(0x010E):
+            rom.write_bytes(0x0CF47F + i, bytearray([world.random.randint(0x00, 0xFF)]))
+
+        for i in range(0x50):
+            rom.write_bytes(0x36F710 + i, bytearray([world.random.randint(0x00, 0xFF)]))
+
+    for index, pointer in enumerate(spell_palettes):
+        rom.copy_bytes(pointer, 8, shuffled_palettes[index])
+
+
+def map_palette_shuffle(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    for i in range(168):
+        rom.copy_bytes(0x1A7CA7 + (i * 192), 191, 0x381000 + (i * 192))
+    
+    for item in map_palettes:
+        choosable_palettes = nice_palettes[item]
+        if world.options.map_palette_shuffle > 1:
+            choosable_palettes += ugly_palettes[item]
+        if world.options.map_palette_shuffle > 2:
+            choosable_palettes += nonsense_palettes[item]
+        
+        chosen_palette = world.random.choice(choosable_palettes)
+        rom.copy_bytes(0x381002 + (chosen_palette * 192), 29, 0x1A7CA9 + (map_palettes[item] * 192))
+        rom.copy_bytes(0x381022 + (chosen_palette * 192), 157, 0x1A7CC9 + (map_palettes[item] * 192))  # The event palette pointer is between these 2 blocks
diff --git a/worlds/earthbound/modules/psi_shuffle.py b/worlds/earthbound/modules/psi_shuffle.py
new file mode 100644
index 0000000000..2be424ad91
--- /dev/null
+++ b/worlds/earthbound/modules/psi_shuffle.py
@@ -0,0 +1,515 @@
+import struct
+from ..Options import PSIShuffle
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+    from .Rom import LocalRom
+    
+
+def shuffle_psi(world: "EarthBoundWorld") -> None:
+    world.offensive_psi_slots = [
+        "Special",
+        "Flash",
+        "Fire",
+        "Freeze",
+        "Thunder",
+        "Starstorm",
+        "Blast",
+        "Missile"
+    ]
+
+    world.assist_psi_slots = [
+        "Hypnosis",
+        "Paralysis",
+        "Offense Up",
+        "Defense Down",
+        "Brainshock",
+        "Defense up",
+        "Drain",
+        "Disable",
+        "Stop",
+        "Neutralize"
+    ]
+
+    world.shield_slots = [
+        "Shield",
+        "PSI Shield"
+    ]
+
+    world.jeff_offense_items = []
+    world.jeff_assist_items = []
+
+    world.psi_address = {
+        "Special": [0x158A5F, 4],
+        "Flash": [0x158B4F, 4],
+        "Fire": [0x158A9B, 4],
+        "Freeze": [0x158AD7, 4],
+        "Thunder": [0x158B13, 4],
+        "Starstorm": [0x3503FC, 4],
+
+        "Shield": [0x158C21, 4],
+        "PSI Shield": [0x158C5D, 4],
+
+        "Hypnosis": [0x158CD5, 2],
+        "Paralysis": [0x158D11, 2],
+        "Offense Up": [0x158C99, 2],
+        "Defense Down": [0x158CB7, 2],
+        "Brainshock": [0x158D2F, 2],
+
+        "Blast": [0x35041A, 4],
+        "Missile": [0x350456, 4],
+
+        "Defense up": [0x350492, 2],
+        "Drain": [0x3504B0, 2],
+        "Disable": [0x3504Ce, 2],
+        "Stop": [0x3504EC, 2],
+        "Neutralize": [0x35050A, 2],
+    }
+
+    if world.options.psi_shuffle:
+        world.random.shuffle(world.offensive_psi_slots)
+
+        if world.options.psi_shuffle != PSIShuffle.option_extended:
+            adjust_psi_list(world.offensive_psi_slots, "Blast", 7)
+            adjust_psi_list(world.offensive_psi_slots, "Missile", 7)
+
+        if not world.options.allow_flash_as_favorite_thing:
+            if world.offensive_psi_slots[0] == "Flash":
+                adjust_psi_list(world.offensive_psi_slots, "Flash", world.random.randint(1, 5)) # Randomize which slot gets Flash
+
+        world.random.shuffle(world.assist_psi_slots)
+
+        if world.options.psi_shuffle != PSIShuffle.option_extended:
+            adjust_psi_list(world.assist_psi_slots, "Defense up", 10)
+            adjust_psi_list(world.assist_psi_slots, "Drain", 10)
+            adjust_psi_list(world.assist_psi_slots, "Disable", 10)
+            adjust_psi_list(world.assist_psi_slots, "Stop", 10)
+            adjust_psi_list(world.assist_psi_slots, "Neutralize", 10)
+
+        world.jeff_offense_items.extend(world.offensive_psi_slots[-2:])
+        world.jeff_assist_items.extend(world.assist_psi_slots[-5:])
+        world.offensive_psi_slots = world.offensive_psi_slots[:-2]
+        world.assist_psi_slots = world.assist_psi_slots[:-5]
+
+        world.random.shuffle(world.shield_slots)
+
+        shield_data = {key: world.psi_address[key] for key in world.shield_slots}
+        assist_data = {key: world.psi_address[key] for key in world.assist_psi_slots}
+        assist_data_plus = {key: world.psi_address[key] for key in world.jeff_assist_items}
+        offense_data_plus = {key: world.psi_address[key] for key in world.jeff_offense_items}
+
+        world.psi_address = {key: world.psi_address[key] for key in world.offensive_psi_slots}
+        world.psi_address.update(shield_data)
+        world.psi_address.update(assist_data)
+        world.psi_address.update(offense_data_plus)
+        world.psi_address.update(assist_data_plus)
+
+    world.psi_slot_data = [
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Special
+        [[0x09, 0x01], [0x0B, 0x01], [0x0D, 0x01], [0x0F, 0x01]],  # Flash
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Fire
+        [[0x09, 0x01], [0x0B, 0x01], [0x0D, 0x01], [0x0F, 0x01]],  # Freeze
+        [[0x09, 0x02], [0x0B, 0x02], [0x0D, 0x02], [0x0F, 0x02]],  # Thunder
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Starstorm
+
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Shield
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # PSI Shield
+
+        [[0x09, 0x01], [0x0B, 0x01]],  # Hypnosis
+        [[0x09, 0x02], [0x0B, 0x02]],  # Paralysis
+        [[0x09, 0x01], [0x0B, 0x01]],  # Offense Up
+        [[0x09, 0x02], [0x0B, 0x02]],  # Defense Down
+        [[0x09, 0x01], [0x0B, 0x01]],  # Brainshock
+
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Blast
+        [[0x09, 0x00], [0x0B, 0x00], [0x0D, 0x00], [0x0F, 0x00]],  # Missile
+
+        [[0x09, 0x01], [0x0B, 0x01]],  # Defense up
+        [[0x09, 0x02], [0x0B, 0x02]],  # Drain
+        [[0x09, 0x01], [0x0B, 0x01]],  # Disable
+        [[0x09, 0x02], [0x0B, 0x02]],  # Stop
+        [[0x09, 0x01], [0x0B, 0x01]],  # Neutralize
+    ]
+
+    world.psi_level_data = [
+        [[0x08, 0x00, 0x00], [0x16, 0x00, 0x00], [0x31, 0x00, 0x00], [0x4B, 0x00, 0x00]],  # Special
+        [[0x12, 0x00, 0x00], [0x26, 0x00, 0x00], [0x3D, 0x00, 0x00], [0x43, 0x00, 0x00]],  # Flash
+        [[0x00, 0x03, 0x00], [0x00, 0x13, 0x00], [0x00, 0x25, 0x00], [0x00, 0x40, 0x00]],  # Fire
+        [[0x00, 0x01, 0x01], [0x00, 0x0B, 0x01], [0x00, 0x1F, 0x21], [0x00, 0x2E, 0x00]],  # Freeze
+        [[0x00, 0x08, 0x01], [0x00, 0x19, 0x01], [0x00, 0x39, 0x29], [0x00, 0x00, 0x37]],  # Thunder
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Starstorm
+
+        [[0x0C, 0x00, 0x0E], [0x00, 0x00, 0x0F], [0x22, 0x00, 0x10], [0x00, 0x00, 0x33]],  # Shield
+        [[0x00, 0x06, 0x00], [0x00, 0x1B, 0x00], [0x00, 0x33, 0x00], [0x00, 0x3C, 0x00]],  # PSI Shield
+
+        [[0x04, 0x00, 0x00], [0x1B, 0x00, 0x00]],  # Hypnosis
+        [[0x0E, 0x00, 0x00], [0x1D, 0x00, 0x00]],  # Paralysis
+        [[0x00, 0x15, 0x00], [0x00, 0x28, 0x00]],  # Offense Up
+        [[0x00, 0x1D, 0x00], [0x00, 0x36, 0x00]],  # Defense Down
+        [[0x00, 0x00, 0x18], [0x00, 0x00, 0x2C]],  # Brainshock
+
+        # Level-up data needs to be zeroed out for these slots
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Blast
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Missile
+
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Defense up
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Drain
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Disable
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00]],  # Stop
+        [[0x00, 0x00, 0x00], [0x00, 0x00, 0x00]]  # Neutralize
+        
+    ]
+
+    world.bomb_names = {
+        "Special": ["Psycho bomb", "Mad psycho bomb", "Psywave emitter", "Psywave blaster", "Broken radio"],
+        "Flash": ["Smoke bomb", "Flashbang", "Flash pan", "Digital camera", "Broken camera"],
+        "Freeze": ["Ice bomb", "Dry ice bomb", "Frost ray", "Freeze ray", "Broken minifridge"],
+        "Fire": ["Fire bomb", "Napalm bomb", "Blowtorch", "Flamethrower", "Broken grill"],
+        "Thunder": ["Electric bomb", "EMP bomb", "Shock coil", "Tesla coil", "Broken spring"],
+        "Starstorm": ["Comet bomb", "Nova bomb", "Meteor radar", "Star radar", "Broken radar"],
+        "Blast": ["Bomb", "Super bomb", "Bazooka", "Heavy bazooka", "Broken bazooka"],
+        "Missile": ["Rocket", "Nitro rocket", "Missile launcher", "Nitro launcher", "Broken vacuum"]
+    }
+
+    world.rocket_names = {
+        "Special": ["Psionic shard", "Psionic orb", "Psionic crystal"],
+        "Flash": ["Flashbulb", "Bright bulb", "Magna bulb"],
+        "Freeze": ["LN2 bottle", "LN2 jug", "LN2 bucket"],
+        "Fire": ["Flare", "Big flare", "Blitz flare"],
+        "Thunder": ["Sparkler", "Big sparkler", "Mega sparkler"],
+        "Starstorm": ["Meteor missile", "Star missile", "Nova missile"],
+        "Blast": ["Firecracker", "Big firecracker", "Super firecracker"],
+        "Missile": ["Bottle rocket", "Big bottle rocket", "Multi bottle rocket"]
+    }
+
+    world.spray_names = {
+        "Hypnosis": "Chloroform spray",
+        "Paralysis": "Nerve spray",
+        "Offense Up": "Offense spray",
+        "Defense Down": "Weakness spray",
+        "Brainshock": "Confusion spray",
+        "Defense up": "Defense spray",
+        "Drain": "HP-straw",
+        "Disable": "Distraction spray",
+        "Stop": "Slime spray",
+        "Neutralize": "Shield-off spray"
+    }
+    world.broken_gadgets = {
+        "Hypnosis": ["Broken watch", "Broken screen"],
+        "Paralysis": ["Broken razor", "Broken fan"],
+        "Offense Up": ["Broken faucet", "Broken tuba"],
+        "Defense Down": ["Broken sprinkler", "Broken trombone"],
+        "Brainshock": ["Broken toaster", "Broken fryer"],
+        "Defense up": ["Broken nozzle", "Broken trumpet"],
+        "Drain": ["Broken hose", "Broken tube"],
+        "Disable": ["Broken machine", "Broken device"],
+        "Stop": ["Broken iron", "Broken steamer"],
+        "Neutralize": ["Broken pipe", "Broken board"]
+    }
+
+    world.broken_desc = {
+        "Hypnosis": [0x00EEEBA4, 0x00EEEBCC],
+        "Paralysis": [0x00EEEC06, 0x00EEEC28],
+        "Offense Up": [0x00EEEC4D, 0x00EEEC75],
+        "Defense Down": [0x00EEECA5, 0x00EEECCB],
+        "Brainshock": [0x00EEED00, 0x00EEED2B],
+        "Defense up": [0x00EEED5A, 0x00C53929],
+        "Drain": [0x00EEED8A, 0x00C538E0],
+        "Disable": [0x00C53772, 0x00EEEDB2],
+        "Stop": [0x00C53870, 0x00EEEE03],
+        "Neutralize": [0x00C53897, 0x00EEEE2F]
+    }
+
+    world.gadget_names = {
+        "Hypnosis": ["Hypno pendulum", "Hypno screen"],
+        "Paralysis": ["Nerve taser", "Nerve ray"],
+        "Offense Up": ["Offensalizer", "Offense shower"],
+        "Defense Down": ["Weakalizer", "Weakness shower"],
+        "Brainshock": ["Mind jammer", "Mind fryer"],
+        "Defense up": ["Defensalizer", "Defense shower"],
+        "Drain": ["HP-sucker", "Hungry HP-sucker"],
+        "Disable": ["Counter-PSI unit", "PSI-nullifier unit"],
+        "Stop": ["Slime generator", "Slime blaster"],
+        "Neutralize": ["Shield killer", "Neutralizer"]
+    }
+
+    world.starstorm_address = {
+        "Special": [0x002D, 0x003C],
+        "Flash": [0x011D, 0x012C],
+        "Fire": [0x0069, 0x0078],
+        "Freeze": [0x00A5, 0x00B4],
+        "Thunder": [0x00E1, 0x00F0],
+        "Starstorm": [0x013B, 0x014A],
+        "Blast": [0x0438, 0x0447],
+        "Missile": [0x0474, 0x0483]
+    }
+
+    world.starstorm_spell_id = {
+        "Special": [0x03, 0x04],
+        "Flash": [0x13, 0x14],
+        "Fire": [0x07, 0x08],
+        "Freeze": [0x0B, 0x0C],
+        "Thunder": [0x0F, 0x10],
+        "Starstorm": [0x15, 0x16],
+        "Blast": [0x48, 0x49],
+        "Missile": [0x4C, 0x4D]
+    }
+
+    world.jeff_addresses = [
+        0x156665,  # Bomb
+        0x15668C,  # Super Bomb
+        0x156443,  # Bazooka
+        0x15646A,  # Heavy bazooka
+        0x1551FB,  # broken bazooka
+
+        0x1565F0,  # Bottle Rocket
+        0x156617,  # Big Bottle Rocket
+        0x15663E,  # multi Bottle Rocket
+    ]
+
+    world.gadget_addresses = [
+        [0, 0x1567EB],  # defense shower
+        [0x156491, 0x1564B8],  # HP-Sucker
+        [0x1563F5],  # Counter-PSI Unit
+        [0x156506],  # Slime Generator
+        [0x15641C, 0x156DB5],  # Shield Killer
+    ]
+
+    world.broken_gadget_addresses = [
+        0x155222,
+        0x1551D4,
+        0x15509C,
+        0x15515F,
+        0x155186
+    ]
+
+    world.bomb_desc = {
+        "Special": [0x00EED4D8, 0x00EED521, 0x00EEDA4F, 0x00EEDA6B, 0x00EEDCFB],
+        "Flash": [0x00EED538, 0x00EED5AB, 0x00EEDA87, 0x00EEDAD7, 0x00EEDD1D],
+        "Fire": [0x00EED659, 0x00EED6CC, 0x00EEDB37, 0x00EEDB68, 0x00EEDD40],
+        "Freeze": [0x00EED744, 0x00EED79D, 0x00EEDB85, 0x00EEDBA2, 0x00EEDD64],
+        "Thunder": [0x00EED822, 0x00EED88E, 0x00EEDBBF, 0x00EEDBE4, 0x00EEDDA0],
+        "Starstorm": [0x00EED4D8, 0x00EED521, 0x00EEDA4F, 0x00EEDCD2, 0x00EEDDC3],
+        "Blast": [0x00C54EA7, 0x00C54EF7, 0x00C54AA1, 0x00C54AF5, 0x00C53908],
+        "Missile": [0x00EED9A5, 0x00EED9FF, 0x00EEDC09, 0x00EEDC40, 0x00EEDDEE]
+    }
+
+    world.rocket_desc = {
+        "Special": [0x00EEDE25, 0x00EEDE41, 0x00EEDE80],
+        "Flash": [0x00EEDEDC, 0x00EEDF37, 0x00EEDFAE],
+        "Fire": [0x00EEE013, 0x00EEE031, 0x00EEE061],
+        "Freeze": [0x00EEE098, 0x00EEE0B5, 0x00EEE11E],
+        "Thunder": [0x00EEE190, 0x00EEE1B6, 0x00EEE220],
+        "Starstorm": [0x00EEE28B, 0x00EEE2A7, 0x00EEE2DB],
+        "Blast": [0x00EEE344, 0x00EEE35B, 0x00EEE36E],
+        "Missile": [0x00C54E01, 0x00C54E20, 0x00C54E54]
+    }
+
+    world.spray_desc = {
+        "Hypnosis": 0x00EEE653,
+        "Paralysis": 0x00EEE688,
+        "Offense Up": 0x00EEE6B9,
+        "Defense Down": 0x00EEE705,
+        "Brainshock": 0x00EEE751,
+        "Defense up": 0x00C2558D,
+        "Drain": 0x00EEE802,
+        "Disable": 0x00EEE838,
+        "Stop": 0x00EEE7D0,
+        "Neutralize": 0x00EEE78F
+    }
+
+    world.gadget_desc = {
+        "Hypnosis": [0x00EEE87B, 0x00EEE8AA],
+        "Paralysis": [0x00EEE8DA, 0x00EEE905],
+        "Offense Up": [0x00EEE933, 0x00EEE97F],
+        "Defense Down": [0x00EEE9C2, 0x00EEEA0E],
+        "Brainshock": [0x00EEEA9D, 0x00EEEAD2],
+        "Defense up": [0x00EEEA51, 0x00C5519F],
+        "Drain": [0x00C54B67, 0x00C54BB0],
+        "Disable": [0x00C54A3A, 0x00EEEB5E],
+        "Stop": [0x00C54C32, 0x00EEEB09],
+        "Neutralize": [0x00C54A6C, 0x00C559D9]
+    }
+
+    world.bomb_actions = {
+        "Special": [0x01AC, 0x01AD, 0x01CF, 0x01D0],
+        "Flash": [0x01AE, 0x01AF, 0x01D1, 0x01D2],
+        "Fire": [0x01B0, 0x01B1, 0x01D3, 0x01D4],
+        "Freeze": [0x01B2, 0x01B3, 0x01D5, 0x01D6],
+        "Thunder": [0x01B4, 0x01B5, 0x01D7, 0x01D8],
+        "Starstorm": [0x01B6, 0x01B7, 0x01D9, 0x01DA],
+        "Blast": [0x00A7, 0x00A8, 0x0136, 0x0137],
+        "Missile": [0x01B8, 0x01B9, 0x01DB, 0x01DC]
+    }
+
+    world.missile_actions = {
+        "Special": [0x01BA, 0x01BB, 0x01BC],
+        "Flash": [0x01BD, 0x01BE, 0x01BF],
+        "Fire": [0x01C0, 0x01C1, 0x01C2],
+        "Freeze": [0x01C3, 0x01C4, 0x01C5],
+        "Thunder": [0x01C6, 0x01C7, 0x01C8],
+        "Starstorm": [0x01C9, 0x01CA, 0x01CB],
+        "Blast": [0x01CC, 0x01CD, 0x01CE],
+        "Missile": [0x00A3, 0x00A4, 0x00A5]
+    }
+
+    world.gadget_actions = {
+        "Hypnosis": [0x01E7, 0x01E8],
+        "Paralysis": [0x01E9, 0x01EA],
+        "Offense Up": [0x01EB, 0x01EC],
+        "Defense Down": [0x01ED, 0x01EE],
+        "Brainshock": [0x01EF, 0x01F0],
+        "Defense up": [0x00B7, 0x00B8],
+        "Drain": [0x00A1, 0x00B0],
+        "Disable": [0x009F, 0x01F1],
+        "Stop": [0x00A9, 0x01F2],
+        "Neutralize": [0x00A0, 0x00F7]
+    }
+
+    world.jeff_item_counts = [
+        5,  # Bomb
+        3  # Bottle Rocket
+    ]
+
+    world.gadget_counts = [
+        1,  # defense shower
+        2,  # HP-Sucker
+        1,  # Counter PSI unit
+        1,  # Slime generator
+        2  # Neutralizer
+    ]
+
+    world.gadget_ids = [
+        [0x00, 0x9D],
+        [0x87, 0x88],
+        [0x83],
+        [0x8A],
+        [0x84, 0xC3]
+    ]
+
+    world.broken_gadget_ids = [
+        0x0E,  # Broken trumpet
+        0x0C,  # Broken tube
+        0x04,  # Broken machine
+        0x09,  # Broken iron
+        0x0A  # Broken pipe
+    ]
+
+    world.jeff_item_names = [
+        world.bomb_names,
+        world.rocket_names
+    ]
+
+    world.jeff_help_text = [
+        world.bomb_desc,
+        world.rocket_desc
+    ]
+
+    world.attack_types = [
+        world.bomb_actions,
+        world.missile_actions
+    ]
+
+
+def write_psi(world: "EarthBoundWorld", rom: "LocalRom") -> None:
+    from ..game_data.text_data import text_encoder
+    psi_num = 0
+    for spell, (address, levels) in world.psi_address.items():
+        for i in range(levels):
+            rom.write_bytes(address + 9, bytearray(world.psi_slot_data[psi_num][i]))
+            rom.write_bytes(address + 6, bytearray(world.psi_level_data[psi_num][i]))
+            if psi_num == 0:
+                rom.write_bytes(address, bytearray([0x01]))
+            elif psi_num == 5 and i > 1:
+                rom.write_bytes(0x01C4AB + (0x9E * (i - 2)), struct.pack("H", world.starstorm_address[spell][i - 2]))  # Menu spells
+                rom.write_bytes(0x01C536 + (0x78 * (i - 2)), bytearray([world.starstorm_spell_id[spell][i - 2]]))  # What spell is controlled by the PSI flags
+                rom.write_bytes(0x2E957F + (0x11 * (i - 2)), bytearray([world.starstorm_spell_id[spell][i - 2]]))  # The global Poo PSI text
+                rom.write_bytes(address + 9, bytearray(world.psi_slot_data[psi_num][i - 2]))
+
+            if spell == "Special" and psi_num != 0:
+                rom.write_bytes(address, bytearray([0x12]))
+
+            address += 15
+            if spell == "Starstorm" and i == 1:
+                address = 0x158B8B
+    # todo; expanded psi
+    # todo; animation for Starstorm L/D
+    # todo; swap enemy actions for Special?
+    # todo; cleanup stuff
+        psi_num += 1
+
+    # rom.write_bytes(0x2E957F + (0x11 * (i - 2)), bytearray([world.starstorm_spell_id[spell][i - 2]]))
+    # Starstorm spell for the item locally
+    rom.write_bytes(0x2EAE2E,  bytearray([world.starstorm_spell_id[world.offensive_psi_slots[5]][0]]))
+    rom.write_bytes(0x2EAE38,  bytearray([world.starstorm_spell_id[world.offensive_psi_slots[5]][1]]))
+
+    jeff_item_num = 0
+    jeff_item_index = 0
+    for item in world.jeff_offense_items:
+        for i in range(world.jeff_item_counts[jeff_item_num]):
+            address = world.jeff_addresses[jeff_item_index]
+            jeff_item_index += 1
+            name = world.jeff_item_names[jeff_item_num][item][i]
+            description = world.jeff_help_text[jeff_item_num][item][i]
+            name_encoded = text_encoder(name, 22)
+            name_encoded.extend(([0x00]))
+            rom.write_bytes(address, name_encoded)
+            rom.write_bytes(address + 35, struct.pack("I", description))
+            if "Broken" not in name:  # broken items don't need attack data
+                attack = world.attack_types[jeff_item_num][item][i]
+                rom.write_bytes(address + 29, struct.pack("H", attack))
+        jeff_item_num += 1
+    jeff_item_num = 0
+    name = world.spray_names[world.jeff_assist_items[0]]
+    name_encoded = text_encoder(name, 22)
+    name_encoded.extend(([0x00]))
+    description = world.spray_desc[world.jeff_assist_items[0]]
+    address = 0x156887
+    action = world.gadget_actions[world.jeff_assist_items[0]][0]
+    rom.write_bytes(address, name_encoded)
+    rom.write_bytes(address + 35, struct.pack("I", description))
+    rom.write_bytes(address + 29, struct.pack("H", action))
+
+    for item in world.jeff_assist_items:
+        for i in range(world.gadget_counts[jeff_item_num]):
+            if jeff_item_num == 0:
+                i = 1
+            name = world.gadget_names[item][i]
+            name_encoded = text_encoder(name, 22)
+            name_encoded.extend(([0x00]))
+            description = world.gadget_desc[item][i]
+            action = world.gadget_actions[world.jeff_assist_items[jeff_item_num]][i]
+            address = world.gadget_addresses[jeff_item_num][i]
+            rom.write_bytes(address, name_encoded)
+            rom.write_bytes(address + 35, struct.pack("I", description))
+            rom.write_bytes(address + 29, struct.pack("H", action))
+            rom.write_bytes(description - 0xC00000 + 5, bytearray([world.gadget_ids[jeff_item_num][i]]))
+        jeff_item_num += 1
+
+    for i in range(5):
+        item = world.jeff_assist_items[i]
+        if i < 2:
+            level = 1
+        else:
+            level = 0
+        address = world.broken_gadget_addresses[i]
+        name = world.broken_gadgets[item][level]
+        description = world.broken_desc[item][level]
+        name_encoded = text_encoder(name, 22)
+        name_encoded.extend(([0x00]))
+        rom.write_bytes(address, name_encoded)
+        rom.write_bytes(address + 35, struct.pack("I", description))
+        rom.write_bytes(description - 0xC00000 + 5, bytearray([world.broken_gadget_ids[i]]))
+
+    rom.write_bytes(0x15A8EB, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[4]][1])))
+    rom.write_bytes(0x15BB45, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[0]][0])))
+    rom.write_bytes(0x15BBA5, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[4]][0])))
+    rom.write_bytes(0x15DF41, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[4]][0])))
+    rom.write_bytes(0x15DF3F, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[4]][1])))
+    rom.write_bytes(0x15BA2B, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[1]][0])))
+    rom.write_bytes(0x15C06D, bytearray(struct.pack("H", world.gadget_actions[world.jeff_assist_items[1]][1])))
+
+
+def adjust_psi_list(psi_input: list[str], spell: str, index: int) -> None:
+    """Move a spell in the PSI table to a different entry/slot"""
+    psi_input.insert(index, (psi_input.pop(psi_input.index(spell))))
diff --git a/worlds/earthbound/modules/shopsanity.py b/worlds/earthbound/modules/shopsanity.py
new file mode 100644
index 0000000000..26ca52c1d8
--- /dev/null
+++ b/worlds/earthbound/modules/shopsanity.py
@@ -0,0 +1,449 @@
+from ..game_data.local_data import psi_item_table, character_item_table, special_name_table, item_id_table, money_item_table
+from ..game_data.text_data import calc_pixel_width, text_encoder
+from ..game_data.static_location_data import location_ids
+from ..Options import ShopRandomizer, MagicantMode, MonkeyCavesMode
+from BaseClasses import ItemClassification, Location
+import struct
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+    from .Rom import LocalRom
+
+high_purchase_areas = {
+    "Twoson",
+    "Fourside",
+    "Scaraba",
+    "Andonuts Lab Area"  # long walk with no atm
+}
+
+shop_locations = {
+    "Onett Drugstore - Right Counter Slot 1",
+    "Onett Drugstore - Right Counter Slot 2",
+    "Onett Drugstore - Right Counter Slot 3",
+    "Onett Drugstore - Right Counter Slot 4",
+    "Onett Drugstore - Right Counter Slot 5",
+    "Onett Drugstore - Left Counter",
+    "Summers - Beach Cart",
+    "Onett Burger Shop - Slot 1",
+    "Onett Burger Shop - Slot 2",
+    "Onett Burger Shop - Slot 3",
+    "Onett Burger Shop - Slot 4",
+    "Onett Bakery - Slot 1",
+    "Onett Bakery - Slot 2",
+    "Onett Bakery - Slot 3",
+    "Onett Bakery - Slot 4",
+    "Twoson Department Store Burger Shop - Slot 1",
+    "Twoson Department Store Burger Shop - Slot 2",
+    "Twoson Department Store Burger Shop - Slot 3",
+    "Twoson Department Store Burger Shop - Slot 4",
+    "Twoson Department Store Bakery - Slot 1",
+    "Twoson Department Store Bakery - Slot 2",
+    "Twoson Department Store Bakery - Slot 3",
+    "Twoson Department Store Bakery - Slot 4",
+    "Twoson Department Store Top Floor - Right Counter Slot 1",
+    "Twoson Department Store Top Floor - Right Counter Slot 2",
+    "Twoson Department Store Top Floor - Right Counter Slot 3",
+    "Twoson Department Store Top Floor - Right Counter Slot 4",
+    "Twoson Department Store Top Floor - Right Counter Slot 5",
+    "Twoson Department Store Top Floor - Right Counter Slot 6",
+    "Twoson Department Store Top Floor - Left Counter Slot 1",
+    "Summers - Magic Cake Cart Shop Slot",
+    "Burglin Park Junk Shop - Slot 1",
+    "Burglin Park Junk Shop - Slot 2",
+    "Burglin Park Junk Shop - Slot 3",
+    "Burglin Park Junk Shop - Slot 4",
+    "Burglin Park Junk Shop - Slot 5",
+    "Burglin Park Junk Shop - Slot 6",
+    "Burglin Park Bread Stand - Slot 1",
+    "Burglin Park Bread Stand - Slot 2",
+    "Burglin Park Bread Stand - Slot 3",
+    "Burglin Park Bread Stand - Slot 4",
+    "Burglin Park Bread Stand - Slot 5",
+    "Burglin Park Bread Stand - Slot 6",
+    "Burglin Park - Banana Stand",
+    "Happy-Happy Village Drugstore - Right Counter Slot 1",
+    "Happy-Happy Village Drugstore - Right Counter Slot 2",
+    "Happy-Happy Village Drugstore - Right Counter Slot 3",
+    "Happy-Happy Village Drugstore - Right Counter Slot 4",
+    "Happy-Happy Village Drugstore - Right Counter Slot 5",
+    "Threed Drugstore - Right Counter Slot 1",
+    "Threed Drugstore - Right Counter Slot 2",
+    "Threed Drugstore - Right Counter Slot 3",
+    "Threed Drugstore - Right Counter Slot 4",
+    "Threed Drugstore - Right Counter Slot 5",
+    "Threed Drugstore - Left Counter Slot 1",
+    "Threed Drugstore - Left Counter Slot 2",
+    "Threed Drugstore - Left Counter Slot 3",
+    "Threed Drugstore - Left Counter Slot 4",
+    "Threed Drugstore - Left Counter Slot 5",
+    "Threed - Arms Dealer Slot 1",
+    "Threed - Arms Dealer Slot 2",
+    "Threed - Arms Dealer Slot 3",
+    "Threed - Arms Dealer Slot 4",
+    "Threed Bakery - Slot 1",
+    "Threed Bakery - Slot 2",
+    "Threed Bakery - Slot 3",
+    "Threed Bakery - Slot 4",
+    "Threed Bakery - Slot 5",
+    "Threed Bakery - Slot 6",
+    "Threed Bakery - Slot 7",
+    "Scaraba - Expensive Water Guy",
+    "Winters Drugstore - Slot 1",
+    "Winters Drugstore - Slot 2",
+    "Winters Drugstore - Slot 3",
+    "Winters Drugstore - Slot 4",
+    "Winters Drugstore - Slot 5",
+    "Winters Drugstore - Slot 6",
+    "Winters Drugstore - Slot 7",
+    "Saturn Valley Shop - Center Saturn Slot 1",
+    "Saturn Valley Shop - Center Saturn Slot 2",
+    "Saturn Valley Shop - Center Saturn Slot 3",
+    "Saturn Valley Shop - Center Saturn Slot 4",
+    "Saturn Valley Shop - Center Saturn Slot 5",
+    "Dusty Dunes Drugstore - Counter Slot 1",
+    "Dusty Dunes Drugstore - Counter Slot 2",
+    "Dusty Dunes Drugstore - Counter Slot 3",
+    "Dusty Dunes Drugstore - Counter Slot 4",
+    "Dusty Dunes Drugstore - Counter Slot 5",
+    "Dusty Dunes - Arms Dealer Slot 1",
+    "Dusty Dunes - Arms Dealer Slot 2",
+    "Dusty Dunes - Arms Dealer Slot 3",
+    "Dusty Dunes - Arms Dealer Slot 4",
+    "Fourside Bakery - Slot 1",
+    "Fourside Bakery - Slot 2",
+    "Fourside Bakery - Slot 3",
+    "Fourside Bakery - Slot 4",
+    "Fourside Bakery - Slot 5",
+    "Fourside Bakery - Slot 6",
+    "Fourside Department Store - Tool Shop Slot 1",
+    "Fourside Department Store - Tool Shop Slot 2",
+    "Fourside Department Store - Tool Shop Slot 3",
+    "Fourside Department Store - Tool Shop Slot 4",
+    "Fourside Department Store - Tool Shop Slot 5",
+    "Fourside Department Store - Tool Shop Slot 6",
+    "Fourside Department Store - Tool Shop Slot 7",
+    "Fourside Department Store - Shop Shop Slot 1",
+    "Fourside Department Store - Shop Shop Slot 2",
+    "Fourside Department Store - Shop Shop Slot 3",
+    "Fourside Department Store - Shop Shop Slot 4",
+    "Fourside Department Store - Food Shop Slot 1",
+    "Fourside Department Store - Food Shop Slot 2",
+    "Fourside Department Store - Food Shop Slot 3",
+    "Fourside Department Store - Food Shop Slot 4",
+    "Fourside Department Store - Food Shop Slot 5",
+    "Fourside Department Store - 2F Cart Slot 1",
+    "Fourside Department Store - 2F Cart Slot 2",
+    "Fourside Department Store - 2F Cart Slot 3",
+    "Fourside Department Store - 2F Cart Slot 4",
+    "Fourside Department Store - 2F Cart Slot 5",
+    "Fourside Department Store - 2F Cart Slot 6",
+    "Fourside Department Store - 2F Cart Slot 7",
+    "Fourside Department Store - Toys Shop Slot 1",
+    "Fourside Department Store - Toys Shop Slot 2",
+    "Fourside Department Store - Toys Shop Slot 3",
+    "Fourside Department Store - Toys Shop Slot 4",
+    "Fourside Department Store - Toys Shop Slot 5",
+    "Fourside Department Store - Toys Shop Slot 6",
+    "Fourside Department Store - Sports Shop Slot 1",
+    "Fourside Department Store - Sports Shop Slot 2",
+    "Fourside Department Store - Sports Shop Slot 3",
+    "Fourside Department Store - Sports Shop Slot 4",
+    "Fourside Department Store - Burger Shop Slot 1",
+    "Fourside Department Store - Burger Shop Slot 2",
+    "Fourside Department Store - Burger Shop Slot 3",
+    "Fourside Department Store - Burger Shop Slot 4",
+    "Fourside Department Store - Burger Shop Slot 5",
+    "Fourside Department Store - Arms Dealer Slot 1",
+    "Fourside Department Store - Arms Dealer Slot 2",
+    "Fourside Department Store - Arms Dealer Slot 3",
+    "Fourside Department Store - Arms Dealer Slot 4",
+    "Fourside Department Store - Arms Dealer Slot 5",
+    "Fourside - Northeast Alley Junk Shop Slot 1",
+    "Fourside - Northeast Alley Junk Shop Slot 2",
+    "Fourside - Northeast Alley Junk Shop Slot 3",
+    "Fourside - Northeast Alley Junk Shop Slot 4",
+    "Magicant - Shop Slot 1",
+    "Magicant - Shop Slot 2",
+    "Summers - Scam Shop Slot 1",
+    "Summers - Scam Shop Slot 2",
+    "Summers - Scam Shop Slot 3",
+    "Summers - Scam Shop Slot 4",
+    "Summers - Scam Shop Slot 5",
+    "Summers - Scam Shop Slot 6",
+    "Summers - Scam Shop Slot 7",
+    "Summers Harbor - Shop Slot 1",
+    "Summers Harbor - Shop Slot 2",
+    "Summers Harbor - Shop Slot 3",
+    "Summers Harbor - Shop Slot 4",
+    "Summers Harbor - Shop Slot 5",
+    "Summers Harbor - Shop Slot 6",
+    "Summers Harbor - Shop Slot 7",
+    "Summers Restaurant - Slot 1",
+    "Summers Restaurant - Slot 2",
+    "Summers Restaurant - Slot 3",
+    "Summers Restaurant - Slot 4",
+    "Summers Restaurant - Slot 5",
+    "Summers Restaurant - Slot 6",
+    "Scaraba - Indoors Shop Slot 1",
+    "Scaraba - Indoors Shop Slot 2",
+    "Scaraba - Indoors Shop Slot 3",
+    "Scaraba - Indoors Shop Slot 4",
+    "Scaraba - Indoors Shop Slot 5",
+    "Scaraba - Indoors Shop Slot 6",
+    "Scaraba Bazaar - Red Snake Carpet Slot 1",
+    "Scaraba Bazaar - Red Snake Carpet Slot 2",
+    "Scaraba Bazaar - Red Snake Carpet Slot 3",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 1",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 2",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 3",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 4",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 5",
+    "Scaraba Bazaar - Bottom Left Carpet Slot 6",
+    "Scaraba Hotel - Arms Dealer Slot 1",
+    "Scaraba Hotel - Arms Dealer Slot 2",
+    "Scaraba Hotel - Arms Dealer Slot 3",
+    "Scaraba Hotel - Arms Dealer Slot 4",
+    "Deep Darkness - Businessman Slot 1",
+    "Deep Darkness - Businessman Slot 2",
+    "Deep Darkness - Businessman Slot 3",
+    "Deep Darkness - Businessman Slot 4",
+    "Deep Darkness - Businessman Slot 5",
+    "Deep Darkness - Businessman Slot 6",
+    "Deep Darkness - Businessman Slot 7",
+    "Happy-Happy Village - Trust Shop Slot 1",
+    "Happy-Happy Village - Trust Shop Slot 2",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 1",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 2",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 3",
+    "Saturn Valley Shop - Post-Belch Saturn Slot 4",
+    "Scaraba - Southern Camel Shop Slot 1",
+    "Scaraba - Southern Camel Shop Slot 2",
+    "Scaraba - Southern Camel Shop Slot 3",
+    "Scaraba - Southern Camel Shop Slot 4",
+    "Scaraba - Southern Camel Shop Slot 5",
+    "Scaraba - Southern Camel Shop Slot 6",
+    "Scaraba - Southern Camel Shop Slot 7",
+    "Deep Darkness - Arms Dealer Slot 1",
+    "Deep Darkness - Arms Dealer Slot 2",
+    "Deep Darkness - Arms Dealer Slot 3",
+    "Deep Darkness - Arms Dealer Slot 4",
+    "Lost Underworld - Tenda Camp Shop Slot 1",
+    "Lost Underworld - Tenda Camp Shop Slot 2",
+    "Lost Underworld - Tenda Camp Shop Slot 3",
+    "Lost Underworld - Tenda Camp Shop Slot 4",
+    "Lost Underworld - Tenda Camp Shop Slot 5",
+    "Lost Underworld - Tenda Camp Shop Slot 6",
+    "Lost Underworld - Tenda Camp Shop Slot 7",
+    "Happy-Happy Village Drugstore - Left Counter Slot 1",
+    "Happy-Happy Village Drugstore - Left Counter Slot 2",
+    "Happy-Happy Village Drugstore - Left Counter Slot 3",
+    "Happy-Happy Village Drugstore - Left Counter Slot 4",
+    "Happy-Happy Village Drugstore - Left Counter Slot 5",
+    "Happy-Happy Village Drugstore - Left Counter Slot 6",
+    "Happy-Happy Village Drugstore - Left Counter Slot 7",
+    "Grapefruit Falls - Hiker Shop Slot 1",
+    "Grapefruit Falls - Hiker Shop Slot 2",
+    "Grapefruit Falls - Hiker Shop Slot 3",
+    "Saturn Valley Shop - Top Saturn Slot 1",
+    "Saturn Valley Shop - Top Saturn Slot 2",
+    "Saturn Valley Shop - Top Saturn Slot 3",
+    "Saturn Valley Shop - Top Saturn Slot 4",
+    "Saturn Valley Shop - Top Saturn Slot 5",
+    "Saturn Valley Shop - Top Saturn Slot 6",
+    "Saturn Valley Shop - Top Saturn Slot 7",
+    "Dusty Dunes Drugstore - Left Shop Slot 1",
+    "Dusty Dunes Drugstore - Left Shop Slot 2",
+    "Dusty Dunes Drugstore - Left Shop Slot 3",
+    "Dusty Dunes Drugstore - Left Shop Slot 4",
+    "Dusty Dunes Drugstore - Left Shop Slot 5",
+    "Dusty Dunes Drugstore - Left Shop Slot 6",
+    "Dusty Dunes Drugstore - Left Shop Slot 7",
+    "Dusty Dunes - Mine Food Cart Slot 1",
+    "Dusty Dunes - Mine Food Cart Slot 2",
+    "Dusty Dunes - Mine Food Cart Slot 3",
+    "Dusty Dunes - Mine Food Cart Slot 4",
+    "Dusty Dunes - Mine Food Cart Slot 5",
+    "Dusty Dunes - Mine Food Cart Slot 6",
+    "Dusty Dunes - Mine Food Cart Slot 7",
+    "Moonside Hotel - Shop Slot 1",
+    "Moonside Hotel - Shop Slot 2",
+    "Moonside Hotel - Shop Slot 3",
+    "Moonside Hotel - Shop Slot 4",
+    "Moonside Hotel - Shop Slot 5",
+    "Dalaam Restaurant - Slot 1",
+    "Dalaam Restaurant - Slot 2",
+    "Dalaam Restaurant - Slot 3",
+    "Dalaam Restaurant - Slot 4",
+    "Scaraba Bazaar - Delicacy Shop Slot 1",
+    "Scaraba Bazaar - Delicacy Shop Slot 2",
+    "Scaraba Bazaar - Delicacy Shop Slot 3",
+    "Scaraba Bazaar - Delicacy Shop Slot 4",
+    "Scaraba Bazaar - Delicacy Shop Slot 5",
+    "Scaraba Bazaar - Delicacy Shop Slot 6",
+    "Scaraba Bazaar - Delicacy Shop Slot 7",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 1",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 2",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 3",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 4",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 5",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 6",
+    "Twoson/Scaraba - Shared Condiment Shop Slot 7",
+    "Andonuts Lab - Caveman Shop Slot 1",
+    "Andonuts Lab - Caveman Shop Slot 2",
+    "Andonuts Lab - Caveman Shop Slot 3",
+    "Andonuts Lab - Caveman Shop Slot 4",
+    "Andonuts Lab - Caveman Shop Slot 5"
+}
+
+
+def write_shop_checks(world: "EarthBoundWorld", rom: "LocalRom", shop_checks: list[Location]) -> None:
+    unsellable_filler_prices = {
+        "Broken Machine": 150,
+        "Broken Air Gun": 110,
+        "Broken Laser": 250,
+        "Broken Pipe": 250,
+        "Broken Tube": 800,
+        "Broken Bazooka": 900,
+        "Broken Trumpet": 500,
+        "Broken Harmonica": 1500,
+        "Counter-PSI Unit": 300,
+        "Shield Killer": 500,
+        "Heavy Bazooka": 1800,
+        "Hungry HP-Sucker": 1600,
+        "Defense Shower": 1000,
+        "Neutralizer": 5000,
+        "Brain Stone": 2,
+        "Monkey's Love": 2
+    }
+    # Unique non-progression items that have no price by default. If they're on a shop,
+    # give them a base price. (prog items are handled by the "price" variable)
+    # Equipamizer already assigns prices to Equipment with no price, so they can be exempt.
+    if not world.options.armorizer:
+        unsellable_filler_prices["Cloak of Kings"] = 2000
+        unsellable_filler_prices["Diadem of Kings"] = 1500
+        unsellable_filler_prices["Bracer of Kings"] = 3500
+
+    if not world.options.weaponizer:
+        unsellable_filler_prices["Magicant Bat"] = 3000
+        unsellable_filler_prices["Legendary Bat"] = 5000
+        unsellable_filler_prices["Magnum Air Gun"] = 220
+        unsellable_filler_prices["Laser Gun"] = 500
+        unsellable_filler_prices["Baddest Beam"] = 3000
+
+    if world.options.shop_randomizer == ShopRandomizer.option_shopsanity:
+        rom.write_bytes(0x04FD77, bytearray([world.options.scout_shop_checks]))
+        for location in shop_checks:
+
+            flag = location.address - 0xEB1000
+            if location.item.player == world.player:
+                if world.options.remote_items:
+                    if location.item.name in special_name_table or location.item.name in money_item_table:
+                        item_type = 0x04
+                        item_id = 0xAD
+                    else:
+                        item_type = 0x05
+                        item_id = item_id_table[location.item.name]
+                else:
+                    if location.item.name in psi_item_table:
+                        item_type = 0x01
+                        item_id = psi_item_table[location.item.name]
+                    elif location.item.name == "Photograph" and location.item.player == world.player:
+                        item_type = 0x06
+                        item_id = 0xAD
+                    elif location.item.name in character_item_table:
+                        item_type = 0x02
+                        item_id = character_item_table[location.item.name][0]
+                    elif location.item.name in money_item_table:
+                        item_type = 0x07
+                        item_id = list(money_item_table).index(location.item.name) + 1
+                    else:
+                        item_type = 0x00
+                        item_id = item_id_table[location.item.name] 
+
+                if location.item.name in unsellable_filler_prices and location.item.player == world.player:
+                    rom.write_bytes(0x15501A + (item_id_table[location.item.name] * 39),
+                                    struct.pack("H", unsellable_filler_prices[location.item.name]))
+
+            else:
+                item_type = 0x04
+                item_id = 0xAD
+        
+            if ItemClassification.trap in location.item.classification:
+                price = 0
+            else:
+                price = world.random.randint(1, (75 * world.area_levels[location.parent_region.name]))
+
+            if location.parent_region.name in high_purchase_areas:
+                price = int(price / 1.5)
+            
+            item_struct = struct.pack('<BHBH', item_id, price, item_type, flag)
+            rom.write_bytes(0x34002A + (0x06 * flag), item_struct)
+            menu_long_name = text_encoder(location.item.name, 127)
+            menu_item_name = location.item.name[:0x30]
+            menu_item_name = menu_item_name.replace(" ", " ")
+            pixel_length = calc_pixel_width(menu_item_name)
+            while pixel_length > 78:
+                menu_item_name = menu_item_name[:-1]
+                pixel_length = calc_pixel_width(menu_item_name)
+            menu_item_name = text_encoder(menu_item_name, 0x30)
+            player_name = text_encoder(world.multiworld.get_player_name(location.item.player), 16)
+            player_name.append(0x00)
+            rom.write_bytes(0x341190 + (flag * 0x30), menu_item_name)
+            rom.write_bytes(0x3466D0 + (flag * 0x11), player_name)
+            rom.write_bytes(0x351100 + (flag * 127), menu_long_name)
+
+        rom.write_bytes(0x019DE5, struct.pack("I", 0xF007805C))  # Build the shop menus
+        rom.write_bytes(0x019E23, struct.pack("I", 0xF008465C))  # Display the item name
+        rom.write_bytes(0x019E8F, struct.pack("I", 0xF0094E5C))  # Display the item price
+        rom.write_bytes(0x011AC6, struct.pack("I", 0xF009985C))  # display the player name
+        rom.write_bytes(0x019EDD, struct.pack("I", 0xF00AA45C))  # Transfer the used data and player selection into a script for processing
+        rom.write_bytes(0x019ED3, struct.pack("I", 0xF00ADD5C))  # Display SOLD OUT
+        rom.write_bytes(0x019B66, struct.pack("I", 0xF00B0B5C))  # Prevent items for other players flashing the "you can equip this"
+        rom.write_bytes(0x019DA0, struct.pack("I", 0xF00B275C))  # Preserve the greyed out HP/PP palette
+
+        rom.write_bytes(0x05E0A9, struct.pack("I", 0xF4900008))  # Compare the price of the item with money on hand
+        rom.write_bytes(0x05E0B6, struct.pack("I", 0xF4905808))  # Display the item we bought and ask to confirm
+        # The player bought the item; set a flag and give it to them
+        rom.write_bytes(0x05E0CE, struct.pack("I", 0xF493C30A))
+        rom.write_bytes(0x05E0C8, struct.pack("I", 0xF493C3))
+        rom.write_bytes(0x05DF1E, struct.pack("I", 0xF496140A))
+        # Prevent the game from checking inventory space if not needed
+        rom.write_bytes(0x05E029, struct.pack("I", 0xF496340A))
+        rom.write_bytes(0x05E04C, struct.pack("I", 0xF496590A))
+        rom.write_bytes(0x05E1AE, struct.pack("I", 0xF00EB8))  # Post-shop cleanup
+
+        rom.write_bytes(0x05E1A5, struct.pack("I", 0xF00EAA))
+        rom.write_bytes(0x05E119, struct.pack("I", 0xF00EB1))
+        rom.write_bytes(0x05E0F2, struct.pack("I", 0xF00EC0))
+
+        rom.write_bytes(0x3407E0, bytearray([item_id_table[world.filler_shop[0]], 0x00, 0x00, 0x00, 0x49, 0x01]))
+        rom.write_bytes(0x3407E6, bytearray([item_id_table[world.filler_shop[1]], 0x00, 0x00, 0x00, 0x4A, 0x01]))
+
+        rom.write_bytes(0x3408DC, bytearray([0xE0, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x3408E2, bytearray([0x5D, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x3408E8, bytearray([0x5A, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x3408EE, bytearray([0x7F, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x3408F4, bytearray([0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x3408FA, bytearray([0x6C, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+        rom.write_bytes(0x340900, bytearray([0x8C, 0x00, 0x00, 0x00, 0xFF, 0xFF]))
+
+        if world.options.magicant_mode >= MagicantMode.option_alternate_goal:  # 2
+            rom.write_bytes(0x3405E8, bytearray([item_id_table[world.magicant_junk[6]], 0x00, 0x00, 0x00, 0xF5, 0x00]))
+            rom.write_bytes(0x3405EE, bytearray([item_id_table[world.magicant_junk[7]], 0x00, 0x00, 0x00, 0xF6, 0x00]))
+    else:
+        filler_shop_items = world.filler_drops.copy()
+        filler_shop_items = [x for x in filler_shop_items if x not in [227, 228, 229, 230, 231, 0]]
+        for location in location_ids:
+            if location_ids[location] >= 0xEB1000:
+                slot = location_ids[location] - 0xEB1000
+                rom.write_bytes(0x1576B9 + slot, bytearray([world.random.choice(filler_shop_items)]))
+                rom.write_bytes(0x1576e3, bytearray([0xEF]))
+                rom.write_bytes(0x15779c, bytearray([0x5A]))
+                if world.options.monkey_caves_mode < MonkeyCavesMode.option_shop:  # 2
+                    rom.write_bytes(0x15776b, bytearray([0xE0]))
+                    rom.write_bytes(0x157775, bytearray([0x8C]))
+                    rom.write_bytes(0x157778, bytearray([0x6C]))
+                    rom.write_bytes(0x157781, bytearray([0x5D]))
+                    rom.write_bytes(0x157848, bytearray([0x7F]))  # DD Drugstore left counter 1
+        rom.write_bytes(0x157802, bytearray([world.random.choice(filler_shop_items)]))
+        rom.write_bytes(0x157803, bytearray([world.random.choice(filler_shop_items)]))
diff --git a/worlds/earthbound/setup_game.py b/worlds/earthbound/setup_game.py
new file mode 100644
index 0000000000..19ba990c79
--- /dev/null
+++ b/worlds/earthbound/setup_game.py
@@ -0,0 +1,501 @@
+from .modules.flavor_data import random_flavors
+from .game_data.text_data import lumine_hall_text, eb_text_table, text_encoder
+from .game_data.local_data import item_id_table
+from .modules.psi_shuffle import shuffle_psi
+from .modules.boss_shuffle import initialize_bosses
+from .modules.enemy_shuffler import shuffle_enemies
+from .modules.dungeon_er import shuffle_dungeons
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from . import EarthBoundWorld
+    
+def setup_gamevars(world: "EarthBoundWorld") -> None:
+    """Initialize or roll most world variables"""
+
+    world.slime_pile_wanted_item = world.random.choice([
+        "Cookie",
+        "Bag of Fries",
+        "Hamburger",
+        "Boiled Egg",
+        "Fresh Egg",
+        "Picnic Lunch",
+        "Pasta di Summers",
+        "Pizza",
+        "Chef's Special",
+        "Large Pizza",
+        "PSI Caramel",
+        "Magic Truffle",
+        "Brain Food Lunch",
+        "Rock Candy",
+        "Croissant",
+        "Bread Roll",
+        "Can of Fruit Juice",
+        "Royal Iced Tea",
+        "Protein Drink",
+        "Kraken Soup",
+        "Bottle of Water",
+        "Cold Remedy",
+        "Vial of Serum",
+        "IQ Capsule",
+        "Guts Capsule",
+        "Speed Capsule",
+        "Vital Capsule",
+        "Luck Capsule",
+        "Ketchup Packet",
+        "Sugar Packet",
+        "Tin of Cocoa",
+        "Carton of Cream",
+        "Sprig of Parsley",
+        "Jar of Hot Sauce",
+        "Salt Packet",
+        "Jar of Delisauce",
+        "Trout Yogurt",
+        "Banana",
+        "Calorie Stick",
+        "Gelato de Resort",
+        "Magic Tart",
+        "Cup of Noodles",
+        "Repel Sandwich",
+        "Repel Superwich",
+        "Lucky Sandwich",
+        "Cup of Coffee",
+        "Double Burger",
+        "Mammoth Burger",
+        "Peanut Cheese Bar",
+        "Piggy Jelly",
+        "Bowl of Rice Gruel",
+        "Bean Croquette",
+        "Molokheiya Soup",
+        "Plain Roll",
+        "Kabob",
+        "Plain Yogurt",
+        "Beef Jerky",
+        "Spicy Jerky",
+        "Luxury Jerky",
+        "Bottle of DXwater",
+        "Magic Pudding",
+        "Popsicle"])
+
+    if world.options.progressive_weapons:
+        for i in range(3):
+            world.common_gear.append("Progressive Bat")
+            world.common_gear.append("Progressive Gun")
+            world.common_gear.append("Progressive Fry Pan")
+        for i in range(3):
+            world.uncommon_gear.append("Progressive Bat")
+            world.uncommon_gear.append("Progressive Gun")
+            world.uncommon_gear.append("Progressive Fry Pan")
+        world.rare_gear.append("Progressive Bat")
+        world.rare_gear.append("Progressive Gun")
+        world.rare_gear.append("Progressive Fry Pan")
+    else:
+        world.common_gear.extend([
+            "Cracked Bat",
+            "Tee Ball Bat",
+            "Sand Lot Bat",
+            "Minor League Bat",
+            "Fry Pan",
+            "Thick Fry Pan",
+            "Deluxe Fry Pan",
+            "Toy Air Gun",
+            "Zip Gun"
+        ])
+
+        world.uncommon_gear.extend([
+            "Mr. Baseball Bat",
+            "T-Rex's Bat",
+            "Big League Bat",
+            "Chef's Fry Pan",
+            "Non-Stick Frypan",
+            "French Fry Pan",
+            "Hyper Beam",
+            "Crusher Beam"
+        ])
+
+        world.rare_gear.extend([
+            "Hall of Fame Bat",
+            "Ultimate Bat",
+            "Gutsy Bat",
+            "Casey Bat",
+            "Holy Fry Pan",
+            "Magic Fry Pan"
+        ])
+
+    if world.options.progressive_armor:
+        for i in range(3):
+            world.common_gear.append("Progressive Bracelet")
+            world.common_gear.append("Progressive Other")
+        for i in range(3):
+            world.uncommon_gear.append("Progressive Bracelet")
+            world.uncommon_gear.append("Progressive Other")
+        world.rare_gear.append("Progressive Bracelet")
+        world.rare_gear.append("Progressive Other")
+    else:
+        world.common_gear.extend([
+            "Cheap Bracelet",
+            "Copper Bracelet",
+            "Baseball Cap",
+            "Mr. Baseball Cap",
+            "Holmes Hat",
+            "Hard Hat",
+            "Coin of Defense"
+        ])
+
+        world.uncommon_gear.extend([
+            "Platinum Band",
+            "Diamond Band",
+            "Lucky Coin",
+            "Silver Bracelet",
+            "Gold Bracelet",
+            "Coin of Slumber",
+            "Coin of Silence"
+        ])
+
+        world.rare_gear.extend([
+            "Talisman Coin",
+            "Shiny Coin",
+            "Charm Coin"
+        ])
+
+    world.multiworld.push_precollected(world.create_item(world.starting_character))
+
+    valid_starts = 14
+    if world.options.magicant_mode != 00:
+        valid_starts -= 1
+
+    if world.options.random_start_location:
+        world.start_location = world.random.randint(1, valid_starts)
+    else:
+        world.start_location = 0
+
+    if world.options.prefixed_items:
+        world.multiworld.itempool.append(world.create_item("Counter-PSI Unit"))
+        world.multiworld.itempool.append(world.create_item("Shield Killer"))
+        world.multiworld.itempool.append(world.create_item("Hungry HP-Sucker"))
+        world.multiworld.itempool.append(world.create_item("Defense Shower"))
+        world.multiworld.itempool.append(world.create_item("Heavy Bazooka"))
+        world.common_items.append("Defense Spray")
+        world.uncommon_items.append("Slime Generator")
+        if world.options.progressive_weapons:
+            for i in range(3):
+                world.multiworld.itempool.append(world.create_item("Progressive Gun"))
+                world.common_gear.append("Progressive Gun")
+                world.uncommon_gear.append("Progressive Gun")
+                world.rare_gear.append("Progressive Gun")
+        else:
+            world.multiworld.itempool.append(world.create_item("Magnum Air Gun"))
+            world.multiworld.itempool.append(world.create_item("Laser Gun"))
+            world.multiworld.itempool.append(world.create_item("Baddest Beam"))
+            world.uncommon_gear.append("Spectrum Beam")
+            world.rare_gear.append("Gaia Beam")
+            world.common_gear.append("Double Beam")
+    else:
+        world.multiworld.itempool.append(world.create_item("Broken Machine"))
+        world.multiworld.itempool.append(world.create_item("Broken Pipe"))
+        world.multiworld.itempool.append(world.create_item("Broken Tube"))
+        world.multiworld.itempool.append(world.create_item("Broken Trumpet"))
+        world.multiworld.itempool.append(world.create_item("Broken Bazooka"))
+        world.common_items.append("Broken Spray Can")
+        world.uncommon_items.append("Broken Iron")
+
+        if world.options.progressive_weapons:
+            for i in range(3):
+                world.multiworld.itempool.append(world.create_item("Progressive Gun"))
+            world.common_gear.append("Progressive Gun")
+            world.uncommon_gear.append("Progressive Gun")
+            world.rare_gear.append("Progressive Gun")
+        else:
+            world.multiworld.itempool.append(world.create_item("Broken Air Gun"))
+            world.multiworld.itempool.append(world.create_item("Broken Laser"))
+            world.multiworld.itempool.append(world.create_item("Broken Harmonica"))
+            world.common_gear.append("Broken Gadget")
+            world.uncommon_gear.append("Broken Cannon")
+            world.rare_gear.append("Broken Antenna")
+
+    for i in range(world.options.total_photos):
+        world.multiworld.itempool.append(world.create_item("Photograph"))
+        world.event_count += 1
+        
+    world.franklinbadge_elements = [
+        "thunder",
+        "fire",
+        "freeze",
+        "flash",
+        "starstorm",
+        "special",
+        "explosive"
+    ]
+
+    world.starting_progressive_bats = 0
+    world.starting_progressive_pans = 0
+    world.starting_progressive_guns = 0
+    world.starting_progressive_bracelets = 0
+    world.starting_progressive_others = 0
+
+    if world.options.prefixed_items:
+        world.broken_guns = [
+            "Magnum Air Gun",
+            "Laser Gun",
+            "Double Beam",
+            "Spectrum Beam",
+            "Baddest Beam",
+            "Gaia Beam"
+        ]
+    else:
+        world.broken_guns = [
+            "Broken Air Gun",
+            "Broken Laser",
+            "Broken Gadget",
+            "Broken Cannon",
+            "Broken Harmonica",
+            "Broken Antenna"
+        ]
+
+    world.bats = [
+        "Sand Lot Bat",
+        "Minor League Bat",
+        "Mr. Baseball Bat",
+        "T-Rex's Bat",
+        "Big League Bat",
+        "Hall of Fame Bat",
+        "Casey Bat",
+        "Magicant Bat",
+        "Legendary Bat"
+    ]
+
+    world.pans = [
+        "Fry Pan",
+        "Thick Fry Pan",
+        "Deluxe Fry Pan",
+        "Chef's Fry Pan",
+        "Non-Stick Fry Pan",
+        "French Fry Pan",
+        "Holy Fry Pan",
+        "Magic Fry Pan"
+    ]
+
+    world.guns = [
+        "Pop Gun",
+        "Stun Gun",
+        "Toy Air Gun",
+        world.broken_guns[0],
+        "Zip Gun",
+        world.broken_guns[1],
+        "Hyper Beam",
+        world.broken_guns[2],
+        "Crusher Beam",
+        world.broken_guns[3],
+        "Death Ray",
+        world.broken_guns[4],
+        "Moon Beam Gun",
+        world.broken_guns[5]
+    ]
+
+    world.bracelets = [
+        "Cheap Bracelet",
+        "Copper Bracelet",
+        "Silver Bracelet",
+        "Gold Bracelet",
+        "Platinum Band",
+        "Diamond Band",
+        "Pixie's Bracelet",
+        "Cherub's Band",
+        "Goddess Band"
+    ]
+
+    world.others = [
+        "Baseball Cap",
+        "Mr. Baseball Cap",
+        "Holmes Hat",
+        "Hard Hat",
+        "Coin of Slumber",
+        "Coin of Defense",
+        "Coin of Slience"
+        "Mr. Saturn Coin",
+        "Charm Coin",
+        "Lucky Coin",
+        "Talisman Coin",
+        "Shiny Coin",
+        "Souvenir Coin"
+
+    ]
+
+    world.progressive_item_groups = {
+        "Progressive Bat": world.bats,
+        "Progressive Fry Pan": world.pans,
+        "Progressive Gun": world.guns,
+        "Progressive Bracelet": world.bracelets,
+        "Progressive Other": world.others
+    }
+
+    world.start_prog_counts = {
+        "Progressive Bat": world.starting_progressive_bats,
+        "Progressive Fry Pan": world.starting_progressive_pans,
+        "Progressive Gun": world.starting_progressive_guns,
+        "Progressive Bracelet": world.starting_progressive_bracelets,
+        "Progressive Other": world.starting_progressive_others
+    }
+
+    if world.options.randomize_franklinbadge_protection:
+        world.franklin_protection = world.random.choice(world.franklinbadge_elements)
+    else:
+        world.franklin_protection = "thunder"
+
+    if world.options.random_start_location:
+        world.valid_teleports = [
+            "Onett Teleport",
+            "Twoson Teleport",
+            "Happy-Happy Village Teleport",
+            "Threed Teleport",
+            "Saturn Valley Teleport",
+            "Fourside Teleport",
+            "Winters Teleport",
+            "Summers Teleport",
+            "Dalaam Teleport",
+            "Scaraba Teleport",
+            "Deep Darkness Teleport",
+            "Tenda Village Teleport",
+            "Lost Underworld Teleport"
+        ]
+
+        if world.options.magicant_mode == 0:
+            world.valid_teleports.append("Magicant Teleport")
+
+        del world.valid_teleports[world.start_location - 1]
+
+        world.starting_teleport = world.random.choice(world.valid_teleports)
+        world.multiworld.push_precollected(world.create_item(world.starting_teleport))
+
+    filler_items = (world.common_items + world.uncommon_items + world.rare_items + world.common_gear +
+                    world.uncommon_gear + world.rare_gear)
+
+    if world.options.progressive_weapons:
+        remove_items = {"Progressive Bat", "Progressive Fry Pan", "Progressive Gun"}
+        filler_items = [item for item in filler_items if item not in remove_items]
+
+    if world.options.progressive_armor:
+        remove_items = {"Progressive Bracelet", "Progressive Other"}
+        filler_items = [item for item in filler_items if item not in remove_items]
+
+    world.filler_drops = [item_id_table[i] for i in filler_items if i in item_id_table]
+    world.filler_drops.append(0x00)
+    if world.options.prefixed_items:
+        world.filler_drops.extend([0xA1, 0xD7, 0x8A, 0x2C, 0x30])
+    else:
+        world.filler_drops.extend([0x07, 0x05, 0x09, 0x0B, 0x10])
+
+    world.filler_shop = []
+    if world.options.magicant_mode.value >= 2:
+        world.magicant_junk = []
+        for i in range(8):
+            world.magicant_junk.append(world.random.choice(filler_items))
+    for i in range(2):
+        world.filler_shop.append(world.random.choice(filler_items))
+
+    world.available_flavors = []
+    if world.options.random_flavors:
+        for i in range(4):
+            world.available_flavors = world.random.sample(random_flavors, 4)
+    else:
+        world.available_flavors = [
+            "Mint flavor",
+            "Strawberry flavor",
+            "Banana flavor",
+            "Peanut flavor"
+        ]
+
+    world.lumine_text = []
+    world.prayer_player = []
+    if world.options.plando_lumine_hall_text == "":
+        lumine_str = world.random.choice(lumine_hall_text)
+    else:
+        lumine_str = world.options.plando_lumine_hall_text.value
+
+    for char in lumine_str[:213]:
+        world.lumine_text.extend(eb_text_table[char])
+    world.lumine_text.extend([0x00])
+    world.starting_money = world.options.starting_money.value
+
+    # todo; move to text converter
+    prayer_player = world.multiworld.get_player_name(world.random.randint(1, world.multiworld.players))
+    for char in prayer_player[:24]:
+        if char in eb_text_table:
+            world.prayer_player.extend(eb_text_table[char])
+        else:
+            world.prayer_player.extend([0x6F])
+    world.prayer_player.extend([0x00])
+
+    world.credits_player = world.multiworld.get_player_name(world.player)
+    world.credits_player = text_encoder(world.credits_player, 16)
+    world.credits_player.extend([0x00])
+    shuffle_psi(world)
+    initialize_bosses(world)
+    shuffle_enemies(world)
+    shuffle_dungeons(world)
+
+
+def place_static_items(world: "EarthBoundWorld") -> None:
+    """Places all locked items. Some are events. Some are filler items that
+       need to be placed depending on certain settings."""
+
+    world.get_location("Belch Defeated").place_locked_item(world.create_item("Threed Tunnels Clear"))
+    world.get_location("Dungeon Man Submarine").place_locked_item(world.create_item("Submarine to Deep Darkness"))
+    world.get_location("Any ATM").place_locked_item(world.create_item("ATM Access"))
+
+    world.get_location("Giant Step Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Lilliput Steps Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Milky Well Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Rainy Circle Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Magnet Hill Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Pink Cloud Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Lumine Hall Sanctuary").place_locked_item(world.create_item("Melody"))
+    world.get_location("Fire Spring Sanctuary").place_locked_item(world.create_item("Melody"))
+
+    world.get_location("Carpainter Defeated").place_locked_item(world.create_item("Valley Bridge Repair"))
+
+    if world.options.giygas_required:
+        world.get_location("Giygas").place_locked_item(world.create_item("Saved Earth"))  # Normal final boss
+        if world.options.magicant_mode == 1:
+            # If required magicant
+            world.get_location("Magicant - Ness's Nightmare").place_locked_item(world.create_item("Power of the Earth"))
+            world.get_location("Sanctuary Goal").place_locked_item(world.create_item("Magicant Unlock"))
+        else:
+            # If not required, place this condition on sanctuary goal
+            world.get_location("Sanctuary Goal").place_locked_item(world.create_item("Power of the Earth"))
+    else:
+        if world.options.magicant_mode == 1:
+            # If Magicant required but not Giygas, place goal
+            world.get_location("Magicant - Ness's Nightmare").place_locked_item(world.create_item("Saved Earth"))
+            world.get_location("Sanctuary Goal").place_locked_item(world.create_item("Magicant Unlock"))
+        else:
+            # If neither final boss, place goal
+            world.get_location("Sanctuary Goal").place_locked_item(world.create_item("Saved Earth"))
+
+    if world.options.alternate_sanctuary_goal:
+        world.get_location("+2 Sanctuaries").place_locked_item(world.create_item("Alternate Goal"))
+
+    if world.options.magicant_mode == 2:
+        world.get_location("+1 Sanctuary").place_locked_item(world.create_item("Magicant Unlock"))
+        world.get_location("Magicant - Ness's Nightmare").place_locked_item(world.create_item("Alternate Goal"))
+
+    if not world.options.monkey_caves_mode:
+        world.get_location("Monkey Caves - 1F Right Chest").place_locked_item(world.create_item("Wet Towel"))
+        world.get_location("Monkey Caves - 1F Left Chest").place_locked_item(world.create_item("Pizza"))
+        world.get_location("Monkey Caves - West 2F Left Chest").place_locked_item(world.create_item("Pizza"))
+        world.get_location("Monkey Caves - West 2F Right Chest #1").place_locked_item(world.create_item("Hamburger"))
+        world.get_location("Monkey Caves - West 2F Right Chest #2").place_locked_item(world.create_item("Ruler"))
+        world.get_location("Monkey Caves - East 2F Left Chest").place_locked_item(world.create_item("Protein Drink"))
+        world.get_location("Monkey Caves - East 2F Right Chest").place_locked_item(world.create_item("Hamburger"))
+        world.get_location("Monkey Caves - East West 3F Right Chest #1").place_locked_item(world.create_item("Hamburger"))
+        world.get_location("Monkey Caves - East West 3F Right Chest #2").place_locked_item(world.create_item("Picnic Lunch"))
+
+    if world.options.shop_randomizer == 2:
+        world.get_location("Twoson Department Store Bakery - Slot 1").place_locked_item(world.create_item("Plain Roll"))
+        world.get_location("Fourside Department Store - Burger Shop Slot 4").place_locked_item(world.create_item("Hamburger"))
+
+        if world.options.monkey_caves_mode < 2:
+            world.get_location("Fourside Bakery - Slot 4").place_locked_item(world.create_item("Repel Sandwich"))
+            world.get_location("Fourside Department Store - Tool Shop Slot 7").place_locked_item(world.create_item("Ruler"))
+            world.get_location("Fourside Department Store - Shop Shop Slot 3").place_locked_item(world.create_item("Protein Drink"))
+            world.get_location("Fourside Department Store - Food Shop Slot 5").place_locked_item(world.create_item("Picnic Lunch"))
+            world.get_location("Dusty Dunes Drugstore - Left Shop Slot 1").place_locked_item(world.create_item("Wet Towel"))
diff --git a/worlds/earthbound/src/earthbound_basepatch.bsdiff4 b/worlds/earthbound/src/earthbound_basepatch.bsdiff4
new file mode 100644
index 0000000000..9ba2b74a04
Binary files /dev/null and b/worlds/earthbound/src/earthbound_basepatch.bsdiff4 differ
diff --git a/worlds/earthbound/src/eb.asm b/worlds/earthbound/src/eb.asm
new file mode 100644
index 0000000000..1ae0aff35e
--- /dev/null
+++ b/worlds/earthbound/src/eb.asm
@@ -0,0 +1,18902 @@
+hirom
+ORG $C67F00
+CharLastInvSlot:
+dw $99FE,$9A5D,$9ABC,$9B1B
+
+TeleSectorID:
+dw $FFFF,$5A85,$5A91,$5AAD,$5AED,$5B09,$5B31,$5AD1,$5B4D,$5B5D,$5B79,$5B91,$5B99,$5BAD,$5AB1,$5B89,$5B29,$5A8D
+
+TeleFlags:
+dw $0001,$0002,$1000,$0004,$0010,$2000,$0020,$0008,$0040,$0100,$0080,$0400,$0800,$4000,$0004,$0200,$0020,$1000
+
+TeleportFlags:
+dw $0000,$00D1,$00D2,$00D3,$00D4,$00D5,$00D6,$00D7,$00D8,$00D9,$00DA,$00DB,$00DC,$00DD,$00DE,$00DF
+
+StartingScripts:
+dw $0000,$0068,$01A6,$0205,$01D5,$0014,$0022,$0064,$0177,$005E,$0062,$00C7,$00C8,$012F,$001F,$0279,$00AF,$0031,$000E,$011F,$0088,$00C9,$0095,$003B,$003C,$0220,$0137,$0027,$01C2,$0225,$000F
+
+UnsetScripts:
+dw $006B,$ED02,$000B,$005F
+
+CharUnlockPointers:
+dw $F830,$F837,$F83E,$F845,$F955,$F849, $F850
+
+ORG $03FE10
+db $1C,$02,$FE,$50,$9A,$9F,$99,$9E,$95,$94,$50,$A9,$9F,$A5,$A2,$50,$A0,$91,$A2,$A4,$A9,$51,$1F,$00,$00,$0B,$10,$78,$10,$78,$10,$78,$10,$3C,$1F,$03,$13,$02
+
+SoundStoneScripts:
+dw $00B6,$00B7,$00B8,$00B9,$00BA,$00BB,$00BC,$00BD
+
+ORG $D56A5B
+db $71,$a2,$93,$98,$99,$a0,$95,$9c,$91,$97,$9f,$50,$79,$a4,$95,$9d
+
+ORG $C4FD80
+db $03,$00,$e5,$04,$88,$80,$e2,$04,$c0,$38,$D3,$00,$72,$a4 ;Tenda Village door. adds guard
+db $01,$00,$DF,$01,$E5,$05 ;Threed cemetary hallway. Locks the door to the pit.
+db $02,$00,$9F,$00,$20,$4F,$A0,$00,$70,$00 ;Scraba south of pyramid. Adds shortcut NPCs
+db $02,$00,$c5, $02, $f8, $58, $6f, $02, $50, $00; Desert West tunnel. Adds ghost
+
+ORG $C4FE74
+db $01, $00, $25, $05, $41, $75
+
+ORG $CF9788
+db $01,$61,$00,$06,$5E,$02,$20,$01,$01,$26,$70,$C6,$00 ;Tenda guard NPC
+
+ORG $CF9415
+db $04,$01
+
+ORG $CF941C
+db $00, $0A, $00, $61
+
+ORG $C4FD50
+NewSectorPointers:
+dw $FD80,$FD8E,$FD94,$FD9E,$FDA8,$FDC2,$FDD0,$FE74,$FE80,$FEE0,$FEEA,$FF00, $FF0A
+
+ORG $D5F880
+SpecialNameTable:
+dw $A810, $A81F, $A82F, $A84C, $A85C, $A873, $A888, $A89A, $A8AB, $A8BC, $A8CD, $A8DD, $A8F4, $A90B, $A924, $A938, $A93E, $A943, $A947, #SpecialTexMagicant
+dw #SpecialTexNess
+dw #SpecialTexPhotoGuy
+dw #DisplayDollars10
+dw #DisplayDollars100
+dw #DisplayDollars1000
+
+
+
+ORG $D7FC7C
+StartingTeleports:
+
+ORG $D7FC8D
+StartingChars:
+
+macro FUNCTION_PROLOGUE(locals)
+  rep   #$31
+  phd        ; PUSH current frame pointer
+  pha        ; Always push, in case this function takes an arg
+  tdc
+  adc.w #$FFEE
+  tcd
+  pla         ; POP possible arg
+endmacro
+
+;2ff4b0 is freespace
+
+
+ORG $C04D46
+JML GetItemRemote
+
+ORG $C1FEAE
+JML InitIntro
+
+ORG $C06982
+JML SetTeleFlags
+
+ORG $C0D622
+JML IgnoreTeleportEnemies
+
+ORG $C0B8EE
+JML GetRemoteTeleport
+
+ORG $C14FD7
+JML GetCharNameFromServ
+
+ORG $C146D6
+JML GetPlayerName
+
+ORG $C14FDB
+JML LoadPlayerName
+
+ORG $C1938F
+JML DrawPlayerName
+
+ORG $C2165E
+JML SetMelodyCount
+
+ORG $C0B904
+JML PocketStorage
+
+ORG $C14D05
+JML SkipArchiSpaceCheck
+
+ORG $C156A9
+JML CheckArchiItemInv
+
+ORG $C19222
+JML GetServerItemName
+
+ORG $C02264
+JML AddNewNPCSectors
+
+ORG $C48402
+JML GetLumiText
+
+ORG $C18B5D
+JML DelArchFromInv
+
+ORG $C07960
+JML SetAnimSpeed
+
+ORG $C22A35
+;JML SaveAPData
+
+ORG $C14F56
+JML ExtraKeyItems
+
+ORG $C4844C
+JML GetLumiTextMain
+
+ORG $C486F4
+JML GetLumiTextSub
+
+ORG $C18B55
+;JML TestArchiItemSpace
+
+ORG $C1F06B
+JML LoadAPData
+
+ORG $C17DD4
+JML SpecialNameDirect
+
+ORG $C2164A
+JML RepelEnemies
+
+ORG $C1FEB2
+JML GetStartingData
+
+ORG $C1FEB6
+JML GetStartingNames
+
+ORG $C40BCE
+JML ResetGame
+
+ORG $C04AA6
+JML ClearNameOnBattle
+
+ORG $C1F299
+JSL CopyAPData
+
+ORG $C1F3B3
+JSL DeleteAPData
+
+ORG $C07902
+JMP MagicantSoloAnimSpeedFix
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;Franklin badge checks
+ORG $C29549
+JML ReflectSpecial
+
+ORG $C29597
+JML ReflectFire
+
+ORG $C2901E
+JML ReflectFireBall
+
+ORG $C295F4
+JML ReflectFreeze
+
+ORG $C298B6
+JML ReflectFlash
+
+ORG $C29A90
+JML ReflectStarstorm
+
+ORG $C2A666
+JML ReflectExplode
+
+ORG $C2A66B
+JML SkipExplosionDeathReflect
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C0B967
+JSL PlayerJustDied
+
+ORG $C272C8
+JML CheckDeathHealing
+
+ORG $C272D0
+JML OverrideDeathlinkText
+
+ORG $C273B0
+JML OverrideDeathlinkHeal
+
+ORG $C25F16
+JSL SendDeathInBattle
+;Deathlink stuff
+;;;;;;;;;;;;;;;;;;;;;
+ORG $C18A1D
+JML ClearStoredAPItem
+
+ORG $C2AD2A
+JML PrayerReflectIgnore
+
+ORG $C1915F
+JML GetProgressiveGoingtoStorage 
+
+ORG $C2E8ED
+JML GetNewSwirlColorNormal
+
+ORG $C2E91D
+JML GetNewSwirlColorGood
+
+ORG $C2E93A
+JML GetNewSwirlColorBad
+
+ORG $C2E94B
+JML PokeySwirl
+
+ORG $C0F67A
+JML GetSeedPlayer
+
+ORG $C1ED67
+JML DrawWorldVersion
+
+ORG $C1FD57
+JML Set24BitStartingEXP
+
+ORG $C0946C
+JML TransferGiftToInv
+
+ORG $C19A62
+JML GetDynamicWindowTitle
+
+ORG $C4FBBD
+JML GetRandomizedTrack
+
+ORG $C105C9
+JML LoadExpandedWindowTable
+
+ORG $C2A5B2
+JSL early_missile_damage
+
+ORG $C4F2E8
+JML ReadDynamicPhotoMapPositionY
+
+ORG $C4F2F1
+JML ReadDynamicPhotoMapPositionX
+
+ORG $C4F3E7
+JML ReadDynamicPhotoCharPosX
+
+ORG $C4F400
+JML ReadDynamicPhotoCharPosY
+
+ORG $C46D80
+JML SpawnDynamicPhotomanX
+
+ORG $C46D93
+JML SpawnDynamicPhotomanY
+
+ORG $C4F429
+JML IncrementCurPhotoCount
+
+ORG $C15F3A
+JML CheckTotalEnergy
+
+ORG $C192DE
+JML DisplayEnergy
+
+ORG $C2EF3D
+JML LoadEnemyToVram
+
+ORG $C2BDC1
+JML AllowDynamicCallEnemyLoad
+
+ORG $C2EFA2
+JML AllowEnemyToSpawn
+
+ORG $C2EFC6
+JML ForceLoadSingle
+
+ORG $C2EEEF
+JML InitializeLoadingEnemies
+
+ORG $C2EFF7
+JSL SetupVramForSpriteLoad
+
+ORG $C1F3D0
+JSL CloseVersionWindow
+
+ORG $C27F2C
+JSL FixGiygasReflect
+
+ORG $C13660
+JML HandleUnusableWarpPad
+
+ORG $C0089A
+JML LoadPhotoColor
+
+ORG $00FA22
+JML GetRemoteMoney
+
+ORG $C2A03F
+JML ClearStatusVars
+
+;new jmls
+
+
+ORG $C1FEBC
+LDA #$0000
+;Skip flyover
+
+ORG $C02F30
+LDA $0066
+AND #$00FF
+BIT #$0040
+BNE $03
+
+ORG $C031B8
+LDA $0066
+AND #$00FF
+BIT #$0040
+BNE $03
+
+ORG $D57E3B
+db $00
+
+ORG $D57E47
+db $00
+
+ORG $D7BAAE
+db $04
+
+ORG $D7BAAC
+db $04
+
+ORG $D7BAB0
+db $04
+
+ORG $D7BA28
+db $04
+
+ORG $D7BA68
+dw $0004,$0004
+
+ORG $D7BAA6
+dw $0004,$0004
+
+ORG $D7BB66
+dw $0004,$0004
+
+ORG $D7BB6C
+dw $0004,$0004
+
+ORG $D7BAE6
+dw $0004,$0004,$0004,$0004,$0004
+
+ORG $D7BB26
+dw $0004,$0004,$0004,$0004,$0004
+
+ORG $D7BAF0
+db $04
+
+ORG $D7BB30
+db $04
+
+ORG $D7BB70
+db $04
+
+; Flags for Tenda VIllage, was $02, now $00 to disable mice
+ORG $D7B200
+dw $0000, $0000
+
+ORG $D7B240
+dw $0000, $0000, $0000
+
+ORG $D7B280
+dw $0000, $0000, $0000
+
+ORG $D7B2C0
+dw $0000, $0000, $0000
+
+ORG $C13CF4
+NOP
+NOP
+
+ORG $C04575
+LDA #$0000
+
+ORG $C02F45
+NOP
+NOP
+NOP
+
+ORG $C031CD
+NOP
+NOP
+NOP
+
+ORG $C1FEBA
+NOP
+NOP
+
+ORG $C3E0E5
+dw $00F0
+
+ORG $C3E11C
+dw $A8E6
+
+ORG $C45631
+;db $00
+
+ORG $CF2DAC
+db $38
+
+ORG $CF2DB1
+db $38
+
+ORG $CF2DBB
+db $38
+
+ORG $CF2DBB
+db $38
+
+ORG $CF2DC0
+db $38
+
+ORG $CF2DC5
+db $38
+
+ORG $CF2DCA
+db $38
+
+ORG $CF2DD4
+db $38
+
+ORG $CF2ECD
+db $38
+
+ORG $CF2ED2
+db $38
+
+ORG $CF2ED7
+db $38
+
+ORG $CF2EDC
+db $38
+
+ORG $CF2EF0
+db $38
+
+ORG $CF2EEB
+db $38
+
+ORG $CF2EE1
+db $38
+
+ORG $CF2EE6
+db $38
+
+ORG $CF2EF5
+db $38
+
+ORG $C86281
+db $D1
+
+ORG $CF975D
+db $00
+
+ORG $C66A9F
+db $0A,$63,$A9,$EE
+
+ORG $C73948
+db $49
+
+ORG $C68C3F
+db $02
+
+ORG $C7BF86
+db $0A,$12,$9C,$EE,$00 ;Giant step redirect
+
+ORG $C7C056
+db $0A,$12,$9C,$EE,$00 ;Lilliput Steps redirect
+
+ORG $C7C1F5
+db $0A,$12,$9C,$EE,$00 ;Milky Well redirect
+
+ORG $C7C126
+db $0A, $12, $9C, $EE; Rainy Circle Redirect
+
+ORG $C7C2C0
+db $0A, $12, $9C, $EE ; Magnet Hill Redirect
+
+ORG $C7C388
+db $0A,$12,$9C,$EE ;Pink Cloud Redirect
+
+ORG $C7C476
+db $0A,$12,$9C,$EE ;Lumine Hall redirect
+
+ORG $C7C47A
+db $0A, $C6, $A0, $EE
+
+ORG $EEA0C6
+db $1F, $15, $6a, $00, $60, $01, $01, $0A, $80, $C4, $C7; Fix stupid lumine hole stuff
+
+ORG $C7C538
+db $0A,$12,$9C,$EE ;Fire Spring redirect
+
+ORG $C5F228
+db $07,$D2,$03,$1B,$03,$40,$F2,$C5,$00,$1F,$02,$71,$13,$18,$04,$10,$20,$04,$D2,$03,$0A,$71,$92,$FE,$13,$02
+
+ORG $C95AA1
+db $D2,$00
+
+ORG $C95AB7
+db $00
+
+ORG $C95B5B
+db $07
+
+ORG $CFA96D
+db $01
+
+ORG $CFA98F
+db $01
+
+ORG $C91C68
+db $0A, $C1, $1C, $C9
+
+ORG $C7699E
+db $1D, $05, $FF, $CA, $1B, $02, $07, $42, $C7, $00, $70, $58, $1C, $02, $01, $50
+db $98, $91, $9E, $94, $95, $94, $50, $9F, $A6, $95, $A2, $50, $A4, $98, $95, $50
+db $1C, $05, $CA, $5E, $59, $1F, $02, $76, $10, $40, $00, $70, $89, $7F, $85, $50
+db $98, $91, $94, $50, $99, $A4, $50, $A4, $98, $99, $A3, $50, $A7, $98, $9F, $9C
+db $95, $50, $A4, $99, $9D, $95, $6F, $51, $03, $00, $70, $7A, $A5, $A3, $A4, $50
+db $A7, $98, $95, $9E, $50, $79, $50, $A7, $91, $A3, $50, $91, $92, $9F, $A5, $A4
+db $50, $A4, $9F, $00, $50, $50, $97, $9F, $50, $97, $95, $A4, $50, $9C, $A5, $9E
+db $93, $98, $5C, $50, $A4, $9F, $9F, $5E, $5E, $5E, $03, $00, $70, $73, $9F, $9D
+db $95, $50, $A7, $99, $A4, $98, $50, $9D, $95, $5E, $5E, $5E, $03, $50, $79, $57
+db $9C, $9C, $50, $A3, $98, $9F, $A7, $50, $A9, $9F, $A5, $00, $50, $50, $A3, $9F
+db $9D, $95, $50, $A2, $95, $91, $9C, $50, $6C, $A0, $A2, $9F, $97, $A2, $95, $A3
+db $A3, $99, $9F, $9E, $6E, $5C, $50, $91, $9C, $A2, $99, $97, $98, $A4, $51, $13
+db $1D, $01, $FF, $CA, $04, $1B, $02, $0A, $F1, $6A, $C7, $00 ;Captain strong pre-fight text
+
+ORG $C76A6D
+db $70, $75, $A6, $95, $9E, $50, $91, $96, $A4, $95, $A2, $50, $91, $9C, $9C, $50
+db $A4, $98, $99, $A3, $50, $A4, $99, $9D, $95, $5C, $10, $14, $50, $50, $79, $57
+db $9D, $50, $83, $84, $79, $7C, $7C, $50, $99, $9E, $50, $72, $7B, $51, $13, $0A
+db $F1, $6A, $C7, $00, $C7, $00, $A7 ;Captain Strong rematch text
+
+ORG $C74207
+db $07, $69, $00, $1B, $03, $0B, $6B, $C7, $00, $07, $1B, $02, $1B, $03, $6D, $6A
+db $C7, $00, $70, $77, $A2, $A2, $5E, $03, $50, $79, $57, $A6, $95, $50, $92, $95
+db $95, $9E, $50, $A3, $A4, $A5, $93, $9B, $50, $99, $9E, $50, $72, $7B, $50, $9D
+db $9F, $94, $95, $50, $96, $9F, $A2, $50, $10, $10, $A4, $98, $A2, $95, $95, $50
+db $10, $10, $98, $9F, $A5, $A2, $A3, $5C, $03, $00, $50, $50, $A7, $91, $99, $A4
+db $99, $9E, $97, $50, $9F, $9E, $50, $9D, $A9, $50, $1C, $05, $CA, $51, $00, $70
+db $7C, $95, $A4, $50, $9D, $95, $50, $9B, $9E, $9F, $A7, $50, $99, $96, $50, $A9
+db $9F, $A5, $50, $A3, $95, $95, $50, $99, $A4, $5E, $03, $00, $70, $7D, $91, $A9
+db $92, $95, $50, $79, $50, $A3, $98, $9F, $A5, $9C, $94, $57, $A6, $95, $50, $A0
+db $9C, $91, $A9, $95, $94, $50, $86, $86, $86, $86, $86, $86, $50, $99, $9E, $A3
+db $A4, $95, $91, $94, $5E, $5E, $5E, $13, $02 ;Captain strong normal text
+
+ORG $EEC593
+db $70, $71, $93, $A4, $A5, $91, $9C, $9C, $A9, $5C, $50, $79, $57, $9D, $50, $9F
+db $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $aa, $9f, $9d, $92, $99, $95
+db $a3, $5e, $03, $00, $70, $79, $50, $a7, $91, $a3, $50, $a3, $9f, $50, $92, $91
+db $94, $50, $91, $A4, $50, $92, $95, $99, $9E, $97, $50, $91, $50, $AA, $9F, $9D
+db $92, $99, $95, $5C, $10, $15, $50, $A4, $98, $95, $A9, $50, $A4, $98, $A2, $95
+db $a7, $50, $9d, $95, $50, $99, $9e, $50, $98, $95, $a2, $95, $51, $13, $02 ;Threed zombie meme text
+
+ORG $EE9A94
+db $70, $7f, $98, $5c, $50, $98, $95, $a9, $5c, $10, $15, $50, $1c, $02, $01, $5e
+db $03, $00, $70, $79, $50, $94, $a2, $9f, $a6, $95, $50, $a4, $98, $95, $50, $83
+db $9b, $a9, $50, $82, $a5, $9e, $9e, $95, $a2, $50, $98, $95, $a2, $95, $50, $a4
+db $9f, $50, $a3, $91, $a6, $95, $50, $a9, $9f, $a5, $50, $96, $a2, $9f, $9d, $50
+db $a4, $98, $95, $50, $aa, $9f, $9d, $92, $99, $95, $a3, $5c, $03, $00, $70, $92
+db $a5, $a4, $50, $99, $a4, $50, $9c, $9f, $9f, $9b, $a3, $50, $9c, $99, $9b, $95
+db $50, $79, $50, $a7, $91, $a3, $50, $a4, $9f, $9f, $50, $95, $91, $a2, $9c, $a9
+db $5e, $03, $00, $70, $7f, $98, $5c, $50, $a7, $95, $9c, $9c, $5e, $03, $00, $70
+db $79, $50, $97, $a5, $95, $a3, $a3, $50, $a9, $9f, $a5, $50, $a0, $a2, $9f, $92
+db $91, $92, $9c, $a9, $50, $a3, $98, $9f, $a5, $9c, $94, $9e, $57, $a4, $50, $a4
+db $a2, $a5, $a3, $a4, $50, $a2, $91, $9e, $94, $9f, $9d, $50, $a0, $a3, $a9, $93
+db $98, $99, $93, $50, $9d, $95, $a3, $a3, $91, $97, $95, $a3, $5e, $03, $00, $70
+db $75, $a3, $a0, $95, $93, $99, $91, $9c, $9c, $a9, $50, $9f, $9e, $95, $a3, $50
+db $96, $a2, $9f, $9d, $50, $aa, $9f, $9d, $92, $99, $95, $a3, $5e, $03, $00, $70
+db $84, $98, $91, $9e, $9b, $a3, $50, $96, $9f, $a2, $50, $a3, $91, $a6, $99, $9e
+db $97, $50, $9d, $95, $5c, $10, $15, $50, $92, $a9, $50, $a4, $98, $95, $50, $a7
+db $91, $a9, $5e, $03, $00, $0A, $79, $AF, $EE, $00, $1b, $03, $B3, $9B, $EE, $00
+db $1f, $1e, $e1, $01, $06, $04, $2f, $00, $02;Threed character
+
+ORG $D5F710
+PaulaUnlocktext:
+db $08
+dd $C7966C
+db $18, $04, $1f, $11, $02, $1f, $00, $00, $0b
+db $10, $78, $50, $08, $10, $F8, $D5, $00, $1f, $03, $18, $01, $01, $70, $1c, $02
+db $02, $50, $9a, $9f, $16, $b9, $94, $15, $a8, $03, $18, $04, $02; Paula Join
+
+PooUnlockText:
+db $08
+dd $C929CD
+db $18, $04, $1f, $11, $04, $1f, $00, $00, $0b, $10, $78, $50
+db $08, $10, $F8, $D5, $00, $1f, $03, $18, $01, $01, $70, $1c, $02, $04, $50, $9a
+db $9f, $16, $b9, $94, $15, $a8, $03, $01, $08, $6B, $F7, $D5, $FF, $18, $04, $02; Poo join 
+
+ORG $C884D0
+JeffUnlockText:
+db $08
+dd $C88533
+db $13, $18, $04, $1f, $00, $00, $0b, $10, $78, $50, $08, $10
+db $F8, $D5, $00, $1f, $03, $18, $01, $01, $70, $1c, $02, $03, $50, $9a, $9f, $16
+db $b9, $94, $15, $a8, $03, $18, $04, $1f, $11, $03, $02; Jeff join
+
+FlyingManUnlockText:
+db $08
+dd $C76FCE
+db $18, $04, $08, $1A, $F8, $D5, $00, $1F, $11, $0B, $02; FlyingMan join
+
+ORG $C75C33
+db $70, $79, $57, $9d, $50, $a4, $98, $95, $50, $1c, $05, $03, $51, $03, $00, $70
+db $79, $50, $9b, $9e, $9f, $a7, $50, $79, $50, $9d, $91, $a9, $50, $9e, $9f, $a4
+db $50, $9c, $9f, $9f, $9b, $50, $9c, $99, $9b, $95, $50, $9d, $a5, $93, $98, $5c
+db $10, $15, $50, $92, $a5, $a4, $50, $79, $57, $9d, $50, $a3, $a4, $a2, $9f, $9e
+db $97, $95, $a2, $50, $a4, $98, $91, $9e, $50, $a4, $98, $95, $50, $91, $a6, $95
+db $a2, $91, $97, $95, $50, $92, $95, $91, $a2, $51, $03, $1d, $03, $ff, $1b, $02
+db $bb, $5c, $c7, $00, $00, $50, $50, $58, $84, $98, $95, $50, $1c, $05, $03, $50
+db $9a, $9f, $99, $9e, $a3, $50, $a9, $9f, $a5, $5e, $59, $1f, $02, $10, $10, $30
+db $1d, $00, $ff, $03, $1f, $41, $13, $02, $00, $70, $89, $9f, $a5, $50, $94, $9f
+db $9e, $57, $a4, $50, $98, $91, $a6, $95, $50, $a2, $9f, $9f, $9d, $50, $96, $9f
+db $a2, $50, $9d, $95, $5c, $10, $15, $50, $a4, $98, $9f, $a5, $97, $98, $5e, $10
+db $20, $50, $79, $57, $9c, $9c, $50, $a7, $91, $99, $a4, $50, $98, $95, $a2, $95
+db $50, $a5, $9e, $a4, $99, $9c, $50, $a9, $9f, $a5, $50, $9d, $91, $9b, $95, $50
+db $a3, $9f, $9d, $95, $50, $a3, $a0, $91, $93, $95, $5e, $07, $68, $00, $13, $02; SuperBear join
+
+db $70, $84, $98, $91, $9e, $9b, $50, $a9, $9f, $a5, $50, $96, $9f, $a2, $50, $96
+db $99, $9e, $94, $99, $9e, $97, $50, $9d, $95, $5e, $03, $00, $70, $79, $50, $9b
+db $9e, $9f, $a7, $50, $a4, $98, $99, $a3, $50, $9d, $91, $a9, $50, $92, $95, $50
+db $98, $91, $a2, $94, $50, $a4, $9f, $50, $92, $95, $9c, $99, $95, $a6, $95, $5c
+db $10, $15, $50, $92, $a5, $a4, $50, $79, $57, $9d, $50, $91, $93, $a4, $a5, $91
+db $9c, $9c, $a9, $50, $91, $50, $a2, $95, $9c, $99, $93, $50, $96, $a2, $9f, $9d
+db $50, $91, $50, $96, $91, $a2, $5d, $91, $a7, $91, $a9, $50, $a7, $9f, $a2, $9c
+db $94, $5e, $03, $00, $70, $7d, $a9, $50, $a4, $a2, $a5, $95, $50, $96, $9f, $a2
+db $9d, $50, $99, $a3, $50, $a4, $98, $91, $a4, $50, $9f, $96, $50, $91, $50, $1c
+db $05, $ad, $5e, $03, $00, $70, $79, $9e, $50, $91, $9e, $9f, $a4, $98, $95, $a2
+db $50, $a4, $99, $9d, $95, $50, $91, $9e, $94, $50, $a0, $9c, $91, $93, $95, $5c
+db $10, $15, $50, $a7, $95, $50, $9d, $91, $a9, $50, $9d, $95, $95, $a4, $50, $91
+db $97, $91, $99, $9e, $5e, $03, $00, $70, $85, $9e, $a4, $99, $9c, $50, $a4, $98
+db $95, $9e, $5c, $10, $15, $50, $1c, $02, $fe, $50, $a3, $95, $9e, $94, $a3, $50
+db $a4, $98, $95, $99, $a2, $50, $a2, $95, $97, $91, $a2, $94, $a3, $51, $13, $02;AP Item join
+
+ORG $C91D5E
+db $70, $7c, $9f, $9f, $9b, $a3, $50, $9c, $99, $9b, $95, $50, $99, $a4, $57, $a3, $50
+db $a2, $95, $91, $94, $a9, $50, $a4, $9f, $50, $97, $9f, $50, $a4, $9f, $50, $87
+db $99, $9e, $a4, $95, $a2, $a3, $5e, $03, $00, $70, $0a, $33, $1e, $c9, $00;Fixed Sky Runner
+
+ORG $C91CC1
+db $0A, $03,$5E,$C7,$00
+
+ORG $C91E94
+;db $ed, $1d, $05, $ff, $9e, $1d, $01, $ff, $9e, $0A, $2C, $20, $C9, $00
+
+ORG $CFA949
+db $47,$00,$01
+
+ORG $CFA93A
+db $02
+
+ORG $CF8915
+db $20,$A8
+
+ORG $CFA977
+db $03,$00
+
+ORG $CFA976
+db $01
+
+ORG $CFA97E
+db $01,$94,$9A,$EE
+
+ORG $CFA979
+db $04,$5E,$02
+
+ORG $C73236
+db $0a, $0b, $EB,$C5,$03,$00 ;Library redirect
+
+ORG $D5F02B
+db $e0,$00,$90,$02,$02,$1e,$00
+
+ORG $D5F033
+db $e0,$00,$80,$02,$04,$21,$00
+
+ORG $CF942D
+db $00,$D6,$00,$61
+
+ORG $61000A
+db $70, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $03, $00, $70, $79, $50, $93, $91, $9e, $50, $a4, $a2, $91, $9e, $a3
+db $a0, $9f, $a2, $a4, $50, $a9, $9f, $a5, $50, $91, $93, $a2, $9f, $a3, $a3, $50
+db $a4, $98, $95, $50, $a2, $99, $a6, $95, $a2, $5e, $03, $07, $d9, $03, $1b, $03
+db $bd, $00, $61, $00, $00, $70, $78, $9f, $a7, $95, $a6, $95, $a2, $5c, $10, $15
+db $50, $99, $a4, $50, $a3, $95, $95, $9d, $a3, $50, $a9, $9f, $a5, $50, $91, $a2
+db $95, $50, $9e, $9f, $a4, $50, $a9, $95, $a4, $50, $a2, $95, $91, $94, $a9, $5e
+db $03, $00, $70, $73, $9f, $9d, $95, $50, $92, $91, $93, $9b, $50, $a7, $98, $95
+db $9e, $50, $a9, $9f, $a5, $50, $98, $91, $a6, $95, $50, $93, $9f, $9e, $a1, $a5
+db $95, $a2, $95, $94, $50, $a4, $98, $95, $50, $a0, $a9, $a2, $91, $9d, $99, $94
+db $5e, $13, $02, $00, $70, $71, $9e, $94, $50, $91, $a7, $91, $a9, $50, $a7, $95
+db $50, $97, $9f, $51, $10, $20, $18, $04, $1f, $21, $90, $02; Rock text
+
+db $70, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $03, $00, $70, $79, $57, $9d, $50, $9e, $9f, $a4, $50, $a6, $95, $a2
+db $a9, $50, $a0, $a2, $9f, $a5, $94, $50, $9f, $96, $50, $9d, $a9, $50, $9e, $91
+db $9d, $95, $5e, $03, $00, $70, $87, $91, $9e, $a4, $50, $a4, $9f, $50, $93, $a2
+db $9f, $a3, $a3, $50, $a4, $98, $95, $50, $a2, $99, $a6, $95, $a2, $6f, $03, $19
+db $02, $89, $95, $a3, $02, $19, $02, $7e, $9f, $02, $00, $1c, $07, $02, $11, $09
+db $02, $55, $01, $61, $00, $6e, $01, $61, $00, $0a, $6e, $01, $61, $00, $00, $12
+db $70, $71, $9e, $94, $50, $98, $95, $a2, $95, $50, $a7, $95, $50, $97, $9f, $51
+db $10, $20, $18, $04, $1f, $21, $91, $02, $12, $70, $7f, $9b, $91, $a9, $5e, $10
+db $20, $50, $79, $57, $9c, $9c, $50, $92, $95, $50, $98, $95, $a2, $95, $5c, $10
+db $0a, $50, $99, $96, $50, $a9, $9f, $a5, $50, $93, $98, $91, $9e, $97, $95, $50
+db $a9, $9f, $a5, $a2, $50, $9d, $99, $9e, $94, $5e, $13, $02; John text
+
+db $16, $50, $5e, $03, $00, $08, $10, $f7, $d5, $00, $1b, $03, $32, $02, $fe, $00
+db $1f, $1e, $44, $04, $06, $04, $7D, $02, $02; Dalaam Character text
+
+db $0e, $01, $0d, $01, $1d, $19, $00, $1b, $03, $E8, $01, $61, $00, $19, $10
+db $00, $0b, $04, $1b, $03, $d9, $01, $61, $00, $0f, $0a, $BD, $01, $61, $00, $04
+db $D8, $00, $1f, $15, $6a, $00, $53, $01, $01, $0a, $0d, $22, $c9, $00, $02; Trial of Mu
+
+ORG $C9D61C
+db $0A, $A2, $01, $61, $00; Dalaam Char redir
+
+ORG $C92203
+db $0A, $BB, $01, $61, $00
+
+ORG $C5EB0B
+db $07,$ff,$01,$1b,$03,$14,$ed,$c5,$00,$70,$89,$9f,$a5,$50,$a7,$91
+db $9e,$a4,$50,$91,$50,$9d,$91,$a0,$6f,$03,$00,$70,$87,$95,$50,$94
+db $9F, $9E, $57, $A4, $50, $98, $91, $A6, $95, $50, $9D, $91, $A0, $A3, $50, $91
+db $9E, $A9, $9D, $9F, $A2, $95, $5C, $10, $10, $50, $9B, $99, $94, $5E, $03, $00
+db $70, $75, $A6, $95, $A2, $A9, $9F, $9E, $95, $50, $9A, $A5, $A3, $A4, $50, $A5
+db $a3, $95, $a3, $50, $80, $9f, $a0, $a4, $a2, $91, $93, $9b, $95, $a2, $50, $a4
+db $98, $95, $A3, $95, $50, $94, $91, $A9, $A3, $5E, $03, $00, $70, $75, $A6, $95
+db $9E, $50, $99, $96, $50, $A9, $9F, $A5, $50, $94, $9F, $9E, $57, $A4, $5C, $10
+db $13, $50, $A9, $9F, $A5, $50, $93, $91, $9E, $50, $9A, $A5, $A3, $A4, $50, $A0
+db $a2, $95, $a3, $a3, $50, $88, $50, $a4, $9f, $50, $a2, $95, $9d, $95, $9d, $92
+db $95, $A2, $50, $A7, $98, $91, $A4, $50, $A4, $98, $95, $50, $9D, $91, $A0, $50
+db $a7, $9f, $a5, $9c, $94, $50, $9c, $9f, $9f, $9b, $50, $9c, $99, $9b, $95, $5c
+db $10, $15, $50, $99, $96, $50, $A9, $9F, $A5, $50, $94, $99, $94, $50, $98, $91
+db $a6, $95, $50, $9f, $9e, $95, $5e, $03, $00, $70, $87, $95, $50, $94, $9f, $5c
+db $10, $15, $50, $98, $9F, $A7, $95, $A6, $95, $A2, $5C, $10, $15, $50, $98, $91
+db $a6, $95, $50, $a2, $95, $9E, $A4, $91, $9C, $A3, $50, $96, $9F, $A2, $50, $1C
+db $05, $05, $A3, $5E, $03, $00, $70, $87, $9F, $A5, $9C, $94, $50, $A9, $9F, $A5
+db $50, $9C, $99, $9B, $95, $50, $9F, $9E, $95, $6F, $03, $00, $19, $02, $89, $95
+db $a3, $02, $19, $02, $7e, $9f, $02, $1c, $07, $02, $11, $12, $09, $02, $78, $ec
+db $c5, $00, $41, $ec, $c5, $00, $70, $89, $95, $91, $98, $5c, $10, $15, $50, $99
+db $a4, $57, $a3, $50, $a0, $a2, $9F, $92, $91, $92, $9C, $A9, $50, $95, $91, $A3
+db $99, $95, $A2, $50, $A4, $9F, $50, $94, $9F, $A7, $9E, $9C, $9F, $91, $94, $5C
+db $50, $10, $10, $91, $9E, $A9, $A7, $91, $A9, $A3, $5E, $13, $02, $70, $7F, $9B
+db $91, $A9, $5E, $50, $10, $15, $76, $95, $95, $9C, $50, $96, $A2, $95, $95, $50
+db $a4, $9F, $50, $a2, $95, $a4, $A5, $A2, $9E, $50, $99, $A4, $50, $a7, $98, $95
+db $9E, $95, $A6, $95, $A2, $5E, $13, $1D, $03, $FF, $1B, $02, $B0, $EC, $C5, $00
+db $0A, $99, $33, $C7, $00, $00, $70, $5E, $5E, $5E, $79, $A3, $50, $A7, $98, $91
+db $a4, $50, $79, $50, $a7, $9f, $a5, $9c, $94, $50, $a3, $91, $a9, $5c, $10, $15
+db $50, $99, $96, $50, $A9, $9F, $A5, $50, $98, $91, $94, $50, $A2, $9F, $9F, $9D
+db $50, $A4, $9F, $50, $98, $9F, $9C, $94, $50, $99, $A4, $5E, $03, $00, $70, $83
+db $9F, $A2, $A2, $A9, $5C, $10, $15, $50, $9B, $99, $94, $5E, $50, $89, $9F, $A5
+db $57, $9C, $9C, $50, $98, $91, $A6, $95, $50, $A4, $9F, $50, $9D, $91, $9B, $95
+db $50, $A3, $A0, $91, $93, $95, $5E, $13, $02, $70, $87, $95, $57, $A2, $95, $50
+db $98, $9F, $A3, $A4, $99, $9E, $97, $50, $91, $50, $73, $9C, $99, $A1, $A5, $95
+db $50, $A4, $9F, $A5, $A2, $9E, $91, $9D, $95, $9E, $A4, $50, $9F, $9E, $50, $76
+db $a2, $99, $94, $91, $a9, $50, $a4, $9f, $50, $92, $9f, $9f, $a3, $a4, $50, $91
+db $a4, $a4, $95, $9e, $94, $91, $9e, $93, $95, $5e, $03, $00, $70, $87, $95, $50
+db $94, $9F, $9E, $57, $A4, $50, $98, $91, $A6, $95, $50, $9D, $91, $9E, $A9, $50
+db $a0, $91, $a2, $a4, $99, $93, $99, $a0, $91, $9e, $a4, $a3, $50, $a9, $95, $a4
+db $5C, $10, $15, $50, $A4, $98, $9F, $A5, $97, $98, $5E, $13, $02 ;Library text
+
+ORG $C8EB99
+db $0A, $AD, $71, $C6, $00
+
+ORG $C671AD
+db $03, $0e, $01, $0d, $01, $1d, $19, $00, $1b, $03, $cc, $71, $c6, $00, $19, $10
+db $00, $0b, $03, $1b, $03, $1C, $72, $c6, $00, $0f, $0a, $b0, $71, $c6, $00, $00
+db $70, $79, $57, $9d, $50, $91, $50, $a4, $95, $9e, $a4, $50, $a4, $98, $91, $a4
+db $50, $95, $91, $a4, $a3, $50, $9e, $95, $a2, $94, $a3, $51, $03, $00, $70, $89
+db $9f, $a5, $50, $94, $9f, $9e, $57, $a4, $50, $9c, $9f, $9f, $9b, $50, $9c, $99
+db $9b, $95, $50, $91, $50, $9e, $95, $a2, $94, $5c, $10, $15, $50, $a3, $9f, $50
+db $83, $73, $82, $71, $7d, $51, $03, $18, $04, $1f, $03, $05, $0B, $00, $02, $18
+db $02, $10, $01, $0a, $9e, $eb, $c8, $00, $30, $16, $b0, $51, $6e, $13, $70, $02; Boogey tent text
+
+db $07, $47, $00, $1b, $02, $86, $72, $c6, $00, $18, $01, $01, $70, $84, $98, $95
+db $50, $9d, $91, $a3, $a4, $95, $a2, $50, $99, $a3, $50, $97, $9f, $9e, $95, $6f
+db $03, $00, $70, $10, $20, $5e, $10, $20, $5e, $10, $20, $5e, $79, $50, $94, $9f
+db $9e, $57, $a4, $50, $92, $95, $9c, $99, $95, $a6, $95, $50, $a9, $9f, $a5, $5c
+db $10, $15, $50, $a3, $9f, $50, $a7, $95, $57, $a2, $95, $50, $a3, $a4, $91, $a9
+db $99, $9e, $97, $50, $a0, $a5, $a4, $5e, $13, $02; Zombie belch text
+
+ORG $CF66F5
+db $03
+
+ORG $C8ECA3
+db $0A, $2D, $72, $C6
+;have to check the zombie pointer text bn  
+
+
+
+ORG $C5F1FA
+db $02, $70, $71, $9E, $A9, $92, $9F, $94, $A9, $50, $A7, $91, $9E, $A4, $50, $91
+db $50, $A0, $95, $91, $9E, $A5, $A4, $6F, $10, $20, $1F, $1E, $2E, $00, $08, $1F
+db $02, $2A, $18, $04, $10, $80, $05, $2F, $01, $0A, $00, $AA, $EE ;Buzz Buzz text
+
+ORG $EE9210
+OnettTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd OnettLeaderName
+OnettLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $7F, $9E, $95, $A4, $A4, $51, $59, $1F, $02, $67, $04, $D1, $00, $13, $02 ;Onett
+
+TwosonTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd TwosonLeaderName
+TwosonLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $84, $A7, $9F, $A3, $9F, $9E, $51, $59, $1F, $02, $67, $04, $D2, $00, $13
+db $02 ;Twoson
+
+HappyTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd HappyLeaderName
+HappyLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $78, $91, $A0, $A0, $A9, $5D, $78, $91, $A0, $A0, $A9, $50, $86, $99, $9C
+db $9C, $91, $97, $95, $51, $59, $1F, $02, $67, $04, $DD, $00, $13, $02 ;Happy-Happy
+
+ThreedTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd ThreedLeaderName
+ThreedLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $84, $98, $A2, $95, $95, $94, $51, $59, $1F, $02, $67, $04, $D3, $00, $13
+db $02 ;Threed
+
+SaturnTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd SaturnLeaderName
+SaturnLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $83, $91, $A4, $A5, $A2, $9E, $50, $86, $91, $9C, $9C, $95, $A9, $51, $59
+db $1F, $02, $67, $04, $D5, $00, $13, $02 ;Saturn Valley
+
+DunesTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd DunesLeaderName
+DunesLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $74, $A5, $A3, $A4, $A9, $50, $74, $A5, $9E, $95, $A3, $50, $74, $95, $A3
+db $95, $A2, $A4, $51, $59, $1F, $02, $67, $04, $DE, $00, $13, $02;Dusty Dunes
+
+FoursTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd FoursLeaderName
+FoursLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $76, $9F, $A5, $A2, $A3, $99, $94, $95, $51, $59, $1F, $02, $67, $04, $D6
+db $00, $13, $02; Fourside
+
+WintersTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd WintersLeaderName
+WintersLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $87, $99, $9E, $A4, $95, $A2, $A3, $51, $59, $1F, $02, $67, $04, $D4, $00
+db $13, $02 ;Winters
+
+SummersTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd SummersLeaderName
+SummersLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $83, $A5, $9D, $9D, $95, $A2, $A3, $51, $59, $1F, $02, $67, $04, $D7, $00
+db $13, $02 ;Summers
+
+ScarabaTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd ScarabaLeaderName
+ScarabaLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $83, $93, $91, $A2, $91, $92, $91, $51, $59, $1F, $02, $67, $04, $D9, $00
+db $13, $02 ;Scaraba
+
+DalaamTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd DalaamLeaderName
+DalaamLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $74, $91, $9C, $91, $91, $9D, $51, $59, $1F, $02, $67, $04, $D8, $00, $13
+db $02 ;Dalaam
+
+DarkTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd DarkLeaderName
+DarkLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $A4, $98, $95, $50, $74, $95, $95, $A0, $50, $74, $91, $A2, $9B, $9E, $95
+db $A3, $A3, $51, $59, $1F, $02, $67, $04, $DA, $00, $13, $02; Deep Darkness
+
+TendaTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd TendaLeaderName
+TendaLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $84, $95, $9E, $94, $91, $50, $86, $99, $9C, $9C, $91, $97, $95, $51, $59
+db $1F, $02, $67, $04, $DB, $00, $13, $02 ;Tenda Village
+
+UnderworldTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd UnderLeaderName
+UnderLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $A4, $98, $95, $50, $7C, $9F, $A3, $A4, $50, $85, $9E, $94, $95, $A2, $A7
+db $9F, $A2, $9C, $94, $51, $59, $1F, $02, $67, $04, $DC, $00, $13, $02; Lost Underworld
+
+MagicantTeleTex:
+db $18, $01, $01, $01
+db $0A
+dd MagicLeaderName
+MagicLeaderDone:
+db $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $A4, $9F, $50, $A4, $95, $9C, $95, $A0, $9F, $A2, $A4, $50, $A4, $9F
+db $50, $7D, $91, $97, $99, $93, $91, $9E, $A4, $51, $59, $1F, $02, $67, $04, $DF
+db $00, $13, $02 ;Magicant
+
+db $18, $01, $01, $01, $70, $58, $1C, $02, $01, $50, $9C, $95, $91, $A2, $9E, $95
+db $94, $50, $9E, $9F, $A4, $98, $99, $9E, $97, $51, $59, $1F, $02, $79, $13, $02;Nothing
+
+PooPsiTex:
+db $18, $01, $01, $01, $70, $58, $1C, $02, $04, $50, $A2, $95, $91, $9C, $99, $AA
+db $95, $94, $50, $A4, $98, $95, $50, $A0, $9F, $A7, $95, $A2, $50, $9F, $96, $50
+db $07, $D1, $03, $1B, $03, $8E, $95, $EE, $FF, $1C, $12, $15, $51, $59, $1F, $02
+db $67, $1F, $71, $04, $02, $04, $D1, $03, $13, $02, $1C, $12, $16, $51, $59, $1F
+db $02, $67, $1F, $71, $04, $03, $13, $02; Starstorm
+
+ORG $EEA500 ;You Win
+db $08, $01, $95, $EE, $00, $18, $00, $02, $00, $00, $00, $00, $00, $00, $00, $00; I assume the first part of this to be the automated Magicant teleport?
+
+ORG $EE9C12
+db $07, $D5, $03, $1B, $03, $10, $A5, $EE, $00, $07, $D4, $03, $1B, $03, $00, $A5
+db $EE, $00, $07, $D3, $03, $1B, $03, $D0, $9B, $EE, $00, $18, $00, $00, $02 ;Sanc text
+
+ORG $EE9620
+db $18, $01, $01, $19, $02, $83, $A4, $9F, $A2, $95, $02, $19, $02, $84, $91, $9B
+db $95, $02, $19, $02, $74, $95, $9C, $95, $A4, $95, $02, $1C, $07, $03, $11, $09
+db $03, $50, $96, $EE, $00, $99, $96, $EE, $00, $84, $C6, $EE, $00, $18, $04, $02
+db $08, $31, $E4, $C5, $00, $1B, $02, $20, $96, $EE, $00, $1D, $0C, $01, $01, $18
+db $07, $02, $00, $00, $00, $00, $1B, $03, $6C, $96, $EE, $00, $08, $56, $E4
+db $C5, $00, $01, $1B, $02, $20, $96, $EE, $00, $1B, $00, $0A
+dl StorageStoreCheck
+db $0A
+dd StorageStoreCheck
+db $00
+BackFromCheck:
+db $1B, $01, $19, $19, $00, $00, $1B, $01, $1D, $12, $00
+db $00, $01, $0A, $50, $96, $EE, $18, $04, $02, $02, $0E, $01, $19, $14, $1B, $02
+db $20, $96, $EE, $00, $1A, $07, $01, $1B, $02, $D6, $96, $EE, $00, $1B, $04, $1B
+db $00, $18, $02, $08, $4A, $E5, $C5, $00, $1B, $02, $99, $96, $EE, $00, $1B, $05, $18
+db $03, $0D, $18, $00, $18, $03, $01, $1B, $06, $1D, $13, $00, $00, $19, $19
+db $00, $00, $00, $0A, $99, $96, $EE, $18, $04, $0A, $20, $96
+db $EE, $00
+db $08, $F8, $C6, $EE, $00, $01, $1B, $02, $84, $C6, $EE, $00, $1B, $00, $19, $19
+db $00, $00, $1D, $0B, $00, $1B, $02, $DD, $96, $EE, $00, $1B, $01, $1D, $0F, $00
+db $00, $01, $0A, $DD, $96, $EE, $00, $18, $04, $02, $DD, $96, $EE, $18, $04 ;Pocket Storage menu
+
+ORG $C67026
+db $07, $9B, $00, $1B, $02, $35, $D7, $C9, $00, $1D, $05, $FF, $AF, $1B, $03, $7A
+db $70, $C6, $00, $70, $7D, $95, $5E, $03, $00, $70, $77, $A5, $91, $A2, $94, $5E
+db $03, $00, $70, $74, $91, $A2, $9B, $9E, $95, $A3, $A3, $50, $A4, $98, $99, $A3
+db $50, $A7, $91, $A9, $5E, $03, $00, $70, $72, $A2, $99, $9E, $97, $50, $1C, $05
+db $AF, $5E, $03, $00, $70, $84, $98, $95, $9E, $50, $A7, $95, $50, $A4, $91, $9C
+db $9B, $5E, $13, $02, $70, $89, $9F, $A5, $50, $92, $A2, $99, $9E, $97, $50, $1C
+db $05, $AF, $5E, $03, $00, $70, $7D, $95, $5E, $03, $00, $70, $74, $99, $A3, $A0
+db $95, $9C, $50, $94, $91, $A2, $9B, $9E, $95, $A3, $A3, $5E, $03, $00, $70, $89
+db $9F, $A5, $50, $A7, $91, $99, $A4, $5E, $03, $00, $50, $50, $1F, $02, $76, $58
+db $84, $98, $95, $50, $84, $95, $9E, $94, $91, $50, $A4, $9F, $9F, $9B, $50, $A4
+db $98, $95, $50, $78, $91, $A7, $9B, $50, $95, $A9, $95, $50, $91, $9E, $94, $50
+db $a2, $a5, $a3, $98, $95, $94, $50, $9F, $A5, $A4, $50, $A4, $98, $95, $50, $94
+db $9F, $9F, $A2, $5E, $5E, $5E, $59, $13, $18, $04, $1F, $1E, $D3, $00, $06, $10
+db $20, $1F, $02, $5F, $10, $C0, $04, $20, $01, $1D, $01, $FF, $AF, $02 ;Tenda guard text
+
+ORG $EE9871
+db $07, $DA, $03, $1B, $03, $EA, $95, $EE, $00, $04, $DA, $03, $50, $50, $1F, $02
+db $44, $10, $60, $18, $01, $01, $58, $84, $98, $99, $A3, $50, $99, $A3, $50, $A3
+db $9F, $9D, $95, $50, $A3, $A4, $A2, $91, $9E, $97, $95, $50, $A4, $95, $91, $10
+db $30, $5E, $10, $30, $5E, $10, $30, $5E, $59, $13, $18, $04, $04, $DA, $03, $FE
+db $0A, $AF, $92, $EE, $1F, $02, $44, $10, $60, $18, $01, $01, $50, $50, $58, $89
+db $9F, $A5, $57, $A6, $95, $50, $97, $9F, $A4, $A4, $95, $9E, $50, $A5, $A3, $95
+db $94, $50, $A4, $9F, $50, $A4, $98, $95, $50, $A4, $91, $A3, $A4, $95, $5E, $59 ;Tea text
+db $13, $02
+
+db $18, $01, $01, $50, $50, $58, $83, $95, $9e, $a4, $50, $91, $50, $1c, $05, $ad
+db $50, $a4, $9f, $50, $1c, $02, $01, $51, $59, $1f, $02, $66, $10, $20, $13, $02; Got AP item, for PSI checks
+
+ORG $C9DC18
+db $0A,$A6,$95,$EE,$00
+
+ORG $CF2375
+db $00,$00,$00,$00,$20,$81 ;Tenda door
+
+ORG $CF2396
+db $00,$00,$00,$00,$00,$00
+
+ORG $CF0D87
+db $E5,$FA,$C6,$00,$1D,$82 ;Lock threed zombie door
+
+ORG $CF9426
+db $66
+
+ORG $C483BE
+LDA #$AAAA
+
+ORG $CF61EB
+dw $0001
+
+ORG $CF6B59
+dw $0002
+
+ORG $C9DAFD
+db $00
+
+ORG $C9DAFF
+dw $03D7
+
+db $02
+
+ORG $C557F0
+db $70, $79, $a4, $50, $91, $a0, $a0, $95, $91, $a2, $a3, $50, $a4, $9f, $50, $92
+db $95, $50, $91, $50, $a2, $95, $a6, $99, $95, $a7, $50, $96, $9f, $a2, $50, $91
+db $50, $83, $93, $91, $a2, $91, $92, $91, $5d, $a4, $98, $95, $9d, $95, $94, $50
+db $a2, $95, $a3, $a4, $91, $a5, $a2, $91, $9e, $a4, $5e, $13, $02
+
+ORG $EFA0DC
+db $70, $84, $98, $95, $50, $98, $99, $95, $a2, $9f, $97, $9c, $a9, $a0, $98, $a3
+db $50, $94, $95, $a0, $99, $93, $a4, $50, $91, $50, $a2, $95, $a6, $99, $95, $a7
+db $50, $96, $9f, $a2, $50, $91, $50, $a2, $95, $a3, $a4, $91, $a5, $a2, $91, $9e
+db $a4, $50, $9f, $a7, $9e, $95, $94, $50, $92, $a9, $50, $a4, $98, $95, $50, $83
+db $a0, $98, $99, $9e, $a8, $5e, $03, $00, $70, $84, $98, $95, $50, $a2, $95, $a6
+db $99, $95, $a7, $50, $97, $9f, $95, $a3, $50, $9f, $9e, $50, $91, $a4, $50, $9c
+db $95, $9e, $97, $a4, $98, $50, $91, $92, $9f, $a5, $a4, $50, $a4, $98, $95, $50
+db $a0, $9f, $9f, $a2, $50, $a1, $a5, $91, $9c, $99, $a4, $a9, $50, $9f, $96, $50
+db $a4, $98, $95, $50, $96, $9f, $9f, $94, $50, $92, $95, $99, $9e, $97, $50, $a3
+db $95, $a2, $a6, $95, $94, $5c, $10, $15, $50, $91, $9e, $94, $50, $91, $a0, $a0
+db $95, $91, $a2, $a3, $50, $a4, $9f, $50, $92, $95, $50, $a3, $99, $97, $9e, $95
+db $94, $50, $92, $a9, $50, $6C, $82, $91, $9d, $50, $82, $91, $99, $a3, $99, $9e
+db $5e, $6E, $13, $02
+
+ORG $C87209
+db $1d, $05, $ff, $b9, $1b, $02, $20, $72, $c8, $00, $0a, $17, $72, $c8
+
+ORG $CF5DAB
+db $3F
+
+ORG $C573C1
+db $0A,$DC,$73,$C5,$00
+
+ORG $C573DC
+;CLEANUP: can I subrotuine here
+db $18, $01, $01, $70, $83, $9f, $5c, $50, $9e, $9f, $a7, $50, $79, $50, $a7, $99
+db $9c, $9c, $50, $a4, $95, $91, $93, $98, $50, $a9, $9f, $a5, $50, $a4, $98, $95
+db $50, $a3, $95, $93, $a2, $95, $a4, $50, $9f, $96, $50, $9d, $a9, $50, $a0, $9f
+db $a7, $95, $a2, $5e, $5e, $5e, $03, $00, $70, $89, $9f, $a5, $50, $9d, $a5, $a3
+db $a4, $50, $9c, $95, $91, $a2, $9e, $50, $a4, $98, $99, $a3, $50, $a0, $9f, $a7
+db $95, $a2, $5c, $10, $15, $50, $95, $a6, $95, $9e, $50, $99, $96, $50, $a9, $9f
+db $a5, $50, $94, $9f, $9e, $57, $a4, $50, $a7, $91, $9e, $a4, $50, $a4, $9f, $5e
+db $03, $08, $54, $95, $FE, $00, $04, $d9, $03, $02, $9b, $32, $c9, $00
+
+ORG $C93284
+db $0A,$AB,$32,$C9,$00
+
+ORG $CF7B49
+db $7E
+
+ORG $CF794B
+db $00
+
+ORG $C9AF4B
+db $D9,$00
+
+ORG $CFDA7E
+db $D8,$03,$02; Dungeon Man signs
+
+ORG $CFDA8F
+db $D8,$03,$01; Dungeon Man signs
+
+ORG $CFD908
+db $D8, $03, $01;Submarine Visibility
+
+ORG $C57C2E
+db $04, $d8, $03, $0a, $39, $7c, $c5, $6f, $7c
+
+ORG $C57C3D
+db $01
+
+ORG $C93529
+db $01
+
+ORG $C5796B
+db $D9
+;;;;;;;;;;;;;;;;;;;
+ORG $C9C999
+db $D8, $00
+
+ORG $C9CBC0
+db $18,$01,$01, $0A,$9F,$C9,$C9
+
+ORG $C9CA28
+db $02
+
+ORG $CFD211
+db $01
+
+ORG $C87220
+;Sphinx tetx
+db $18, $01, $01
+db $70, $89, $9f, $a5, $57, $a6, $95, $50, $92, $a2, $9f, $a5, $97, $98, $a4, $50
+db $a4, $98, $95, $50, $91, $9e, $93, $99, $95, $9e, $a4, $50, $9d, $91, $9e, $a5
+db $a3, $93, $a2, $99, $a0, $a4, $a3, $5e, $10, $20, $50, $89, $9f, $a5, $50, $9d
+db $91, $a9, $50, $a0, $a2, $9f, $93, $95, $95, $94, $5e, $13, $08, $15, $30, $c9
+db $00, $04, $56, $01, $02
+
+
+ORG $C5749A
+db $0A,$F3,$74,$C5,$00
+
+ORG $C87203
+db $56
+
+ORG $C92967
+db $87, $9f, $a7, $51, $50, $7c, $9f, $9f, $9b, $50, $91, $a4, $50, $a4, $98, $99
+db $a3, $50, $97, $a5, $a9, $50, $a3, $a4, $91, $9e, $94, $99, $9e, $97, $50, $9f
+db $9e, $50, $91, $50, $a2, $9f, $93, $9b, $51, $13, $08, $18, $96, $fe, $00, $18
+db $04, $02; Mu training text
+
+ORG $D5F810
+db $10, $78, $10, $78, $10, $3C, $1D, $19, $01, $02, $1D, $19, $01, $0A, $B9, $82, $C6, $00
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C78641
+
+db $0A, $A0, $E8, $C5, $00; Desert bus text
+
+ORG $CF6219
+db $04, $00; Desert tunnel
+
+ORG $CFB2E5
+db $31,$01,$02,$2E,$00,$47,$00
+
+ORG $C3AF4E
+db $19, $50, $FE
+
+ORG $C3FE50
+db $42, $2f, $a8, $c0, $1a, $5c, $bb, $1a, $64, $FE, $42, $8d, $a8, $c0, $C3, $00
+db $96, $FE, $09, $42
+
+db $0e, $05, $12, $00, $42, $43, $a9, $c0, $ff, $42, $85, $a6, $c0, $80, $01, $1a
+db $44, $ab, $06, $01, $42, $43, $a9, $c0, $ff, $42, $c6, $a8, $c0, $0a, $64, $FE
+db $1b, $23
+
+db $06, $01, $42, $43, $a9, $c0, $ff, $42, $c6, $a8, $c0, $0a, $64, $FE, $1b, $23
+
+ORG $C3FE96
+db $18, $01, $01, $1f, $02, $60, $70, $87, $9f, $9f, $9f, $9f, $51, $10, $14, $17
+db $83, $9f, $9f, $9f, $51, $10, $0f, $17, $83, $9f, $9f, $9f, $9f, $9f, $9f, $9f
+db $51, $03, $00, $70, $58, $77, $9f, $15, $85, $51, $10, $0f, $50, $50, $77, $9f
+db $15, $85, $51, $59, $03, $18, $04, $1f, $15, $31, $01, $63, $00, $01, $1f, $15
+db $31, $01, $64, $00, $01, $1f, $61, $1f, $21, $41, $02
+
+ORG $C5E8A0
+db $07, $47, $00, $1b, $03, $4a, $e9, $c5, $00, $70, $58, $71, $50, $9e, $9f, $a4
+db $99, $93, $95, $50, $99, $a3, $50, $a0, $9f, $a3, $a4, $95, $94, $50, $9f, $9e
+db $50, $a4, $98, $95, $50, $92, $a5, $a3, $50, $a3, $93, $98, $95, $94, $a5, $9c
+db $95, $5e, $03, $00, $70, $74, $a5, $95, $50, $a4, $9f, $50, $a2, $95, $a0, $9f
+db $a2, $a4, $a3, $50, $9f, $96, $50, $a0, $91, $a2, $91, $9e, $9f, $a2, $9d, $91
+db $9c, $50, $91, $93, $a4, $99, $a6, $99, $a4, $a9, $5c, $10, $15, $50, $92, $a5
+db $a3, $50, $a2, $9f, $a5, $a4, $95, $a3, $50, $a4, $9f, $50, $84, $98, $a2, $95
+db $95, $94, $50, $98, $91, $a6, $95, $50, $92, $95, $95, $9e, $50, $a4, $95, $9d
+db $a0, $9f, $a2, $91, $a2, $99, $9c, $a9, $50, $a3, $a5, $a3, $a0, $95, $9e, $94
+db $95, $94, $5e, $03, $00, $70, $5d, $76, $9f, $a5, $a2, $a3, $99, $94, $95, $50
+db $72, $a5, $a3, $50, $73, $9f, $5e, $59, $13, $02, $70, $58, $1c, $02, $00, $0a
+db $46, $86, $c7, $00
+
+ORG $D5EDB3
+db $35,$00,$e5,$04,$03,$20
+
+ORG $CFBE73
+db $85, $00, $02, $0A, $00, $E9, $02, $01, $07, $1F, $C6
+
+ORG $CFBE89
+db $DE, $00, $01
+
+ORG $C61F0E
+db $0A, $D6, $1C, $C8
+
+ORG $C81CD6
+db $70, $85, $9b, $99, $95, $50, $85, $9b, $17, $fc, $9b, $99, $95, $03, $00, $70
+db $58, $79, $50, $91, $9d, $50, $7d, $91, $9e, $50, $7b, $5e, $50, $7d, $91, $9e
+db $5e, $59, $03, $00, $70, $85, $9b, $99, $95, $50, $85, $9b, $17, $fc, $9b, $99
+db $95, $03, $00, $70, $58, $84, $91, $9c, $91, $50, $82, $91, $9d, $91, $98, $50
+db $91, $a3, $9b, $95, $94, $50, $9d, $95, $50, $a4, $9f, $50, $97, $a5, $91, $a2
+db $94, $50, $a4, $98, $99, $a3, $50, $94, $9f, $9f, $a2, $5e, $59, $03, $00, $70
+db $85, $9b, $99, $95, $50, $85, $9b, $17, $fc, $9b, $99, $95, $03, $00, $70, $58
+db $79, $96, $50, $a9, $9f, $a5, $50, $97, $99, $a6, $95, $50, $9d, $95, $50, $a4
+db $98, $95, $50, $1c, $05, $a6, $5c, $10, $05, $50, $79, $57, $9c, $9c, $50, $9c
+db $95, $a4, $50, $a9, $9f, $a5, $50, $a4, $98, $a2, $9f, $a5, $97, $98, $5e, $59
+db $0a, $84, $1f, $c6
+
+ORG $C61FFA
+db $1D
+
+ORG $C62005
+db $E9, $02
+
+ORG $C61F08
+db $E9, $02
+
+ORG $CFC032
+db $E9, $02
+
+ORG $CF15E3
+db $01
+
+ORG $C627D8
+db $0A, $4F, $51, $C9
+
+ORG $C9514F
+db $70, $58, $79, $50, $a7, $9f, $a5, $9c, $94, $50, $a4, $95, $91, $93, $98, $50
+db $a9, $9f, $a5, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $91, $a4, $99, $9f
+db $9e, $5c, $10, $0f, $50, $92, $a5, $a4, $50, $99, $a4, $50, $a3, $95, $95, $9d
+db $a3, $50, $a9, $9f, $a5, $50, $91, $9c, $a2, $95, $91, $94, $a9, $50, $9b, $9e
+db $9f, $a7, $50, $99, $a4, $51, $59, $07, $65, $02, $1b, $03, $ec, $51, $c9, $00
+db $03, $00, $70, $7b, $a9, $99, $9b, $99, $50, $9b, $91, $03, $00, $70, $58, $79
+db $9e, $a3, $a4, $95, $91, $94, $5c, $50, $79, $57, $9c, $9c, $50, $a4, $95, $91
+db $93, $98, $50, $a9, $9f, $a5, $50, $a4, $98, $99, $a3, $51, $59, $13, $18, $04
+db $1f, $02, $32, $10, $20, $1f, $02, $26, $10, $30, $1f, $02, $31, $10, $10, $1f
+db $02, $41, $10, $55, $08, $55, $93, $fe, $00, $04, $65, $02, $02, $13, $02
+
+ORG $CFBC05
+db $00
+
+
+;Dusty Dunes Miner
+ORG $C60365
+db $1d, $05, $ff, $cb, $1b, $03, $01, $04, $c6, $00, $70, $78, $95, $a9, $5e, $03
+db $00, $70, $79, $50, $a7, $91, $a3, $50, $9d, $99, $9e, $99, $9e, $97, $50, $96
+db $9f, $a2, $50, $1c, $05, $5a, $a3, $5c, $10, $10, $50, $92, $a5, $a4, $50, $79
+db $50, $9c, $9f, $a3, $a4, $50, $9d, $a9, $50, $a0, $95, $a2, $9d, $99, $a4, $50
+db $92, $95, $93, $91, $a5, $a3, $95, $50, $79, $57, $9d, $50, $6C, $9e, $9f, $a4
+db $50, $9c, $99, $93, $95, $9e, $a3, $95, $94, $6E, $5e, $03, $00, $70, $79, $96
+db $50, $a9, $9f, $a5, $50, $92, $a2, $99, $9e, $97, $50, $9d, $95, $50, $91, $50
+db $a0, $95, $a2, $9d, $99, $a4, $5c, $10, $10, $50, $79, $57, $9c, $9c, $50, $a3
+db $98, $91, $a2, $95, $50, $a7, $98, $91, $a4, $95, $a6, $95, $a2, $50, $9c, $9f
+db $9f, $a4, $50, $79, $50, $96, $99, $9e, $94, $5e, $13, $02, $70, $89, $9f, $a5
+db $57, $a6, $95, $50, $97, $9f, $a4, $50, $91, $50, $9d, $99, $9e, $99, $9e, $97
+db $50, $a0, $95, $a2, $9d, $99, $a4, $51, $1f, $02, $76, $10, $20, $1d, $01, $ff
+db $cb, $71, $9c, $a2, $99, $97, $98, $a4, $5c, $50, $9e, $95, $a7, $50, $96, $9f
+db $a2, $95, $9d, $91, $9e, $5e, $03, $00, $70, $84, $98, $95, $a2, $95, $57, $a3
+db $50, $9e, $9f, $50, $a4, $99, $9d, $95, $50, $a4, $9f, $50, $a7, $91, $a3, $a4
+db $95, $5c, $10, $10, $50, $a3, $9f, $50, $a7, $95, $57, $a2, $95, $50, $a2, $a5
+db $9e, $9e, $99, $9e, $97, $50, $91, $a4, $50, $96, $a5, $9c, $9c, $50, $a0, $9f
+db $a7, $95, $a2, $51, $03, $00, $04, $ae, $00, $18, $04, $1f, $21, $23, $1f, $e5
+db $ff, $1f, $16, $f8, $02, $01, $18, $01, $01, $70, $78, $9f, $9f, $51, $03, $00
+db $70, $84, $9f, $9c, $94, $50, $a9, $9f, $a5, $50, $99, $a4, $57, $94, $50, $92
+db $95, $50, $a1, $a5, $99, $93, $9b, $51, $03, $00, $70, $84, $98, $95, $a2, $95
+db $57, $a3, $50, $9a, $a5, $a3, $a4, $50, $9f, $9e, $95, $50, $a0, $a2, $9f, $92
+db $9c, $95, $9d, $5e, $5e, $5e, $03, $00, $0a, $28, $12, $c6, $00
+
+ORG $C61229
+db $79, $50, $91, $9c, $9d, $9f, $a3, $a4, $50, $96, $9f, $a5, $9e, $94, $50, $1C
+db $05, $70, $a3, $5c, $50, $92, $a5, $a4
+
+ORG $D5ECC3
+db $c0,$01,$b5,$04,$03,$1d
+
+ORG $C60351
+db $48, $00, $0B, $05, $C6
+
+ORG $C60358
+db $AE, $00, $28, $12, $C6
+
+ORG $C6050B
+db $70, $89, $9f, $a5, $50, $94, $99, $94, $50, $99, $a4, $51, $03, $00, $70, $87
+db $98, $99, $9c, $95, $50, $a9, $9f, $a5, $50, $a7, $95, $a2, $95, $50, $94, $9f
+db $a7, $9e, $50, $a4, $98, $95, $a2, $95, $5c, $50, $79, $50, $a3, $91, $a7, $50
+db $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $97, $9c, $99, $9d, $9d, $95
+db $a2, $99, $9e, $97, $50, $99, $9e, $50, $a4, $98, $95, $50, $93, $91, $a6, $95
+db $50, $a7, $91, $9c, $9c, $5e, $03, $00, $70, $71, $a3, $50, $a0, $a2, $9f, $9d
+db $99, $a3, $95, $94, $5c, $50, $a9, $9f, $a5, $50, $93, $91, $9e, $50, $98, $91
+db $a6, $95, $50, $99, $a4, $5e, $03, $1d, $00, $ff, $b6, $1b, $02, $ac, $05, $c6
+db $00, $1d, $0e, $ff, $01, $08, $b6, $dc, $c7, $ff, $0a, $a7, $05, $C6, $50, $97
+db $9f, $a4, $50, $a4, $98, $95, $50, $1c, $05, $b6, $51, $59, $04, $5a, $00, $13
+db $02, $70, $89, $9f, $a5, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95
+db $50, $91, $9e, $a9, $50, $a2, $9f, $9f, $9d, $50, $96, $9f, $a2, $50, $99, $a4
+db $5c, $50, $a4, $98, $9f, $a5, $97, $98, $5e, $13, $02; Miner
+
+ORG $C6034A
+db $5A, $00, $5F, $00, $C6
+
+ORG $C6005F
+db $70, $79, $50, $98, $9f, $a0, $95, $50, $a4, $98, $95, $50, $93, $99, $a4, $a9
+db $50, $94, $9f, $95, $a3, $9e, $57, $a4, $50, $96, $99, $9e, $94, $50, $9f, $a5
+db $a4, $50, $91, $92, $9f, $a5, $a4, $50, $a4, $98, $99, $a3, $50, $98, $9f, $9c
+db $95, $5e, $5e, $5e, $13, $02
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C8B53F
+db $70, $7d, $a9, $50, $a7, $99, $96, $95, $50, $a7, $91, $9e, $a4, $a3, $50, $a4
+db $9f, $50, $a3, $a4, $91, $a9, $50, $98, $95, $a2, $95, $50, $91, $9e, $94, $50
+db $a3, $a4, $91, $a2, $95, $50, $91, $a4, $50, $91, $50, $a2, $9f, $93, $9b, $50
+db $91, $9c, $9c, $50, $94, $91, $a9, $5e, $03, $00, $70, $7f, $9e, $50, $a4, $9f
+db $a0, $50, $9f, $96, $50, $a4, $98, $91, $a4, $5c, $10, $07, $50, $a4, $98, $95
+db $50, $7b, $a2, $91, $9b, $95, $9e, $50, $98, $91, $a3, $50, $92, $95, $95, $9e
+db $50, $a4, $95, $a2, $a2, $9f, $a2, $99, $aa, $99, $9e, $97, $50, $a4, $98, $95
+db $50, $a3, $95, $91, $a3, $5e, $03, $00, $70, $79, $57, $9d, $50, $9e, $9f, $a4
+db $50, $98, $91, $a0, $a0, $a9, $50, $91, $92, $9f, $a5, $a4, $50, $99, $a4, $5c
+db $10, $08, $50, $92, $a5, $a4, $50, $79, $50, $98, $91, $a6, $95, $50, $a4, $9f
+db $50, $94, $9f, $50, $9d, $a9, $50, $9a, $9f, $92, $50, $91, $a3, $50, $91, $50
+db $a3, $91, $99, $9c, $9f, $a2, $5e, $03, $00, $70, $87, $91, $9e, $a4, $50, $a4
+db $9f, $50, $a3, $91, $99, $9c, $50, $a4, $9f, $50, $83, $93, $91, $a2, $91, $92
+db $91, $6f, $03, $00, $0a, $7b, $b7, $c8; Summers sailor
+
+ORG $C8B52B
+db $DB, $03
+
+ORG $C8B532
+db $69, $02
+
+ORG $C68955
+db $70, $78, $95, $9c, $9c, $9f, $5c, $10, $07, $50, $99, $a3, $50, $a4, $98, $99
+db $a3, $50, $19, $10, $01, $1b, $00, $1c, $02, $ff, $6f, $03, $00, $70, $83, $9f
+db $a2, $a2, $a9, $50, $96, $9f, $a2, $50, $93, $9f, $9e, $a4, $91, $93, $a4, $99
+db $9e, $97, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $a4, $98, $99, $a3
+db $5c, $03, $00, $70, $92, $a5, $a4, $50, $79, $50, $a2, $95, $91, $9c, $9c, $a9
+db $50, $9e, $95, $95, $94, $50, $a9, $9f, $a5, $50, $a4, $9f, $50, $93, $91, $a4
+db $93, $98, $50, $a5, $a0, $50, $9f, $9e, $50, $a9, $9f, $a5, $a2, $50, $91, $a3
+db $a9, $9e, $93, $50, $a0, $a2, $9f, $97, $a2, $95, $a3, $a3, $5e, $03, $00, $70
+db $79, $50, $9b, $9e, $9f, $a7, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $92, $a5
+db $a3, $a9, $50, $a3, $91, $a6, $99, $9e, $97, $50, $a4, $98, $95, $50, $a7, $9f
+db $a2, $9c, $94, $50, $91, $9e, $94, $50, $91, $9c, $9c, $5c, $10, $08, $50, $92
+db $a5, $a4, $50, $79, $57, $9d, $50, $a3, $a4, $99, $9c, $9c, $50, $99, $9e, $50
+db $72, $7b, $5e, $03, $00, $70, $74, $9f, $9e, $57, $a4, $50, $a7, $9f, $a2, $a2
+db $a9, $5d, $10, $10, $50, $79, $50, $98, $99, $9e, $a4, $95, $94, $50, $9d, $9f
+db $a2, $95, $50, $99, $a4, $95, $9d, $a3, $5e, $50, $79, $50, $9a, $a5, $a3, $a4
+db $50, $9e, $95, $95, $94, $50, $9d, $a9, $5e, $5e, $5e, $03, $00, $70, $87, $98
+db $91, $a4, $6f, $03, $00, $70, $87, $98, $91, $a4, $6f, $03, $00, $70, $84, $98
+db $99, $a3, $50, $99, $a3, $50, $a4, $98, $95, $50, $a7, $a2, $9f, $9e, $97, $50
+db $9d, $a5, $9c, $a4, $99, $a7, $9f, $a2, $9c, $94, $6f, $03, $00, $70, $7f, $9f
+db $a0, $a3, $51, $03, $00, $70, $77, $9f, $a4, $a4, $91, $50, $97, $9f, $51, $0A
+db $A3, $8A, $C6, $a6, $95, $a2, $50, $a4, $91, $9c, $9b, $95, $94, $51, $03, $00
+db $70, $5a, $72, $95, $95, $95, $95, $95, $a0, $5a, $13, $18, $04, $1f, $03, $04
+db $11, $04, $02; Summers Tony Call
+
+ORG $C8B9BC
+db $D7, $00
+
+ORG $C8A020
+db $3D, $00
+
+ORG $C77EE8
+db $19, $1F, $1B, $04, $70, $0A, $BC, $7E, $C7
+
+ORG $D56FCC
+db $4F
+
+ORG $C8A992
+db $7F, $AA
+
+ORG $CF1DCB
+db $DC, $A0, $EF
+
+ORG $C8AAE6
+db $0A, $3D, $6E, $C8
+
+ORG $C86E3D
+db $07, $57, $01, $1b, $03, $ed, $aa, $c8, $00, $0a, $b0, $ab, $c8
+
+ORG $C8B226
+db $04
+
+ORG $C920C5
+db $08, $01, $95, $fe, $00, $18, $04, $1f, $21, $24, $1f, $ec, $ff, $06, $02; Get magic cake item
+
+ORG $D5ECCB
+db $89, $02, $63, $01, $05, $00; Warp to summers cart
+
+ORG $C8B199
+db $3D; Magic Tart shop
+
+ORG $C92E90
+db $0A, $50, $06, $61
+
+ORG $610650
+db $0e, $01, $0d, $01, $1d, $19, $00, $1b, $03, $6e, $06, $61, $00, $19, $10, $00
+db $0b, $04, $1b, $03, $87, $08, $61, $00, $0f, $0a, $52, $06, $61, $00, $0e, $01
+db $0d, $01, $1d, $19, $00, $1b, $03, $8c, $06, $61, $00, $19, $10, $00, $0b, $03
+db $1b, $03, $bd, $07, $61, $00, $0f, $0a, $70, $06, $61, $00, $0e, $01, $0d, $01
+db $1d, $19, $00, $1b, $03, $aa, $06, $61, $00, $19, $10, $00, $0b, $02, $1b, $03
+db $38, $07, $61, $00, $0f, $0a, $8e, $06, $61, $00, $70, $83, $9f, $5e, $5e, $5e
+db $50, $a9, $9f, $a5, $57, $a2, $95, $50, $96, $a2, $9f, $9d, $50, $7f, $9e, $95
+db $a4, $a4, $6f, $03, $00, $70, $89, $9f, $a5, $50, $9d, $a5, $a3, $a4, $50, $92
+db $95, $50, $9f, $9e, $50, $91, $50, $a0, $a2, $95, $a4, $a4, $a9, $50, $99, $9d
+db $a0, $9f, $a2, $a4, $91, $9e, $a4, $50, $9a, $9f, $a5, $a2, $9e, $95, $a9, $5c
+db $10, $07, $50, $a4, $9f, $50, $93, $9f, $9d, $95, $50, $a3, $9f, $50, $96, $91
+db $a2, $5e, $03, $00, $70, $79, $50, $92, $95, $a4, $50, $a9, $9f, $a5, $50, $9d
+db $a5, $a3, $a4, $50, $9d, $99, $a3, $a3, $50, $98, $9f, $9d, $95, $50, $95, $a6
+db $95, $a2, $a9, $50, $9f, $9e, $93, $95, $50, $99, $9e, $50, $91, $a7, $98, $99
+db $9c, $95, $51, $03, $0a, $88, $2f, $c9, $08, $7f, $dc, $c7, $00, $1b, $03, $aa
+db $06, $61, $00
+db $0A
+dl PaulaBoatText
+NotSoloPaula:
+db $5e, $5e, $50, $a4, $98, $91, $a4, $50, $97
+db $99, $a2, $9c, $50, $9f, $a6, $95, $a2, $50, $a4, $98, $95, $a2, $95, $5e, $5e
+db $5e, $03, $00, $70, $a9, $9f, $a5, $a2, $50, $92, $a5, $94, $94, $a9, $5c, $10
+db $07, $50, $a2, $99, $97, $98, $a4, $6f, $5e, $5e, $5e, $10, $14, $50, $89, $9f
+db $a5, $50, $a4, $a7, $9f, $50, $9f, $9e, $50, $91, $50, $a2, $9f, $9d, $91, $9e
+db $a4, $99, $93, $50, $a6, $91, $93, $91, $a4, $99, $9f, $9e, $6f, $03, $00, $70
+db $78, $91, $51, $10, $07, $50, $79, $57, $9d, $50, $9a, $a5, $a3, $a4, $50, $9b
+db $99, $94, $94, $99, $9e, $97, $51, $03, $00, $0a, $88, $2f, $c9, $08, $7f, $dc
+db $c7, $00, $1b, $03, $8c, $06, $61, $00
+db $0A
+dl JeffBoatText
+NotSoloJeff:
+db $5e, $5e, $50, $a4
+db $98, $91, $a4, $50, $97, $a5, $a9, $50, $a7, $99, $a4, $98, $50, $a4, $98, $95
+db $50, $97, $9c, $91, $a3, $a3, $95, $a3, $5e, $5e, $5e, $03, $00, $70, $a9, $9f
+db $a5, $a2, $50, $92, $a5, $94, $94, $a9, $5c, $10, $07, $50, $a2, $99, $97, $98
+db $a4, $6f, $5e, $5e, $5e, $10, $14, $50, $78, $95, $50, $93, $91, $9d, $95, $50
+db $96, $a2, $9f, $9d, $50, $87, $99, $9e, $a4, $95, $a2, $a3, $6f, $03, $00, $70
+db $84, $98, $91, $a4, $57, $a3, $50, $a0, $a2, $95, $a4, $a4, $a9, $50, $96, $91
+db $a2, $50, $91, $a7, $91, $a9, $5e, $03, $00, $70, $89, $9f, $a5, $50, $97, $a5
+db $a9, $a3, $50, $9d, $a5, $a3, $a4, $50, $92, $95, $50, $97, $9f, $9f, $94, $50
+db $96, $a2, $99, $95, $9e, $94, $a3, $51, $03, $00, $70, $7d, $91, $a9, $92, $95
+db $50, $98, $95, $50, $93, $9f, $a5, $9c, $94, $50, $96, $99, $a8, $50, $a4, $98
+db $95, $50, $95, $9e, $97, $99, $9e, $95, $50, $96, $9f, $a2, $50, $9d, $95, $6f
+db $03, $00, $0a, $88, $2f, $c9, $00, $08, $7f, $dc, $c7, $00, $1b, $03, $6e, $06
+db $61, $00, $0a, $9e, $2e, $c9
+
+ORG $C92CDC
+db $db, $03
+
+ORG $C31001
+db $db, $03
+
+ORG $C3107B
+db $db, $03
+
+ORG $C92DDB
+db $db, $03
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $CFB3FC
+db $00
+
+ORG $CFB3F5
+db $3D
+
+ORG $D015BA
+db $C0, $FF
+
+ORG $D0FFC0
+db $DC, $83, $02, $00, $1d, $01, $AA, $00, $21, $01, $b5; Winters gate map change
+
+ORG $C6CF2D; Snow Wood guard
+db $0A, $73, $5F, $C7
+
+ORG $C75F73
+db $06, $dc, $03, $4a, $f0, $c5, $00, $70, $7d, $91, $a8, $a7, $95, $9c, $9c, $50
+db $93, $91, $a5, $97, $98, $a4, $50, $9d, $95, $50, $93, $98, $95, $91, $a4, $99
+db $9e, $97, $50, $9f, $9e, $50, $91, $50, $9d, $91, $a4, $98, $50, $a4, $95, $a3
+db $a4, $5c, $10, $07, $50, $a3, $9f, $50, $98, $95, $50, $9d, $91, $94, $95, $50
+db $9d, $95, $50, $a3, $a4, $91, $9e, $94, $50, $9f, $a5, $a4, $50, $98, $95, $a2
+db $95, $5e, $03, $1d, $05, $ff, $a7, $1b, $03, $89, $ef, $c5, $ff, $00, $0e, $01
+db $0d, $01, $1d, $19, $00, $1b, $03, $f0, $5f, $c7, $00, $19, $10, $00, $0b, $03
+db $1b, $03, $79, $60, $c7, $00, $0f, $0a, $d3, $5f, $c7, $00, $00, $70, $79, $57
+db $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $07, $50, $19, $10, $01, $1b, $04
+db $1c, $02, $00, $5c, $03, $00, $70, $92, $a5, $a4, $50, $7d, $91, $a8, $a7, $95
+db $9c, $9c, $50, $a3, $91, $a9, $a3, $50, $79, $50, $93, $91, $9e, $57, $a4, $50
+db $9c, $95, $a4, $50, $91, $9e, $a9, $9f, $9e, $95, $50, $99, $9e, $a4, $9f, $50
+db $a4, $98, $95, $50, $a3, $93, $98, $9f, $9f, $9c, $50, $a4, $98, $91, $a4, $57
+db $a3, $50, $9e, $9f, $a4, $50, $91, $50, $a2, $95, $97, $99, $a3, $a4, $95, $a2
+db $95, $94, $50, $a3, $a4, $a5, $94, $95, $9e, $a4, $5e, $03, $00, $70, $84, $98
+db $9f, $a3, $95, $50, $91, $a2, $95, $50, $a4, $98, $95, $50, $a2, $a5, $9c, $95
+db $a3, $5e, $5e, $5e, $13, $02, $0e, $03, $08, $7f, $dc, $c7, $00, $1b, $03, $f0
+db $5f, $c7, $00, $70, $78, $95, $a9, $5c, $50, $1c, $02, $03, $5e, $50, $7d, $91
+db $a8, $a7, $95, $9c, $9c, $50, $a3, $91, $a9, $a3, $50, $a9, $9f, $a5, $57, $a2
+db $95, $50, $a3, $a5, $a3, $a0, $95, $9e, $94, $95, $94, $50, $a5, $9e, $a4, $99
+db $9c, $50, $a4, $98, $95, $50, $a7, $9f, $a2, $9c, $94, $50, $99, $a3, $50, $a3
+db $91, $a6, $95, $94, $5e, $03, $00, $70, $7e, $9f, $5c, $10, $08, $50, $9e, $9f
+db $5c, $10, $08, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $9e, $9f, $a4, $50, $99
+db $9e, $50, $a4, $a2, $9f, $a5, $92, $9c, $95, $50, $9f, $a2, $50, $91, $9e, $a9
+db $a4, $98, $99, $9e, $97, $5e, $03, $0a, $3e, $ef, $c5
+
+ORG $C5EF3E
+db $00, $70, $78, $95, $50, $9a, $a5, $a3, $a4, $50, $94, $9f, $95, $a3, $9e, $57
+db $a4, $50, $a7, $91, $9e, $a4, $50, $a9, $9f, $a5, $50, $a4, $9f, $50, $a7, $9f
+db $a2, $a2, $a9, $50, $91, $92, $9f, $a5, $a4, $50, $a3, $a4, $a5, $94, $a9, $99
+db $9e, $97, $50, $a7, $98, $99, $9c, $95, $50, $9f, $9e, $50, $91, $9e, $50, $91
+db $94, $a6, $95, $9e, $a4, $a5, $a2, $95, $5e, $13, $02, $00, $70, $87, $98, $91
+db $a4, $57, $a3, $50, $a4, $98, $91, $a4, $6f, $03, $00, $70, $89, $9f, $a5, $50
+db $98, $91, $a6, $95, $50, $91, $50, $9c, $95, $a4, $a4, $95, $a2, $50, $a4, $9f
+db $50, $94, $a2, $9f, $a0, $50, $9f, $96, $96, $50, $96, $9f, $a2, $50, $84, $9f
+db $9e, $a9, $6f, $03, $00, $70, $87, $95, $9c, $9c, $10, $30, $5e, $10, $30, $5e
+db $10, $30, $5e, $50, $79, $50, $97, $a5, $95, $a3, $a3, $50, $99, $a4, $57, $a3
+db $50, $91, $9c, $a2, $99, $97, $98, $a4, $50, $a4, $9f, $50, $9c, $95, $a4, $50
+db $a9, $9f, $a5, $50, $99, $9e, $50, $a3, $9f, $50, $a9, $9f, $a5, $50, $93, $91
+db $9e, $50, $94, $a2, $9f, $a0, $50, $99, $a4, $50, $9f, $96, $96, $5e, $10, $30
+db $5e, $10, $30, $5e, $10, $30, $03, $00, $70, $7a, $a5, $a3, $a4, $50, $a3, $a4
+db $91, $a9, $50, $9f, $a5, $a4, $50, $9f, $96, $50, $a4, $a2, $9f, $a5, $92, $9c
+db $95, $51, $03, $18, $04, $04, $dc, $03, $1f, $e9, $7f, $02, $1f, $16, $7f, $02
+db $01, $1f, $02, $77, $1f, $15, $2e, $00, $07, $01, $01, $02, $70, $78, $a5, $a2
+db $a2, $a9, $50, $a5, $a0, $50, $91, $9e, $94, $50, $94, $9f, $50, $a7, $98, $91
+db $a4, $50, $a9, $9f, $a5, $50, $9e, $95, $95, $94, $50, $a4, $9f, $51, $13, $02
+
+ORG $CF6027
+db $7D ;Boarding school event music
+
+ORG $C6FA03
+db $FF ;Skips broken key text
+
+ORG $C6FA0A
+db $CD ;Opens locker with locker key
+
+ORG $C6FA26
+db $CD
+
+ORG $C6FA2A
+db $75
+
+ORG $C6F98C
+db $0a, $26, $FE, $C4
+
+ORG $C6F932
+db $0a, $41, $FE, $C4
+
+ORG $C6F905
+db $0a, $F0, $FD, $C4
+
+ORG $C6F95F
+db $0a, $0B, $FE, $C4
+
+ORG $C4FDF0
+db $07, $58, $00, $1b, $03, $93, $fa, $c6, $00, $08, $0b, $f9, $c6, $00, $1d, $03; FIX TEXT JUMPS!!!!
+db $ff, $1b, $02, $0A, $FE, $C4, $00, $04, $58, $00, $02, $07, $F4, $03, $1b, $03
+db $93, $fa, $c6, $00, $08, $65, $f9, $c6, $00, $1d, $03, $ff, $1b, $02, $0a, $FE
+db $C4, $00, $04, $F4, $03, $02, $07, $17, $00, $1b, $03, $93, $fa, $c6, $00, $08
+db $92, $f9, $c6, $00, $1d, $03, $ff, $1b, $02, $0a, $FE, $C4, $00, $04, $17, $00
+db $02, $07, $4e, $01, $1b, $03, $93, $fa, $c6, $00, $08, $38, $f9, $c6, $00, $1d
+db $03, $ff, $1b, $02, $0A, $FE, $C4, $00, $04, $4e, $01, $02; Fix locker checks
+
+ORG $C6AA44
+db $70, $7f, $98, $5c, $10, $0f, $50, $a9, $9f, $a5, $50, $a3, $a4, $91, $a2, $a4
+db $9c, $95, $94, $50, $9d, $95, $5e, $03, $00, $70, $79, $57, $9d, $50, $a7, $9f
+db $a2, $9b, $99, $9e, $97, $50, $9f, $9e, $50, $71, $a2, $93, $98, $99, $a0, $95
+db $9c, $91, $97, $9f, $50, $99, $9e, $a4, $95, $97, $a2, $91, $a4, $99, $9f, $9e
+db $50, $96, $9f, $a2, $50, $a4, $98, $95, $50, $83, $a5, $a0, $95, $a2, $50, $72
+db $91, $92, $a9, $50, $7d, $91, $97, $99, $93, $50, $74, $a2, $95, $91, $9d, $50
+db $72, $9f, $a9, $5c, $03, $00, $70, $92, $a5, $a4, $50, $99, $a4, $50, $99, $a3
+db $9e, $57, $a4, $50, $97, $9f, $99, $9e, $97, $50, $a6, $95, $a2, $a9, $50, $a7
+db $95, $9c, $9c, $5e, $03, $00, $70, $79, $96, $50, $9f, $9e, $9c, $a9, $50, $80
+db $98, $91, $a2, $50, $a7, $95, $a2, $95, $50, $98, $95, $a2, $95, $5e, $03, $00
+db $70, $78, $95, $57, $94, $50, $92, $95, $50, $91, $92, $9c, $95, $50, $a4, $9f
+db $50, $a0, $a2, $9f, $a6, $99, $94, $95, $50, $91, $50, $97, $a2, $95, $91, $a4
+db $50, $94, $95, $91, $9c, $50, $9f, $96, $50, $98, $95, $9c, $a0, $5e, $03, $00
+db $70, $71, $9e, $a9, $a7, $91, $a9, $a3, $5c, $10, $0f, $50, $79, $57, $94, $50
+db $9c, $9f, $a6, $95, $50, $a4, $9f, $50, $98, $95, $9c, $a0, $50, $a9, $9f, $a5
+db $50, $a7, $99, $a4, $98, $50, $a9, $9f, $a5, $a2, $50, $91, $94, $a6, $95, $9e
+db $a4, $a5, $a2, $95, $5c, $03, $00, $70, $92, $a5, $a4, $50, $79, $57, $9d, $50
+db $93, $9f, $9d, $9d, $99, $a4, $a4, $95, $94, $50, $a4, $9f, $50, $9d, $a9, $50
+db $a7, $9f, $a2, $9b, $5e, $50, $79, $50, $93, $91, $9e, $50, $91, $a4, $50, $9c
+db $95, $91, $a3, $a4, $50, $97, $99, $a6, $95, $50, $a9, $9f, $a5, $50, $a4, $98
+db $99, $a3, $50, $1c, $05, $01, $5e, $03, $0a, $d5, $ab, $c6, $00
+
+ORG $C6ABD5; Maxwell
+db $00, $1d, $00, $ff, $cd, $1b, $02, $da, $ac, $c6, $00, $1d, $03, $ff, $1d, $0e
+db $00, $cd, $08, $b6, $dc, $c7, $00, $03, $00, $70, $77, $9f, $9f, $94, $50, $9c
+db $a5, $93, $9b, $50, $9f, $a5, $a4, $50, $a4, $98, $95, $a2, $95, $51, $13, $04
+db $5d, $02, $02
+
+ORG $CFB163
+db $49, $00, $02; Consistency for gate man
+
+ORG $C6CDAF
+db $70, $79, $50, $93, $91, $9e, $57, $a4, $50, $92, $16, $ad, $15, $23, $15, $91
+db $94, $9f, $15, $0a, $a3, $9f, $50, $9e, $16, $a6, $17, $17, $13, $02; Cookie guy
+
+ORG $CFB0CA
+db $49, $00, $02; Tony in bed
+
+ORG $CFB0D6
+db $00, $00, $04, $5E, $02
+
+ORG $CFB0DE
+db $10, $99, $EE
+
+ORG $EE9910
+db $70, $71, $a2, $95, $50, $a9, $9f, $a5, $50, $9c, $9f, $9f, $9b, $99, $9e, $97
+db $50, $96, $9f, $a2, $50, $84, $9f, $9e, $a9, $6f, $03, $00, $70, $78, $95, $57
+db $a3, $50, $9e, $9f, $a4, $50, $98, $95, $a2, $95, $50, $a2, $99, $97, $98, $a4
+db $50, $9e, $9f, $a7, $5e, $10, $10, $50, $78, $95, $50, $a3, $91, $99, $94, $50
+db $98, $95, $50, $a7, $91, $a3, $50, $97, $9f, $99, $9e, $97, $50, $a4, $9f, $50
+db $99, $9e, $a6, $95, $a3, $a4, $99, $97, $91, $a4, $95, $50, $83, $a4, $9f, $9e
+db $95, $98, $95, $9e, $97, $95, $5c, $03, $00, $70, $92, $a5, $a4, $50, $9e, $95
+db $a6, $95, $a2, $50, $93, $91, $9d, $95, $50, $92, $91, $93, $9b, $5e, $5e, $5e
+db $03, $00, $70, $79, $57, $9d, $50, $a3, $a4, $91, $a2, $a4, $99, $9e, $97, $50
+db $a4, $9f, $50, $97, $95, $a4, $50, $91, $50, $9c, $99, $a4, $a4, $9c, $95, $50
+db $a7, $9f, $a2, $a2, $99, $95, $94, $5e, $03, $00, $70, $79, $96, $50, $a9, $9f
+db $a5, $50, $94, $9f, $9e, $57, $a4, $50, $9d, $99, $9e, $94, $5c, $50, $79, $57
+db $9d, $50, $93, $9f, $9d, $99, $9e, $97, $50, $a7, $99, $a4, $98, $50, $a9, $9f
+db $a5, $51, $03, $00, $0A, $D4, $B0, $EE, $00, $1b, $03, $F7, $99, $EE, $00, $1f
+db $1e, $50, $02, $06, $04, $80, $00, $02; Winters character slot
+
+ORG $D808FB
+;db $82 Winters bed FIX THIS!!!!!!
+
+ORG $C7A1BA
+db $02; Leaving Snow Wood hotspot. also free text?
+
+ORG $C6AE5C
+db $0A, $A3, $AE, $C6
+
+ORG $CFB1FC
+db $49, $00, $02
+
+ORG $C6AA30
+db $5D, $02
+
+ORG $C6AD75
+db $0A, $BB, $A1, $C7
+
+ORG $C7A1BB
+db $70, $87, $95, $57, $a2, $95, $50, $9e, $9f, $a4, $50, $a3, $95, $9c, $9c, $99
+db $9e, $97, $50, $9d, $9f, $9e, $9b, $95, $a9, $a3, $50, $91, $9e, $a9, $9d, $9f
+db $a2, $95, $5e, $03, $00, $70, $84, $98, $95, $50, $9c, $91, $a3, $a4, $50, $9f
+db $9e, $95, $50, $a7, $95, $50, $98, $91, $94, $50, $a2, $91, $9e, $50, $91, $a7
+db $91, $a9, $50, $a4, $9f, $50, $a4, $98, $95, $50, $a3, $9f, $a5, $a4, $98, $5e
+db $03, $00, $70, $71, $9c, $9c, $50, $79, $50, $98, $91, $a6, $95, $50, $99, $a3
+db $50, $a4, $98, $99, $a3, $50, $1c, $05, $68, $5e, $03, $00, $70, $79, $a4, $50
+db $93, $9f, $a3, $a4, $a3, $50, $91, $50, $92, $a5, $93, $9b, $5e, $03, $00, $70
+db $83, $a4, $99, $9c, $9c, $50, $a7, $91, $9e, $a4, $50, $99, $a4, $6f, $0a, $e8
+db $ad, $c6, $03
+
+ORG $C6AE07
+db $0A, $4D, $A2, $C7
+
+ORG $C7A24D
+db $70, $7f, $9b, $91, $a9, $5c, $10, $0f, $50, $92, $a5, $a4, $50, $79, $50, $93
+db $91, $9e, $57, $a4, $50, $97, $a5, $a2, $91, $9e, $a4, $95, $95, $50, $99, $a4
+db $57, $9c, $9c, $50, $92, $95, $50, $98, $95, $a2, $95, $50, $96, $9f, $a2, $95
+db $a6, $95, $a2, $5e, $5e, $5e, $13, $02
+
+ORG $C6AEC3
+db $0A, $D7, $AE, $C6
+
+ORG $C6AE77
+db $70, $79, $a4, $57, $a3, $50, $9e, $9f, $a4, $50, $a3, $95, $9c, $9c, $99, $9e
+db $97, $5c, $10, $0f, $50, $a3, $9f, $50, $a4, $98, $99, $a3, $50, $9f, $9e, $95
+db $57, $a3, $50, $96, $a2, $95, $95, $5e, $10, $00
+
+ORG $CFB363
+db $00
+
+ORG $C6B18D
+db $06, $76, $02, $77, $b2, $c6, $00, $70, $7b, $99, $5d, $9b, $9b, $a9, $95, $5d
+db $9b, $a9, $95, $5d, $9b, $a9, $95, $5d, $9b, $99, $99, $99, $5e, $03, $00, $70
+db $58, $79, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95, $50, $91, $9e
+db $a9, $50, $16, $e6, $10, $05, $95, $10, $05, $95, $10, $05, $95, $a7, $15, $1b
+db $97, $a5, $9d, $5e, $10, $10, $50, $73, $91, $9e, $50, $79, $50, $98, $91, $a6
+db $95, $50, $a3, $9f, $9d, $95, $50, $9f, $96, $50, $a9, $9f, $a5, $a2, $a3, $6f
+db $59, $03, $00, $19, $02, $89, $95, $a3, $02, $19, $02, $7e, $9f, $02, $1c, $07
+db $02, $11, $09, $02, $2d, $b2, $c6, $00, $09, $b2, $c6, $00, $12, $70, $7b, $95
+db $95, $50, $9b, $95, $95, $5e, $03, $00, $70, $58, $89, $9f, $a5, $50, $9d, $91
+db $9b, $95, $50, $9d, $95, $50, $a3, $9f, $50, $a3, $91, $94, $51, $59, $13, $02
+db $1d, $05, $ff, $68, $1b, $02, $02, $b2, $c6, $00, $1d, $01, $ff, $68, $1f, $02
+db $76, $10, $10, $12, $70, $58, $84, $98, $95, $50, $9d, $9f, $9e, $9b, $95, $a9
+db $50, $a4, $9f, $9f, $9b, $50, $a4, $98, $95, $50, $95, $9e, $a4, $99, $a2, $95
+db $50, $a0, $91, $93, $9b, $50, $96, $a2, $9f, $9d, $19, $10, $01, $1b, $04, $50
+db $1c, $02, $00, $5e, $59, $03, $00, $04, $76, $02, $70, $7b, $99, $5d, $9b, $9b
+db $a9, $95, $5d, $9b, $a9, $95, $5d, $9b, $a9, $95, $5d, $9b, $99, $99, $99, $5e
+db $03, $00, $0a, $17, $bc, $c6; Bubble monkey gum check
+
+ORG $C6BC00
+db $0A, $8D, $B1, $C6
+
+ORG $C99B52
+db $49
+
+ORG $CFB262
+db $B2, $01, $02
+
+ORG $CFB25D
+db $b6
+
+ORG $CFB284
+db $B2, $01, $02; Saturn in lab
+
+ORG $CF7459
+db $02, $00, $69, $02, $68, $98, $BB, $00
+
+ORG $CFB275
+db $00
+
+ORG $CFB27F
+db $AB
+
+ORG $CFB282
+db $B2
+
+ORG $CFB265
+db $99, $C0, $C6
+
+ORG $CFB287
+db $35, $C0, $C6
+
+ORG $CFB527
+db $8F, $00
+
+ORG $CFB5D1
+db $64, $00
+
+ORG $CFB53D
+db $49, $00, $02
+
+ORG $CFB5EA
+db $14, $F6, $2F
+
+ORG $C6C7DA
+db $49
+
+ORG $2FF600
+db $05, $FE, $02, $06, $de, $03, $97, $F7, $2F, $00, $06, $b2, $01, $98, $f7, $2f
+db $00, $02
+
+ORG $CF1111
+db $00, $F6, $2F
+
+ORG $C6C7E7
+db $70, $7d, $a9, $50, $9d, $91, $a3, $a4, $95, $a2, $5c, $10, $0f, $50, $71, $a0
+db $a0, $9c, $95, $50, $7b, $99, $94, $5c, $10, $0f, $50, $98, $91, $a3, $50, $93
+db $9f, $9d, $a0, $9c, $95, $a4, $95, $94, $50, $98, $99, $a3, $50, $a5, $9c, $a4
+db $99, $9d, $91, $a4, $95, $50, $99, $9e, $a6, $95, $9e, $a4, $99, $9f, $9e, $5e
+db $03, $00, $70, $84, $98, $91, $a4, $57, $a3, $50, $a2, $99, $97, $98, $a4, $5e
+db $10, $10, $50, $84, $98, $95, $50, $1c, $05, $e0, $5e, $03, $00, $70, $79, $50
+db $91, $93, $a4, $a5, $91, $9c, $9c, $a9, $50, $93, $9f, $9e, $a4, $a2, $99, $92
+db $a5, $a4, $95, $94, $50, $91, $9e, $50, $99, $9e, $a6, $91, $9c, $a5, $91, $92
+db $9c, $95, $50, $91, $9d, $9f, $a5, $9e, $a4, $50, $a4, $9f, $50, $a4, $98, $95
+db $50, $a0, $a2, $9f, $9a, $95, $93, $a4, $5e, $5e, $5e, $03, $0a, $0c, $bf, $c6
+
+ORG $C6BF0C
+db $00, $70, $71, $96, $a4, $95, $a2, $50, $a4, $98, $91, $a4, $5c, $10, $0f, $50
+db $98, $95, $50, $a3, $91, $99, $94, $50, $98, $95, $50, $a7, $91, $a3, $50, $98
+db $95, $91, $94, $99, $9e, $97, $50, $98, $9f, $9d, $95, $50, $a4, $9f, $50, $84
+db $a7, $9f, $a3, $9f, $9e, $5e, $03, $00, $70, $79, $50, $92, $95, $9c, $99, $95
+db $a6, $95, $50, $98, $95, $50, $a7, $91, $9e, $a4, $95, $94, $50, $a9, $9f, $a5
+db $50, $a4, $9f, $50, $98, $91, $a6, $95, $50, $98, $99, $a3, $50, $99, $9e, $a6
+db $95, $9e, $a4, $99, $9f, $9e, $5e, $03, $0a, $8c, $c8, $c6; Apple kid mouse text
+
+ORG $C6C099
+db $0A, $50, $F9, $2F
+
+ORG $2FF950
+db $06, $dd, $03, $35, $fb, $2f, $00, $70, $19, $10, $01, $1b, $04, $1c, $02, $00
+db $5c, $10, $0f, $50, $92, $a5, $94, $94, $a9, $51, $10, $10, $50, $89, $9f, $a5
+db $50, $a3, $91, $a6, $95, $94, $50, $a5, $a3, $51, $03, $00, $70, $79, $50, $a7
+db $91, $a3, $50, $a3, $a4, $a5, $94, $a9, $99, $9e, $97, $5c, $10, $0f, $50, $a7
+db $98, $95, $9e, $50, $79, $50, $98, $95, $91, $a2, $94, $50, $a4, $98, $99, $a3
+db $50, $a7, $95, $99, $a2, $94, $50, $9e, $9f, $99, $a3, $95, $50, $9f, $a5, $a4
+db $a3, $99, $94, $95, $5e, $5e, $5e, $03, $00, $70, $79, $50, $a7, $95, $9e, $a4
+db $50, $a4, $9f, $50, $93, $98, $95, $93, $9b, $50, $99, $a4, $50, $9f, $a5, $a4
+db $5c, $10, $0f, $50, $91, $9e, $94, $50, $a4, $98, $95, $9e, $50, $79, $50, $a7
+db $9f, $a5, $9e, $94, $50, $a5, $a0, $50, $98, $95, $a2, $95, $5e, $03, $00, $70
+db $78, $9d, $6f, $10, $15, $50, $89, $9f, $a5, $57, $a2, $95, $50, $98, $95, $a2
+db $95, $50, $96, $9f, $a2, $50, $a4, $98, $95, $50, $1c, $05, $e0, $6f, $03, $00
+db $70, $7f, $98, $51, $50, $79, $50, $9d, $a5, $a3, $a4, $50, $98, $91, $a6, $95
+db $50, $a4, $91, $9b, $95, $9e, $50, $99, $a4, $50, $a7, $99, $a4, $98, $50, $9d
+db $95, $5e, $03, $00, $70, $79, $50, $94, $9f, $9e, $57, $a4, $50, $9e, $95, $95
+db $94, $50, $99, $a4, $50, $91, $9e, $a9, $9d, $9f, $a2, $95, $5c, $50, $a4, $98
+db $9f, $a5, $97, $98, $5c, $10, $0f, $50, $a3, $9f, $50, $a9, $9f, $a5, $50, $93
+db $91, $9e, $50, $98, $91, $a6, $95, $50, $99, $a4, $5e, $03, $00, $70, $1d, $19
+db $00, $1d, $00, $ff, $ad, $1b, $02, $95, $fa, $2f, $00, $1f, $02, $74, $10, $10
+db $1c, $02, $fe, $50, $97, $9f, $a4, $50, $a4, $98, $95, $50, $1c, $05, $e0, $51
+db $04, $dd, $03, $13, $02, $7f, $98, $5e, $5e, $5e, $10, $10, $50, $89, $9f, $a5
+db $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95, $50, $95, $9e, $9f, $a5
+db $97, $98, $50, $a2, $9f, $9f, $9d, $50, $96, $9f, $a2, $50, $99, $a4, $5e, $03
+db $00, $70, $87, $95, $9c, $9c, $5c, $10, $0f, $50, $79, $57, $9c, $9c, $50, $98
+db $91, $9e, $97, $50, $9f, $9e, $50, $a4, $9f, $50, $99, $a4, $50, $96, $9f, $a2
+db $50, $9e, $9f, $a7, $5e, $03, $00, $70, $79, $96, $50, $a9, $9f, $a5, $50, $a7
+db $91, $9e, $a4, $50, $a4, $9f, $50, $9d, $95, $95, $a4, $50, $a5, $a0, $50, $a7
+db $99, $a4, $98, $50, $9d, $95, $50, $9c, $91, $a4, $95, $a2, $5c, $50, $10, $0f
+db $50, $79, $57, $9c, $9c, $50, $92, $95, $50, $91, $a2, $9f, $a5, $9e, $94, $50
+db $74, $a2, $5e, $50, $71, $9e, $94, $9f, $9e, $a5, $a4, $a3, $57, $a3, $50, $9c
+db $91, $92, $5e, $13, $02, $70, $79, $57, $a6, $95, $50, $92, $95, $95, $9e, $50
+db $a4, $98, $99, $9e, $9b, $99, $9e, $97, $50, $91, $92, $9f, $a5, $a4, $50, $6C
+db $71, $a2, $93, $98, $99, $a0, $95, $9c, $91, $97, $9f, $6E, $50, $9c, $91, $a4
+db $95, $9c, $a9, $5e, $13, $02; Stonehenge item
+
+ORG $CFB5E7
+db $49, $00, $02
+
+ORG $CFB5E2
+db $8F
+
+ORG $CF0EC6
+db $86, $f7, $2f
+
+ORG $CF111C
+db $86, $F7, $2F
+
+ORG $2FF786
+db $02, $de, $03, $97, $f7, $2f, $00, $06, $b2, $01, $98, $f7, $2f, $00, $04, $d8
+db $02, $02, $05, $d8, $02, $02
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $CF5B2B
+db $2F; Everdred music
+
+ORG $CF1678
+db $00, $00, $00, $00, $00, $00; Dept. Store entrance
+
+ORG $D4E300
+db $1F, $1F, $20, $3F, $5F, $40, $5F, $40, $5F, $50, $5F, $41, $5E, $43, $5D, $47
+db $1F, $1F, $3F, $3F, $60, $60, $7F, $7F, $7F, $7F, $7F, $7F, $7F, $7E, $7F, $7D
+db $FC, $FC, $06, $FE, $EA, $0E, $FA, $0E, $FA, $2E, $FA, $8E, $FA, $8E, $FA, $0E
+db $FC, $FC, $FE, $FE, $1E, $1E, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE
+db $58, $4F, $5C, $47, $5E, $43, $5D, $47, $5F, $56, $5F, $40, $7F, $7F, $00, $00
+db $7F, $78, $7F, $7C, $7F, $7E, $7F, $7D, $7F, $7F, $7F, $7F, $7F, $7F, $00, $00
+db $FA, $8E, $7A, $CE, $FA, $8E, $FA, $0E, $FA, $2E, $FA, $0E, $FC, $FC, $00, $00
+db $FE, $FE, $FE, $7E, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FC, $FC, $00, $00
+db $1F, $1F, $20, $3F, $5F, $40, $5F, $40, $5F, $50, $5F, $41, $5E, $43, $5D, $47
+db $1F, $1F, $3F, $3F, $60, $60, $7F, $7F, $7F, $7F, $7F, $7F, $7F, $7E, $7F, $7D
+db $FC, $FC, $06, $FE, $EA, $0E, $FA, $0E, $FA, $2E, $FA, $8E, $FA, $8E, $FA, $0E
+db $FC, $FC, $FE, $FE, $1E, $1E, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE
+db $58, $4F, $5C, $47, $5E, $43, $5D, $47, $5F, $56, $5F, $40, $7F, $7F, $00, $00
+db $7F, $78, $7F, $7C, $7F, $7E, $7F, $7D, $7F, $7F, $7F, $7F, $7F, $7F, $00, $00
+db $FA, $8E, $7A, $CE, $FA, $8E, $FA, $0E, $FA, $2E, $FA, $0E, $FC, $FC, $00, $00
+db $FE, $FE, $FE, $7E, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FE, $FC, $FC, $00, $00
+
+ORG $D49760
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3f, $3f, $7f, $7f
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3f, $00, $7f
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $fc, $fc, $f8, $f8
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $fc, $00, $f8
+
+ORG $6F3F1A
+db $0E
+
+ORG $6F4091
+db $0E
+
+ORG $CF7F39
+db $6C, $68
+
+ORG $C4FDA8
+db $06, $00, $a9, $03, $70, $88, $aa, $03, $70, $a0, $98, $03, $80, $f8, $BE, $02
+db $6c, $68, $bf, $02, $7A, $68, $A3, $03, $98, $88; Electric box stuff
+
+ORG $CF688D
+db $05, $00
+
+ORG $CFB834
+db $03, $6E, $01
+
+ORG $CFB83C
+db $00, $10, $97, $EE
+
+ORG $08957A
+db $02
+
+ORG $CFB829
+db $00, $00, $00
+
+ORG $08958D
+db $06, $39, $01, $d5, $95, $08, $00, $1f, $07, $02, $10, $0a, $1f, $01, $00, $1f
+db $e1, $1f, $00, $01, $10, $14, $1f, $e1, $14, $01, $01, $10, $14, $1f, $e1, $1f
+db $00, $01, $10, $01, $1f, $e1, $14, $01, $01, $10, $01, $1f, $e1, $1f, $00, $01
+db $10, $20, $04, $39, $00, $04, $39, $01, $04, $2b, $02, $1f, $1e, $98, $03, $06
+db $1f, $1e, $a3, $03, $06, $1f, $03, $02, $1f, $07, $02, $10, $0a, $1f, $01, $00
+db $1f, $e1, $14, $01, $01, $10, $14, $1f, $e1, $1f, $00, $01, $10, $14, $1f, $e1
+db $14, $01, $01, $10, $01, $1f, $e1, $1f, $00, $01, $10, $01, $1f, $e1, $14, $01
+db $01, $10, $20, $05, $39, $00, $05, $39, $01, $05, $2b, $02, $1f, $03, $02, $95; Electric box event
+
+ORG $EE9710
+db $06, $8B, $00, $4d, $98, $EE, $00, $0e, $01, $0d, $01, $1d, $19, $00, $1b, $03
+db $35, $97, $EE, $00, $19, $10, $00, $0b, $03, $1b, $03, $79, $97, $EE, $00, $0f
+db $0a, $19, $97, $EE, $00, $70, $58, $79, $a4, $57, $a3, $50, $91, $9e, $50, $95
+db $9c, $95, $93, $a4, $a2, $99, $93, $91, $9c, $50, $92, $9f, $a8, $5e, $10, $10
+db $50, $79, $a4, $50, $a7, $9f, $a5, $9c, $94, $50, $a4, $91, $9b, $95, $50, $91
+db $50, $97, $95, $9e, $99, $a5, $a3, $50, $a4, $9f, $50, $9f, $a0, $95, $a2, $91
+db $a4, $95, $50, $99, $a4, $5e, $59, $13, $02, $0e, $03, $08, $7f, $dc, $c7, $00
+db $1b, $03, $35, $97, $EE, $00, $70, $58, $1c, $02, $03, $50, $9f, $a0, $95, $9e
+db $95, $94, $50, $a4, $98, $95, $50, $95, $9c, $95, $93, $a4, $a2, $99, $93, $91
+db $9c, $50, $92, $9f, $a8, $5e, $1f, $02, $75, $10, $15, $00, $70, $84, $98, $95
+db $a2, $95, $57, $a3, $50, $91, $9e, $50, $99, $9d, $a0, $9f, $a2, $a4, $91, $9e
+db $a4, $5d, $9c, $9f, $9f, $9b, $99, $9e, $97, $50, $a3, $a7, $99, $a4, $93, $98
+db $50, $98, $95, $a2, $95, $5e, $10, $10, $50, $80, $a5, $9c, $9c, $50, $99, $a4
+db $6f, $00, $19, $02, $89, $95, $a3, $02, $19, $02, $7e, $9f, $02, $1c, $07, $02
+db $11, $09, $02, $20, $98, $EE, $00, $fb, $97, $EE, $00, $12, $70, $19, $10, $01
+db $1b, $04, $1c, $02, $00, $50, $94, $99, $94, $50, $9e, $9f, $a4, $50, $a0, $a5
+db $9c, $9c, $50, $a4, $98, $95, $50, $a3, $a7, $99, $a4, $93, $98, $5e, $13, $02
+db $12, $70, $19, $10, $01, $1b, $04, $1c, $02, $00, $50, $a0, $a5, $9c, $9c, $95
+db $94, $50, $a4, $98, $95, $50, $a3, $a7, $99, $a4, $93, $98, $5e, $1f, $02, $77
+db $10, $15, $1f, $02, $75, $10, $20, $18, $04, $0a, $8d, $95, $08, $70, $58, $84
+db $98, $95, $50, $95, $9c, $95, $93, $a4, $a2, $99, $93, $91, $9c, $50, $92, $9f
+db $a8, $50, $99, $a3, $50, $9c, $9f, $93, $9b, $95, $94, $5e, $5e, $5e, $59, $13
+db $02; Electric box text
+
+ORG $CFB824
+db $5F, $01
+
+ORG $C8972A
+db $70, $58, $79, $50, $98, $95, $91, $a2, $94, $50, $a4, $98, $91, $a4, $50, $91
+db $50, $a3, $93, $91, $a2, $a9, $50, $9d, $9f, $9e, $a3, $a4, $95, $a2, $50, $9c
+db $99, $a6, $95, $a3, $50, $9f, $9e, $50, $a4, $98, $95, $50, $a4, $9f, $a0, $50
+db $96, $9c, $9f, $9f, $a2, $5e, $03, $00, $70, $84, $98, $95, $a9, $50, $a3, $91
+db $a9, $50, $99, $a4, $50, $9f, $9e, $9c, $a9, $50, $93, $9f, $9d, $95, $a3, $50
+db $9f, $a5, $a4, $50, $a7, $98, $95, $9e, $50, $a4, $98, $95, $50, $9c, $99, $97
+db $98, $a4, $a3, $50, $91, $a2, $95, $50, $a4, $a5, $a2, $9e, $95, $94, $50, $9f
+db $96, $96, $5e, $5e, $5e, $03, $00, $70, $79, $50, $92, $95, $a4, $50, $98, $95
+db $50, $98, $91, $a3, $50, $a3, $9f, $9d, $95, $50, $97, $9f, $9f, $94, $50, $a4
+db $a2, $95, $91, $a3, $a5, $a2, $95, $5e, $5e, $5e, $50, $10, $10, $50, $79, $50
+db $97, $a5, $95, $a3, $a3, $50, $99, $a4, $57, $a3, $50, $91, $50, $9d, $9f, $a5
+db $a3, $95, $57, $a3, $50, $a3, $99, $a8, $a4, $98, $50, $a3, $95, $9e, $a3, $95
+db $5e, $59, $13, $02; Mouse hint
+
+ORG $C82CFC
+db $0A, $F9, $99, $EE
+
+ORG $EE99F9
+db $70, $5e, $5e, $5e, $79, $96, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $98, $95
+db $a2, $95, $50, $96, $9f, $a2, $50, $91, $50, $a4, $a2, $95, $91, $a3, $a5, $a2
+db $95, $5c, $50, $a4, $98, $95, $a2, $95, $57, $a3, $50, $9e, $9f, $9e, $95, $50
+db $a4, $9f, $50, $92, $95, $50, $96, $9f, $a5, $9e, $94, $5e, $5e, $5e, $03, $00
+db $70, $7d, $a9, $50, $a0, $9f, $a7, $95, $a2, $50, $99, $a3, $50, $91, $50, $93
+db $a5, $a2, $a3, $95, $5e, $5e, $5e, $03, $00, $70, $71, $9e, $94, $50, $79, $50
+db $92, $95, $a3, $a4, $9f, $a7, $50, $a4, $98, $91, $a4, $50, $93, $a5, $a2, $a3
+db $95, $50, $9f, $9e, $a4, $9f, $50, $a9, $9f, $a5, $51, $03, $00, $70, $77, $a7
+db $91, $91, $91, $91, $91, $a2, $a2, $a2, $a2, $97, $98, $51, $51, $03, $18, $04
+db $10, $30, $08, $40, $92, $fe, $00, $0a, $50, $2d, $c8; Dept store spook
+
+ORG $CFC51C
+db $91, $00, $02
+
+ORG $C86DFE
+db $14, $6E, $C8
+
+ORG $CF1B8F
+db $AE, $9B, $EE
+
+ORG $EE9BAE
+db $08, $82, $90, $c6, $00, $19, $10, $01, $1b, $04, $70, $6f, $10, $1e, $6f, $10
+db $1e, $6f, $10, $13, $1f, $21, $9c, $19, $26, $00, $02; Moonside warp
+
+ORG $CFE6E9
+db $4B, $00, $01
+
+ORG $C9A08E
+db $0A, $93, $A0, $C9
+
+ORG $CFC9CE
+db $40, $00
+
+ORG $C7B550
+db $0A, $DC, $B6, $C7
+
+ORG $C7B709
+db $0A
+
+ORG $C7A9B6
+db $70, $89, $9f, $a5, $57, $a2, $95, $50, $75, $94, $a5, $91, $a2, $94, $9f, $5c
+db $10, $0f, $50, $a2, $99, $97, $98, $a4, $6f, $03, $00, $70, $79, $5c, $10, $0f
+db $50, $a5, $98, $5c, $10, $0f, $50, $98, $91, $a6, $95, $50, $91, $50, $a0, $91
+db $93, $9b, $91, $97, $95, $50, $96, $9f, $a2, $50, $a9, $9f, $a5, $5e, $5e, $5e
+db $10, $10, $50, $79, $a4, $57, $a3, $50, $a4, $98, $95, $50, $1c, $05, $ac, $50
+db $a9, $9f, $a5, $50, $9f, $a2, $94, $95, $a2, $95, $94, $5c, $10, $0f, $50, $a2
+db $99, $97, $98, $a4, $6f, $03, $00, $70, $83, $a0, $95, $93, $99, $91, $9c, $50
+db $94, $95, $9c, $99, $a6, $95, $a2, $a9, $5c, $10, $0f, $50, $9f, $a2, $50, $a3
+db $9f, $9d, $95, $a4, $98, $99, $9e, $97, $5e, $10, $10, $50, $7e, $9f, $6f, $10
+db $10, $50, $87, $95, $9c, $9c, $5c, $10, $10, $50, $a5, $98, $5e, $5e, $5e, $03
+db $00, $70, $83, $99, $9e, $93, $95, $50, $79, $57, $9d, $50, $91, $9c, $a2, $95
+db $91, $94, $a9, $50, $98, $95, $a2, $95, $5c, $10, $0f, $50, $9c, $95, $a4, $57
+db $a3, $50, $9a, $a5, $a3, $a4, $50, $a3, $91, $a9, $50, $99, $a4, $50, $99, $a3
+db $50, $a9, $9f, $a5, $5e, $03, $00, $70, $71, $98, $95, $9d, $5e, $5e, $5e, $10
+db $10, $50, $78, $95, $a2, $95, $57, $a3, $50, $a9, $9f, $a5, $a2, $50, $a0, $91
+db $93, $9b, $91, $97, $95, $5c, $50, $6C, $75, $94, $a5, $91, $a2, $94, $9f, $5e
+db $6E, $03, $1d, $00, $ff, $ac, $1b, $02, $e2, $aa, $c7, $00, $1f, $02, $74, $00
+db $10, $30, $70, $58, $1c, $02, $fe, $50, $97, $9f, $a4, $50, $a4, $98, $95, $50
+db $1c, $05, $ac, $5e, $59, $13, $18, $04, $0a, $0F, $b7, $c7, $00, $70, $7f, $98
+db $5c, $10, $0f, $50, $a9, $9f, $a5, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91
+db $a6, $95, $50, $91, $9e, $a9, $50, $a2, $9f, $9f, $9d, $50, $a4, $9f, $50, $93
+db $91, $a2, $a2, $a9, $50, $99, $a4, $5e, $10, $10, $50, $87, $95, $9c, $9c, $5c
+db $10, $0f, $50, $79, $57, $9d, $50, $9e, $9f, $a4, $50, $a4, $91, $9b, $99, $9e
+db $97, $50, $a4, $98, $99, $a3, $50, $a4, $98, $99, $9e, $97, $50, $92, $91, $93
+db $9b, $5e, $03, $0a, $E7, $B1, $EE; Moonside item NPC
+
+ORG $C7B719
+db $05, $4F, $02, $02
+
+ORG $C7B716
+db $04, $DF, $03
+
+ORG $EEB1E7
+db $01
+db $70, $79, $57, $9c, $9c, $50, $a7, $91, $99, $a4, $50, $a5, $9e, $a4, $99, $9c
+db $50, $a9, $9f, $a5, $50, $93, $91, $9e, $50, $a4, $91, $9b, $95, $50, $99, $a4
+db $5e, $10, $10, $50, $89, $95, $91, $98, $5e, $03, $18, $04, $1f, $f2, $40, $00
+db $7c, $02, $1f, $61, $04, $50, $02, $05, $4f, $02, $1f, $1f, $40, $00, $06, $1f
+db $17, $c8, $03, $5e, $02, $06, $02
+
+ORG $C374DD
+db $2E
+
+ORG $C374C4
+db $07
+
+ORG $C7B576
+db $1d, $00, $ff, $ac, $1b, $02, $df, $b5, $c7, $00, $70, $78, $95, $a2, $95, $57
+db $a3, $50, $a9, $9f, $a5, $a2, $50, $a0, $91, $93, $9b, $91, $97, $95, $5e, $00
+db $1f, $02, $74, $10, $20, $70, $58, $1c, $02, $ff, $50, $97, $9f, $a4, $50, $a4
+db $98, $95, $50, $1c, $05, $ac, $51, $59, $03, $00, $70, $7d, $a9, $50, $9a, $9f
+db $92, $50, $99, $a3, $50, $94, $9f, $9e, $95, $5e, $10, $10, $50, $79, $57, $9d
+db $50, $9f, $a5, $a4, $a4, $91, $50, $98, $95, $a2, $95, $51, $13, $05, $50, $02
+db $04, $df, $03, $18, $04, $0a, $0F, $b7, $c7, $70, $89, $9f, $a5, $50, $83, $84
+db $79, $7c, $7c, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95, $50, $95
+db $9e, $9f, $a5, $97, $98, $50, $a2, $9f, $9f, $9d, $5e, $10, $10, $50, $79, $50
+db $97, $a5, $95, $a3, $a3, $50, $a9, $9f, $a5, $50, $9d, $a5, $a3, $a4, $50, $9e
+db $9f, $a4, $50, $a7, $91, $9e, $a4, $50, $a4, $98, $99, $a3, $50, $a0, $91, $93
+db $9b, $91, $97, $95, $5e, $5e, $5e, $13, $02; Moonside item failure text
+
+ORG $CFC9D1
+db $5E, $02
+
+ORG $CFC9C2
+db $49, $00
+
+ORG $C292AB
+NOP
+NOP
+
+ORG $C7B70E
+db $02, $1f, $f2, $40, $00, $7f, $02, $1f, $61, $04, $df, $03, $05, $4f, $02, $02
+
+ORG $D5E11D
+db $00
+
+ORG $CFC43F
+db $49, $00
+
+ORG $CFC450
+db $49, $00
+
+ORG $CFC461
+db $49, $00
+
+ORG $CFC472
+db $49, $00
+
+ORG $CFC483
+db $49, $00
+
+ORG $CF60C1
+db $68
+
+ORG $CFC373
+db $49, $00, $02
+
+ORG $CFC397
+db $00
+
+ORG $C6EF20
+db $0A, $6F, $EE, $C6
+
+ORG $C6EE6F
+db $00, $08, $8a, $85, $c8, $00, $1b, $03, $83, $ee, $c6, $00, $04, $98, $02, $1f
+db $1e, $69, $03, $06, $02; Paula in Fourside
+
+ORG $CFC384
+db $98, $02
+
+ORG $CFC3D9
+db $49, $00
+
+ORG $CFC3C8
+db $49, $00
+
+ORG $CF1897
+db $49
+
+ORG $CF188D
+db $00
+
+ORG $C6EA3C
+db $E5, $02
+
+ORG $C6EA72
+db $70, $83, $9f, $50, $9d, $a5, $93, $98, $50, $9d, $99, $a3, $96, $9f, $a2, $a4
+db $a5, $9e, $95, $50, $98, $91, $a3, $50, $92, $95, $96, $91, $9c, $9c, $95, $9e
+db $50, $9d, $95, $50, $a3, $99, $9e, $93, $95, $50, $79, $50, $a4, $9f, $9f, $9b
+db $50, $a4, $98, $95, $50, $1c, $05, $32, $5e, $03, $00, $70, $79, $50, $94, $9f
+db $9e, $57, $a4, $50, $a7, $91, $9e, $a4, $50, $99, $a4, $50, $91, $9e, $a9, $9d
+db $9f, $a2, $95, $5e, $10, $10, $50, $79, $57, $9d, $50, $a2, $95, $91, $9c, $9c
+db $a9, $50, $9a, $a5, $a3, $a4, $50, $91, $50, $a2, $95, $97, $a5, $9c, $91, $a2
+db $50, $9f, $9c, $94, $50, $9d, $91, $9e, $5e, $5e, $5e, $03, $00, $70, $80, $9c
+db $95, $91, $a3, $95, $5c, $10, $0f, $50, $a4, $91, $9b, $95, $50, $a4, $98, $99
+db $a3, $50, $91, $a3, $50, $91, $9e, $50, $91, $a0, $9f, $9c, $9f, $97, $a9, $50
+db $96, $9f, $a2, $50, $91, $9e, $a9, $50, $a4, $a2, $9f, $a5, $92, $9c, $95, $50
+db $79, $57, $a6, $95, $50, $93, $91, $a5, $a3, $95, $94, $5e, $03, $00, $1d, $00
+db $ff, $32, $1b, $02, $59, $eb, $c6, $00, $1f, $02, $74, $10, $20, $70, $58, $1b
+db $04, $1c, $02, $00, $50, $97, $9f, $a4, $50, $a4, $98, $95, $50, $1c, $05, $32
+db $5e, $59, $04, $e5, $02, $13, $02, $70, $7d, $91, $a9, $92, $95, $50, $9e, $9f
+db $a4, $5e, $10, $10, $50, $79, $57, $9c, $9c, $50, $98, $9f, $9c, $94, $50, $9f
+db $9e, $a4, $9f, $50, $99, $a4, $50, $a5, $9e, $a4, $99, $9c, $50, $a9, $9f, $a5
+db $50, $98, $91, $a6, $95, $50, $a2, $9f, $9f, $9d, $50, $96, $9f, $a2, $50, $99
+db $a4, $5e, $5e, $5e, $13, $02; Monotoli item
+
+ORG $C6EE2F
+db $74, $9f, $50, $79, $50, $9c, $9f, $9f, $9b, $50, $97, $9f, $9f, $94, $50, $99
+db $9e, $50, $a4, $98, $99, $a3, $50, $98, $91, $a4, $6f, $13, $02
+
+ORG $C6D3A2
+db $C1, $D3, $C6
+
+ORG $C6D3C0
+db $12
+
+ORG $C88BEC
+db $70, $87, $95, $57, $a2, $95, $50, $98, $95, $91, $94, $95, $94, $50, $a4, $9f
+db $50, $84, $98, $a2, $95, $95, $94, $5e, $50, $76, $95, $95, $9c, $50, $96, $a2
+db $95, $95, $50, $a4, $9f, $50, $a4, $91, $97, $50, $91, $9c, $9f, $9e, $97, $51
+db $0a, $21, $8c, $c8; Runaway five text 2
+
+ORG $C88C40
+db $70, $84, $98, $91, $a4, $50, $9c, $91, $94, $a9, $50, $99, $9e, $50, $a4, $98
+db $95, $50, $9c, $9f, $92, $92, $a9, $5e, $5e, $5e, $10, $10, $50, $9e, $9f, $a7
+db $50, $a3, $98, $95, $50, $9c, $9f, $9f, $9b, $a3, $50, $9c, $99, $9b, $95, $50
+db $91, $50, $a3, $a4, $91, $a2, $51, $03, $18, $04, $1f, $ea, $b9, $00, $15, $73
+db $16, $4e, $50, $1f, $61, $1f, $f2, $ba, $00, $d9, $01, $16, $4e, $1f, $f2, $bb
+db $00, $d9, $01, $15, $73, $50, $1f, $61, $10, $e0, $04, $3d, $01, $05, $18, $02
+db $1f, $03, $04, $93, $00, $02; Rest of the runaway 5 cutscene
+
+ORG $CF674B
+db $06, $00
+
+ORG $C4FDC2
+db $03, $00, $54, $03, $88, $b0, $53, $03, $90, $98, $48, $03, $40, $D0; Venus outside door
+
+ORG $CFC14E
+db $A5, $00, $03, $5E, $02
+
+ORG $CF663D
+db $07
+
+ORG $C4FDD0
+db $02, $00, $e2, $03, $ff, $ff, $c0, $03, $e0, $e0
+
+ORG $CF17D8
+db $00, $00, $00
+
+ORG $CF776D
+db $02, $00, $b7, $03, $70, $c0, $d8, $03, $78, $48
+
+ORG $C88CA6
+db $04, $0b, $00, $1f, $41, $05, $04, $47, $00, $03, $00, $18, $04, $0a, $0a, $9c
+db $c8
+
+ORG $C89C06
+db $0A, $A6, $8C, $C8
+
+ORG $C89C96
+db $0A, $B7, $8C, $C8
+
+ORG $C88CB7
+db $07, $76, $01, $1b, $03, $c3, $8c, $c8, $00, $05, $47, $00, $1f, $15, $f3, $00
+db $c9, $00, $ff, $0a, $9d, $9c, $c8;Runaway five day bus
+
+ORG $C89CE6
+db $CF, $8C, $C8
+
+ORG $C88CCF
+db $06, $47, $00, $0a, $9d, $c8, $00, $0a, $c8, $9c, $c7
+
+ORG $C89D96
+db $18, $04, $02
+
+ORG $C99D48
+db $3B, $9D, $C9;Disable venus theater
+
+ORG $C99D4C
+db $0A, $38, $92, $C8;Runaway five theater text
+
+ORG $C89238
+db $18, $01, $01, $70, $58, $71, $50, $93, $a2, $9f, $a7, $94, $50, $9f, $96, $50
+db $9e, $9f, $99, $a3, $a9, $50, $96, $91, $9e, $a3, $50, $a0, $a2, $95, $a6, $95
+db $9e, $a4, $a3, $50, $a4, $98, $95, $50, $94, $9f, $9f, $a2, $50, $96, $a2, $9f
+db $9d, $50, $9f, $a0, $95, $9e, $99, $9e, $97, $5e, $59, $13, $18, $04, $02; Runaway five theater text
+
+ORG $CF19EC
+db $D6, $00
+
+ORG $C6D5AE
+db $70, $84, $98, $91, $9e, $9b, $a3, $50, $96, $9f, $a2, $50, $9b, $99, $93, $9b
+db $99, $9e, $97, $50, $a4, $98, $9f, $a3, $95, $50, $93, $98, $a5, $9d, $a0, $a3
+db $5e, $10, $0f, $5e, $10, $0f, $5e, $10, $0f, $50, $79, $50, $9d, $95, $91, $9e
+db $5c, $10, $10, $50, $a4, $98, $95, $50, $82, $a5, $9e, $91, $a7, $91, $a9, $50
+db $76, $99, $a6, $95, $50, $9f, $a5, $a4, $a4, $91, $50, $98, $95, $a2, $95, $5e
+db $03, $00, $70, $7e, $9f, $a7, $50, $79, $57, $9d, $50, $96, $a2, $95, $95, $50
+db $a4, $9f, $50, $a3, $a4, $91, $a2, $a4, $50, $9d, $a9, $50, $a3, $9f, $9c, $9f
+db $50, $93, $91, $a2, $95, $95, $a2, $5e, $10, $14, $50, $87, $98, $a9, $50, $94
+db $9f, $9e, $57, $a4, $50, $a9, $9f, $a5, $50, $a4, $91, $9b, $95, $50, $a4, $98
+db $99, $a3, $50, $1c, $05, $11, $50, $91, $a3, $50, $91, $50, $97, $99, $96, $a4
+db $6f, $03, $01, $70, $79, $a4, $57, $a3, $50, $a3, $99, $97, $9e, $95, $94, $5c
+db $10, $0f, $50, $95, $a6, $95, $9e, $5e, $03, $1d, $00, $ff, $03, $0a, $77, $92
+db $c8
+
+ORG $C89277
+db $1b, $03, $c2, $92, $c8, $00, $01, $70, $84, $9f, $9f, $50, $92, $91, $94, $5e
+db $10, $0f, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99
+db $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $9a, $a5, $9e, $9b
+db $5e, $10, $0f, $50, $77, $95, $a4, $50, $a2, $99, $94, $50, $9f, $96, $50, $a3
+db $9f, $9d, $95, $a4, $98, $99, $9e, $97, $51, $13, $02, $00, $1f, $02, $74, $10
+db $20, $70, $58, $1b, $04, $1c, $02, $00, $50, $97, $9f, $a4, $50, $a4, $98, $95
+db $50, $1c, $05, $11, $5e, $59, $03, $04, $8c, $00, $05, $93, $00, $70, $87, $95
+db $9c, $9c, $5c, $10, $0a, $50, $79, $57, $9d, $50, $9f, $9e, $5e, $10, $10, $50
+db $83, $95, $95, $50, $a9, $9f, $a5, $50, $91, $a2, $9f, $a5, $9e, $94, $51, $03
+db $18, $04, $1f, $16, $48, $03, $01, $1f, $02, $08, $10, $0a, $1f, $1e, $48, $03
+db $01, $1f, $02, $09, $02; Venus text
+
+ORG $CFC153
+db $93, $00, $02
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $EF95E9
+db $83, $9f, $9d, $95, $92, $9f, $94, $a9, $50, $9c, $95, $96, $a4, $50, $a4, $98
+db $99, $a3, $50, $1c, $05, $11, $50, $99, $9e, $50, $98, $95, $a2, $95, $5e, $10
+db $0f, $50, $7d, $91, $a9, $92, $95, $50, $99, $a4, $50, $a7, $99, $9c, $9c, $50
+db $98, $95, $9c, $a0, $50, $a9, $9f, $a5, $5e, $03, $0a, $58, $96, $ef
+
+ORG $EF969D
+db $0A, $1C, $93, $C8
+
+ORG $C8931C
+db $95, $50, $a9, $9f, $a5, $50, $96, $99, $9e, $94, $50, $a4, $98, $95, $50, $9b
+db $95, $a9, $5e, $03, $0a, $ae, $96, $ef
+
+ORG $EF96CC
+db $02; Paula text script
+
+ORG $EF952F
+db $EC, $03, $29, $96, $C7
+
+ORG $C7961A
+db $0A, $08, $AF, $EE, $00, $18, $01, $01, $06, $56, $00
+dd CabinPostItemRescue
+db $70
+db $72, $a9, $50, $a4, $98, $95, $50, $a7, $91, $a9, $5c, $10, $0a, $50, $79, $50
+db $96, $9f, $a5, $9e, $94, $50, $a4, $98, $99, $a3, $1c, $05, $11, $50, $98, $95
+db $a2, $95, $5e, $10, $0f, $0A, $34, $AF, $EE, $34, $AF, $EE, $1b, $02, $34, $93
+db $c8, $00, $10, $0f, $50, $79, $57, $94, $50, $9c, $99, $9b, $0A
+dl CabinTextFixNew
+
+ORG $C796BB
+db $02; End Paula
+
+ORG $CF09E7
+db $49; Always enable happy-happy building
+
+ORG $C98A64
+db $0A, $34, $93, $C8
+
+ORG $C89334
+db $06, $e0, $03, $44, $93, $c8, $ff, $16, $1a, $a2, $15, $94, $0a, $69, $8a, $c9
+db $70, $84, $98, $91, $9e, $9b, $50, $a9, $9f, $a5, $50, $96, $9f, $a2, $50, $a9
+db $9f, $a5, $a2, $50, $97, $95, $9e, $95, $a2, $9f, $a3, $99, $a4, $a9, $5e, $13
+db $02, $04, $e0, $03, $0a, $7a, $90, $c7
+
+ORG $C98AAE
+db $65, $93, $C8
+
+ORG $C98B1F
+db $0A, $6C, $93, $C8
+
+ORG $C8936C
+db $06, $e0, $03, $dc, $93, $c8, $ff, $5e, $10, $0f, $50, $79, $57, $94, $50, $9c
+db $99, $9b, $95, $50, $a4, $9f, $50, $97, $99, $a6, $95, $50, $a9, $9f, $a5, $50
+db $a4, $98, $99, $a3, $50, $a3, $9f, $a5, $a6, $95, $9e, $99, $a2, $50, $9f, $96
+db $50, $9f, $a5, $a2, $50, $a6, $99, $9c, $9c, $91, $97, $95, $5e, $03, $1d, $03
+db $ff, $1b, $02, $e1, $93, $c8, $ff, $1d, $0e, $ff, $11, $08, $cf, $dc, $c7, $ff
+db $0a, $d5, $93, $c8, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $e0, $03, $13, $18, $04, $02
+db $5e, $13, $18, $04, $02, $70, $89, $9f, $a5, $57, $a2, $95, $50, $93, $91, $a2
+db $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3
+db $a4, $a5, $96, $96, $5e, $13, $18, $04, $02, $05; Donations text
+
+ORG $C98207
+db $70, $78, $95, $a2, $95, $57, $a3, $50, $91, $50, $a3, $a9, $9d, $92, $9f, $9c
+db $50, $9f, $96, $50, $9d, $a9, $50, $a2, $95, $9d, $9f, $a2, $a3, $95, $5e, $10
+db $0f, $01, $50, $50, $84, $91, $9b, $95, $50, $99, $a4, $50, $91, $9e, $94, $50
+db $97, $9f, $5e, $0a, $46, $82, $c9; Carpainter text
+
+ORG $C9A143
+db $49
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $CF068E
+db $49
+
+ORG $C99ACC
+db $02
+
+ORG $C799D7
+db $0A, $DD, $99, $C7
+
+ORG $C79A5E
+db $0A, $05, $94, $C8
+
+ORG $C89405
+db $05, $06, $00, $1f, $61, $05, $18, $02, $1f, $03, $02; Runaway five stuff
+
+ORG $C79BEC
+db $0A, $10, $94, $C8
+
+ORG $C89410
+db $04, $0b, $00, $70, $7f, $17, $34, $0a, $f0, $9b, $c7; Bus enemy flag
+
+ORG $C79C7A
+db $CF, $8C, $C8; Bus direct
+
+ORG $C95C0E
+db $0A, $1B, $94, $C8
+
+ORG $C95C66
+db $0A, $E4, $9C, $EE; Everdred flag
+
+ORG $C8941B
+db $06, $42, $00, $F0, $9C, $EE, $00, $0a, $2a, $5c, $c9, $19, $10, $01, $0b, $02
+db $1b, $03, $44, $94, $c8, $00, $19, $10, $02, $0b, $02, $1b, $03, $86, $94, $c8
+db $00, $17, $fe, $91, $98, $0a, $de, $5c, $c9, $70, $84, $98, $91, $a4, $50, $9d
+db $a5, $a3, $a4, $50, $92, $95, $50, $a7, $98, $a9, $50, $a9, $9f, $a5, $50, $a2
+db $95, $a3, $93, $a5, $95, $94, $50, $a9, $9f, $a5, $a2, $a3, $95, $9c, $96, $5e
+db $10, $0f, $50, $87, $98, $a9, $50, $94, $9f, $9e, $57, $a4, $50, $a9, $9f, $a5
+db $50, $93, $9f, $9d, $95, $50, $99, $9e, $6f, $13, $02, $0a, $40, $9C, $EE
+
+ORG $C95CDA
+db $0A, $26, $94, $C8
+
+ORG $C95CFC
+db $79, $50, $98, $95, $91, $a2, $50, $a3, $98, $95, $57, $a3, $50, $9e, $9f, $a4
+db $50, $91, $a2, $9f, $a5, $9e, $94, $50, $98, $95, $a2, $95, $5c, $10, $0a, $50
+db $a4, $98, $9f, $a5, $97, $98, $5e, $0a, $9c, $5d, $c9
+
+ORG $EE9C40
+db $08, $7f, $dc, $c7, $00, $1b, $03, $87, $9C, $EE, $00, $70, $84, $98, $91, $a4
+db $50, $9d, $a5, $a3, $a4, $50, $92, $95, $50, $a7, $98, $a9, $50, $a3, $98, $95
+db $57, $a3, $50, $a7, $99, $a4, $98, $50, $a9, $9f, $a5, $5e, $10, $0f, $50, $87
+db $98, $a9, $50, $94, $9f, $9e, $57, $a4, $50, $a9, $9f, $a5, $50, $93, $9f, $9d
+db $95, $50, $99, $9e, $6f, $13, $02, $70, $79, $50, $98, $95, $91, $a2, $94, $50
+db $a3, $9f, $9d, $95, $92, $9f, $94, $a9, $50, $a2, $95, $a3, $93, $a5, $95, $94
+db $50, $98, $95, $a2, $5e, $10, $0f, $50, $83, $98, $95, $57, $a3, $50, $9e, $9f
+db $a4, $50, $a7, $99, $a4, $98, $50, $a9, $9f, $a5, $5c, $10, $0a, $50, $99, $a3
+db $50, $a3, $98, $95, $6f, $03, $00, $70, $73, $9f, $9d, $95, $50, $92, $91, $93
+db $9b, $50, $99, $96, $50, $a9, $9f, $a5, $50, $96, $99, $9e, $94, $50, $98, $95
+db $a2, $5e, $13, $02, $18, $01, $01, $17, $fe, $04, $42, $00, $0a, $6b, $5c, $c9
+db $06, $55, $00, $d7, $60, $c9, $00, $06, $e1, $03, $02, $9D, $EE, $ff, $0a, $c6
+db $5d, $c9, $19, $10, $01, $0b, $02, $1b, $03, $1C, $9D, $EE, $ff, $19, $10, $02
+db $0b, $02, $1b, $03, $42, $9D, $EE, $ff, $0a, $a5, $5e, $c9, $70, $79, $a4, $57
+db $a3, $50, $97, $9f, $9f, $94, $50, $a4, $9f, $50, $a3, $95, $95, $50, $a9, $9f
+db $a5, $5c, $10, $0a, $50, $1c, $02, $02, $5e, $10, $0f, $00, $50, $50, $0a, $18
+db $5f, $c9, $0a, $0a, $5f, $c9; Everdred item text
+
+ORG $C95F9E
+db $91, $50, $1c, $05, $11, $5e, $0a, $ab, $5f, $c9
+
+ORG $C818D4
+db $04, $2A, $00, $02; Apple kid mouse
+
+ORG $C7916C
+db $02
+
+ORG $CF083B
+db $00, $00
+
+ORG $C818BF
+db $0A, $46, $9D, $EE
+
+ORG $EE9D46
+db $50, $79, $57, $9d, $50, $a7, $9f, $a2, $9b, $99, $9e, $97, $50, $9f, $9e, $50
+db $a4, $98, $99, $a3, $50, $93, $9f, $9f, $9c, $50, $99, $9e, $a6, $95, $9e, $a4
+db $99, $9f, $9e, $50, $a4, $98, $91, $a4, $50, $9c, $95, $a4, $a3, $50, $a9, $9f
+db $a5, $50, $a0, $9c, $91, $a9, $50, $a6, $99, $94, $95, $9f, $50, $97, $91, $9d
+db $95, $a3, $5c, $03, $50, $00, $70, $95, $a8, $93, $95, $a0, $a4, $50, $a4, $98
+db $95, $50, $99, $a4, $95, $9d, $a3, $50, $91, $a2, $95, $50, $99, $9e, $50, $a2
+db $91, $9e, $94, $9f, $9d, $50, $a0, $9c, $91, $93, $95, $a3, $5e, $10, $15, $01
+db $50, $50, $89, $9f, $a5, $50, $93, $91, $9e, $50, $95, $a6, $95, $9e, $50, $a0
+db $9c, $91, $a9, $50, $99, $a4, $50, $a7, $99, $a4, $98, $50, $9f, $a4, $98, $95
+db $a2, $50, $a0, $95, $9f, $a0, $9c, $95, $50, $9f, $a2, $50, $97, $91, $9d, $95
+db $a3, $5e, $03, $00, $70, $79, $57, $9d, $50, $93, $91, $9c, $9c, $99, $9e, $97
+db $50, $99, $a4, $50, $10, $0a, $6C, $79, $a3, $9c, $91, $9e, $94, $a3, $6E, $5e
+db $10, $0a, $50, $87, $91, $9e, $9e, $91, $50, $a4, $a2, $a9, $50, $99, $a4, $5e
+db $5e, $5e, $6f, $10, $10, $50, $7e, $9f, $5c, $50, $79, $50, $97, $a5, $95, $a3
+db $a3, $50, $9e, $9f, $a4, $5e, $03, $01, $70, $87, $95, $9c, $9c, $5c, $50, $79
+db $57, $9c, $9c, $50, $92, $95, $50, $9f, $a6, $95, $a2, $50, $91, $a4, $50, $72
+db $a5, $a2, $97, $9c, $99, $9e, $50, $80, $91, $a2, $9b, $50, $99, $96, $50, $a9
+db $9f, $a5, $50, $9e, $95, $95, $94, $50, $9d, $95, $5e, $10, $0f, $50, $72, $a9
+db $50, $a4, $98, $95, $50, $a7, $91, $a9, $5c, $10, $0a, $50, $a9, $9f, $a5, $50
+db $a3, $98, $9f, $a5, $9c, $94, $50, $93, $98, $95, $93, $9b, $50, $9f, $a5, $a4
+db $50, $a4, $98, $95, $50, $9d, $9f, $a5, $a3, $95, $5e, $10, $10, $50, $78, $95
+db $50, $9c, $9f, $9f, $9b, $a3, $50, $9c, $99, $9b, $95, $50, $98, $95, $50, $a7
+db $91, $9e, $a4, $a3, $50, $a4, $9f, $50, $97, $99, $a6, $95, $50, $a9, $9f, $a5
+db $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $5e, $13, $04, $2a, $00, $04
+db $70, $00, $02; Apple Kid text
+
+ORG $CF809F
+db $69, $01, $d0, $60
+
+ORG $CF8091
+db $04
+
+ORG $CF9828
+db $00
+
+ORG $C804EE
+db $E1, $03
+;;;;;;;;;;;;;;;;;;;;;;
+ORG $C87E3F
+db $D1
+
+ORG $CF6C1B
+db $04
+
+ORG $CF6D1F
+db $00
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $CFB9D2
+db $74, $01, $01
+
+ORG $CFB9E3
+db $74, $01, $01
+
+ORG $CFBAC0
+db $E3, $03, $01; Phase Distorter 2
+
+;ORG $CFBABE
+;db $1F; Always make the Phase Distorter enterable
+
+ORG $C7F182
+db $84, $98, $95, $50, $80, $98, $91, $a3, $95, $50, $74, $99, $a3, $a4, $9f, $a2
+db $a4, $95, $a2, $50, $62, $50, $99, $a3, $50, $9e, $95, $91, $a2, $9c, $a9, $50
+db $93, $9f, $9d, $a0, $9c, $95, $a4, $95, $5e, $10, $0f, $50, $89, $9f, $a5, $50
+db $93, $91, $9e, $50, $a4, $a2, $a9, $50, $a4, $9f, $50, $a5, $a3, $95, $50, $99
+db $a4, $5c, $10, $0a, $50, $92, $a5, $a4, $50, $79, $50, $94, $9f, $a5, $92, $a4
+db $50, $99, $a4, $50, $a7, $99, $9c, $9c, $50, $a7, $9f, $a2, $9b, $50, $99, $9e
+db $50, $a4, $98, $99, $a3, $50, $a3, $a4, $91, $a4, $95, $5e, $5e, $5e, $03, $00
+db $70, $79, $96, $50, $9f, $9e, $9c, $a9, $50, $a7, $95, $50, $98, $91, $94, $50
+db $a3, $9f, $9d, $95, $50, $8a, $95, $a8, $9f, $9e, $a9, $a4, $95, $5e, $5e, $5e
+db $13, $1f, $f1, $e5, $02, $1f, $01, $02; Andonutes Text 1
+
+ORG $C9B94E
+db $78, $9d, $9d, $9d, $5e, $5e, $5e, $50, $79, $50, $94, $99, $94, $9e, $57, $a4
+db $50, $a4, $98, $99, $9e, $9b, $50, $99, $a4, $50, $a7, $9f, $a5, $9c, $94, $50
+db $a7, $9f, $a2, $9b, $5e, $5e, $5e, $03, $00, $70, $79, $96, $50, $9f, $9e, $9c
+db $a9, $50, $a7, $95, $50, $98, $91, $94, $50, $91, $50, $a0, $99, $95, $93, $95
+db $50, $9f, $96, $50, $91, $50, $9d, $95, $a4, $95, $9f, $a2, $99, $a4, $95, $5c
+db $10, $0a, $50, $79, $50, $93, $9f, $a5, $9c, $94, $50, $a3, $a9, $9e, $a4, $98
+db $95, $a3, $99, $aa, $95, $50, $a4, $98, $95, $50, $8a, $95, $a8, $9f, $9e, $a9
+db $a4, $95, $50, $9e, $95, $95, $94, $95, $94, $50, $a4, $9f, $50, $93, $9f, $9d
+db $a0, $9c, $95, $a4, $95, $50, $99, $a4, $5e, $13, $18, $04, $04, $E3, $03, $02; Andonuts Text 2
+
+ORG $C7F17B
+db $E3, $03; Andonuts Text 3 flag
+
+ORG $C7F3F4
+db $04, $85, $00, $1f, $f1, $e5, $02, $1f, $01, $04, $7E, $01, $04, $47, $01, $04
+db $4A, $01, $04, $4B, $01, $04, $49, $01, $02
+
+ORG $C6306B
+db $0A, $C9, $9E, $EE
+
+ORG $EE9EC9
+db $19, $02, $73, $91, $9c, $9c, $02, $19, $02, $87, $91, $a2, $a0, $02, $1c, $07
+db $03, $11, $09, $03, $e1, $15, $c9, $00, $a8, $30, $c6, $00, $ea, $9e, $ee, $00
+db $02, $18, $04, $04, $07, $03, $1f, $17, $00, $00, $b8, $01, $01, $04, $e3, $03
+db $05, $4c, $01, $1f, $eb, $ff, $06, $04, $f8, $02, $1f, $03, $1f, $1e, $fa, $04
+db $09, $10, $b4, $1f, $21, $e5, $1f, $e5, $ff, $15, $73, $16, $3e, $10, $64, $1f
+db $17, $e5, $02, $B9, $01, $04, $10, $50, $08, $6b, $dd, $c7, $00, $05, $f8, $02
+db $1f, $03, $1f, $ec, $ff, $01, $1f, $15, $6a, $00, $52, $01, $01, $08, $b8, $b4
+db $c9, $00, $19, $26, $01, $1f, $66, $01, $07, $3c, $bc, $c9, $00, $1f, $66, $02
+db $29, $17, $59, $ef, $00, $05, $e3, $03, $1E, $01, $e5, $02, $f1, $01, $02; Phase Distorter 2 Menu
+
+ORG $C33595
+db $06, $02, $19, $AA, $A2
+
+ORG $C9BBD6
+db $00, $00, $00, $00
+
+ORG $C9BBDB
+db $1f, $15, $6a, $00, $50, $01, $01, $50, $50, $08, $b8, $b4, $c9, $00, $1f, $eb
+db $ff, $06, $04, $f8, $02, $1f, $03, $1f, $1e, $e5, $02, $09, $10, $b4, $1f, $21
+db $5e, $1f, $e5, $ff, $15, $73, $16, $3e, $10, $64, $1f, $17, $fa, $04, $51, $01
+db $04, $10, $50, $08, $6b, $dd, $c7, $00, $05, $f8, $02, $1f, $03, $1f, $ec, $ff
+db $01, $1f, $15, $6a, $00, $52, $01, $01, $08, $b8, $b4, $c9
+
+ORG $C9BC28
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+ORG $D5F2D3
+db $30, $00, $B6
+
+ORG $CFBAC3
+;db $6D, $FE, $C4; Valley phase distorter
+
+ORG $CF6253
+db $08, $00
+
+ORG $CFE102
+db $00
+
+ORG $CFE103
+dd StarMasterText
+
+ORG $CFE0FB
+db $62, $00, $03
+
+ORG $C76F96
+
+ORG $C9BD69
+db $70, $77, $9f, $9f, $94, $50, $9e, $95, $a7, $a3, $5c, $10, $0a, $50, $95, $a6
+db $95, $a2, $a9, $9f, $9e, $95, $51, $03, $00, $70, $79, $57, $a6, $95, $50, $9a
+db $a5, $a3, $a4, $50, $96, $99, $9e, $99, $a3, $98, $95, $94, $50, $9d, $a9, $50
+db $9c, $91, $a4, $95, $a3, $a4, $50, $99, $9e, $a6, $95, $9e, $a4, $99, $9f, $9e
+db $5c, $10, $0a, $50, $a4, $98, $95, $50, $80, $98, $91, $a3, $95, $50, $74, $99
+db $a3, $a4, $9f, $a2, $a4, $95, $a2, $50, $63, $5e, $03, $00, $70, $85, $a3, $99
+db $9e, $97, $50, $a4, $98, $95, $50, $80, $98, $91, $a3, $95, $50, $74, $99, $a3
+db $a4, $9f, $a2, $a4, $95, $a2, $50, $63, $5c, $10, $0a, $50, $a9, $9f, $a5, $57
+db $9c, $9c, $50, $92, $95, $50, $91, $92, $9c, $95, $50, $a4, $9f, $50, $a4, $a2
+db $91, $a6, $95, $9c, $50, $99, $9e, $a4, $9f, $50, $a4, $98, $95, $50, $a0, $91
+db $a3, $a4, $50, $a4, $9f, $50, $93, $9f, $9e, $96, $a2, $9f, $9e, $a4, $50, $a4
+db $98, $95, $50, $a5, $9c, $a4, $99, $9d, $91, $a4, $95, $50, $95, $a6, $99, $9c
+db $5e, $03, $00, $70, $85, $9e, $96, $9f, $a2, $a4, $a5, $9e, $91, $a4, $95, $9c
+db $a9, $5c, $10, $0a, $50, $99, $a4, $50, $93, $91, $9e, $50, $9f, $9e, $9c, $a9
+db $50, $92, $95, $50, $a5, $a3, $95, $94, $50, $92, $a9, $50, $a3, $9f, $9d, $95
+db $9f, $9e, $95, $50, $a7, $98, $9f, $50, $98, $91, $a3, $50, $91, $92, $a3, $9f
+db $a2, $92, $95, $94, $50, $a4, $98, $95, $50, $a0, $9f, $a7, $95, $a2, $50, $9f
+db $96, $50, $a4, $98, $95, $50, $75, $91, $a2, $a4, $98, $50, $99, $9e, $a4, $9f
+db $50, $a4, $98, $95, $99, $a2, $50, $98, $95, $91, $a2, $a4, $5e, $03, $06, $d6
+db $03, $c5, $be, $c9, $ff, $00, $70, $7f, $98, $5c, $10, $0a, $50, $99, $96, $50
+db $9f, $9e, $9c, $a9, $50, $79, $50, $a7, $95, $a2, $95, $50, $a3, $a4, $99, $9c
+db $9c, $50, $a9, $9f, $a5, $9e, $97, $5e, $5e, $5e, $13, $02, $00, $70, $87, $98
+db $91, $6f, $10, $0f, $50, $89, $9f, $a5, $50, $a3, $91, $a9, $50, $a9, $9f, $a5
+db $50, $91, $9c, $a2, $95, $91, $94, $a9, $50, $98, $91, $a6, $95, $6f, $03, $00
+db $70, $87, $95, $9c, $9c, $5c, $10, $0a, $50, $a4, $98, $95, $9e, $5c, $10, $05
+db $50, $9c, $95, $a4, $57, $a3, $50, $97, $95, $a4, $50, $a3, $a4, $91, $a2, $a4
+db $95, $94, $51, $03, $0a, $32, $c0, $c9
+
+ORG $C8886A
+db $0A, $5A, $9F, $EE;Belch Base
+
+ORG $EE9F5A
+db $70, $89, $9f, $a5, $50, $97, $9f, $a4, $50, $a4, $98, $95, $50, $97, $9f, $9f
+db $94, $a3, $6f, $03, $00, $1d, $05, $ff, $69, $1b, $03, $f5, $9f, $ee, $ff, $70
+db $7e, $9f, $6f, $10, $0f, $50, $74, $9f, $50, $a9, $9f, $a5, $50, $a4, $98, $99
+db $9e, $9b, $50, $a7, $95, $57, $a2, $95, $50, $a3, $a4, $a5, $a0, $99, $94, $50
+db $95, $9e, $9f, $a5, $97, $98, $50, $a4, $9f, $50, $9c, $95, $a4, $50, $a3, $9f
+db $9d, $95, $50, $a0, $a5, $9e, $9b, $50, $99, $9e, $5c, $10, $07, $50, $9a, $a5
+db $a3, $a4, $50, $96, $9f, $a2, $50, $a7, $91, $99, $a4, $99, $9e, $97, $50, $63
+db $50, $9d, $99, $9e, $a5, $a4, $95, $a3, $6f, $03, $00, $70, $77, $99, $a6, $95
+db $50, $a5, $a3, $50, $76, $9c, $a9, $50, $78, $9f, $9e, $95, $a9, $50, $9f, $a2
+db $50, $92, $95, $91, $a4, $50, $99, $a4, $51, $13, $02, $10, $0f, $18, $04, $1f
+db $02, $76, $18, $01, $01, $19, $10, $01, $1b, $04, $70, $58, $1c, $02, $00, $50
+db $98, $91, $9e, $94, $95, $94, $50, $9f, $a6, $95, $a2, $50, $a4, $98, $95, $50
+db $1c, $05, $69, $5e, $59, $03, $00, $70, $7f, $9b, $91, $a9, $5e, $10, $0f, $50
+db $89, $9f, $a5, $50, $93, $91, $9e, $50, $93, $9f, $9d, $95, $50, $99, $9e, $5e
+db $03, $1d, $01, $ff, $69, $0a, $9f, $88, $c8
+
+ORG $C9AA92
+db $49
+
+ORG $EF617B
+db $0A, $43, $A0, $EE
+
+ORG $EEA043
+db $18, $01, $01, $70, $74, $99, $94, $50, $a9, $9f, $a5, $50, $92, $a2, $99, $9e
+db $97, $50, $a4, $98, $95, $50, $6C, $1C, $05, $01, $0a, $64, $a0, $ee, $00, $00
+db $00, $6E, $6f, $03, $00, $70, $79, $a4, $57, $a3, $50, $a4, $98, $95, $50, $a0
+db $95, $a2, $96, $95, $93, $a4, $50, $a3, $9e, $91, $93, $9b, $50, $96, $9f, $a2
+db $50, $a0, $9c, $9f, $a4, $a4, $99, $9e, $97, $50, $a7, $9f, $a2, $9c, $94, $50
+db $94, $9f, $9d, $99, $9e, $91, $a4, $99, $9f, $9e, $5e, $03, $00, $0a, $b0, $61
+db $ef
+
+ORG $EF61F6
+db $D3
+
+ORG $C27F5C
+db $00
+
+ORG $C27F60
+db $00
+
+ORG $EF65ED
+db $70, $84, $98, $95, $50, $97, $98, $9f, $a3, $a4, $a3, $50, $91, $a2, $9f, $a5
+db $9e, $94, $50, $84, $98, $a2, $95, $95, $94, $50, $a7, $99, $9c, $9c, $50, $a6
+db $91, $9e, $99, $a3, $98, $5e, $0a, $18, $66, $ef; Belch text
+
+ORG $C7EE67
+db $0A, $F8, $F9, $C7
+
+ORG $C7F9F8
+db $06, $e6, $03, $35, $fa, $c7, $00, $1f, $02, $44, $10, $20, $18, $01, $01, $70
+db $58, $87, $9f, $a7, $51, $10, $0f, $50, $84, $98, $91, $a4, $57, $a3, $50, $91
+db $50, $a3, $a4, $a2, $9f, $9e, $97, $50, $91, $96, $a4, $95, $a2, $a4, $91, $a3
+db $95, $5e, $5e, $5e, $59, $03, $0A, $E2, $AF, $EE, $71, $92, $ee, $1f, $02, $44
+db $10, $20, $18, $01, $01, $70, $58, $89, $9f, $a5, $57, $a6, $95, $50, $97, $9f
+db $a4, $a4, $95, $9e, $50, $a5, $a3, $95, $94, $50, $a4, $9f, $50, $99, $a4, $5e
+db $59, $13, $02; Saturn coffee
+
+ORG $CF66ED
+db $00, $00; Milky well npcs
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C9C6B8
+db $0A, $A4, $A0, $EE
+
+ORG $EEA0A4
+db $1d, $05, $ff, $d3, $1b, $03, $aF, $a0, $ee, $ff, $02, $1f, $1a, $03, $05, $03
+db $0a, $bd, $c6, $c9; Tenda Gate
+
+ORG $D57041
+db $2F; Tendakraut storage
+
+ORG $CFDFD1
+db $B8, $A0, $EE
+
+ORG $EEA0B8
+db $1d, $05, $ff, $d3, $1b, $03, $cd, $c6, $c9, $ff, $0a, $9e, $c5, $c7
+
+ORG $C9DE1C
+db $0A, $27, $DE, $C9
+
+ORG $C9DEA0
+db $70, $79, $50, $93, $91, $9e, $57, $a4, $50, $91, $93, $a4, $a5, $91, $9c, $9c
+db $a9, $50, $a4, $91, $9c, $9b, $5e, $03, $00, $70, $82, $9f, $93, $9b, $a3, $50
+db $93, $91, $9e, $57, $a4, $50, $a4, $91, $9c, $9b, $5c, $10, $09, $50, $a7, $95
+db $99, $a2, $94, $9f, $5e, $03, $18, $04, $10, $20, $04, $a7, $01, $0a, $4f, $94
+db $ee; Talking rock text
+
+ORG $C9B0C4
+db $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $D586E0
+db $39, $90, $C2;Skip the party add when beating master barf
+
+ORG $EF7415
+db $0A, $E0, $A0, $EE
+
+ORG $EEA0E0
+db $00, $08, $c8, $f8, $d6, $00, $14, $08, $26, $fa, $d6, $ff, $04, $e7, $03, $1F
+db $17, $22, $05, $5E, $02, $01, $02
+
+ORG $EEC2E0
+db $70, $83, $a5, $94, $94, $95, $9e, $9c, $a9, $5c, $50, $1c, $02, $02, $50, $91
+db $a0, $a0, $95, $91, $a2, $95, $94, $51, $03, $02, $70, $76, $a2, $9f, $9d, $50
+db $a4, $98, $95, $50, $a3, $9b, $a9, $5c, $50, $1c, $02, $03, $50, $91, $a0, $a0
+db $95, $91, $a2, $95, $94, $51, $02, $70, $83, $a5, $94, $94, $95, $9e, $9c, $a9
+db $5c, $50, $1c, $02, $0b, $50, $9d, $91, $a4, $95, $a2, $99, $91, $9c, $99, $aa
+db $95, $94, $51, $02, $70, $1c, $05, $02, $50, $a2, $9f, $a3, $95, $50, $96, $a2
+db $9f, $9d, $50, $a4, $98, $95, $50, $a3, $a7, $91, $9d, $a0, $51, $02, $70, $1c
+db $05, $03, $50, $94, $91, $a3, $98, $95, $94, $50, $96, $a2, $9f, $9d, $50, $a4
+db $98, $95, $50, $a4, $a2, $95, $95, $a3, $51, $02, $70, $83, $a5, $94, $94, $95
+db $9e, $9c, $a9, $5c, $50, $91, $50, $7d, $91, $93, $98, $50, $80, $99, $aa, $aa
+db $91, $50, $94, $95, $9c, $99, $a6, $95, $a2, $a9, $50, $9d, $91, $9e, $50, $91
+db $a2, $a2, $99, $a6, $95, $94, $51, $02, $70, $83, $a5, $94, $94, $95, $9e, $9c
+db $a9, $5c, $50, $91, $50, $83, $a4, $91, $a2, $50, $7d, $91, $a3, $a4, $95, $a2
+db $50, $a3, $a7, $9f, $9f, $a0, $95, $94, $50, $99, $9e, $51, $02, $70, $1c, $02
+db $02, $50, $a0, $a2, $91, $a9, $95, $94, $50, $96, $a2, $9f, $9d, $50, $a4, $98
+db $95, $50, $92, $9f, $a4, $a4, $9f, $9d, $50, $9f, $96, $50, $98, $95, $a2, $50
+db $98, $95, $91, $a2, $a4, $51, $1f, $02, $1c, $14, $00, $70, $1C, $0E, $0A, $F7
+db $C3, $EE, $50, $72, $91, $a2, $96, $50, $a3, $91, $9e, $9b, $50, $99, $9e, $a4
+db $9f, $50, $a4, $98, $95, $50, $a3, $a7, $91, $9d, $a0, $51, $10, $20, $02, $00
+db $70, $1c, $02, $03, $50, $96, $99, $a2, $95, $94, $50, $a4, $98, $95, $50, $85
+db $9c, $a4, $a2, $91, $50, $7d, $95, $97, $91, $50, $72, $91, $aa, $9f, $9f, $9b
+db $91, $51, $1f, $02, $4a, $10, $10, $1f, $02, $1f, $10, $30, $02, $00, $08, $3b
+db $74, $ef, $ff, $70, $1f, $02, $37, $1c, $02, $04, $50, $a4, $a2, $99, $95, $94
+db $50, $01, $50, $50, $1c, $12, $15, $51, $08, $82, $88, $ef, $ff, $02, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $02, $00, $70, $1c, $02, $0b, $50, $94, $99, $94, $50, $91, $50
+db $9d, $91, $93, $98, $9f, $50, $93, $9f, $9d, $92, $9f, $50, $9b, $99, $93, $9b
+db $51, $14, $02, $00, $70, $84, $98, $95, $50, $a0, $99, $aa, $aa, $91, $50, $97
+db $a5, $a9, $50, $a4, $98, $a2, $95, $a7, $50, $a3, $93, $91, $9c, $94, $99, $9e
+db $97, $50, $98, $9f, $a4, $50, $a0, $99, $aa, $aa, $91, $50, $91, $a4, $50, $1C
+db $0D, $0A, $EA, $C4, $EE, $50, $72, $91, $a2, $96, $51, $1f, $02, $11, $10, $30
+db $1f, $02, $2f, $10, $20, $02, $00, $70, $83, $a4, $91, $a2, $50, $7d, $91, $a3
+db $a4, $95, $a2, $50, $a4, $a2, $99, $95, $94, $50, $1c, $12, $16, $51, $1f, $02
+db $37, $10, $10, $08, $b8, $88, $ef, $ff, $02, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00; Master Barf defeat text
+
+ORG $CF694D
+db $09, $00
+
+ORG $C4FE80
+db $02, $00, $cd, $04, $b8, $e0, $22, $05, $a0, $c0;Barf NPC
+
+ORG $CFE0C8
+db $00, $00, $02
+
+ORG $CFE0CD
+db $E7, $03, $02, $00, $A1, $EE
+
+ORG $C9E746
+db $7A, $FA, $D6
+
+ORG $D6FA7A
+db $1F, $15, $00, $00, $BA, $01, $01, $0A, $70, $85, $C6
+
+ORG $EEA100
+db $70, $7f, $98, $5c, $10, $0a, $50, $98, $95, $a9, $5e, $10, $0f, $50, $79, $50
+db $93, $91, $9d, $95, $50, $92, $95, $93, $91, $a5, $a3, $95, $50, $99, $a4, $50
+db $9c, $9f, $9f, $9b, $95, $94, $50, $9c, $99, $9b, $95, $50, $a9, $9f, $a5, $50
+db $a7, $95, $a2, $95, $50, $99, $9e, $50, $91, $50, $a2, $9f, $a5, $97, $98, $50
+db $a3, $a0, $9f, $a4, $5e, $03, $00, $08, $8a, $85, $c8, $ff, $1b, $03, $5d, $a1
+db $ee, $ff, $05, $e7, $03, $04, $e8, $03, $1f, $1e, $22, $05, $01, $02
+
+ORG $C9E850
+db $0A, $58, $E7, $C9
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $CFE0BF
+db $5F, $A1, $EE
+
+ORG $CFE0F2
+db $A3, $A1, $EE
+
+ORG $CFE0E1
+db $E8, $A1, $EE
+
+ORG $EEA15F
+db $70, $79, $57, $9d, $50, $a9, $9f, $a5, $a2, $50, $93, $9f, $a5, $a2, $91, $97
+db $95, $5e, $03, $00, $70, $79, $57, $9d, $50, $a4, $9f, $9f, $50, $a3, $93, $91
+db $a2, $95, $94, $50, $a4, $9f, $50, $96, $99, $97, $98, $a4, $5c, $10, $0a, $50
+db $a3, $9f, $50, $79, $57, $9c, $9c, $50, $a3, $a4, $91, $a9, $50, $98, $95, $a2
+db $95, $5e, $13, $02, $70, $79, $57, $9d, $50, $a9, $9f, $a5, $a2, $50, $a0, $9f
+db $a7, $95, $a2, $5e, $03, $00, $70, $79, $57, $9d, $50, $a4, $9f, $9f, $50, $9d
+db $a5, $93, $98, $50, $9f, $96, $50, $91, $50, $a7, $95, $91, $9b, $9c, $99, $9e
+db $97, $5c, $10, $0a, $50, $a3, $9f, $50, $79, $57, $9c, $9c, $50, $a3, $a4, $91
+db $a9, $50, $98, $95, $a2, $95, $5e, $13, $02, $70, $79, $57, $9d, $50, $a9, $9f
+db $a5, $a2, $50, $a7, $99, $a3, $94, $9f, $9d, $5e, $03, $00, $70, $79, $57, $94
+db $50, $9a, $a5, $a3, $a4, $50, $9d, $91, $9b, $95, $50, $91, $50, $96, $9f, $9f
+db $9c, $50, $9f, $96, $50, $9d, $a9, $a3, $95, $9c, $96, $5c, $10, $0a, $50, $a3
+db $9f, $50, $79, $57, $9c, $9c, $50, $a3, $a4, $91, $a9, $50, $98, $95, $a2, $95
+db $5e, $13, $02; Flying men text
+
+ORG $CF8369
+db $03, $00, $23, $05, $d8, $48, $21, $05, $e0, $90, $24, $05, $f0, $58
+
+ORG $C779A1
+db $0A, $33, $A2, $EE
+
+ORG $EEA233
+db $08, $f4, $15, $c9, $00, $1f, $02, $25, $10, $5a, $1f, $1e, $4e, $05, $02, $10
+db $e0, $18, $01, $01, $70, $58, $1c, $02, $01, $50, $93, $9f, $9e, $a1, $a5, $95
+db $a2, $95, $94, $50, $98, $99, $a3, $50, $99, $9e, $9e, $95, $a2, $50, $95, $a6
+db $99, $9c, $51, $59, $03, $18, $04, $08, $d9, $9b, $ee, $ff, $08, $a7, $79, $c7
+db $ff, $1f, $21, $34, $02;Magicant nightmare?
+
+ORG $C77B44
+db $87, $95, $50, $a3, $98, $9f, $a5, $9c, $94, $50, $97, $9f, $50, $a4, $9f, $50
+db $a4, $98, $95, $50, $73, $91, $a6, $95, $50, $9f, $96, $50, $a4, $98, $95, $50
+db $80, $91, $a3, $a4, $50, $91, $9e, $94, $50, $95, $9e, $94, $50, $a4, $98, $99
+db $a3, $5e, $03, $0a, $3e, $7c, $c7
+
+ORG $C7E352
+db $18, $04, $02
+
+;;;;;;;;;;;;;;;;;;;;;
+ORG $EEA515
+db $18, $04, $18, $01, $31, $1f, $00, $ff, $05, $50, $50, $50, $50, $50, $50, $50
+db $50, $50, $50, $50, $50, $04, $e9, $03, $1c, $08, $02, $10, $a0, $03, $18, $04
+db $08, $6b, $dd, $c7, $00, $1f, $00, $00, $5e, $1f, $14, $05, $06, $ff, $ff, $ff
+db $ff, $ff, $ff, $1f, $eb, $02, $06, $1f, $15, $02, $00, $0d, $03, $01, $10, $01
+db $1f, $f2, $02, $00, $0a, $00, $1f, $eb, $01, $06, $1f, $15, $01, $00, $0c, $03
+db $01, $10, $01, $1f, $f2, $01, $00, $0a, $00, $10, $78, $10, $78, $10, $78, $10
+db $78, $10, $78, $10, $3c, $1f, $15, $92, $00, $06, $03, $01, $10, $3c, $10, $64
+db $1f, $15, $6a, $00, $7a, $02, $01, $1f, $61, $1f, $41, $0b, $08, $6b, $dd, $c7
+db $00, $1f, $eb, $ff, $06, $1f, $21, $e1, $1f, $00, $00, $5f, $1f, $15, $8f, $00
+db $f8, $02, $01, $1f, $61, $1f, $15, $58, $01, $f9, $02, $01, $1f, $61, $1f, $15
+db $c1, $01, $fa, $02, $01, $1f, $61, $1f, $41, $0c, $1f, $50, $1F, $EB, $FF, $00
+db $0a, $c9, $a5, $ee, $1F, $21, $51, $0A, $81, $C9, $C9; Ending
+
+
+ORG $C39F17
+db $42, $A0, $FE, $C4; Paula robot
+
+ORG $C39F22
+db $42, $B5, $FE, $c4; Jeff robot
+
+ORG $C39F2D
+db $42, $CA, $FE, $c4; Poo robot
+
+ORG $C9C07F
+db $70, $7f, $98, $5c, $10, $0a, $50, $79, $50, $91, $9c, $9d, $9f, $a3, $a4, $50
+db $96, $9f, $a2, $97, $9f, $a4, $50, $a4, $9f, $50, $9d, $95, $9e, $a4, $99, $9f
+db $9e, $50, $a4, $98, $91, $a4, $50, $79, $50, $98, $91, $94, $50, $a4, $9f, $50
+db $a0, $a5, $a4, $50, $a9, $9f, $a5, $a2, $50, $92, $a2, $91, $99, $9e, $a3, $50
+db $99, $9e, $a4, $9f, $50, $a2, $9f, $92, $9f, $a4, $a3, $5e, $03, $00, $70, $80
+db $a2, $9f, $92, $91, $92, $9c, $a9, $5c, $50, $91, $a4, $50, $9c, $95, $91, $a3
+db $a4, $5e, $03, $00, $70, $78, $95, $a9, $5c, $10, $06, $50, $a7, $98, $91, $a4
+db $57, $a3, $50, $a4, $98, $99, $a3, $50, $92, $a5, $a4, $a4, $9f, $9e, $50, $94
+db $9f, $6f, $03, $04, $1d, $01, $1f, $02, $10, $1f, $01, $ff, $10, $20, $0a, $1d
+db $c2, $c9; Phase distorter 3 present
+
+ORG $C63092
+db $0A, $80, $A2, $EE
+
+ORG $EEA280
+db $19, $02, $73, $91, $9c, $9c, $02, $19, $02, $87, $91, $a2, $a0, $02, $1c, $07
+db $03, $11, $09, $03, $e1, $15, $c9, $00, $a8, $30, $c6, $00, $a1, $a2, $ee, $00
+db $02, $18, $04, $04, $07, $03, $1f, $17, $00, $00, $b8, $01, $01, $04, $e3, $03
+db $05, $4c, $01, $1f, $eb, $ff, $06, $04, $f8, $02, $1f, $00, $10, $5b, $1f, $1e
+db $1e, $05, $09, $10, $b4, $05, $74, $01, $1f, $21, $e5, $1f, $e5, $ff, $15, $73
+db $16, $3e, $10, $64, $1f, $17, $e5, $02, $b9, $01, $04, $10, $50, $08, $6b, $dd
+db $c7, $00, $05, $f8, $02, $1f, $03, $1f, $ec, $ff, $01, $1f, $15, $6a, $00, $52
+db $01, $01, $08, $b8, $b4, $c9, $00, $19, $26, $01, $1f, $66, $01, $07, $3c, $bc
+db $c9, $00, $1f, $66, $02, $29, $17, $59, $ef, $00, $05, $e3, $03, $1e, $01, $e5
+db $02, $02; Phase distorter 3 menu
+
+ORG $CFDE39
+db $12, $A3, $EE
+
+ORG $EEA312
+db $06, $1d, $01, $1d, $c2, $c9, $ff, $0a, $9e, $c5, $c7
+
+ORG $CFDE38
+db $00
+
+ORG $C7F166
+db $1D, $01
+
+ORG $C7F634
+db $70, $87, $95, $9c, $93, $9f, $9d, $95, $50, $92, $91, $93, $9b, $51, $10, $15
+db $50, $78, $9f, $a7, $50, $94, $99, $94, $50, $99, $a4, $50, $96, $95, $95, $9c
+db $50, $a4, $a2, $91, $a6, $95, $9c, $99, $9e, $97, $50, $a4, $98, $a2, $9f, $a5
+db $97, $98, $50, $a4, $99, $9d, $95, $6f, $03, $00, $70, $84, $9f, $50, $a3, $98
+db $a2, $95, $94, $a3, $5c, $10, $0a, $50, $a9, $9f, $a5, $50, $a3, $91, $a9, $6f
+db $13, $02; Andonuts 4
+
+ORG $CF250D
+db $1D, $A3, $EE
+
+ORG $EEA31D
+db $06, $e1, $03, $3a, $af, $c9, $ff, $18, $01, $01, $70, $58, $89, $9f, $a5, $57
+db $a2, $95, $50, $9f, $a6, $95, $a2, $93, $9f, $9d, $95, $50, $a7, $99, $a4, $98
+db $50, $a4, $98, $95, $50, $96, $95, $95, $9c, $99, $9e, $97, $50, $a4, $98, $91
+db $a4, $50, $a9, $9f, $a5, $50, $a3, $98, $9f, $a5, $9c, $94, $9e, $57, $a4, $50
+db $a0, $a2, $9f, $93, $95, $95, $94, $50, $a7, $99, $a4, $98, $9f, $a5, $a4, $50
+db $1c, $02, $02, $5e, $5e, $5e, $59, $13, $18, $04, $0a, $3a, $af, $c9, $02; Paula warning
+
+
+ORG $C9C4D3
+db $0A, $7C, $A3, $EE
+
+ORG $EEA37C
+db $18, $01, $01, $70, $73, $9f, $9e, $97, $a2, $91, $a4, $a5, $9c, $91, $a4, $99
+db $9f, $9e, $a3, $51, $03, $00, $70, $77, $99, $a9, $97, $91, $a3, $50, $98, $91
+db $a3, $50, $92, $95, $95, $9e, $50, $94, $95, $96, $95, $91, $a4, $95, $94, $5c
+db $10, $0a, $50, $91, $9e, $94, $50, $a4, $98, $95, $50, $75, $91, $a2, $a4, $98
+db $50, $99, $a3, $50, $a3, $91, $96, $95, $5e, $03, $00, $70, $87, $9f, $a5, $9c
+db $94, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $a4, $9f, $50, $a3, $9b
+db $99, $a0, $50, $a4, $9f, $50, $a4, $98, $95, $50, $93, $a2, $95, $94, $99, $a4
+db $a3, $5c, $10, $0a, $50, $9f, $a2, $50, $95, $a8, $a0, $9c, $9f, $a2, $95, $50
+db $a4, $98, $95, $50, $95, $a0, $99, $9c, $9f, $97, $a5, $95, $6f, $00, $19, $02
+db $73, $a2, $95, $94, $99, $a4, $a3, $02, $19, $02, $75, $a0, $99, $9c, $9f, $97
+db $a5, $95, $02, $1c, $07, $02, $11, $09, $02, $37, $a4, $ee, $00, $d0, $a5, $ee
+db $00, $12, $0a, $0a, $a4, $ee, $1f, $e4, $01, $00, $05, $18, $04, $1f, $e4, $02
+db $00, $05, $1f, $e4, $04, $00, $05, $1f, $ea, $01, $00, $1f, $f2, $01, $00, $5e
+db $02, $1f, $ea, $02, $00, $1f, $f2, $02, $00, $5e, $02, $1f, $ea, $03, $00, $1f
+db $f2, $03, $00, $5e, $02, $1f, $ea, $04, $00, $1f, $f2, $04, $00, $5e, $02, $1f
+db $00, $00, $5e, $5e, $0a, $6e, $a5, $ee; Credits choice
+
+ORG $EEA5D0
+db $0A
+dl FixEpilogueWinters
+db $d2, $00
+BackfromEpilogueFix:
+db $04, $d3, $00, $04, $d5, $00, $04, $d6, $00, $04
+db $d7, $00, $04, $d8, $00, $04, $d9, $00, $04, $da, $00, $04, $db, $00, $04, $dc
+db $00, $04, $dd, $00, $04, $de, $00, $04, $df, $00, $04, $69, $00, $12, $70, $80
+db $9c, $95, $91, $a3, $95, $50, $9b, $95, $95, $a0, $50, $99, $9e, $50, $9d, $99
+db $9e, $94, $50, $a4, $98, $91, $a4, $50, $a3, $9f, $9d, $95, $50, $a3, $95, $a1
+db $a5, $95, $9e, $93, $95, $a3, $50, $9d, $91, $a9, $50, $9e, $9f, $a4, $50, $a7
+db $9f, $a2, $9b, $50, $9f, $a2, $50, $92, $95, $50, $91, $a6, $91, $99, $9c, $91
+db $92, $9c, $95, $5e, $03, $00, $70, $7c, $9f, $93, $91, $a4, $99, $9f, $9e, $a3
+db $50, $93, $9f, $9c, $9c, $95, $93, $a4, $95, $94, $50, $a7, $99, $9c, $9c, $50
+db $9e, $9f, $a4, $50, $92, $95, $50, $93, $9f, $a5, $9e, $a4, $95, $94, $5c, $10
+db $0a, $50, $91, $9e, $94, $50, $a9, $9f, $a5, $50, $a7, $99, $9c, $9c, $50, $9e
+db $95, $95, $94, $50, $a4, $9f, $50, $a2, $95, $a3, $a4, $91, $a2, $a4, $50, $96
+db $a2, $9f, $9d, $50, $a9, $9f, $a5, $a2, $50, $a0, $a2, $95, $a6, $99, $9f, $a5
+db $a3, $50, $a3, $91, $a6, $95, $50, $a4, $9f, $50, $a2, $95, $a3, $a5, $9d, $95
+db $50, $9e, $9f, $a2, $9d, $91, $9c, $50, $a0, $9c, $91, $a9, $5e, $03, $00, $70
+db $84, $9f, $50, $a6, $99, $95, $a7, $50, $a4, $98, $95, $50, $93, $a2, $95, $94
+db $99, $a4, $a3, $5c, $10, $0a, $50, $a2, $95, $a4, $a5, $a2, $9e, $50, $a4, $9f
+db $50, $1c, $02, $01, $57, $a3, $50, $98, $9f, $a5, $a3, $95, $50, $99, $9e, $50
+db $7f, $9e, $95, $a4, $a4, $5e, $03, $18, $04, $0a, $ef, $c4, $c9; Epilogue choice
+
+ORG $C9C582
+db $0a, $87, $c5, $c9
+
+ORG $C48535
+LDA #$00FF;Lumine hall hardcoded length
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;Get rid of the NPCS outside monotoli building. I already fixed it once I can do it again. Also remove the hotspot?
+
+
+;think about stuff like NPCs saying items...
+
+;;;;;;;;;;;;;;;;;;;;;;;
+
+ORG $EE9BD0
+db $07, $D6, $03, $1B, $03, $03, $BB, $EE, $00, $18, $01, $01, $01, $70, $58, $1C
+db $02, $01, $50, $91, $92, $A3, $9F, $A2, $92, $95, $94, $50, $A4, $98, $95, $50
+db $A0, $9F, $A7, $95, $A2, $50, $9F, $96, $50, $A4, $98, $95, $50, $75, $91, $A2
+db $A4, $98, $51, $59, $04, $D6, $03, $1F, $02, $67, $10, $20, $13, $18, $00, $02 ;Earth's power text
+
+ORG $C55593
+db $70, $79, $96, $50, $a9, $9f, $a5, $50, $a3, $95, $95, $50, $a4, $98, $99, $a3
+db $5c, $50, $a4, $95, $9c, $9c, $50, $80, $99, $9e, $9b, $50, $83, $a7, $99, $a4
+db $93, $98, $5e
+
+;;;;;;;;;;;;;;;;;;;; only if start pos is not onett
+;ORG $CF96C2
+;dw $0069
+
+;ORG $CF9618
+;dw $0069
+
+;ORG $CF9629
+;dw $0069
+;;;;;;;;;;;;;;;
+ORG $D579F0 ; New Tenda Village coordinates
+dw $0035
+dw $0020
+
+ORG $F4A000
+db $78, $91, $a0, $a0, $a9, $5d, $78, $91, $a0, $a0, $a9, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $dd, $00, $f4, $01, $cb, $03, $FF; Happy-Happy Teleport
+
+db $74, $a5, $a3, $a4, $a9, $50, $74, $a5, $9e, $95, $a3, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $de, $00, $a0, $00, $e3, $04, $FF; Dusty Dunes
+
+db $7d, $91, $97, $99, $93, $91, $9e, $a4, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $df, $00, $f2, $02, $28, $02, $FF; Magicant Teleport
+
+ORG $F4C000
+ShopItemNamesDeluxe:
+.10:
+db $54, $61, $60, $00
+.100:
+db $54, $61, $60, $60, $00
+.1000:
+db $54, $61, $60, $60, $60, $00
+
+.MoneyNames:
+dw $0000
+dw .10
+dw .100
+dw .1000
+
+
+
+ORG $00F8D0
+GetItemRemote:
+SEP #$20
+STZ $0770
+STZ $B582
+STZ $B583
+STZ $B5E7
+LDA #$01
+STA $B585
+REP #$20
+PHX
+SEP #$10
+LDX $B570
+BEQ SkipItemGet
+JSR CalcCharSpace
+CMP #$69
+BEQ SkipItemGet
+SEP #$10
+REP #$20
+LDA $B571
+AND #$00FF
+LDX $B570
+JSL $C18BC6
+STZ $B570
+LDA #$0074
+JSL $C0ABE0
+SkipItemGet:
+REP #$30
+LDA $987F
+LDY #$0008
+PLX
+JML $C04D4C
+
+CalcCharSpace:
+LDY #$00
+SEP #$20
+STZ $B571
+CheckNextChar:
+LDA $986F,Y
+JSR CheckCharInv
+CPY $98A4
+BEQ CharacterInvalid
+BRA CheckNextChar
+CharacterInvalid:
+JSL KeyItemBlockerAndCheckProg
+BEQ SendItemToStorage
+LDA #$69
+RTS
+SendItemToStorage:
+LDA $B570
+;KEY ITEM CHECK GOES HERE
+JSL CheckIfKeyItem
+JSL StoreItem
+REP #$20
+STZ $3272
+LDA #$0074
+JSL $C0ABE0
+SEP #$20
+LDA #$69
+STZ $B570
+RTS
+CheckCharInv:
+STA $B571
+DEC
+ASL
+TAX
+REP #$20
+LDA CharLastInvSlot,X
+REP #$10
+TAX
+SEP #$20
+LDA $0000,X
+BNE CharInvFull
+PLX
+CharInvFull:
+SEP #$10
+INY
+RTS
+
+InitIntro:
+REP #$20
+PHX
+LDX #$0000
+SetScript:
+LDA StartingScripts,X
+PHX
+JSL $C2165E
+PLX
+INX
+INX
+CPX #$003E
+BNE SetScript
+PHY
+LDY #$0000
+UnsetNextScript:
+TYX
+LDA UnsetScripts,X
+TXY
+LDX #$0000
+PHY
+JSL $C2165E
+PLY
+INY
+INY
+CPY #$000A
+BEQ EndUnsetScripts
+BRA UnsetNextScript
+EndUnsetScripts:
+PLY
+PLX
+SEP #$20
+LDA #$09
+STA $9839
+REP #$20
+JML $C1FEB2
+
+SetTeleFlags:
+LDA $06
+PHX
+LDX #$0000
+CheckTeleFlag:
+CMP TeleSectorID,X
+BEQ UnlockTeleport
+CPX #$0028
+BEQ EndTeleCheck
+INX
+INX
+BRA CheckTeleFlag
+EndTeleCheck:
+PLX
+STA $5E38
+JML LoadCurrentPhotoColor
+UnlockTeleport:
+PHA
+LDA TeleFlags,X
+TSB $9C22
+PLA
+BRA EndTeleCheck
+
+IgnoreTeleportEnemies:
+LDA $9F3F
+AND #$00FF
+BNE SkipCollision
+JSL $C0D15C
+JML $C0D626
+SkipCollision:
+JML $C0D62B
+
+GetRemoteTeleport:
+LDA $B572
+AND #$00FF
+BEQ EndGetPSI
+CMP #$0010
+BCS GetChara
+PHX
+ASL
+TAX
+LDA TeleportFlags,X
+JSL $C2165E
+LDA #$0067
+JSL $C0ABE0
+PLX
+BRA EndGetPSI
+GetChara:
+JSR UnlockCharacter
+EndGetPSI:
+STZ $B572
+STZ $FF40
+LDA $006D
+AND #$A000
+JML GetRemoteMoney
+
+UnlockCharacter:
+PHX
+SEC
+SBC #$0010
+ASL
+STA $B572
+%FUNCTION_PROLOGUE(18)
+JSL $C0943C
+PHX
+LDX $B572
+LDA CharUnlockPointers,X
+PLX
+;STZ $B572
+STA $0E
+LDA #$00D5
+STA $10
+LDA #$0001
+JSL $C1DD47 ;Display textbox
+JSL $C186B1 ;Overworld text
+JSL $C09451 ;Resume sprites
+PLD
+PLX
+RTS
+
+
+GetCharNameFromServ:
+REP #$31
+CPX #$00FE
+BNE SkipSpecialNameLoad
+SEP #$10
+LDX $B572
+REP #$10
+SkipSpecialNameLoad:
+PHD
+PHA
+JML $C14FDB
+
+GetPlayerName:
+PHA
+LDA $FF40
+BEQ GetNormalItem
+PLA
+STZ $FF40
+LDA #$00AD
+BRA ForceAPItem
+GetNormalItem:
+PLA
+ForceAPItem:
+CMP #$00AD
+BNE SetPlayerNameFlag
+INC $B573
+INC $B579
+SetPlayerNameFlag:
+JSL CheckifNameProgressive
+LDA #$0000
+JML $C146DC
+
+LoadPlayerName:
+TDC
+ADC #$FFF2
+PHA
+LDA $B573
+AND #$00FF
+BEQ SkipPlayerName
+LDX #$001F
+SkipPlayerName:
+PLA
+JML $C14FDF
+
+DrawPlayerName:
+PHA
+LDA $B573
+AND #$00FF
+BEQ DrawNormalName
+PLA
+LDA $B579
+AND #$00FF
+BEQ SkipPriorityName
+STZ $B579
+BRA DontSkipPrior
+SkipPriorityName:
+STZ $B573
+DontSkipPrior:
+LDA #$FF50
+STA $0E
+LDA #$007E
+STA $10
+JML $C19399
+
+DrawNormalName:
+PLA
+ADC $06
+STA $06
+JML $C19393
+
+SetMelodyCount:
+PHX
+LDX #$0000
+CheckSoundStoneScript:
+CMP SoundStoneScripts,X
+BEQ IncrementMelody
+INX
+INX
+CPX #$0010
+BEQ NormalEvent
+BRA CheckSoundStoneScript
+IncrementMelody:
+INC $B575
+SEP #$20
+PHA
+LDA $B575
+CMP $C4FD70
+BCC SkipSanctuaryTrigger
+PHA
+LDA #$04
+TSB $9C82
+PLA
+SkipSanctuaryTrigger:
+CMP $C4FD71
+BCC SkipMagicantTrigger
+PHA
+LDA #$08
+TSB $9C82
+PLA
+SkipMagicantTrigger:
+CMP $C4FD72
+BCC ReturnEvent
+LDA #$10
+TSB $9C82
+ReturnEvent:
+PLA
+NormalEvent:
+REP #$20
+PLX
+REP #$31
+DEC
+PHA
+LSR
+JML SetFlagProceed
+
+PocketStorage:
+LDA $0065
+AND #$00FF
+BIT #$0010
+BEQ SkipDropMenu
+PHX
+PHY
+%FUNCTION_PROLOGUE(18)
+JSL $C0943C
+LDA #$9620
+STA $0E
+LDA #$00EE
+STA $10
+JSL $C186B1
+JSL $C09451
+JSL $C1DD59 ;Close textbox
+PLD
+PLY
+PLX
+SkipDropMenu:
+LDA $006D
+AND #$0040
+JML $C0B90A
+
+SkipArchiSpaceCheck:
+PHA
+LDA $B573
+AND #$00FF
+BNE SkipSpaceCheck
+PLA
+JSL $C4572B
+JML $C14D09
+SkipSpaceCheck:
+PLA
+LDA #$00FF
+JML $C14D09
+
+CheckArchiItemInv:
+LDX $14
+CPX #$00AD
+BEQ SkipInvAdd
+JSL $C18BC6
+SkipInvAdd:
+JML $C156AD
+
+GetServerItemName:
+LDA $B573
+AND #$00FF
+BEQ WriteNormalName
+LDA #$FF80
+STA $06
+LDA #$007E
+STA $08
+LDA #$0000
+JML $C1922E
+WriteNormalName:
+LDA #$5000
+STA $06
+JML $C19227
+
+AddNewNPCSectors:
+BNE EntryIsntNull
+JML $C0255A
+EntryIsntNull:
+STA $06
+AND #$FF00
+BEQ CheckNPCSector
+JML $C0226B
+CheckNPCSector:
+PHX
+LDA $06
+DEC
+ASL
+TAX
+LDA NewSectorPointers,X
+PLX
+STA $06
+LDA #$00C4
+STA $08
+JML $C0227C
+
+GetLumiText:
+LDA $C48037,X
+AND #$00FF
+BEQ EndLumiText
+JML $C48409
+EndLumiText:
+JML $C48717
+
+DelArchFromInv:
+LDY $0E
+TYA
+SEP #$20
+CMP #$AD
+BEQ SkipArchiWrite
+JML GetProgressiveItems
+SkipArchiWrite:
+JML $C18B65
+
+SetAnimSpeed:
+PHX
+LDA $0066
+LDX #$0000
+AND #$00FF
+BIT #$0040
+BEQ NotRunning
+LDA #$0003
+BRA SetRunSpeed
+NotRunning:
+LDA #$0008
+SetRunSpeed:
+STA $0E
+CPX #$000A
+BEQ EndRun
+INX #2
+BRA SetRunSpeed
+EndRun:
+PLX
+JML $C07966
+
+SaveAPData:
+PHA
+PHX
+PHY
+PHB
+LDA $B4A1; Save file num
+AND #$00FF
+TAX
+LDA #$7E00
+CalcSaveSpot:
+CPX #$0000
+BEQ RunDataSave
+CLC
+ADC #$0010
+DEX
+BRA CalcSaveSpot
+RunDataSave:
+TAY
+LDA #$000F
+LDX #$B570
+MVN $7E20
+;storage
+LDA #$0063
+LDX #$B590
+LDY #$7E40
+MVN $7E20
+PLB
+PLY
+PLX
+PLA
+JSL $EF0A4D
+RTL
+
+ExtraKeyItems:
+LDA $D55000,X
+BEQ CheckKeys
+JML $C14F5A
+CheckKeys:
+JML DeleteExtraKeyItem
+LDA $06
+AND #$00FF
+LDX #$0000
+CheckNextItemStash:
+LDY #$0000
+CheckNextItem:
+SEP #$20
+CMP $99F1,X
+REP #$20
+BEQ FoundItemCopy
+BackToItems:
+INY
+INX
+CPY #$000E
+BNE CheckNextItem
+CPX #$012B;Change this condition?
+BEQ CheckStorageForKeys
+PHA
+TXA
+INC $B58B
+LDA $98A4
+AND #$00FF
+DEC
+CMP $B58B
+BCS .CheckNextChar
+PLA
+JMP CheckStorageForKeys
+.CheckNextChar:
+LDA $B58B
+AND #$00FF
+TAX
+LDA $986F,X
+AND #$00FF
+ASL
+TAX
+LDA InvPointers,X
+TAX
+PLA
+BRA CheckNextItemStash
+FoundItemCopy:
+PHA
+LDA $B580
+AND #$00FF
+BNE RemoveItem
+PLA
+INC $B580
+BRA BackToItems
+PLA
+RemoveItem:
+LDA #$0010
+BRA EndKeyCheck
+CheckStorageForKeys:
+LDX #$0000
+CheckStorageSlot:
+SEP #$20
+CMP $B590,X
+REP #$20
+BEQ FoundItemCopy2
+CPX #$0023
+BEQ EndStorageCheck
+BackToStorage:
+INX
+BRA CheckStorageSlot
+EndStorageCheck:
+LDA #$0000
+EndKeyCheck:
+PLY
+PLX
+STZ $B580
+JML $C14F5A
+FoundItemCopy2:
+PHA
+LDA $B580
+AND #$00FF
+BNE RemoveItem
+PLA
+INC $B580
+BRA BackToStorage
+
+TestArchiItemSpace:
+LDA $0E
+AND #$00FF
+CMP #$00AD
+BEQ .SkipSpaceCheck
+LDA $0000,X
+.SkipSpaceCheck
+JML $C18B5B
+
+GetLumiTextMain:
+LDA $C48037
+AND #$00FF
+BEQ .EndLumiText
+JML $C4845A
+.EndLumiText:
+JML $C48717
+
+GetLumiTextSub:
+LDA $C4803B,X
+AND #$00FF
+BEQ .EndLumiText
+JML $C486FB
+.EndLumiText:
+JML $C48717
+
+LoadAPData:
+LDA $B4A1
+AND #$00FF
+PHA
+PHX
+PHY
+PHB
+TAX
+LDA #$7E00
+CheckFileNum:
+CPX #$0000
+BEQ GotFileData
+CLC
+ADC #$0010
+DEX
+BRA CheckFileNum
+GotFileData:
+TAX
+LDY #$B570
+LDA #$000F
+MVN $207E
+
+LDY #$B590
+LDX #$7E40
+LDA #$0063
+MVN $207E
+PLB
+PLY
+PLX
+PLA
+JML $C1F071
+;Each 10 bytes should be saved per file
+
+SpecialNameDirect:
+CMP #$0007
+BNE NotSeven
+JML $C17E71
+NotSeven:
+CMP #$0016
+BEQ GetSpecialName
+CMP #$0017
+BEQ PullAPName
+CMP #$00B7
+BEQ SilentAPName
+JML CheckMoreSpecialCommands
+GetSpecialName:
+JSR PrintSpecialName
+LDA #$0000
+JML $C17F0F
+PullAPName:
+INC $FF40
+JSR APCC;Move name data
+LDA #$0000
+JML $C17E65
+SilentAPName:
+INC $FF40
+JSR APC2
+LDA #$0000
+JML $C17F0F
+
+
+
+APCC:
+rep #$31
+phd
+pha
+tdc
+adc #$ffee
+tcd
+pla
+; read ARGS_COUNT bytes of args into $97BA
+ldy #$0001
+jsl R_Peek_Parameter_Bytes
+LDA $97BA
+AND #$00FF
+XBA
+JSL MoveItemNames
+PLD
+RTS
+
+APC2:
+rep #$31
+phd
+pha
+tdc
+adc #$ffee
+tcd
+pla
+; read ARGS_COUNT bytes of args into $97BA
+ldy #$0001
+jsr R_Read_Parameter_Bytes
+LDA $97BA
+AND #$00FF
+XBA
+JSL MoveItemNames
+PLD
+RTS
+
+PrintSpecialName:
+  rep #$31
+  phd
+  pha
+  tdc
+  adc #$ffee
+  tcd
+  pla
+  ; read ARGS_COUNT bytes of args into $97BA
+  ldy #$0001
+  jsr R_Read_Parameter_Bytes
+  LDA $97BA
+  AND #$00FF
+  ASL
+  PHX
+  TAX  
+  LDA SpecialNameTable,X
+PLX
+  sta $0e
+  lda.w #$00EE
+  sta $10
+  ; load maximum length of the string into A
+  lda #$ffff
+  ; call "printStringAutoNewline"
+  jsl $C447FB
+  ; clean up stack frame and return
+  pld
+  rts
+
+  R_Read_Parameter_Bytes:
+rep #$31
+phd
+tdc
+adc #$ffee
+tcd
+; First things first: get the text pointer
+lda $97b8
+sta $00
+asl     ; 2
+adc $00 ; 3
+asl     ; 6
+asl     ; 12
+adc $00 ; 13
+asl     ; 26
+adc $00 ; 27
+; We now have [0x97b8] * 27 in A.
+sta $00
+; Load the text pointer from the table at 0x7E96AA into 0xE.
+tax
+lda $96aa,x
+sta $0e
+lda $96ac,x
+sta $10
+; Load amount into X. Also store into 0x02 for later use
+sty $02
+tyx
+; The memcpy routine copies words. If we have an odd number of
+; bytes, it will round down. We add 1 so that it effectively rounds up.
+inx
+lda #$97ba
+; Copy it: X bytes from [0x0e] to (A).
+jsl $c08ed2
+; Zero out upper bytes of cc_argv
+ldy $02
+tya
+lsr ; Get lower order bit in carry, and branch if 0
+lda #$0000
+bcc .aligned
+; Align Y to next word
+sep #$20
+sta $97ba,y
+rep #$31
+bra .unaligned
+.loop:
+sta $97ba,y
+iny
+.unaligned:
+iny
+.aligned:
+cpy #$0016
+bmi .loop
+.end:
+; Adjust the text pointer and store back into table.
+ldx $00
+lda $0e
+clc
+adc $02
+sta $96aa,x
+lda $10
+sta $96ac,x
+pld
+rts
+
+
+ORG $C0FF00
+MagicantSoloAnimSpeedFix:
+PHA
+JSL SetMagicantAnimSpeeds
+PLA
+JMP $79EA
+
+
+
+ORG $C1FFF1
+StoreItem:
+JSR $913D
+RTL
+GetItemName:
+JSR $9216
+RTL
+
+org $C1FEC9
+    LDA $98B6
+    AND #$00FF
+    ASL
+    TAX
+    LDA Table_HpPpRollSpeedLo-2,x
+    STA $9627
+    LDA #$0001
+    STA $9629
+    LDA Table_FFNIB-2,x
+    ; $C1FEE2
+    STA $964B
+    ; Load text speed
+    LDA.l Table_FramesPerChar-2,x
+    STA $9625
+    BRA $2B
+    ; $C1FEEE
+Table_FramesPerChar:
+    ; Base game values
+    ;.word 0x100
+    ;.word 0x200
+    ;.word 0x300
+    ; Better values (imo)
+    dw $0AA
+    dw $100
+    dw $280
+    ; $C1FEF4
+
+WaitTextOneTick:
+    ; Load leftover portion of # of frames to wait
+    ; $C1FEF4
+    LDA $962B
+    ; Add our text speed
+    CLC
+    ADC $9625
+    TAY
+    ; Save fractional portion back to memory
+    AND #$00FF
+    STA $962B
+    ; $C1FF02
+    ; Determine the integer number of frames to wait
+    TYA
+    XBA
+    AND #$00FF
+    BEQ FrameWaitDone
+    STA $00
+FrameWaitLoop:
+    JSL $C12DD5
+    DEC $00
+    ; $C1FF11
+    BNE FrameWaitLoop
+FrameWaitDone:
+    RTL
+    ; $C1FF14
+
+    ; space before $C1FF19 is free
+
+org $C10D4B
+    JSL WaitTextOneTick
+    BRA $0D
+
+org $C44055
+    JSL WaitTextOneTick
+    BRA $0D
+
+org $C444E3
+    JSL WaitTextOneTick
+    BRA $0D
+
+
+org $C3FB1F
+; The data was previously here, we're modifying the values
+; and breaking them into separate lo/hi word tables...
+; except the hi word is always 1, so no need to store it.
+; we'll use the space to store the FFNIB values
+Table_HpPpRollSpeedLo:
+    ; Base game values
+    ;.word 0x2000
+    ;.word 0x1800
+    ;.word 0x1000
+    ; Better values (imo)
+    dw 4480
+    dw 2480
+    dw 1480
+
+Table_FFNIB:
+    ; Base game values
+    ;.word 30
+    ;.word 60
+    ;.word 0
+    ; Better values (imo)
+    dw 20
+    dw 30
+    dw 0
+
+
+ORG $C308E5
+  db $42
+  dl $C4FDE0
+  db $00; Screen reload code
+
+
+ORG $C4FDE0
+reload_row_gfx:
+LDX $987B
+LDA $9877
+JML $C012ED
+
+ORG $C33572
+db $42
+dl $C4FE60
+db $00
+
+ORG $C4FE60
+spawn_saturn_pd:
+LDA #$0180
+STA $9E2D
+LDA #$1DBB
+STA $9E2F
+RTL
+
+db $18, $04, $0A, $D3, $BB, $C9
+
+ORG $C335B5
+db $42
+dl $C4FE90
+db $00
+
+ORG $C4FE90
+spawn_barf_char:
+LDA #$13C1
+STA $9E2D
+LDA #$1DA1
+STA $9E2F
+RTL
+
+ORG $C4FEA0
+check_paula:
+SEP #$20
+LDA $9C84
+BIT #$01
+REP #$20
+BEQ skip_paula
+JML $C0A98B
+skip_paula:
+LDY #$9F22
+STY $94
+RTL
+
+check_jeff:
+SEP #$20
+LDA $9C84
+BIT #$02
+REP #$20
+BEQ skip_jeff
+JML $C0A98B
+skip_jeff:
+LDY #$9F2D
+STY $94
+RTL
+
+check_poo:
+SEP #$20
+LDA $9C09
+BIT #$80
+REP #$20
+BEQ skip_poo
+JML $C0A98B
+skip_poo:
+LDY #$9F38
+STY $94
+RTL
+
+ORG $D5F5FB
+db $03, $00; Starting level
+
+ORG $D5F600
+db $4A
+
+ORG $D5F830
+db $04, $e1, $03, $0a
+dl PaulaUnlocktext
+ 
+db $04, $e2, $03, $0a
+dl JeffUnlockText
+
+db $04, $10, $00, $0a
+dl PooUnlockText
+
+db $0A
+dl FlyingManUnlockText
+
+NessFlagText:
+db $04, $17, $04
+db $0A
+dl NessUnlockText
+
+db $0A
+dl DynamicPhotoSetter
+
+ORG $C66AC1
+db $68; Tracy text
+
+ORG $D577EB
+db $8E; Scaraba Pig Nose Shop
+
+ORG $C570A2
+db $0A, $FD, $A6, $EE
+
+ORG $EEA6FD
+db $17, $b5, $03, $00, $04, $ea, $03, $0a, $a6, $70, $c5
+
+ORG $C56F80
+db $0A, $08, $A7, $EE
+
+ORG $EEA708
+db $06, $ea, $03, $18, $a7, $ee, $ff, $15, $14, $1c, $05, $8d, $0a, $85, $6f, $c5
+db $70, $71, $98, $5c, $10, $0a, $50, $79, $50, $91, $9d, $50, $a3, $9f, $9c, $94
+db $50, $9f, $a5, $a4, $5e, $10, $0f, $50, $83, $9f, $50, $a3, $9f, $a2, $a2, $a9
+db $5e, $13, $02; Snake Bagsman
+
+;Present stuff
+ORG $C132D5
+LDX $06
+PHX
+LDX $08
+PHX
+STA $0E
+STZ $10
+JSR $0489
+PLA
+STA $08
+PLA
+INC
+INC
+STA $06
+JML FindMovData
+GotMovData:
+STZ $10
+JSR $045D
+BRA $3A
+
+ORG $C7D8A5
+db $0A, $40, $A7, $EE
+
+ORG $EEA740
+db $09, $03, $ee, $d8, $c7, $00, $F4, $BA, $ee, $00, $FE, $BA, $ee, $00, $0a, $ad
+db $d8, $c7, $70, $71, $50, $a7, $95, $9c, $9c, $50, $9f, $96, $50, $a0, $a3, $a9
+db $93, $98, $99, $93, $50, $95, $9e, $95, $a2, $97, $a9, $50, $a3, $a0, $a2, $a5
+db $9e, $97, $50, $a5, $a0, $50, $96, $a2, $9f, $9d, $50, $99, $9e, $a3, $99, $94
+db $95, $51, $03, $1b, $04, $09, $10, $11, $92, $ee, $ff, $41, $92, $ee, $ff, $73
+db $92, $ee, $ff, $b0, $92, $ee, $ff, $e1, $92, $ee, $ff, $19, $93, $ee, $ff, $56
+db $93, $ee, $ff, $89, $93, $ee, $ff, $bb, $93, $ee, $ff, $ed, $93, $ee, $ff, $1f
+db $94, $ee, $ff, $50, $94, $ee, $ff, $8c, $94, $ee, $ff, $c4, $94, $ee, $ff, $02
+db $95, $ee, $ff, $55, $95, $ee, $ff, $55, $95, $ee, $ff, $02, $70, $71, $50, $a6
+db $9f, $99, $93, $95, $50, $a2, $91, $9e, $97, $50, $9f, $a5, $a4, $50, $96, $a2
+db $9f, $9d, $50, $a7, $99, $a4, $98, $99, $9e, $0A, $F5, $A7, $EE, $50, $a0, $a2
+db $95, $a3, $95, $9e, $a4, $51, $03, $00, $1b, $04, $09, $04, $30, $f8, $d5, $ff
+db $37, $f8, $d5, $ff, $3e, $f8, $d5, $ff, $45, $f8, $d5, $ff, $0A
+dl ExtraPresentCheck
+
+ORG $EEA810
+db $7f, $9e, $95, $a4, $a4, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $84
+db $a7, $9f, $a3, $9f, $9e, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $78
+db $91, $a0, $a0, $a9, $5d, $78, $91, $a0, $a0, $a9, $50, $86, $99, $9c, $9c, $91
+db $97, $95, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $84, $98, $a2, $95
+db $95, $94, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $83, $91, $a4, $a5
+db $a2, $9e, $50, $86, $91, $9c, $9c, $95, $a9, $50, $84, $95, $9c, $95, $a0, $9f
+db $a2, $a4, $00, $74, $a5, $a3, $a4, $a9, $50, $74, $a5, $9e, $95, $a3, $50, $84
+db $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $76, $9f, $a5, $a2, $a3, $99, $94, $95
+db $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $87, $99, $9e, $a4, $95, $a2
+db $a3, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $83, $a5, $9d, $9d, $95
+db $a2, $a3, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $83, $93, $91, $a2
+db $91, $92, $91, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $74, $91, $9c
+db $91, $91, $9d, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $74, $95, $95
+db $a0, $50, $74, $91, $a2, $9b, $9e, $95, $a3, $a3, $50, $84, $95, $9c, $95, $a0
+db $9f, $a2, $a4, $00, $84, $95, $9e, $94, $91, $50, $86, $99, $9c, $9c, $91, $97
+db $95, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00, $7c, $9f, $a3, $a4, $50
+db $85, $9e, $94, $95, $a2, $a7, $9f, $a2, $9c, $94, $50, $84, $95, $9c, $95, $a0
+db $9f, $a2, $a4, $00, $80, $a2, $9f, $97, $a2, $95, $a3, $a3, $99, $a6, $95, $50
+db $80, $9f, $9f, $50, $80, $83, $79, $00, $80, $91, $a5, $9c, $91, $00, $7a, $95
+db $96, $96, $00, $80, $9f, $9f, $00, $76, $9c, $a9, $99, $9e, $97, $50, $7d, $91
+db $9e, $00, $7D, $91, $97, $99, $93, $91, $9E, $A4, $50, $84, $95, $9C, $95, $A0
+db $9F, $A2, $A4, $00
+
+ORG $EEA963
+db $03, $06, $d2, $03, $6c, $a9, $ee, $ff, $1f, $02, $71, $18, $04, $10, $80, $18
+db $01, $01, $08, $90, $a9, $ee, $ff, $1b, $03, $83, $a9, $ee, $ff, $04, $d2, $03
+db $02
+
+ORG $EEA990
+db $70, $84, $98, $95, $a2, $95, $50, $99, $a3, $50, $91, $50, $1c, $05, $01, $50
+db $99, $9e, $50, $a4, $98, $95, $50, $a3, $a4, $91, $a4, $a5, $95, $57, $a3, $50
+db $95, $a9, $95, $5e, $03, $00, $1d, $00, $FF, $01, $1b, $03, $ef, $a9, $ee, $ff
+db $70, $72, $a5, $a4, $19, $10, $01, $1b, $04, $50, $1c, $02, $00, $50, $99, $a3
+db $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5
+db $93, $98, $50, $a3, $a4, $a5, $96, $96, $5e, $1f, $81, $00, $01, $13, $02, $1b
+db $04, $1f, $02, $74, $10, $30, $08, $58, $d9, $c7, $ff, $1f, $81, $ff, $ff, $02
+
+ORG $EEAA00
+db $18, $01, $01, $08, $12, $aa, $ee, $ff, $1b, $03, $11, $aa, $ee, $ff, $04, $e4
+db $03, $02, $1f, $17, $2e, $00, $0a, $00, $01, $70, $72, $95, $96, $9f, $a2, $95
+db $50, $79, $50, $97, $9f, $5c, $10, $0a, $50, $79, $50, $a7, $91, $9e, $a4, $50
+db $a9, $9f, $a5, $50, $a4, $9f, $50, $98, $91, $a6, $95, $50, $a4, $98, $99, $a3
+db $50, $1c, $05, $01, $5e, $03, $1d, $0e, $ff, $01, $1b, $02, $60, $aa, $ee, $ff
+db $08, $cf, $dc, $c7, $ff, $03, $1f, $1e, $2e, $00, $01, $1f, $81, $ff, $ff, $02
+db $00, $70, $72, $a5, $a4, $5c, $10, $0a, $50, $a9, $9f, $a5, $57, $a2, $95, $50
+db $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93
+db $98, $50, $a3, $a4, $a5, $96, $96, $5e, $03, $04, $2f, $01, $02; Buzz Buzz 2
+
+ORG $C78C32
+db $0A, $8D, $AA, $EE
+
+ORG $EEAA8D
+db $06, $76, $01, $9d, $aa, $ee, $ff, $05, $16, $02, $1f, $03, $0a, $ce, $88, $c8
+db $50, $18, $01, $01, $0a, $36, $8c, $c7
+
+ORG $C888D1
+db $70, $87, $98, $9f, $91, $98, $5e, $10, $0f, $50, $84, $98, $91, $a4, $50, $a4
+db $a5, $9e, $9e, $95, $9c, $57, $a3, $50, $98, $91, $a5, $9e, $a4, $95, $94, $5e
+db $03, $00, $70, $79, $57, $9d, $50, $9e, $9f, $a4, $50, $97, $9f, $99, $9e, $97
+db $50, $a4, $98, $91, $a4, $50, $a7, $91, $a9, $5e, $50, $10, $0f, $7d, $a9, $50
+db $9a, $9f, $92, $50, $91, $99, $9e, $57, $a4, $50, $a7, $9f, $a2, $a4, $98, $50
+db $a4, $98, $99, $a3, $51, $03, $00, $70, $89, $9f, $a5, $50, $97, $9f, $50, $9f
+db $9e, $50, $a9, $9f, $a5, $a2, $50, $9f, $a7, $9e, $51, $03, $1F, $41, $06, $00; Bus 2
+
+ORG $EEAAA5
+db $0D, $01, $0D, $01, $1b, $04, $09, $14, $fe, $aa, $ee, $00, $30, $ab, $ee, $00
+db $63, $ab, $ee, $00, $a3, $ab, $ee, $00, $d6, $ab, $ee, $00, $10, $ac, $ee, $00
+db $4f, $ac, $ee, $00, $84, $ac, $ee, $00, $b8, $ac, $ee, $00, $ec, $ac, $ee, $00
+db $20, $ad, $ee, $00, $53, $ad, $ee, $00, $8d, $ad, $ee, $00, $c7, $ad, $ee, $00
+db $07, $ae, $ee, $00, $40, $ae, $ee, $00, $62, $ae, $ee, $00, $84, $ae, $ee, $00
+db $a6, $ae, $ee, $00, $c5, $ae, $ee, $00, $02, $1f, $02, $67, $10, $30, $01, $70
+db $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7
+db $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50
+db $7f, $9e, $95, $a4, $a4, $51, $59, $04, $d1, $00, $02, $1f, $02, $67, $10, $30
+db $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98
+db $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4
+db $9f, $50, $84, $a7, $9f, $a3, $9f, $9e, $51, $59, $04, $d2, $00, $02, $1f, $02
+db $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95
+db $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2
+db $a4, $50, $a4, $9f, $50, $78, $91, $a0, $a0, $a9, $5d, $78, $91, $a0, $a0, $a9
+db $50, $86, $99, $9c, $9c, $91, $97, $95, $51, $59, $04, $dd, $00, $02, $1f, $02
+db $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95
+db $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2
+db $a4, $50, $a4, $9f, $50, $84, $98, $a2, $95, $95, $94, $51, $59, $04, $d3, $00
+db $02, $1f, $02, $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91
+db $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95
+db $a0, $9f, $a2, $a4, $50, $a4, $9f, $50, $83, $91, $a4, $a5, $a2, $9e, $50, $86
+db $91, $9c, $9c, $95, $a9, $51, $59, $04, $d5, $00, $02, $1f, $02, $67, $10, $30
+db $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98
+db $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4
+db $9f, $50, $74, $a5, $a3, $a4, $a9, $50, $74, $a5, $9e, $95, $a3, $50, $74, $95
+db $a3, $95, $a2, $a4, $51, $59, $04, $de, $00, $02, $1f, $02, $67, $10, $30, $01
+db $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98, $9f
+db $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f
+db $50, $76, $9f, $a5, $a2, $a3, $99, $94, $95, $51, $59, $04, $d6, $00, $02, $1f
+db $02, $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e
+db $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f
+db $a2, $a4, $50, $a4, $9f, $50, $87, $99, $9e, $a4, $95, $a2, $a3, $51, $59, $04
+db $d4, $00, $02, $1f, $02, $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c
+db $95, $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95
+db $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50, $83, $a5, $9d, $9d, $95, $a2
+db $a3, $51, $59, $04, $d7, $00, $02, $1f, $02, $67, $10, $30, $01, $70, $58, $1c
+db $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4
+db $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50, $83, $93
+db $91, $a2, $91, $92, $91, $51, $59, $04, $d9, $00, $02, $1f, $02, $67, $10, $30
+db $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98
+db $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4
+db $9f, $50, $74, $91, $9c, $91, $91, $9d, $51, $59, $04, $d8, $00, $02, $1f, $02
+db $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95
+db $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2
+db $a4, $50, $a4, $9f, $50, $74, $95, $95, $a0, $50, $74, $91, $a2, $9b, $9e, $95
+db $a3, $a3, $51, $59, $04, $da, $00, $02, $1f, $02, $67, $10, $30, $01, $70, $58
+db $1c, $02, $01, $50, $9c, $95, $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50
+db $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50, $84
+db $95, $9e, $94, $91, $50, $86, $99, $9c, $9c, $91, $97, $95, $51, $59, $04, $db
+db $00, $02, $1f, $02, $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95
+db $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c
+db $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50, $a4, $98, $95, $50, $7c, $9f, $a3
+db $a4, $50, $85, $9e, $94, $95, $a2, $a7, $9f, $a2, $9c, $94, $51, $59, $04, $dc
+db $00, $02, $1f, $02, $67, $10, $30, $01, $70, $58, $1c, $02, $04, $50, $9c, $95
+db $91, $a2, $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a5, $a3, $95
+db $06, $d1, $03, $36, $ae, $ee, $ff, $1c, $12, $15, $51, $59, $0A
+dl SetNpcPooPSIFlag
+db $02, $1c, $12, $16, $51, $59, $1f, $71, $04, $03, $02
+db $0A
+dl NPCPaulaTex
+NpcPaulaReturn:
+db $10
+db $85, $01, $1f, $03, $70, $58, $1c, $02, $02, $50, $9a, $9f, $99, $9e, $95, $94
+db $50, $a9, $9f, $a5, $5e, $59, $04, $e1, $03, $1f, $11, $02, $02
+
+db $0A
+dl NPCJeffTex
+NpcJeffReturn:
+db $10, $85, $01, $1f, $03, $70, $58, $1c, $02, $03, $50, $9a, $9f, $99, $9e
+db $95, $94, $50, $a9, $9f, $a5, $5e, $59, $04, $e2, $03, $1f, $11, $03, $02, $1f
+db $00, $00, $7b, $10, $85, $00, $1f, $03, $70, $58, $1c, $02, $04, $50, $9a, $9f
+db $99, $9e, $95, $94, $50, $a9, $9f, $a5, $5e, $59, $04, $10, $00, $1f, $11, $04
+db $02
+
+db $0A
+dl NPCPooTex
+NpcPooReturn:
+db $10, $85, $01, $1f, $03, $70, $58, $1c, $02, $0b, $50
+db $9a, $9f, $99, $9e, $95, $94, $50, $a9, $9f, $a5, $5e, $59, $1f, $11, $0b, $02
+db $1f, $02, $67, $10, $30, $01, $70, $58, $1c, $02, $01, $50, $9c, $95, $91, $a2
+db $9e, $95, $94, $50, $98, $9f, $a7, $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0
+db $9f, $a2, $a4, $50, $a4, $9f, $50, $7d, $91, $97, $99, $93, $91, $9e, $a4, $51
+db $59, $04, $DF, $00, $02; MASSIVE NPC PSI table
+
+ORG $C87E7C
+db $08, $b6, $dc, $c7, $00, $0D, $01
+
+ORG $C86305
+db $08, $b6, $dc, $c7, $00, $01, $01
+
+ORG $C66309
+db $19, $10, $01, $1b, $04
+
+ORG $C661D0
+db $a4, $98, $95, $50, $1c, $05, $01, $5e, $03, $00, $70, $80, $99, $a2, $9b, $9c
+db $95, $5c, $10, $0f, $50, $a4, $98, $95, $50, $7d, $91, $a9, $9f, $a2, $50, $9f
+db $96, $50, $7f, $9e, $95, $a4, $a4, $5c, $10, $15, $50, $a3, $98, $9f, $a5, $9c
+db $94, $50, $98, $91, $a6, $95, $50, $99, $a4, $5e, $03, $00, $70, $79, $96, $50
+db $a9, $9f, $a5, $50, $9e, $95, $95, $94, $50, $99, $a4, $5c, $10, $0f, $50, $97
+db $9f, $50, $a4, $91, $9c, $9b, $50, $a4, $9f, $50, $98, $99, $9d, $5e, $03, $00
+db $0a, $09, $63, $c6, $ff
+
+ORG $C72D49
+db $1c, $05, $01, $5e, $0a, $53, $2d, $c7
+
+ORG $C72D62
+db $08, $b6, $dc, $c7, $00, $01, $01
+
+ORG $C80021
+db $49
+
+ORG $C8001A
+db $49
+
+ORG $C80005
+db $01, $01, $01, $01, $01, $01
+
+ORG $C80044
+db $1c, $05, $01, $0a, $4b, $00, $c8
+
+ORG $C93E5D
+db $1c, $05, $01, $0a, $6b, $3e, $c9
+
+ORG $C93EE7
+db $01, $01, $01, $01, $01, $01
+
+ORG $C93F2A
+db $0A, $FA, $AE, $EE
+
+ORG $EEAEFA
+db $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $13, $04, $9e, $02, $02
+
+ORG $C80619
+db $1c, $05, $01, $0a, $20, $06, $c8
+
+ORG $C94E76
+db $0A, $4D, $BE, $EE
+
+ORG $EEBE4D
+db $50, $a4, $15, $d7, $04, $eb, $03, $0a, $7a, $4e, $c9
+
+ORG $C7617C
+db $08, $cf, $dc, $c7, $00, $04, $4c, $00
+
+ORG $EF96D3
+db $01, $01, $01
+
+ORG $D5F8E0
+db $70, $79, $50, $98, $91, $a6, $95, $50, $93, $9f, $9d, $95, $50, $a4, $9f, $50
+db $a4, $95, $91, $93, $98, $50, $a9, $9f, $a5, $50, $a4, $98, $99, $a3, $50, $a0
+db $9f, $a7, $95, $a2, $5e, $50, $71, $93, $93, $95, $a0, $a4, $50, $99, $a4, $50
+db $9e, $9f, $a7, $51, $03, $02, $ff, $ff, $70, $74, $95, $10, $05, $95, $10, $05
+db $95, $10, $05, $95, $10, $05, $95, $10, $05, $95, $9c, $99, $a6, $95, $a2, $a9
+db $50, $96, $9f, $a2, $50, $9f, $9e, $95, $19, $10, $01, $1b, $04, $50, $1c, $02
+db $00, $51, $03, $00, $70, $7f, $9e, $95, $50, $9f, $a2, $94, $95, $a2, $50, $9f
+db $96, $50, $91, $50, $02
+
+ORG $EEAF08
+db $08, $33, $af, $ee, $00, $01, $08, $30, $f8, $d5, $ff, $00, $1b, $03, $ff, $ff
+db $ff, $ff, $0a, $1f, $96, $c7, $1d, $0e, $ff, $01, $1b, $03, $29, $af, $ee, $ff
+db $02, $08, $b6, $dc, $c7, $ff, $03, $1f, $81, $ff, $ff, $02
+
+ORG $EEAF34
+db $03, $1d, $03, $ff, $1b, $02, $4d, $af, $ee, $ff, $1d, $0e, $ff, $11, $08, $cf
+db $dc, $c7, $ff, $03, $0a
+dl CabinTextJump
+db $c7, $00, $70, $89, $9f, $a5, $57, $a2
+db $95, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d
+db $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96, $5e, $03, $1f, $f1, $b5, $01, $0a
+db $00, $04, $ec, $03, $02
+
+ORG $CFA690
+db $ed, $03
+
+ORG $CFA6A1
+db $ed, $03
+
+ORG $CFA67F
+db $EC, $03
+
+ORG $CF8865
+db $4a, $6f
+
+ORG $CFA68E
+db $0A
+
+ORG $C796B8
+db $02
+
+ORG $CFB02B
+db $02
+
+ORG $EEAF79
+db $08, $78, $AF, $EE, $ff, $08, $af, $af, $ee, $ff, $1b, $03, $8d, $af, $ee, $ff
+db $0a, $a4, $9b, $ee, $70, $89, $9f, $a5, $57, $a2, $95, $50, $93, $91, $a2, $a2
+db $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3, $a4
+db $a5, $96, $96, $5e, $13, $02, $1c, $05, $01, $51, $03, $1d, $03, $ff, $1b, $02
+db $c2, $af, $ee, $ff, $1f, $81, $01, $02, $02, $1d, $0e, $ff, $01, $08, $cf, $dc
+db $c7, $ff, $03, $1f, $81, $ff, $ff, $02
+
+ORG $CFB034
+db $d1, $af, $ee
+
+ORG $EEAFD1
+db $1b, $00, $0a, $cb, $da, $c7, $1b, $01, $08, $40, $a7, $ee, $ff
+db $0A
+dl fix_boogey_tent
+
+ORG $C7DAEB
+db $0a, $d7, $af, $ee
+
+ORG $C7A300
+db $02
+
+ORG $EEAFE2
+db $08, $f1, $af, $ee, $ff, $1b, $02, $3d, $b0, $ee, $ff, $04, $e6, $03, $02, $01
+db $70, $87, $98, $9f, $91, $98, $51, $10, $0f, $50, $84, $98, $95, $a2, $95, $57
+db $a3, $50, $91, $50, $1c, $05, $01, $50, $91, $a4, $50, $a4, $98, $95, $50, $92
+db $9f, $a4, $a4, $9f, $9d, $50, $9f, $96, $50, $a4, $98, $95, $50, $93, $a5, $a0
+db $51, $03, $1d, $03, $ff, $1b, $02, $38, $b0, $ee, $ff, $1d, $0e, $ff, $01, $08
+db $cf, $dc, $c7, $ff, $13, $02, $1f, $81, $ff, $ff, $02, $01, $70, $72, $a5, $a4
+db $5c, $10, $0a, $50, $19, $10, $01, $1b, $04, $1c, $02, $00, $50, $99, $a3, $50
+db $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93
+db $98, $50, $a3, $a4, $a5, $96, $96, $5e, $13, $02
+
+ORG $C7EA9B
+db $04, $ab, $00, $01, $15, $3d, $17, $75, $15, $23, $00, $50, $50, $1c, $05, $00
+db $5e, $03, $1f, $30, $1d, $0e, $00, $fc, $08, $cf, $dc, $c7, $ff, $03, $01, $0a
+db $00, $ea, $c7
+
+ORG $C7EABF
+db $04, $aC, $00, $01, $15, $3d, $17, $75, $15, $23, $00, $50, $50, $1c, $05, $00
+db $5e, $03, $1f, $30, $1d, $0e, $00, $fc, $08, $cf, $dc, $c7, $ff, $03, $01, $0a
+db $00, $ea, $c7
+
+ORG $C7EAE3
+db $04, $ad, $00, $01, $15, $3d, $17, $75, $15, $23, $00, $50, $50, $1c, $05, $00
+db $5e, $03, $1f, $30, $1d, $0e, $00, $fc, $08, $cf, $dc, $c7, $ff, $03, $01, $0a
+db $00, $ea, $c7
+
+ORG $C7EA95
+db $BF
+
+ORG $C7EA8E
+db $E3
+
+ORG $C60D8A
+db $50, $1c, $05, $01, $0a, $99, $0d, $c6
+
+ORG $C60DA5
+db $1f, $1e, $1a, $03, $06, $1d, $0e, $ff, $bb
+
+ORG $C6F8FD
+db $6c, $b0, $ee
+
+ORG $C6FA30
+db $02
+
+ORG $EEB06C
+db $08, $0c, $fa, $c6, $ff, $06, $58, $00, $6b, $b0, $ee, $ff, $0e, $02, $0d, $01
+db $1b, $04, $0e, $03, $0d, $01, $0a, $40, $a7, $ee
+
+ORG $C6F957
+db $86, $b0, $ee
+
+ORG $EEB086
+db $08, $0c, $fa, $c6, $ff, $06, $67, $00, $6b, $b0, $ee, $ff, $0e, $02, $0d, $01
+db $1b, $04, $0e, $03, $0d, $01, $0a, $40, $a7, $ee
+
+ORG $C6F984
+db $A0, $B0, $EE
+
+ORG $EEB0A0
+db $08, $0c, $fa, $c6, $ff, $06, $17, $00, $6b, $b0, $ee, $ff, $0e, $02, $0d, $01
+db $1b, $04, $0e, $03, $0d, $01, $0a, $40, $a7, $ee
+
+ORG $C4FE40
+db $02
+
+ORG $C6F92A
+db $BA, $B0, $EE
+
+ORG $EEB0BA
+db $08, $0c, $fa, $c6, $ff, $06, $4e, $01, $6b, $b0, $ee, $ff, $0e, $02, $0d, $01
+db $1b, $04, $0e, $03, $0d, $01, $0a, $40, $a7, $ee
+
+ORG $C6AB8D
+db $67, $AC
+
+ORG $C6AC79
+db $0A, $EC, $AB, $C6
+
+ORG $EEB0D4
+db $08, $27, $b1, $ee, $ff, $08, $0b, $b1, $ee, $ff, $1b, $03, $e8, $b0, $ee, $ff
+db $0a, $ef, $99, $ee, $01, $70, $89, $9f, $a5, $57, $a2, $95, $50, $93, $91, $a2
+db $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3
+db $a4, $a5, $96, $96, $5e, $13, $02, $1c, $05, $02, $51, $03, $1d, $03, $ff, $1b
+db $02, $28, $b1, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $13, $1f
+db $81, $ff, $ff, $02, $1f, $81, $01, $01, $02
+
+ORG $C570A6
+db $1d, $03, $ff, $1d, $0e, $00, $8d, $08, $cf, $dc, $c7, $ff, $13, $02
+
+ORG $C6AEAC
+db $01, $01, $01, $01
+
+ORG $C6AEC3
+db $03, $1d, $0e, $ff, $01, $08, $b6, $dc, $c7, $ff, $0a, $dc, $ae, $c6
+
+ORG $2FFA6C
+db $1d, $03, $ff, $1b, $02, $94, $fa, $2f, $ff, $1d, $0e, $ff, $01, $08, $b6, $dc
+db $c7, $ff, $03, $04, $dd, $03, $02, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $00, $00, $00, $00, $00, $00, $00, $00, $70
+
+ORG $C625F5
+db $17, $fd, $a5, $50, $85, $9b, $a9, $a5, $9b, $a5, $99, $6f, $03, $00, $17, $73
+db $91, $a4, $15, $cb, $16, $fc, $a3, $17, $c7, $17, $07, $94, $99, $94, $15, $6c
+db $6f, $10, $14, $17, $9c, $a5, $a4, $5c, $17, $3f, $17, $6d, $15, $88, $91, $a4
+db $17, $35, $93, $a4, $17, $c9, $5c, $15, $66, $15, $b1, $6f, $59, $03, $1d, $0e
+db $ff, $a6
+
+ORG $C60FE5
+db $01, $01, $01, $1d, $0e, $00, $8b
+
+ORG $C951E3
+db $0A, $2D, $B1, $EE
+
+ORG $EEB12D
+db $08, $68, $b1, $ee, $ff, $1b, $02, $3c, $b1, $ee, $ff, $04, $65, $02, $02, $00
+db $70, $7b, $a9, $95, $95, $9b, $a9, $9f, $9b, $a9, $91, $03, $00, $70, $58, $89
+db $9f, $a5, $57, $a6, $95, $50, $97, $9f, $a4, $50, $a4, $9f, $9f, $50, $9d, $a5
+db $93, $98, $50, $9a, $a5, $9e, $9b, $51, $59, $13, $02, $18, $01, $01, $70, $7b
+db $95, $95, $9b, $a9, $9f, $9f, $9b, $a9, $91, $9b, $a9, $95, $91, $9b, $03, $00
+db $70, $58, $7a, $a5, $a3, $a4, $50, $9b, $99, $94, $94, $99, $9e, $97, $51, $50
+db $79, $57, $9c, $9c, $50, $97, $99, $a6, $95, $50, $a9, $9f, $a5, $50, $a4, $98
+db $99, $a3, $1c, $05, $01, $5e, $59, $03, $1d, $03, $ff, $1b, $02, $bd, $b1, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $1f, $81, $01, $01, $03, $02
+db $1f, $81, $ff, $ff, $02
+
+ORG $C99D3E
+db $D6
+
+ORG $C6D667
+db $0A, $C2, $B1, $EE
+
+ORG $C61014
+db $83, $9f, $50, $97, $9f, $9f, $94, $50, $9c, $a5, $93, $9b, $50, $a7, $99, $a4
+db $98, $50, $a4, $98, $91, $a4, $5e, $13, $0a, $e4, $10, $c6
+
+ORG $C60FF3
+db $04, $2a, $02;Set the flag
+
+ORG $EEB1C2
+db $1d, $03, $ff, $1b, $02, $7d, $92, $c8, $ff, $1d, $0e, $ff, $01, $08, $b6, $dc
+db $c7, $ff, $03, $00, $0a, $de, $92, $c8
+
+ORG $EF66AC
+db $0A, $DA, $B1, $EE
+
+ORG $EEB1DA
+db $04, $76, $01, $04, $4e, $02, $04, $6f, $02, $0a, $b2, $66, $EF
+
+ORG $C7AAB8
+db $1d, $03, $ff, $1b, $02, $e2, $aa, $c7, $ff, $1d, $0e, $ff, $04, $08, $b6, $dc
+db $c7, $ff, $03, $18, $04, $0a, $0f, $b7, $c7
+
+ORG $C7B595
+db $1d, $0e, $ff, $01, $08, $b6, $dc, $c7, $ff, $03, $0a, $af, $b5, $c7
+
+ORG $C7B576
+db $1d, $03, $ff, $01
+
+ORG $EE9A8B
+db $0A, $2E, $B2, $EE
+
+ORG $EEB22E
+db $08, $66, $b2, $ee, $ff, $1b, $03, $3d, $b2, $ee, $ff, $0a, $90, $9a, $ee, $04
+db $ee, $03, $18, $01, $01, $70, $87, $98, $91, $a4, $6f, $51, $50, $89, $9f, $a5
+db $57, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f
+db $50, $9d, $a5, $93, $98, $51, $13, $02, $1d, $03, $ff, $1b, $02, $81, $b2, $ee
+db $ff, $18, $01, $01, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $1f, $81
+db $ff, $ff, $02, $1f, $81, $01, $01, $02
+
+ORG $CFC80B
+db $86, $B2, $EE
+
+ORG $EEB286
+db $06, $8b, $00, $88, $c5, $c7, $00, $06, $ee, $03, $2e, $b2, $ee, $00, $0a, $6b
+db $2c, $c8
+
+ORG $EEB298
+db $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $02
+
+ORG $C6E9D0
+db $98, $b2, $ee
+
+ORG $C6E9A3
+db $00
+
+ORG $C29298
+RTL
+
+ORG $C6EB30
+db $1d, $03, $ff, $1b, $02, $59, $eb, $c6, $00, $1d, $0e, $ff, $01, $08, $b6, $dc
+db $c7, $ff, $0a, $54, $eb, $c6
+
+ORG $C6EF1F
+db $03, $0A, $AB, $B2, $EE
+
+ORG $EEB2AB
+db $01, $08, $2c, $b2, $ee, $ff, $08, $c1, $b2, $ee, $ff, $1b, $03, $e3, $b2, $ee
+db $ff, $0a, $7b, $ee, $c6, $00, $1c, $05, $01, $51, $03, $1d, $03, $ff, $1b, $02
+db $de, $b2, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $1f, $81
+db $ff, $ff, $02, $1f, $81, $01, $01, $02, $01, $70, $89, $9f, $a5, $57, $a2, $95
+db $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5
+db $93, $98, $51, $03, $02
+
+ORG $C8B19F
+db $04, $0B, $00
+
+ORG $C920B8
+db $0A, $00, $B3, $EE
+
+ORG $EEB300
+db $1f, $21, $51, $1f, $e5, $ff, $1f, $21, $24, $1f, $e5, $ff, $1f, $ec, $ff, $06
+db $08, $1f, $b3, $ee, $ff, $1b, $03, $f3, $b3, $ee, $ff, $0A
+dl ActivateCakeEnemies
+db $10
+db $20, $1f, $1a, $2d, $04, $03, $1f, $16, $2d, $04, $01, $1f, $e6, $2d, $04, $10
+db $1a, $1f, $1b, $2d, $04, $18, $01, $01, $70, $89, $9f, $a5, $57, $a2, $95, $50
+db $96, $99, $9e, $91, $9c, $9c, $a9, $50, $91, $a7, $91, $9b, $95, $5e, $03, $00
+db $70, $89, $9f, $a5, $50, $a7, $95, $a2, $95, $50, $9f, $a5, $a4, $50, $96, $9f
+db $a2, $50, $a1, $a5, $99, $a4, $95, $50, $91, $a7, $98, $99, $9c, $95, $5e, $5e
+db $5e, $10, $0f, $50, $84, $91, $9b, $95, $50, $a4, $98, $99, $a3, $50, $91, $a3
+db $50, $91, $9e, $50, $91, $a0, $9f, $9c, $9f, $97, $a9, $50, $96, $a2, $9f, $9d
+db $50, $9d, $95, $5e, $03, $1d, $03, $ff, $1b, $02, $ad, $b3, $ee, $ff, $1d, $0e
+db $ff, $01, $08, $b6, $dc, $c7, $ff, $03, $1f, $81, $ff, $ff, $02, $01, $70, $89
+db $9f, $a5, $57, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4
+db $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96, $51, $03, $00
+db $70, $79, $57, $9c, $9c, $50, $98, $9f, $9c, $94, $50, $9f, $9e, $a4, $9f, $50
+db $99, $a4, $50, $96, $9f, $a2, $50, $9e, $9f, $a7, $5e, $03, $04, $ef, $03, $1f
+db $81, $01, $01, $02
+
+ORG $C8B226
+db $01, $01, $01
+
+ORG $C8B192
+db $EF, $03
+
+ORG $C8B22F
+db $1d, $03, $ff, $1b, $02, $ad, $b3, $ee, $ff, $05, $ef, $03, $04, $3d, $00, $0a
+db $50, $b3, $ee
+
+ORG $C928FB
+db $01, $01
+
+ORG $C92992
+db $F4, $B3, $EE
+
+ORG $EEB3F4
+db $01, $1f, $81, $ff, $ff, $08, $08, $b4, $ee, $ff, $1b, $03, $87, $b4, $ee, $ff
+db $04, $11, $01, $02, $01, $70, $84, $98, $95, $50, $9d, $91, $a3, $a4, $95, $a2
+db $50, $98, $91, $a3, $50, $95, $9e, $a4, $a2, $a5, $a3, $a4, $95, $94, $50, $9d
+db $95, $50, $a4, $9f, $50, $94, $95, $9c, $99, $a6, $95, $a2, $50, $a4, $98, $99
+db $a3, $51, $03, $1d, $03, $ff, $1b, $02, $4f, $b4, $ee, $ff, $1d, $0e, $ff, $01
+db $08, $cf, $dc, $c7, $ff, $03, $1f, $81, $ff, $ff, $02, $01, $70, $89, $9f, $a5
+db $50, $98, $91, $a6, $95, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $51, $03
+db $00, $70, $84, $98, $95, $50, $9d, $91, $a3, $a4, $95, $a2, $50, $a7, $99, $9c
+db $9c, $50, $98, $9f, $9c, $94, $50, $9f, $9e, $a4, $9f, $50, $99, $a4, $5e, $04
+db $F0, $03, $03, $02
+
+ORG $C9C992
+db $f0, $03, $88, $b4, $ee
+
+ORG $EEB488
+db $70, $89, $9f, $a5, $50, $98, $91, $a6, $95, $50, $9c, $95, $96, $a4, $50, $a4
+db $98, $99, $a3, $5e, $1d, $03, $ff, $1b, $02, $b0, $b4, $ee, $ff, $05, $f0, $03
+db $04, $11, $01, $0a, $40, $b4, $ee, $ff, $01, $70, $89, $9f, $a5, $50, $98, $91
+db $a6, $95, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $5e, $13, $02
+
+ORG $6101A7
+db $0A, $C6, $B4, $EE
+
+ORG $EEB4C6
+db $1f, $81, $ff, $ff, $01, $08, $c5, $b4, $ee, $ff, $08, $e0, $b4, $ee, $ff, $1b
+db $03, $02, $b5, $ee, $ff, $0a, $b2, $01, $61, $00, $1c, $05, $01, $51, $03, $1d
+db $03, $ff, $1b, $02, $fd, $b4, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7
+db $ff, $03, $1f, $81, $ff, $ff, $02, $1f, $81, $01, $01, $02, $01, $70, $89, $9f
+db $a5, $57, $a6, $95, $50, $97, $9f, $a4, $50, $a4, $9f, $9f, $50, $9d, $a5, $93
+db $98, $50, $a3, $a4, $a5, $96, $96, $51, $13, $02
+
+ORG $C8720E
+db $03
+
+ORG $CF6733
+db $0A, $00
+
+ORG $C4FEE0
+db $02, $00, $87, $04, $a9, $9e, $7d, $04, $20, $58
+
+ORG $D5F9A0
+StarstormBits:
+db $02, $04
+
+CharFlags:
+dw $03E1, $003E2, $0010, $0068, $0417
+
+ORG $CFD67D
+db $62, $00, $04, $0A, $00
+
+ORG $CFD685
+db $67, $32, $C9
+
+ORG $C5744D
+db $0A, $20, $B5, $EE
+
+ORG $C9327F
+db $0A
+
+ORG $EEB520
+db $08, $32, $b5, $ee, $ff, $1b, $03, $49, $b5, $ee, $ff, $04, $d9, $03, $0a, $84
+db $32, $c9, $1d, $03, $ff, $1b, $02, $4a, $b5, $ee, $ff, $1d, $0e, $ff, $01, $08
+db $cf, $dc, $c7, $ff, $03, $1f, $81, $ff, $ff, $02, $01, $70, $77, $95, $a4, $50
+db $a2, $99, $94, $50, $9f, $96, $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97
+db $5c, $50, $96, $99, $a2, $a3, $a4, $5e, $13, $1f, $81, $01, $01, $02
+
+ORG $CFD682
+db $d9, $03, $01
+
+ORG $CF20E2
+db $00, $00, $00;Post-pyramid door script. In case I need to flag the rock later.
+
+ORG $CF672F
+db $00, $00
+
+ORG $C576C2
+db $08, $b6, $dc, $c7, $00, $1b, $05
+
+ORG $C9E510
+db $08, $cf, $dc, $c7, $00, $1b, $05
+
+ORG $C9E7A0
+dl Truffle1
+
+ORG $EEB56E
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $02
+
+ORG $C9E7B9
+dl Truffle2
+
+ORG $EEB59A
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $02
+
+ORG $C9E7D2
+dl Truffle3
+
+ORG $EEB5C6
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $02
+
+ORG $C9E7EB
+dl Truffle4
+
+ORG $EEB5F2
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $02
+
+ORG $C9E804
+dl Truffle5
+
+ORG $EEB61E
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $02
+
+ORG $C9E7AA
+db $01, $01, $01, $01, $01
+
+ORG $C9E838
+db $02
+
+ORG $EEA147
+db $0A, $4A, $B6, $EE
+
+ORG $EEB64A
+db $1f, $81, $ff, $ff, $08, $3a, $b6, $ee, $ff, $08, $62, $b6, $ee, $ff, $1b, $03
+db $3a, $b6, $ee, $ff, $0a, $52, $a1, $ee, $1c, $05, $01, $51, $03, $1d, $03, $ff
+db $1b, $02, $7f, $b6, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $1f, $81, $ff, $ff, $02, $01, $70, $89, $9f, $a5, $57, $a6, $95, $50, $97, $9f
+db $a4, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96
+db $51, $1f, $81, $01, $01, $13, $02
+
+ORG $C9E750
+db $0a, $57, $e7, $c9
+
+ORG $C9DAB2
+db $1b, $05, $1f, $02, $74, $10, $3c, $18, $01, $01, $70, $1c, $02, $01, $50, $9c
+db $16, $74, $15, $32, $9c, $95, $91, $94, $95, $a2, $15, $09, $84, $16, $74, $91
+db $16, $ef, $99, $92, $15, $15, $92, $17, $37, $50, $6c, $7f, $17, $82, $17, $93
+db $15, $1b, $83, $98, $a9, $16, $09, $5e, $6e, $03, $00, $1d, $0e, $ff, $d3
+
+ORG $EE95A6
+db $70, $0a, $71, $98, $ee
+
+ORG $EE98AD
+db $0a, $a1, $b6, $ee
+
+ORG $EEB6A1
+db $18, $01, $01, $1f, $81, $ff, $ff, $08, $b7, $b6, $ee, $ff, $1b, $03, $b6, $b6
+db $ee, $ff, $04, $da, $03, $02, $70, $58, $78, $95, $a9, $51, $10, $0f, $50, $84
+db $98, $95, $a2, $95, $57, $a3, $50, $91, $50, $1c, $05, $01, $50, $99, $9e, $50
+db $a4, $98, $95, $50, $93, $a5, $a0, $51, $59, $03, $1d, $03, $ff, $1b, $02, $f3
+db $b6, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $1f, $81, $ff
+db $ff, $02, $01, $70, $58, $72, $a5, $a4, $5c, $10, $0a, $50, $a9, $9f, $a5, $50
+db $a7, $95, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f
+db $9f, $50, $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96, $5e, $59, $03, $1f
+db $81, $01, $01, $02
+
+ORG $EE987A
+db $01, $01, $01, $1f, $02, $44, $10, $60, $18, $01, $01, $01, $70
+
+ORG $EE98BD
+db $01, $70
+
+ORG $EE9876
+db $B5, $98, $EE
+
+ORG $C9DEDA
+db $0A, $25, $B7, $EE
+
+ORG $EEB725
+db $18, $01, $01, $1f, $81, $ff, $ff, $08, $3b, $b7, $ee, $ff, $1b, $03, $ad, $b7
+db $ee, $ff, $04, $a7, $01, $02, $70, $58, $78, $95, $a9, $51, $10, $0f, $50, $84
+db $98, $95, $a2, $95, $50, $99, $a3, $50, $91, $50, $1c, $05, $01, $50, $a5, $9e
+db $94, $95, $a2, $50, $a4, $98, $95, $50, $a2, $9f, $93, $9b, $51, $59, $03, $1d
+db $03, $ff, $1b, $02, $7c, $b7, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7
+db $ff, $03, $1f, $81, $ff, $ff, $02, $01, $70, $58, $72, $a5, $a4, $5c, $10, $0a
+db $50, $a9, $9f, $a5, $50, $a7, $95, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99
+db $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96
+db $96, $5e, $59, $13, $1f, $81, $01, $01, $02
+
+ORG $C77612
+db $1c, $05, $01
+
+ORG $EEA26A
+db $0a, $ae, $b7, $ee
+
+ORG $EEB7AE
+db $01, $1f, $81, $ff, $ff, $08, $06, $bb, $ee, $ff, $1b, $03, $ff, $ff, $ff, $ff
+db $18, $04, $04, $f2, $03, $0a, $74, $a2, $ee, $70, $72, $a9, $50, $93, $9c, $95
+db $91, $a2, $99, $9e, $97, $50, $98, $99, $a3, $50, $9d, $99, $9e, $94, $5c, $10
+db $0a, $50, $1c, $02, $01, $50, $a2, $95, $9d, $95, $9d, $92, $95, $a2, $95, $94
+db $50, $a7, $98, $95, $a2, $95, $50, $98, $95, $50, $9c, $95, $96, $a4, $50, $a4
+db $98, $95, $50, $1c, $05, $01, $51, $03, $1d, $03, $ff, $1b, $02, $1E, $b8, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $b6, $dc, $c7, $ff, $03, $1f, $81, $ff, $ff, $02
+db $01, $70, $58, $79, $a4, $57, $a3, $50, $98, $95, $a2, $95, $50, $99, $9e, $50
+db $7d, $91, $97, $99, $93, $91, $9e, $a4, $5c, $10, $0a, $50, $a7, $99, $a4, $98
+db $50, $84, $a2, $91, $93, $a9, $5e, $59, $03, $04, $f1, $03, $1f, $81, $ff, $ff
+db $02
+
+ORG $C772FF
+db $0a, $51, $b8, $ee
+
+ORG $EEB851
+db $06, $f1, $03, $61, $b8, $ee, $ff, $70, $72, $a2, $15, $5d, $0a, $04, $73, $c7
+db $70, $72, $a2, $9f, $a4, $98, $95, $a2, $51, $03, $00, $70, $79, $50, $96, $9f
+db $a5, $9e, $94, $50, $a9, $9f, $a5, $a2, $50, $1c, $05, $01, $5e, $03, $00, $1d
+db $03, $ff, $1b, $02, $8d, $b8, $ee, $ff, $0a, $0F, $b8, $ee, $01, $70, $72, $a5
+db $a4, $50, $a9, $9f, $a5, $57, $a6, $95, $50, $97, $9f, $a4, $50, $a4, $9f, $9f
+db $50, $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96, $51, $13
+
+ORG $EF5917
+db $02
+
+ORG $C9BC48
+db $02
+
+ORG $CFBAC3
+db $24, $C0, $EE
+
+ORG $EEB8AE
+db $06, $86, $00, $6d, $fe, $c4, $ff, $02
+
+ORG $C9B9DA
+db $02
+
+ORG $C7F348
+db $0A, $B6, $B8, $EE
+
+ORG $EEB8B6
+db $04, $a9, $00, $1f, $f1, $e5, $02, $1e, $01, $0a, $f4, $f3, $c7
+
+ORG $EEB8C3
+db $1f, $81, $ff, $ff, $08, $d6, $b8, $ee, $ff, $1b, $03, $be, $b8, $ee, $ff, $04
+db $e5, $03, $02, $01, $70, $84, $98, $99, $a3, $50, $1c, $05, $01, $5e, $03, $1d
+db $03, $ff, $1b, $02, $f7, $b8, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7
+db $ff, $03, $1f, $81, $ff, $ff, $02, $01, $70, $7e, $9f, $a4, $50, $9e, $9f, $a7
+db $5e, $03, $00, $70, $89, $9f, $a5, $50, $91, $a2, $95, $50, $93, $91, $a2, $a2
+db $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $5e, $13, $1f
+db $81, $01, $01, $02
+
+ORG $EEB927
+db $70, $71, $50, $9d, $a9, $a3, $a4, $95, $a2, $99, $9f, $a5, $a3, $50, $9d, $91
+db $93, $98, $99, $9e, $95, $50, $a0, $91, $a2, $a4, $5e, $03, $00, $70, $84, $98
+db $95, $50, $a7, $9f, $a2, $94, $a3, $5c, $10, $0a, $50, $6C, $83, $7b, $89, $50
+db $82, $85, $7e, $7e, $75, $82, $50, $7d, $7b, $5e, $50, $61, $6E, $50, $91, $a2
+db $95, $50, $95, $9d, $92, $9c, $91, $aa, $9f, $9e, $95, $94, $50, $9f, $9e, $50
+db $a4, $98, $95, $50, $a3, $99, $94, $95, $5e, $13, $02
+
+ORG $C551D6
+db $0a, $27, $b9, $ee
+
+ORG $D56812
+db $85, $76, $7f, $50, $95, $9e, $97, $99, $9e, $95, $00
+
+ORG $D5682F
+db $01, $00
+
+ORG $D5682E
+db $04
+
+ORG $D568C8
+db $00, $00
+
+ORG $D56971
+db $7c, $95, $a4, $a4, $95, $a2, $50, $96, $9f, $a2, $50, $84, $9f, $9e, $a9, $00
+
+ORG $EEB982
+db $70, $71, $50, $9c, $95, $a4, $a4, $95, $a2, $50, $91, $94, $94, $a2, $95, $a3
+db $a3, $95, $94, $50, $a4, $9f, $50, $84, $9f, $9e, $a9, $50, $96, $a2, $9f, $9d
+db $50, $91, $50, $a3, $a4, $a5, $94, $95, $9e, $a4, $50, $91, $a4, $50, $83, $9e
+db $9f, $a7, $50, $87, $9f, $9f, $94, $5e, $13, $02
+
+ORG $C6FDC1
+db $74, $95, $91, $a2, $50, $84, $9f, $9e, $a9, $5c, $10, $0a, $50, $a7, $95, $50
+db $a3, $98, $9f, $a5, $9c, $94, $50, $97, $95, $a4, $50, $a4, $9f, $97, $95, $a4
+db $98, $95, $a2, $50, $91, $9e, $94, $50, $a0, $9c, $91, $a9, $50, $91, $9e, $50
+db $71, $a2, $93, $98, $99, $a0, $95, $9c, $91, $97, $9f, $50, $a3, $95, $95, $94
+db $50, $a3, $9f, $9d, $95, $a4, $99, $9d, $95, $5e, $03, $00, $70, $79, $50, $a4
+db $98, $99, $9e, $9b, $50, $7d, $91, $a8, $a7, $95, $9c, $9c, $50, $a3, $91, $99
+db $94, $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $91, $92, $9f, $a5
+db $a4, $50, $99, $a4, $50, $9c, $91, $a3, $a4, $50, $9e, $99, $97, $98, $a4, $5e
+db $13, $02, $7d, $a7, $91, $99, $15, $b5, $a3, $95, $15, $b2, $16, $e6, $95, $a2
+db $17, $30
+
+ORG $C5549F
+db $0a, $82, $b9, $ee
+
+ORG $C55CD7
+db $70, $71, $50, $92, $a2, $91, $a3, $a3, $50, $a0, $9f, $9c, $99, $93, $95, $9d
+db $91, $9e, $57, $a3, $50, $92, $91, $94, $97, $95, $50, $92, $95, $91, $a2, $99
+db $9e, $97, $50, $a4, $98, $95, $50, $a3, $a9, $9d, $92, $9f, $9c, $50, $9f, $96
+db $50, $a4, $98, $95, $50, $7f, $9e, $95, $a4, $a4, $50, $80, $9f, $9c, $99, $93
+db $95, $50, $74, $95, $a0, $91, $a2, $a4, $9d, $95, $9e, $a4, $5e, $13, $02
+
+ORG $D56EC6
+db $80, $9f, $9c, $99, $93, $95, $50, $92, $91, $94, $97, $95
+
+ORG $D56EE3
+db $01, $00
+
+ORG $D56F0A
+db $01, $00
+
+ORG $D56EED
+db $7d, $99, $9e, $99, $9e, $97, $50, $a0, $95, $a2, $9d, $99, $a4, $00
+
+ORG $C55D37
+db $0a, $bc, $b9, $ee
+
+ORG $EEB9BC
+db $70, $71, $50, $aa, $9f, $9e, $99, $9e, $97, $50, $a0, $95, $a2, $9d, $99, $a4
+db $50, $91, $9c, $9c, $9f, $a7, $99, $9e, $97, $50, $a4, $98, $95, $50, $93, $9f
+db $9e, $a3, $a4, $a2, $a5, $93, $a4, $99, $9f, $9e, $50, $9f, $96, $50, $91, $50
+db $9d, $99, $9e, $95, $50, $99, $9e, $50, $a4, $98, $95, $50, $74, $a5, $a3, $a4
+db $a9, $50, $74, $a5, $9e, $95, $a3, $50, $74, $95, $a3, $95, $a2, $a4, $5e, $03
+db $00, $70, $79, $a4, $50, $92, $95, $91, $a2, $a3, $50, $91, $50, $76, $9f, $a5
+db $a2, $a3, $99, $94, $95, $50, $9c, $95, $97, $99, $a3, $9c, $91, $a4, $99, $9f
+db $9e, $50, $a3, $a4, $91, $9d, $a0, $50, $9f, $96, $50, $94, $a5, $92, $99, $9f
+db $a5, $a3, $50, $9c, $95, $97, $99, $a4, $99, $9d, $91, $93, $a9, $5e, $13, $02
+
+ORG $D57220
+db $82, $95, $a0, $95, $9c, $50, $a3, $91, $9e, $94, $a7, $99, $93, $98
+
+ORG $C5601B
+db $82, $95, $a0, $95, $9c, $a3, $50, $a9, $9f, $a5, $a2, $50, $95, $9e, $95, $9d
+db $99, $95, $a3
+
+ORG $C5605E
+db $82, $95, $a0, $95, $9c, $a3, $50, $a9, $9f, $a5, $a2, $50, $95, $9e, $95, $9d
+db $99, $95, $a3
+
+ORG $D57247
+db $82, $95, $a0, $95, $9c, $50, $a3, $a5, $a0, $95, $a2, $a7, $99, $93, $98, $00
+
+ORG $D5F955
+db $08, $54, $95, $ee, $ff, $18, $04, $02
+
+ORG $C862BE
+db $50, $91, $50, $1c, $05, $01
+
+ORG $00FFD7
+db $12
+
+ORG $FFEEEE
+db $A4
+
+ORG $FFFFFF
+db $A4
+
+;db "how come inserting some random ass data into the game makes bsdiff respect my tokens" PUT THIS BACK WHEN PATCHING
+
+ORG $EEBA50
+db $70, $58, $78, $95, $a9, $51, $10, $0f, $50, $84, $98, $95, $a2, $95, $50, $99
+db $a3, $50, $91, $50, $1c, $05, $01, $50, $9f, $9e, $50, $a4, $98, $95, $50, $a3
+db $98, $95, $9c, $96, $51, $59, $03, $0a, $6e, $7e, $c8
+
+ORG $C87E4C
+db $0a, $50, $ba, $ee
+
+ORG $EEBA80
+db $a4, $16, $55, $50, $1c, $05, $01, $5e, $0a, $bc, $19, $c8
+
+ORG $C819B8
+db $0a, $80, $ba, $ee
+
+ORG $EEBA8D
+db $50, $91, $50, $1c, $05, $01, $50, $9f, $15, $7a, $0a, $94, $31, $c9
+
+ORG $C9318F
+db $0a, $8d, $ba, $ee
+
+ORG $CF2095
+db $93, $20, $cf
+
+ORG $CF61D5
+db $D1, $80;Music flag for the lilliput void
+
+ORG $CF2099
+dw $01D9
+
+
+ORG $D6FAA0
+MoveItemNames:
+PHB
+PHA
+PHX
+PHY
+XBA
+SEP #$10
+TAX
+PHX
+LDA #$0000
+CheckDataNum:
+CPX #$00
+BEQ PullData
+DEX
+CLC
+ADC #$0080
+BRA CheckDataNum
+PullData:
+REP #$10
+CLC
+TAX
+LDA #$007F
+LDY #$FF80
+MVN $FF7E
+SEP #$10
+PLX
+LDA #$0000
+CheckNameIndex:
+CPX #$00
+BEQ PullPlayerName
+DEX
+CLC
+ADC #$0030
+BRA CheckNameIndex
+PullPlayerName:
+REP #$10
+CLC
+ADC #$8000
+TAX
+LDA #$002F
+LDY #$FF50
+MVN $FF7E
+PLY
+PLX
+PLA
+PLB
+RTL
+
+FindMovData:
+LDA [$06]
+STA $0E
+JSL MoveItemNames
+JML GotMovData
+; A far copy of $C19216
+
+
+  R_Peek_Parameter_Bytes:
+rep #$31
+phd
+tdc
+adc #$ffee
+tcd
+; First things first: get the text pointer
+lda $97b8
+sta $00
+asl     ; 2
+adc $00 ; 3
+asl     ; 6
+asl     ; 12
+adc $00 ; 13
+asl     ; 26
+adc $00 ; 27
+; We now have [0x97b8] * 27 in A.
+sta $00
+; Load the text pointer from the table at 0x7E96AA into 0xE.
+tax
+lda $96aa,x
+sta $0e
+lda $96ac,x
+sta $10
+; Load amount into X. Also store into 0x02 for later use
+sty $02
+tyx
+; The memcpy routine copies words. If we have an odd number of
+; bytes, it will round down. We add 1 so that it effectively rounds up.
+inx
+lda #$97ba
+; Copy it: X bytes from [0x0e] to (A).
+jsl $c08ed2
+; Zero out upper bytes of cc_argv
+ldy $02
+tya
+lsr ; Get lower order bit in carry, and branch if 0
+lda #$0000
+bcc .aligned
+; Align Y to next word
+sep #$20
+sta $97ba,y
+rep #$31
+bra .unaligned
+.loop:
+sta $97ba,y
+iny
+.unaligned:
+iny
+.aligned:
+cpy #$0016
+bmi .loop
+.end:
+pld
+rtl
+
+RepelEnemies:
+REP #$31
+DEC
+TAY
+CMP #$000A
+BEQ CheckRepels
+CheckNormal:
+JML ExitRepelCheck
+CheckRepels:
+PHA
+LDA $9E3C
+BEQ RepelsEmpty
+PLA
+JML ExitRepelCheck_ForceFlagOn
+RepelsEmpty:
+PLA
+BRA CheckNormal
+
+ORG $C57675
+db $0a, $9b, $ba, $ee
+
+ORG $EEBA9B
+db $50, $1c, $05, $01, $0a, $79, $76, $c5
+
+ORG $C6DD98
+db $50, $70, $78, $95, $a2, $95, $57, $a3, $50, $9d, $a9, $50, $9c, $a5, $93, $9b
+db $a9, $50, $1c, $05, $01, $5e, $10, $0f, $50, $79, $50, $98, $91, $a6, $95, $50
+db $9f, $9e, $9c, $a9, $50, $a5, $a3, $95, $94, $50, $99, $a4, $50, $9f, $9e, $93
+db $95, $50, $a3, $99, $9e, $93, $95, $50, $a4, $98, $95, $50, $9c, $91, $a3, $a4
+db $50, $a7, $91, $a3, $98, $99, $9e, $97, $5e, $03, $00, $0a, $2c, $de, $c6
+
+ORG $C6E9A7
+db $1c, $05, $01, $0a, $b9, $e9, $c6
+
+ORG $C8ABB4
+db $91, $50, $1c, $05, $01, $0a, $c8, $ab, $c8
+
+ORG $C6C05F
+db $1c, $05, $01, $0a, $66, $c0, $c6
+
+ORG $C60E49
+db $70, $87, $98, $91, $a4, $50, $91, $a2, $95, $50, $a9, $9f, $a5, $50, $94, $9f
+db $99, $9e, $97, $50, $99, $9e, $50, $9d, $a9, $50, $93, $91, $a6, $95, $6f, $03
+db $00, $70, $84, $91, $9b, $95, $50, $a4, $98, $99, $a3, $50, $1c, $05, $01, $50
+db $91, $9e, $94, $50, $9c, $95, $91, $a6, $95, $5e, $03, $0a, $dc, $0f, $c6
+
+ORG $C9820F
+db $a4, $98, $95, $50, $1c, $05, $01, $5e, $0a, $26, $82, $c9
+
+ORG $EEAF08
+db $0a, $a3, $ba, $ee
+
+ORG $EEBAA3
+db $08, $4b, $ba, $ee, $ff, $08, $b8, $ba, $ee, $ff, $1b, $03, $4b, $ba, $ee, $ff
+db $0a, $1a, $af, $ee, $ff, $1c, $05, $01, $51, $03, $1d, $03, $ff, $1b, $02, $d5
+db $ba, $ee, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $1f, $81, $ff
+db $ff, $02, $00, $70, $89, $9f, $a5, $50, $98, $91, $a6, $95, $50, $a4, $9f, $9f
+db $50, $9d, $a5, $93, $98, $50, $9a, $a5, $9e, $9b, $5e, $13, $1f, $81, $01, $01
+db $02
+
+ORG $EEBAF4
+db $01, $0a, $52, $a7, $ee
+
+ORG $EEBAFE
+db $01, $0a, $cc, $a7, $ee
+
+ORG $EEAE84
+db $01, $08, $3e, $f8, $d5, $01, $01
+
+ORG $C1F72F
+;LDA #$00FF
+
+ORG $C1F74A
+;LDA #$00FF
+
+ORG $C1F765
+;LDA #$00FF
+
+ORG $C1F780
+;LDA #$00FF
+
+;ORG $C1F72A
+;LDA #$AF10;Flavor pointer
+
+ORG $C1FE8A
+LDA #$1FB8
+
+ORG $C1FE90
+LDA #$0450
+
+ORG $C4FD70
+db $FF, $FF, $FF
+
+ORG $EEBB03
+db $18, $04, $02
+
+ORG $EEBB06
+db $18, $01, $01, $0A, $C7, $B7, $EE
+
+ORG $C7DFE9
+db $0A, $0D, $BB, $EE
+
+;Magicant stat boosts
+ORG $EEBB0D
+db $1d, $19, $02, $1b, $03, $31, $bb, $ee, $ff, $1d, $19, $03, $1b, $03, $c5, $bb
+db $ee, $ff, $1d, $19, $04, $1b, $03, $9d, $bc, $ee, $ff, $1d, $19, $05, $1b, $03
+db $a4, $bd, $ee, $ff, $18, $01, $01, $19, $10, $01, $1b, $04, $70, $1c, $02, $00
+db $08, $ea, $fb, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $67, $fc, $d6
+db $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $e9, $fc, $d6, $ff, $00, $70, $19
+db $10, $01, $1b, $04, $08, $62, $fd, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04
+db $08, $e1, $fd, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $5b, $fe, $d6
+db $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $d6, $fe, $d6, $ff, $00, $70, $19
+db $10, $01, $1b, $04, $08, $4f, $ff, $d6, $ff, $18, $04, $1f, $41, $0e, $10, $1e
+db $18, $01, $0e, $70, $1c, $02, $01, $50, $97, $91, $99, $9e, $95, $94, $50, $62
+db $60, $60, $5c, $60, $60, $60, $50, $95, $a8, $a0, $5e, $03, $1e, $09, $01, $40
+db $d0, $03, $00, $18, $04, $10, $13, $02, $18, $01, $01, $19, $10, $01, $1b, $04
+db $70, $1c, $02, $00, $08, $ea, $fb, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04
+db $08, $67, $fc, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $e9, $fc, $d6
+db $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $62, $fd, $d6, $ff, $00, $70, $19
+db $10, $01, $1b, $04, $08, $e1, $fd, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04
+db $08, $5b, $fe, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $d6, $fe, $d6
+db $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $4f, $ff, $d6, $ff, $18, $04, $1f
+db $41, $0e, $10, $1e, $18, $01, $0e, $70, $1c, $02, $01, $50, $91, $9e, $94, $50
+db $19, $10, $02, $1b, $04, $1c, $02, $00, $50, $97, $91, $99, $9e, $95, $94, $50
+db $61, $60, $60, $5c, $60, $60, $60, $50, $95, $a8, $a0, $5e, $03, $1e, $09, $01
+db $a0, $86, $01, $00, $19, $10, $02, $1b, $04, $09, $04, $ff, $ff, $ff, $ff, $79
+db $bc, $ee, $22, $85, $bc, $ee, $33, $91, $bc, $ee, $44, $02, $1e, $09, $02, $a0
+db $86, $01, $00, $18, $04, $10, $13, $02, $1e, $09, $03, $a0, $86, $01, $00, $18
+db $04, $10, $13, $02, $1e, $09, $04, $a0, $86, $01, $00, $18, $04, $10, $13, $02
+db $18, $01, $01, $19, $10, $01, $1b, $04, $70, $1c, $02, $00, $08, $ea, $fb, $d6
+db $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $67, $fc, $d6, $ff, $00, $70, $19
+db $10, $03, $1b, $04, $08, $e9, $fc, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04
+db $08, $62, $fd, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $e1, $fd, $d6
+db $ff, $00, $70, $19, $10, $03, $1b, $04, $08, $5b, $fe, $d6, $ff, $00, $70, $19
+db $10, $01, $1b, $04, $08, $d6, $fe, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04
+db $08, $4f, $ff, $d6, $ff, $18, $04, $1f, $41, $0e, $10, $1e, $18, $01, $0e, $70
+db $75, $a6, $95, $a2, $a9, $9f, $9e, $95, $50, $97, $91, $99, $9e, $95, $94, $50
+db $66, $66, $5c, $60, $60, $60, $50, $95, $a8, $a0, $5e, $03, $1e, $09, $01, $d0
+db $01, $01, $00, $19, $10, $02, $01, $01, $09, $04, $ff, $ff, $ff, $ff, $47, $bd
+db $ee, $11, $53, $bd, $ee, $22, $5f, $bd, $ee, $33, $1e, $09, $02, $d0, $01, $01
+db $00, $0a, $6b, $bd, $ee, $ff, $1e, $09, $03, $d0, $01, $01, $00, $0a, $6b, $bd
+db $ee, $ff, $1e, $09, $04, $d0, $01, $01, $00, $0a, $6b, $bd, $ee, $ff, $19, $10
+db $03, $09, $04, $ff, $ff, $ff, $ff, $80, $bd, $ee, $22, $8c, $bd, $ee, $33, $98
+db $bd, $ee, $44, $1e, $09, $02, $d0, $01, $01, $00, $18, $04, $10, $13, $02, $1e
+db $09, $03, $d0, $01, $01, $00, $18, $04, $10, $13, $02, $1e, $09, $04, $d0, $01
+db $01, $00, $18, $04, $10, $13, $02, $18, $01, $01, $70, $1c, $02, $01, $08, $ea
+db $fb, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $67, $fc, $d6, $ff, $00
+db $70, $19, $10, $03, $1b, $04, $08, $e9, $fc, $d6, $ff, $00, $70, $19, $10, $04
+db $1b, $04, $08, $62, $fd, $d6, $ff, $00, $70, $19, $10, $01, $1b, $04, $08, $e1
+db $fd, $d6, $ff, $00, $70, $19, $10, $02, $1b, $04, $08, $5b, $fe, $d6, $ff, $00
+db $70, $19, $10, $03, $1b, $04, $08, $d6, $fe, $d6, $ff, $00, $70, $19, $10, $04
+db $1b, $04, $08, $4f, $ff, $d6, $ff, $18, $04, $1f, $41, $0e, $10, $1e, $18, $01
+db $0e, $70, $75, $a6, $95, $a2, $a9, $9f, $9e, $95, $50, $97, $91, $99, $9e, $95
+db $94, $50, $65, $60, $5c, $60, $60, $60, $50, $95, $a8, $a0, $5e, $03, $1e, $09
+db $01, $50, $c3, $00, $00, $1e, $09, $02, $50, $c3, $00, $00, $1e, $09, $03, $50
+db $c3, $00, $00, $1e, $09, $04, $50, $c3, $00, $00, $00, $18, $04, $10, $13, $02
+
+ORG $D6FBEA
+db $50, $a7, $91, $a3, $50, $96, $99, $9c, $9c, $95, $94, $50, $a7, $99, $a4, $98
+db $50, $a4, $98, $95, $50, $80, $9f, $a7, $95, $a2, $50, $9f, $96, $50, $a4, $98
+db $95, $50, $77, $99, $91, $9e, $a4, $50, $83, $a4, $95, $a0, $51, $03, $00, $70
+db $1c, $02, $00, $57, $a3, $50, $83, $a0, $95, $95, $94, $50, $99, $9e, $93, $a2
+db $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0c
+db $00, $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $86, $99, $a4, $91, $9c
+db $99, $a4, $a9, $50, $99, $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9
+db $50, $65, $51, $1f, $02, $28, $1e, $0d, $00, $05, $03, $02, $02, $1c, $02, $00
+db $50, $a7, $91, $a3, $50, $96, $99, $9c, $9c, $95, $94, $50, $a7, $99, $a4, $98
+db $50, $a4, $98, $95, $50, $80, $9f, $a7, $95, $a2, $50, $9f, $96, $50, $a4, $98
+db $95, $50, $7c, $99, $9c, $9c, $99, $a0, $a5, $a4, $50, $83, $a4, $95, $a0, $a3
+db $51, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $77, $a5, $a4, $a3, $50, $99
+db $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02
+db $28, $1e, $0b, $00, $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $86, $99
+db $a4, $91, $9c, $99, $a4, $a9, $50, $99, $9e, $93, $a2, $95, $91, $a3, $95, $94
+db $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0d, $00, $05, $03, $02, $1c
+db $02, $00, $50, $a7, $91, $a3, $50, $96, $99, $9c, $9c, $95, $94, $50, $a7, $99
+db $a4, $98, $50, $a4, $98, $95, $50, $80, $9f, $a7, $95, $a2, $50, $9f, $96, $50
+db $a4, $98, $95, $50, $7d, $99, $9c, $9b, $a9, $50, $87, $95, $9c, $9c, $51, $03
+db $00, $70, $1c, $02, $00, $57, $a3, $50, $83, $a0, $95, $95, $94, $50, $99, $9e
+db $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28
+db $1e, $0c, $00, $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $79, $81, $50
+db $99, $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f
+db $02, $28, $1e, $0a, $00, $05, $03, $02, $1c, $02, $00, $50, $a7, $91, $a3, $50
+db $96, $99, $9c, $9c, $95, $94, $50, $a7, $99, $a4, $98, $50, $a4, $98, $95, $50
+db $80, $9f, $a7, $95, $a2, $50, $9f, $96, $50, $a4, $98, $95, $50, $7d, $91, $97
+db $9e, $95, $a4, $50, $78, $99, $9c, $9c, $51, $03, $00, $70, $1c, $02, $00, $57
+db $a3, $50, $86, $99, $a4, $91, $9c, $99, $a4, $a9, $50, $99, $9e, $93, $a2, $95
+db $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0d, $00
+db $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $7c, $a5, $93, $9b, $50, $99
+db $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02
+db $28, $1e, $0e, $00, $05, $03, $02, $1c, $02, $00, $50, $a7, $91, $a3, $50, $96
+db $99, $9c, $9c, $95, $94, $50, $a7, $99, $a4, $98, $50, $a4, $98, $95, $50, $80
+db $9f, $a7, $95, $a2, $50, $9f, $96, $50, $a4, $98, $95, $50, $82, $91, $99, $9e
+db $a9, $50, $73, $99, $a2, $93, $9c, $95, $51, $03, $00, $70, $1c, $02, $00, $57
+db $a3, $50, $77, $a5, $a4, $a3, $50, $99, $9e, $93, $a2, $95, $91, $a3, $95, $94
+db $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0b, $00, $05, $03, $00, $70
+db $1c, $02, $00, $57, $a3, $50, $79, $81, $50, $99, $9e, $93, $a2, $95, $91, $a3
+db $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0a, $00, $05, $03
+db $02, $1c, $02, $00, $50, $a7, $91, $a3, $50, $96, $99, $9c, $9c, $95, $94, $50
+db $a7, $99, $a4, $98, $50, $a4, $98, $95, $50, $80, $9f, $a7, $95, $a2, $50, $9f
+db $96, $50, $a4, $98, $95, $50, $80, $99, $9e, $9b, $50, $73, $9c, $9f, $a5, $94
+db $51, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $83, $a0, $95, $95, $94, $50
+db $99, $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f
+db $02, $28, $1e, $0c, $00, $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $77
+db $a5, $a4, $a3, $50, $99, $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92, $a9
+db $50, $65, $51, $1f, $02, $28, $1e, $0b, $00, $05, $03, $02, $1c, $02, $00, $50
+db $a7, $91, $a3, $50, $96, $99, $9c, $9c, $95, $94, $50, $a7, $99, $a4, $98, $50
+db $a4, $98, $95, $50, $80, $9f, $a7, $95, $a2, $50, $9f, $96, $50, $a4, $98, $95
+db $50, $7c, $a5, $9d, $99, $9e, $95, $50, $78, $91, $9c, $9c, $51, $03, $00, $70
+db $1c, $02, $00, $57, $a3, $50, $7c, $a5, $93, $9b, $50, $99, $9e, $93, $a2, $95
+db $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0e, $00
+db $05, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $79, $81, $50, $99, $9e, $93
+db $a2, $95, $91, $a3, $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e
+db $0a, $00, $05, $03, $02, $1c, $02, $00, $50, $a7, $91, $a3, $50, $96, $99, $9c
+db $9c, $95, $94, $50, $a7, $99, $a4, $98, $50, $a4, $98, $95, $50, $80, $9f, $a7
+db $95, $a2, $50, $9f, $96, $50, $a4, $98, $95, $50, $76, $99, $a2, $95, $50, $83
+db $a0, $a2, $99, $9e, $97, $51, $03, $00, $70, $1c, $02, $00, $57, $a3, $50, $83
+db $a0, $95, $95, $94, $50, $99, $9e, $93, $a2, $95, $91, $a3, $95, $94, $50, $92
+db $a9, $50, $65, $51, $1f, $02, $28, $1e, $0c, $00, $05, $03, $00, $70, $1c, $02
+db $00, $57, $a3, $50, $7c, $a5, $93, $9b, $50, $99, $9e, $93, $a2, $95, $91, $a3
+db $95, $94, $50, $92, $a9, $50, $65, $51, $1f, $02, $28, $1e, $0e, $00, $05, $03
+db $02
+
+ORG $EEBE58
+db $1f, $02, $74, $10, $3c, $18, $04, $1f, $02, $66, $10, $64, $18, $01, $01, $18
+db $01, $01, $70, $58, $84, $95, $9e, $94, $91, $50, $73, $98, $99, $95, $96, $50
+db $97, $9f, $a4, $50, $a4, $98, $95, $50, $0A, $6A, $C6, $EE, $59, $03, $0a, $ed
+db $da, $c9
+
+ORG $C9DAB4
+db $0A, $58, $BE, $EE
+
+ORG $EEA9AF
+db $0A, $9A, $BE, $EE
+
+ORG $EEBE8A
+db $50, $99, $9e, $50, $a4, $98, $95, $50, $a3, $a4, $91, $a4, $a5, $95, $57, $a3
+db $50, $95, $a9, $95, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $c0, $a9, $ee, $ff
+db $0a, $b6, $a9, $ee
+
+ORG $EEBEAE
+db $1d, $03, $ff, $1b, $02, $25, $eb, $c7, $ff, $0a, $00, $ea, $c7, $1d, $03, $ff
+db $1b, $02, $25, $eb, $c7, $ff, $0a, $00, $ea, $c7
+
+ORG $C6053B
+db $91, $50, $1c, $05, $01, $50, $0a, $45, $05, $c6
+
+ORG $C9E3E7
+db $0A, $C8, $BE, $EE
+
+ORG $EEBEC8
+db $15, $6c, $6f, $51, $03, $00, $70, $79, $57, $9c, $9c, $50, $97, $99, $a6, $95
+db $50, $a9, $9f, $a5, $50, $9d, $a9, $50, $1c, $05, $01, $51, $01, $0a, $ec, $e3
+db $c9
+
+ORG $C7EA80
+db $0A, $2F, $C0, $EE
+;fix
+ORG $EEC02F
+db $06, $ad, $00, $ff, $ff, $ff, $ff, $06, $ac, $00, $51, $C0, $ee, $ff, $06, $ab
+db $00, $5E, $C0, $ee, $ff, $1d, $03, $ff, $1b, $02, $25, $eb, $c7, $ff, $0a, $89
+db $ea, $c7, $1d, $03, $ff, $1b, $02, $25, $eb, $c7, $ff, $0a, $89, $ea, $c7, $1d
+db $03, $ff, $1b, $02, $25, $eb, $c7, $ff, $0a, $89, $ea, $c7
+
+ORG $EEAFB4
+db $0A, $04, $BF, $EE
+
+ORG $EEAFBC
+db $01
+
+ORG $EEBF04
+db $1d, $03, $ff, $1b, $02, $bc, $af, $ee, $ff, $0a, $c2, $af, $ee
+
+ORG $EEBF11
+db $06, $2C, $01, $81, $bf, $ee, $ff, $18, $01, $01, $70, $58, $87, $98, $9f, $91
+db $98, $51, $10, $0f, $50, $84, $98, $95, $a2, $95, $57, $a3, $50, $91, $50, $aa
+db $9f, $9d, $92, $99, $95, $50, $94, $9f, $99, $9e, $97, $50, $99, $a3, $9f, $9d
+db $95, $a4, $a2, $99, $93, $50, $95, $a8, $95, $a2, $93, $99, $a3, $95, $a3, $50
+db $9f, $9e, $50, $a4, $98, $95, $50, $95, $9e, $a4, $a2, $91, $9e, $93, $95, $51
+db $03, $00, $70, $72, $95, $a4, $a4, $95, $a2, $50, $93, $9f, $9d, $95, $50, $92
+db $91, $93, $9b, $50, $9c, $91, $a4, $95, $a2, $5e, $5e, $5e, $59, $13, $18, $04
+db $02
+
+ORG $CF0CF8
+db $11, $bf, $ee, $ff, $2C, $81
+
+ORG $C887F5
+db $00, $00, $00
+
+ORG $C88840
+db $00, $00, $00
+
+ORG $EEB53B
+db $0A, $9C, $BF, $EE
+
+ORG $EEB498
+db $0A, $82, $BF, $EE
+
+ORG $EEBF82
+db $98, $99, $a3, $50, $1c, $05, $01, $5e, $03, $0a, $9c, $b4, $ee
+
+ORG $EEB432
+db $0A, $8F, $BF, $EE
+
+ORG $EEBF8F
+db $98, $99, $a3, $50, $1c, $05, $01, $51, $03, $0a, $37, $b4, $ee
+
+ORG $EEBF9C
+db $01, $70, $79, $a4, $57, $a3, $50, $91, $50, $1c, $05, $01, $5e, $03, $1d, $0e
+db $ff, $01, $0a, $3f, $b5, $ee
+
+ORG $EEB37E
+db $0A, $B2, $BF, $EE
+
+ORG $EEBFB2
+db $1c, $05, $01, $50, $91, $a3, $50, $91, $0a, $82, $b3, $ee
+
+ORG $EEB082
+db $0A, $BE, $BF, $EE
+
+ORG $EEBFBE
+db $01, $01, $01, $0a, $40, $a7, $ee
+
+ORG $EEB09C
+db $0A, $C5, $BF, $EE
+
+ORG $EEBFC5
+db $01, $01, $01, $0a, $40, $a7, $ee
+
+ORG $EEB0B6
+db $0A, $CC, $BF, $EE
+
+ORG $EEBFCC
+db $01, $01, $01, $0a, $40, $a7, $ee
+
+ORG $EEB0D0
+db $0A, $D3, $BF, $EE
+
+ORG $EEBFD3
+db $01, $01, $01, $0a, $40, $a7, $ee
+
+ORG $EEB26F
+db $0A, $DA, $BF, $EE
+
+ORG $EEBFDA
+db $18, $01, $01, $70, $58, $79, $a4, $57, $a3, $50, $91, $50, $1c, $05, $01, $5e
+db $59, $03, $1d, $0e, $ff, $01, $0a, $76, $b2, $ee
+
+ORG $EFFB66
+GetStartingNames:
+PHB
+PHX
+PHY
+LDA $D7FCD0
+STA $9831
+LDA $D7FCD2
+STA $9833
+LDA #$0017
+LDX #$FCE0
+LDY #$9801
+MVN $D77E
+PLY
+PLX
+PLB
+JML GiveTeddyOnLoad
+
+ResetStatus:
+STZ $9A3B
+STZ $9A9A
+STZ $9AF9
+JML $C4C7D4
+
+ResetGame:
+JSL $C087CE
+ResetRoutine:
+STZ $F640
+ResetTimer:
+INC $F640
+LDA $F640
+CMP #$FFFF
+BEQ EndReset
+BRA ResetTimer
+EndReset:
+INC $F642
+LDA $F642
+CMP #$0005
+BEQ ReallyReset
+BRA ResetRoutine
+ReallyReset:
+REP #$20
+LDA #$0000
+TCD
+LDA #$01FF
+TCS
+LDA #$0000
+LDX #$0000
+LDY #$0000
+CLC
+XCE
+SEP #$35
+REP #$CA
+JML $C08000
+
+ClearStorageMenu:
+JSL $EF0115
+LDA $8958
+AND #$00FF
+CMP #$000D
+BNE EndStorageCheck2
+PHY
+JSL $C3E7E3
+JSL $C1DD53
+PLY
+EndStorageCheck2:
+RTL
+
+AutoText:
+LDA $0069
+AND #$4000;Is Y held?
+BEQ .HoldY
+RTL
+.HoldY:
+LDA $006D
+AND #$E0A0
+RTL
+
+LostScriptedFight:
+STZ $5D98
+LDA #$0001
+PLD
+RTL
+
+ClearNameOnBattle:
+LDA #$0001
+STA $5D98
+STZ $B573
+RTL
+;;;;;;;;;;;;;;;;
+;Franklin badge stuff
+ReflectSpecial:
+LDX #$00FF
+LDA $12
+PHA
+PHX
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+.Reflect:
+PLX
+PLA
+JML $C2954E
+
+ReflectFire:
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+LDX $A972
+LDA $003A,X
+JML $C2959D
+
+ReflectFreeze:
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+LDX $A972
+LDA $0038,X
+JML $C295FA
+
+ReflectFireBall:
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+LDX $A972
+LDA $003A,X
+AND #$00FF
+JML $C29024
+
+ReflectFlash:
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+LDA $B58A
+AND #$00FF
+BNE ReflectPrayClear
+JSR ReflectAttack
+.Reflect:
+ReflectFlash.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+LDX $A972
+SEP #$20
+JML $C298BB
+ReflectPrayClear:
+STZ $B58A
+BRA ReflectFlash.Reflect
+
+ReflectStarstorm:
+CMP #$0000
+BNE StarstormEnd
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+JML $C29A95
+StarstormEnd:
+JML $C29AA4
+
+ReflectExplode:
+PHX
+LDA $0E
+PHA
+LDA $0F
+PHA
+JSR CheckFranklinBadge
+CMP #$0000
+BEQ .Reflect
+JSR ReflectAttack
+SEP #$20
+LDA #$02
+STA $AA96
+REP #$20
+.Reflect:
+PLA
+STA $0F
+PLA
+STA $0E
+LDA #$0000
+STA $04
+PLX
+JML $C2A66B
+
+CheckFranklinBadge:
+LDX $A972
+REP #$20
+LDA $000E,X
+AND #$00FF
+BNE NotPlayerChar
+LDX #$0001
+STX $16
+LDX $A972
+LDA $0010,X
+AND #$00FF
+INC
+LDX $16
+JSL $C45683
+RTS
+NotPlayerChar:
+LDA #$0000
+RTS
+
+ReflectAttack:
+;LDA $AA96
+;AND #$00FF
+;BNE SkipReflect
+LDA #$7160
+STA $0E
+LDA #$00EF
+STA $10
+JSL $C1DC1C
+LDA #$0001
+STA $AA96
+JSL DealReflect
+RTS
+SkipReflect:
+STZ $AA96
+SkipSuperreflect:
+RTS
+
+SkipExplosionDeathReflect:
+LDA $AA90; Is death attack?
+AND #$00FF
+BEQ .ForceExplode
+LDA $AA96
+AND #$00FF
+CMP #$0002
+BEQ .SkipExplode; Is already reflected
+.ForceExplode
+LDA $1A
+JML ExplodeReturn
+.SkipExplode:
+JML $C2A6A9
+;;;;;;;;;;;;;;;;;
+CopyAPData:
+JSL $EF0C15
+PHA
+PHX
+PHB
+LDY #$0000
+LDX $16
+.CheckCurFile:
+LDA #$7E00
+.CheckZero:
+CPX #$0000
+BEQ .GotSaveDest
+CLC
+ADC #$0010
+DEX
+BRA .CheckZero
+.GotSaveDest
+CPY #$0001
+BEQ .PerformCopy
+PHA
+LDA $B4A1
+AND #$00FF
+TAX
+INY
+BRA .CheckCurFile
+.PerformCopy:
+TAX
+PLA
+TAY
+LDA #$000F
+MVN $2020
+PLB
+PLX
+PLA
+RTL
+
+DeleteAPData:
+JSL $EF0BFA
+LDA $B4A1
+AND #$00FF
+TAX
+LDA #$7E00
+.CheckSave:
+CPX #$0000
+BEQ .GotSave
+CLC
+ADC #$0010
+DEX
+BRA .CheckSave
+.GotSave:
+PHX
+PHY
+PHB
+TAY
+LDX #$FF70
+LDA #$000F
+MVN $FF20
+PLB
+PLY
+PLX
+RTL
+
+PlayerJustDied:
+SEP #$20
+LDA $B582; If the player just died in battle, dont send any more deaths 
+BNE SkipSendingDeath
+;In this case, we died on the overworld
+INC $B582;Player is currently dead
+LDA $B583;Did the player just get killed by a deathlink death?
+BNE SkipSendingDeath
+INC $B584;Tell the serveer we died
+SkipSendingDeath:
+STZ $B583
+REP #$20
+JSL $C4C718
+RTL
+
+CheckDeathHealing:
+PHX
+PHY
+LDX $A972
+LDA $000E,X
+AND #$00FF
+BNE NotHealPlayer;1 if enemy
+LDA $B583;Deathlink from server- if mortal mode, this will always return 1 if the death was from a link
+AND #$00FF
+BEQ ResetDeathLinkHeal;Mortal no mercy mode will put this here; else, it will be a BRA
+PLY
+PLX
+STY $16
+TYX
+LDA $02
+JML $C272D0
+NotHealPlayer:
+PLY
+PLX
+STY $16
+TYX
+LDA $02
+JML $C272CD
+ResetDeathLinkHeal:
+SEP #$20
+STZ $B583;This means that the player healed, and the death is not solely from the deathlink anymore
+REP #$20
+BRA NotHealPlayer
+
+OverrideDeathlinkText:
+LDX $A972
+LDA $000E,X
+AND #$00FF
+BNE .NotPlayer
+LDA $B583;
+AND #$0FF
+BEQ .NotPlayer;If the player is not currently in a deathlink, act normal. This will be a BRA if mercy mode is ON
+LDA #$CD0C
+STA $0E
+LDA #$00EE
+STA $10
+JML $C272E4
+.NotPlayer:
+LDX $02
+LDY $16
+JML $C272D4
+
+OverrideDeathlinkHeal:
+LDX $A972
+LDA $000E,X
+AND #$00FF
+BNE NotPlayerForRevive
+LDA $B583
+AND #$00FF
+BEQ ReviveClearDeathlinkFlag;Change to BRA if mercy mode ON
+LDA #$CD0C
+STA $0E
+LDA #$00EE
+STA $10
+JSL $C1DC1C
+JML $C2754B
+NotPlayerForRevive:
+JSL $C1DC1C
+JML $C273B4
+ReviveClearDeathlinkFlag:
+SEP #$20
+STZ $B583
+REP #$20
+BRA NotPlayerForRevive
+
+SendDeathInBattle:
+SEP #$20
+INC $B582;Player is currently dead
+LDA $B583;Did the player just get killed by a deathlink death?
+BNE .SkipSendingDeath
+INC $B584;Is the player sending a death
+.SkipSendingDeath:
+STZ $B583
+REP #$20
+JSL $C1DC1C
+RTL
+
+ClearStoredAPItem:
+LDA $06
+CMP #$EA7F
+BNE SkipAPCheck
+LDA $08
+AND #$00FF
+CMP #$00C7
+BNE SkipAPCheck
+STZ $B573
+STZ $B579
+SkipAPCheck:
+LDX #$0000
+LDA #$0001
+JML $C18A23
+
+PrayerReflectIgnore:
+LDA #$0001
+STA $B58A
+LDA $C4A2F9,X
+JML $C2AD2E
+
+ORG $C2FFE0
+DealReflect:
+JSR $7E8A
+RTL
+
+ExplodeReturn:
+JSR $6A44
+JML $C2A670
+;;;;;;;;;;;;;;;;;;;;
+;old code
+
+
+
+
+
+
+;;;;;;;;;;;;;;;;
+ORG $C7DE7E
+db $F4, $BF, $EE
+
+ORG $EEBFF4
+db $08, $11, $de, $c7, $00, $02, $7B, $C6, $EE, $02
+
+
+;If easy death:
+
+ORG $EEBFF9
+;db $1E
+
+ORG $C4C7CE
+;JML ResetStatus
+
+ORG $C4C7D4
+;NOP
+;NOP
+;NOP
+
+ORG $C912F2
+;db $0A, $FE, $BF, $EE
+
+ORG $EEBFFE
+db $1b, $04, $15, $38, $1f, $81, $ff, $ff, $1b, $04, $0a, $f7, $12, $c9
+
+
+org $D8D35A
+dw new_collision
+
+org $D8D354
+dw new_collision
+
+org $D8FFF0
+new_collision:
+db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $82, $00, $00, $00, $00
+
+ORG $C79609
+db $0A, $0D, $C0, $EE
+
+ORG $EEC00D
+db $50, $99, $9d, $91, $1f, $81, $ff, $ff, $0a, $0D, $96, $C7
+
+ORG $D5F970
+db $1F, $81, $FF, $FF, $0A, $E0, $F8, $D5
+
+ORG $C79640
+db $0A, $19, $C0, $EE
+
+ORG $EEC019
+db $a4, $98, $99, $a3, $50, $0a, $44, $96, $c7
+
+ORG $C8A2D1
+db $00, $00, $00; summers phonecall oss
+
+ORG $EEC022
+db $96, $c7, $06, $86, $00, $6d, $fe, $c4, $ff, $0a, $9e, $c5, $c7
+
+ORG $C9C27A
+db $02; Future past apple kid. Eventually change with seed-related text
+
+ORG $CFDE16
+db $00;Broken Phase distorter not appearing
+
+ORG $D56F7C
+db $00
+
+ORG $C7EA03
+db $49
+
+ORG $D57775
+db $8C
+
+ORG $C95BA7
+db $0A, $70, $C0, $EE
+
+ORG $EEC070
+db $06, $77, $00, $1e, $c1, $ee, $ff, $70, $89, $95, $a0, $5e, $50, $10, $0f, $84
+db $98, $95, $50, $82, $a5, $9e, $91, $a7, $91, $a9, $50, $76, $99, $a6, $95, $50
+db $9f, $a7, $95, $50, $9d, $95, $50, $91, $50, $9c, $9f, $a4, $50, $9f, $96, $50
+db $9d, $9f, $9e, $95, $a9, $5e, $03, $00, $70, $84, $98, $95, $a9, $57, $9c, $9c
+db $50, $a0, $a2, $9f, $92, $91, $92, $9c, $a9, $50, $92, $95, $50, $98, $95, $a2
+db $95, $50, $9c, $9f, $9e, $97, $95, $a2, $50, $a4, $98, $91, $9e, $50, $79, $57
+db $a6, $95, $50, $92, $95, $95, $9e, $50, $99, $9e, $50, $72, $7b, $5c, $10, $0a
+db $50, $a5, $9e, $9c, $95, $a3, $a3, $50, $a9, $9f, $a5, $50, $a7, $91, $9e, $a4
+db $50, $a4, $9f, $50, $a0, $91, $a9, $50, $9f, $96, $96, $50, $a4, $98, $95, $99
+db $a2, $50, $94, $95, $92, $a4, $5e, $5e, $5e, $50, $78, $95, $98, $5c, $10, $0a
+db $50, $98, $95, $98, $5c, $10, $0a, $50, $98, $95, $98, $5e, $13, $02, $70, $83
+db $98, $9f, $9f, $a4, $5e, $03, $00, $70, $79, $57, $9d, $50, $a3, $a4, $99, $9c
+db $9c, $50, $99, $9e, $50, $72, $7b, $5c, $10, $0a, $50, $a4, $9f, $9f, $5e, $13
+db $02; Poochyfud text
+
+ORG $C9C262
+db $0a, $41, $c1, $ee
+
+ORG $EEC141
+db $70, $79, $50, $a2, $95, $91, $94, $50, $a3, $9f, $9d, $95, $a7, $98, $95, $a2
+db $95, $5c, $10, $0a, $50, $a4, $98, $91, $a4, $50, $a9, $9f, $a5, $50, $93, $91
+db $9e, $50, $08, $b2, $f0, $ee, $ff, $0a, $98, $c1, $ee, $95, $50, $a0, $9f, $a7
+db $95, $a2, $50, $9f, $96, $50, $a4, $98, $95, $50, $75, $91, $a2, $a4, $98, $50
+db $99, $a4, $a3, $95, $9c, $96, $50, $99, $9e, $a4, $9f, $50, $a9, $9f, $a5, $a2
+db $50, $98, $95, $91, $a2, $a4, $5c, $03, $00, $70, $92, $a9, $50, $a0, $a5, $a2
+db $99, $96, $a9, $99, $9e, $97, $50, $1c, $0a, $01, $00, $00, $00, $50, $9f, $96
+db $50, $a4, $98, $95, $50, $6C, $10, $06, $89, $9f, $a5, $a2, $50, $83, $91, $9e
+db $93, $a4, $a5, $91, $a2, $a9, $6E, $10, $06, $50, $9c, $9f, $93, $91, $a4, $99
+db $9f, $9e, $a3, $5c, $03, $00, $08, $40, $c1, $ee, $ff, $08, $40, $c1, $ee, $ff
+db $08, $40, $c1, $ee, $ff, $70, $a7, $98, $91, $a4, $95, $a6, $95, $a2, $50, $a4
+db $98, $91, $a4, $50, $9d, $95, $91, $9e, $a3, $5e, $13, $02, $70, $9f, $a2, $50
+db $a4, $98, $91, $a4, $50, $a9, $9f, $a5, $50, $93, $91, $9e, $50, $a3, $91, $a6
+db $95, $50, $a4, $98, $95, $50, $a7, $9f, $a2, $9c, $94, $50, $92, $a9, $50, $a0
+db $a5, $a2, $99, $96, $a9, $99, $9e, $97, $50, $62, $50, $9d, $9f, $a2, $95, $5c
+db $03, $02, $70, $91, $9e, $94, $50, $a4, $98, $91, $a4, $50, $a9, $9f, $a5, $50
+db $9e, $95, $95, $94, $50, $a4, $9f, $50, $a0, $a5, $a2, $97, $95, $50, $a4, $98
+db $95, $50, $95, $a6, $99, $9c, $50, $96, $a2, $9f, $9d, $50, $a9, $9f, $a5, $a2
+db $50, $9d, $99, $9e, $94, $5c, $03, $01, $02, $70, $9f, $a2, $50, $a4, $98, $91
+db $a4, $50, $a9, $9f, $a5, $50, $93, $91, $9e, $50, $a3, $91, $a6, $95, $50, $a4
+db $98, $95, $50, $a7, $9f, $a2, $9c, $94, $50, $92, $a9, $50, $a0, $a5, $a2, $99
+db $96, $a9, $99, $9e, $97, $50, $61, $50, $9d, $9f, $a2, $95, $50, $91, $9e, $94
+db $50, $a0, $a5, $a2, $97, $99, $9e, $97, $50, $a9, $9f, $a5, $a2, $50, $9d, $99
+db $9e, $94, $57, $a3, $50, $95, $a6, $99, $9c, $5c, $03, $01, $02
+
+ORG $C86E26
+db $10
+
+ORG $EEB227
+db $0A, $BE, $C2, $EE
+
+ORG $EEC2BE
+db $1f, $17, $c8, $03, $5e, $02, $06, $02
+
+ORG $C9D5B8
+db $0A, $C6, $C2, $EE
+
+ORG $EEC2C6
+db $50, $16, $6f, $51, $08, $58, $24, $c9, $ff, $0a, $bc, $d5, $c9
+
+ORG $CF213D
+db $C7, $00
+
+ORG $EEA0E6
+db $01
+
+ORG $EEB7C7
+db $0A, $4A, $C5, $EE
+
+ORG $EEC54A
+db $18, $01, $01, $70, $72, $a9, $50, $0a, $cb, $b7, $ee
+
+ORG $C8FF31
+db $0A, $55, $C5, $EE
+
+ORG $EEC555
+db $04, $e9, $03, $18, $00, $10, $3c, $0a, $35, $ff, $c8
+
+ORG $C8FF86
+db $0A, $60, $C5, $EE
+
+ORG $EEC560
+db $9f, $a4, $98, $95, $a2, $50, $9d, $a5, $9c, $a4, $99, $a7, $9f, $a2, $9c, $94
+db $0a, $8b, $ff, $c8
+
+ORG $C98A7F
+db $0a, $74, $c5, $ee
+
+ORG $EEC574
+db $91, $50, $1c, $05, $01, $0a, $87, $8a, $c9
+
+ORG $C89390
+db $0a, $7d, $c5, $ee
+
+ORG $EEC57d
+db $50, $1c, $05, $01, $50, $91, $a3, $50, $91, $50, $a3, $9f, $a5, $a6, $95, $9e
+db $99, $a2, $0a, $99, $93, $c8
+
+ORG $CF9829
+db $00
+
+ORG $C6DB04
+db $49
+
+ORG $C7C0CD
+dd EndScript; Fix rainy circle playing twice
+
+ORG $C9D95E
+db $01, $01, $01
+
+ORG $C7BFF5
+db $94, $BF, $C7
+
+ORG $EF6CA2
+db $04, $cc, $00, $1f, $12, $0a, $1f, $12, $0b, $02; stop flying man from living
+
+ORG $C6AE51
+db $01, $01, $01, $01
+
+ORG $CFA94C
+db $93, $C5, $EE
+
+ORG $00FFE6
+db $F0, $FE
+
+ORG $00FEF0
+;Crash handler
+SEP #$20
+STZ $B4A1
+JML RenderCrashScreen; Jump to anti-piracy screen
+
+ORG $EEAAF1
+db $F2, $C5, $EE
+
+ORG $EEC5F2
+db $0A
+dl PooNPCTexReal
+PooReturnReal:
+db $10, $85, $01, $1f, $03, $70, $58, $1c, $02, $04, $50, $9a
+db $9f, $99, $9e, $95, $94, $50, $a9, $9f, $a5, $5e, $59, $04, $10, $00, $1f, $11
+db $04, $03, $01, $0e, $00, $0e, $01, $08, $f1, $c5, $ee, $ff, $02
+;db $04, $0e, $01, $0e, $00, $0e, $01, $08, $f1, $c5, $ee, $ff, $02
+
+ORG $C3E27C
+db $0C
+
+ORG $C6B233
+db $1f, $c6, $ee
+
+ORG $EEC61F
+db $12, $70, $7b, $95, $95, $50, $9b, $a9, $9f, $51, $03, $01, $70, $58, $89, $9f
+db $a5, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95, $50, $91, $9e, $a9
+db $01, $50, $50, $16, $e6, $10, $05, $95, $10, $05, $95, $10, $05, $95, $a7, $15
+db $1b, $97, $a5, $9d, $51, $59, $10, $10, $12, $02
+
+ORG $C932C9
+db $02
+
+ORG $EEC659
+db $7d, $91, $97, $99, $93, $91, $9e, $a4, $50, $84, $95, $9c, $95, $a0, $9f, $a2
+db $a4
+
+ORG $C60582
+db $01, $1d, $03, $ff
+
+ORG $C6E9A0
+db $01, $01, $01, $01
+
+ORG $C97980
+db $4B
+
+ORG $EF58C8
+db $F5, $03
+
+ORG $EF5913
+db $F5, $03
+
+ORG $C81A97
+db $49
+
+ORG $EEB08C
+db $f4, $03
+
+ORG $EEC66A
+;;;TODO: Test the Shyness Book dialogue after getting an AP item? this
+db $0A, $91, $BF, $C6, $84, $be
+db $ee
+
+ORG $C6D3A2
+db $ba
+
+ORG $C7D35A
+db $49
+
+ORG $C3E064
+db $27, $00
+
+ORG $EEC67B
+db $1e, $00, $ff, $64, $1e, $04, $ff, $64, $02
+
+ORG $D56FCC
+db $2F;Store tiny ruby
+
+ORG $D5528A
+db $84, $0e ;broken antenna price
+
+ORG $D5576A
+db $08, $1d; Gaia beam price
+
+ORG $D5556F
+db $02, $00; Sword of Kings
+
+ORG $CF11BA
+db $47, $80
+;;;;;;;;;;;;;;;;;;;;;
+;New storage
+ORG $C17A9D
+JML CheckGiftBox7
+
+ORG $C1911B
+JML CheckGiftBox8
+
+ORG $C19AB9
+JML CheckGiftBox1
+
+ORG $C191BE
+JML CheckGiftBox4
+
+ORG $C191C9
+JML CheckGiftBox6
+
+ORG $C19151
+JML CheckGiftBox9
+
+ORG $C191D3
+JML CheckGiftBox3
+
+ORG $C191E5
+CMP #$0045
+
+ORG $C19B1E
+CMP #$0045
+
+ORG $C190F9
+LDA #$0045
+
+ORG $C19170
+LDA #$0045
+
+ORG $C19B3B
+JSL ClearStorageMenu
+
+ORG $C191EC
+JML CheckGiftBox5
+
+ORG $C15B29
+JML CheckGiftBox2
+
+ORG $C11E25
+;JSL ClearStoragePage
+
+ORG $EEC684
+db $18, $01, $29, $19, $02, $79, $9e, $a6, $95, $9e, $a4, $9f, $a2, $a9, $02, $19
+db $02, $83, $a4, $9f, $a2, $91, $97, $95, $02, $1c, $07, $02, $11, $09, $02, $dc
+db $96, $ee, $11, $b1, $c6, $ee, $22, $18, $00, $0a, $20, $96, $ee, $0e, $01, $19
+db $14, $1b, $02, $84, $c6, $ee, $ff, $18, $02, $1a, $07, $18, $03, $0d, $18, $00
+db $18, $03, $29, $1b, $02, $eb, $c6, $ee, $00, $1b, $04, $1b, $05, $19, $1a, $00
+db $1b, $04, $1d, $0b, $00, $1b, $02, $bd, $c6, $ee, $ff, $1b, $06, $1b, $0c, $19
+db $1c, $ff, $00, $0a, $b1, $c6, $ee, $18, $03, $0d, $18, $00, $18, $03, $29, $12
+db $0a, $87, $c6, $ee, $1c, $04, $1d, $19, $02, $1b, $03, $DB, $C8, $EE, $00, $1a
+db $01, $84, $e5, $c5, $00, $8b, $e5, $c5, $00, $92, $e5, $c5, $00, $99, $e5, $c5
+db $00, $00, $0d, $00, $1b, $02, $30, $C7, $EE, $00, $19, $1b, $02, $1b, $02, $F8
+db $C6, $EE, $00, $18, $09, $02, $1b, $02, $F8, $C6, $EE, $00, $18, $03, $02, $18
+db $00, $18, $03, $29, $1b, $04, $02, $00
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Twoson police officer
+ORG $CF67AF
+db $0b, $00
+
+ORG $C4FEEA
+db $02, $00, $57, $01, $b0, $f8, $9b, $00, $45, $5c
+
+ORG $CF93D6
+db $69, $00, $01
+
+ORG $CF93D9
+db $3b, $c7, $ee, $00, $DF, $EE, $EE
+
+ORG $EEC73B
+db $70, $7f, $9e, $95, $a4, $a4, $6f, $10, $0f, $50, $83, $9f, $a2, $a2, $a9, $5c
+db $50, $a4, $98, $95, $50, $a2, $9f, $91, $94, $50, $99, $a3, $50, $93, $9c, $9f
+db $a3, $95, $94, $50, $a5, $9e, $a4, $99, $9c, $50, $96, $a5, $a2, $a4, $98, $95
+db $a2, $50, $9e, $9f, $a4, $99, $93, $95, $5e, $03, $00, $70, $73, $91, $a0, $a4
+db $91, $99, $9e, $50, $83, $a4, $a2, $9f, $9e, $97, $50, $9c, $9f, $a3, $a4, $50
+db $98, $99, $a3, $50, $92, $91, $94, $97, $95, $50, $91, $97, $91, $99, $9e, $5c
+db $10, $08, $50, $a3, $9f, $50, $a4, $98, $99, $a3, $50, $91, $a2, $95, $91, $50
+db $99, $a3, $50, $a5, $9e, $94, $95, $a2, $50, $9c, $9f, $93, $9b, $94, $9f, $a7
+db $9e, $50, $a5, $9e, $a4, $99, $9c, $50, $99, $a4, $57, $a3, $50, $96, $9f, $a5
+db $9e, $94, $5e, $13, $02, $19, $19, $00, $00, $1b, $04, $0b, $CA, $1b, $02, $b6
+db $c6, $c7, $ff, $1d, $01, $ff, $ca, $1f, $02, $76, $18, $04, $18, $01, $01, $70
+db $78, $95, $a9, $51, $10, $0f, $50, $84, $98, $91, $a4, $57, $a3, $50, $a4, $98
+db $95, $50, $93, $91, $a0, $a4, $91, $99, $9e, $57, $a3, $50, $92, $91, $94, $97
+db $95, $51, $03, $00, $70, $84, $98, $95, $50, $a2, $9f, $91, $94, $50, $a4, $9f
+db $50, $7f, $9e, $95, $a4, $a4, $50, $93, $91, $9e, $50, $9e, $9f, $a7, $50, $92
+db $95, $50, $9f, $a0, $95, $9e, $95, $94, $50, $91, $97, $91, $99, $9e, $5e, $10
+db $0f, $50, $84, $98, $91, $9e, $9b, $50, $a9, $9f, $a5, $50, $96, $9f, $a2, $50
+db $a9, $9f, $a5, $a2, $50, $93, $9f, $9f, $a0, $95, $a2, $91, $a4, $99, $9f, $9e
+db $5e, $03, $18, $04, $04, $69, $00, $1f, $16, $9b, $00, $02, $10, $04, $1f, $1e
+db $9b, $00, $00, $02
+
+ORG $D56EDF
+db $3B;Item type for the Police Badge
+
+ORG $CF6277
+db $00, $00; Remove police from Onett
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C577A0
+db $0A, $6F, $C8, $EE
+
+ORG $EEC86F
+db $04, $5e, $02, $1d, $01, $ff, $c0, $0a, $a4, $77, $c5
+
+ORG $C6FB13
+db $7A, $C8, $EE
+
+ORG $EEC87A
+db $08, $33, $fb, $c6, $ff, $1d, $01, $ff, $ac, $02
+
+ORG $C8720F
+db $84, $C8, $EE
+
+ORG $EEC884
+db $1d, $01, $ff, $b9, $0a, $20, $72, $c8
+
+ORG $C57076
+db $01, $01, $01, $01
+
+ORG $C9FD1A
+db $0A, $8C, $C8, $EE
+
+ORG $EEC88C
+db $a4, $51, $03, $00, $70, $79, $9e, $50, $99, $a4, $a3, $50, $9c, $91, $a3, $a4
+db $50, $9d, $9f, $9d, $95, $9e, $a4, $a3, $5c, $10, $0a, $50, $a4, $98, $95, $50
+db $95, $a2, $91, $a3, $95, $a2, $50, $a5, $a3, $95, $94, $50, $a4, $98, $95, $50
+db $75, $a2, $91, $a3, $95, $a2, $50, $75, $a2, $91, $a3, $95, $a2, $50, $75, $a2
+db $91, $a3, $95, $a2, $51, $59, $03, $1d, $01, $ff, $d2, $0a, $1e, $fd, $c9
+
+ORG $C8255E
+db $00, $00
+
+ORG $C636E5
+db $0a, $00, $00, $F2; Disables Escargo phone call
+
+ORG $C8A01F
+db $02
+
+ORG $EEC8DB
+db $19, $10, $01, $0d, $00, $1b, $05, $18, $02, $1b, $06, $1a, $05, $02, $00, $1b
+db $06, $18, $09, $02, $1b, $05, $18, $03, $02, $18, $00, $18, $03, $29, $1b, $06
+db $1b, $02, $c2, $e4, $c5, $00, $1b, $04, $02, $02
+;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C10119
+JSL AutoText
+BRA $00
+
+ORG $C1015C
+JSL AutoText
+BRA $00
+
+ORG $C10224
+JSL AutoText
+BRA $00
+
+ORG $C10278
+JSL AutoText
+BRA $00
+
+ORG $C101D8
+JSL AutoText
+BRA $00
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;Fix OSS Bug
+ORG $C22FD1
+JML LostScriptedFight
+NOP
+
+ORG $C22FEC
+JML LostScriptedFight
+NOP
+;;;;;;;;;;;;;;;;;;;
+ORG $C1F80D
+;JSL PrintVersionNumber
+
+ORG $C57948
+db $49, $00; Dungeon man if submarine is used
+
+ORG $C5796B
+db $D8, $03
+
+ORG $C5794F
+db $D8, $03
+
+ORG $C57A26
+db $06, $9c, $03, $55, $79, $c5, $ff, $70, $78, $95, $a2, $95, $5c, $10, $0a, $50
+db $79, $50, $92, $95, $9c, $99, $95, $a6, $95, $50, $a9, $9f, $a5, $50, $98, $91
+db $a6, $95, $50, $9c, $95, $96, $a4, $50, $a4, $98, $99, $a3, $50, $1c, $05, $01
+db $50, $92, $95, $98, $99, $9e, $94, $5e, $03, $1d, $03, $ff, $1b, $02, $76, $7a
+db $c5, $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03, $04, $9c, $03, $02
+db $00, $70, $89, $9f, $a5, $50, $a3, $98, $9f, $a5, $9c, $94, $50, $93, $9f, $9d
+db $95, $50, $92, $91, $93, $9b, $50, $a7, $98, $95, $9e, $50, $a9, $9f, $a5, $50
+db $98, $91, $a6, $95, $50, $9d, $9f, $a2, $95, $50, $a2, $9f, $9f, $9d, $5e, $13
+db $02
+
+ORG $C5373A
+db $0a, $05, $c9, $ee
+
+ORG $EEC905
+db $a3, $50, $91, $08, $3a, $c9, $ee, $ff, $0a, $41, $37, $c5, $50, $9c, $99, $97
+db $98, $a4, $9e, $99, $9e, $97, $02, $50, $96, $99, $a2, $95, $02, $9e, $50, $99
+db $93, $95, $02, $50, $96, $9c, $91, $a3, $98, $02, $50, $a3, $a4, $91, $a2, $a3
+db $a4, $9f, $a2, $9d, $02, $50, $a0, $a3, $a9, $93, $98, $99, $93, $50, $95, $9e
+db $95, $a2, $97, $a9, $02, $9e, $50, $95, $a8, $a0, $9c, $9f, $a3, $99, $a6, $95
+db $02
+
+ORG $EF717B
+db $0a, $56, $c9, $ee
+
+ORG $EEC956
+db $08, $82, $c9, $ee, $ff, $0a, $80, $71, $ef, $9c, $99, $97, $98, $a4, $9e, $99
+db $9e, $97, $02, $96, $99, $a2, $95, $02, $99, $93, $95, $02, $9c, $99, $97, $98
+db $a4, $02, $a3, $a4, $91, $a2, $a3, $a4, $9f, $a2, $9d, $02, $95, $9e, $95, $a2
+db $97, $a9, $02, $92, $9c, $91, $a3, $a4, $02
+
+ORG $EF7163
+db $1c, $05, $01, $0a, $70, $71, $ef
+
+ORG $C8361C
+db $70, $7f, $98, $98, $98, $5c, $10, $08, $50, $91, $98, $98, $98, $5c, $50, $9f
+db $a5, $93, $98, $5e, $5e, $5e, $03, $00, $70, $79, $50, $a7, $91, $a3, $50, $a4
+db $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $50, $9c, $9f, $9f, $9b, $50, $91, $a4
+db $50, $a4, $98, $91, $a4, $50, $a3, $a4, $91, $a4, $a5, $95, $50, $92, $95, $98
+db $99, $9e, $94, $50, $a4, $98, $95, $50, $93, $9f, $a5, $9e, $a4, $95, $a2, $5c
+db $10, $08, $50, $a7, $98, $95, $9e, $50, $79, $50, $a3, $a0, $a2, $91, $99, $9e
+db $95, $94, $50, $9d, $a9, $50, $91, $9e, $9b, $9c, $95, $5e, $5e, $5e, $03, $00
+db $70, $89, $95, $a3, $5e, $5e, $5e, $50, $79, $57, $9d, $50, $96, $99, $9e, $95
+db $5e, $10, $08, $50, $7a, $a5, $a3, $a4, $50, $98, $91, $a6, $95, $50, $a4, $9f
+db $50, $a7, $91, $9c, $9b, $50, $99, $a4, $50, $9f, $96, $96, $5e, $03, $00, $70
+db $71, $9e, $a9, $a7, $91, $a9, $a3, $5c, $10, $08, $50, $a9, $9f, $a5, $50, $a3
+db $98, $9f, $a5, $9c, $94, $50, $a2, $95, $91, $9c, $9c, $a9, $50, $93, $98, $95
+db $93, $9b, $10, $0e, $50, $92, $95, $98, $99, $9e, $94, $10, $0e, $50, $a4, $98
+db $95, $50, $93, $9f, $a5, $9e, $a4, $95, $a2, $10, $0e, $50, $91, $a4, $50, $a4
+db $98, $95, $50, $93, $91, $96, $95, $5e, $03, $00, $0a, $d8, $39, $c8; Everdred fourside text
+
+ORG $CFAE24
+db $00, $8F, $C9, $EE
+
+ORG $EEC98F
+db $70, $7e, $9f, $a4, $50, $a4, $9f, $9f, $50, $9c, $9f, $9e, $97, $50, $91, $97
+db $9f, $5c, $03, $00, $70, $79, $50, $98, $95, $91, $a2, $94, $50, $a3, $9f, $9d
+db $95, $50, $aa, $9f, $9d, $92, $99, $95, $a3, $50, $a4, $91, $9c, $9b, $99, $9e
+db $97, $50, $91, $92, $9f, $a5, $a4, $50, $98, $9f, $a7, $50, $a4, $98, $95, $a9
+db $50, $9c, $9f, $93, $9b, $95, $94, $50, $a3, $9f, $9d, $95, $01, $50, $50, $6C
+db $1c, $05, $01, $6E, $50, $99, $9e, $50, $a4, $98, $95, $50, $93, $95, $9d, $95
+db $a4, $95, $a2, $a9, $5e, $03, $00, $70, $78, $9f, $a7, $50, $91, $a7, $96, $a5
+db $9c, $51, $13, $02
+
+ORG $CFA5D5
+db $7A, $00, $02
+
+ORG $CFA272
+db $7a, $00, $01
+
+ORG $CFA283
+db $7a, $00, $01
+
+ORG $D5F63B
+db $6E
+
+ORG $EECA03
+db $04, $c3, $01, $04, $c4, $01, $04, $c5, $01, $04, $c6, $01, $04, $c7, $01, $04
+db $c8, $01, $04, $c9, $01, $04, $ca, $01, $04, $cc, $01, $04, $cd, $01, $04, $ce
+db $01, $0a, $0b, $b1, $c9
+
+ORG $EECA28
+db $70, $7b, $9f, $9b, $a5, $99, $9b, $9f, $9b, $91, $9b, $95, $9b, $95, $51, $03
+db $00, $70, $58, $77, $95, $a4, $50, $a9, $9f, $a5, $a2, $50, $7d, $9f, $9e, $9b
+db $95, $a9, $50, $74, $95, $9c, $a5, $a8, $95, $50, $92, $a5, $9e, $94, $9c, $95
+db $a3, $51, $59, $03, $00, $70, $7b, $9f, $9b, $a5, $9b, $99, $50, $9b, $95, $95
+db $9b, $9f, $9b, $91, $99, $50, $9b, $9f, $9b, $9f, $9b, $9f, $50, $54, $65, $60
+db $60, $51, $03, $00, $70, $58, $71, $9e, $a9, $a4, $98, $99, $9e, $97, $50, $91
+db $50, $9d, $9f, $9e, $9b, $95, $a9, $50, $93, $9f, $a5, $9c, $94, $50, $a7, $91
+db $9e, $a4, $5c, $10, $06, $50, $9a, $a5, $a3, $a4, $50, $54, $65, $60, $60, $51
+db $59, $03, $00, $70, $7b, $9f, $9b, $a5, $9b, $91, $91, $99, $50, $9b, $9f, $9b
+db $91, $50, $54, $65, $60, $60, $6f, $03, $00, $70, $58, $87, $91, $9e, $a4, $50
+db $91, $50, $7d, $9f, $9e, $9b, $95, $a9, $50, $74, $95, $9c, $a5, $a8, $95, $50
+db $92, $a5, $9e, $94, $9c, $95, $50, $96, $9f, $a2, $50, $54, $65, $60, $60, $6f
+db $59, $03, $00, $1c, $04, $18, $0a, $19, $02, $89, $95, $a3, $02, $19, $02, $7e
+db $9f, $02, $1c, $07, $02, $11, $09, $02, $28, $cb, $ee, $11, $08, $cb, $ee, $22
+db $12, $70, $7b, $9f, $9b, $9f, $9b, $91, $9b, $5e, $03, $00, $70, $58, $89, $9f
+db $a5, $57, $9c, $9c, $50, $92, $95, $50, $92, $91, $93, $9b, $5e, $59, $13, $02
+db $1d, $09, $f4, $01, $1b, $02, $53, $cb, $ee, $ff, $12, $70, $7b, $99, $9b, $99
+db $99, $a9, $91, $99, $9b, $9f, $51, $03, $00, $70, $58, $89, $9f, $a5, $57, $a2
+db $95, $50, $92, $a2, $9f, $9b, $95, $51, $59, $13, $02, $0e, $00, $0d, $01, $1d
+db $00, $ff, $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b, $02, $bf
+db $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d, $00, $ff
+db $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b, $02, $bf, $cb, $ee
+db $ff, $1d, $00, $ff, $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b
+db $02, $bf, $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d
+db $00, $ff, $fe, $1b, $02, $bf, $cb, $ee, $ff, $1d, $00, $ff, $fe, $1b, $02, $bf
+db $cb, $ee, $ff, $0a, $35, $cc, $ee, $12, $70, $58, $87, $98, $9f, $91, $98, $51
+db $10, $0f, $50, $89, $9f, $a5, $50, $92, $95, $a4, $a4, $95, $a2, $50, $9d, $91
+db $9b, $95, $50, $a3, $a5, $a2, $95, $50, $a9, $9f, $a5, $50, $93, $91, $9e, $50
+db $98, $9f, $9c, $94, $50, $61, $60, $50, $a4, $98, $99, $9e, $97, $a3, $5c, $10
+db $06, $50, $92, $a5, $94, $94, $a9, $51, $59, $13, $08, $0c, $cc, $ee, $ff, $1d
+db $08, $f4, $01, $02, $1d, $01, $ff, $fe, $1d, $01, $ff, $fe, $1d, $01, $ff, $fe
+db $1d, $01, $ff, $fe, $1d, $01, $ff, $fe, $1d, $01, $ff, $fe, $1d, $01, $ff, $fe
+db $1d, $01, $ff, $fe, $1d, $01, $ff, $fe, $1d, $01, $ff, $fe, $02, $08, $0c, $cc
+db $ee, $ff, $1f, $02, $78, $18, $0a, $12, $70, $7b, $a5, $9b, $99, $9b, $9f, $9b
+db $91, $50, $9b, $99, $99, $a9, $9b, $5e, $03, $00, $70, $58, $7d, $a5, $93, $98
+db $50, $9f, $92, $9c, $99, $97, $95, $94, $5e, $59, $03, $1d, $0e, $ff, $e0, $1d
+db $0e, $ff, $5d, $1d, $0e, $ff, $5f, $1d, $0e, $ff, $5f, $1d, $0e, $ff, $7f, $1d
+db $0e, $ff, $5a, $1d, $0e, $ff, $5a, $1d, $0e, $ff, $5a, $1d, $0e, $ff, $6c, $1d
+db $0e, $ff, $8c, $1f, $02, $74, $10, $10, $1f, $02, $74, $10, $10, $1f, $02, $74
+db $10, $10, $1f, $02, $74, $10, $10, $1f, $02, $74, $10, $10, $1f, $02, $74, $10
+db $10, $1f, $02, $74, $10, $10, $1f, $02, $74, $10, $10, $1f, $02, $74, $10, $10
+db $1f, $02, $74, $10, $10, $02; Monkey caves Monkey Bundle
+
+ORG $C807F5
+db $1c, $05, $01, $0a, $fc, $07, $c8
+
+ORG $C57A14
+db $02
+
+ORG $C98276
+db $0A, $BE, $CC, $EE
+
+ORG $EECCBE
+db $18, $04, $04, $7a, $00, $05, $f6, $03, $02
+
+ORG $C98025
+db $F6, $03
+
+ORG $C9827D
+db $F6, $03; Carpainter stuff
+
+ORG $C97633
+db $02
+
+ORG $C86DFC
+;db $7A, $00, $C7, $CC, $EE
+
+ORG $EECCC7
+db $70, $58, $83, $9f, $a5, $9e, $94, $a3, $50, $9c, $99, $9b, $95, $50, $a3, $9f
+db $9d, $95, $9f, $9e, $95, $57, $a3, $50, $9f, $a5, $a4, $a3, $99, $94, $95, $5e
+db $03, $00, $70, $72, $95, $a4, $a4, $95, $a2, $50, $93, $9f, $9d, $95, $50, $92
+db $91, $93, $9b, $50, $9c, $91, $a4, $95, $a2, $5e, $59, $13, $02;Fix re-entering moonside. Do I need this? Doesn't it set the checkpoint when clearing moonside?
+
+ORG $C58ED1
+db $0A
+dl DynamicPhotoSetter
+
+ORG $EECD04
+db $18, $04, $1f, $e1, $00, $5c, $01, $02
+
+ORG $EECD0C
+db $01, $70, $72, $a5, $a4, $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50
+db $a0, $a2, $95, $a6, $95, $9e, $a4, $95, $94, $50, $99, $a4, $50, $96, $a2, $9f
+db $9d, $50, $a7, $9f, $a2, $9b, $99, $9e, $97, $51, $03, $02, $00; Deathlink heal tex
+;;;;;;;;;;;;;;;;
+ORG $D50700
+db $0f, $0f, $10, $10, $20, $3f, $40, $40, $ff, $ff, $80, $86, $80, $8f, $80, $8f
+db $0f, $0f, $10, $1f, $20, $20, $40, $7f, $ff, $ff, $80, $ff, $80, $ff, $b0, $ff
+db $ff, $ff, $03, $03, $07, $ff, $0b, $0f, $fb, $ff, $1b, $1f, $1b, $1f, $1b, $1f
+db $ff, $ff, $03, $ff, $05, $05, $0d, $f9, $f5, $f1, $15, $f1, $15, $f1, $d5, $31
+db $80, $86, $81, $b1, $83, $fb, $87, $f9, $8f, $b1, $8f, $80, $87, $81, $ff, $ff
+db $f9, $fe, $f9, $ff, $fb, $ff, $ff, $ff, $bf, $ff, $8f, $ff, $87, $ff, $ff, $ff
+db $9b, $9f, $db, $df, $fb, $ff, $fb, $df, $da, $de, $1c, $1c, $d8, $d8, $f0, $f0
+db $f5, $91, $f5, $d1, $f5, $f1, $d5, $f1, $d6, $f2, $14, $f4, $d8, $f8, $f0, $f0;ProgBox
+
+ORG $D517c0
+db $0f, $0f, $1f, $1f, $3f, $3f, $7f, $7f, $ff, $ff, $80, $80, $80, $80, $c0, $c0
+db $0f, $0f, $10, $10, $20, $20, $40, $40, $ff, $ff, $80, $ff, $80, $ff, $80, $bf
+db $ff, $ff, $03, $ff, $07, $ff, $0b, $ff, $fb, $ff, $1b, $1f, $1b, $1f, $3b, $3f
+db $ff, $ff, $ff, $03, $fd, $05, $fd, $09, $f5, $f1, $15, $f1, $15, $f1, $15, $d1
+db $bf, $ff, $81, $b1, $83, $fb, $87, $f9, $8f, $b1, $8f, $80, $87, $81, $ff, $ff
+db $c0, $80, $f9, $cf, $fb, $ff, $ff, $ff, $bf, $ff, $8f, $ff, $87, $ff, $ff, $ff
+db $db, $ff, $1b, $df, $fb, $ff, $fb, $df, $da, $de, $1c, $1c, $d8, $d8, $f0, $f0
+db $35, $11, $f5, $11, $f5, $f1, $d5, $f1, $d6, $f2, $14, $f4, $d8, $f8, $f0, $f0;ProgBox open sprite
+
+ORG $D53240
+db $0f, $0f, $10, $10, $20, $3f, $40, $40, $ff, $ff, $80, $86, $80, $8f, $80, $8f
+db $0f, $0f, $10, $1f, $20, $20, $40, $7f, $ff, $ff, $80, $ff, $80, $ff, $b0, $ff
+db $ff, $ff, $03, $03, $07, $ff, $0b, $0f, $fb, $ff, $1b, $1f, $1b, $1f, $1b, $1f
+db $ff, $ff, $03, $ff, $05, $05, $0d, $f9, $f5, $f1, $15, $f1, $15, $f1, $d5, $31
+db $80, $86, $80, $b0, $81, $f8, $87, $f8, $8f, $b0, $8f, $80, $86, $80, $ff, $ff
+db $f9, $fe, $f9, $fe, $f8, $ff, $fe, $ff, $bf, $ff, $8f, $ff, $86, $ff, $ff, $ff
+db $1b, $1f, $db, $1f, $fb, $1f, $fb, $1f, $da, $1e, $1c, $1c, $18, $18, $f0, $f0
+db $f5, $11, $35, $d1, $15, $f1, $15, $f1, $16, $f2, $14, $f4, $18, $f8, $f0, $f0;APBox
+
+ORG $D540C0
+db $ff, $ff, $c0, $ff, $e0, $ff, $d0, $ff, $df, $ff, $d8, $f8, $d8, $f8, $dc, $fc
+db $ff, $ff, $ff, $c0, $bf, $a0, $bf, $90, $af, $8f, $a8, $8f, $a8, $8f, $a8, $8b
+db $f0, $f0, $f8, $f8, $fc, $fc, $fe, $fe, $ff, $ff, $01, $01, $01, $01, $03, $03
+db $f0, $f0, $08, $08, $04, $04, $02, $02, $ff, $ff, $01, $ff, $01, $ff, $01, $fd
+db $db, $ff, $d8, $fb, $df, $f8, $df, $f8, $5b, $78, $38, $38, $18, $18, $0f, $0f
+db $ac, $88, $af, $88, $a8, $8f, $a8, $8f, $68, $4f, $28, $2f, $18, $1f, $0f, $0f
+db $fd, $ff, $01, $0d, $81, $1f, $e1, $1f, $f1, $0d, $f1, $01, $61, $01, $ff, $ff
+db $03, $01, $9f, $73, $1f, $ff, $7f, $ff, $fd, $ff, $f1, $ff, $61, $ff, $ff, $ff;ApBox open sprite
+
+ORG $EF43E3
+db $0A
+
+ORG $EF44AB
+db $0A
+
+ORG $EF43E9
+db $c0, $17
+
+ORG $EF44B1
+db $c1, $40
+
+ORG $EECD38
+db $06, $e2, $00, $ec, $d9, $c7, $00, $06, $cd, $00, $99, $ce, $ee, $ff, $06, $ce
+db $00, $99, $ce, $ee, $ff, $06, $cf, $00, $99, $ce, $ee, $ff, $06, $d0, $00, $99
+db $ce, $ee, $ff, $06, $e7, $00, $99, $ce, $ee, $ff, $06, $e8, $00, $99, $ce, $ee
+db $ff, $06, $e9, $00, $99, $ce, $ee, $ff, $06, $eA, $00, $99, $ce, $ee, $ff, $06
+db $EB, $00, $99, $ce, $ee, $ff, $06, $eC, $00, $99, $ce, $ee, $ff, $06, $ED, $00
+db $99, $ce, $ee, $ff, $06, $eE, $00, $99, $ce, $ee, $ff, $06, $eF, $00, $99, $ce
+db $ee, $ff, $06, $F0, $00, $99, $ce, $ee, $ff, $06, $F1, $00, $99, $ce, $ee, $ff
+db $06, $F2, $00, $99, $ce, $ee, $ff, $06, $F3, $00, $99, $ce, $ee, $ff, $06, $F4
+db $00, $99, $ce, $ee, $ff, $0a, $14, $d9, $c7;New present table
+
+;macro needs to go here?
+db $04, $cd, $00, $08, $7f, $d8, $c7, $00, $05, $cd, $00, $02
+db $04, $ce, $00, $08, $7f, $d8, $c7, $00, $05, $ce, $00, $02
+db $04, $CF, $00, $08, $7f, $d8, $c7, $00, $05, $CF, $00, $02
+db $04, $D0, $00, $08, $7f, $d8, $c7, $00, $05, $D0, $00, $02
+db $04, $E7, $00, $08, $7f, $d8, $c7, $00, $05, $E7, $00, $02
+db $04, $E8, $00, $08, $7f, $d8, $c7, $00, $05, $E8, $00, $02
+db $04, $E9, $00, $08, $7f, $d8, $c7, $00, $05, $E9, $00, $02
+db $04, $EA, $00, $08, $7f, $d8, $c7, $00, $05, $EA, $00, $02
+db $04, $EB, $00, $08, $7f, $d8, $c7, $00, $05, $EB, $00, $02
+db $04, $EC, $00, $08, $7f, $d8, $c7, $00, $05, $EC, $00, $02
+db $04, $ED, $00, $08, $7f, $d8, $c7, $00, $05, $ED, $00, $02
+db $04, $EE, $00, $08, $7f, $d8, $c7, $00, $05, $EE, $00, $02
+db $04, $EF, $00, $08, $7f, $d8, $c7, $00, $05, $EF, $00, $02
+db $04, $F0, $00, $08, $7f, $d8, $c7, $00, $05, $F0, $00, $02
+db $04, $F1, $00, $08, $7f, $d8, $c7, $00, $05, $F1, $00, $02
+db $04, $F2, $00, $08, $7f, $d8, $c7, $00, $05, $F2, $00, $02
+db $04, $F3, $00, $08, $7f, $d8, $c7, $00, $05, $F3, $00, $02
+db $04, $F4, $00, $08, $7f, $d8, $c7, $00, $05, $F4, $00, $02;Present checks
+
+db $70, $1c, $02, $00, $50, $9f, $a0, $95, $9e, $95, $94, $50, $a4, $98, $95, $50
+db $92, $9f, $a8, $5e, $02;Ap box normal
+
+db $06, $e2, $00, $fc, $d9, $c7, $00, $06, $ce, $00, $29, $CF, $EE, $ff, $06, $cf
+db $00, $47, $CF, $EE, $ff, $06, $d0, $00, $57, $CF, $EE, $ff, $06, $e7, $00, $8A
+db $CF, $EE, $ff, $06, $e8, $00, $9A, $CF, $EE, $ff, $06, $e9, $00, $BD, $CF, $EE
+db $ff, $06, $ea, $00, $CB, $CF, $EE, $ff, $06, $eb, $00, $F2, $CF, $EE, $ff, $06
+db $ec, $00, $08, $D0, $EE, $ff, $06, $ed, $00, $1D, $D0, $EE, $ff, $06, $ee, $00
+db $32, $D0, $EE, $ff, $06, $EF, $00, $4D, $D0, $EE, $ff, $06, $f0, $00, $5e, $d0
+db $ee, $ff, $06, $f1, $00, $76, $D0, $EE, $ff, $06, $f2, $00, $9E, $D0, $EE, $ff
+db $06, $f3, $00, $AE, $D0, $EE, $ff, $0a, $d5, $d0, $EE
+
+db $01, $10, $14, $70, $79, $a3, $50, $a4, $98, $99, $a3, $50, $95, $a6, $95, $9e
+db $50, $a2, $91, $9e, $94, $9f, $9d, $99, $aa, $95, $94, $6f, $03, $02;is this even randomized
+
+db $01, $10, $14, $70, $7f, $9f, $98, $50, $9c, $91, $50, $9c, $91, $51, $03, $02;ooh la la
+
+db $01, $10, $14, $70, $7e, $9f, $a7, $50, $a4, $98, $95, $a2, $95, $57, $a3, $50
+db $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $a9, $9f, $a5, $50, $94, $9f
+db $9e, $57, $a4, $50, $a3, $95, $95, $50, $95, $a6, $95, $a2, $a9, $94, $91, $a9
+db $51, $03, $02
+
+db $01, $10, $14, $70, $87, $78, $71, $71, $71, $71, $71, $84, $6f, $51, $03, $02;what
+
+db $01, $10, $14, $70, $87, $95, $9c, $9c, $5c, $10, $05, $50, $a3, $9c, $91, $a0
+db $50, $9d, $95, $50, $a7, $99, $a4, $98, $50, $91, $50, $a4, $a2, $9f, $a5, $a4
+db $51, $03, $02;trout
+
+db $01, $10, $14, $70, $7a, $91, $93, $9b, $a0, $9f, $a4, $51, $03, $02;jackpot
+
+db $01, $10, $14, $70, $72, $a5, $a4, $50, $99, $a4, $50, $a7, $91, $a3, $50, $95
+db $9d, $a0, $a4, $a9, $51, $03, $01, $70, $7a, $a5, $a3, $a4, $50, $9b, $99, $94
+db $94, $99, $9e, $97, $51, $03, $02
+
+db $01, $10, $14, $70, $78, $9f, $a4, $50, $94, $99, $97, $97, $99, $a4, $a9, $50
+db $94, $9f, $97, $51, $03, $02
+
+db $01, $10, $14, $70, $77, $a2, $95, $91, $a4, $50, $97, $91, $94, $aa, $9f, $9f
+db $9b, $a3, $51, $03, $02
+
+db $01, $10, $14, $70, $87, $98, $9f, $91, $98, $5c, $10, $03, $50, $9e, $95, $9c
+db $9c, $a9, $51, $03, $02
+
+db $01, $10, $14, $70, $87, $98, $91, $a4, $50, $94, $9f, $50, $a7, $95, $50, $98
+db $91, $a6, $95, $50, $98, $95, $a2, $95, $6f, $03, $02
+
+db $01, $10, $14, $70, $78, $85, $78, $78, $78, $78, $78, $78, $78, $6f, $51, $03
+db $02
+
+db $01, $10, $14, $70, $7e, $9f, $a7, $50, $a7, $95, $57, $a2, $95, $50, $93, $9f
+db $9f, $9b, $99, $9e, $97, $51, $03, $02
+
+db $01, $10, $14, $70, $79, $50, $9e, $95, $a6, $95, $a2, $50, $a3, $a5, $a3, $a0
+db $95, $93, $a4, $95, $94, $50, $99, $a4, $50, $93, $9f, $a5, $9c, $94, $50, $98
+db $91, $a0, $a0, $95, $9e, $51, $03, $02
+
+db $01, $10, $14, $70, $7f, $98, $98, $98, $98, $50, $a9, $95, $a3, $51, $03, $02; oh yes
+
+db $01, $10, $14, $70, $79, $57, $a6, $95, $50, $a3, $95, $95, $9e, $50, $a4, $98
+db $99, $a3, $50, $92, $95, $96, $9f, $a2, $95, $5e, $03, $02; seen this before
+
+db $06, $e5, $00, $b6, $da, $c7, $ff, $0a, $fd, $d9, $c7
+
+db $06, $F4, $00, $E0, $D0, $EE, $FF, $0a, $31, $d9, $c7; trap
+
+db $01, $10, $14, $70, $89, $9f, $a5, $50, $91, $a2, $95, $50, $91, $50, $96, $9f, $9f
+db $9c, $51, $03, $02; trap text
+
+ORG $C7D90D
+db $0A, $38, $CD, $EE
+
+ORG $C7D92A
+db $0A, $AE, $CE, $EE
+
+ORG $C7D9E4
+db $0A, $CA, $D0, $EE
+
+ORG $C8972A
+db $0A, $F5, $D0, $EE
+
+ORG $C897C1
+db $0A, $48, $D1, $EE
+
+ORG $C7FA20
+db $0A, $5E, $D1, $EE
+
+ORG $EED0F5
+db $06, $8b, $00, $04, $d1, $ee, $ff, $70, $58, $79, $50, $0a, $2e, $97, $c8, $70
+db $58, $79, $50, $98, $95, $91, $a2, $94, $50, $a4, $98, $91, $a4, $50, $91, $50
+db $a3, $93, $91, $a2, $a9, $50, $9d, $9f, $9e, $a3, $a4, $95, $a2, $50, $94, $9f
+db $95, $a3, $9e, $57, $a4, $50, $9c, $99, $a6, $95, $50, $9f, $9e, $50, $a4, $98
+db $95, $50, $a4, $9f, $a0, $50, $96, $9c, $9f, $9f, $a2, $5e, $03, $00, $70, $0a
+db $c8, $97, $c8
+
+
+db $5c, $50, $10, $10, $9c, $99, $9b, $95, $50, $91, $50, $1c, $05, $11, $5e, $03
+db $00, $70, $0a, $c8, $97, $c8
+;;;;;;;;;;;;;;;
+db $91, $96, $A4, $95, $A2, $A4, $91, $A3, $A4, $95, $0A, $29, $FA, $C7
+
+ORG $C79CB7
+db $D3, $00
+
+ORG $C79D59
+db $0A, $EF, $DC, $EE
+
+ORG $EED16C
+db $08, $df, $69, $c5, $00, $01, $70, $79, $a4, $50, $94, $95, $91, $9c, $a3, $50
+db $91, $92, $9f, $a5, $a4, $50, $68, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50
+db $9f, $96, $50, $94, $91, $9d, $91, $97, $95, $50, $a4, $9f, $50, $95, $91, $93
+db $98, $50, $95, $9e, $95, $9d, $a9, $5e, $02
+
+db $08, $df, $69, $c5, $00, $01, $70, $79, $a4, $50, $94, $95, $91, $9c, $a3, $50
+db $91, $92, $9f, $a5, $a4, $50, $61, $68, $60, $50, $a0, $9f, $99, $9e, $a4, $a3
+db $50, $9f, $96, $50, $94, $91, $9d, $91, $97, $95, $50, $a4, $9f, $50, $95, $91
+db $93, $98, $50, $95, $9e, $95, $9d, $a9, $5e, $02
+
+db $70, $71, $50, $98, $91, $a2, $a3, $98, $50, $92, $9c, $91, $a3, $a4, $50, $9f
+db $96, $50, $95, $9e, $95, $a2, $97, $a9, $50, $95, $9e, $97, $a5, $9c, $96, $a3
+db $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $5c, $50, $99, $9e, $96, $9c
+db $99, $93, $a4, $99, $9e, $97, $50, $91, $92, $9f, $a5, $a4, $02, $08, $df, $d1
+db $ee, $ff, $50, $69, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50, $9f, $96, $50
+db $94, $91, $9d, $91, $97, $95, $5e, $01, $70, $79, $a4, $50, $9d, $91, $a9, $50
+db $99, $9e, $96, $9c, $99, $93, $a4, $50, $91, $92, $9f, $a5, $a4, $50, $98, $91
+db $9c, $96, $50, $91, $a3, $50, $9d, $a5, $93, $98, $50, $a4, $9f, $50, $9f, $a4
+db $98, $95, $a2, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $02, $08, $df, $d1
+db $ee, $ff, $50, $61, $68, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50, $9f, $96
+db $50, $94, $91, $9d, $91, $97, $95, $5e, $01, $70, $79, $a4, $50, $9d, $91, $a9
+db $50, $99, $9e, $96, $9c, $99, $93, $a4, $50, $91, $92, $9f, $a5, $a4, $50, $98
+db $91, $9c, $96, $50, $91, $a3, $50, $9d, $a5, $93, $98, $50, $a4, $9f, $50, $9f
+db $a4, $98, $95, $a2, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $02, $08, $df
+db $d1, $ee, $ff, $50, $62, $67, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50, $9f
+db $96, $50, $94, $91, $9d, $91, $97, $95, $5e, $01, $70, $79, $a4, $50, $9d, $91
+db $a9, $50, $99, $9e, $96, $9c, $99, $93, $a4, $50, $91, $92, $9f, $a5, $a4, $50
+db $98, $91, $9c, $96, $50, $91, $a3, $50, $9d, $a5, $93, $98, $50, $a4, $9f, $50
+db $9f, $a4, $98, $95, $a2, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $02, $08
+db $df, $d1, $ee, $ff, $50, $63, $66, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50
+db $9f, $96, $50, $94, $91, $9d, $91, $97, $95, $5e, $01, $70, $79, $a4, $50, $9d
+db $91, $a9, $50, $99, $9e, $96, $9c, $99, $93, $a4, $50, $91, $92, $9f, $a5, $a4
+db $50, $98, $91, $9c, $96, $50, $91, $a3, $50, $9d, $a5, $93, $98, $50, $a4, $9f
+db $50, $9f, $a4, $98, $95, $a2, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $02;PSI blast help text
+
+db $70, $71, $50, $a3, $a0, $91, $a2, $9b, $50, $9f, $96, $50, $95, $9e, $95, $a2, $97
+db $a9, $50, $99, $a3, $50, $a3, $98, $9f, $a4, $50, $91, $a4, $50, $9f, $9e, $95
+db $50, $95, $9e, $95, $9d, $a9, $5c, $50, $99, $9e, $96, $9c, $99, $93, $a4, $99
+db $9e, $97, $50, $91, $92, $9f, $a5, $a4, $50, $61, $62, $60, $50, $a0, $9f, $99
+db $9e, $a4, $a3, $50, $9f, $96, $50, $94, $91, $9d, $91, $97, $95, $5e, $01, $70
+db $84, $98, $95, $50, $96, $91, $a3, $a4, $95, $a2, $50, $a9, $9f, $a5, $50, $91
+db $a2, $95, $5c, $50, $a4, $98, $95, $50, $9d, $9f, $a2, $95, $50, $9c, $99, $9b
+db $95, $9c, $a9, $50, $99, $a4, $50, $99, $a3, $50, $96, $9f, $a2, $50, $a4, $98
+db $95, $50, $a3, $a0, $91, $a2, $9b, $50, $a4, $9f, $50, $98, $99, $a4, $5e, $02
+db $70, $7f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $99, $a3, $50, $a3, $a4
+db $a2, $a5, $93, $9b, $50, $92, $a9, $50, $02, $a3, $a0, $91, $a2, $9b, $a3, $50
+db $9f, $96, $50, $95, $9e, $95, $a2, $97, $a9, $50, $96, $9f, $a2, $50, $91, $92
+db $9f, $a5, $a4, $50, $61, $62, $60, $50, $a0, $9f, $99, $9e, $a4, $a3, $50, $9f
+db $96, $50, $94, $91, $9d, $91, $97, $95, $50, $95, $91, $93, $98, $5e, $01, $70
+db $84, $98, $95, $50, $a3, $a0, $91, $a2, $9b, $a3, $50, $91, $a2, $95, $50, $9d
+db $9f, $a2, $95, $50, $9c, $99, $9b, $95, $9c, $a9, $50, $a4, $9f, $50, $98, $99
+db $a4, $50, $a4, $98, $95, $50, $96, $91, $a3, $a4, $95, $a2, $50, $a9, $9f, $a5
+db $50, $91, $a2, $95, $50, $a4, $98, $91, $9e, $50, $a4, $98, $95, $50, $a4, $91
+db $a2, $97, $95, $a4, $5e, $02, $08, $f0, $d3, $ee, $ff, $63, $50, $08, $09, $d4
+db $ee, $ff, $02, $08, $f0, $d3, $ee, $ff, $65, $50, $08, $09, $d4, $ee, $ff, $02
+db $08, $f0, $d3, $ee, $ff, $61, $65, $50, $08, $09, $d4, $ee, $ff, $02;PSI Missile help text
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $70, $74, $91, $9d, $91, $97, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95
+db $9d, $99, $95, $a3, $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99
+db $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $02, $01, $50, $6c, $1c, $05, $93
+db $6e, $03, $00, $08, $ae, $d4, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13
+db $02;psycho bomb
+
+db $70, $77, $a2, $95, $91, $a4, $9c, $a9, $50, $94, $91, $9d, $91, $97, $95, $a3
+db $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $a7, $98, $95
+db $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95
+db $5e, $02, $01, $50, $6c, $1c, $05, $94, $6e, $03, $00, $08, $ef, $d4, $ee, $ff
+db $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Mad psycho bomb
+
+db $01, $50, $6c, $1c, $05, $93, $6e, $03, $00, $70, $87, $98, $95, $9e, $50, $a5
+db $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5c, $50, $99
+db $a4, $50, $93, $91, $9e, $50, $9d, $91, $9b, $95, $50, $91, $9c, $9c, $50, $95
+db $9e, $95, $9d, $99, $95, $a3, $50, $93, $a2, $a9, $50, $a5, $9e, $93, $9f, $9e
+db $a4, $a2, $9f, $9c, $9c, $91, $92, $9c, $a9, $5c, $03, $00, $70, $9f, $a2, $50
+db $9f, $93, $93, $91, $a3, $99, $9f, $9e, $91, $9c, $9c, $a9, $50, $96, $95, $95
+db $9c, $50, $a3, $a4, $a2, $91, $9e, $97, $95, $5e, $03, $00, $08, $ab, $6d, $c5
+db $00, $13, $02;Flash bomb
+
+db $01, $50, $6c, $1c, $05, $94, $6e, $03, $00, $70, $87, $98, $95, $9e, $50, $a5
+db $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5c, $50, $99
+db $a4, $50, $93, $91, $9e, $50, $9d, $91, $9b, $95, $50, $91, $9c, $9c, $50, $95
+db $9e, $95, $9d, $99, $95, $a3, $50, $93, $a2, $a9, $50, $a5, $9e, $93, $9f, $9e
+db $a4, $a2, $9f, $9c, $9c, $91, $92, $9c, $a9, $5c, $03, $00, $70, $91, $9e, $94
+db $50, $a7, $99, $9c, $9c, $50, $9f, $96, $a4, $95, $9e, $50, $94, $95, $a3, $a4
+db $a2, $9f, $a9, $50, $91, $9e, $50, $95, $9e, $95, $9d, $a9, $50, $99, $9e, $50
+db $91, $50, $a3, $99, $9e, $97, $9c, $95, $50, $a3, $a4, $a2, $99, $9b, $95, $5e
+db $03, $08, $ab, $6d, $c5, $00, $13, $02;Flash bomb 2
+
+db $74, $95, $91, $9c, $a3, $50, $96, $99, $a2, $95, $50, $94, $91, $9d, $91, $97
+db $95, $50, $a4, $9f, $50, $91, $50, $a2, $9f, $a7, $50, $9f, $96, $50, $95, $9e
+db $95, $9d, $99, $95, $a3, $02, $01, $50, $6c, $1c, $05, $93, $6e, $03, $00, $70
+db $08, $33, $d6, $ee, $ff, $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50
+db $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5
+db $00, $13, $02;Fire bomb
+
+db $74, $95, $91, $9c, $a3, $50, $98, $95, $91, $a6, $a9, $5d, $94, $a5, $a4, $a9
+db $50, $96, $99, $a2, $95, $50, $94, $91, $9d, $91, $97, $95, $50, $a4, $9f, $50
+db $91, $50, $a2, $9f, $a7, $50, $9f, $96, $50, $95, $9e, $95, $9d, $99, $95, $a3
+db $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91
+db $a4, $a4, $9c, $95, $5e, $02, $01, $50, $6c, $1c, $05, $94, $6e, $03, $00, $70
+db $08, $86, $d6, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Fire bomb 2
+
+db $74, $95, $91, $9c, $a3, $50, $99, $93, $95, $50, $94, $91, $9d, $91, $97, $95
+db $50, $a4, $9f, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $a7, $98
+db $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c
+db $95, $5e, $02, $7f, $93, $93, $91, $a3, $99, $9f, $9e, $91, $9c, $9c, $a9, $5c
+db $50, $99, $a4, $50, $9d, $91, $a9, $50, $96, $a2, $95, $95, $aa, $95, $50, $a4
+db $98, $95, $50, $95, $9e, $95, $9d, $a9, $50, $a3, $9f, $9c, $99, $94, $5e, $02
+db $01, $50, $6c, $1c, $05, $93, $6e, $03, $00, $70, $08, $e4, $d6, $ee, $ff, $03
+db $00, $70, $08, $17, $d7, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Ice bomb
+
+db $74, $95, $91, $9c, $a3, $50, $98, $95, $91, $a6, $a9, $50, $99, $93, $95, $50
+db $94, $91, $9d, $91, $97, $95, $50, $a4, $9f, $50, $9f, $9e, $95, $50, $95, $9e
+db $95, $9d, $a9, $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e
+db $50, $92, $91, $a4, $a4, $9c, $95, $5e, $02, $01, $50, $6c, $1c, $05, $94, $6e
+db $03, $00, $70, $08, $64, $d7, $ee, $ff, $03, $00, $70, $08, $17, $d7, $ee, $ff
+db $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Ice bomb 2
+
+db $87, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4
+db $a4, $9c, $95, $5c, $50, $a4, $98, $95, $50, $95, $9e, $95, $9d, $a9, $50, $99
+db $a3, $50, $a3, $a4, $a2, $a5, $93, $9b, $50, $a7, $99, $a4, $98, $50, $91, $50
+db $9c, $99, $97, $98, $a4, $99, $9e, $97, $50, $92, $9f, $9c, $a4, $5e, $02, $79
+db $a4, $50, $9d, $91, $a9, $50, $9d, $99, $a3, $a3, $50, $99, $96, $50, $a4, $98
+db $95, $a2, $95, $50, $91, $a2, $95, $50, $96, $95, $a7, $50, $95, $9e, $95, $9d
+db $99, $95, $a3, $5e, $02, $01, $50, $6c, $1c, $05, $93, $6e, $03, $00, $70, $08
+db $bd, $d7, $ee, $ff, $03, $00, $01, $70, $08, $fc, $d7, $ee, $ff, $03, $00, $08
+db $ab, $6d, $c5, $00, $13, $02;Thunder bomb
+
+db $87, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4
+db $a4, $9c, $95, $5c, $50, $a4, $98, $95, $50, $95, $9e, $95, $9d, $a9, $50, $99
+db $a3, $50, $a3, $a4, $a2, $a5, $93, $9b, $50, $a7, $99, $a4, $98, $50, $91, $50
+db $9c, $99, $97, $98, $a4, $99, $9e, $97, $50, $92, $9f, $9c, $a4, $50, $a4, $98
+db $a2, $95, $95, $50, $a4, $99, $9d, $95, $a3, $5e, $02, $01, $50, $6c, $1c, $05
+db $94, $6e, $03, $00, $70, $08, $43, $d8, $ee, $ff, $03, $00, $70, $08, $fc, $d7
+db $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02; Thunder bomb 2
+
+db $01, $50, $6c, $1c, $05, $93, $6e, $03, $00, $70, $71, $50, $a0, $9f, $a7, $95
+db $a2, $96, $a5, $9c, $50, $a7, $95, $91, $a0, $9f, $9e, $50, $a4, $98, $91, $a4
+db $50, $94, $95, $91, $9c, $a3, $50, $98, $95, $91, $a6, $a9, $50, $98, $95, $91
+db $a6, $a9, $50, $94, $91, $9d, $91, $97, $95, $50, $a4, $9f, $50, $91, $9c, $9c
+db $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $a7, $98, $95, $9e, $50, $a5, $a3
+db $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08
+db $ab, $6d, $c5, $00, $13, $02;Star bomb 1
+
+db $01, $50, $6c, $1c, $05, $94, $6e, $03, $00, $70, $84, $98, $95, $50, $a3, $a4
+db $a2, $9f, $9e, $97, $95, $a3, $a4, $50, $a7, $95, $91, $a0, $9f, $9e, $50, $91
+db $a2, $9f, $a5, $9e, $94, $5e, $03, $00, $70, $74, $95, $91, $9c, $a3, $50, $95
+db $a8, $a4, $a2, $95, $9d, $95, $50, $94, $91, $9d, $91, $97, $95, $50, $a4, $9f
+db $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $a7, $98, $95
+db $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95
+db $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;star bomb 2
+
+db $74, $91, $9d, $91, $97, $95, $a3, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d
+db $a9, $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92
+db $91, $a4, $a4, $9c, $95, $5e, $02, $01, $50, $6c, $1c, $05, $94, $6e, $03, $00
+db $70, $08, $7e, $d9, $ee, $ff, $03, $00, $70, $79, $a4, $50, $9d, $91, $a9, $50
+db $92, $95, $50, $91, $50, $94, $a5, $94, $5e, $03, $00, $08, $ab, $6d, $c5, $00
+db $13, $02;Missile bomb 1
+
+db $77, $a2, $95, $91, $a4, $9c, $a9, $50, $94, $91, $9d, $91, $97, $95, $a3, $50
+db $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $a7, $98, $95, $9e, $50, $a5
+db $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $02, $01
+db $50, $6c, $1c, $05, $94, $6e, $03, $00, $70, $08, $d0, $d9, $ee, $ff, $03, $00
+db $70, $79, $a4, $50, $99, $a3, $50, $9d, $9f, $a2, $95, $50, $95, $96, $96, $95
+db $93, $a4, $99, $a6, $95, $50, $91, $97, $91, $99, $9e, $a3, $a4, $50, $95, $9e
+db $95, $9d, $99, $95, $a3, $50, $a3, $9c, $9f, $a7, $95, $a2, $50, $a4, $98, $91
+db $9e, $50, $a9, $9f, $a5, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Missile bomb 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $08, $ae
+db $d4, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Psychic bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $08, $ef
+db $d4, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Psychic bazooka 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $79
+db $a4, $50, $93, $91, $9e, $50, $9d, $91, $9b, $95, $50, $a4, $98, $95, $50, $95
+db $9e, $95, $9d, $a9, $50, $93, $a2, $a9, $5c, $50, $9f, $a2, $50, $9f, $93, $93
+db $91, $a3, $99, $9f, $9e, $91, $9c, $9c, $a9, $50, $96, $95, $95, $9c, $50, $a3
+db $a4, $a2, $91, $9e, $97, $95, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Flash bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $75
+db $9d, $99, $a4, $a3, $50, $91, $50, $98, $95, $91, $a6, $a9, $5d, $94, $a5, $a4
+db $a9, $50, $96, $9c, $91, $a3, $98, $50, $a4, $98, $91, $a4, $50, $98, $91, $a3
+db $50, $91, $50, $98, $99, $97, $98, $50, $93, $98, $91, $9e, $93, $95, $50, $9f
+db $96, $50, $9b, $9e, $9f, $93, $9b, $99, $9e, $97, $50, $9f, $a5, $a4, $50, $95
+db $9e, $95, $9d, $99, $95, $a3, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Flash bazooka 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $33, $d6, $ee, $ff, $50, $a7, $98, $95, $9e, $50, $a5, $a3, $95, $94, $50, $99
+db $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $08, $9b, $6d, $c5, $ff, $13
+db $02;Fire bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $86, $d6, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $ff, $13, $02;Fire bazooka 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $e4, $d6, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $ff, $13, $02;Freeze bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $64, $d7, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $ff, $13, $02;Freeze bazooka 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $bd, $d7, $ee, $ff, $03, $00, $70, $08, $fc, $d7, $ee, $ff, $03, $00, $08, $9b
+db $6d, $c5, $ff, $13, $02;Thunder bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $43, $d8, $ee, $ff, $03, $00, $70, $08, $fc, $d7, $ee, $ff, $03, $00, $08, $9b
+db $6d, $c5, $ff, $13, $02;Thunder bazooka 2
+
+db $01, $50, $6c, $1c, $05, $85, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $7e, $d9, $ee, $ff, $03, $00, $70, $79, $a4, $50, $9d, $91, $a9, $50, $9e, $9f
+db $a4, $50, $91, $9c, $a7, $91, $a9, $a3, $50, $a7, $9f, $a2, $9b, $5e, $03, $00
+db $08, $9b, $6d, $c5, $ff, $13, $02;Missile bazooka 1
+
+db $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $d0, $d9, $ee, $ff, $03, $00, $70, $7d, $9f, $a2, $95, $50, $9d, $99, $a3, $a3
+db $99, $9c, $95, $a3, $50, $91, $a2, $95, $50, $9c, $99, $9b, $95, $9c, $a9, $50
+db $a4, $9f, $50, $98, $99, $a4, $50, $99, $96, $50, $a9, $9f, $a5, $50, $91, $a2
+db $95, $50, $96, $91, $a3, $a4, $95, $a2, $50, $a4, $98, $91, $9e, $50, $a4, $98
+db $95, $50, $95, $9e, $95, $9d, $a9, $5e, $03, $00, $08, $9b, $6d, $c5, $ff, $13
+db $02;Missile bazooka 2
+
+db $78, $95, $91, $a6, $99, $9c, $a9, $50, $94, $91, $9d, $91, $97, $95, $a3, $50
+db $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $a7, $98, $95, $9e
+db $50, $a5, $a3, $95, $94, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e
+db $02, $01, $50, $6c, $1c, $05, $86, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70
+db $08, $a1, $dc, $ee, $ff, $03, $00, $08, $9b, $6d, $c5, $ff, $13, $02;Starstorm bazooka 2
+
+db $15, $03, $03, $18, $04, $05, $0B, $00, $0A, $5E, $9D, $C7;Not bazooka, fix enemies disappearing on rnwy5
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $a2, $91, $94, $99, $9f, $5e, $00, $03, $08, $6f, $6b, $c5, $00
+db $13, $02;Broken radio
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $93, $91, $9d, $95, $a2, $91, $5e, $03, $00, $08, $6f, $6b, $c5
+db $00, $13, $02;Broken camera
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $a4, $9f, $91, $a3, $a4, $95, $a2, $5e, $03, $00, $08, $6f, $6b
+db $c5, $00, $13, $02;Broken toaster
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $93, $9f, $9f, $9c, $99, $9e, $97, $50, $a5, $9e, $99, $a4, $50
+db $96, $a2, $9f, $9d, $50, $91, $50, $9d, $99, $9e, $99, $50, $96, $a2, $99, $94
+db $97, $95, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02;Broken minifridge
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $a3, $a0, $a2, $99, $9e, $97, $5e, $03, $00, $08, $6f, $6b, $c5
+db $00, $13, $02;Broken spring
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $98, $91, $9e, $94, $98, $95, $9c, $94, $50, $a2, $91, $94, $91
+db $a2, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02;Broken radar
+
+db $01, $50, $6c, $1c, $05, $0d, $6e, $03, $00, $70, $71, $50, $a0, $91, $a2, $a4
+db $50, $96, $a2, $9f, $9d, $50, $91, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $a6
+db $91, $93, $a5, $a5, $9d, $50, $93, $9c, $95, $91, $9e, $95, $a2, $5e, $03, $00
+db $08, $6f, $6b, $c5, $00, $13, $02;Broken vacuum
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $08, $ae
+db $d4, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Special BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $72
+db $9c, $91, $a3, $a4, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95
+db $a3, $50, $a7, $99, $a4, $98, $50, $a0, $a3, $a9, $93, $98, $99, $93, $50, $95
+db $9e, $95, $a2, $97, $a9, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Special BBR
+
+db $01, $50, $6C, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $85, $9e, $9c, $95
+db $91, $a3, $98, $95, $a3, $50, $91, $50, $a7, $91, $a6, $95, $50, $9f, $96, $50
+db $a0, $a3, $a9, $93, $98, $99, $93, $50, $95, $9e, $95, $a2, $97, $a9, $50, $a4
+db $98, $91, $a4, $50, $97, $a2, $95, $91, $a4, $9c, $a9, $50, $94, $91, $9d, $91
+db $97, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e
+db $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Special MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $7d
+db $91, $9b, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3
+db $50, $93, $a2, $a9, $50, $a5, $9e, $93, $9f, $9e, $a4, $a2, $9f, $9c, $9c, $91
+db $92, $9c, $a9, $5c, $50, $9f, $a2, $50, $9f, $93, $93, $91, $a3, $99, $9f, $9e
+db $91, $9c, $9c, $a9, $50, $96, $95, $95, $9c, $50, $a3, $a4, $a2, $91, $9e, $97
+db $95, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Flash BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $75
+db $9d, $99, $a4, $95, $a3, $50, $91, $50, $92, $a2, $99, $97, $98, $a4, $50, $96
+db $9c, $91, $a3, $98, $50, $a4, $98, $91, $a4, $50, $93, $91, $9e, $50, $9d, $91
+db $9b, $95, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $93, $a2, $a9, $50, $a5
+db $9e, $93, $9f, $9e, $a4, $a2, $9f, $9c, $9c, $91, $92, $9c, $a9, $5c, $03, $00
+db $70, $9f, $a2, $50, $9f, $93, $93, $91, $a3, $99, $9f, $9e, $91, $9c, $9c, $a9
+db $50, $92, $95, $50, $94, $95, $a3, $a4, $a2, $9f, $a9, $95, $94, $5e, $03, $00
+db $08, $ab, $6d, $c5, $ff, $13, $02;Flash BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $75
+db $9d, $99, $a4, $a3, $50, $91, $50, $97, $9c, $9f, $a2, $99, $9f, $a5, $a3, $50
+db $9c, $99, $97, $98, $a4, $50, $a4, $98, $91, $a4, $50, $98, $91, $a3, $50, $91
+db $50, $98, $99, $97, $98, $50, $a0, $a2, $9f, $92, $91, $92, $99, $9c, $99, $a4
+db $a9, $50, $9f, $96, $50, $94, $95, $a3, $a4, $a2, $9f, $a9, $99, $9e, $97, $50
+db $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $03, $00, $08, $ab
+db $6d, $c5, $ff, $13, $02;Flash MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $03, $70, $08
+db $33, $d6, $ee, $ff, $5e, $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Fire BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $ff, $70, $82
+db $9f, $91, $a3, $a4, $a3, $50, $91, $50, $a2, $9f, $a7, $50, $9f, $96, $50, $95
+db $9e, $95, $9d, $99, $95, $a3, $5e, $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Fire BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $82
+db $95, $91, $9c, $9c, $a9, $50, $a2, $9f, $91, $a3, $a4, $a3, $50, $91, $50, $a2
+db $9f, $a7, $50, $9f, $96, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $03, $00
+db $08, $ab, $6d, $c5, $ff, $13, $02;Fire MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $08
+db $e4, $d6, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Freeze BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $83
+db $a0, $9c, $91, $a3, $98, $95, $a3, $50, $99, $93, $95, $5d, $93, $9f, $9c, $94
+db $50, $9e, $99, $a4, $a2, $9f, $97, $95, $9e, $50, $9f, $9e, $50, $91, $9e, $50
+db $95, $9e, $95, $9d, $a9, $5e, $03, $00, $70, $7f, $93, $93, $91, $a3, $99, $9f
+db $9e, $91, $9c, $9c, $a9, $5c, $50, $99, $a4, $50, $9d, $91, $a9, $50, $96, $a2
+db $95, $95, $aa, $95, $50, $a4, $98, $95, $9d, $50, $a3, $9f, $9c, $99, $94, $5e
+db $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Freeze BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $83
+db $a0, $9c, $91, $a3, $98, $95, $a3, $50, $91, $50, $9c, $9f, $a4, $50, $9f, $96
+db $50, $99, $93, $95, $5d, $93, $9f, $9c, $94, $50, $9e, $99, $a4, $a2, $9f, $97
+db $95, $9e, $50, $9f, $9e, $50, $91, $9e, $50, $95, $9e, $95, $9d, $a9, $5e, $03
+db $00, $70, $7f, $93, $93, $91, $a3, $99, $9f, $9e, $91, $9c, $9c, $a9, $5c, $50
+db $99, $a4, $50, $9d, $91, $a9, $50, $96, $a2, $95, $95, $aa, $95, $50, $a4, $98
+db $95, $9d, $50, $a3, $9f, $9c, $99, $94, $5e, $03, $00, $08, $ab, $6d, $c5, $ff
+db $13, $02;Freeze MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $08
+db $bd, $d7, $ee, $ff, $03, $00, $01, $70, $08, $fc, $d7, $ee, $ff, $03, $00, $08
+db $ab, $6d, $c5, $00, $13, $02;Thunder BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $83
+db $98, $9f, $9f, $a4, $a3, $50, $a4, $a7, $9f, $50, $a3, $a0, $91, $a2, $9b, $a3
+db $50, $9f, $a5, $a4, $50, $a4, $9f, $a7, $91, $a2, $94, $a3, $50, $a4, $98, $95
+db $50, $95, $9e, $95, $9d, $a9, $5e, $03, $00, $70, $84, $98, $95, $a9, $50, $9d
+db $91, $a9, $50, $9d, $99, $a3, $a3, $50, $99, $96, $50, $a4, $98, $95, $a2, $95
+db $50, $91, $a2, $95, $50, $96, $95, $a7, $50, $95, $9e, $95, $9d, $99, $95, $a3
+db $5e, $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Thunder BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $83
+db $98, $9f, $9f, $a4, $a3, $50, $96, $9f, $a5, $a2, $50, $a3, $a0, $91, $a2, $9b
+db $a3, $50, $9f, $a5, $a4, $50, $a4, $9f, $a7, $91, $a2, $94, $a3, $50, $a4, $98
+db $95, $50, $95, $9e, $95, $9d, $a9, $5e, $03, $00, $70, $84, $98, $95, $a9, $50
+db $9d, $91, $a9, $50, $9d, $99, $a3, $a3, $50, $99, $96, $50, $a4, $98, $95, $a2
+db $95, $50, $91, $a2, $95, $50, $96, $95, $a7, $50, $95, $9e, $95, $9d, $99, $95
+db $a3, $5e, $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Thunder MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $08, $ae
+db $d4, $ee, $ff, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Starstorm BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $82
+db $91, $99, $9e, $a3, $50, $a3, $a4, $91, $a2, $a3, $50, $94, $9f, $a7, $9e, $50
+db $9f, $9e, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e, $03, $00, $08, $ab, $6d
+db $c5, $ff, $13, $02;Starstorm BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $72
+db $9f, $9d, $92, $91, $a2, $94, $a3, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50
+db $a7, $99, $a4, $98, $50, $91, $50, $a4, $9f, $a2, $a2, $95, $9e, $a4, $50, $9f
+db $96, $50, $a3, $a4, $91, $a2, $a3, $5e, $03, $00, $70, $80, $9f, $a3, $a3, $99
+db $92, $9c, $a9, $50, $a4, $98, $95, $50, $a3, $a4, $a2, $9f, $9e, $97, $95, $a3
+db $a4, $50, $a7, $95, $91, $a0, $9f, $9e, $50, $91, $a2, $9f, $a5, $9e, $94, $5e
+db $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Starstorm MBR
+
+db $01, $50, $6c, $1c, $05, $90, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $08, $c5
+db $6d, $c5, $ff, $0a, $b5, $4e, $c5;Bomb BR
+
+db $01, $50, $6c, $1c, $05, $91, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $0a, $00
+db $4f, $c5;Bomb BBR
+
+db $01, $50, $6c, $1c, $05, $92, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $75
+db $9e, $97, $a5, $9c, $96, $a3, $50, $91, $9e, $50, $95, $9e, $95, $9d, $a9, $50
+db $99, $9e, $50, $91, $50, $9d, $91, $a3, $a3, $99, $a6, $95, $50, $95, $a8, $a0
+db $9c, $9f, $a3, $99, $9f, $9e, $5e, $03, $00, $70, $84, $98, $95, $50, $92, $9c
+db $91, $a3, $a4, $50, $99, $a3, $50, $a0, $9f, $a7, $95, $a2, $96, $a5, $9c, $50
+db $95, $9e, $9f, $a5, $97, $98, $50, $a4, $9f, $50, $91, $96, $96, $95, $93, $a4
+db $50, $9e, $95, $91, $a2, $92, $a9, $50, $95, $9e, $95, $9d, $99, $95, $a3, $5e
+db $03, $00, $08, $ab, $6d, $c5, $ff, $13, $02;Bomb MBR
+
+db $70, $79, $9e, $93, $a2, $95, $91, $a3, $95, $50, $9f, $9e, $95, $50, $a0, $95
+db $a2, $a3, $9f, $9e, $57, $a3, $50, $74, $95, $96, $95, $9e, $a3, $95, $50, $96
+db $9f, $a2, $50, $a4, $98, $95, $50, $94, $a5, $a2, $91, $a4, $99, $9f, $9e, $50
+db $9f, $96, $50, $a4, $98, $95, $50, $93, $a5, $a2, $a2, $95, $9e, $a4, $50, $92
+db $91, $a4, $a4, $9c, $95, $5e, $00, $08, $0d, $6b, $c5, $ff, $02;def up a
+
+db $70, $79, $9e, $93, $a2, $95, $91, $a3, $95, $50, $95, $a6, $95, $a2, $a9, $9f
+db $9e, $95, $57, $a3, $50, $74, $95, $96, $95, $9e, $a3, $95, $50, $96, $9f, $a2
+db $50, $a4, $98, $95, $50, $94, $a5, $a2, $91, $a4, $99, $9f, $9e, $50, $9f, $96
+db $50, $a4, $98, $95, $50, $93, $a5, $a2, $a2, $95, $9e, $a4, $50, $92, $91, $a4
+db $a4, $9c, $95, $5e, $00, $08, $0d, $6b, $c5, $ff, $02;def up o
+
+db $70, $74, $a2, $91, $99, $9e, $a3, $50, $78, $80, $50, $96, $a2, $9f, $9d, $50
+db $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $5e, $00, $70, $84, $98, $95, $50
+db $9d, $9f, $a2, $95, $50, $78, $80, $50, $91, $9e, $50, $95, $9e, $95, $9d, $a9
+db $50, $98, $91, $a3, $5c, $50, $a4, $98, $95, $50, $9d, $9f, $a2, $95, $50, $a9
+db $9f, $a5, $50, $97, $95, $a4, $5e, $02;Drain a
+
+db $70, $74, $a2, $91, $99, $9e, $a3, $50, $a3, $9f, $9d, $95, $50, $78, $80, $50
+db $96, $a2, $9f, $9d, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3
+db $5e, $00, $70, $84, $98, $95, $50, $9d, $9f, $a2, $95, $50, $78, $80, $50, $a4
+db $98, $95, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $98, $91, $a6, $95, $5c
+db $50, $a4, $98, $95, $50, $9d, $9f, $a2, $95, $50, $a9, $9f, $a5, $50, $97, $95
+db $a4, $5e, $02;Drain o
+
+db $70, $7d, $91, $9b, $95, $a3, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9
+db $50, $a5, $9e, $91, $92, $9c, $95, $50, $a4, $9f, $50, $93, $9f, $9e, $93, $95
+db $9e, $a4, $a2, $91, $a4, $95, $50, $96, $9f, $a2, $50, $91, $50, $a3, $98, $9f
+db $a2, $a4, $50, $a4, $99, $9d, $95, $5e, $02;disable a
+
+db $70, $7d, $91, $9b, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99
+db $95, $a3, $50, $a5, $9e, $91, $92, $9c, $95, $50, $a4, $9f, $50, $93, $9f, $9e
+db $93, $95, $9e, $a4, $a2, $91, $a4, $95, $50, $96, $9f, $a2, $50, $91, $50, $a3
+db $98, $9f, $a2, $a4, $50, $a4, $99, $9d, $95, $5e, $02;disable o
+
+db $70, $83, $9f, $9c, $99, $94, $99, $96, $99, $95, $a3, $50, $9f, $9e, $95, $50
+db $95, $9e, $95, $9d, $a9, $5e, $02;Stop a
+
+db $70, $83, $9f, $9c, $99, $94, $99, $96, $99, $95, $a3, $50, $91, $9c, $9c, $50
+db $95, $9e, $95, $9d, $99, $95, $a3, $5e, $02;stop o
+
+db $70, $82, $95, $9d, $9f, $a6, $95, $a3, $50, $91, $50, $a3, $98, $99, $95, $9c
+db $94, $50, $96, $a2, $9f, $9d, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9
+db $5e, $00, $70, $79, $a4, $50, $9d, $91, $a9, $50, $9f, $93, $93, $91, $a3, $99
+db $9f, $9e, $91, $9c, $9c, $a9, $50, $96, $91, $99, $9c, $5e, $02;Neutralize a
+
+db $70, $82, $95, $9d, $9f, $a6, $95, $a3, $50, $a3, $98, $99, $95, $9c, $94, $a3
+db $50, $96, $a2, $9f, $9d, $50, $95, $a6, $95, $a2, $a9, $9f, $9e, $95, $50, $99
+db $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $00, $70, $82, $95, $a3, $95, $a4
+db $a3, $50, $91, $92, $99, $9c, $99, $a4, $a9, $50, $93, $98, $91, $9e, $97, $95
+db $a3, $50, $9f, $96, $50, $95, $a6, $95, $a2, $a9, $9f, $9e, $95, $50, $99, $9e
+db $50, $92, $91, $a4, $a4, $9c, $95, $5e, $02;Neutralize o
+;;;;;;;;;;;;;;;;;;;;
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $80, $a5, $a4, $a3, $50, $9f
+db $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $a4, $9f, $50, $a3, $9c, $95, $95
+db $a0, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab
+db $6d, $c5, $ff, $13, $02;sleep spray
+
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $80, $91, $a2, $91, $9c, $a9
+db $aa, $95, $a3, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $99, $9e
+db $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13
+db $02;para spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $79, $9e, $93, $a2, $95, $91
+db $a3, $95, $50, $9f, $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $96, $a2
+db $99, $95, $9e, $94, $a3, $50, $7f, $96, $96, $95, $9e, $a3, $95, $50, $94, $a5
+db $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $0d
+db $6b, $c5, $00, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;off up spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $74, $95, $93, $a2, $95, $91
+db $a3, $95, $50, $9f, $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $95, $9e
+db $95, $9d, $99, $95, $a3, $50, $74, $95, $96, $95, $9e, $a3, $95, $50, $94, $a5
+db $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $0d
+db $6b, $c5, $00, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;Def down spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $7d, $91, $9b, $95, $a3, $50
+db $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $96, $95, $95, $9c, $50, $a3
+db $a4, $a2, $91, $9e, $97, $95, $50, $94, $a5, $a2, $99, $9e, $97, $50, $92, $91
+db $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13, $02;brainshock spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $82, $95, $9d, $9f, $a6, $95
+db $a3, $50, $91, $50, $a3, $98, $99, $95, $9c, $94, $50, $96, $a2, $9f, $9d, $50
+db $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $94, $a5, $a2, $99, $9e, $97
+db $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5, $00, $13
+db $02;Shield off spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $83, $9f, $9c, $99, $94, $99
+db $96, $99, $95, $a3, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $99
+db $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5, $00
+db $13, $02;Stop spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $74, $a2, $91, $99, $9e, $a3
+db $50, $78, $80, $50, $96, $a2, $9f, $9d, $50, $9f, $9e, $95, $50, $95, $9e, $95
+db $9d, $a9, $50, $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08
+db $ab, $6d, $c5, $00, $13, $02;HP-Drain spray
+
+db $01, $50, $6c, $1c, $05, $a1, $6e, $03, $00, $70, $7d, $91, $9b, $95, $a3, $50
+db $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $a5, $9e, $91, $92, $9c, $95
+db $50, $a4, $9f, $50, $93, $9f, $9e, $93, $95, $9e, $a4, $a2, $91, $a4, $95, $50
+db $99, $9e, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $ab, $6d, $c5
+db $00, $13, $02;Disable spray
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $80
+db $a5, $a4, $a3, $50, $91, $9e, $50, $95, $9e, $95, $9d, $a9, $50, $a4, $9f, $50
+db $a3, $9c, $95, $95, $a0, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Hypno gadget a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $80
+db $a5, $a4, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $a9, $50, $a4, $9f
+db $50, $a3, $9c, $95, $95, $a0, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Hypno gadget o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $80
+db $91, $a2, $91, $9c, $a9, $aa, $95, $a3, $50, $91, $9e, $50, $95, $9e, $95, $9d
+db $a9, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Para a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $80
+db $91, $a2, $91, $9c, $a9, $aa, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95
+db $9d, $99, $95, $a3, $5e, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Para o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $79, $9e, $93, $a2, $95, $91
+db $a3, $95, $50, $9f, $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $96, $a2
+db $99, $95, $9e, $94, $a3, $50, $7f, $96, $96, $95, $9e, $a3, $95, $50, $94, $a5
+db $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $0d
+db $6b, $c5, $00, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Offense up a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $79, $9e, $93, $a2, $95, $91
+db $a3, $95, $a3, $50, $a4, $98, $95, $50, $7f, $96, $96, $95, $9e, $a3, $95, $50
+db $9f, $96, $50, $91, $9c, $9c, $50, $a4, $98, $95, $50, $96, $a2, $99, $95, $9e
+db $94, $a3, $5e, $03, $00, $08, $0d, $6b, $c5, $00, $03, $00, $08, $9b, $6d, $c5
+db $00, $13, $02;Offense up o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $74, $95, $93, $a2, $95, $91
+db $a3, $95, $50, $9f, $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $95, $9e
+db $95, $9d, $99, $95, $a3, $50, $74, $95, $96, $95, $9e, $a3, $95, $50, $94, $a5
+db $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $0d
+db $6b, $c5, $00, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Def down a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $74, $95, $93, $a2, $95, $91
+db $a3, $95, $a3, $50, $a4, $98, $95, $50, $74, $95, $96, $95, $9e, $a3, $95, $50
+db $9f, $96, $50, $91, $9c, $9c, $50, $a4, $98, $95, $50, $95, $9e, $95, $9d, $99
+db $95, $a3, $5e, $03, $00, $08, $0d, $6b, $c5, $00, $03, $00, $08, $9b, $6d, $c5
+db $00, $13, $02;Def down o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $79, $9e, $93, $a2, $95, $91
+db $a3, $95, $50, $9f, $9e, $95, $50, $9f, $96, $50, $a4, $98, $95, $50, $96, $a2
+db $99, $95, $9e, $94, $a3, $50, $74, $95, $96, $95, $9e, $a3, $95, $50, $94, $a5
+db $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08, $0d
+db $6b, $c5, $00, $03, $00, $08, $9b, $6d, $c5, $00, $13, $02;Def up a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $7d
+db $91, $9b, $95, $a3, $50, $9f, $9e, $95, $50, $95, $9e, $95, $9d, $a9, $50, $96
+db $95, $95, $9c, $50, $a3, $a4, $a2, $91, $9e, $97, $95, $5e, $03, $00, $08, $9b
+db $6d, $c5, $00, $13, $02;Brainshock a
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $7d
+db $91, $9b, $95, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3
+db $50, $96, $95, $95, $9c, $50, $a3, $a4, $a2, $91, $9e, $97, $95, $5e, $03, $00
+db $08, $9b, $6d, $c5, $00, $13, $02;Brainshock o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $72
+db $9c, $91, $a3, $a4, $a3, $50, $91, $50, $a3, $a4, $99, $93, $9b, $a9, $50, $a3
+db $a5, $92, $a3, $a4, $91, $9e, $93, $95, $50, $a4, $98, $91, $a4, $50, $a3, $a4
+db $9f, $a0, $a3, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50
+db $96, $a2, $9f, $9d, $50, $9d, $9f, $a6, $99, $9e, $97, $5e, $03, $00, $08, $9b
+db $6d, $c5, $00, $13, $02;Slime o
+
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $08, $b7, $6d, $c5, $00, $70, $74
+db $99, $a3, $a2, $a5, $a0, $a4, $a3, $50, $a4, $98, $95, $50, $80, $83, $79, $50
+db $9f, $96, $50, $91, $9c, $9c, $50, $95, $9e, $95, $9d, $99, $95, $a3, $50, $94
+db $a5, $a2, $99, $9e, $97, $50, $92, $91, $a4, $a4, $9c, $95, $5e, $03, $00, $08
+db $9b, $6d, $c5, $00, $13, $02;Disable o
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b
+db $95, $9e, $50, $a0, $9f, $93, $9b, $95, $a4, $a7, $91, $a4, $93, $98, $5e, $03
+db $00, $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03
+db $00, $70, $71, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $a3, $93, $a2, $95, $95
+db $9e, $50, $96, $a2, $9f, $9d, $50, $91, $50, $98, $91, $9e, $94, $98, $95, $9c
+db $94, $50, $94, $95, $a6, $99, $93, $95, $5e, $03, $00, $08, $6f, $6b, $c5, $00
+db $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2
+db $9f, $9b, $95, $9e, $50, $a2, $91, $aa, $9f, $a2, $5e, $03, $00, $08, $6f, $6b
+db $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50
+db $92, $a2, $9f, $9b, $95, $9e, $50, $94, $95, $a3, $9b, $50, $96, $91, $9e, $5e
+db $03, $00, $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e
+db $03, $00, $70, $71, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $96, $91, $a5, $93
+db $95, $a4, $50, $98, $95, $91, $94, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13
+db $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $a0, $99, $95
+db $93, $95, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $9f, $96, $96, $50, $9f, $96
+db $50, $91, $50, $a4, $a5, $92, $91, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13
+db $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f
+db $9b, $95, $9e, $50, $a3, $a0, $a2, $99, $9e, $9b, $9c, $95, $a2, $5e, $03, $00
+db $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00
+db $70, $83, $9f, $9d, $95, $50, $a0, $91, $a2, $a4, $50, $92, $95, $9c, $9f, $9e
+db $97, $99, $9e, $97, $50, $a4, $9f, $50, $91, $50, $a4, $a2, $9f, $9d, $92, $9f
+db $9e, $95, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c
+db $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $9d
+db $99, $93, $a2, $9f, $a7, $91, $a6, $95, $50, $9f, $a6, $95, $9e, $5e, $03, $00
+db $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00
+db $70, $80, $91, $a2, $a4, $50, $9f, $96, $50, $91, $50, $92, $a2, $9f, $9b, $95
+db $9e, $50, $94, $95, $95, $a0, $50, $96, $a2, $a9, $95, $a2, $5e, $03, $00, $08
+db $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70
+db $71, $50, $9e, $9f, $aa, $aa, $9c, $95, $50, $96, $a2, $9f, $9d, $50, $91, $50
+db $a7, $91, $a4, $95, $a2, $99, $9e, $97, $50, $93, $91, $9e, $5e, $03, $00, $08
+db $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05, $01, $6e, $03, $00, $70
+db $71, $50, $92, $a2, $9f, $9b, $95, $9e, $50, $97, $91, $a2, $94, $95, $9e, $50
+db $98, $9f, $a3, $95, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02, $01, $50
+db $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b, $95, $9e
+db $50, $94, $95, $a6, $99, $93, $95, $50, $9f, $96, $50, $a3, $9f, $9d, $95, $50
+db $a3, $9f, $a2, $a4, $5e, $03, $00, $70, $79, $a4, $a3, $50, $96, $a5, $9e, $93
+db $a4, $99, $9f, $9e, $50, $99, $a3, $50, $99, $9e, $94, $99, $a3, $93, $95, $a2
+db $9e, $99, $92, $9c, $95, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02, $01
+db $50, $6c, $1c, $05, $01, $6e, $03, $00, $70, $71, $50, $92, $a2, $9f, $9b, $95
+db $9e, $50, $93, $9c, $9f, $a4, $98, $95, $a3, $50, $a3, $a4, $95, $91, $9d, $95
+db $a2, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02, $01, $50, $6c, $1c, $05
+db $01, $6e, $03, $00, $70, $80, $99, $95, $93, $95, $a3, $50, $9f, $96, $50, $91
+db $50, $92, $a2, $9f, $9b, $95, $9e, $50, $9d, $9f, $a4, $98, $95, $a2, $92, $9f
+db $91, $a2, $94, $5e, $03, $00, $08, $6f, $6b, $c5, $00, $13, $02;Descriptions for broken items
+
+db $97, $95, $9e, $95, $a2, $9f, $a3, $99, $a4, $a9, $5e, $13, $18, $04, $0a, $7a
+db $90, $c7
+
+db $18, $01, $01, $0A, $2D, $B1, $EE
+
+db $a9, $9f, $a5, $a2, $50, $9c, $9f, $97, $99, $93, $91, $9c, $50, $72, $7b, $50
+db $9d, $9f, $94, $95, $0a, $b8, $1f, $c8
+
+db $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $0a, $c4, $8a, $c9
+
+db $00, $0A, $a3, $C8, $C6
+
+db $5E, $0A, $66, $C0, $C6
+
+db $1f, $31, $0a, $81, $c0, $c6
+
+db $00, $0A, $F1, $10, $C6
+
+;;;;;;;;;;;;;;;;;;;;
+
+ORG $D57295
+db $80, $A2, $9F, $97, $A2, $95, $A3, $A3, $99, $A6, $95, $50, $92, $91, $A4, $00
+
+ORG $D572BC
+db $80, $a2, $9f, $97, $a2, $95, $a3, $a3, $99, $a6, $95, $50, $a0, $91, $9e, $00
+
+ORG $D572E3
+db $80, $A2, $9F, $97, $A2, $95, $A3, $A3, $99, $A6, $95, $50, $97, $A5, $9E, $00
+
+ORG $D5730A
+db $80, $a2, $9f, $97, $a2, $95, $a3, $5e, $50, $92, $a2, $91, $93, $95, $9c
+db $95, $a4, $00
+
+ORG $D57331
+db $80, $A2, $9F, $97, $A2, $95, $A3, $A3, $99, $A6, $95, $50, $9F, $A4, $98, $95
+db $A2, $00
+
+ORG $C5E3BF
+db $FE; Lucky sandwiches no longer randomize themselves
+
+ORG $D5728B
+dw $01F3 ;Lucky Sandwich new action
+
+ORG $C89358
+db $0A, $61, $EE, $EE
+
+ORG $C951E3
+db $0A, $73, $EE, $EE
+
+ORG $C72BE7
+db $1c, $05, $01, $0a, $fe, $2b, $c7
+
+ORG $C8008D
+db $1c, $05, $01, $50
+
+ORG $C81FA3
+db $0A, $7A, $EE, $EE
+
+ORG $C81FF1
+db $1c, $05, $01, $a3, $5e, $07, $00, $00
+
+ORG $C93F08
+db $1c, $05, $01, $6e, $0a, $15, $3f, $c9
+
+ORG $C98ABC
+db $0a, $92, $ee, $ee
+
+ORG $C6AEB4
+db $91, $50, $1c, $05, $01, $0a, $c2, $ae, $c6
+
+ORG $C6C891
+db $A0, $EE, $EE
+
+ORG $C6C063
+db $a5, $ee, $EE
+
+ORG $C6C06F
+db $aa, $ee, $ee
+
+ORG $C60FE1
+db $B0, $EE, $EE
+
+ORG $C61123
+db $1c, $05, $01, $0a, $2f, $11, $c6
+
+ORG $C9E84E
+db $0a, $5a, $e7, $c9
+
+ORG $CF097A
+db $00, $00;Threed tunnel door flag
+
+ORG $C7C41F
+db $CD, $C3; Lumine hole double flag
+
+ORG $EEA9B6
+db $1d, $0e, $ff, $01, $0a, $ef, $a9, $ee
+
+ORG $C9E2F1
+db $0A, $B5, $EE, $EE
+
+ORG $EEEEB5
+db $04, $C4, $00, $04, $DC, $00, $02
+
+ORG $C87205
+db $9e, $c5, $c7 ;sphinx post-pyramid
+
+ORG $CF8E44
+db $01
+
+ORG $CF8E42
+db $69, $00
+
+ORG $D014C0
+db $80
+;Color Math on swirls
+ORG $C2E989
+;LDX #$007F
+
+ORG $C2E995
+;LDX #$003F
+
+ORG $C5770D
+db $A3, $9F, $A5, $A4, $98
+
+ORG $C57665
+db $a3, $9f, $a5, $a4
+
+;;;;;;;;;;;;;;;;;
+;New battle entry for Heavily Armed Pokey
+ORG $CBD8D2
+db $DC, $00;Battle Background
+
+ORG $D0D5A5
+db $d8, $00;Pokey battle
+
+ORG $D5E533
+db $01
+;;;;;;;;;;;;
+;new entry for Diamond Dog
+ORG $D0DF70
+db $01, $53, $00, $ff
+
+ORG $CBDFFE
+db $37, $01
+
+ORG $D5E688
+db $49
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;entry for giygas phase 2 fix
+ORG $C2C505
+LDA #$0005;Set the group number
+
+ORG $D0D562
+db $00
+
+ORG $D0C63C
+db $00
+
+ORG $CBD8AE
+db $e0, $00, $df, $00
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C91EAD
+db $0a, $fc, $1e, $c9
+
+ORG $C3CF10
+db $04
+;sky runner event stuff
+
+ORG $C91E56
+db $0A, $60, $F2, $EE
+
+ORG $C3CEFE
+db $D8
+
+ORG $C91F11
+db $1F, $00, $00, $6E
+db $10, $F0, $10, $40, $0A, $FE, $F1, $EE
+
+ORG $CF95F6
+db $EC, $02, $02
+
+ORG $CF95F1
+db $0D
+
+ORG $CF6C31
+db $03; Remove sky runner npc from Onett
+
+ORG $C6BBF9
+db $0A, $24, $F2, $EE
+
+;;;;;;;;;
+ORG $EFA455
+db $0A, $3A, $F1, $EE
+;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Frank
+ORG $C65F1F
+db $08, $bc, $ee, $ee
+
+ORG $C65F10
+db $08, $bc, $ee, $ee
+
+ORG $C66481
+db $08, $bc, $ee, $ee
+
+ORG $C660C4
+db $08, $bc, $ee, $ee
+
+ORG $C66110
+db $08, $bc, $ee, $ee
+
+ORG $C66197
+db $08, $bc, $ee, $ee
+
+ORG $C661AB
+db $08, $bc, $ee, $ee
+
+ORG $C746E1
+db $08, $bc, $ee, $ee
+
+ORG $C74BC0
+db $08, $bc, $ee, $ee
+
+ORG $C74E1C
+db $08, $bc, $ee, $ee
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;FSTM2
+ORG $C66145
+db $08, $bc, $ee, $ee, $ff, $0a, $56, $61, $c6
+
+ORG $C6648A
+db $08, $bc, $ee, $ee, $ff, $0a, $9b, $64, $c6
+
+ORG $C664FB
+db $08, $bc, $ee, $ee, $ff, $0a, $0c, $65, $c6
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Captain Strong
+ORG $C5FC28
+db $50, $50, $08, $bc, $ee, $ee, $ff
+
+ORG $C5FC58
+db $08, $bc, $ee, $ee, $ff, $0a, $65, $fc, $c5
+
+ORG $C5FCF6
+db $08, $bc, $ee, $ee, $ff, $0f
+
+ORG $C65F87
+db $08, $bc, $ee, $ee, $ff, $0f
+
+ORG $C66084
+db $08, $bc, $ee, $ee, $ff, $0f
+;;;;;;;;;;;;;;;;
+;Everdred
+ORG $C95C6F
+db $08, $bc, $ee, $ee, $ff, $0f
+
+ORG $C8065C
+db $0a, $e9, $ee, $ee
+;;;;;;;;;;;;;;;;;;;
+;Carpainter
+ORG $C993DA
+db $08, $bc, $ee, $ee, $ff, $0a, $e3, $93, $c9
+
+ORG $C9945D
+db $08, $bc, $ee, $ee, $ff, $0a, $66, $94, $c9
+
+ORG $C99310
+db $08, $bc, $ee, $ee, $ff, $0a, $19, $93, $c9
+
+ORG $C99363
+db $08, $bc, $ee, $ee, $ff, $0a, $6c, $93, $c9
+
+ORG $C990D9
+db $08, $bc, $ee, $ee, $ff, $0f, $0f
+
+ORG $C98EF5
+db $08, $bc, $ee, $ee, $ff, $0a, $fe, $8e, $c9
+
+ORG $C99142
+db $08, $bc, $ee, $ee, $ff, $0a, $4b, $91, $c9
+
+ORG $C99027
+db $08, $bc, $ee, $ee, $ff, $0a, $30, $90, $c9
+
+ORG $C983BA
+db $08, $bc, $ee, $ee, $ff, $0a, $c3, $83, $c9
+
+ORG $C9840B
+db $08, $bc, $ee, $ee, $ff, $0a, $14, $84, $c9
+
+ORG $C9835A
+db $08, $bc, $ee, $ee, $ff, $0a, $63, $83, $c9
+
+ORG $C684CF
+db $08, $bc, $ee, $ee, $ff, $0f, $0f
+
+ORG $C9056E
+db $08, $bc, $ee, $ee, $ff, $0a, $77, $05, $c9
+
+ORG $C794EB
+db $08, $bc, $ee, $ee, $ff, $0a, $f4, $94, $c7
+;;;;;;;;;;;;;
+;Belch
+ORG $C8EF20
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C8EF37
+db $08, $bc, $ee, $ee, $ff
+
+ORG $EF6296
+db $08, $bc, $ee, $ee, $ff, $0a, $9f, $62, $ef
+
+ORG $EF62B2
+db $08, $bc, $ee, $ee, $ff, $0a, $bb, $62, $ef
+
+ORG $EF690F
+db $08, $bc, $ee, $ee, $ff, $0a, $18, $69, $ef
+
+ORG $EF6972
+db $08, $bc, $ee, $ee, $ff, $0a, $7b, $69, $ef
+
+
+
+;Mani Mani
+ORG $C978AC
+db $08, $bc, $ee, $ee, $ff, $50, $99, $a3, $50, $0a, $bb, $78, $c9
+
+ORG $C9782C
+db $08, $bc, $ee, $ee, $ff, $50, $99, $a3, $50, $0a, $3b, $78, $c9
+
+ORG $C97997
+db $08, $bc, $ee, $ee, $ff, $0a, $a3, $79, $c9, $c9
+
+
+;;;;;;;;;;;;;;;
+;Kraken
+ORG $C86060
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C86138
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C8B42F
+db $08, $bc, $ee, $ee
+
+ORG $C8B8B3
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C8B6FB
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C8B590
+db $08, $bc, $ee, $ee, $ff, $0f
+
+ORG $C9AB2A
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C92D4C
+db $08, $bc, $ee, $ee, $ff
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Master Belch
+ORG $C9E64C
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C9E68F
+db $08, $bc, $ee, $ee, $ff
+
+ORG $C9E6C1
+db $0a, $d4, $ee, $ee, $FF
+
+;;;;;;;;;;;;;
+;Starman DX
+ORG $C92C28
+db $08, $bc, $ee, $ee, $ff, $0a, $31, $2c, $c9
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Pokey
+ORG $C57E39
+db $0a, $c2, $ee, $ee
+
+ORG $C57E57
+db $0a, $cb, $ee, $ee
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C8FC59
+db $0A, $9C, $F0, $EE
+
+ORG $C57F4A
+db $0A, $A7, $F0, $EE
+
+
+ORG $C76186
+db $0A
+dl tracy_backpack_tex
+
+ORG $C64690
+dl tracy_backpack_twice_tex
+
+ORG $C6AE42
+db $0A
+dl winters_drugstore_space
+
+ORG $C6AEA3
+db $0A
+dl winters_drugstore_space2
+
+
+;;;;;;;;;;;;;;;
+;hint stuff
+
+ORG $CF8C25
+dl onett_hint_man ;Onett hint guy text pointer
+
+ORG $CF9C04
+dl twoson_hint_man
+
+ORG $CFAB6C
+dl threed_hint_man
+
+ORG $CFC9F8
+dl fourside_hint_man
+
+ORG $CFD0AD
+dl summers_hint_man
+
+ORG $CFD61F
+dl scaraba_hint_man
+
+ORG $C726D8
+db $02
+
+ORG $C701A0
+db $49
+
+ORG $C701C6
+db $08
+dd display_hint_price
+db $0F
+
+ORG $C7032E
+db $70, $87, $9f, $a2, $94, $50, $9f, $9e, $50, $a4, $98, $95, $50, $a3, $a4, $a2
+db $95, $95, $a4, $50, $99, $a3, $50, $a4, $98, $91, $a4, $50
+
+db $06, $05, $04
+dd display_onett_hint
+
+db $06, $06, $04
+dd display_twoson_hint
+
+db $06, $07, $04
+dd display_threed_hint
+
+db $06, $08, $04
+dd display_fourside_hint
+
+db $06, $09, $04
+dd display_summers_hint
+
+db $06, $0A, $04
+dd display_scaraba_hint
+db $02
+
+display_onett_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_onett_hint; replace with a $02 if not pushable
+db $06, $F9, $03
+dd .onett_hint_twice
+db $08
+dd count_hints
+.onett_hint_twice:
+db $04, $F9, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $05, $04
+db $02
+
+display_twoson_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_twoson_hint; replace with a $02 if not pushable
+db $06, $FA, $03
+dd .twoson_hint_twice
+db $08
+dd count_hints
+.twoson_hint_twice:
+db $04, $FA, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $06, $04
+db $02
+
+display_threed_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_threed_hint; replace with a $02 if not pushable
+db $06, $FB, $03
+dd .threed_hint_twice
+db $08
+dd count_hints
+.threed_hint_twice:
+db $04, $FB, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $07, $04
+db $02
+
+display_fourside_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_fourside_hint; replace with a $02 if not pushable
+db $06, $FC, $03
+dd .fourside_hint_twice
+db $08
+dd count_hints
+.fourside_hint_twice:
+db $04, $FC, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $08, $04
+db $02
+
+display_summers_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_summers_hint; replace with a $02 if not pushable
+db $06, $FD, $03
+dd .summers_hint_twice
+db $08
+dd count_hints
+.summers_hint_twice:
+db $04, $FD, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $09, $04
+db $02
+
+display_scaraba_hint:
+db $08
+dd hint_error_message;replace with generated pointer
+db $03
+db $08
+dd push_scaraba_hint; replace with a $02 if not pushable
+db $06, $FE, $03
+dd .scaraba_hint_twice
+db $08
+dd count_hints
+.scaraba_hint_twice:
+db $04, $FE, $03
+db $01
+db $06, $04, $04
+dd $C72348 ;Direct here if we're out of hints
+dd $C726CC08
+db $FF
+db $03, $01
+db $08
+dd post_hint_text
+db $05, $0A, $04
+db $02
+
+ORG $FCFFA0
+db $75, $91, $a2, $a4, $98, $72, $9f, $a5, $9e, $94, $50, $71, $a2, $93, $98, $99
+db $a0, $95, $9c, $91, $97, $9f, $50, $a6, $95, $a2, $a3, $99, $9f, $9e, $50, $02
+
+ORG $E1F4CA
+db $f9, $03; Onett hint shop flag
+
+ORG $E1F4F3
+db $fa, $03; Twoson hint shop flag
+
+ORG $E1F521
+db $fb, $03; Threed hint shop flag
+
+ORG $E1F545
+db $fc, $03; Fourside hint shop flag
+
+ORG $E1F57E
+db $fd, $03; Summers hint shop flag
+
+ORG $E1F55F
+db $fe, $03; Scaraba hint shop flag
+
+;Giant Step
+ORG $D6FC38
+db $08
+dd boost_speed_dynamic
+
+ORG $D6FC60
+db $08
+dd boost_vitality_dynamic
+;Lilliput Steps
+ORG $D6FCBB
+db $08
+dd boost_guts_dynamic
+
+ORG $D6FCE3
+db $08
+dd boost_vitality_dynamic
+;Milky Well
+ORG $D6FD3A
+db $08
+dd boost_speed_dynamic
+
+ORG $D6FD5C
+db $08
+dd boost_iq_dynamic
+;Magnet Hill
+ORG $D6FDB7
+db $08
+dd boost_vitality_dynamic
+
+ORG $D6FDDB
+db $08
+dd boost_luck_dynamic
+;Rainy Circle
+ORG $D6FE33
+db $08
+dd boost_guts_dynamic
+
+ORG $D6FE55
+db $08
+dd boost_iq_dynamic
+;Pink Cloud
+
+ORG $D6FEAC
+db $08
+dd boost_speed_dynamic
+
+ORG $D6FED0
+db $08
+dd boost_guts_dynamic
+;Lumine Hall
+ORG $D6FF27
+db $08
+dd boost_luck_dynamic
+
+ORG $D6FF49
+db $08
+dd boost_iq_dynamic
+;Fire Spring
+ORG $D6FFA1
+db $08
+dd boost_speed_dynamic
+
+ORG $D6FFC5
+db $08
+dd boost_luck_dynamic
+
+ORG $C99A9D
+db $a1, $9a, $c9
+
+ORG $C769A8
+db $0A, $3C, $F7, $EE
+
+ORG $C10E16
+LDA #$0098
+
+ORG $EF79F3
+db $4C, $F7, $EE
+
+ORG $D7FD30
+ExpPointers:
+dw $FFFF
+dw $FD40
+dw $FD44
+dw $FD48
+dw $FD4C
+
+ORG $D7FD40
+dd $00000011
+dd $00000000
+dd $00000000
+dd $000016EF
+
+PlayerCount: ;Write this value during generation
+dw $0001
+dw $0000
+
+BannedItemList:
+db $01, $68, $69, $7D, $8B, $9E, $A2, $A6, $A7, $AA, $AB, $AC, $AD, $AE
+db $AF, $B1, $B2, $B3, $B4, $B5, $B6, $B7, $B8, $B9, $BB, $C0, $C1, $C4
+db $C5, $CA, $CB, $CC, $CD, $CE, $D0, $D2, $D3, $E3, $E4, $E5, $E6, $E7
+db $FD, $B0, $A3, $C5, $A4
+
+StorageTitlePointers:
+dw $FF90, $FF70
+
+StorageTitleLength:
+dw $000C, $0010
+
+StorageNumberStart:
+dw $9CA9, $9CAE
+
+ORG $C9B132
+db $11, $04; Tony phone call flag
+
+ORG $C37A90
+db $90;Dept. Store starts farther right. Used for Escargo Express
+
+ORG $C37AB1
+db $30
+
+ORG $FCFF90
+db $77, $99, $96, $A4, $50, $79, $9E, $92, $9F, $A8
+
+ORG $D5630B
+db $84, $99, $9e, $a9, $50, $9b, $95, $a9, $00; Tiny key
+
+ORG $D5632E
+dd TinyKeyDesc
+
+ORG $D56B45
+db $84, $95, $9E, $94, $91, $50, $9C, $91, $A6, $91, $A0, $91, $9E, $A4, $A3, $00
+
+ORG $D56B68
+dd LavapantsDesc
+
+ORG $C6FED6
+db $0A
+dl LavaPantsHandleItem
+
+ORG $D56B61
+db $0F
+
+ORG $C7BF60
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7BF71
+
+ORG $C7C02B
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C03C
+
+ORG $C7C0FD
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C10E
+
+ORG $C7C1CE
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C1DF
+
+ORG $C7C299
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C2AA
+
+ORG $C7C360
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C371
+
+ORG $C7C44F
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C460
+
+ORG $C7C511
+db $08
+dl RememberedTex
+db $FF
+
+db $0A
+dl $C7C522
+
+ORG $FCFF70
+db $79, $9D, $A0, $9F, $A2, $A4, $91, $9E, $A4, $50, $77, $9F, $9F, $94, $A3
+
+ORG $EE9645
+dd SetupStorageTakeMenu
+
+ORG $EE96D6
+db $0A
+dl InitStorageMen
+
+ORG $EE969F
+dl InitStorageMen
+
+ORG $EE968C
+db $0A
+dl CheckItemOnStore
+
+ORG $C66698
+db $08
+dd SancFirst
+
+ORG $C6BEA7
+db $0A
+dl RainyCircleIntro
+
+ORG $C83D4C
+db $08
+dd SancFifth
+
+ORG $C9D2E2
+db $08
+dd SancSixth
+
+ORG $C9E2A3
+db $08
+dd SancSeventh
+
+ORG $EF5813
+db $0A
+dl FireSpringIntro
+
+ORG $EF67C2
+db $08
+dd SancThird
+
+ORG $EF97CA
+db $08
+dd SancSecond
+
+ORG $EE96B7
+db $0A
+dl CheckAbsoluteStorage
+
+ORG $D7FDA0
+MusicTrackList:
+db $00, $01, $02, $03, $04, $05, $06, $07, $08, $09, $0a, $0b, $0c, $0d, $0e, $0f
+db $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
+db $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
+db $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f
+db $40, $41, $42, $43, $44, $45, $46, $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $4f
+db $50, $51, $52, $53, $54, $55, $56, $57, $58, $59, $5a, $5b, $5c, $5d, $5e, $5f
+db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6a, $6b, $6c, $6d, $6e, $6f
+db $70, $71, $72, $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c, $7d, $7e, $7f
+db $80, $81, $82, $83, $84, $85, $86, $87, $88, $89, $8a, $8b, $8c, $8d, $8e, $8f
+db $90, $91, $92, $93, $94, $95, $96, $97, $98, $99, $9a, $9b, $9c, $9d, $9e, $9f
+db $a0, $a1, $a2, $a3, $a4, $a5, $a6, $a7, $a8, $a9, $aa, $ab, $ac, $ad, $ae, $af
+db $b0, $b1, $b2, $b3, $b4, $b5, $b6, $b7, $b8, $b9, $ba, $bb, $bc, $bd, $be, $bf
+
+BanListNoProgs:
+db $01, $68, $69, $7D, $8B, $9E, $A2, $A6, $A7, $AA, $AB, $AC, $AD, $AE
+db $AF, $B1, $B2, $B3, $B4, $B5, $B6, $B7, $B8, $B9, $BB, $C0, $C1, $C4
+db $C5, $CA, $CB, $CC, $CD, $CE, $D0, $D2, $D3, $FD, $B0, $A3, $C5, $A4
+
+ORG $D56F2E
+db $00
+
+ORG $D56B93
+db $87, $91, $a2, $a0, $50, $a0, $91, $94, $00; Change the Receiver phone to Sold Out
+
+
+ORG $F41000
+ShopItemNames:
+.OnettTeleport:
+db $7F, $9E, $95, $A4, $A4, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.TwosonTeleport:
+db $84, $A7, $9F, $A3, $9F, $9E, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.HappyTeleport:
+db $78, $78, $86, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.ThreedTeleport:
+db $84, $98, $A2, $95, $95, $94, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.SaturnTeleport:
+db $83, $91, $a4, $a5, $a2, $9e, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00
+.DesertTeleport:
+db $74, $A5, $9E, $95, $A3, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.FoursideTeleport:
+db $76, $9F, $A5, $A2, $A3, $99, $94, $95, $50, $84, $95, $9C, $95, $A0, $9F, $A2
+db $A4, $00
+.WintersTeleport:
+db $87, $99, $9E, $A4, $95, $A2, $A3, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4
+db $00
+.SummersTeleport:
+db $83, $A5, $9D, $9D, $95, $A2, $A3, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4
+db $00
+.ScarabaTeleport:
+db $83, $93, $91, $A2, $91, $92, $91, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4
+db $00
+.DalaamTeleport:
+db $74, $91, $9C, $91, $91, $9D, $50, $84, $95, $9C, $95, $A0, $9F, $A2, $A4, $00
+.DarkTeleport:
+db $74, $91, $a2, $9b, $9e, $95, $a3, $a3, $50, $84, $95, $9c, $95, $a0, $9f, $a2
+db $a4, $00
+.TendaTeleport:
+db $84, $95, $9e, $94, $91, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00
+.UnderworldTeleport:
+db $7c, $5e, $50, $85, $87, $50, $84, $95, $9c, $95, $a0, $9f, $a2, $a4, $00
+.MgntTeleport:
+db $7d, $91, $97, $99, $93, $91, $9e, $a4, $50, $84, $95, $9c, $95, $a0, $9f, $a2
+db $a4, $00
+.PooPSI:
+db $80, $9F, $9F, $50, $80, $83, $79, $00
+.Paula:
+db $80, $91, $A5, $9C, $91, $00
+.Jeff:
+db $7A, $95, $96, $96, $00
+.Poo:
+db $80, $9F, $9F, $00
+.FlnMn:
+db $76, $9C, $A9, $99, $9E, $97, $50, $7D, $91, $9E, $00
+.Ness:
+db $7E, $95, $A3, $A3, $00
+.SoldOut:
+db $83, $7F, $7C, $74, $50, $7F, $85, $84, $00
+.TeleportNames:
+dw $0000
+dw .OnettTeleport
+dw .TwosonTeleport
+dw .HappyTeleport
+dw .ThreedTeleport
+dw .SaturnTeleport
+dw .DesertTeleport
+dw .FoursideTeleport
+dw .WintersTeleport
+dw .SummersTeleport
+dw .ScarabaTeleport
+dw .DalaamTeleport
+dw .DarkTeleport
+dw .TendaTeleport
+dw .UnderworldTeleport
+dw .MgntTeleport
+dw .PooPSI
+.CharNames:
+dw $0000
+dw .Paula
+dw .Jeff
+dw .Poo
+dw .FlnMn
+dw .Ness
+
+.PlayerText:
+db $18, $01, $0B, $1c, $02, $01, $02
+
+ShopFlagBits:
+db $01
+db $02
+db $04
+db $08
+db $10
+db $20
+db $40
+db $80
+
+ORG $CFB891
+db $00
+
+ORG $CFB8F5
+db $47
+
+ORG $D7FEA0
+ExtraWindowData:
+dw $0005, $0009, $001A, $0004
+
+HasStartingPhoto:
+db $00
+
+HasPooStartPhoto:
+db $00
+
+PhotoFlags:
+dw $02BA
+dw $02BB
+
+MoneyAmounts:
+dw $0000
+dw $000A
+dw $0064
+dw $03E8
+
+ORG $C3E2A8
+;contemplate switching to 1
+dw $000C, $0010, $0013, $0004
+
+ORG $CFB115
+DD OpenLockers_TopRightLocker
+
+ORG $CFB126
+DD OpenLockers_TopLeftLocker
+
+ORG $CFB137
+DD OpenLockers_BottomRightLocker
+
+ORG $CFB159
+DD OpenLockers_BottomLeftLocker
+
+ORG $CFB148
+DD OpenLockers_MiddleLocker
+
+ORG $CFA990
+dd fixed_skyrunner_redirect
+
+ORG $C5D793
+db $F6
+
+ORG $C64FA5
+db $FF
+
+ORG $EEAAA5
+db $0A
+dl NpcNessGiveOverride
+
+ORG $C79693
+db $02
+;Paula text og script
+
+ORG $C92A38
+dd $C92A3C
+
+ORG $C76FDA
+db $0A
+dl $C76FEE
+
+ORG $C885AC
+db $02
+
+ORG $D56BAF
+db $04
+
+ORG $C55715
+db $0A
+dl WarpPadDescription
+
+ORG $C6FFBC
+db $0A
+dl WarpPadUsage
+
+ORG $C8FD5B
+db $0A
+dl PokeyCharCount
+
+ORG $CFE045
+dw $041B
+
+ORG $CFE056
+dw $041A
+
+ORG $CFE067
+dw $0419
+
+ORG $CFE078
+dw $0418
+
+ORG $C8FFF0
+db $0A
+dl DisplayRobots
+
+ORG $C811B3
+db $0A
+dl OrangeKidCrowdfund
+
+ORG $C66680
+db $84, $66
+
+ORG $C6BE82
+db $86, $BE
+
+ORG $C6BE8F
+db $93, $BE
+
+ORG $C76119
+db $0A
+dl TracyNessText
+
+ORG $CFE367
+dd MagicantTentacleERText
+
+ORG $C87963
+db $0A
+dl DuckSignTex
+
+ORG $C87997
+db $0A
+dl GoatSignTex
+
+ORG $C87A1F
+db $0A
+dl SlimeSignTex
+
+ORG $C8798A
+db $02
+
+ORG $C879BA
+db $02
+
+ORG $C87A45
+db $02
+
+ORG $C92E9E
+db $0A
+dl PooBoatText
+NotSoloPoo:
+
+ORG $C39F0C
+db $42
+dl CheckNessRobot
+
+ORG $F30080
+db $0A, $C3, $B8, $EE
+
+ORG $C7BF32
+db $0A
+dl GiantStepNessText
+
+ORG $C7BF5C
+db $0A
+dl GiantStepNessName
+
+ORG $C7BFFC
+db $0A
+dl LilliputNessText
+
+ORG $C7C027
+db $0A
+dl LilliputNessName
+
+ORG $C7C18F
+db $0A
+dl MilkyNessText
+
+ORG $C7C1CA
+db $0A
+dl MilkyNessName
+
+ORG $C7C0D4
+db $0A
+dl RainyNessText
+
+ORG $C7C0F9
+db $0A
+dl RainyNessName
+
+ORG $C7C26C
+db $0A
+dl MagnetNessText
+
+ORG $C7C295
+db $0A
+dl MagnetNessName
+
+ORG $C7C32B
+db $0A
+dl CloudNessText
+
+ORG $C7C35C
+db $0A
+dl CloudNessName
+
+ORG $C7C426
+db $0A
+dl LumineNessText
+
+ORG $C7C44B
+db $0A
+dl LumineNessName
+
+ORG $C7C4DD
+db $0A
+dl FireNessText
+
+ORG $C7C50D
+db $0A
+dl FireNessName
+
+ORG $EF97B2
+dd $EF97B6
+
+ORG $EF67AA
+dd $EF67AE
+
+ORG $C83D34
+dd $C83D38
+
+ORG $C9D2CA
+dd $C9D2CE
+
+ORG $C9E28B
+dd $C9E28F
+
+ORG $EF57FB
+dd $EF57FF
+
+ORG $C8854C
+db $0A
+dl $C88561
+
+ORG $EE9BDD
+db $0A
+dl EarthPowerLeader
+
+ORG $EEAB04
+db $0A
+dd OnettTeleNPCName
+OnettTeleNPCBack:
+
+ORG $EEAB36
+db $0A
+dd TwosonTeleNPCName
+TwosonTeleNPCBack:
+
+ORG $EEAB69
+db $0A
+dd HappyTeleNPCName
+HappyTeleNPCBack:
+
+ORG $EEABA9
+db $0A
+dd ThreedTeleNPCName
+ThreedTeleNPCBack:
+
+ORG $EEABDC
+db $0A
+dd SaturnTeleNPCName
+SaturnTeleNPCBack:
+
+ORG $EEAC16
+db $0A
+dd DunesTeleNPCName
+DunesTeleNPCBack:
+
+ORG $EEAC55
+db $0A
+dd FoursTeleNPCName
+FoursTeleNPCBack:
+
+ORG $EEAC8A
+db $0A
+dd WintersTeleNPCName
+WintersTeleNPCBack:
+
+ORG $EEACBE
+db $0A
+dd SummersTeleNPCName
+SummersTeleNPCBack:
+
+ORG $EEACF2
+db $0A
+dd ScarabaTeleNPCName
+ScarabaTeleNPCBack:
+
+ORG $EEAD26
+db $0A
+dd DalaamTeleNPCName
+DalaamTeleNPCBack:
+
+ORG $EEAD59
+db $0A
+dd DarkTeleNPCName
+DarkTeleNPCBack:
+
+ORG $EEAD93
+db $0A
+dd TendaTeleNPCName
+TendaTeleNPCBack:
+
+ORG $EEADCD
+db $0A
+dd UnderTeleNPCName
+UnderTeleNPCBack:
+
+ORG $EEAECB
+db $0A
+dd MagicTeleNPCName
+MagicTeleNPCBack:
+
+ORG $C630A8
+db $08
+dd ClearAndCallDad
+
+ORG $C91D47
+db $02
+
+ORG $61000B
+db $0A
+dl rock_text
+
+ORG $6100D7
+db $0A
+dl man_text
+
+ORG $C76074
+db $0A
+dl NessTonyHint
+
+ORG $C5EF84
+db $0A
+dl JeffTonyHint
+
+ORG $EED7ED
+db $0A
+dl FixLightningTypo
+
+ORG $EED873
+db $0A
+dl FixLightningTypo2
+
+ORG $C62E6D
+db $0A
+dl HandleEnergyLinkFromATM
+
+ORG $C62D30
+db $0A
+dl InitializeEnergyLink
+
+ORG $C68829 ;Disable PRV photo
+db $02
+
+ORG $C68876 ;Disable threed photo
+db $02
+
+ORG $C6886C ;Disable SV photo
+db $02
+
+ORG $C68927 ;Disable Deep Dark photo
+db $02
+
+ORG $C68847 ;Disable Winters photo
+db $02
+
+ORG $C87ADC ;Disable Brickroad photo
+db $02
+
+ORG $C688B9 ;Disable Dept store photo
+db $02
+
+ORG $C6889B ;Disable Museum photo
+db $02
+
+ORG $C60CC9 ;sesaphoto
+db $02
+
+ORG $C60C86 ;sesaphoto
+db $02
+
+ORG $C68887 ;Disable gold mine photo
+db $02
+
+ORG $C688FF ;Disable Summers photo
+db $02
+
+ORG $C688CD ;Disable Dalaam photo
+db $02
+
+ORG $2FF614
+db $0A
+dl StonehengePhotoText
+
+ORG $C62FD6
+db $08
+dd ShowDepositEnergy
+
+ORG $CFDF49
+dd UnderworldATM
+
+ORG $CFDBA2
+dd DarknessATM
+
+ORG $EF188B
+dd $EF2A4F
+
+ORG $D57B05
+db $C7
+
+ORG $C6332A
+db $0A
+dl ShowDadEnergy
+
+ORG $C63229
+db $0A
+dl PingDadEnergy
+
+ORG $CF1203
+dd SetSaturnLadderFlag
+
+;ORG $D01664
+;db $1F, $04 Flag for the Saturn Valley Ladder
+
+;ORG $CF19C7
+;dd JackieMoonsideSetup Only in dungeon er
+
+;ORG $CFC8C6
+;dd EverDeadText ; Only in dungeon ER
+
+;ORG $CF1657
+;dd CafeEverdredText ; Only in dungeon ER
+
+ORG $CFC50E
+dd JackieItemCheck
+
+ORG $CF0648
+dd UnlockOnettTeleport
+
+ORG $CF09E3
+dd $C9B10B
+
+ORG $CF1922
+dd $C9B10B
+
+ORG $CF00C6
+dd $C9B10B
+
+ORG $CF00BB
+dd $C9B10B
+
+ORG $CF2396
+dd $C9B10B
+
+ORG $CFBC06
+dd MinerDialogue
+
+ORG $C6122B
+db $0A
+dl MinerText2
+
+ORG $C93267
+db $0A
+dl $C9327F
+
+;ORG $D0D4E5
+;dd PokeyBattleExpanded
+
+;ORG $EFFF10
+;PokeyBattleExpanded:
+
+ORG $CF6BF1
+db $6D, $CF
+
+ORG $D5AD53
+dw $0209
+dw $0209; Skate Punk
+
+ORG $D5DD69 ; Loaded Dice
+dw $0209
+dw $0209
+dw $0209
+dw $0209
+
+ORG $D5A5F7 ; Loaded Dice
+dw $0209
+dw $0209
+dw $0209
+dw $0209
+
+ORG $D5AEC9 ; Starman Super
+dw $0209
+
+ORG $D03CA4 ; Remove bugged plate
+db $00
+
+ORG $CF0457
+dd OnettHotelSetTeleport
+
+ORG $EECA28
+db $0A
+dl MonkeyCaveShop
+
+ORG $C50051
+dd MonkeyShopGreeting
+
+ORG $C50519
+dd MonkeyShopBuyLine
+
+ORG $C50E1F
+dd MonkeyShopNotEnoughMoney
+
+ORG $C506B1
+dd MonkeyShopSelectItem
+
+ORG $C50849
+dd MonkeyShopPickCarrier
+
+ORG $C50381
+dd MonkeyShopNoBuy
+
+ORG $C50C87
+dd MonkeyShopCancelBuy
+
+ORG $C501E9
+dd MonkeyShopExitThanks
+
+ORG $C515B9
+dd MonkeyShopThank
+
+ORG $C519CB
+dd MonkeyShopCantCarry
+
+ORG $C51751
+dd MonkeyShopBuyAnother
+
+ORG $C50FB7
+dd MonkeyShopCantCarrySingle
+
+ORG $D5782C
+db $E0 ; Repel Sandwich
+db $5D
+db $5A
+db $7F
+db $5F
+db $6C ; Protein Drink
+db $8C ; Ruler
+
+ORG $C74C11
+dd PostFrankGuardText
+
+ORG $D7B200
+db $00
+
+;Tenda lower floor
+ORG $D7B708
+db $80
+
+ORG $D7B748
+db $80
+
+; Tenda Inn
+ORG $D7C4F0
+db $80
+
+ORG $C772F8 ; Magicant Mom
+db $CA
+
+ORG $C1D6B5
+LDA #$03D6
+
+ORG $C7FB56
+db $0A
+dl AddNessToEpilogue
+
+ORG $C9C356
+db $00, $00, $00
+
+ORG $C9C359
+db $00, $00, $00, $00
+
+ORG $CFB374
+db $00
+
+ORG $CF666B
+db $0C, $00
+
+ORG $C4FF00
+db $02, $00, $77, $02, $60, $c8, $AC, $02, $60, $dd ; Winters brickroad and phone
+
+ORG $C5E572
+db $00, $00 ; Fix vanilla storage bug
+
+ORG $C9AF4B
+db $C7, $00
+
+ORG $D56AE9
+db $3B
+
+ORG $C9FD46
+db $0A
+dl NewBikeText
+
+ORG $C6BFA3
+db $5E, $0A
+dl $EEBE84
+
+ORG $C8630A
+db $90, $90
+
+ORG $EEC613
+db $90, $90
+
+ORG $D6FB66
+StartingInvetory:
+dw $99F3
+
+StartingInvAmounts:
+dw $000B
+
+ORG $EF79DE
+db $0A
+dl FixYouWonAlignment
+
+ORG $C7AC44
+db $0A
+dl FixPhotoManLoad
+
+ORG $C33BF8
+db $09
+
+ORG $C33BB8
+db $00
+
+ORG $C7AC9B
+db $0A
+dl PhotomanLeave
+
+ORG $C3765F
+db $03
+dd PhotoManActionScript
+
+ORG $C701F6
+db $0A
+dl DenyHintsSaidNo
+
+ORG $C72664
+db $0A
+dl DenyHintsNoMoney
+
+ORG $CFA96E
+dd fixed_skyrunner_redirect
+
+ORG $C7C4D6
+dd EndScript
+
+ORG $C7C188
+dd EndScript
+
+ORG $C7C324
+dd EndScript
+
+ORG $CFC517
+dw $010D
+
+ORG $CF7E97
+db $B0, $90
+
+ORG $C4FF0A
+db $06, $00, $4f, $05, $40, $60, $50, $05, $60, $78, $53, $05, $68, $28, $51, $05
+db $68, $a0, $52, $05, $78, $60, $81, $03, $32, $74
+
+ORG $CF66D9
+dw $000D
+
+ORG $CFC51A
+dw $0284
+
+ORG $C37698
+db $03
+dd DisableCollAndAnim
+
+ORG $DA82A7
+db $44
+
+ORG $DAB4E7
+db $44
+
+ORG $DAB067
+db $44
+
+ORG $C14936
+JSL LeaveMoneyInMemory
+
+ORG $C17F21
+JML CheckExtraAddCommands
+
+ORG $C005EF
+LDA #$9900
+nop
+
+ORG $C005F5
+LDA #$00F8
+nop
+
+ORG $CFA93B
+dd RideSkycicle
+
+ORG $CFA933
+db $D3
+
+ORG $CF8919
+db $30, $68
+
+ORG $CFA932
+db $02
+
+ORG $C7CB74
+db $C7, $00
+
+ORG $D7A90C
+db $EC
+
+ORG $D68463
+;db $FF
+
+ORG $C8A8E3
+dd CheckForRubyPoo
+
+ORG $C80C40
+db $E1, $03
+
+ORG $C91EA8; TEST THIS!!!! SKY RUNNER FIX
+db $d2
+
+ORG $C99CCD
+db $0A
+dl DisableOSSOnLumine
+
+ORG $C0D668 ;Fix vanilla ambush detection
+LDA $9889
+
+ORG $EEC777
+db $73, $98, $99, $95, $96, $50, $0A
+dl TwosonCopBossText
+
+ORG $EEBDA4
+db $0A
+dl SetupNessForMagicantBoost
+
+
+;New data table go here
+
+
+;;;;;;;;;;;;;boss names
+ORG $EEEEBC
+db $76, $a2, $91, $9e, $9b, $02; Frank
+
+db $08, $bc, $ee, $ee, $ff, $0a, $3d, $7e, $c5; Pokey name text
+db $08, $bc, $ee, $ee, $ff, $0a, $5B, $7e, $c5; Pokey name text
+db $50, $50, $08, $bc, $ee, $ee, $ff, $0a, $c7, $e6, $c9; Belch Name next
+
+db $05, $27, $00, $05, $C2, $01, $0A, $D0, $C7, $EE
+
+db $08, $bc, $ee, $ee, $ff, $50, $9f, $96, $50, $0a, $64, $06, $c8
+
+db $76, $A2, $91, $9E, $9B, $A9, $A3, $A4, $95, $99, $9E, $50, $7D, $91, $A2, $9B
+db $50, $79, $79, $02;Frankystein Mark II
+
+db $76, $a2, $91, $9e, $9b, $a9, $a3, $a4, $95, $99, $9e, $02;Frankystein
+
+db $84, $99, $A4, $91, $9E, $99, $93, $50, $71, $9E, $A4, $02; Titanic Ant
+
+db $73, $91, $a0, $a4, $91, $99, $9e, $50, $83, $a4, $a2, $9f, $9e, $97, $02;Captain Strong
+
+db $75, $a6, $95, $a2, $94, $a2, $95, $94, $02;Everdred
+
+db $7d, $a2, $5e, $50, $73, $91, $a2, $a0, $91, $99, $9e, $a4, $95, $a2, $02;Carpainter
+
+db $7d, $9f, $9e, $94, $9f, $50, $7d, $9f, $9c, $95, $02;Mondo Mole
+
+db $72, $9f, $9f, $97, $95, $a9, $50, $84, $95, $9e, $a4, $02;Boogey Tent
+
+db $7d, $99, $9e, $99, $50, $72, $91, $a2, $96, $02; Mini Barf
+
+db $7d, $91, $a3, $a4, $95, $a2, $50, $72, $95, $9c, $93, $98, $02;Belch
+
+db $84, $a2, $99, $9c, $9c, $99, $9f, $9e, $91, $97, $95, $50, $83, $a0, $a2, $9f
+db $a5, $a4, $02;Trillionage sprout
+
+db $77, $a5, $91, $a2, $94, $99, $91, $9e, $50, $74, $99, $97, $97, $95, $a2, $02;uardian digger
+
+db $74, $95, $a0, $a4, $5e, $50, $83, $a4, $9f, $a2, $95, $50, $83, $a0, $9f, $9f
+db $9b, $02;Dept store
+
+db $a4, $98, $95, $50, $7d, $91, $9e, $99, $50, $7d, $91, $9e, $99, $50, $83, $a4
+db $91, $a4, $a5, $95, $02;MMS
+
+db $7d, $91, $9e, $99, $50, $7d, $91, $9e, $99, $02;Mani Mani
+
+db $73, $9c, $a5, $9d, $a3, $a9, $50, $82, $9f, $92, $9f, $a4, $02;Clumsy Robot
+
+db $83, $98, $a2, $9f, $9f, $9f, $9d, $02;Shroom
+
+db $80, $9c, $91, $97, $a5, $95, $50, $82, $91, $a4, $50, $9f, $96, $50, $74, $9f
+db $9f, $9d, $02;Rat
+
+db $84, $98, $a5, $9e, $94, $95, $a2, $50, $91, $9e, $94, $50, $83, $a4, $9f, $a2
+db $9d, $02;Thunderstorm
+
+db $7b, $a2, $91, $9b, $95, $9e, $02;Kraken
+
+db $77, $a5, $91, $a2, $94, $99, $91, $9e, $50, $77, $95, $9e, $95, $a2, $91, $9c
+db $02;General
+
+db $7d, $91, $a3, $a4, $95, $a2, $50, $72, $91, $a2, $96, $02;Barf
+
+db $83, $a4, $91, $a2, $9d, $91, $9e, $50, $74, $88, $02;DX
+
+db $74, $95, $9C, $A5, $A8, $95, $02;Deluxe
+
+db $75, $9C, $95, $93, $A4, $A2, $9F, $50, $83, $A0, $95, $93, $A4, $95, $A2, $02;Specter
+
+db $73, $91, $a2, $92, $9f, $9e, $50, $74, $9f, $97, $02;Carbon Dog
+
+db $78, $95, $91, $a6, $99, $9c, $a9, $50, $71, $a2, $9d, $95, $94, $50, $80, $9f
+db $9b, $95, $a9, $02;Heavily Pokey
+
+db $1c, $02, $01, $57, $a3, $50, $7e, $99, $97, $98, $a4, $9d, $91, $a2, $95, $02;Nightmare
+
+db $83, $a4, $91, $a2, $9d, $91, $9e, $50, $7a, $a5, $9e, $99, $9f, $a2, $02;Junior
+
+db $74, $99, $91, $9d, $9f, $9e, $94, $50, $74, $9f, $97, $02;Diamond Dog
+
+db $77, $99, $A9, $97, $91, $A3, $02; giygas
+
+db $00, $70, $08, $bc, $ee, $ee, $ff, $0a, $5d, $fc, $c8
+
+db $50, $08, $bc, $ee, $ee, $ff, $5e, $0a, $4e, $7f, $c5
+;;;;;;;;;;;;;;;;;;;;;;;;
+;Absorb the power of the earth
+db $91, $92, $a3, $9f, $a2, $92, $50, $a4, $98, $95, $50, $a0, $9f, $a7, $95, $a2
+db $50, $9f, $96, $50, $a4, $98, $95, $50, $75, $91, $a2, $a4, $98, $50, $99, $a4
+db $a3, $95, $9c, $96, $50, $99, $9e, $a4, $9f, $50, $a9, $9f, $a5, $a2, $50, $98
+db $95, $91, $a2, $a4, $5c, $02
+
+;Purge giygas's evil
+db $a0, $a5, $a2, $97, $95, $50, $77, $99, $a9, $97, $91, $a3, $57, $a3, $50, $95
+db $a6, $99, $9c, $50, $96, $a2, $9f, $9d, $50, $a4, $98, $95, $50, $a7, $9f, $a2
+db $9c, $94, $50, $9f, $9e, $93, $95, $50, $91, $9e, $94, $50, $96, $9f, $a2, $50
+db $91, $9c, $9c, $5c, $02
+
+db $18, $04
+;patch moves stuff here
+
+
+ORG $EEF136
+db $0A, $42, $1E, $C9
+
+display_melodies:
+db $93, $9b, $6a, $18, $05, $4e, $00, $07, $b6, $00, $1B, $03
+dd .has_giant_step
+db $08
+dd .display_dot
+db $0A
+dl .check_lilliput
+.has_giant_step:
+db $08
+dd .display_melody
+.check_lilliput:
+db $07, $B7, $00, $1B, $03
+dd .has_lilliput_steps
+db $08
+dd .display_dot
+db $0A
+dl .check_milky
+.has_lilliput_steps:
+db $08
+dd .display_melody
+.check_milky
+db $07, $B9, $00, $1B, $03
+dd .has_milky_well
+db $08
+dd .display_dot
+db $0A
+dl .check_rainy_circle
+.has_milky_well:
+db $08
+dd .display_melody
+.check_rainy_circle:
+db $07, $b8, $00, $1B, $03
+dd .has_rainy_circle
+db $08
+dd .display_dot
+db $0A
+dl .check_magnet_hill
+.has_rainy_circle:
+db $08
+dd .display_melody
+.check_magnet_hill:
+db $07, $BA, $00, $1B, $03
+dd .has_magnet_hill
+db $08
+dd .display_dot
+db $0A
+dl .check_pink_cloud
+.has_magnet_hill:
+db $08
+dd .display_melody
+.check_pink_cloud:
+db $07, $BB, $00, $1b, $03
+dd .has_pink_cloud
+db $08
+dd .display_dot
+db $0A
+dl .check_lumine_hall
+.has_pink_cloud:
+db $08
+dd .display_melody
+.check_lumine_hall:
+db $07, $BC, $00, $1B, $03
+dd .has_lumine_hall
+db $08
+dd .display_dot
+db $0A
+dl .check_fire_spring
+.has_lumine_hall:
+db $08
+dd .display_melody
+.check_fire_spring:
+db $07, $BD, $00, $1B, $03
+dd .has_fire_spring
+db $08
+dd .display_dot
+db $0A
+dl .done_melodies
+.has_fire_spring:
+db $08
+dd .display_melody
+.done_melodies:
+db $02
+
+.display_dot:
+db $70, $02
+
+.display_melody:
+db $AC, $02
+;;;;;;;;;;;;;;;;;;;;
+;sky runner stuff
+db $1F, $E5, $FF
+db $04, $EC, $02
+db $05, $8F, $02
+db $1F, $21, $DA
+db $10, $30
+db $1F, $1E, $BB, $00, $00, $10, $02
+db $1F, $EC, $FF, $00
+db $19, $26, $FF
+db $05, $EC, $02;Unset the flag
+db $04, $30, $00; remove the old sky runner
+db $05, $0B, $00
+db $02
+
+db $07, $30, $00, $1b, $02, $00, $bc, $c6, $ff, $06, $76, $02, $77, $b2, $c6, $00
+db $70, $7b, $99, $5d, $9b, $95, $99, $5d, $9b, $a9, $95, $5d, $9b, $a9, $95, $5d
+db $9b, $99, $99, $99, $5e, $03, $00, $70, $58, $89, $95, $a0, $5c, $10, $0f, $50
+db $79, $50, $96, $9f, $a5, $9e, $94, $50, $0a, $22, $bc, $c6
+
+db $1f, $eb, $ff, $06, $04, $0B, $00, $0A, $5A, $1E, $C9
+;;;;;;;;;;;;;;
+;hint guy
+onett_hint_man:
+db $04, $05, $04
+db $06, $f9, $03
+dd $FFC726DA
+dd $C701440A
+
+twoson_hint_man:
+db $04, $06, $04
+db $06, $fA, $03
+dd $FFC726DA
+dd $C7014F0A
+
+threed_hint_man:
+db $04, $07, $04
+db $06, $fB, $03
+dd $FFC726DA
+dd $C7015A0A
+
+fourside_hint_man:
+db $04, $08, $04
+db $06, $fc, $03
+dd $FFC726DA
+dd $C701650A
+
+summers_hint_man:
+db $04, $09, $04
+db $06, $fD, $03
+dd $FFC726DA
+dd $C701760A
+
+scaraba_hint_man:
+db $04, $0A, $04
+db $06, $fe, $03
+dd $FFC726DA
+dd $C701870A
+
+display_hint_price:
+
+db $06, $03, $04
+dd bought_five_hints
+
+db $06, $02, $04
+dd bought_four_hints
+
+db $06, $01, $04
+dd bought_three_hints
+
+db $06, $00, $04
+dd bought_two_hints
+
+db $06, $FF, $03
+dd bought_one_hint
+
+db $61, $60, $60
+db $0E, $64
+db $0D, $01, $02
+
+bought_one_hint:
+db $62, $60, $60
+db $0E, $C8
+db $0D, $01, $02
+
+bought_two_hints:
+db $64, $60, $60
+db $08
+dd get_2bytenum_part1
+db $1D, $08, $90, $01
+db $1B, $00, $1D, $09, $90, $01
+db $08
+dd get_2bytenum_part2
+db $02
+
+bought_three_hints:
+db $68, $60, $60
+db $08
+dd get_2bytenum_part1
+db $1D, $08, $20, $03
+db $1B, $00, $1D, $09, $20, $03
+db $08
+dd get_2bytenum_part2
+db $02
+
+bought_four_hints:
+db $61, $66, $60, $60
+db $08
+dd get_2bytenum_part1
+db $1D, $08, $40, $06
+db $1B, $00, $1D, $09, $40, $06
+db $08
+dd get_2bytenum_part2
+db $02
+
+bought_five_hints:
+db $63, $62, $60, $60
+db $08
+dd get_2bytenum_part1
+db $1D, $08, $80, $0C
+db $1B, $00, $1D, $09, $80, $0C
+db $08
+dd get_2bytenum_part2
+db $02
+
+get_2bytenum_part1:
+db $19, $27, $06, $1b, $04, $1d, $09, $00, $00, $02
+
+get_2bytenum_part2:
+db $1d, $08, $00, $00, $1b, $01, $1b, $04, $02
+
+hint_error_message:
+db $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $a7, $95, $9e, $a4, $50, $a4
+db $95, $a2, $a2, $99, $92, $9c, $a9, $50, $a7, $a2, $9f, $9e, $97, $50, $98, $95
+db $a2, $95, $5e, $02
+
+count_hints:
+db $06, $04, $04
+dd .end_hints
+db $06, 03, $04;if we have 5
+dd .set_sixth_hint
+db $06, $02, $04;if we have 4
+dd .set_fifth_hint
+db $06, $01, $04;if we have 3
+dd .set_fourth_hint
+db $06, $00, $04
+dd .set_third_hint; if we have 2
+db $06, $FF, $03
+dd .set_second_hint
+db $04, $FF, $03, $02
+
+
+.set_second_hint:
+db $04, $00, $04
+db $02
+.set_third_hint:
+db $04, $01, $04
+db $02
+.set_fourth_hint:
+db $04, $02, $04
+db $02
+.set_fifth_hint:
+db $04, $03, $04
+db $02
+.set_sixth_hint:
+db $04, $04, $04
+.end_hints:
+db $02
+
+push_onett_hint:
+db $06, $0B, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $0B, $04
+.skip_hint:
+db $02
+
+push_twoson_hint:
+db $06, $0C, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $0C, $04
+.skip_hint:
+db $02
+
+push_threed_hint:
+db $06, $0D, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $0D, $04
+.skip_hint:
+db $02
+
+push_fourside_hint:
+db $06, $0E, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $0E, $04
+.skip_hint:
+db $02
+
+push_summers_hint:
+db $06, $0F, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $0F, $04
+.skip_hint:
+db $02
+
+push_scaraba_hint:
+db $06, $10, $04
+dd .skip_hint
+db $08
+dd server_hint_text
+db $1B, $02
+dd .skip_hint
+db $04, $10, $04
+.skip_hint:
+db $02
+
+
+server_hint_text:
+db $01, $70, $76, $9f, $a2, $50, $91, $9e, $50, $95, $a8, $a4, $a2, $91, $50, $54
+db $65, $60, $60, $5c, $10, $03, $50, $79, $57, $9c, $9c, $50, $a4, $95, $9c, $9c
+db $50, $a4, $98, $95, $50, $a3, $95, $a2, $a6, $95, $a2, $50, $91, $92, $9f, $a5
+db $a4, $50, $a4, $98, $99, $a3, $50, $98, $99, $9e, $a4, $5e, $03, $01, $70, $87
+db $98, $91, $a4, $50, $94, $9f, $50, $a9, $9f, $a5, $50, $a3, $91, $a9, $6f, $01
+db $08, $4d, $dd, $c7, $ff, $11, $12
+
+db $09, $02
+dd pushhint_saidyes
+dd pushhint_no
+
+pushhint_no:
+db $1D, $19, $01
+db $02
+
+pushhint_saidyes:
+db $19, $27, $06, $1b, $04, $1d, $09, $00, $00, $1d, $08, $F4, $01, $1b, $00, $1d
+db $09, $F4, $01, $1d, $08, $00, $00, $1b, $01, $1b, $04
+db $1D, $14, $00, $00, $00, $00
+db $1B, $03
+dd pushhint_nomoney
+db $1D, $09, $00, $00
+db $18, $0A
+db $1F, $02, $78
+db $1D, $19, $FA
+db $02
+pushhint_nomoney:
+db $12, $70, $89, $9f, $a5, $50, $94, $9f, $9e, $57, $a4, $50, $98, $91, $a6, $95
+db $50, $95, $9e, $9f, $a5, $97, $98, $50, $9d, $9f, $9e, $95, $a9, $50, $96, $9f
+db $a2, $50, $a4, $98, $91, $a4, $50, $a0, $91, $93, $9b, $91, $97, $95, $5e, $03
+db $0A
+dd pushhint_no
+
+post_hint_text:
+db $70, $79, $96, $50, $a9, $9f, $a5, $50, $a7, $91, $9e, $a4, $50, $91, $9e, $9f, $a4
+db $98, $95, $a2, $50, $98, $99, $9e, $a4, $5c, $10, $02, $50, $96, $99, $9e, $94
+db $50, $9d, $95, $50, $91, $a4, $50, $9f, $9e, $95, $50, $9f, $96, $50, $9d, $a9
+db $50, $9f, $a4, $98, $95, $a2, $50, $a3, $98, $9f, $a0, $a3, $5e, $13, $02
+
+tracy_backpack_tex:
+db $70, $89, $9f, $a5, $50, $93, $91, $9e, $50, $91, $9c, $a3, $9f, $50, $9c, $95
+db $91, $a6, $95, $50, $91, $9e, $a9, $a4, $98, $99, $9e, $97, $50, $a9, $9f, $a5
+db $50, $94, $9f, $9e, $57, $a4, $50, $9e, $95, $95, $94, $50, $99, $9e, $50, $a9
+db $9f, $a5, $a2, $50, $92, $91, $93, $9b, $a0, $91, $93, $9b, $5e, $03, $01, $70
+db $89, $9f, $a5, $50, $93, $91, $9e, $50, $9f, $a0, $95, $9e, $50, $99, $a4, $50
+db $a7, $99, $a4, $98, $50, $a4, $98, $95, $50, $82, $50, $92, $a5, $a4, $a4, $9f
+db $9e, $51, $13, $02
+
+tracy_backpack_twice_tex:
+db $70, $74, $99, $94, $50, $a9, $9f, $a5, $50, $96, $9f, $a2, $97, $95, $a4, $50
+db $91, $9c, $a2, $95, $91, $94, $a9, $5c, $50, $92, $99, $97, $50, $92, $a2, $9f
+db $6f, $03, $01, $70, $89, $9f, $a5, $50, $93, $91, $9e, $50, $a3, $a4, $9f, $a2
+db $95, $50, $99, $a4, $95, $9d, $a3, $50, $a7, $99, $a4, $98, $50, $a4, $98, $95
+db $50, $82, $50, $92, $a5, $a4, $a4, $9f, $9e, $51, $13, $02
+
+winters_drugstore_space:
+db $08
+dd drugstore_spacecheck
+db $1B, $02
+dd $FFC6AEE1
+dd $C6AE4B0A
+
+winters_drugstore_space2:
+db $08
+dd drugstore_spacecheck
+db $1B, $02
+dd $FFC6AEE1
+dd $C6AEAC0A
+
+drugstore_spacecheck:
+db $1D, $03, $FF, $1B, $02
+dd .no_space
+db $1D, $19, $FE
+db $02
+.no_space:
+db $1D, $19, $01
+db $02
+
+fix_boogey_tent:
+db $1B, $02
+dd .no_space
+db $04, $57, $00
+db $02
+.no_space:
+db $04, $9D, $02
+db $02
+;Newtext
+
+boost_speed_dynamic:
+db $1B, $04
+db $1F, $C0, $04
+dd boost_ness_speed
+dd boost_paula_speed
+dd boost_jeff_speed
+dd boost_poo_speed
+db $1b, $04, $02
+
+
+boost_vitality_dynamic:
+db $1B, $04
+db $1F, $C0, $04
+dd boost_ness_vitality
+dd boost_paula_vitality
+dd boost_jeff_vitality
+dd boost_poo_vitality
+db $1b, $04, $02
+
+boost_guts_dynamic:
+db $1B, $04
+db $1F, $C0, $04
+dd boost_ness_guts
+dd boost_paula_guts
+dd boost_jeff_guts
+dd boost_poo_guts
+db $1b, $04, $02
+
+boost_iq_dynamic:
+db $1B, $04
+db $1F, $C0, $04
+dd boost_ness_iq
+dd boost_paula_iq
+dd boost_jeff_iq
+dd boost_poo_iq
+db $1b, $04, $02
+
+boost_luck_dynamic:
+db $1B, $04
+db $1F, $C0, $04
+dd boost_ness_luck
+dd boost_paula_luck
+dd boost_jeff_luck
+dd boost_poo_luck
+db $1b, $04, $02
+
+boost_ness_speed:
+db $1E, $0C, $01, $05, $03, $02
+
+boost_paula_speed:
+db $1E, $0C, $02, $05, $03, $02
+
+boost_jeff_speed:
+db $1E, $0C, $03, $05, $03, $02
+
+boost_poo_speed:
+db $1E, $0C, $04, $05, $03, $02
+;;;;;;;;;;
+boost_ness_vitality:
+db $1E, $0D, $01, $05, $03, $02
+
+boost_paula_vitality:
+db $1E, $0D, $02, $05, $03, $02
+
+boost_jeff_vitality:
+db $1E, $0D, $03, $05, $03, $02
+
+boost_poo_vitality:
+db $1E, $0D, $04, $05, $03, $02
+;;;;;;;;;;;;;;
+boost_ness_guts:
+db $1E, $0B, $01, $05, $03, $02
+
+boost_paula_guts:
+db $1E, $0B, $02, $05, $03, $02
+
+boost_jeff_guts:
+db $1E, $0B, $03, $05, $03, $02
+
+boost_poo_guts:
+db $1E, $0B, $04, $05, $03, $02
+;;;;;;;;
+boost_ness_iq:
+db $1E, $0A, $01, $05, $03, $02
+
+boost_paula_iq:
+db $1E, $0A, $02, $05, $03, $02
+
+boost_jeff_iq:
+db $1E, $0A, $03, $05, $03, $02
+
+boost_poo_iq:
+db $1E, $0A, $04, $05, $03, $02
+;;;;;;;;;;;;
+boost_ness_luck:
+db $1E, $0E, $01, $05, $03, $02
+
+boost_paula_luck:
+db $1E, $0E, $02, $05, $03, $02
+
+boost_jeff_luck:
+db $1E, $0E, $03, $05, $03, $02
+
+boost_poo_luck:
+db $1E, $0E, $04, $05, $03, $02
+
+db $06, $69, $00
+dd $00C74207
+db $0A
+dl LeaderHandinBadge
+db $01
+db $0A, $AD, $69, $C7
+
+;new text go here
+db $19, $10, $01
+db $1B, $04
+db $0E, $00
+db $08
+db $7F, $DC, $C7, $00
+db $1b, $02
+dd $00C7E6D7
+db $7E, $9F, $92, $9F, $94, $A9, $02
+
+PrintPlayerNum:
+db $1B, $06
+db $1C, $0A, $00, $00, $00, $00, $5E, $50, $02
+
+PlayerNameText:
+db $06, $13, $04
+dd .PrintPlayerName
+db $1B, $06
+db $80, $9C, $91, $A9, $95, $A2, $1C, $0A, $00, $00, $00, $00, $50, $50, $B8, $02
+.PrintPlayerName:
+db $1C, $05, $AD, $50, $50, $B8, $02
+
+LilliputDoor:
+db $06, $15, $04
+dd .LilliputUnlocked
+db $18, $01, $01
+db $70, $7f, $9e, $50, $93, $9c, $9f, $a3, $95, $a2, $50, $99, $9e, $a3, $a0, $95
+db $93, $a4, $99, $9f, $9e, $5c, $10, $05, $50, $99, $a4, $50, $91, $93, $a4, $a5
+db $91, $9c, $9c, $a9, $50, $91, $a0, $a0, $95, $91, $a2, $a3, $50, $a4, $9f, $50
+db $92, $95, $50, $a0, $91, $99, $9e, $a4, $95, $94, $50, $9f, $9e, $5e, $5e, $5e
+db $03, $01, $70, $7c, $9f, $9f, $9b, $99, $9e, $97, $50, $93, $9c, $9f, $a3, $95
+db $a2, $5c, $10, $04, $50, $a4, $98, $95, $a2, $95, $50, $91, $a0, $a0, $95, $91
+db $a2, $a3, $50, $a4, $9f, $50, $92, $95, $50, $91, $50, $a4, $99, $9e, $a9, $50
+db $9b, $95, $a9, $98, $9f, $9c, $95, $51
+db $1D, $05, $FF, $7D
+db $1B, $03
+dd .UnlockDoor
+db $13
+db $18, $04
+db $02
+.UnlockDoor:
+db $03, $01, $70
+db $19, $10, $01
+db $1B, $04
+db $1C, $02, $00
+db $50
+db $a5, $9e, $9c, $9f, $93, $9b, $95, $94, $50, $a4, $98, $95, $50, $94, $9f, $9f
+db $a2, $50, $a5, $a3, $99, $9e, $97, $50, $a4, $98, $95, $50, $1c, $05, $7d, $51, $1f
+db $02, $76, $03, $01, $70, $84, $98, $95, $50, $94, $9f, $9f, $a2, $50, $9f, $a0
+db $95, $9e, $95, $94, $51
+db $03
+db $1D, $01, $FF, $7D
+db $04, $15, $04
+db $18, $04
+.LilliputUnlocked:
+db $0A, $0B, $B1, $C9
+
+TinyKeyDesc:
+db $01, $50, $6c, $1c, $05, $7d, $6e, $03, $00, $70, $71, $50, $9b, $95, $a9, $50
+db $a3, $9f, $50, $a3, $9d, $91, $9c, $9c, $5c, $50, $a9, $9f, $a5, $50, $93, $91
+db $9e, $50, $92, $91, $a2, $95, $9c, $a9, $50, $a3, $95, $95, $50, $99, $a4, $5e
+db $03, $01, $70, $79, $a4, $57, $a3, $50, $93, $9f, $a6, $95, $a2, $95, $94, $50
+db $99, $9e, $50, $92, $9c, $a5, $95, $50, $a0, $91, $99, $9e, $a4, $5e, $5e, $5e
+db $13, $02
+
+LavapantsDesc:
+db $01, $50, $6c, $1c, $05, $B3, $6e, $03, $00, $70, $7c, $91, $a6, $91, $5d, $a0
+db $a2, $9f, $9f, $96, $50, $a0, $91, $9e, $a4, $a3, $50, $a0, $91, $99, $9e, $a3
+db $a4, $91, $9b, $99, $9e, $97, $9c, $a9, $50, $96, $9f, $a2, $97, $95, $94, $50
+db $92, $a9, $50, $91, $50, $84, $95, $9e, $94, $91, $5e, $03, $01, $70, $84, $98
+db $95, $a9, $50, $95, $a6, $95, $9e, $50, $a7, $9f, $a2, $9b, $50, $a5, $9e, $94
+db $95, $a2, $a7, $91, $a4, $95, $a2, $51, $03, $01, $70, $58, $74, $9f, $95, $a3
+db $50, $9e, $9f, $a4, $50, $a0, $a2, $9f, $a4, $95, $93, $a4, $50, $91, $97, $91
+db $99, $9e, $a3, $a4, $50, $98, $95, $91, $a4, $50, $9f, $a2, $50, $96, $99, $a2
+db $95, $5e, $13, $02
+
+FireSpringDoor:
+db $06, $16, $04
+dd .FireSpringUnlocked
+db $18, $01, $01
+db $70, $87, $98, $9f, $91, $98, $51, $03, $01, $70, $79, $a4, $57, $a3, $50, $a3
+db $9f, $50, $98, $9f, $a4, $5c, $10, $05, $50, $a9, $9f, $a5, $50, $93, $9f, $a5
+db $9c, $94, $50, $9d, $95, $9c, $a4, $51
+db $1D, $05, $FF, $B3, $03
+db $1B, $03
+dd .UnlockDoor
+
+db $01, $70, $72, $95, $a4, $a4, $95
+db $a2, $50, $93, $9f, $9d, $95, $50, $92, $91, $93, $9b, $50, $a7, $99, $a4, $98
+db $50, $a3, $9f, $9d, $95, $50, $9c, $91, $a6, $91, $5d, $a0, $a2, $9f, $9f, $96
+db $50, $a0, $91, $9e, $a4, $a3, $5e, $5e, $5e
+;Todo; Somewhere in this, place the jump to UnlockDoor after "It's so hot you could melt"
+db $13
+db $18, $04
+db $02
+.UnlockDoor:
+db $08
+dd LeaderPantsText
+db $1D, $01, $FF, $B3 ;Todo. Add check for presence of item....? Find a way to stop this if we already used tenda pants
+db $18, $04
+.FireSpringUnlocked
+db $0A, $0B, $B1, $C9
+
+LavaPantsUseTxt:
+db $01, $70
+db $1C, $0D
+db $1B, $04
+.DoorPantsTex:
+db $50
+db $a5, $a3, $95, $94, $50, $a4, $98, $95, $50, $1c, $05, $b3, $51
+db $1F, $02, $73
+db $14
+db $01, $70, $7E, $9F, $A7, $5C, $50
+db $08
+dd $00C7E602
+db $50
+db $93, $91, $9e, $50, $95, $91, $a3, $99, $9c, $a9, $50, $a7, $99, $a4, $98, $a3
+db $a4, $91, $9e, $94, $50, $a4, $98, $95, $50, $9c, $91, $a6, $91, $50, $99, $9e
+db $50, $76, $99, $a2, $95, $50, $83, $a0, $a2, $99, $9e, $97, $5e
+db $14
+db $18, $04
+db $04, $16, $04
+db $02
+
+RememberedTex:
+db $50, $A2, $95, $9D, $95, $9D, $92, $95, $A2, $95, $94, $50
+db $A4, $98, $95, $50, $02
+
+SetupStorageTakeMenu:
+db $18, $01, $29
+db $19, $02
+db $83, $a4, $9f, $a2, $91, $97, $95, $02
+db $19, $02
+db $7b, $95, $a9, $50, $79, $a4, $95, $9d, $a3, $02
+db $1C, $07, $02
+db $11
+db $09, $02
+dd .Storage
+dd .KeyStorage
+db $0A
+dl $EEC6AB
+.Storage:
+;db $18, $00
+db $18, $03, $29
+db $0A
+dl $EE9699
+.KeyStorage:
+db $1C, $1D, $01
+db $0A
+dl .Storage
+
+InitStorageMen:
+db $18, $03, $0D
+db $18, $00
+db $1C, $1E, $01
+db $0A
+dl SetupStorageTakeMenu
+
+CheckItemOnStore:
+db $1B, $00
+db $19, $19, $00, $00
+db $1B, $05
+db $1C, $1F, $01
+db $1B, $01
+db $1d, $12, $00, $00
+db $1C, $1E, $01
+db $0A
+dl $EE9690
+
+ORG $EEFAA0
+SancFirst:
+db $96, $99, $A2, $A3, $A4, $02
+
+SancSecond:
+db $A3, $95, $93, $9F, $9E, $94, $02
+
+SancThird:
+db $A4, $98, $99, $A2, $94, $02
+
+SancFourth:
+db $96, $9F, $A5, $A2, $A4, $98, $02
+
+SancFifth:
+db $96, $99, $96, $A4, $98, $02
+
+SancSixth:
+db $A3, $99, $A8, $A4, $98, $02
+
+SancSeventh:
+db $A3, $95, $A6, $95, $9E, $A4, $98, $02
+
+SancEighth:
+db $95, $99, $97, $98, $A4, $98, $02
+
+RainyCircleIntro:
+db $08
+dd SancFourth
+db $0A
+dl $C6BEAC
+
+FireSpringIntro:
+db $08
+dd SancEighth
+db $0A
+dl $EF5817
+
+CheckAbsoluteStorage:
+db $1B, $06
+db $18, $03, $01
+db $1B, $02
+dd $00EE9699
+db $0A
+dl $EE96BD
+
+OpenLockers:
+.TopRightLocker:
+db $1B, $00
+db $08
+dd .CheckIfUseKeytoLocker
+db $1B, $02
+dd $C6FB5D
+db $06, $58, $00
+dd $C7D9FD
+db $08
+dd .LockerItemAwaitsText
+db $1C, $05, $01
+db $50
+db $99, $9E, $A3, $99, $94, $95, $51, $03, $01
+db $08
+dd .CheckForLockerItemSpace
+db $1B, $02
+dd $C685BB
+db $1D, $0E, $FF, $11
+db $08
+dd .LockerGetItemText
+db $03
+db $04, $58, $00
+db $02
+
+.TopLeftLocker:
+db $1B, $00
+db $08
+dd .CheckIfUseKeytoLocker
+db $1B, $02
+dd $C6FB5D
+db $06, $F4, $03
+dd $C7D9FD
+db $08
+dd .LockerItemAwaitsText
+db $1C, $05, $01
+db $50
+db $99, $9E, $A3, $99, $94, $95, $51, $03, $01
+db $08
+dd .CheckForLockerItemSpace
+db $1B, $02
+dd $C685BB
+db $1D, $0E, $FF, $11
+db $08
+dd .LockerGetItemText
+db $03
+db $04, $F4, $03
+db $02
+
+.BottomRightLocker:
+db $1B, $00
+db $08
+dd .CheckIfUseKeytoLocker
+db $1B, $02
+dd $C6FB5D
+db $06, $17, $00
+dd $C7D9FD
+db $08
+dd .LockerItemAwaitsText
+db $1C, $05, $01
+db $50
+db $99, $9E, $A3, $99, $94, $95, $51, $03, $01
+db $08
+dd .CheckForLockerItemSpace
+db $1B, $02
+dd $C685BB
+db $1D, $0E, $FF, $11
+db $08
+dd .LockerGetItemText
+db $03
+db $04, $17, $00
+db $02
+
+.BottomLeftLocker:
+db $1B, $00
+db $08
+dd .CheckIfUseKeytoLocker
+db $1B, $02
+dd $C6FB5D
+db $06, $4E, $01
+dd $C7D9FD
+db $08
+dd .LockerItemAwaitsText
+db $1C, $05, $01
+db $50
+db $99, $9E, $A3, $99, $94, $95, $51, $03, $01
+db $08
+dd .CheckForLockerItemSpace
+db $1B, $02
+dd $C685BB
+db $1D, $0E, $FF, $11
+db $08
+dd .LockerGetItemText
+db $03
+db $04, $4E, $01
+db $02
+
+.CheckIfUseKeytoLocker:
+db $08
+dd .CheckItemUsage
+db $0B, $CD
+db $0A
+dd CheckForLockerKey
+db $02
+
+.CheckItemUsage:
+db $19, $19, $00, $00
+db $1B, $04
+db $02
+
+.OpenLockerText:
+db $70, $19, $10, $01
+db $1C, $02, $00
+db $50, $9f, $a0, $95, $9e, $95, $94, $50, $a4, $98, $95, $50, $9c, $9f, $93, $9b
+db $95, $a2, $50, $a5, $a3, $99, $9e, $97, $50, $99, $a4, $a3, $50, $9b, $95, $a9
+db $51
+db $1f, $02, $75, $03, $02
+
+.CheckForLockerItemSpace:
+db $1D, $03, $FF
+db $02
+
+.LockerGetItemText:
+db $08
+dd $C7DCCF
+db $02
+
+.MiddleLocker:
+db $70, $84, $98, $95, $50, $9c, $9f, $93, $9b, $50, $99, $a3, $50, $92, $a5, $a3
+db $a4, $95, $94, $5e, $13, $02
+
+.LockerItemAwaitsText:
+db $01
+db $70
+db $78, $95, $a9, $51, $10, $10, $50, $84, $98, $95, $a2, $95, $50, $99, $a3, $50
+db $91, $50, $02
+
+fixed_skyrunner_redirect:
+db $18, $04
+db $1D, $05, $FF, $9E
+db $1B, $02
+dd broken_skyrunner_text
+db $1D, $01, $FF, $9E
+db $0A
+dl fixed_skyrunner_text
+
+SpecialTexMagicant:
+db $7D, $91, $97, $99, $93, $91, $9E, $A4, $50, $84, $95, $9C, $95, $A0, $9F, $A2
+db $A4, $00
+
+SpecialTexNess:
+db $7E, $95, $A3, $A3, $00
+
+SpecialTexPhotoGuy:
+db $A0, $98, $9F, $A4, $9F, $97, $A2, $91, $A0, $98, $00
+
+NpcNessGiveOverride:
+db $0D, $01
+db $1B, $04
+db $1B, $00
+db $0B, $15
+db $1B, $03
+dd .GiveNess
+db $1B, $01
+db $0B, $16
+db $1B, $03
+dd PhotoHandler
+db $1B, $01
+db $0A
+dl $EEAAAB
+.GiveNess:
+db $1C, $04
+db $1F, $00, $00
+db $7b, $10, $85, $01, $1f, $03, $70, $58
+db $1c, $02, $01
+db $50, $9a, $9f, $99, $9e, $95, $94, $50, $a9, $9f, $a5, $5e, $59
+db $04, $17, $04
+db $1f, $11, $01, $02, $01
+db $02
+
+NessUnlockText:
+db $70, $78, $95, $a9, $51, $03, $01, $70, $79, $57, $9d, $50, $1c, $02, $01, $51
+db $03, $01, $70, $79, $a4, $57, $a3, $50, $97, $a2, $95, $91, $a4, $50, $a4, $9f
+db $50, $96, $99, $9e, $91, $9c, $9c, $a9, $50, $9d, $95, $95, $a4, $50, $a9, $9f
+db $a5, $50, $97, $a5, $a9, $a3, $51, $13
+db $18, $04, $1f, $00, $00, $0b, $10, $78, $50, $08, $10, $F8, $D5, $00, $1f, $03
+db $18, $01, $01, $70, $1c, $02, $01, $50, $9a, $9f, $16, $b9, $94, $15, $a8, $03
+db $18, $04, $1f, $11, $01, $02
+db $02
+
+SetNpcPooPSIFlag:
+db $04, $D1, $03
+db $1f, $71, $04, $02, $02
+
+DisplayDollars10:
+db $54, $61, $60, $00
+
+DisplayDollars100:
+db $54, $61, $60, $60, $00
+
+DisplayDollars1000:
+db $54, $61, $60, $60, $60, $00
+
+
+;FOR TESTING!!!!
+;ORG $CF09EE
+;dl $EEf790
+
+;ORG $CF09F2
+;db $15, $84
+
+;ORG $CF23D2
+;db $16, $84
+
+;ORG $CF23CE
+;dd FireSpringDoor
+;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C1C84A
+JSR $C80E
+
+ORG $C1C7FD
+CLC
+  ADC #psi_letters
+  STA $0E
+  lda #$00FD
+  sta $10
+STZ $12
+STZ $14
+BRA $10
+JSL sort_psi_menu
+JMP $163C
+
+ORG $F00000
+sort_psi_menu:
+REP #$31
+PHD
+TDC
+ADC #$FFF8
+TCD
+LDA $8958
+CMP #$FFFF
+BNE .nojump
+JMP .Return
+.nojump:
+ASL
+TAX
+LDA $88E4,X
+LDY #$0052
+JSL $C08FF7
+TAY
+LDA $867B,Y
+STA $00
+JSL $C10C49
+DEC
+BNE $06
+LDA #$FFFF
+JMP .Return
+BMI $F8
+STA $02
+LDA $00
+LDY #$002D
+JSL $C08FF7
+CLC
+ADC #$89D4
+STA $04
+LDX $04
+TXA
+.selsort_outer:
+LDY $02
+STY $06
+CLC
+ADC #$002D
+TAY
+LDA $000A,X
+CMP $000A,Y
+BNE $06
+LDA $0008,X
+CMP $0008,Y
+BCC $01
+TYX
+TYA
+DEC $06
+BNE $E5
+CPX $04
+BEQ .selsort_outer_no_swap
+LDY $04
+SEP #$20
+LDA #$27
+STA $00
+.swap_loop:
+LDA $0006,X
+XBA
+LDA $0006,Y
+STA $0006,X
+XBA
+STA $0006,Y
+INX
+INY
+DEC $00
+BNE .swap_loop
+REP #$20
+.selsort_outer_no_swap:
+LDA $04
+CLC
+ADC #$002D
+STA $04
+TAX
+DEC $02
+BNE .selsort_outer
+LDA #$0000
+.Return:
+PLD
+RTL
+
+GetProgressiveItems:
+JSR SwapItemForProg
+STA $0000,X
+JML $C18B65
+
+GetProgressiveGoingtoStorage:
+AND #$00FF
+SEP #$20
+JSR SwapItemForProg
+STA $0000,X
+JML $C19164
+
+CheckifNameProgressive:
+SEP #$20
+CMP #$E3
+BCC .NormalItem
+CMP #$E8
+BCS .NormalItem
+JSR SwapNameForProg
+.NormalItem:
+REP #$20
+JML GetItemName
+
+SwapItemForProg:
+CMP #$E3
+BCC .NormalItem
+CMP #$E8
+BCS .NormalItem
+SEC
+SBC #$E3
+PHX
+TAX
+LDA $B5E0,X ;Progressive item count
+CMP ProgCaps,X
+BCS .CappedItem
+INC $B5E0,X
+BRA .GetItem
+.CappedItem:
+LDA $B5E0,X
+.GetItem:
+SEP #$10
+CPX #$00
+BEQ .GetProgBat
+CPX #$01
+BEQ .GetProgPan
+CPX #$02
+BEQ .GetProgGun
+CPX #$03
+BEQ .GetProgBrace
+CPX #$04
+BEQ .GetProgOther
+.GotProgItem:
+REP #$10
+PLX
+.NormalItem:
+RTS
+.GetProgBat:
+TAX
+LDA ProgBats,X
+JMP .GotProgItem
+.GetProgPan:
+TAX
+LDA ProgPans,X
+JMP .GotProgItem
+.GetProgGun:
+TAX
+LDA ProgGuns,X
+JMP .GotProgItem
+.GetProgBrace
+TAX
+LDA ProgBracelets,X
+JMP .GotProgItem
+.GetProgOther
+TAX
+LDA ProgOther,X
+JMP .GotProgItem
+
+SwapNameForProg:
+SEC
+SBC #$E3
+PHX
+TAX
+LDA $B5E0,X ;Progressive item count
+SEP #$10
+CPX #$00
+BEQ .GetProgBat
+CPX #$01
+BEQ .GetProgPan
+CPX #$02
+BEQ .GetProgGun
+CPX #$03
+BEQ .GetProgBrace
+CPX #$04
+BEQ .GetProgOther
+.GotProgItem:
+REP #$10
+PLX
+RTS
+.GetProgBat:
+TAX
+LDA ProgBats,X
+JMP .GotProgItem
+.GetProgPan:
+TAX
+LDA ProgPans,X
+JMP .GotProgItem
+.GetProgGun:
+TAX
+LDA ProgGuns,X
+JMP .GotProgItem
+.GetProgBrace
+TAX
+LDA ProgBracelets,X
+JMP .GotProgItem
+.GetProgOther
+TAX
+LDA ProgOther,X
+JMP .GotProgItem
+
+NewLuckySandwich:
+REP #$31
+LDA #$0010
+JSL .RandBankC2
+CMP #$0007
+BCC .60HPRS
+LDA #$0009
+JSL .RandBankC2
+CMP #$0004
+BCC .240HPRS
+LDA #$0005
+JSL .RandBankC2
+CMP #$0003
+BCC .FullHPRS
+LDA #$0002
+JSL .RandBankC2
+CMP #$0000
+BEQ .5PP
+LDA #$0003
+JSL .RandBankC2
+BCS .20PP
+BRA .FullHeal
+.60HPRS:
+LDA #$003C
+JSL .MultBankC2
+TAX
+LDA $A972
+JSL .RestHP
+BRA .Return
+.240HPRS:
+LDA #$00F0
+JSL .MultBankC2
+TAX
+LDA $A972
+JSL .RestHP
+BRA .Return
+.FullHPRS
+LDX #$0F27
+LDA $A972
+JSL .RestHP
+BRA .Return
+.5PP:
+LDA #$0005
+JSL .MultBankC2
+TAX
+LDA $A972
+JSL .RestPP
+BRA .Return
+.20PP:
+LDA #$0014
+JSL .MultBankC2
+TAX
+LDA $A972
+JSL .RestPP
+BRA .Return
+.FullHeal:
+LDX #$0F27
+LDA $A972
+JSL .RestHP
+LDX $A972
+LDA $001B,X
+TAX
+LDA $A972
+JSL .RestPP
+.Return:
+RTL
+
+.RandBankC2:
+PHY
+LDY #$6A2C
+JSL goto_bank_c2
+PLY
+RTL
+
+.MultBankC2:
+PHY
+LDY #$6AFC
+JSL goto_bank_c2
+PLY
+RTL
+
+.RestHP:
+PHY
+LDY #$7293
+JSL goto_bank_c2
+PLY
+RTL
+
+.RestPP:
+PHY
+LDY #$7317
+JSL goto_bank_c2
+PLY
+RTL
+
+GetNewSwirlColorNormal:
+LDA #$0004
+STA $14
+LDA #$0004
+STA $04
+LDY #$0000
+STY $12
+JML $C2E8F9
+
+GetNewSwirlColorGood:
+LDA #$001C
+STA $14
+LDA #$0005
+STA $04
+LDY #$000C
+STY $12
+LDA #$0006
+JML $C2E92F
+
+GetNewSwirlColorBad:
+LDA #$0000
+STA $14
+LDA #$001F
+STA $04
+LDY #$001F
+STY $12
+JML $C2E944
+
+PokeySwirl:
+LDA $4A8C
+CMP #$000E
+BEQ .BossSwirl
+CMP #$01C0
+BCC .NormalSwirl
+.BossSwirl:
+JML $C2E953
+.NormalSwirl:
+JML $C2E964
+;;;;;;;;;;;;
+GetSeedPlayer:
+PHY
+PHB
+LDA #$0010
+LDX #$FD00
+LDY #$9801
+MVN $D77E
+PLB
+PLY
+LDX #$9801
+STX $15
+JML $C0F67F
+
+DrawWorldVersion:
+LDA #$0024
+JSL $C1DD47
+LDA #$FFA0
+STA $0E
+LDA #$00FC
+STA $10
+;FCFFE0 stores the world version
+JSL $C186B1
+
+LDA #$0013
+JSL $C1DD47;draw the file select box
+JML $C1ED6D
+
+Set24BitStartingEXP:
+PHX
+LDA $24
+AND #$00FF
+ASL
+TAX
+LDA ExpPointers,X
+STA $06
+LDA #$00D7
+STA $08
+LDA [$06]
+BEQ .ZeroCheck
+.HasExp:
+TAX
+INC $06
+INC $06
+LDA [$06]
+STA $08
+STX $06
+PLX
+JML $C1FD61
+.ZeroCheck:
+PHA
+INC $06
+INC $06
+LDA [$06]
+BEQ .NoEXP
+PLA
+DEC $06
+DEC $06
+BRA .HasExp
+.NoEXP:
+PLA
+PLX
+DEC $06
+DEC $06
+JML $C1FD72
+
+CheckMoreSpecialCommands:
+CMP #$0018
+BEQ .PrintPlayerMenu
+CMP #$0019
+BEQ .CheckIfIsBanned
+CMP #$001A
+BEQ .SendGiftPacket
+CMP #$001B
+BEQ .PrintGiftInbox
+CMP #$001C
+BEQ .CountGifts
+CMP #$001D
+BEQ .SwaptoKeyStorage
+CMP #$001E
+BEQ .ClearKeyStorage
+CMP #$001F
+BEQ .StoreKeyItem
+CMP #$0020
+BEQ .SetShopFlag
+CMP #$0021
+BEQ .ClearAPName
+JML CheckMoreMoreCommands
+.CheckIfIsBanned:
+JMP .CompareBannedItemList
+.SendGiftPacket:
+JMP .LongSendGiftPacket
+.PrintGiftInbox:
+JMP SwapToGiftInventory
+.CountGifts:
+JMP CountGifts
+.SwaptoKeyStorage:
+JMP SwapKeyStorage
+.StoreKeyItem:
+JMP StoreKeyItem
+.ClearKeyStorage:
+JMP ClearKeyStorage
+.SetShopFlag:
+JMP SetShopFlag
+.ClearAPName:
+JMP ClearAPNameFlag
+
+.PrintPlayerMenu:
+JSL $C3E4D4
+LDA #$0035
+JSL $C1DD47 ;open_window
+
+LDA #$0002
+LDY #$0EB3
+JSL goto_bank_c1
+
+LDA #$0082
+LDY #$0EB3
+JSL goto_bank_c1
+LDA #$0001
+STA $97D0
+.ResetText:
+STZ $B5E9
+LDA $B622
+AND #$FFFB
+STA $B622
+LDA $97D0
+STA $B5E7
+LDA #$00EE
+STA $10
+LDA.w #PrintPlayerNum
+STA $0E
+JSL $C186B1
+
+.PressNothing:
+LDA #$0000
+.CheckServerLoop:
+STA $B58E
+LDA $B58E
+CMP #$0032
+BEQ .ExitServerLoop
+
+LDA $B622
+AND #$00FF
+AND #$0004
+BNE .ExitServerLoop
+LDA $B58E
+INC
+PHA
+JSL $C08756
+PLA
+BRA .CheckServerLoop
+.ExitServerLoop:
+LDA #$00EE
+STA $10
+LDA.w #PlayerNameText
+STA $0E
+JSL $C3E4D4
+JSL $C186B1
+JSL $C3E4CA
+.LoopWin:
+JSL $C12DD5
+
+LDA $0066
+AND #$0008
+BNE .PressedUp
+LDA $0066
+AND #$0004
+BNE .PressedDown
+LDA $0066
+AND #$0001
+BNE .PressedRight
+
+LDA $0066
+AND #$0002
+BNE .PressedLeft
+JMP .SpecialInput
+.PressedUp:
+LDA #$0035
+JSL $C1DD47
+LDA $97D0
+CMP PlayerCount
+BCS .MaxPlayers
+INC
+.MaxPlayers:
+DEC
+CMP PlayerCount
+BCS .OverCap
+INC
+STA $97D0
+.OverCap:
+JMP .ResetText
+.PressedDown:
+LDA #$0035
+JSL $C1DD47
+LDA $97D0
+CMP #$0001
+BEQ .MaxPlayers
+DEC
+BRA .MaxPlayers
+.PressedRight:
+LDA #$0035
+JSL $C1DD47
+LDA $97D0
+CMP PlayerCount
+BCS .MaxPlayers
+CLC
+ADC #$000A
+JMP .MaxPlayers
+.PressedLeft:
+LDA #$0035
+JSL $C1DD47
+LDA $97D0
+CMP #$000B
+BCC .MaxPlayers
+SEC
+SBC #$000A
+BRA .MaxPlayers
+.SpecialInput:
+LDA $006D
+AND #$00A0
+BNE .Confirm
+LDA $006D
+AND #$A000
+BNE .Decline
+JMP .LoopWin
+.Confirm:
+LDA #$0001
+STA $97CC
+JSL $C1DD59
+
+LDA $97D0
+STA $B5E9
+LDA #$0000
+JML $C17F0F
+
+.Decline:
+JSL $C1DD59
+STZ $97CC
+LDA #$0000
+JML $C17F0F
+
+.CompareBannedItemList:
+REP #$31
+PHD
+TDC
+ADC #$FFEE
+TCD
+STZ $B573
+LDY #$03DB
+JSL goto_bank_c1
+LDA $06
+SEP #$20
+LDX #$0000
+.check_banlist:
+CMP BannedItemList,X
+BEQ .BannedItem
+INX
+CPX #$002F
+BCC .check_banlist
+REP #$20
+LDA #$0001
+BRA .exit
+.BannedItem:
+REP #$20
+LDA #$0000
+.exit:
+STA $0E
+STZ $10
+LDY #$045C
+JSL goto_bank_c1
+LDA #$0000
+PLD
+JML $C17F0F
+
+
+.LongSendGiftPacket:
+LDA $31D0
+AND #$00FF
+CMP #$0009
+BCC .GiftBufferNotFull
+LDA $B622
+ORA #$0008
+STA $B622
+
+;Set flag here
+.GiftBufferNotFull:
+INC $31D0
+LDX #$0000
+.CheckBuffer:
+LDA $31D1,X
+BEQ .InsertGiftToBuffer
+INX #3
+BRA .CheckBuffer
+
+.InsertGiftToBuffer:
+SEP #$20
+LDA $97D0
+STA $31D1,X
+REP #$20
+LDA $B5E9
+STA $31D2,X
+LDA #$0000
+JML $C17F0F
+
+TransferGiftToInv:
+PHA
+PHX
+SEP #$20
+LDA $3270;Set this byte if we opened the Receiving menu
+BNE .NoGift
+LDA $3200
+BEQ .NoGift
+LDX #$0000
+.CheckGiftSlots:
+LDA $3201,X
+BEQ .EmptySlot
+INX
+CPX #$0047
+BEQ .NoGift
+BRA .CheckGiftSlots
+.EmptySlot:
+LDA $3200
+STA $3201,X
+STZ $3200
+.NoGift:
+REP #$20
+PLX
+PLA
+JML $809470
+
+SwapToGiftInventory:
+LDA $3272
+BEQ .SetSwapInv
+STZ $3272
+BRA .ClearSwapInv
+.SetSwapInv:
+LDA #$0001
+STA $3272
+.ClearSwapInv:
+LDA #$0000
+JML $C17F0F
+
+CountGifts:
+STZ $97D0
+STZ $97CC
+SEP #$20
+LDA $3201
+BEQ .Exit
+LDA #$01
+STA $97D0
+LDX #$0000
+.CheckGiftCount:
+LDA $3201,X
+BEQ .Exit
+INC $97CC
+INX
+BRA .CheckGiftCount
+
+.Exit:
+REP #$20
+LDA #$0000
+JML $C17F0F
+
+
+GetDynamicWindowTitle:
+LDA $3272
+BEQ .GetStorage
+DEC
+ASL
+TAX
+LDA StorageTitlePointers,X
+STA $0E
+LDA #$00FC
+STA $10
+LDA StorageNumberStart,X
+STA $18
+LDA StorageTitleLength,X
+AND #$00FF
+TAX
+LDA #$9C9F
+JML $C19A6D
+.GetStorage:
+LDA #$00C4
+STA $10
+JML $C19A67
+
+CheckGiftBox1:;
+LDA $3272
+BEQ .Storage
+CMP #$0002
+BEQ .KeyStorage
+LDA $3201,X
+BRA .GiftBox
+.Storage:
+LDA $B590,X
+.GiftBox:
+AND #$00FF
+JML $C19ABF
+.KeyStorage:
+LDA $3280,X
+BRA .GiftBox
+
+
+CheckGiftBox2:
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+LDA $3201,X
+BRA .GiftBox
+.Storage:
+LDA $B590,X
+.GiftBox:
+STA $06
+JML $C15B2E
+.KeyStorage:
+LDA $3280,X
+BRA .GiftBox
+
+CheckGiftBox3:
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+LDA $3202,X
+BRA .GiftBox
+.Storage:
+LDA $B591,X
+.GiftBox:
+STA $00
+JML $C191D8
+.KeyStorage:
+LDA $3281,X
+BRA .GiftBox
+
+CheckGiftBox4:
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+LDA $3201,X
+BRA .Giftbox
+.Storage:
+LDA $B590,X
+.Giftbox
+STA $01
+JML $C191C3
+.KeyStorage:
+LDA $3280,X
+BRA .Giftbox
+
+
+CheckGiftBox5:
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+STZ $3201,X
+BRA .Giftbox
+.Storage:
+STZ $B590,X
+.Giftbox:
+REP #$20
+JML $C191F1
+.KeyStorage:
+STZ $3280,X
+BRA .Giftbox
+
+CheckGiftBox6:
+PHA
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+PLA
+STA $3201,X
+BRA .GiftBox
+.Storage:
+PLA
+STA $B590,X
+.GiftBox:
+REP #$20
+JML $C191CE
+.KeyStorage:
+PLA
+STA $3280,X
+BRA .GiftBox
+
+CheckIfKeyItem:
+PHX
+LDX #$00
+.Check:
+CMP BanListNoProgs,X
+BEQ .IsKeyItem
+INX
+CPX #$2A
+BEQ .NormalItem
+BRA .Check
+.IsKeyItem:
+PHA
+LDA #$02
+STA $3272
+PLA
+.NormalItem:
+PLX
+RTL
+
+CheckGiftBox7:
+LDA $3272
+BEQ .Storage
+CMP #$02
+BEQ .KeyStorage
+LDA $3201,X
+BRA .GiftBox
+.Storage:
+LDA $B590,X
+.GiftBox:
+STA $06
+JML $C17AA2
+.KeyStorage:
+LDA $3280,X
+BRA .GiftBox
+
+CheckGiftBox8:
+LDA $3272
+BEQ .Storage
+CMP #$0002
+BEQ .KeyStorage
+LDA $3201,X
+BRA .GiftBox
+.Storage:
+LDA $B590,X
+.GiftBox:
+AND #$00FF
+JML $C19121
+.KeyStorage:
+LDA $3280,X
+BRA .GiftBox
+
+CheckGiftBox9:
+PHA
+LDA $3272
+BEQ .Storage
+CMP #$0002
+BEQ .KeyStorage
+PLA
+CLC
+ADC #$3201
+BRA .GiftBox
+.Storage:
+PLA
+CLC
+ADC #$B590
+.GiftBox:
+TAX
+JML $C19156
+.KeyStorage:
+PLA
+CLC
+ADC #$3280
+BRA .GiftBox
+
+SwapKeyStorage:
+LDA $3272
+BNE .ClearStorage
+LDA #$0002
+STA $3272
+.Cleared:
+LDA #$0000
+JML $C17F0F
+.ClearStorage
+STZ $3272
+BRA .Cleared
+
+ClearKeyStorage:
+STZ $3272
+LDA #$0000
+JML $C17F0F
+
+StoreKeyItem:
+LDA $97D0
+SEP #$20
+LDX #$0000
+.CheckBans:
+CMP BannedItemList,X
+BEQ .IsKeyItem
+INX
+CPX #$002F
+BEQ .Done
+BRA .CheckBans
+.IsKeyItem:
+LDA #$02
+STA $3272
+BRA .Done
+.Done:
+REP #$20
+LDA #$0000
+JML $C17F0F
+
+KeyItemBlocker:
+PHX
+LDA $B570
+LDX #$00
+.Check:
+CMP BannedItemList,X
+BEQ .IsKeyItem
+INX
+CPX #$2F
+BEQ .Done
+BRA .Check
+.Done:
+PLX
+LDA $B5D4
+RTL
+.IsKeyItem:
+PLX
+LDA $32C4
+RTL
+
+SetShopFlag:
+STZ $B573
+LDA $0734 ; If I change this to $0734 will it fix my flag bug?
+LDX #$0000
+.CheckShopID:
+CMP #$0007
+BCC .GotShopID
+SEC
+SBC #$0007
+INX
+BRA .CheckShopID
+.GotShopID:
+PHX
+LDX #$0000
+.CheckBit:
+CMP #$0000
+BEQ .GotBit
+DEC
+INX
+BRA .CheckBit
+.GotBit:
+SEP #$20
+LDA ShopFlagBits,X
+PLX
+ORA $B721,X
+STA $B721,X
+REP #$20
+LDA #$0000
+JML $C17F0F
+
+ClearAPNameFlag:
+STZ $B573
+LDA #$0000
+JML $C17F0F
+
+APShopHandler:
+LDA $1E
+STA $0770
+TAX
+LDA #$0000
+.CheckShop:
+CPX #$0000
+BEQ .GotShopNum
+CLC
+ADC #$002A
+DEX
+BRA .CheckShop
+.GotShopNum:
+PHA
+LDX $04
+LDA #$0000
+.CheckSlot:
+CPX #$0000
+BEQ .AddSlotVal
+DEX
+CLC
+ADC #$0006
+BRA .CheckSlot
+.AddSlotVal:
+STA $3274
+PLA
+CLC
+ADC $3274
+;At this point we should know what item we're looking at
+TAX
+LDA $F40000,X
+AND #$00FF
+TAY
+STY $1A
+BNE .ValidShopItem
+JML $C19E93
+.ValidShopItem:
+PHA
+LDA $F40003,X
+AND #$00FF
+STA $3274
+CMP #$0004
+BEQ .GrabOffWorldItemName
+CMP #$0005
+BEQ .GrabOffWorldItemName
+CMP #$0006
+BEQ .GrabOffWorldItemName
+LDA $F40004,X
+STA $0734
+LDA $F40000,X
+.APItemReturn:
+AND #$00FF
+STA $0732
+LDA $F40001,X
+STA $0730
+PLA
+JSL CheckItemBoughtFlag
+CMP #$0000
+BEQ .ItemNotBought
+JSR HandleBoughtItem
+.ItemNotBought:
+JML $C19E06
+.GrabOffWorldItemName:
+PHB
+PHX
+PHY
+LDA $F40004,X
+STA $0734
+;AND #$00FF
+TAX
+LDA #$1190
+..CompareID:
+CPX #$0000
+BEQ ..GotName
+DEX
+CLC
+ADC #$0030
+BRA ..CompareID
+..GotName:
+TAX
+LDA #$007F
+LDY #$FF80
+MVN $F47E
+PLY
+PLX
+PLB
+LDA $F40003,X
+AND #$00FF
+CMP #$0005
+BEQ .Remote
+LDA #$00AD
+JMP .APItemReturn
+.Remote:
+LDA $F40000,X
+AND #$00FF
+JMP .APItemReturn
+
+
+GetAPShopName:
+PHA
+LDA $3274
+LDX $04
+STA $0740,X
+TXA
+ASL
+TAX
+LDA $0734
+STA $0748,X
+LDA $0730
+STA $0756,X
+LDA $3274
+BEQ .NormalItemName
+CMP #$0001
+BEQ .GetTeleportName
+CMP #$0002
+BEQ .GetCharacterName
+CMP #$0003
+BEQ .GetSoldOutName
+CMP #$0004
+BEQ .GetArchipelagoName
+CMP #$0005
+BEQ .GetArchipelagoName
+CMP #$0006
+BEQ .GetPhotoName
+CMP #$0007
+BEQ .GetMoneyName
+
+.NormalItemName:
+PLA
+ADC $06
+STA $06
+STA $0E
+JML $C19E29
+.GetTeleportName:
+PLA
+LDA $0732
+ASL
+TAX
+LDA ShopItemNames_TeleportNames,X
+STA $06
+STA $0E
+LDA #$00F4
+STA $08
+JML $C19E29
+.GetCharacterName:
+PLA
+LDA $0732
+ASL
+TAX
+LDA ShopItemNames_CharNames,X
+STA $06
+STA $0E
+LDA #$00F4
+STA $08
+JML $C19E29
+.GetArchipelagoName:
+PLA
+LDA #$FF80
+STA $06
+STA $0E
+LDA #$007E
+STA $08
+JML $C19E29
+.GetSoldOutName:
+PLA
+LDA #ShopItemNames_SoldOut
+STA $06
+STA $0E
+LDA #$00F4
+STA $08
+JML $C19E29
+.GetPhotoName:
+PLA
+LDA #PhotoShopText
+STA $06
+STA $0E
+LDA #$00F3
+STA $08
+JML $C19E29
+.GetMoneyName:
+PLA
+LDA $0732
+ASL
+TAX
+LDA ShopItemNamesDeluxe_MoneyNames,X
+STA $06
+STA $0E
+LDA #$00F4
+STA $08
+JML $C19E29
+
+
+CheckItemBoughtFlag:
+PHX
+LDA $04
+SEP #$20
+TAX
+LDA ShopFlagBits,X
+REP #$20
+PHA
+LDA $1E
+TAX
+PLA
+AND $B720,X
+PLX
+RTL
+
+HandleBoughtItem:
+LDA $3274
+BEQ .LocalItemChecker
+CMP #$0005
+BEQ .LocalItemChecker
+;This is a teleport/char/nonlocal item. Can never buy this again.
+.BannedItem:
+REP #$20
+LDA #$0003
+STA $3274
+RTS
+.LocalItemChecker:
+LDA $0732
+LDX #$0000
+SEP #$20
+.CheckItem:
+CMP BannedItemList,X
+BEQ .BannedItem
+INX
+CPX #$002F
+BEQ .NotBanned
+BRA .CheckItem
+.NotBanned:
+REP #$20
+STZ $3274
+RTS
+
+GetAPShopPrice:
+LDA $3274
+CMP #$0003
+BEQ .SoldOut
+CMP #$0000
+BEQ .NormalItem
+CMP #$0005
+BEQ .NormalItem
+.DisplaySpecialPrice:
+LDA $0730
+STA $06
+STA $0E
+.DisplayPrice:
+JSL $C4507A
+.SoldOut:
+JML $C19E93
+
+.NormalItem:
+LDA $0732
+JSR CheckBanlist
+BEQ .DisplaySpecialPrice
+BRA .DisplayPrice
+
+CheckBanlist:
+SEP #$20
+LDX #$0000
+.Check:
+CMP BannedItemList,X
+BEQ .Ban
+CPX #$002F
+BEQ .Done
+INX
+BRA .Check
+.Done:
+REP #$20
+LDA #$0001
+RTS
+.Ban:
+REP #$20
+LDA #$0000
+RTS
+
+DisplayAPPlayer:
+LDA $0724
+BEQ .DontCloseNameWin
+LDA $06
+STA $0720
+LDA $08
+STA $0722
+LDA #$000B
+STA $8958
+PHX
+PHY
+JSL $C1DD59 ;Switch to textbox first...
+PLY
+PLX
+STZ $0724
+LDA #$000C
+STA $8958
+LDA $0720
+STA $06
+LDA $0722
+STA $08
+.DontCloseNameWin:
+LDA $0000,Y
+STA $06
+LDA $8958
+CMP #$000C
+BNE .End
+BRA .DontEnd
+.End:
+JMP .End2
+.DontEnd:
+PHX
+LDA $20
+AND #$00FF
+TAX
+.GotSlot:
+LDA $0740,X
+AND #$00FF
+STA $3274
+PHX
+  TXA
+  ASL
+  TAX
+  LDA $0756,X
+  STA $0730
+  LDA $0748,X
+  STA $0734
+PLX
+LDA $3274
+AND #$00FF
+CMP #$0003
+BEQ .SoldOutVar
+STZ $0736
+CMP #$0004
+BCC .DontDisplayPlayerName
+CMP #$0006
+BCS .DontDisplayPlayerName
+LDA #$0001
+STA $B573
+STA $0724
+LDA $06
+STA $0720
+LDA $08
+STA $0722
+LDA #ShopItemNames_PlayerText
+STA $0E
+LDA #$00F4
+STA $10
+PHY
+JSR MoveShopPlayerName
+JSL $C3E4D4 ; Instant print on
+JSL $C186B1 ;Overworld text
+JSL $C3E4CA
+PLY
+STZ $B573
+LDA $0720
+STA $06
+LDA $0722
+STA $08
+;LDA #$000B
+;JSL $C1DD47
+.DontDisplayPlayerName:
+PLX
+JML $C11ACB
+.SoldOutVar:
+LDA #$0001
+STA $0736
+JMP .DontDisplayPlayerName
+.End2:
+JML $C11ACB
+
+MoveShopPlayerName:
+PHB
+PHX
+PHY
+PHA
+TXA
+ASL
+TAX
+LDA $0748,X
+TAX
+PHX
+LDA #$66D0
+.CheckNameSlot:
+CPX #$0000
+BEQ .MoveName
+DEX
+CLC
+ADC #$0011
+BRA .CheckNameSlot
+
+.MoveName:
+TAX
+LDA #$0010
+LDY #$FF50
+MVN $F47E
+PLX
+LDA #$1100
+.CheckSlotName:
+CPX #$0000
+BEQ .MoveItem
+DEX
+CLC
+ADC #$007F
+BRA .CheckSlotName
+.MoveItem:
+TAX
+LDA #$002F
+LDY #$FF80
+MVN $F57E
+PLA
+PLY
+PLX
+PLB
+RTS
+
+TransferOutOfMenu:
+STZ $B573
+JSL $C3E4CA
+;Todo; we need to transfer the item Type and item Price out of here. Also the item Flag. Store these in globals.
+LDA $3274
+STA $97CC
+STZ $0724
+lda $0730
+STA $97D0
+STZ $97D2
+LDA $0734
+STA $97D4
+LDA #$000B
+STA $8958
+PHX
+PHY
+JSL $C1DD59
+PLY
+PLX
+LDA #$0001
+STA $8958
+LDX $1A
+JML $C19EE3
+
+CheckIfBuyable:
+LDA $1A
+BEQ .done
+LDA $0736
+BEQ .done
+LDA $1A
+JSL $EF016F
+LDA #$00FF
+TSB $5E79
+LDA #$0005
+JSL $C0ABE0
+JML $C19EC7
+.done:
+STZ $0736
+JSL $C1DD59
+LDA #$9C8A
+JML $C19ED9
+
+OverrideShopWindowFX:
+PHA
+LDA $3274
+BEQ .NormalItem
+CMP #$0005
+BEQ .NormalItem
+PLA
+LDA #$0001
+JML $C19B6A
+.NormalItem:
+PLA
+JSL $C3EE14
+JML $C19B6A
+
+PreserveWindowPalette:
+PHA
+TDC
+PHA
+LDA #$1DDE
+TCD
+LDA $1A
+BEQ .CancelMenu
+PLA
+TCD
+LDA $0736
+BNE .SoldOut
+.Done:
+PLA
+JSL $C08ED2
+JML $C19DA4
+.SoldOut:
+PLA
+JML $C19DA4
+.CancelMenu:
+PLA
+TCD
+BRA .Done
+
+GetRandomizedTrack:
+%FUNCTION_PROLOGUE(18)
+TAX
+LDA MusicTrackList,X
+AND #$00FF
+JML $C4FBC7
+
+SetMagicantAnimSpeeds:
+LDA $99DC
+CMP #$0003
+BEQ .Paralysis
+LDA $0066
+AND #$0040
+BEQ .Walking
+LDA #$0005
+BRA .SetSpeed
+.Walking:
+LDA #$0008
+.SetSpeed:
+STA $0F42
+RTL
+.Paralysis:
+LDA #$0038
+BRA .SetSpeed
+
+LoadExpandedWindowTable:
+TYA
+CMP #$0035
+BCS .ExpandedWindow
+LDA #$E250
+STA $06
+.Done:
+JML $C105CE
+.ExpandedWindow:
+SEC
+SBC #$0035
+TAY
+LDA #ExtraWindowData
+STA $06
+LDA #$00D7
+STA $08
+JML $C105D3
+
+CheckMoreMoreCommands:
+CMP #$0022
+BEQ CheckIfCanWarp
+CMP #$0023
+BEQ IncTotalPhotos
+CMP #$0024
+BEQ SendRequestForEnergy
+CMP #$0025
+BEQ AuthenticateEnergy
+CMP #$0026
+BEQ GotServerEnergyNum
+CMP #$0027
+BEQ CheckifELOn
+JML CheckMoreMoreMoreCommands
+
+CheckIfCanWarp:
+PHX
+LDX $987B
+LDA $9877
+JSL $C00AA1
+PLX
+AND #$0080
+BEQ .CantWarp
+LDA #$0001
+.CantWarp:
+STA $97CC
+LDA #$0000
+JML $C17F0F
+
+IncTotalPhotos:
+INC $00D7
+LDA #$0000
+JML $C17F0F
+
+SendRequestForEnergy:
+STZ $0792
+STZ $0794
+STZ $079A
+LDA #$0001
+STA $0790
+LDA #$0000
+JML $C17F0F
+
+AuthenticateEnergy:
+JMP AuthenticateEnergyLong
+
+GotServerEnergyNum:
+JMP GotServerEnergyLong
+
+CheckifELOn:
+JMP CheckifELLong
+
+CheckNessRobot:
+SEP #$20
+LDA $B622
+BIT #$40
+REP #$20
+BEQ skip_ness
+JML $C0A98B
+skip_ness:
+LDY #$9F17
+STY $94
+RTL
+
+DeleteExtraKeyItem:
+PHX
+PHY
+STZ $B58B
+LDY #$0001
+.CheckNextCharacter:
+LDX #$0000
+JSR .GetCharacterInventory
+PHY
+LDA $06
+LDY #$0000
+.CheckNextSlot:
+SEP #$20
+CMP $9992,X
+REP #$20
+BEQ .LogKeyItem
+.IgnoreOriginalItem:
+INX
+INY
+CPY #$000E
+BNE .CheckNextSlot
+LDA $B58E
+CMP $98A4
+BEQ .Done
+PLY
+INY
+BRA .CheckNextCharacter
+
+.LogKeyItem:
+PHA
+LDA $B58B
+BNE .TossDuplicateItem
+PLA
+INC $B58B
+JMP .IgnoreOriginalItem
+.Done:
+LDA $06
+LDX #$0000
+.CheckStorage:
+SEP #$20
+CMP $3280,X
+REP #$20
+BEQ .TossDuplicateItemNoPull
+INX
+CPX #$0045
+BNE .CheckStorage
+
+.REALLYdone:
+PLY
+JMP CheckNormalStorage
+.ReallyReallyDoneTheItems:
+JML EndKeyCheck
+.TossDuplicateItem:
+PLA
+PLY
+JML RemoveItem
+
+.TossDuplicateItemNoPull:
+PLY
+JML RemoveItem
+
+.GetCharacterInventory:
+PHY
+LDA $986E,Y ; get the character
+AND #$00FF
+TAY
+TXA
+..Check:
+CPY #$0000
+BEQ ..Done
+CLC
+ADC #$005F
+DEY
+BRA ..Check
+..Done:
+PLY
+TAX
+STY $B58E
+RTS
+
+ReadDynamicPhotoMapPositionY:
+PHX
+LDA $00D4
+AND #$00FF
+ASL
+ASL
+TAX
+LDA $00DF,X
+PLX
+JML $C4F2ED
+
+ReadDynamicPhotoMapPositionX:
+PHX
+LDA $00D4
+AND #$00FF
+ASL
+ASL
+TAX
+LDA $00DD,X
+PLX
+JML $C4F2F6
+
+ReadDynamicPhotoCharPosY:
+PHX
+LDA $00D4
+AND #$00FF
+ASL
+ASL
+TAX
+PHY
+LDY #$6A2C
+LDA #$0040
+PHX
+JSL goto_bank_c2
+PLX
+PLY
+STA $00D5
+LDA $00DF,X
+SEC
+SBC #$0020
+CLC
+ADC $00D5
+PLX
+JML $C4F405
+
+ReadDynamicPhotoCharPosX:
+PHX
+LDA $00D4
+AND #$00FF
+ASL
+ASL
+TAX
+PHY
+LDY #$6A2C
+LDA #$0040
+PHX
+JSL goto_bank_c2
+PLX
+PLY
+STA $00D5
+LDA $00DD,X
+SEC
+SBC #$0020
+CLC
+ADC $00D5
+PLX
+JML $C4F3EC
+
+SpawnDynamicPhotomanX:
+PHX
+PHY
+LDA $00D7
+ASL
+ASL
+TAX
+LDA $9877
+STA $00DD,X
+LDA $00D9
+LDY #$6A2C
+LDA #$0010
+JSL goto_bank_c2
+CLC
+ADC $9877
+PLY
+PLX
+STA $00DB
+JML SavePhotoColor
+
+SpawnDynamicPhotomanY:
+PHX
+LDA $00D7
+ASL
+ASL
+TAX
+LDA $987B
+STA $00DF,X
+PHA
+LDA $B623
+AND #$00FF
+AND #$0008
+BEQ .NormalOffset
+PLA
+CLC
+ADC #$0200
+BRA .Offscreen
+.NormalOffset:
+PLA
+CLC
+ADC #$0050
+.Offscreen:
+PLX
+JML $C46D98
+
+IncrementCurPhotoCount:
+LDX #$0001
+STX $1C
+INC $00D4
+JML $C4F42E
+
+CheckTotalEnergy:
+LDA $08
+STA $0C
+LDA $B623
+AND #$00FF
+AND #$0010
+BEQ .CheckBank
+LDA $0792
+STA $06
+LDA $0794
+STA $08
+JML $C15F48
+.CheckBank:
+JML $C15F3E
+
+DisplayEnergy:
+TAY
+LDA $0000,Y
+PHA
+LDA $B623
+AND #$00FF
+AND #$0010
+BEQ .DontDisp
+PLA
+LDA $0792
+STA $06
+LDA $0794
+STA $08
+JML $C192E9
+.DontDisp:
+PLA
+JML $C192E2
+
+AuthenticateEnergyLong:
+PHX
+LDA $97D0
+STA $0796
+LDA $97D2
+STA $0798
+LDX #$00B4
+.CountFrames:
+LDA $079A
+AND #$00FF
+BNE .WithdrawSuccess
+PHX
+JSL $C08756
+PLX
+DEX
+CPX #$0000
+BNE .CountFrames
+PLX
+LDA #$0000
+STA $97D0
+STA $0796
+STA $0797
+STA $97D2
+.Done:
+LDA #$0000
+JML $C17F0F
+.WithdrawSuccess:
+PLX
+STA $97CC
+LDA #$0000
+BRA .Done
+
+GotServerEnergyLong:
+LDA $0790
+STA $97CC
+LDA #$0000
+JML $C17F0F
+
+CheckEndPhotos:
+PHX
+LDA HasStartingPhoto
+AND #$00FF
+BEQ .NoStartPhoto
+LDA $00D7
+AND #$00FF
+ASL
+ASL
+TAX
+LDA $C1FE9E
+STA $00DD,X
+LDA $C1FE9B
+STA $00DF,X
+LDA $00D7
+ASL
+TAX
+LDA PhotoFlags,X
+LDX #$0001
+JSL $C2165E
+LDA $C0B672
+AND #$00FF
+STA $98CB
+INC $00D7
+.NoStartPhoto:
+LDA HasPooStartPhoto
+AND #$00FF
+BEQ .NoPooPhoto
+LDA $00D7
+AND #$00FF
+ASL
+ASL
+TAX
+LDA $C1FE9E
+STA $00DD,X
+LDA $C1FE9B
+STA $00DF,X
+LDA $00D7
+ASL
+TAX
+LDA PhotoFlags,X
+LDX #$0001
+JSL $C2165E
+LDA $00D7
+CMP #$0001
+BEQ .SpawnPoo2
+LDA #$0004
+STA $98CB
+.SpawnPoo2:
+LDA #$0004
+STA $98D4
+INC $00D7
+
+.NoPooPhoto:
+PLX
+JML $C1FEB6
+
+CheckifELLong:
+LDA $C4FD78
+AND #$00FF
+STA $97CC
+LDA #$0000
+JML $C17F0F
+
+SetFlagOnEquipConfirmSolo:
+db $1C, $20, $01
+db $0A
+dl $C5E1E0
+
+SetFlagOnEquipConfirm:
+db $1C, $20, $01
+db $0A
+dl $C50990
+
+ForcePurchaseCheck:
+db $1D, $19, $01
+db $0A
+dd CancelBuyRemoveName
+
+ForceSetSoloCheck:
+db $1C, $20, $01
+db $0A
+dl $C5E1E0
+
+LoadEnemyToVram:
+LDA $0780
+BEQ .LoadNormal
+LDA $9D11
+AND #$00FF
+BRA .LoadCustom
+.LoadNormal:
+LDA [$0A]
+.LoadCustom:
+LDY #$005E
+PHX
+LDX $AAB4
+SEP #$20
+STA $0782,X
+REP #$20
+PLX
+JML $C2EF42
+
+AllowDynamicCallEnemyLoad:
+CMP #$00FF
+BEQ .cantcall
+JML $C2BDA3
+.cantcall:
+LDA $26
+PHX
+LDX #$0000
+SEP #$20
+.Check:
+CMP $0782,X
+BEQ .Loaded
+CPX #$0003
+BEQ .DontOverride
+INX
+BRA .Check
+.DontOverride:
+REP #$20
+PLX
+JML $C2BDC6
+.Loaded:
+REP #$20
+PLX
+JML $C2BDEC
+
+AllowEnemyToSpawn:
+LDA $0780
+BEQ .DontOverride
+LDA $9D11
+AND #$00FF
+BRA .Done
+.DontOverride:
+LDA [$0A]
+.Done:
+STA $AABE,X
+JML $C2EFA7
+
+ForceLoadSingle:
+LDA [$1A],y
+AND #$00FF
+PHA
+LDA $0780
+BNE .ForceMode
+.Load:
+PLA
+JML $C2EFCB
+
+.ForceMode:
+LDA $B5ED
+BNE .Done
+INC $B5ED
+BRA .Load
+.Done:
+PLA
+JML $C2EFD4
+
+InitializeLoadingEnemies:
+STZ $0780
+STZ $0782
+STZ $0784
+STZ $AAB4
+STZ $AAB2
+JML $C2EEF5
+
+SetupVramForSpriteLoad:
+PHA
+LDA $0780
+BEQ .NormalLoad
+LDA $AAB4
+CMP #$04
+BCS .NormalLoad
+PLA
+JSL $C085B7
+SEP #$20
+LDA #$0F
+STA $00000D
+RTL
+.NormalLoad:
+PLA
+JML $C08616
+
+CloseVersionWindow:
+LDA #$0024
+JSL $C3E521
+JML $C3E4D4
+
+FixGiygasReflectBroken:
+PHA
+LDA $AA96
+BEQ .NotReflection
+LDA #$A26A
+STA $A972
+.NotReflection:
+JML $C23D05
+
+CheckNormalStorage:
+PHY
+LDA $06
+LDX #$0000
+.CheckStorage:
+SEP #$20
+CMP $B590,X
+REP #$20
+BEQ .TossDuplicateItemNoPull
+INX
+CPX #$0045
+BNE .CheckStorage
+PLY
+LDA #$0000
+JML DeleteExtraKeyItem_ReallyReallyDoneTheItems
+.TossDuplicateItemNoPull:
+PLY
+JML RemoveItem
+
+GetStartingData:
+PHB
+LDA StartingInvetory
+TAY
+LDX #$5000
+LDA StartingInvAmounts
+MVN $F77E
+PLB
+LDA #$0000
+LDX #$0000
+CheckTeleport:
+LDA StartingTeleports,X
+AND #$00FF
+BEQ EndStartTeleports
+CMP #$0010
+BNE NormalTeleport
+JMP GetStarstorm
+NormalTeleport:
+PHX
+ASL
+TAX
+LDA TeleportFlags,X
+JSL $C2165E
+PLX
+INX
+BRA CheckTeleport
+EndStartTeleports:
+STZ $FF41
+LDA #$0000
+LDX #$0000
+CheckChars:
+LDA StartingChars,X
+AND #$00FF
+BEQ EndStartData
+PHX
+PHA
+CMP #$0001
+BNE .NotNess
+LDA #$0006
+.NotNess:
+DEC
+DEC
+ASL
+TAX
+LDA CharFlags,X
+LDX #$0001
+JSL $C2165E
+PLA
+JSL $C228F8
+PLX
+INX
+BRA CheckChars
+EndStartData:
+JML CheckEndPhotos
+GetStarstorm:
+PHX
+LDA $FF41
+AND #$00FF
+CMP #$0002
+BNE .StarstormYeah
+DEC $FF41
+.StarstormYeah:
+TAX
+LDA StarstormBits,X
+AND #$00FF
+TSB $9839
+PLX
+INX
+INC $FF41
+JMP CheckTeleport
+
+KeyItemBlockerAndCheckProg:
+LDA $B570
+CMP #$E3
+BCC .NormalItem
+CMP #$E8
+BCS .NormalItem
+LDA $B5D4
+RTL
+.NormalItem:
+JML KeyItemBlocker
+
+CheckMoreMoreMoreCommands:
+CMP #$0028
+BEQ StorePartyDirections
+CMP #$0029
+BEQ LoadPartyDirections
+JML $C17DDC
+
+StorePartyDirections:
+PHB
+PHX
+PHY
+LDX #$2B26
+LDY #$B43E
+LDA #$000A
+MVN $7E7E
+PLY
+PLX
+PLB
+LDA #$0000
+JML $C17F0F
+
+LoadPartyDirections:
+PHY
+PHX
+.Ness:
+JMP LoadPartyMemberDirectionsFixed
+  LDX $B43E
+  JSL $C46363
+.Paula:
+  LDA #$0002
+  LDX $B440
+  JSL $C46363
+.Jeff:
+  LDA #$0003
+  LDX $B442
+  JSL $C46363
+.Poo:
+  LDA #$0004
+  LDX $B444
+  JSL $C46363
+.Temp1:
+LDA $B446
+STA $2B2E
+LDA $B448
+STA $2B30
+  LDA $98A4
+  ASL
+  TAX
+  LDA $9897,X
+  BEQ .Temp2
+  ASL
+  TAX
+  LDA $2AF6,x
+  STZ $2AF6,X
+  TAX
+  PHX
+  LDA $98A4
+  TAX
+  LDA $988B,X
+  AND #$00FF
+  PLX
+  JSL $C46363 ; not working
+.Temp2:
+  LDA $98A4
+  INC
+  ASL
+  TAX
+  LDA $9897,X
+  BEQ .Done
+  ASL
+  TAX
+  LDA $2AF6,x
+  STZ $2AF6,X
+  TAX
+  PHX
+  LDA $98A4
+  INC
+  TAX
+  LDA $988B,X
+  AND #$00FF
+  PLX
+  JSL $C46363 ;not working
+.Done:
+PLY
+PLX
+LDA #$0000
+JML $C17F0F
+
+GiveTeddyOnLoad:
+PHX
+PHY
+LDA #$0000
+LDX #$0000
+LDY #$0000
+SEP #$20
+LDA $98A3
+BNE .End
+LDA $C0B672
+TAX
+REP #$20
+LDA #$99F1
+.CheckChar:
+CPX #$0001
+BEQ .GotChar
+CLC
+ADC #$005F
+DEX
+BRA .CheckChar
+.GotChar:
+TAX
+SEP #$20
+.CheckSlot:
+LDA $0000,X
+BEQ .End
+CMP #$02
+BEQ .GiveTeddy
+CMP #$03
+BEQ .GiveSuper
+.KeepGoing:
+CPY #$000D
+BEQ .End
+INY
+INX
+BRA .CheckSlot
+.End:
+REP #$20
+PLY
+PLX
+JML $C1FEBA
+.GiveTeddy:
+INC $B44A
+PHA
+PHX
+PHY
+REP #$20
+LDA #$0010
+JSL $C228F8
+SEP #$20
+PLY
+PLX
+PLA
+BRA .KeepGoing
+.GiveSuper:
+REP #$20
+LDA $B44A
+BNE .ReplaceBear
+.AddSuper:
+LDA #$0011
+JSL $C228F8
+BRA .End
+.ReplaceBear:
+LDA #$0010
+INC $98A3
+JSL $C229BB
+DEC $98A3
+BRA .AddSuper
+
+FixGiygasReflect:
+PHA
+LDA $AA96
+BEQ .NotReflection
+LDA #$A26A
+STA $A972
+.NotReflection:
+PLA
+JML $C23D05
+
+HandleUnusableWarpPad:
+PHX
+LDA $1D
+TAX
+LDA $1F
+AND #$00FF
+JSL $C3E977
+PLX
+CMP #$00B5
+BNE .NormalItem
+LDA #$0000
+BRA .UseItem
+.NormalItem:
+LDA $06
+.UseItem:
+DEC
+LDY #$005F
+JML $C13666
+
+LoadCurrentPhotoColor:
+PHX
+LDX #$0000
+.Check:
+CMP PhotocolorTable,X
+BEQ .GotPhotoColor
+CPX #$0156
+BEQ .NotInTable
+INX
+INX
+BRA .Check
+.GotPhotoColor:
+PHA
+LDA GoodPhotoColors,X
+.ForceLoad0:
+AND #$00FF
+SEP #$20
+STA $B44C
+REP #$20
+PLA
+PLX
+JML $C06987
+.NotInTable:
+PHA
+LDA #$0010
+BRA .ForceLoad0
+
+SavePhotoColor:
+PHA
+PHX
+LDA $00D7
+TAX
+SEP #$20
+LDA $B44C
+STA $0160,X
+REP #$20
+PLX
+PLA
+JML $C46D85
+
+LoadPhotoColor:
+PHX
+LDA $00D4
+AND #$00FF
+TAX
+LDA $0160,X
+AND #$00FF
+TAX
+LDA #$0000
+.Check:
+CPX #$0000
+BEQ .Done
+CLC
+ADC #$00C0
+DEX
+BRA .Check
+.Done:
+PLX
+JML $C0089E
+
+RenderCrashScreen:
+STZ $002B
+.CheckForFrame:
+  LDA $002B
+  BEQ .CheckForFrame
+  STZ $002B
+  STZ $4100
+  JSL $C08726
+  REP #$31
+  LDA #$1EE0
+  TCD
+    LDA #$00F8
+    STA $10
+    LDA #$9000
+    STA $0E
+    LDA #$0000
+    LDX #$01B0
+    LDY #$6100
+  JSL $C08616
+    LDA #$0000
+    LDX #$7C00
+    LDY #$6000
+  JSL $C08E1C
+  LDA #$06FF
+  LDX #$9700
+  LDY #$7DFE
+  MVN $F87E
+
+
+  LDA #$0460
+  LDX #$9200
+  LDY #$7F16
+  MVN $F87E
+JSL $C2038B
+LDA #$0004
+STA $001A
+  LDA #$000F
+  LDX #$0002
+  JSL $C0886C
+.Loop:
+JSL $C08756
+LDA $006A
+AND #$0010
+BNE .Reset
+BRA .Loop
+.Reset:
+JML ReallyReset
+
+LeaveMoneyInMemory:
+LDA $B5EF
+BNE .KeepInMem
+JML $C22214
+.KeepInMem:
+STZ $B5EF
+LDA $06
+STA $97D0
+JML $C22214
+
+
+CheckExtraAddCommands:
+CMP #$0001
+BNE .NotOne
+JML $C18012
+.NotOne:
+CMP #$0025
+BEQ .SaveMoney
+JML $C17F29
+.SaveMoney:
+INC $B5EF
+JML $C1803C
+
+
+GetRemoteMoney:
+LDA $B5F1
+BEQ .Done
+PHA
+LDA #$0074
+JSL $C0ABE0
+PLA
+ASL
+TAX
+LDA MoneyAmounts,X
+STA $0E
+LDA #$0000
+STA $10
+JSL $C22214
+STZ $B5F1
+.Done:
+LDA $006D
+AND #$A000
+JML $C0B8F4
+
+ClearStatusVars:
+LDA #$766E
+STA $0E
+STZ $B587
+STZ $B588
+JML $C2A044
+
+LoadPartyMemberDirectionsFixed:
+    phy
+    phx
+    LDA #$000B
+    LDY #$2B26
+    LDX #$B43E
+    MVN $7E7E
+    ldy #$0000
+    bra .loopcond
+.loop:
+    phy
+    ; Update entity sprite frame (the thing that the "set direction" function at C46363 does after storing to the table of directions)
+    jsl $C0A780
+    ply
+    iny
+    iny
+.loopcond:
+    ; Have we gotten through all 6 possible party members?
+    cpy #$000C
+    bcs .loopend
+    ; If not, have we gotten through all valid party members? (according to the entity index list)
+    lda $9897,y
+    and #$00FF
+    bne .loop
+.loopend:
+    ply
+    plx
+    lda #$0000
+    jml $C17F0F
+
+
+
+;new code go here
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+;ANYTHING BETWEEN THIS BREAK AND THE NEXT NEEDS TO GET COMMENTED OUT!
+ORG $C19DE5
+;JML APShopHandler;This JML is only in AP patch
+
+ORG $C19E23
+;JML GetAPShopName
+
+ORG $C19E8F
+;JML GetAPShopPrice
+
+ORG $C11AC6
+;JML DisplayAPPlayer
+
+ORG $C19EDD
+;JML TransferOutOfMenu
+
+org $C19ED3
+;JML CheckIfBuyable
+;NOP
+;NOP
+
+ORG $C19B66
+;JML OverrideShopWindowFX
+
+ORG $C5E0A9
+;db $08
+;dd CheckShopsanityPrice
+
+ORG $C19DA0
+;JML PreserveWindowPalette
+
+ORG $C5E0B6
+;db $08
+;dd BoughtShopsanityItemScript
+
+ORG $C5E0CE
+;db $0A
+;dl ShopsanityPurchaseHandler
+
+ORG $C5E0C8
+;dl ShopsanityPurchaseHandler
+
+ORG $C5DF1E
+;db $0A
+;dl OverrideSpaceCheckOnSpecialItem
+
+ORG $C5E029
+;db $0A
+;dl OverrideSpaceCheckOnSpecialItem_nosell
+
+ORG $C5E1AE
+;dd ForcePurchaseCheck
+
+;ALWAYS HAVE THESE
+ORG $C50A6A
+db $0A
+dl BackupShopEquipText
+
+ORG $C50B4C
+db $0A
+dl BackupShopSellText
+
+ORG $C50C2E
+db $0A
+dl BackupShopCantEquip
+;
+
+ORG $C5E04C
+;db $0A
+;dl OverrideSpaceCheckOnSpecialItem_oneslot
+
+ORG $C5E1A5
+;dd SetFlagOnEquipConfirmSolo
+
+ORG $C5E119
+;dd SetFlagOnEquipConfirm
+
+ORG $C5E0F2
+;dd ForceSetSoloCheck
+
+
+
+
+ORG $F403F0
+;Item ID, 2-byte price, Item Type, 2-bytelocation ID/flag number
+;db $05, $00, $00, $02, $00, $00; Non-remote local item. Franklin Badge.
+;db $5A, $00, $00, $01, $01, $00; Non-remote local Teleport.
+;db $96, $00, $00, $05, $02, $00; A remote regular item
+;db $01, $ff, $ff, $02, $03, $00; Non-remote local Character
+;db $ad, $ff, $ff, $04, $04, $00; Item that the player already bought and got the flag for
+;db $ad, $ff, $ff, $04, $05, $00; Item for another player 
+;db $01, $ff, $ff, $05, $06, $00; A remote Key Item
+
+ORG $F400D2
+;db $11
+;Type 0- Normal local item
+;Type 1- Teleport/PSI
+;type 2- Character
+;type 3- item that's already been bought- SOLD OUT
+;type 4; Item for another player
+;type 5- Remote local item
+;type 6- Photograph
+
+;ORG $F41280
+;db $73, $9F, $9F, $9C, $50, $79, $A4, $95, $9D, $00
+
+;ORG $F411F0
+;db $82, $a5, $a3, $a4, $50, $80, $a2, $9f, $9d, $9f, $a4, $95, $a2, $00
+
+;ORG $F412B0
+;db $76, $A2, $91, $9E, $9B, $9C, $99, $9E, $50, $72, $91, $94, $97, $95, $00
+
+;ORG $F45022
+;db $80, $9C, $91, $A9, $95, $A2, $50, $61, $00
+
+;ORG $F45055
+;db $80, $9C, $91, $A9, $95, $A2, $50, $62, $00
+;Player names should be 16 bytes, followed by a zero
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $F49000
+CheckShopsanityPrice:
+db $01, $01
+db $1B, $06
+db $1B, $02
+dd .NormalItem
+.SpecialPrice:
+db $0B, $05
+db $1B, $03
+dd .RemoteItem
+.CheckRemotePrice:
+db $08
+dd $C5E254
+db $1B, $03
+dd .CantAffordSpecial
+db $1B, $01
+db $1B, $04
+db $1B, $00
+db $1d, $19, $01
+db $02
+
+.NormalItem:
+;Write a code here that checks if the item is in the banlist
+db $1B, $01
+db $1B, $04
+db $1C, $19, $01
+db $1B, $03
+dd .RegularPrice
+db $1B, $06
+db $0A
+dl .SpecialPrice
+.RegularPrice:
+db $1B, $01
+db $0A
+dl $C5E24B
+.CantAffordSpecial:
+db $02
+.RemoteItem:
+db $1B, $01
+db $1B, $04
+db $1C, $19, $01
+db $1B, $02
+dd .SpecialPriceRemote
+db $0A
+dl .RegularPrice
+.SpecialPriceRemote:
+db $1B, $06
+db $0A
+dl .CheckRemotePrice
+
+
+BoughtShopsanityItemScript:
+db $1B, $00
+db $1B, $06
+db $1B, $02
+dd .NormalItem
+db $0b, $06
+db $1B, $03
+dd .Photo
+db $70
+db $0A
+dl .CheckSaturnText
+.NonSaturnTetx:
+db $83, $9f, $5c, $10, $02, $50, $a9, $9f, $a5, $50, $a7, $91, $9e, $a4, $50
+.BackSaturnText:
+db $1B, $06
+db $0B, $07
+db $1B, $03
+dd .Money
+
+db $1B, $06
+db $09, $05
+dd .Teleport
+dd .Character
+dd .Error
+dd .OffWorld
+dd .RemoteLocal
+db $02
+.NormalItem:
+db $1B, $01
+db $0A
+dl $C50660
+
+.Teleport:
+  db $1B, $01
+  db $1B, $04
+  db $0B, $10
+  db $1B, $03
+  dd ..PooPsi
+  db $1B, $01
+  db $06
+  db $F8, $00
+  dd .TeleportActiveSaturn
+  db $06
+  db $F9, $00
+  dd .TeleportActiveSaturn
+  db $06
+  db $FA, $00
+  dd .TeleportActiveSaturn
+  db $a4, $98, $95, $50, $91, $92, $99, $9c, $99, $a4, $a9, $50, $a4, $9f, $50, $a4
+  db $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50
+  ..ContinueTeleport:
+  db $08
+  dd ..TeleportShopNameTable
+  db $6F
+  db $02
+
+  ..PooPsi:
+  db $06
+  db $F8, $00
+  dd .PooPsiSaturn
+  db $06
+  db $F9, $00
+  dd .PooPsiSaturn
+  db $06
+  db $FA, $00
+  dd .PooPsiSaturn
+  db $a4, $9f, $50, $9c, $95, $91, $a2, $9e, $50, $91, $50, $9e, $95, $a7, $50, $80
+  db $83, $79, $50, $91, $92, $99, $9c, $99, $a4, $a9, $6f, $02
+
+  ..TeleportShopNameTable:
+  db $1B, $04
+  db $09, $0F
+  dd .ShopOnett
+  dd .ShopTwoson
+  dd .ShopHHV
+  dd .ShopThreed
+  dd .ShopSaturn
+  dd .ShopDes
+  dd .ShopFours
+  dd .ShopWinter
+  dd .ShopSummer
+  dd .ShopScar
+  dd .ShopDalam
+  dd .ShopDark
+  dd .ShopTen
+  dd .ShopUnder
+  dd .ShopMagic
+  db $02
+
+.Character:
+  db $1B, $01
+  db $1B, $04
+  db $06
+  db $F8, $00
+  dd .CharacterSaturn
+  db $06
+  db $F9, $00
+  dd .CharacterSaturn
+  db $06
+  db $FA, $00
+  dd .CharacterSaturn
+  db $a4, $9f, $50, $98, $99, $a2, $95, $50, $9d, $a9, $50, $91, $a0, $a0, $a2, $95
+  db $9e, $a4, $99, $93, $95, $5c, $50
+  ..ContinueCharacter
+  db $08
+  dd ..CharShopNameTable
+  db $6F
+  db $02
+
+  ..CharShopNameTable:
+  db $09, $05
+  dd .Paula
+  dd .Jeff
+  dd .Poo
+  dd .FlnMn
+  dd .Ness
+  db $02
+
+.Error:
+db $07, $a5, $98, $50, $9f, $98, $51, $50, $79, $96, $50, $a9, $9f, $a5, $57, $a2
+db $95, $50, $a3, $95, $95, $99, $9e, $97, $50, $a4, $98, $99, $a3, $50, $a4, $95
+db $a8, $a4, $5c, $03, $00, $70, $50, $99, $a4, $50, $9d, $95, $91, $9e, $a3, $50
+db $a3, $9f, $9d, $95, $92, $9f, $94, $a9, $50, $a3, $93, $a2, $95, $a7, $95, $94
+db $50, $a5, $a0, $50, $a4, $98, $99, $a3, $50, $a3, $93, $a2, $99, $a0, $a4, $51
+db $50, $80, $9c, $95, $91, $a3, $95, $50, $a2, $95, $a0, $9f, $a2, $a4, $50, $a4
+db $98, $99, $a3, $50, $91, $a3, $50, $91, $50, $92, $a5, $97, $51, $51, $02
+
+.OffWorld:
+db $1B, $01
+  db $06
+  db $F8, $00
+  dd .OffworldSaturn
+  db $06
+  db $F9, $00
+  dd .OffworldSaturn
+  db $06
+  db $FA, $00
+  dd .OffworldSaturn
+db $A4, $98, $95, $50
+db $1C, $05, $00, $50
+db $96, $9F, $A2, $50
+db $1C, $02, $00
+db $6F, $02
+
+.RemoteLocal:
+db $1B, $01
+  db $06
+  db $F8, $00
+  dd .RemoteSaturn
+  db $06
+  db $F9, $00
+  dd .RemoteSaturn
+  db $06
+  db $FA, $00
+  dd .RemoteSaturn
+db $A4, $98, $95, $50
+db $1C, $05, $AD, $50
+db $96, $9F, $A2, $50
+db $1C, $02, $00
+db $6F, $02
+
+.Photo:
+db $02
+
+.Money:
+db $1B, $01
+db $1B, $04
+db $09, $03
+dd ..10
+dd ..100
+dd ..1000
+db $02
+
+..10:
+db $54, $61, $60, $6F, $02
+..100:
+db $54, $61, $60, $60, $6F, $02
+..1000:
+db $54, $61, $60, $60, $60, $6F, $02
+
+
+.TeleportActiveSaturn:
+db $97, $9F, $50, $A4, $9F, $50
+db $0A
+dl .Teleport_ContinueTeleport
+
+.PooPsiSaturn:
+db $9E, $95, $A7, $50, $80, $83, $79, $6F, $02
+
+.CharacterSaturn:
+db $92, $A5, $A9, $50
+db $0A
+dl .Character_ContinueCharacter
+
+.OffworldSaturn:
+db $1C, $05, $00, $50
+db $96, $9F, $A2, $50
+db $1C, $02, $00
+db $6F, $02
+
+.RemoteSaturn:
+db $1C, $05, $AD, $50
+db $96, $9F, $A2, $50
+db $1C, $02, $00
+db $6F, $02
+
+.ShopOnett:
+db $7F, $9E, $95, $A4, $A4, $02
+.ShopTwoson:
+db $84, $A7, $9F, $A3, $9F, $9E, $02
+.ShopHHV:
+db $78, $91, $a0, $a0, $a9, $5d, $78, $91, $a0, $a0, $a9, $50, $86, $99, $9c, $9c
+db $91, $97, $95, $02
+.ShopThreed:
+db $84, $98, $A2, $95, $95, $94, $02
+.ShopSaturn:
+db $83, $91, $A4, $A5, $A2, $9E, $50, $86, $91, $9C, $9C, $95, $A9, $02
+db $91, $97, $95, $02
+.ShopDes:
+db $a4, $98, $95, $50, $74, $a5, $a3, $a4, $a9, $50, $74, $a5, $9e, $95, $a3, $50
+db $74, $95, $a3, $95, $a2, $a4, $02
+.ShopFours:
+db $76, $9F, $A5, $A2, $A3, $99, $94, $95, $02
+.ShopWinter:
+db $87, $99, $9E, $A4, $95, $A2, $A3, $02
+.ShopSummer:
+db $83, $A5, $9D, $9D, $95, $A2, $A3, $02
+.ShopScar:
+db $83, $93, $91, $A2, $91, $92, $91, $02
+.ShopDalam:
+db $74, $91, $9C, $91, $91, $9D, $02
+.ShopDark:
+db $a4, $98, $95, $50, $74, $95, $95, $a0, $50, $74, $91, $a2, $9b, $9e, $95, $a3
+db $a3, $02
+.ShopTen:
+db $a4, $98, $95, $50, $84, $95, $9e, $94, $91, $50, $86, $99, $9c, $9c, $91, $97
+db $95, $02
+.ShopUnder:
+db $a4, $98, $95, $50, $7c, $9f, $a3, $a4, $50, $85, $9e, $94, $95, $a2, $a7, $9f
+db $a2, $9c, $94, $02
+.ShopMagic:
+db $7D, $91, $97, $99, $93, $91, $9E, $A4, $02
+
+.Paula:
+db $1C, $02, $02, $02
+.Jeff:
+db $1C, $02, $03, $02
+.Poo:
+db $1C, $02, $04, $02
+.FlnMn:
+db $76, $9C, $A9, $99, $9E, $97, $50, $7D, $91, $9E, $02
+.Ness:
+db $1C, $02, $01, $02
+
+.CheckSaturnText:
+db $06
+db $F8, $00
+dd .SaturnText
+db $06
+db $F9, $00
+dd .SaturnText
+db $06
+db $FA, $00
+dd .SaturnText
+db $0A
+dl .NonSaturnTetx
+.SaturnText:
+db $1F, $31
+db $89, $9F, $A5, $50, $A7, $91, $9E
+db $A4, $50
+db $0A
+dl .BackSaturnText
+
+ShopsanityPurchaseHandler:
+;Set the flag here, probably?
+db $1B, $06
+db $0B, $06
+db $1B, $03
+dd .Photo
+db $1B, $06
+db $1B, $02
+dd .NormalItem
+db $01
+db $1F, $30
+db $06
+db $93, $02
+dd .SpecialMoonsideFlagHandler
+db $19, $02
+db $89, $95, $A3, $02
+db $19, $02
+db $7E, $9F, $02
+db $1C, $07, $02, $11
+db $12
+db $09, $02
+dd .Purchase
+dd .Cancel
+.Cancel:
+db $0A
+dl $C5E1AD
+.Purchase:
+db $1B, $06
+db $0B, $05
+db $1B, $03
+dd .PurchaseRemoteItem
+db $1B, $06
+.ConfirmRemotePurchase:
+db $1D, $09
+dw $0000
+db $18, $0A
+db $08
+dd $C5D835
+db $1B, $06
+db $08
+dd .BoughtSpecialItemGiveToPlayer
+;Set flag here!!!!
+db $0A
+dl $C50198
+db $02
+.NormalItem:
+db $1B, $01
+db $1C, $19, $01
+db $1B, $03
+dd .NotSpecial
+db $19, $20
+db $0B, $01
+db $1B, $03
+dd .GiveLeader
+db $1B, $01
+db $08
+dd $C507F8
+db $08
+dd $C5E52E
+db $1B, $02
+dd $C5E1AD
+
+db $1B, $04
+db $1D, $03, $00
+db $1B, $02
+dd $C5E1B7
+db $1C, $20, $01
+.LeaderGiven:
+db $09, $04
+dd .GiveNess
+dd .GivePaula
+dd .GiveJeff
+dd .GivePoo
+.GiveNess:
+db $1B, $01
+db $1D, $0E, $01, $00
+db $0A
+dl .FinishGive
+.GivePaula:
+db $1B, $01
+db $1D, $0E, $02, $00
+db $0A
+dl .FinishGive
+.GiveJeff:
+db $1B, $01
+db $1D, $0E, $03, $00
+db $0A
+dl .FinishGive
+.GivePoo:
+db $1B, $01
+db $1D, $0E, $04, $00
+db $0A
+dl .FinishGive
+.FinishGive:
+db $04, $91, $02
+db $1B, $06
+db $1D, $09
+dw $0000
+db $18, $0A
+db $08
+dd $C5D835
+db $08
+dd $C51568
+db $02
+.NotSpecial:
+db $19, $20
+db $0B, $01
+db $1B, $03
+dd .HandleSoloNonSpecialBuy
+
+db $1B, $01
+db $08
+dd $C507F8
+db $08
+dd $C5E0D3
+db $1B, $02
+dd .skipflag
+db $1C, $20, $01
+.skipflag:
+db $02
+.GiveLeader:
+db $1C, $20, $01
+db $19, $10, $01
+db $0A
+dl .LeaderGiven
+.HandleSoloNonSpecialBuy:
+db $1D, $03, $FF
+db $1B, $02
+dd $C5DF89
+;db $1C, $20, $01
+db $0A
+dl $C5E0DE
+.BoughtSpecialItemGiveToPlayer:
+db $1C, $20, $01
+db $04, $91, $02
+db $09, $07
+dd ..Teleport
+dd ..Character
+dd ..Error
+dd ..OffWorld
+dd ..RemoteLocal
+dd ..Error
+dd ..Money
+
+
+
+..Error:
+..OffWorld:
+..RemoteLocal:
+db $02
+
+..Teleport:
+db $1B, $01
+db $1B, $04
+db $09, $10
+dd OnettTeleTex+$1
+dd TwosonTeleTex+$1
+dd HappyTeleTex+$1
+dd ThreedTeleTex+$1
+dd SaturnTeleTex+$1
+dd DunesTeleTex+$1
+dd FoursTeleTex+$1
+dd WintersTeleTex+$1
+dd SummersTeleTex+$1
+dd ScarabaTeleTex+$1
+dd DalaamTeleTex+$1
+dd DarkTeleTex+$1
+dd TendaTeleTex+$1
+dd UnderworldTeleTex+$1
+dd MagicantTeleTex+$1
+dd PooPsiTex+$1
+db $02
+
+..Money:
+db $10, $10
+db $1B, $01
+db $1B, $04
+db $09, $03
+dd ...10
+dd ...100
+dd ...1000
+db $02
+...10:
+db $1D, $25, $0A, $00
+db $08
+dd DisplayAndGetMoney
+db $02
+
+...100:
+db $1D, $25, $64, $00
+db $08
+dd DisplayAndGetMoney
+db $02
+
+...1000:
+db $1D, $25, $E8, $03
+db $08
+dd DisplayAndGetMoney
+db $02
+
+..Character:
+db $1B, $01
+db $1B, $04
+db $09, $05
+dd .Paula
+dd .Jeff
+dd .Poo
+dd .FlnMn
+dd .Ness
+db $02
+.Paula:
+db $08
+dd $D5F830
+db $18, $01, $01
+db $02
+.Jeff:
+db $08
+dd $D5F837
+db $18, $01, $01
+db $02
+.Poo:
+db $08
+dd $D5F83E
+db $18, $01, $01
+db $02
+.FlnMn:
+db $08
+dd $D5F845
+db $18, $01, $01
+db $02
+.Ness:
+db $08
+dd $D5F849
+db $18, $01, $01
+db $02
+
+.PurchaseRemoteItem:
+db $1B, $01
+db $1c, $19, $01
+db $1B, $02
+dd .RemoteSpecialPurchase
+
+db $1B, $01
+db $1D, $0A, $00
+db $1B, $04
+db $0A
+dl .ConfirmRemotePurchase
+.RemoteSpecialPurchase:
+db $1B, $06
+db $0A
+dl .ConfirmRemotePurchase
+.Photo:
+db $1C, $28, $01
+db $1B, $06
+db $04, $91, $02
+db $1C, $20, $01
+db $08
+dd DynamicPhotoSetter
+db $1C, $29, $01
+db $18, $01, $01
+db $02
+
+.SpecialMoonsideFlagHandler:
+db $19, $02
+db $89, $95, $A3, $02
+db $19, $02
+db $7E, $9F, $02
+db $1C, $07, $02, $11
+db $12
+db $09, $02
+dd .Cancel
+dd .Purchase
+db $0A
+dl .Purchase
+
+
+OverrideSpaceCheckOnSpecialItem:
+db $1B, $06
+db $1B, $02
+dd .CheckSpace
+db $0A
+dl $C5DF27
+.CheckSpace:
+db $1d, $03, $ff
+db $1b, $02
+dd $C5Df89
+db $0A
+dl $C5DF27
+
+CancelBuyRemoveName:
+db $1C, $21, $01
+db $0A
+dl $C50C36
+
+OverrideSpaceCheckOnSpecialItem_nosell:
+db $1B, $06
+db $1B, $02
+dd .CheckSpace
+db $0A
+dl $C5E05C
+.CheckSpace:
+db $1d, $03, $ff
+db $1b, $02
+dd $C50F66
+db $0A
+dl $C5DF27
+
+BackupShopEquipText:
+db $0A
+dl $C5B910
+
+BackupShopSellText:
+db $0A
+dl $C52189
+
+BackupShopCantEquip:
+db $0A
+dl $C5B94D
+
+OverrideSpaceCheckOnSpecialItem_oneslot:
+db $1B, $06
+db $1B, $02
+dd .CheckSpace
+db $0A
+dl $C5E05C
+.CheckSpace:
+db $1d, $03, $ff
+db $1b, $02
+dd $C5E0A3
+db $0A
+dl $C5E05C
+
+
+;ORG $f40930
+;db $01, $00, $01, $01, $00, $00, $01, $00, $01
+
+
+
+;set flags
+;give the item
+
+
+
+;First we should probably check if it's a special item? 
+;1E is the shop ID
+;04 is thre slot number
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;BATTLE ACTION STUFF WEE-WOO WEE-WOO
+
+macro LoadAddress06(address)
+   LDA #$AFB0
+   STA $06
+   lda #$00FF
+   sta $08
+endmacro
+
+macro LoadAddress0A(address)
+   LDA #$AFB0
+   STA $0A
+   lda #$00FF
+   sta $0C
+endmacro
+
+macro LoadAddress18(address)
+   LDA #$AFB0
+   STA $18
+   lda #$00FF
+   sta $1A
+endmacro
+
+ORG $FFAFB0
+
+ORG $C11FF1
+LDA $FFAFB0,X
+
+ORG $C1B6E4
+LDA $FFAFB0,X
+
+ORG $C1B80E
+LDA $FFAFB0,X
+
+ORG $C1C9E7
+LDA $FFAFB0,X
+
+ORG $C1CD55
+LDA $FFAFB0,X
+
+ORG $C1CDCF
+LDA $FFAFB0,X
+
+ORG $C244D4
+LDA $FFAFB0,X
+
+ORG $C256EE
+LDA $FFAFB0,X
+
+ORG $C257E4
+LDA $FFAFB0,X
+
+ORG $C25A12
+LDA $FFAFB0,X
+
+ORG $C25A8A
+LDA $FFAFB0,X
+
+ORG $C25B4E
+LDA $FFAFB0,X
+
+ORG $C25B9D
+LDA $FFAFB0,X
+
+ORG $C2699F
+LDA $FFAFB0,X
+
+ORG $C29447
+LDA $FFAFB0,X
+
+ORG $C1ADC8
+%LoadAddress06(BattleActions)
+
+ORG $C1AFFD
+%LoadAddress0A(BattleActions)
+
+ORG $C1B04F
+%LoadAddress0A(BattleActions)
+
+ORG $C1B0CB
+%LoadAddress0A(BattleActions)
+
+ORG $C1B138
+%LoadAddress0A(BattleActions)
+
+ORG $C1B1A7
+%LoadAddress0A(BattleActions)
+
+ORG $C1B259
+%LoadAddress0A(BattleActions)
+
+ORG $C1B371
+%LoadAddress18(BattleActions)
+
+ORG $C1B466
+%LoadAddress0A(BattleActions)
+
+ORG $C1B89C
+%LoadAddress0A(BattleActions)
+
+ORG $C1B8E7
+%LoadAddress06(BattleActions)
+
+ORG $C1B9AD
+%LoadAddress0A(BattleActions)
+
+ORG $C1C913
+%LoadAddress0A(BattleActions)
+
+ORG $C1CC9B
+%LoadAddress06(BattleActions)
+
+ORG $C1DF64
+%LoadAddress06(BattleActions)
+
+ORG $C1DFB8
+%LoadAddress06(BattleActions)
+
+ORG $C2451F
+%LoadAddress06(BattleActions)
+
+ORG $C2582E
+%LoadAddress06(BattleActions)
+
+ORG $C25C32
+%LoadAddress0A(BattleActions)
+
+ORG $C25CEB
+%LoadAddress0A(BattleActions)
+
+ORG $C2794D
+%LoadAddress0A(BattleActions)
+
+ORG $FFBEA4
+;START OF NEW BATTLE ACTIONS
+db $00, $01, $05, $00, $30, $9c, $ef, $00, $6D, $8b, $c2, $00;cold spores
+
+db $00, $01, $05, $00 
+dd regular_eyes
+dd $00C28CF1;Glared with Regular Eyes
+
+db $00, $01, $05, $00
+dd creepy_eyes
+dd $00C29FFE;Glared with Creepy eyes
+
+db $00, $04, $05, $00
+dd gentle_light
+dd $00C29987;Emit gentle light
+
+db $00, $04, $05, $00
+dd harsh_light
+dd $00C299AE;Emit harsh light
+
+db $00, $04, $05, $00
+dd radiant_light
+dd $00C29A35;Emit radiant light
+
+db $00, $01, $05, $00
+dd fireball_gamma
+dd flaming_fireball_gamma
+
+db $00, $01, $05, $00
+dd fireball_beta
+dd flaming_fireball_beta
+
+db $00, $01, $05, $00
+dd fireball_alpha
+dd flaming_fireball_alpha
+
+db $00, $04, $05, $00
+dd breathe_fire_alpha
+dd $00C295AB;
+
+db $00, $04, $05, $00
+dd breathe_fire_beta
+dd $00C295B4;
+
+db $00, $04, $05, $00
+dd breathe_fire_omega
+dd $00C295C6;
+
+db $00, $04, $05, $00
+dd spray_fire_alpha
+dd $00C295AB;
+
+db $00, $04, $05, $00
+dd spray_fire_beta
+dd $00C295B4;
+
+db $00, $04, $05, $00
+dd spray_fire_gamma
+dd $00C295BD;
+
+db $00, $01, $02, $00
+dd dirty_fangs
+dd dirty_fang_asm;
+
+db $00, $01, $05, $00
+dd dirty_stinger
+dd $00C28B6D;
+
+db $00, $04, $05, $00
+dd fizzling_crack_zap
+dd $00C29871;
+
+db $00, $04, $05, $00
+dd thunder_boom_bang
+dd $00C29889;
+
+db $00, $04, $05, $00
+dd shocking_blast_burst
+dd $00C29895;
+
+db $00, $04, $05, $00
+dd static_shock
+dd $00C29871;
+
+db $00, $04, $05, $00
+dd charged_shock
+dd $00C29889;
+
+db $00, $04, $05, $00
+dd high_voltage_shock
+dd $00C29895;
+
+db $00, $04, $05, $00
+dd espresso_beta
+dd $00C295B4;
+
+db $00, $04, $05, $00
+dd espresso_gamma
+dd $00C295BD;
+
+db $00, $04, $05, $00
+dd espresso_omega
+dd $00C295C6;
+
+db $00, $04, $05, $00
+dd extinguish_alpha
+dd $00C295AB;
+
+db $00, $04, $05, $00
+dd extinguish_beta
+dd $00C295B4;
+
+db $00, $04, $05, $00
+dd extinguish_omega
+dd $00C295C6;
+
+db $00, $01, $02, $00
+dd solid_byte
+dd $00C2A5EC;
+
+db $00, $01, $02, $00
+dd paralyzing_byte
+dd paralyz_byte_asm;
+
+db $00, $01, $05, $00
+dd dirty_flute
+dd $00C28B6D;
+
+db $00, $01, $05, $00
+dd dirty_kiss
+dd $00C28B6D;
+
+db $00, $03, $03, $01;fire zeta
+dd $00EF8543
+dd fire_zeta
+
+db $00, $03, $03, $03;fire epsilon
+dd $00EF8543
+dd fire_epsilon
+
+db $00, $01, $03, $01;Freeze zeta
+dd $00EF8543
+dd freeze_zeta
+
+db $00, $01, $03, $01;Freeze epsilon
+dd $00EF8543
+dd freeze_epsilon
+
+db $00, $01, $03, $02;Freeze delta
+dd $00EF8543
+dd freeze_delta
+
+db $00, $01, $03, $02;Freeze lambda
+dd $00EF8543
+dd freeze_lambda
+
+db $00, $04, $03, $03;Special zeta
+dd $00EF8543
+dd special_zeta
+
+db $00, $04, $03, $05;Special epsilon
+dd $00EF8543
+dd special_epsilon
+
+db $00, $01, $03, $04;Paralysis Delta
+dd $00EF8543
+dd paralyz_delta
+
+db $00, $04, $03, $01;Thunder zeta
+dd $00EF8543
+dd thunder_zeta
+
+db $00, $04, $03, $01;Thunder epsilon
+dd $00EF8543
+dd thunder_epsilon
+
+db $00, $04, $03, $01;Thunder lambda
+dd $00EF8543
+dd thunder_delta
+
+db $00, $04, $03, $01;Thunder delta
+dd $00EF8543
+dd thunder_lambda
+
+db $00, $04, $03, $01;starstorm zeta
+dd $00EF8543
+dd starstorm_zeta
+
+db $00, $04, $03, $03;starstorm epsilon
+dd $00EF8543
+dd starstorm_epsilon
+
+db $00, $04, $03, $06;starstorm delta
+dd $00EF8543
+dd starstorm_delta
+
+db $00, $04, $03, $0C;starstorm lambda
+dd $00EF8543
+dd starstorm_lambda
+
+db $00, $04, $03, $00
+dd warm_breath
+dd fire_zeta
+
+db $00, $04, $03, $00
+dd sizzle_breath
+dd fire_epsilon
+
+db $00, $01, $05, $00
+dd fireball_zeta
+dd flaming_fireball_zeta
+
+db $00, $01, $05, $00
+dd fireball_epsilon
+dd flaming_fireball_epsilon
+
+db $00, $04, $05, $00
+dd spray_fire_zeta
+dd fire_zeta
+
+db $00, $04, $05, $00
+dd spray_fire_epsilon
+dd fire_epsilon
+
+db $00, $04, $05, $00
+dd lukewarm_espresso
+dd fire_zeta;
+
+db $00, $04, $05, $00
+dd piping_espresso
+dd fire_epsilon;
+
+db $00, $04, $05, $00
+dd tingling_jolt
+dd thunder_zeta;
+
+db $00, $04, $05, $00
+dd minor_zap
+dd thunder_epsilon
+
+db $00, $04, $05, $00
+dd dull_shock
+dd thunder_delta;
+
+db $00, $04, $05, $00
+dd lv_shock
+dd thunder_lambda;
+
+db $00, $04, $05, $00
+dd fizzled_zap
+dd thunder_zeta;
+
+db $00, $04, $05, $00
+dd crackling_whoosh_bam
+dd thunder_epsilon
+
+db $00, $04, $05, $00
+dd sparking_swish_bang
+dd thunder_delta;
+
+db $00, $04, $05, $00
+dd jolting_shock_zap
+dd thunder_lambda;
+
+db $00, $04, $05, $00
+dd extinguish_zeta
+dd fire_zeta;
+
+db $00, $04, $05, $00
+dd extinguish_epsilon
+dd fire_epsilon;
+
+db $00, $04, $05, $00
+dd $00ef8f17
+dd $00C29871;Giygas phase 2 thunder 1
+
+db $00, $04, $05, $00
+dd $00ef8f17
+dd thunder_lambda
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd thunder_delta
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd thunder_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd thunder_zeta
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd $00C29871
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd thunder_lambda
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd thunder_delta
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd thunder_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd thunder_zeta
+;;;;;;;;;;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd $00C29871
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd thunder_lambda
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd thunder_delta
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd thunder_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd thunder_zeta
+;;;;;;;;;;;;;;;
+;freeze giygas
+db $00, $04, $05, $00
+dd $00EF8F17
+dd freeze_zeta
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd freeze_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd freeze_delta
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd freeze_lambda
+;;;;;;;;;;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd freeze_zeta
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd freeze_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd freeze_delta
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd freeze_lambda
+;;;;;;;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd freeze_zeta
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd freeze_epsilon
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd freeze_delta
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd freeze_lambda
+;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8F17
+dd $00C29987
+
+db $00, $04, $05, $00
+dd $00EF8F17
+dd $00C299AE
+;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd $00C29987
+
+db $00, $04, $05, $00
+dd $00EF8EE2
+dd $00C299AE
+;;;;;;;;;;;;;;;;
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd $00C29987
+
+db $00, $04, $05, $00
+dd $00EF8F4A
+dd $00C299AE
+;;;;;;;;;;;;
+db $00, $01, $03, $05
+dd $00EF8543;Blast alpha
+dd blast_alpha
+
+db $00, $01, $03, $0F
+dd $00EF8543;Blast beta
+dd blast_beta
+
+db $00, $01, $03, $14
+dd $00EF8543;Blast gamma
+dd blast_gamma
+
+db $00, $01, $03, $1E
+dd $00EF8543;Blast omega
+dd blast_omega
+;;;;;;;;;;;;;;;;;;
+db $00, $01, $03, $05
+dd $00EF8543;Missile alpha
+dd missile_alpha
+
+db $00, $01, $03, $0F
+dd $00EF8543;Missile beta
+dd missile_beta
+
+db $00, $01, $03, $1E
+dd $00EF8543;Missile gamma
+dd missile_gamma
+
+db $00, $01, $03, $64
+dd $00EF8543;Missile omega
+dd missile_omega
+;;;;;;;;;;;;;;;;;
+;01ac
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29556
+
+;01AD
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29568
+
+;flash bomb
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29987
+
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c299ef
+
+;fire bomb
+db $00, $03, $04, $00
+dd $00c97eb7
+dd $00c295ab
+
+db $00, $03, $04, $00
+dd $00c97eb7
+dd $00c295bd
+;freeze bomb
+db $00, $01, $04, $00
+dd $00c97eb7
+dd $00c29647
+
+db $00, $01, $04, $00
+dd $00c97eb7
+dd $00c29659
+;thunder bomb
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29871
+
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29889
+;Starstorm bomb
+db $00, $04, $04, $00
+dd $00c97eb7
+dd starstorm_delta
+
+db $00, $04, $04, $00
+dd $00c97eb7
+dd $00c29aa6
+;Missile bomb
+db $00, $01, $04, $00
+dd $00c97eb7
+dd $00c2a5d1
+
+db $00, $01, $04, $00
+dd $00c97eb7
+dd $00c2a5da
+;;;;;;;;;;;;
+;Special missile
+db $00, $04, $04, $00
+dd $00c97ddc
+dd $00c29556
+
+db $00, $04, $04, $00
+dd $00c97df5
+dd $00c2955f
+
+db $00, $04, $04, $00
+dd $00c97e24
+dd $00c29571
+;Flash missile
+db $00, $04, $04, $00
+dd $00c97ddc
+dd $00c29987
+
+db $00, $04, $04, $00
+dd $00c97df5
+dd $00c299ae
+
+db $00, $04, $04, $00
+dd $00c97e24
+dd $00c29a35
+;Fire missile
+db $00, $03, $04, $00
+dd $00c97ddc
+dd $00c295ab
+
+db $00, $03, $04, $00
+dd $00c97df5
+dd $00c295b4
+
+db $00, $03, $04, $00
+dd $00c97e24
+dd $00c295c6
+;freeze missile
+db $00, $01, $04, $00
+dd $00c97ddc
+dd $00c29647
+
+db $00, $01, $04, $00
+dd $00c97df5
+dd $00c29650
+
+db $00, $01, $04, $00
+dd $00c97e24
+dd $00c29662
+;thunder missile
+db $00, $04, $04, $00
+dd $00c97ddc
+dd $00c29871
+
+db $00, $04, $04, $00
+dd $00c97df5
+dd $00c2987d
+
+db $00, $04, $04, $00
+dd $00c97e24
+dd $00c29895
+;Star missile
+db $00, $04, $04, $00
+dd $00c97ddc
+dd starstorm_delta
+
+db $00, $04, $04, $00
+dd $00c97df5
+dd starstorm_lambda
+
+db $00, $04, $04, $00
+dd $00c97e24
+dd $00c29aaf
+;Bomb missile
+db $00, $01, $04, $00
+dd $00c97ddc
+dd $00c2a818
+
+db $00, $01, $04, $00
+dd $00c97df5
+dd blast_beta
+
+db $00, $01, $04, $00
+dd $00c97e24
+dd blast_omega
+;;;;;;;;;;;;;;;;;;;;;;
+;bazookas
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c29556
+
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c29568
+
+;flash bomb
+db $00, $04, $04, $00
+dd $00cc97e9e
+dd $00c29987
+
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c299ef
+
+;fire bomb
+db $00, $03, $04, $00
+dd $00c97e9e
+dd $00c295ab
+
+db $00, $03, $04, $00
+dd $00c97e9e
+dd $00c295bd
+;freeze bomb
+db $00, $01, $04, $00
+dd $00c97e9e
+dd $00c29647
+
+db $00, $01, $04, $00
+dd $00c97e9e
+dd $00c29659
+;thunder bomb
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c29871
+
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c29889
+;Starstorm bomb
+db $00, $04, $04, $00
+dd $00c97e9e
+dd starstorm_delta
+
+db $00, $04, $04, $00
+dd $00c97e9e
+dd $00c29aa6
+;Missile bomb
+db $00, $01, $04, $00
+dd $00c97e9e
+dd $00c2a5d1
+
+db $00, $01, $04, $00
+dd $00c97e9e
+dd $00c2a5da
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;New assist PSI
+;Defense Up Alpha
+db $01, 01, $03, $07
+dd $00EF8543
+dd $00c2aac6
+;Defense Up Omega
+db $01, $04, $03, $15
+dd $00EF8543
+dd $00c2ab0d
+;Drain Alpha
+db $00, $01, $03, $08
+dd $00EF8543
+dd $00c2a46b
+;Drain Omega
+db $00, $04, $03, $18
+dd $00EF8543
+dd $00c2a507
+;Disable Alpha
+db $00, $01, $03, $06
+dd $00EF8543
+dd $00c2a3d1
+;Disable Omega
+db $00, $04, $03, $12
+dd $00EF8543
+dd $00c2a3d1
+;Stop Alpha
+db $00, $01, $03, $05
+dd $00EF8543
+dd $00c28cf1
+;Stop Omega
+db $00, $04, $03, $0F
+dd $00EF8543
+dd $00c28cf1
+
+;Neutralize Alpha
+db $00, $01, $03, $0A
+dd $00EF8543
+dd $00c2a422
+;Neutralize Omega
+db $00, $04, $03, $1E
+dd $00EF8543
+dd $00c290c6
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Action 01E7
+db $00, $01, $04, $00
+dd hypnosis_alpha_item_anim
+dd $00c29f06
+
+db $00, $04, $04, $00
+dd hypnosis_omega_item_anim
+dd $00c29f57
+;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $04, $00
+dd paralysis_alpha_item_anim
+dd $00c29ffe
+
+db $00, $04, $04, $00
+dd paralysis_omega_item_anim
+dd $00c2a04f
+;;;;;;;;;;;;;;;;;;;;;;;
+;TODO: MAKE NEW ITEM ANIM CODES FOR THE EXTENDED ASSISTS
+;Offense Up
+db $01, $01, $04, $00
+dd $00ef8e27
+dd $00c29e38
+
+db $01, $04, $04, $00
+dd $00ef8e27
+dd $00c29e7f
+;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $04, $00
+dd defdown_alpha_item_anim
+dd $00cc29e86
+
+db $00, $04, $04, $00
+dd defdown_omega_item_anim
+dd $00cc29eff
+;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $04, $00
+dd brainshock_alpha_item_anim
+dd $00c2a056
+
+db $00, $04, $04, $00
+dd brainshock_omega_item_anim
+dd $00c2a0a7
+;;;;;;;;;;;;;;;;;;;;
+;new jeffer items go here?
+db $00, $04, $04, $00
+dd $00ef8e3c
+dd $00c2a3d1
+
+db $00, $04, $04, $00
+dd $00c97d75
+dd $00c28cf1
+;;;;;;;;;;
+;01F3
+db $01, $01, $04, $00
+dd $00c97b6b
+dd NewLuckySandwich
+;;;;;;;;;;;;;;;
+;Unique text for these?
+db $00, $04, $05, $00
+dd $00ef9e05
+dd $00C29987
+
+db $00, $04, $05, $00
+dd $00ef9e05
+dd $00C299AE
+
+db $00, $04, $05, $00
+dd $00ef9e05
+dd $00C299EF
+;;;;;;;;;;
+db $00, $01, $03, $01
+dd $00EF8543;Blast Zeta
+dd blast_zeta
+
+db $00, $01, $03, $03
+dd $00EF8543;Blast Epsilon
+dd blast_epsilon
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $03, $01
+dd $00EF8543;Missile Zeta
+dd missile_zeta
+
+db $00, $01, $03, $03
+dd $00EF8543;Missile Epsilon
+dd missile_epsilon
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $01, $00
+dd throwbomb_zeta
+dd blast_zeta
+
+db $00, $01, $01, $00
+dd throwbomb_epsilon
+dd blast_epsilon
+
+db $00, $01, $01, $00
+dd throwbomb_alpha
+dd blast_alpha
+
+db $00, $01, $01, $00
+dd throwbomb_beta
+dd blast_beta
+
+db $00, $01, $01, $00
+dd throwbomb_gamma
+dd blast_gamma
+
+db $00, $01, $01, $00
+dd throwbomb_omega
+dd blast_omega
+;;;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $01, $00
+dd shootrocket_zeta
+dd missile_zeta
+
+db $00, $01, $01, $00
+dd shootrocket_epsilon
+dd missile_epsilon
+
+db $00, $01, $01, $00
+dd shootrocket_alpha
+dd missile_alpha
+
+db $00, $01, $01, $00
+dd shootrocket_beta
+dd missile_beta
+
+db $00, $01, $01, $00
+dd shootrocket_gamma
+dd missile_gamma
+
+db $00, $01, $01, $00
+dd shootrocket_omega
+dd missile_omega
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $00, $01, $05, $00
+dd paralyz_pollen_lambda
+dd $C28CF1
+
+db $00, $04, $05, $00
+dd paralyz_pollen_omega
+dd $C28A92
+;;;;;;;;;;;;;;;;
+db $00, $00, $05, $00
+dd $EF9A47
+dd code_test_load_enemyvram
+
+
+;New battle text
+ORG $FE0000
+regular_eyes:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $97, $9c, $91, $a2, $95, $94, $50, $a7
+db $99, $a4, $98, $50, $99, $a4, $a3, $50, $a2, $95, $97, $a5, $9c, $91, $a2, $50
+db $95, $a9, $95, $a3, $51, $03, $10, $01, $02;Glared with regular eyes!
+
+creepy_eyes:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $97, $9c, $91, $a2, $95, $94, $50, $a7
+db $99, $a4, $98, $50, $99, $a4, $a3, $50, $93, $a2, $95, $95, $a0, $a9, $50, $95
+db $a9, $95, $a3, $51, $03, $10, $01, $02;glared with its creepy eyes!
+
+gentle_light:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $95, $9d, $99, $a4, $a4, $95, $94, $50
+db $91, $50, $97, $95, $9e, $a4, $9c, $95, $50, $9c, $99, $97, $98, $a4, $51, $03
+db $02
+
+harsh_light:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $95, $9d, $99, $a4, $a4, $95, $94, $50
+db $91, $50, $98, $91, $a2, $a3, $98, $50, $9c, $99, $97, $98, $a4, $51, $03, $02
+
+radiant_light:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $95, $9d, $99, $a4, $a4, $95, $94, $50
+db $91, $50, $a2, $91, $94, $99, $91, $9e, $a4, $50, $9c, $99, $97, $98, $a4, $51
+db $03, $02
+
+fireball_gamma:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $95, $a7, $95, $94, $50, $9f
+db $a5, $a4, $50, $91, $50, $98, $9f, $a4, $50, $96, $99, $a2, $95, $92, $91, $9c
+db $9c, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+fireball_beta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $95, $a7, $95, $94, $50, $9f
+db $a5, $a4, $50, $91, $50, $a3, $9d, $9f, $9c, $94, $95, $a2, $99, $9e, $97, $50
+db $96, $99, $a2, $95, $92, $91, $9c, $9c, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+fireball_alpha:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $95, $a7, $95, $94, $50, $9f
+db $a5, $a4, $50, $91, $50, $9c, $99, $a4, $a4, $9c, $95, $50, $92, $99, $a4, $50
+db $9f, $96, $50, $96, $99, $a2, $95, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+breathe_fire_alpha:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $a2, $95, $91, $a4, $98, $95, $94
+db $50, $91, $50, $98, $9f, $a4, $50, $92, $a2, $95, $91, $a4, $98, $51, $1f, $02
+db $4b, $03, $10, $01, $02
+
+breathe_fire_beta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $a2, $95, $91, $a4, $98, $95, $94
+db $50, $91, $50, $92, $a5, $a2, $a3, $a4, $50, $9f, $96, $50, $98, $95, $91, $a4
+db $51, $1f, $02, $4b, $03, $10, $01, $02
+
+breathe_fire_omega:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $a2, $95, $91, $a4, $98, $95, $94
+db $50, $a7, $98, $99, $a4, $95, $5d, $98, $9f, $a4, $50, $96, $99, $a2, $95, $51
+db $1f, $02, $4b, $03, $10, $01, $02
+
+spray_fire_alpha:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $9f, $a5, $a4
+db $50, $91, $50, $9c, $99, $9e, $95, $50, $9f, $96, $50, $96, $99, $a2, $95, $51
+db $1f, $02, $4b, $03, $10, $01, $02
+
+spray_fire_beta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $9f, $a5, $a4
+db $50, $91, $50, $92, $99, $a4, $50, $9f, $96, $50, $96, $99, $a2, $95, $51, $1f
+db $02, $4b, $03, $10, $01, $02
+
+spray_fire_gamma:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $9f, $a5, $a4
+db $50, $91, $50, $a3, $a4, $a2, $95, $91, $9d, $50, $9f, $96, $50, $96, $99, $a2
+db $95, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+dirty_fangs:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a4, $9f, $9f, $9b, $50, $91, $50, $92
+db $99, $a4, $95, $50, $a5, $a3, $99, $9e, $97, $50, $99, $a4, $a3, $50, $94, $99
+db $a2, $a4, $a9, $50, $96, $91, $9e, $97, $a3, $51, $03, $02
+
+dirty_stinger:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a4, $a5, $9e, $97, $50, $a7, $99
+db $a4, $98, $50, $99, $a4, $a3, $50, $94, $99, $a2, $a4, $a9, $50, $a3, $a4, $99
+db $9e, $97, $95, $a2, $51, $03, $10, $01, $02
+
+fizzling_crack_zap:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $76
+db $99, $aa, $aa, $9c, $99, $9e, $97, $50, $73, $a2, $91, $93, $9b, $50, $8a, $91
+db $a0, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+thunder_boom_bang:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $84
+db $98, $a5, $9e, $94, $95, $a2, $99, $9e, $97, $50, $72, $9f, $9f, $9d, $50, $72
+db $91, $9e, $97, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+shocking_blast_burst:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $83
+db $98, $9f, $93, $9b, $99, $9e, $97, $50, $72, $9c, $91, $a3, $a4, $50, $72, $a5
+db $a2, $a3, $a4, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+static_shock:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50
+db $a3, $a4, $91, $a4, $99, $93, $50, $a3, $98, $9f, $93, $9b, $50, $91, $a4, $a4
+db $91, $93, $9b, $51, $03, $02
+
+charged_shock:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50
+db $93, $98, $91, $a2, $97, $95, $94, $50, $a3, $98, $9f, $93, $9b, $50, $91, $a4
+db $a4, $91, $93, $9b, $51, $03, $02
+
+high_voltage_shock:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50
+db $98, $99, $97, $98, $5d, $a6, $9f, $9c, $a4, $91, $97, $95, $50, $a3, $98, $9f
+db $93, $9b, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+espresso_beta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $99, $9c, $9c, $95, $94, $50
+db $a3, $9f, $9d, $95, $50, $92, $9c, $99, $a3, $a4, $95, $a2, $99, $9e, $97, $50
+db $98, $9f, $a4, $50, $95, $a3, $a0, $a2, $95, $a3, $a3, $9f, $51, $03, $02
+
+espresso_gamma:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $99, $9c, $9c, $95, $94, $50
+db $a3, $9f, $9d, $95, $50, $92, $9f, $99, $9c, $99, $9e, $97, $50, $98, $9f, $a4
+db $50, $95, $a3, $a0, $a2, $95, $a3, $a3, $9f, $51, $03, $02
+
+espresso_omega:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $99, $9c, $9c, $95, $94, $50
+db $91, $50, $a7, $98, $9f, $9c, $95, $50, $9a, $a5, $97, $50, $9f, $96, $50, $9e
+db $a5, $93, $9c, $95, $91, $a2, $50, $99, $9e, $96, $95, $a2, $9e, $9f, $50, $95
+db $a3, $a0, $a2, $95, $a3, $a3, $9f, $51, $03, $02
+
+extinguish_alpha:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $94, $99, $a3, $a0, $95, $9e, $a3, $95
+db $94, $50, $91, $9e, $50, $95, $a8, $a4, $99, $9e, $97, $a5, $99, $a3, $98, $99
+db $9e, $97, $50, $92, $a5, $a2, $a3, $a4, $51, $1f, $02, $58, $03, $10, $01, $02
+
+extinguish_beta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $94, $99, $a3, $a0, $95, $9e, $a3, $95
+db $94, $50, $91, $9e, $50, $95, $a8, $a4, $99, $9e, $97, $a5, $99, $a3, $98, $99
+db $9e, $97, $50, $96, $9c, $91, $a2, $95, $51, $1f, $02, $58, $03, $10, $01, $02
+
+extinguish_omega:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $94, $99, $a3, $a0, $95, $9e, $a3, $95
+db $94, $50, $91, $9e, $50, $95, $a8, $a4, $99, $9e, $97, $a5, $99, $a3, $98, $99
+db $9e, $97, $50, $95, $a8, $a0, $9c, $9f, $a3, $99, $9f, $9e, $51, $1f, $02, $58
+db $03, $10, $01, $02
+
+solid_byte:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $99, $a4, $50, $a9, $9f, $a5, $50
+db $a3, $9f, $96, $a4, $51, $03, $02
+
+paralyzing_byte:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $99, $a4, $50, $a9, $9f, $a5, $50
+db $a7, $99, $a4, $98, $50, $91, $50, $93, $a2, $a5, $9e, $93, $98, $99, $9e, $97
+db $50, $93, $98, $9f, $9d, $a0, $51, $03, $02
+
+dirty_flute:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a0, $9c, $91, $a9, $95, $94, $50, $91
+db $50, $96, $9c, $a5, $a4, $95, $50, $a7, $99, $a4, $98, $50, $99, $a4, $a3, $50
+db $94, $99, $a3, $97, $a5, $a3, $a4, $99, $9e, $97, $50, $92, $a2, $95, $91, $a4
+db $98, $51, $03, $02
+
+dirty_kiss:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $97, $91, $a6, $95, $50, $a4, $98, $95
+db $50, $a3, $9d, $9f, $9f, $93, $98, $50, $9f, $96, $50, $a3, $99, $93, $9b, $9e
+db $95, $a3, $a3, $51, $03, $10, $01, $02
+
+warm_breath:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $a2, $95, $91, $a4, $98, $95, $94
+db $50, $a7, $91, $a2, $9d, $9c, $a9, $50, $9f, $9e, $50, $a9, $9f, $a5, $51, $1F
+db $02, $4b, $03, $10, $01, $02
+
+sizzle_breath:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $92, $a2, $95, $91, $a4, $98, $95, $94
+db $50, $91, $50, $a3, $99, $aa, $aa, $9c, $99, $9e, $97, $50, $98, $9f, $a4, $50
+db $92, $a2, $95, $91, $a4, $98, $51, $1F, $02, $4b, $03, $10, $01, $02
+
+fireball_zeta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $95, $a7, $95, $94, $50, $9f
+db $a5, $a4, $50, $98, $9f, $a4, $50, $95, $9d, $92, $95, $a2, $a3, $51, $1f, $02
+db $4b, $03, $10, $01, $02
+
+fireball_epsilon:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $95, $a7, $95, $94, $50, $9f
+db $a5, $a4, $50, $91, $50, $96, $9c, $99, $93, $9b, $95, $a2, $99, $9e, $97, $50
+db $96, $99, $a2, $95, $92, $91, $9c, $9c, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+spray_fire_zeta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $9f, $a5, $a4
+db $50, $91, $50, $a3, $a0, $9c, $91, $a3, $98, $50, $9f, $96, $50, $96, $99, $a2
+db $95, $51, $1f, $02, $4b, $03, $10, $01, $02
+
+spray_fire_epsilon:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $9f, $a5, $a4
+db $50, $91, $50, $92, $a5, $a2, $a3, $a4, $50, $9f, $96, $50, $96, $99, $a2, $95
+db $51, $1f, $02, $4b, $03, $10, $01, $02
+
+lukewarm_espresso:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $99, $9c, $9c, $95, $94, $50
+db $a3, $9f, $9d, $95, $50, $9c, $a5, $9b, $95, $a7, $91, $a2, $9d, $50, $95, $a3
+db $a0, $a2, $95, $a3, $a3, $9f, $51, $03, $02
+
+piping_espresso:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a3, $a0, $99, $9c, $9c, $95, $94, $50
+db $a3, $9f, $9d, $95, $50, $a0, $99, $a0, $99, $9e, $97, $50, $98, $9f, $a4, $50
+db $95, $a3, $a0, $a2, $95, $a3, $a3, $9f, $51, $03, $02
+
+tingling_jolt:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $a4
+db $99, $9e, $97, $9c, $99, $9e, $97, $50, $9a, $9f, $9c, $a4, $50, $91, $a4, $a4
+db $91, $93, $9b, $51, $03, $02
+
+minor_zap:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $9d
+db $99, $9e, $9f, $a2, $50, $aa, $91, $a0, $50, $91, $a4, $a4, $91, $93, $9b, $51
+db $03, $02
+
+dull_shock:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $94
+db $a5, $9c, $9c, $50, $a3, $98, $9f, $93, $9b, $50, $91, $a4, $a4, $91, $93, $9b
+db $51, $03, $02
+
+lv_shock:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $69
+db $5d, $a6, $9f, $9c, $a4, $50, $a3, $98, $9f, $93, $9b, $50, $91, $a4, $a4, $91
+db $93, $9b, $51, $03, $02
+
+fizzled_zap:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $76
+db $99, $aa, $aa, $9c, $99, $9e, $97, $50, $87, $98, $99, $96, $96, $50, $8a, $91
+db $a0, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+crackling_whoosh_bam:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $73
+db $a2, $91, $93, $9b, $9c, $99, $9e, $97, $50, $87, $98, $9f, $9f, $a3, $98, $50
+db $72, $91, $9d, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+sparking_swish_bang:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $83
+db $a0, $91, $a2, $9b, $99, $9e, $97, $50, $83, $a7, $99, $a3, $98, $50, $72, $91
+db $9e, $97, $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+jolting_shock_zap:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $a5, $a3, $95, $94, $50, $91, $50, $7a
+db $9f, $9c, $a4, $99, $9e, $97, $50, $83, $98, $9f, $93, $9b, $50, $8a, $91, $a0
+db $50, $91, $a4, $a4, $91, $93, $9b, $51, $03, $02
+
+extinguish_zeta:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $94, $99, $a3, $a0, $95, $9e, $a3, $95
+db $94, $50, $91, $9e, $50, $95, $a8, $a4, $99, $9e, $97, $a5, $99, $a3, $98, $99
+db $9e, $97, $50, $a0, $a5, $96, $96, $51, $1f, $02, $58, $03, $10, $01, $02
+
+extinguish_epsilon:
+db $01, $1f, $02, $19, $70, $1c, $0d, $50, $94, $99, $a3, $a0, $95, $9e, $a3, $95
+db $94, $50, $91, $9e, $50, $95, $a8, $a4, $99, $9e, $97, $a5, $99, $a3, $98, $99
+db $9e, $97, $50, $a3, $a0, $9c, $91, $a3, $98, $51, $1f, $02, $58, $03, $10, $01
+db $02
+
+throwbomb_zeta:
+db $01, $1F, $02, $19
+db $70, $1c, $0d, $50, $a4, $a2, $99, $95, $94, $50, $a4, $9f, $50, $a4, $98, $a2
+db $9f, $a7, $50, $91, $50, $92, $9f, $9d, $92, $5c, $10, $05, $50, $92, $a5, $a4
+db $50, $a4, $a2, $99, $a0, $a0, $95, $94, $50, $9f, $a6, $95, $a2, $50, $a9, $9f
+db $a5, $51
+db $1F, $02, $11
+db $03, $02
+
+throwbomb_epsilon:
+db $01, $1F, $02, $19
+db $70, $1c, $0d, $50, $a4, $98, $a2, $95, $a7, $50, $91, $50, $a4, $9f, $a9
+db $50, $92, $9f, $9d, $92, $51
+db $1F, $02, $11, $03
+db $02
+
+throwbomb_alpha:
+db $01, $1F, $02, $19
+db $70, $1c, $0d, $50, $a4, $98, $a2, $95, $a7, $50, $91, $50, $92, $9f, $9d
+db $92, $51
+db $1F, $02, $11, $03
+db $02
+
+throwbomb_beta:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a4, $98, $a2, $95, $a7, $50, $91, $50, $92, $99, $97
+db $50, $92, $9f, $9d, $92, $51
+db $1F, $02, $11, $03
+db $02
+
+throwbomb_gamma:
+db $01, $1F, $02, $19
+db $70, $1c, $0d, $50, $a4, $98, $a2, $95, $a7, $50, $91, $50, $a3, $a5, $a0
+db $95, $a2, $50, $92, $9f, $9d, $92, $51
+db $1F, $02, $11, $03
+db $02
+
+throwbomb_omega:
+db $01, $1F, $02, $19
+db $70, $1c, $0d, $50, $a4, $98, $a2, $95, $a7, $50, $91, $50, $98, $91, $9e, $94
+db $98, $95, $9c, $94, $50, $9e, $a5, $93, $9c, $95, $91, $a2, $50, $92, $9f, $9d
+db $92, $51
+db $1F, $02, $11, $03
+db $02
+
+shootrocket_zeta:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $94, $a5, $94, $50
+db $92, $9f, $a4, $a4, $9c, $95, $50, $a2, $9f, $93, $9b, $95, $a4, $51
+db $1F, $02, $46, $03
+db $02
+
+shootrocket_epsilon:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $a2, $9f, $9d, $91
+db $9e, $50, $93, $91, $9e, $94, $9c, $95, $51
+db $1F, $02, $46, $03
+db $02
+
+shootrocket_alpha:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $92, $9f, $a4, $a4
+db $9c, $95, $50, $a2, $9f, $93, $9b, $95, $a4, $51
+db $1F, $02, $46
+db $03
+db $02
+
+shootrocket_beta:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $94, $9f, $a5, $92
+db $9c, $95, $50, $92, $9f, $a4, $a4, $9c, $95, $50, $a2, $9f, $93, $9b, $95, $a4
+db $51
+db $1F, $02, $46, $03
+db $02
+
+shootrocket_gamma:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $92, $99, $97, $50
+db $92, $9f, $a4, $a4, $9c, $95, $50, $a2, $9f, $93, $9b, $95, $a4, $51
+db $1F, $02, $46, $03
+db $02
+
+shootrocket_omega:
+db $01, $1F, $02, $19
+db $01, $70, $1c, $0d, $50, $a3, $98, $9f, $a4, $50, $91, $50, $a2, $95, $91, $9c
+db $50, $97, $a5, $9e, $51
+db $1F, $02, $46, $03
+db $02
+
+paralyz_pollen_lambda:
+db $01, $1F, $02, $19
+db $01, $70, $1C, $0D, $50
+db $97, $9f, $a4, $50, $91, $50, $9c, $99, $a4, $a4, $9c, $95, $50, $a0, $9f, $9c
+db $9c, $95, $9e, $50, $9f, $9e, $50, $a9, $9f, $a5, $51
+db $1F, $02, $52
+db $03
+db $02
+
+paralyz_pollen_omega:
+db $01, $1F, $02, $19
+db $01, $70, $1C, $0D, $50
+db $97, $9f, $a4, $50, $91, $50, $92, $a5, $9e, $93, $98, $50, $9f, $96, $50, $a0
+db $9f, $9c, $9c, $95, $9e, $50, $95, $a6, $95, $a2, $a9, $a7, $98, $95, $a2, $95
+db $51
+db $1F, $02, $52
+db $03
+db $02
+
+vram_test_message:
+db $01, $70
+db $77, $9F, $50, $97, $9F, $50, $97, $91, $94, $97, $95, $A4, $50, $94, $A9, $9E
+db $91, $9D, $99, $93, $50, $A6, $A2, $91, $9D, $51, $03, $02
+
+;New battle code
+ORG $FD0000
+flaming_fireball_gamma:
+REP #$31
+PHD
+TDC
+ADC #$FFF0
+TCD
+LDA #$00FA
+JML $C29016
+
+flaming_fireball_beta:
+REP #$31
+PHD
+TDC
+ADC #$FFF0
+TCD
+LDA #$0096
+JML $C29016
+
+flaming_fireball_alpha:
+REP #$31
+PHD
+TDC
+ADC #$FFF0
+TCD
+LDA #$005A
+JML $C29016
+
+check_status_types:
+LDA $B587
+AND #$00FF
+PHA
+TAX
+LDA StatusChecks,X
+AND #$00FF
+TAY
+PLA
+ASL
+TAX
+LDA StatusText,X
+STA $B588
+LDX #$0000
+SEP #$20
+STZ $B587
+REP #$20
+JML $C28FCE
+
+check_diamond_types:
+LDA $B587
+AND #$00FF
+PHA
+TAX
+LDA DiamondChecks,X
+AND #$00FF
+TAY
+PLA
+ASL
+TAX
+LDA DiamondText,X
+STA $B588
+LDX #$0000
+SEP #$20
+STZ $B587
+REP #$20
+JML $C28FCE
+
+check_status_text:
+LDA $B588
+STZ $B588
+STA $0E
+JML $C28FDE
+
+dirty_fang_asm:
+LDA #$0001
+STA $B587
+STA $B588
+JML $C28F97
+
+paralyz_byte_asm:
+LDA #$0001
+STA $B587
+STA $B588
+JML $C2916E
+
+fire_zeta:
+REP #$31
+LDA #$0014
+JML $C295B0
+
+fire_epsilon:
+REP #$31
+LDA #$0028
+JML $C295B0
+
+freeze_zeta:
+REP #$31
+LDA #$0010
+JML $C2964C
+
+freeze_epsilon:
+REP #$31
+LDA #$0020
+JML $C2964C
+
+freeze_delta:
+REP #$31
+LDA #$003C
+JML $C2964C
+
+freeze_lambda:
+REP #$31
+LDA #$0064
+JML $C2964C
+
+special_zeta:
+REP #$31
+LDA #$000F
+JML $C2955B
+
+special_epsilon:
+REP #$31
+LDA #$001E
+JML $C2955B
+
+paralyz_delta:
+LDA #$0003
+STA $B587
+STA $B588
+JML $C29FFE
+
+para_stun:
+LDA $B587
+AND #$00FF
+BEQ .paralyze
+LDY #$0004
+LDX #$0002
+BRA .stun
+.paralyze:
+LDY #$0003
+LDX #$0000
+.stun:
+JML $C2A024
+
+para_text:
+LDA $B587
+AND #$00FF
+BEQ .paralyze
+LDA #$6BEF
+BRA .stun
+.paralyze:
+LDA #$6AE0
+.stun:
+STA $0E
+STZ $B587
+STZ $B588
+JML $C2A034
+
+thunder_zeta:
+REP #$31
+LDX #$0001
+LDA #$0010
+JML $C29879
+
+thunder_epsilon:
+REP #$31
+LDX #$0002
+LDA #$0010
+JML $C29879
+
+thunder_delta:
+REP #$31
+LDX #$0003
+LDA #$0010
+JML $C29879
+
+thunder_lambda:
+REP #$31
+LDX #$0004
+LDA #$0010
+JML $C29879
+
+starstorm_zeta:
+REP #$31
+LDA #$0016
+JML $C29AAB
+
+starstorm_epsilon:
+REP #$31
+LDA #$002D
+JML $C29AAB
+
+starstorm_delta:
+REP #$31
+LDA #$005A
+JML $C29AAB
+
+starstorm_lambda:
+REP #$31
+LDA #$00B4
+JML $C29AAB
+
+flaming_fireball_zeta:
+REP #$31
+PHD
+TDC
+ADC #$FFF0
+TCD
+LDA #$0014
+JML $C29016
+
+flaming_fireball_epsilon:
+REP #$31
+PHD
+TDC
+ADC #$FFF0
+TCD
+LDA #$002D
+JML $C29016
+
+blast_alpha:
+REP #$31
+LDA #$005A
+JSR blast_common
+RTL
+
+blast_beta:
+REP #$31
+LDA #$00B4
+JSR blast_common
+RTL
+
+blast_gamma:
+REP #$31
+LDA #$010E
+JSR blast_common
+RTL
+
+blast_omega:
+REP #$31
+LDA #$0168
+JSR blast_common
+RTL
+
+missile_alpha:
+REP #$31
+LDA #$0001
+JSR missile_common
+RTL
+
+missile_beta:
+REP #$31
+LDA #$0003
+JSR missile_common
+RTL
+
+missile_gamma:
+REP #$31
+LDA #$0005
+JSR missile_common
+RTL
+
+missile_omega:
+REP #$31
+LDA #$0014
+JSR missile_common
+RTL
+
+
+
+blast_common:
+REP #$31
+PHD
+PHA
+TDC
+ADC #$FFEA
+TCD
+PLA
+TAX
+STX $1A
+LDY #$941C
+JSL goto_bank_c2
+CMP #$0000
+BNE .Return
+LDY #$A657
+LDA $1A
+JSL goto_bank_c2
+
+.Return:
+STZ $AA96
+PLD
+RTS
+
+goto_bank_c2:
+STA $00BC
+STY $00BE
+PEA $00B7
+SEP #$20
+LDA #$C2
+PHA
+REP #$20
+PHY
+LDA $00BC
+LDY $00BE
+RTL
+
+goto_bank_c1:
+STA $00BC
+STY $00BE
+PEA $0034
+SEP #$20
+LDA #$C1
+PHA
+REP #$20
+PHY
+LDA $00BC
+LDY $00BE
+RTL
+
+missile_common:
+REP #$31
+PHD
+PHA
+TDC
+ADC #$FFEA
+TCD
+PLA
+TAX
+STX $1A
+LDY #$941C
+JSL goto_bank_c2
+CMP #$0000
+BNE .Return
+LDY #$A579
+LDA $1A
+JSL goto_bank_c2
+.Return:
+STZ $AA96
+PLD
+RTS
+
+;Y has the jump address
+
+
+
+psi_letters:
+dw $008B ;alpha
+dw $008C ;beta
+dw $008D ;gamma
+dw $008E ;sigma
+dw $008F ;omega
+
+dw $00B2 ;Zeta
+dw $00B3 ;Epsilon
+dw $00B4 ;Delta
+dw $00B5 ;Lambda
+
+blast_zeta:
+REP #$31
+LDA #$0016
+JSR blast_common
+RTL
+
+blast_epsilon:
+REP #$31
+LDA #$002D
+JSR blast_common
+RTL
+
+missile_zeta:
+REP #$31
+LDA #$0001
+STA $B5EB
+JSR missile_common
+STZ $B5EB
+RTL
+
+missile_epsilon:
+REP #$31
+LDA #$0003
+STA $B5EB
+JSR missile_common
+STZ $B5EB
+RTL
+
+early_missile_damage:
+PHA
+LDA $B5EB
+BEQ late_missile_damage
+LDY #$0019
+late_missile_damage:
+PLA
+JML $C08FF7
+
+code_test_load_enemyvram:
+REP #$31
+LDA $AAB4
+CMP #$0004
+BCS .skip_vram_load ; 4 is the max enemies the game can handle. If we already loaded 4, ignore
+LDA $9D11
+AND #$00FF
+SEP #$20
+CMP $0782
+BEQ .skip_vram_load
+CMP $0783
+BEQ .skip_vram_load
+CMP $0784
+BEQ .skip_vram_load
+CMP $0785
+BEQ .skip_vram_load ;If the enemy is already loaded, don't load it into a new slot
+REP #$20
+JSR refresh_all_enemy_sprites ;Enemy sprites get cleared by things like PSI; they will corrupt if not refreshed
+LDA #$0090
+LDY #$005E
+INC $0780
+JSL goto_vramload
+.skip_vram_load:
+REP #$31
+JSL $C2C145 ;Do the enemy call
+STZ $0780
+STZ $B5ED
+RTL
+
+goto_vramload:
+REP #$31
+PHD
+TDC
+ADC #$FFE2
+TCD
+JML $C2EEF5
+
+refresh_all_enemy_sprites:
+LDA $AAB2
+STA $B5F5
+LDA $AAB4
+STA $B5F3
+STZ $AAB4
+STZ $AAB2
+LDA #$0000
+PHA
+.LoadNext:
+TAX
+LDA $0782,X
+AND #$00FF
+JSR get_enemy_sprite
+LDY #$EAE9
+JSL goto_bank_c2
+PLA
+INC
+CMP $B5F3
+BEQ .Done
+PHA
+BRA .LoadNext
+
+.Done:
+LDA $B5F5
+STA $AAB2
+LDA $B5F3
+STA $AAB4
+RTS
+
+get_enemy_sprite:
+TAX
+LDA #$0000
+.CheckNext:
+CPX #$0000
+BEQ .done
+DEX
+CLC
+ADC #$005E
+BRA .CheckNext
+.done:
+TAX
+LDA $D595A5,X
+RTS
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ORG $C28FC8
+JML check_status_types
+
+ORG $C28FD9
+JML check_status_text
+
+ORG $C291B6
+JML check_diamond_types
+
+ORG $C2A01E
+JML para_stun
+
+ORG $C2A02F
+JML para_text
+
+ORG $D5F9B0
+StatusChecks:
+db $05, $07
+
+DiamondChecks:
+db $02, $03
+
+StatusText:
+dw $6B18, $6B2F
+
+DiamondText:
+dw $6AC7, $6AE0
+
+InvPointers:
+dw $0000, $005F, $005F, $00BE, $011D
+
+ProgBats:
+db $13, $14, $15, $D4, $16, $17, $D6, $1B, $18, $19, $1A
+
+ProgPans:
+db $1C, $1D, $1E, $1F, $F8, $20, $22, $21
+
+ProgGuns:
+db $24, $25, $26, $27, $28, $29, $2A, $D7, $2B, $2C, $2D, $2E, $2F, $30
+;REPLACE BROKEN ONES IF NOT PREFIXED
+
+ProgBracelets:
+db $40, $41, $42, $43, $44, $45, $46, $47, $48
+
+ProgOther:
+db $4A, $4C, $4B, $4D, $51, $52, $DD, $F9, $DE, $53, $54, $55, $56
+
+ProgCaps:
+db $0A, $07, $0D, $08, $0C
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Repointed PSI table
+macro PSIAddress06(address)
+   LDA #$0000
+   STA $06
+   lda #$00F5
+   sta $08
+endmacro
+
+macro PSIAddress0A(address)
+   LDA #$0000
+   STA $0A
+   lda #$00F5
+   sta $0C
+endmacro
+
+ORG $C1C4AA
+   LDA #$013B
+   STA $06
+   lda #$00F5
+   sta $08;Change for PSI shuffle- this is Poo's toplevel offensive psi
+
+ORG $C1C548
+   LDA #$014A
+   STA $06
+   lda #$00F5
+   sta $08;Change for PSI shuffle- this is Poo's toplevel offensive psi
+
+ORG $C1B694
+%PSIAddress06(NewPSI)
+
+ORG $C1B7CF
+%PSIAddress06(NewPSI)
+
+ORG $C1B8F9
+%PSIAddress0A(NewPSI)
+
+ORG $C1BB34
+%PSIAddress0A(NewPSI)
+
+ORG $C1B8BB
+LDA AllocPsiTable,X
+
+ORG $C1B9CC
+LDA AllocPsiTable,X
+
+ORG $C1C243
+%PSIAddress06(NewPSI)
+
+ORG $C1C2AD
+%PSIAddress06(NewPSI)
+
+ORG $C1C6E4
+%PSIAddress06(NewPSI)
+
+ORG $C1C8D6
+%PSIAddress06(NewPSI)
+
+ORG $C1C9D6
+LDA AllocPsiTable,X
+
+ORG $C1CADF
+LDA AllocPsiTable,X
+
+ORG $C1CA12
+%PSIAddress06(NewPSI)
+
+ORG $C1CCB6
+LDA AllocPsiTable,X
+
+ORG $C1CD49
+LDA AllocPsiTable,X
+
+ORG $C1CD8F
+%PSIAddress06(NewPSI)
+
+ORG $C1CE3B
+LDA AllocPsiTable,X
+
+ORG $C1D7D6
+%PSIAddress06(NewPSI)
+
+ORG $C1D839
+%PSIAddress06(NewPSI)
+
+ORG $C1D89B
+%PSIAddress06(NewPSI)
+
+ORG $C45EFE
+LDA AllocPsiTable,X
+
+ORG $C45F1B
+LDA AllocPsiTable,X
+
+ORG $C45F38
+LDA AllocPsiTable,X
+
+ORG $F5031B
+db $02, $06, $00;fire z
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $02, $07, $00;Fire ep
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;;
+db $03, $06, $00;freeze z
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $03, $07, $00;freeze e
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $03, $08, $00;freeze d
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $03, $09, $00;freeze l
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $01, $06, $00;special z
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $01, $07, $00;special e
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $0f, $09, $00;paralyze l
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $04, $06, $00;thunder z
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $04, $07, $00;thunder e
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $04, $08, $00;thunder d
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $04, $09, $00;thunder l
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $06, $06, $00;starstorm z
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $06, $07, $00;starstorm e
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+
+db $06, $08, $01;starstorm d
+db $02, $6F, $01, $00, $00, $00, $09, $00, $6C, $D1, $EE, $00
+
+db $06, $09, $01;starstorm l
+db $02, $70, $01, $00, $00, $00, $0B, $00, $A5, $D1, $EE, $00
+
+db $13, $01, $01;blast a
+db $02, $A4, $01, $00, $00, $00, $09, $00, $1C, $D2, $EE, $FF
+
+db $13, $02, $01;blast b
+db $02, $A5, $01, $00, $00, $00, $0B, $00, $6C, $D2, $EE, $FF
+
+db $13, $03, $01;blast g
+db $02, $A6, $01, $00, $00, $00, $0D, $00, $BD, $D2, $EE, $FF
+
+db $13, $05, $01;blast o
+db $02, $A7, $01, $00, $00, $00, $0F, $00, $0E, $D3, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $14, $01, $01;missile a
+db $02, $A8, $01, $00, $00, $00, $09, $00, $5F, $D3, $EE, $FF
+
+db $14, $02, $01;missile b
+db $02, $A9, $01, $00, $00, $00, $0B, $00, $86, $D4, $EE, $FF
+
+db $14, $03, $01;missile g
+db $02, $AA, $01, $00, $00, $00, $0D, $00, $93, $D4, $EE, $FF
+
+db $14, $05, $01;missile o
+db $02, $AB, $01, $00, $00, $00, $0F, $00, $A0, $D4, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $15, $01, $04;defense up a
+db $02, $DD, $01, $00, $00, $00, $09, $00, $E6, $E3, $EE, $FF
+
+db $15, $05, $04;defense up o
+db $02, $DE, $01, $00, $00, $00, $09, $00, $33, $E4, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $16, $01, $04;drain a
+db $02, $DF, $01, $00, $00, $00, $09, $00, $7E, $E4, $EE, $FF
+
+db $16, $05, $04;drain o
+db $02, $E0, $01, $00, $00, $00, $09, $00, $C6, $E4, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;
+db $17, $01, $04;disable a
+db $02, $E1, $01, $00, $00, $00, $09, $00, $19, $E5, $EE, $FF
+
+db $17, $05, $04;disable o
+db $02, $E2, $01, $00, $00, $00, $09, $00, $52, $E5, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;
+db $18, $01, $04;stop a
+db $02, $E3, $01, $00, $00, $00, $09, $00, $8D, $E5, $EE, $FF
+
+db $18, $05, $04;stop o
+db $02, $E4, $01, $00, $00, $00, $09, $00, $A4, $E5, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;
+db $19, $01, $04;neutralize a
+db $02, $E5, $01, $00, $00, $00, $09, $00, $BD, $E5, $EE, $FF
+
+db $19, $05, $04;neutralize o
+db $02, $E6, $01, $00, $00, $00, $09, $00, $FA, $E5, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $13, $06, $01;blast z
+db $02, $A4, $01, $00, $00, $00, $09, $00, $1C, $D2, $EE, $FF
+
+db $13, $07, $01;blast e
+db $02, $A5, $01, $00, $00, $00, $0B, $00, $6C, $D2, $EE, $FF
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+db $14, $06, $01;missile z
+db $02, $A8, $01, $00, $00, $00, $09, $00, $5F, $D3, $EE, $FF
+
+db $14, $07, $01;missile e
+db $02, $A8, $01, $00, $00, $00, $09, $00, $5F, $D3, $EE, $FF
+
+
+;;;;;;;;;;;;;;;
+;PSI ANIMATIONS
+ORG $F50000
+;Table of all PSI attacks
+AllocPsiTable:
+
+ORG $EF8580
+db $0A, $00, $00, $FB
+
+ORG $FB0000
+db $1F, $C0, $5B; number of anims
+
+ORG $FB00CB
+dd $00EF88E9; Teleport 1. change to a $02
+dd $00EF88E9;Teleport 2. change to a $02
+
+dd $00EF874A ;Fire zeta
+dd $00EF874A ; Fire epsilon
+
+dd $00EF87AC ;Freeze zeta
+dd $00EF87AC ;Freeze epsilon
+dd $00EF87AC ;Freeze Delta
+dd $00EF87AC ;Freeze Lambda
+
+dd $00EF864C ;Special zeta
+dd $00EF864C ;Special epsilon
+
+dd $00EF899C ;Paralysis delta
+
+dd $00EF8813 ;thunder zeta
+dd $00EF8813 ;thunder epsilon
+dd $00EF8813 ;thunder Delta
+dd $00EF8813 ;thunder Lambda
+
+dd $00EF8882;Starstorm zeta
+dd $00EF8882;starstorm epsilon
+dd $00EF8882 ;starstorm lambda
+dd $00EF8882 ;starstorm delta
+
+dd blast_alpha_anim;Blast alpha
+dd blast_beta_anim;Blast beta
+dd blast_gamma_anim;Blast gamma
+dd blast_omega_anim;Blast gamma
+
+dd missile_alpha_anim
+dd missile_beta_anim
+dd missile_gamma_anim
+dd missile_omega_anim
+
+dd $00EF88E9;Defense up alpha
+dd $00EF88E9;Def up omega
+
+dd drain_alpha_anim;Drain alpha
+dd drain_omega_anim;Drain omega
+
+dd disable_anim;Disable alpha
+dd disable_anim;Disable omega
+
+dd $00EF88E9;Stop alpha
+dd $00EF88E9;Stop omega
+
+dd neutralize_anim;Neutralize alpha
+dd $00EF88E9;Neutralize omega
+
+dd blast_alpha_anim;Blast alpha
+dd blast_alpha_anim;Blast beta
+
+dd missile_alpha_anim;Missile Zeta
+dd missile_alpha_anim;Missile Epsilon
+
+db $02
+
+PSINameTable:
+
+;Extended PSI names
+ORG $FB06A9
+db $80, $83, $79, $50, $87, $91, $a6, $95, $50;PSI Wave
+
+ORG $FB06C2
+db $80, $83, $79, $50, $72, $9C, $91, $A3, $A4, $50;PSI Blast
+
+ORG $FB06DB
+db $80, $83, $79, $50, $7D, $99, $A3, $A3, $99, $9C, $95, $50;PSI Missile
+
+ORG $FB06F4
+db $74, $95, $96, $95, $9E, $A3, $95, $50, $A5, $A0, $50;Defense up
+
+ORG $FB070D
+db $74, $A2, $91, $99, $9E, $50;Drain
+
+ORG $FB0726
+db $74, $99, $A3, $91, $92, $9C, $95, $50;Disable
+
+ORG $FB073F
+db $83, $A4, $9F, $A0, $50;Stop
+
+ORG $FB0758
+db $7E, $95, $A5, $A4, $A2, $91, $9C, $99, $AA, $95, $50;Neutralize
+
+ORG $FB0771
+
+;These are the *script commands* that play the new PSI animations.
+blast_alpha_anim:
+db $1f, $02, $34, $1c, $13, $00, $37, $10, $17, $1f, $02, $5b, $10, $10, $1f, $02
+db $33, $10, $14, $1c, $13, $25, $00, $10, $01, $10, $01, $02
+
+blast_beta_anim:
+db $1f, $02, $34, $1c, $13, $00, $38, $10, $17, $1f, $02, $5b, $10, $10, $1f, $02
+db $33, $10, $14, $1c, $13, $25, $00, $10, $0f, $10, $10, $02
+
+blast_gamma_anim:
+db $1f, $02, $34, $1c, $13, $00, $39, $10, $17, $1f, $02, $5b, $10, $10, $1f, $02
+db $33, $10, $14, $1c, $13, $25, $00, $10, $0f, $10, $10, $02
+
+blast_omega_anim:
+db $1f, $02, $34, $1c, $13, $00, $3A, $10, $17, $1f, $02, $5b, $10, $10, $1f, $02
+db $33, $10, $14, $1c, $13, $25, $00, $10, $0f, $10, $10, $02
+
+missile_alpha_anim:
+db $1f, $02, $46, $1c, $13, $00, $3B, $10, $04, $1f, $02, $01, $1c, $13, $2b, $00
+db $10, $0f, $02
+
+missile_beta_anim:
+db $1f, $02, $46, $10, $05, $1f, $02, $46, $10, $05, $1f, $02, $46, $1c, $13, $00
+db $3c, $10, $04, $1f, $02, $01, $1c, $13, $2b, $00, $10, $0f, $02
+
+missile_gamma_anim:
+db $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f
+db $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1c, $13, $00, $3d, $10, $04, $1f
+db $02, $01, $1c, $13, $2b, $00, $02
+
+missile_omega_anim:
+db $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f
+db $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02
+db $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46
+db $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10
+db $02, $1f, $02, $46, $10, $02, $1f, $02, $46, $10, $02, $1c, $13, $00, $3e, $10
+db $04, $1f, $02, $01, $1c, $13, $2b, $00, $02
+
+drain_alpha_anim:
+db $1f, $02, $3b, $1c, $13, $00, $04, $10, $3c, $03, $02
+
+drain_omega_anim:
+db $1f, $02, $3b, $1c, $13, $00, $1e, $10, $3c, $03, $02
+
+disable_anim:
+db $1f, $02, $36, $10, $1e, $1c, $13, $00, $01, $10, $3c, $03, $02
+
+neutralize_anim:
+db $1f, $02, $63, $1c, $13, $00, $1b, $10, $3c, $03, $02
+
+hypnosis_alpha_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $5c, $89, $ef
+
+hypnosis_omega_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $6c, $89, $ef
+
+paralysis_alpha_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $9c, $89, $ef
+
+paralysis_omega_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $ac, $89, $ef
+
+defdown_alpha_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $3c, $89, $ef
+
+defdown_omega_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $4c, $89, $ef
+
+brainshock_alpha_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $bc, $89, $ef
+
+brainshock_omega_item_anim:
+db $01, $70, $1c, $0d, $19, $1f, $1b, $04, $16, $ac, $16, $47, $00, $50, $50, $1c
+db $05, $00, $51, $03, $0a, $ce, $89, $ef
+
+
+ORG $C1C423
+LDA #$0500
+STA $06
+LDA #$00FB
+STA $08
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;psi symbol extensions
+macro GreekLetter06(address)
+   LDA.w #psi_letters
+   STA $06
+   lda #$00FD
+   sta $08
+endmacro
+
+ORG $C1C4F8
+%GreekLetter06(address)
+
+ORG $C1C569
+%GreekLetter06(address)
+
+ORG $C1C695
+%GreekLetter06(address)
+
+ORG $C1C78D
+%GreekLetter06(address)
+
+ORG $C1C7FE
+;%GreekLetter06(address)
+
+ORG $c1ca53
+%GreekLetter06(address)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;font stuff
+ORG $C3F054
+dd FontDataTable
+
+ORG $C3F058
+dd FontGFXTable
+
+ORG $C3F060
+dd SaturnFontTable
+
+ORG $C3F064
+dd SaturnFontGFX
+
+ORG $FA0000
+FontDataTable:
+
+ORG $FA0060
+FontExtensionData:
+;Font Widths
+db $05; _
+db $04 ;<
+db $06 ;Ζ
+db $03 ;ε
+db $04 ;δ
+db $05 ;λ
+db $06 ;&
+db $06 ;#
+db $05 ;arrows
+db $06 ;n
+db $05 ;ä
+db $05 ;é
+
+ORG $FA0100
+SaturnFontTable:
+
+ORG $FA0160
+SaturnExtensionData:
+db $0A; _
+db $08;<
+db $0B
+db $0B
+db $0B
+db $0B
+db $0D
+db $0B
+db $0B
+db $09
+db $08
+db $0B
+
+ORG $FC0000
+FontGFXTable:
+
+ORG $FC0C00
+incbin main_font_extended.bin
+
+
+ORG $FC1000
+SaturnFontGFX:
+
+ORG $FC1C00
+incbin saturn_font_extended.bin
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;PSI Animations
+ORG $C3F98D
+JMP $FE00
+
+ORG $C3FE00
+  CMP #$FFFF
+  BEQ $18
+  CMP #$0023
+  BCC $0B
+  CMP #$0036
+  BCS $03
+  JMP $F99B
+  SBC #$0014
+  STA $02
+  LDA $02
+  JSL $C2E116
+  JMP $FAC7
+
+ORG $C2E34F
+  LDA #$0000
+  STA $06
+  LDA #$00F6
+  STA $08
+
+ORG $C2E461
+  LDA #$0400
+  STA $06
+  LDA #$00F6
+  STA $08
+
+ORG $C2E2F4
+  LDA #$0600
+  STA $06
+  LDA #$00F6
+  STA $08
+
+ORG $C2E154
+dl new_psi_anims
+
+ORG $C2E1BB
+dl new_psi_anims
+
+ORG $C2E50A
+dl new_psi_anims
+
+ORG $F60000
+new_psi_anims:
+
+ORG $F60198
+;Headers for new PSI. Blast alpha.
+db $25, $AC, $04, $03, $01, $03, $0e, $00, $19, $32, $9c, $0a
+;Blast beta
+db $25, $AC, $04, $03, $01, $03, $0e, $00, $19, $32, $9c, $0a
+;Blast Gamma
+db $25, $AC, $04, $03, $01, $03, $10, $00, $19, $32, $9c, $0a
+;Blast Omega
+db $25, $AC, $04, $03, $01, $03, $10, $00, $19, $32, $9c, $0a
+
+;Missile
+db $27, $DB, $02, $03, $01, $03, $06, $00, $05, $19, $d4, $4b
+db $27, $DB, $02, $03, $01, $03, $0B, $00, $05, $19, $d4, $4b
+db $27, $DB, $02, $03, $01, $03, $0A, $00, $05, $19, $d4, $4b
+db $27, $DB, $02, $03, $01, $03, $0E, $00, $05, $19, $d4, $4b
+
+ORG $F60400
+animation_pointer_table:
+
+ORG $F60488
+dd $00F70000;Blast A
+dd $00F701F7; Blast b
+dd $00F70413; Blast g
+dd $00F70679; Blast o
+dd $00F70953; Missile a
+dd $00F70A4F; Missile B
+dd $00F70B85; Missile g
+dd $00F70CCE; Missile o
+
+
+ORG $F60600
+animation_palette_table:
+
+ORG $F60710
+db $00, $00, $9c, $0a, $75, $19, $bf, $63;Blast palette
+db $00, $00, $9c, $0a, $75, $19, $bf, $63;Blast palette
+db $00, $00, $9c, $0a, $75, $19, $bf, $63;Blast Gamma
+db $00, $00, $9c, $0a, $75, $19, $bf, $63;Blast Omega
+
+db $00, $00, $d4, $4b, $e5, $09, $ff, $7f;Missile alpha
+db $00, $00, $d4, $4b, $e5, $09, $ff, $7f
+db $00, $00, $d4, $4b, $e5, $09, $ff, $7f
+db $00, $00, $d4, $4b, $e5, $09, $ff, $7f; Missile omega
+
+ORG $F70000
+incbin psi_animations.bin ;this is specifically new animations i drew
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;expanded SRAM
+sramchunk0_pointer = $97F5
+sram_chunk0_size = $0493
+
+sramchunk1_pointer = $B570
+sramchunk1_size = $0010; ap related stuff
+
+sram_chunk2_pointer = $B590
+sramchunk2_size = $0080 ;Expanded storage space
+
+sram_chunk3_pointer = $B620
+sramchunk3_size = $01C0; Expanded flags
+
+sramchunk4_pointer = $31D0
+sramchunk4_size = $0100
+
+sramchunk5_pointer = $000D4
+sramchunk5_size = $00AC
+
+!save_size = #$AA0
+!save_bytes = #$A80
+
+check_corruption = $7E9F79
+memcopy = $C08EED
+mult16 = $C09032
+erase_save = $EF05A9
+copy_save = $EF06A2
+validate_checksum = $EF07C0
+save_game = $EF088F
+save_checksum_1 = $EF0734
+save_checksum_2 = $EF077B
+
+save_chunk_sizes = $EF0A52
+save_chunk_pointers = $EF0A5C
+
+;delete save
+ORG $EF05B3
+LDY !save_size
+
+ORG $EF05DD
+LDX !save_size
+
+ORG $EF063D
+LDY !save_size
+
+ORG $EF069B
+CPX #$0003
+
+;copy save
+ORG $EF06B8
+LDY !save_size
+
+ORG $EF06E2
+LDY !save_size
+
+ORG $EF072B
+LDA !save_size
+;;;;;;;;;
+ORG $EF073E
+LDY !save_size
+
+ORG $EF0773
+CMP !save_bytes
+;;;;;;;;;;;;;;;;;;;
+ORG $EF0785
+LDY !save_size
+
+ORG $EF079F
+CalcChecksum:
+LDY #$0000
+STY $02
+  .Loop:
+  LDA [$06],y
+  EOR $02
+  STA $02
+  INY
+  INY
+  CPY !save_bytes
+  BCC .Loop
+PLD
+RTS
+;;;;;;;;;;;;;;;
+ORG $EF07DB
+LDY !save_size
+
+ORG $EF082F
+CheckCorruptedSave:
+STA $10
+JSR validate_checksum
+CMP #$0000
+BEQ .Return
+.SaveCorrupted:
+LDA $10
+JSR erase_save
+LDX $10
+SEP #$20
+LDA $EF05A6,X
+ORA.w check_corruption
+STA.w check_corruption
+REP #$20
+.Return:
+PLD
+RTS
+
+ORG $EF0899
+SaveGame:
+STA $20
+.RetrySave:
+LDX $00A7
+LDY $00A9
+STX $99C9
+STY $99CB
+LDY !save_size
+JSL mult16
+STA $16
+CLC
+ADC #$6020
+STA $0E
+LDA #$0030
+STA $10
+LDA #$007E
+STA $14
+LDX #$0000
+.ChunkCheck:
+LDA.l save_chunk_pointer_table,X
+BEQ .EndofChunk
+STA $12
+LDA.l save_chunk_size_table,x
+JSL memcopy
+LDA.l save_chunk_size_table,x
+ADC $0E
+STA $0E
+INX
+INX
+BRA .ChunkCheck
+.EndofChunk:
+LDA $20
+JSR save_checksum_1
+STA $1A
+LDA $20
+JSR save_checksum_1
+CMP $1A
+BEQ .Valid
+JMP .RetrySave
+.Valid:
+LDX $16
+STA $30601C,X
+
+LDA $20
+JSR save_checksum_2
+STA $1A
+LDA $20
+JSR save_checksum_2
+CMP $1A
+BEQ .Valid2
+JMP .RetrySave
+.Valid2:
+LDX $16
+STA $30601E,X
+PLD
+RTS
+
+ORG $EF0A4D
+JSR save_game
+RTL
+NOP
+
+;;;;;;;;;;;;;;;;;;;;;
+ORG $EF0A72
+LoadGame:
+LDY !save_size
+JSL mult16
+CLC
+ADC #$6020
+STA $12
+LDA #$0030
+STA $14
+LDA #$007E
+STA $10
+LDX #$0000
+.ChunkCheck:
+LDA.l save_chunk_pointer_table,X
+BEQ .ChunkEnd
+STA $0E
+LDA.l save_chunk_size_table,X
+JSL memcopy
+LDA.l save_chunk_size_table,X
+ADC $12
+STA $12
+INX
+INX
+BRA .ChunkCheck
+.ChunkEnd:
+LDA $99C9
+STA $00A7
+LDA $99CB
+STA $00A9
+PLD
+RTL
+
+ORG $EF0BA6
+LDA !save_bytes
+
+ORG $EF0BB8
+CMP !save_bytes
+
+ORG $EF0BFA
+JSR erase_save
+RTL
+
+ORG $EF0C15
+JSR copy_save
+RTL
+;;;;;;;;;;;;;;;
+;expand event flags
+
+new_flag_table = $7EB620
+new_flag_pointer_0x80 = $7EB5A0
+flag_size = $01C0
+total_flag_bytes = $0240 
+
+
+ORG $C21628
+GetEventFlag:
+JML RepelEnemies
+ExitRepelCheck:
+AND #$0007
+TAX
+LDA $C4562F,X
+PHA
+TYA
+LSR
+LSR
+LSR
+TAX
+PLA
+CPX.w #total_flag_bytes
+BMI .outofrange
+JMP .GetFlagReturnZero
+.outofrange:
+CPX #$0080
+BPL .Inrange
+AND $9C08,X
+BRA .loadflag
+.Inrange:
+AND.w new_flag_pointer_0x80,x
+.loadflag:
+AND #$00FF
+BEQ .GetFlagReturnZero
+.ForceFlagOn:
+LDA #$0001
+RTL
+.GetFlagReturnZero:
+LDA #$0000
+RTL
+NOP
+
+SetFlag:
+JML SetMelodyCount
+SetFlagProceed:
+LSR
+LSR
+CMP.w #total_flag_bytes
+BMI .outofrange
+PLA
+JMP $1659
+.outofrange:
+CMP #$0080
+CLC
+BPL .addflags
+ADC #$9C08
+BRA .label
+.addflags:
+ADC.w #new_flag_pointer_0x80
+.label
+TAY
+PLA
+PHX
+AND #$0007
+TAX
+LDA $C4562F,x
+AND #$00FF
+PLX
+BEQ .WriteFlag
+ORA $0000,Y
+BRA .Store
+.WriteFlag
+EOR #$FFFF
+AND $0000,Y
+.Store:
+STA $0000,y
+AND #$00FF
+RTL
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+NOP
+RTL
+
+ORG $F20000
+;Escargo express intro text
+ExpressText:
+db $70, $84, $98, $91, $9e, $9b, $50, $a9, $9f, $a5, $50, $96, $9f, $a2, $50, $93
+db $91, $9c, $9c, $99, $9e, $97, $50, $75, $a3, $93, $91, $a2, $97, $9f, $50, $75
+db $a8, $a0, $a2, $95, $a3, $a3, $51, $03, $00, $70, $85, $9e, $96, $9f, $a2, $a4
+db $a5, $9e, $91, $a4, $95, $9c, $a9, $5c, $10, $04, $50, $9f, $a5, $a2, $50, $99
+db $a4, $95, $9d, $50, $a3, $a4, $9f, $a2, $91, $97, $95, $50, $a3, $95, $a2, $a6
+db $99, $93, $95, $a3, $50, $98, $91, $a6, $95, $50, $92, $95, $95, $9e, $50, $a3
+db $a5, $a3, $a0, $95, $9e, $94, $95, $94, $5e, $03, $00, $70, $79, $96, $50, $a9
+db $9f, $a5, $50, $9e, $95, $95, $94, $50, $a4, $9f, $50, $a3, $a4, $9f, $a2, $95
+db $50, $91, $9e, $50, $99, $a4, $95, $9d, $5c, $50, $a0, $9c, $95, $91, $a3, $95
+db $50, $98, $91, $9e, $97, $50, $a5, $a0, $50, $91, $9e, $94, $50, $a0, $a2, $95
+db $a3, $a3, $50, $a4, $98, $95, $50, $82, $50, $92, $a5, $a4, $a4, $9f, $9e, $5e
+db $03, $00
+
+escg_mainmen:
+db $70, $79, $96, $50, $a9, $9f, $a5, $50, $91, $a2, $95, $50, $93, $91, $9c, $9c
+db $99, $9e, $97, $50, $91, $92, $9f, $a5, $a4, $50, $9f, $a5, $a2, $50, $9f, $96
+db $96, $5d, $a7, $9f, $a2, $9c, $94, $50, $99, $a4, $95, $9d, $50, $94, $95, $9c
+db $99, $a6, $95, $a2, $a9, $50, $a3, $95, $a2, $a6, $99, $93, $95, $5c, $03, $00
+db $70, $a3, $a0, $95, $93, $99, $96, $a9, $50, $a9, $9f, $a5, $a2, $50, $a2, $95
+db $a1, $a5, $95, $a3, $a4, $50, $9e, $9f, $a7, $5e, $03, $00
+db $0A
+dl Gift_menu_Gift_menu_init
+db $19, $02
+db $77, $99, $96, $a4, $99, $9e, $97, $02
+db $19, $02
+db $83, $95, $a2, $a6, $95, $a2, $50, $a3, $a4, $9f, $a2, $91, $97, $95, $02
+db $1C, $07, $02, $11
+db $09, $02
+dd Gift_menu
+dd Server_Storage
+db $12
+db $0A
+dl $C75929
+Gift_menu:
+  db $12
+  db $08
+  dd escg_inquire
+  .Gift_menu_init:
+  db $01
+  db $19, $02
+  db $83, $95, $9E, $94, $50, $97, $99, $96, $A4, $02
+  db $19, $02
+  db $82, $95, $93, $95, $99, $a6, $95, $50, $97, $99, $96, $a4, $02
+  db $1C, $07, $02, $11
+  db $09, $02
+  dd .SendGiftText
+  dd .GetGiftText
+  db $12
+  db $01
+  db $0A
+  dl $C75929
+  .SendGiftText:
+  db $06, $14, $04
+  dd .GiftOutboxFull
+
+  ;Todo; write a way here to check whether or not our Gift Buffer is full
+  db $0E, $01
+  db $0D, $01
+  db $1B, $05
+  db $12
+  db $70, $87, $98, $9f, $50, $a7, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5, $50, $9c
+  db $99, $9b, $95, $50, $a4, $9f, $50, $a3, $95, $9e, $94, $50, $91, $50, $97, $99
+  db $96, $a4, $50, $a4, $9f, $6f
+  db $1C, $18, $00
+  db $18, $03, $01, $01
+  db $1B, $06
+  db $1b, $02
+  dd Gift_menu
+  ;;;;;;;;;;;;;
+  .open_gift_selector:
+  db $70, $7f, $9b, $91, $a9, $5e, $10, $10, $50, $87, $98, $91, $a4, $50, $a7, $9f
+  db $a5, $9c, $94, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $a4, $9f, $50
+  db $a3, $95, $9e, $94, $6f, $03
+  .gift_item_picker:
+  db $08, $56, $e4, $c5, $ff
+  db $1B, $02
+  dd .SendGiftText ; The player pressed b
+  db $1B, $05
+  db $19, $19, $00, $00 ;Return the item name we selected
+  db $1B, $00 ;Store all current memory values
+  db $1C, $19, $01
+  db $70
+  db $10, $0A
+  db $1B, $02
+  dd .banned_item
+  .gift_okay:
+  db $1B, $01 ; Get the memory we used earlier
+
+  db $89, $9f, $a5, $57, $94, $50, $9c, $99, $9b, $95, $50, $a4, $9f, $50, $a3, $95
+  db $9e, $94, $50, $a4, $98, $95, $50, $1c, $05, $00, $6f
+  db $01
+  db $19, $02
+  db $89, $95, $A3, $02
+  db $19, $02
+  db $7E, $9F, $02
+  db $1C, $07, $02
+  db $11
+  db $12
+  db $09, $02
+  dd .send_gift_to_gift_buffer
+  dd .declined_to_send_gift
+  db $0A
+  dl .declined_to_send_gift
+  .send_gift_to_gift_buffer:
+  db $18, $04
+  db $1C, $28, $01
+  db $1F, $00, $01, $59
+  db $1f, $15, $87, $00, $99, $02, $01 
+  db $10, $05
+  db $1F, $13, $FF, $03
+  db $10, $20
+  db $1F, $03
+  db $1C, $29, $01
+  db $18, $01, $01
+  db $1b, $06
+  db $1F, $02, $76
+  db $10, $15
+  db $1D, $0F, $00, $00
+  db $1B, $05
+  db $1C, $1A, $01
+  db $70
+  db $89, $9f, $a5, $a2, $50, $97, $99, $96, $a4, $50, $a0, $91, $93, $9b, $91, $97
+  db $95, $50, $98, $91, $a3, $50, $92, $95, $95, $9e, $50, $93, $9f, $9e, $96, $99
+  db $a2, $9d, $95, $94, $5e, $10, $10, $50, $79, $a4, $50, $a7, $99, $9c, $9c, $50
+  db $92, $95, $50, $a3, $95, $9e, $a4, $50, $a3, $98, $9f, $a2, $a4, $9c, $a9, $5e
+  db $03, $01, $70, $71, $9e, $50, $71, $a2, $93, $98, $99, $a0, $95, $9c, $91, $97
+  db $9f, $50, $a3, $95, $a2, $a6, $95, $a2, $50, $93, $9f, $9e, $9e, $95, $93, $a4
+  db $99, $9f, $9e, $50, $99, $a3, $50, $a2, $95, $a1, $a5, $99, $a2, $95, $94, $50
+  db $a4, $9f, $50, $a3, $95, $9e, $94, $50, $97, $99, $96, $a4, $a3, $5e, $03, $01
+  db $70, $79, $96, $50, $a9, $9f, $a5, $a2, $50, $97, $99, $96, $a4, $50, $99, $a3
+  db $50, $a5, $9e, $91, $92, $9c, $95, $50, $a4, $9f, $50, $92, $95, $50, $91, $93
+  db $93, $95, $a0, $a4, $95, $94, $5c, $50, $a9, $9f, $a5, $50, $a7, $99, $9c, $9c
+  db $50, $92, $95, $50, $91, $92, $9c, $95, $50, $a4, $9f, $50, $a2, $95, $a4, $a2
+  db $99, $95, $a6, $95, $50, $99, $a4, $50, $98, $95, $a2, $95, $5e, $03
+  db $01, $70
+  db $87, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $a4
+  db $9f, $50, $a3, $95, $9e, $94, $50, $91, $9e, $9f, $a4, $98, $95, $a2, $50, $97
+  db $99, $96, $a4, $6f
+  db $01
+  db $19, $02
+  db $89, $95, $A3, $02
+  db $19, $02
+  db $7E, $9F, $02
+  db $1C, $07, $02
+  db $11
+  db $12
+  db $09, $02
+  dd .SendGiftText
+  dd escg_mainmen
+  db $0A
+  dl escg_mainmen
+
+  db $02
+  .declined_to_send_gift:
+  db $70, $10, $0, $84, $98, $95, $9e, $5c, $10, $05, $50, $a7, $9f, $a5, $9c, $94
+  db $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $a4, $9f, $50, $a3, $95, $9e
+  db $94, $50, $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $95, $9c, $a3, $95
+  db $6f
+  db $01
+  db $19, $02
+  db $89, $95, $A3, $02
+  db $19, $02
+  db $7E, $9F, $02
+  db $19, $02
+  db $72, $A9, $95, $02
+  db $1C, $07, $03
+  db $11
+  db $12
+  db $09, $03
+  dd .open_gift_selector
+  dd .parse_gift_okay
+  dd $C7DE3D
+  .parse_gift_okay:
+  db $70
+  db $0A
+  dl .gift_okay
+
+  .banned_item:
+  db $79, $57, $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $06, $50, $92, $a5, $a4
+  db $50, $a4, $98, $99, $a3, $50, $99, $a4, $95, $9d, $50, $93, $91, $9e, $9e, $9f
+  db $a4, $50, $a0, $9f, $a3, $a3, $99, $92, $9c, $a9, $50, $92, $95, $50, $97, $99
+  db $a6, $95, $9e, $50, $91, $a7, $91, $a9, $5e, $03, $00, $70, $80, $9c, $95, $91
+  db $a3, $95, $50, $93, $98, $9f, $9f, $a3, $95, $50, $a3, $9f, $9d, $95, $a4, $98
+  db $99, $9e, $97, $50, $95, $9c, $a3, $95, $5e, $03
+  db $0A
+  dl .gift_item_picker
+  .GetGiftText:
+  db $1C, $21, $12
+  db $12
+  db $1C, $1C, $01  
+  db $1B, $06
+  db $1B, $02
+  dd .NoGiftsToReceive
+  db $01
+  db $1B, $00
+  db $0B, $01
+  db $1b, $03
+  dd .SingularGiftText
+  db $1B, $01
+  db $1B, $04
+  db $70
+  db $84, $98, $95, $a2, $95, $50, $91, $a2, $95, $50, $93, $a5, $a2, $a2, $95, $9e
+  db $a4, $9c, $a9, $50, $1c, $0a, $00, $00, $00, $00, $50, $97, $99, $96, $a4, $a3
+  db $50, $99, $9e, $50, $a9, $9f, $a5, $a2, $50, $99, $9e, $92, $9f, $a8, $5e, $03
+  db $01, $70, $87, $98, $91, $a4, $50, $a7, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5
+  db $50, $9c, $99, $9b, $95, $6f
+  .GiftUnionizer:
+  db $03
+  db $1C, $1B, $01
+  db $1A, $07
+  db $1B, $05
+  db $18, $03, $0D
+  db $18, $00
+  db $18, $03, $01
+  db $1B, $06
+  db $1B, $02
+  dd .return_from_get
+  db $1B, $04
+
+  db $19, $1A, $00
+  db $1B, $05
+  .GetGiftChar:
+  db $0E, $00
+  db $1B, $04
+  db $70, $87, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50
+  db $a4, $98, $95, $50, $1c, $05, $00, $6f
+  db $01
+  db $19, $02
+  db $7B, $95, $95, $A0, $02
+  db $19, $02
+  db $84, $9F, $A3, $A3, $02
+  db $19, 02
+  db $72, $91, $93, $9B, $02
+  db $1C, $07, $03
+  db $11
+  db $09, $03
+  dd .AcceptGift
+  dd .TossGift
+  dd .return_from_get
+  db $0A
+  dl .return_from_get
+  
+  db $02
+
+  .GiftOutboxFull:
+  db $12
+  db $01
+  db $70, $79, $57, $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $04, $50, $92, $a5
+  db $a4, $50, $a9, $9f, $a5, $a2, $50, $97, $99, $96, $a4, $50, $a1, $a5, $95, $a5
+  db $95, $50, $99, $a3, $50, $96, $a5, $9c, $9c, $5e, $03, $01, $70, $80, $9c, $95
+  db $91, $a3, $95, $50, $93, $9f, $9e, $9e, $95, $93, $a4, $50, $a4, $9f, $50, $91
+  db $9e, $50, $71, $a2, $93, $98, $99, $a0, $95, $9c, $91, $97, $9f, $50, $a3, $95
+  db $a2, $a6, $95, $a2, $50, $a3, $9f, $50, $a9, $9f, $a5, $a2, $50, $97, $99, $96
+  db $a4, $a3, $50, $93, $91, $9e, $50, $92, $95, $50, $a0, $a2, $9f, $93, $95, $a3
+  db $a3, $95, $94, $5e, $03
+  db $01
+  db $0A
+  dl Gift_menu
+
+  .NoGiftsToReceive:
+  db $70, $79, $57, $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $05, $50, $92, $a5
+  db $a4, $50, $a9, $9f, $a5, $50, $94, $9f, $50, $9e, $9f, $a4, $50, $93, $a5, $a2
+  db $a2, $95, $9e, $a4, $9c, $a9, $50, $98, $91, $a6, $95, $50, $91, $9e, $a9, $50
+  db $97, $99, $96, $a4, $a3, $50, $99, $9e, $50, $a9, $9f, $a5, $a2, $50, $99, $9e
+  db $92, $9f, $a8, $5e, $03
+  db $01
+  db $0A
+  dl Gift_menu
+
+  .SingularGiftText:
+  db $1B, $01
+  db $70
+  db $84, $98, $95, $a2, $95, $50, $99, $a3, $50, $93, $a5, $a2, $a2, $95, $9e, $a4
+  db $9c, $a9, $50, $9f, $9e, $95, $50, $97, $99, $96, $a4, $50, $99, $9e, $50, $a9
+  db $9f, $a5, $a2, $50, $99, $9e, $92, $9f, $a8, $5e
+  db $0A
+  dl .GiftUnionizer
+
+  .TossGift:
+  db $12
+  db $1F, $02, $76
+  db $10, $10
+  db $70, $79, $a4, $57, $9c, $9c, $50, $92, $95, $50, $97, $9f, $9f, $94, $50, $91
+  db $a3, $50, $97, $9f, $9e, $95, $5e
+  db $1B, $06
+  db $19, $1C, $FF, $00
+  db $03, $01
+  db $0A
+  dl .return_from_get
+
+  .AcceptGift:
+  db $12
+  db $1D, $03, $FF
+  db $1B, $02
+  dd .InventoryFull
+  db $70, $87, $98, $9f, $50, $a3, $98, $9f, $a5, $9c, $94, $50, $a4, $91, $9b, $95
+  db $50, $a4, $98, $99, $a3, $6f, $03
+  db $08
+  dd $FFC5E52E
+  db $1B, $02
+  dd .ClearGetGiftChar
+  db $1B, $04
+  db $1D, $03, $00
+  db $1B, $02
+  dd .SelectedCharFull
+  db $18, $04
+  db $1C, $28, $01
+  db $1F, $00, $01, $59
+  db $1f, $15, $87, $00, $99, $02, $01 
+  db $10, $05
+  db $1F, $13, $FF, $03
+  db $10, $20
+  db $1F, $03
+  db $01, $01, $01
+  db $1C, $29, $01
+  db $18, $01, $01
+  db $1F, $02, $74
+
+  db $1B, $04
+  db $0D, $01
+
+  db $1D, $13, $00, $00
+  db $70, $84, $91, $9b, $95, $50, $97, $9f, $9f, $94, $50, $93, $91, $a2, $95, $50
+  db $9f, $96, $50, $99, $a4, $5e, $03
+  db $01
+  db $0A
+  dl .return_from_get
+
+  .return_from_get:
+  db $12
+  db $1C, $1B, $01
+  db $0A
+  dl Gift_menu
+
+  .InventoryFull:
+  db $70, $79, $57, $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $05, $50, $92, $a5
+  db $a4, $50, $a9, $9f, $a5, $50, $93, $91, $9e, $9e, $9f, $a4, $50, $93, $91, $a2
+  db $a2, $a9, $50, $91, $9e, $a9, $50, $9d, $9f, $a2, $95, $50, $99, $a4, $95, $9d
+  db $a3, $5e, $03, $01
+  db $0A
+  dl .return_from_get
+
+  .SelectedCharFull:
+  db $70, $79, $57, $9d, $50, $a3, $9f, $a2, $a2, $a9, $5c, $10, $04, $50, $92, $a5
+  db $a4, $50, $a4, $98, $95, $a9, $50, $93, $91, $9e, $9e, $9f, $a4, $50, $93, $91
+  db $a2, $a2, $a9, $50, $91, $9e, $a9, $a4, $98, $99, $9e, $97, $50, $95, $9c, $a3
+  db $95, $5e, $03
+  db $01
+  db $1B, $06
+  db $0A
+  dl .GetGiftChar
+
+  .ClearGetGiftChar:
+  db $1B, $06
+  db $0A
+  dl .GetGiftChar
+
+
+Server_Storage:
+db $02
+
+escg_inquire:
+db $70, $87, $98, $91, $a4, $50, $a7, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5, $50
+db $9c, $99, $9b, $95, $50, $a4, $9f, $50, $94, $9f, $6f, $02
+;;;;;;;;;;;;;;;;;;;;;;
+ORG $F30000
+CabinTextFixNew:
+db $95, $50, $a9, $9f
+db $a5, $50, $a4, $9f, $50, $98, $91, $a6, $95, $50, $99, $a4, $5e, $03, $00, $1f
+db $02, $74, $10, $20, $1b, $04, $70, $58, $1c, $02, $00, $50, $97, $9f
+CabinTextJump:
+db $04, $56
+db $00, $04, $2D, $00
+CabinPostItemRescue:
+db $04, $EC, $03, $04, $ED, $03, $18, $04, $0a, $a4, $96, $c7
+
+StarMasterText:
+db $06, $e5, $03
+dd .GotCheck
+db $70, $71, $a4, $50, $9c, $91, $a3, $a4, $5c
+db $10, $0a, $50, $a9, $9f, $a5, $57, $a6, $95, $50, $91, $a2, $a2, $99, $a6, $95
+db $94, $5e, $10, $0f, $50, $79, $50, $9e, $9f, $a7, $50, $9f, $96, $96, $95, $a2
+db $50, $a9, $9f, $a5, $50, $9d, $a9, $50, $a5, $9c, $a4, $99, $9d, $91, $a4, $95
+db $50, $9b, $9e, $9f, $a7, $9c, $95, $94, $97, $95, $5e, $03, $04, $e5, $03, $0a
+db $c7, $b8, $ee
+.GotCheck:
+db $70, $74, $9f, $50, $a9, $9f, $a5, $50, $9b, $9e, $9f, $a7, $50
+db $98, $9f, $a7, $50, $a4, $9f, $50, $97, $95, $a4, $50, $9f, $a5, $a4, $50, $9f
+db $96, $50, $98, $95, $a2, $95, $6f, $13, $02
+
+TeddyJoin:
+db $70, $89, $9f, $a5, $50, $93, $91, $9e, $50, $93, $91, $9c, $9c, $50, $9d, $95
+db $50, $84, $95, $94, $94, $a9, $5e, $03, $00, $70, $84, $95, $94, $94, $a9, $50
+db $72, $95, $91, $a2, $5e, $03, $00, $70, $79, $a4, $50, $99, $a3, $50, $9d, $a9
+db $50, $94, $95, $a3, $a4, $99, $9e, $a9, $50, $a4, $9f, $50, $a3, $91, $a6, $95
+db $50, $a4, $98, $95, $50, $a7, $9f, $a2, $9c, $94, $5c, $10, $20, $50, $91, $9e
+db $94, $50, $79, $50, $a7, $99, $9c, $9c, $50, $91, $9c, $9c, $9f, $a7, $50, $a9
+db $9f, $a5, $50, $a4, $9f, $50, $92, $95, $50, $9d, $a9, $50, $95, $a3, $93, $9f
+db $a2, $a4, $51, $03, $1d, $03, $ff, $1b, $03, $6A, $86, $c8, $00, $00, $70, $87
+db $95, $9c, $9c, $5c, $50, $79, $50, $a7, $9f, $a5, $9c, $94, $5c, $10, $15, $50
+db $95, $a8, $93, $95, $a0, $a4, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $93, $91
+db $a2, $a2, $a9, $99, $9e, $97, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $50
+db $a3, $a4, $a5, $96, $96, $5e, $07, $68, $00, $13, $02, $a9, $5c, $15, $25, $9e, $51, $03, $18
+db $04, $10, $01, $1f, $11, $03, $1f, $eb, $99, $9e, $97, $50, $a4, $9f, $9f, $50
+db $9d, $a5, $93, $98, $50, $a3, $a4, $a5, $96, $96, $5e, $13, $02, $00, $50, $50
+db $58, $84, $98, $95, $50, $1c, $05, $02, $50, $9a, $9f, $99, $9e, $a3, $50, $a9
+db $9f, $a5, $5e, $59, $1f, $02, $10, $10, $30, $1d, $00, $ff, $02, $13, $1f, $41
+db $13, $02; TeddyBear join
+
+PresentNessCheck:
+db $0B, $05
+db $1B, $03
+dd NessFlagText
+db $02
+
+WarpPadDescription:
+db $71, $50, $98, $91, $9e, $94, $98, $95, $9c, $94, $50, $a4, $95, $9c, $95, $a0
+db $9f, $a2, $a4, $95, $a2, $50, $92, $a5, $99, $9c, $a4, $50, $92, $a9, $50, $a4
+db $98, $95, $50, $97, $95, $9e, $99, $a5, $a3, $5c, $50, $1c, $02, $03, $5e, $03
+db $00, $70, $89, $9f, $a5, $50, $93, $91, $9e, $50, $a5, $a3, $95, $50, $99, $a4
+db $50, $a4, $9f, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $50, $a4, $9f, $50
+db $9b, $9e, $9f, $a7, $9e, $50, $9c, $9f, $93, $91, $a4, $99, $9f, $9e, $a3, $5e
+db $13, $02
+
+WarpPadUsage:
+db $1C, $22, $01
+db $1B, $06
+db $1B, $03
+dd .CantWarp
+db $06, $F2, $02
+dd $C7C865
+db $70
+db $83, $75, $7c, $75, $73, $84, $50, $87, $71, $82, $80, $50, $7d, $7f, $74, $75
+db $01
+db $19, $02
+db $71, $02
+db $19, $02
+db $72, $02
+db $1C, $07, $02
+db $11
+db $12
+db $09, $02
+dd .WarpAccept
+dd .WarpAccept
+db $02
+.WarpAccept:
+db $70, $79, $7e, $80, $85, $84, $50, $89, $7f, $85, $82, $50, $74, $75, $83, $84
+db $79, $7e, $71, $84, $79, $7f, $7e, $10, $06
+db $1B, $04
+db $1A, $0B
+db $1F, $20, $00, $00, $02
+
+.CantWarp:
+db $70, $84, $98, $95, $50, $a3, $99, $97, $9e, $91, $9c, $50, $99, $a3, $50, $9a
+db $91, $9d, $9d, $95, $94, $5c, $10, $05, $50, $a3, $9f, $50, $a4, $98, $95, $50
+db $1c, $05, $b5, $50, $93, $91, $9e, $9e, $9f, $a4, $50, $92, $95, $50, $a5, $a3
+db $95, $94, $50, $98, $95, $a2, $95, $5e, $13, $02
+
+
+PokeyCharCount:
+db $08
+dd .CountChars
+db $0A
+dl $C8FD5F
+
+.CountChars:
+db $19, $20
+db $09, $04
+dd .One
+dd .Two
+dd .Three
+dd .Four
+.One:
+db $02
+.Two:
+db $A4, $A7, $9F, $50, $02
+.Three:
+db $A4, $98, $A2, $95, $95, $50, $02
+.Four:
+db $96, $9F, $A5, $A2, $50, $02
+
+DisplayRobots:
+db $18, $04
+db $07, $17, $04
+db $1B, $02
+dd .NoNess
+db $04, $18, $04
+.NoNess:
+db $07, $E1, $03
+db $1B, $02
+dd .NoPaula
+db $04, $19, $04
+
+.NoPaula:
+db $07, $E2, $03
+db $1B, $02
+dd .NoJeff
+db $04, $1A, $04
+.NoJeff:
+db $07, $10, $00
+db $1B, $02
+dd .NoPoo
+db $04, $1B, $04
+.NoPoo:
+db $02
+
+OrangeKidCrowdfund:
+db $01, $70
+db $84, $98, $91, $a4, $57, $a3, $50, $a7, $98, $a9, $50, $79, $50, $94, $95, $93
+db $99, $94, $95, $94, $50, $a4, $9f, $50, $9f, $a0, $95, $9e, $50, $91, $50, $93
+db $a2, $9f, $a7, $94, $96, $a5, $9e, $94, $99, $9e, $97, $50, $93, $91, $9d, $a0
+db $91, $99, $97, $9e, $50, $96, $9f, $a2, $50, $9d, $a9, $50, $99, $9e, $a6, $95
+db $9e, $a4, $99, $9f, $9e, $a3, $5e, $03, $00, $70, $79, $96, $50, $a9, $9f, $a5
+db $50, $a3, $a0, $95, $9e, $94, $50, $54, $62, $60, $60, $50, $a2, $99, $97, $98
+db $a4, $50, $9e, $9f, $a7, $5c, $10, $05, $a9, $9f, $a5, $57, $9c, $9c, $50, $9a
+db $9f, $99, $9e, $50, $a4, $98, $95, $50, $7f, $a2, $91, $9e, $97, $95, $50, $7a
+db $a5, $99, $93, $95, $50, $a4, $99, $95, $a2, $03, $00, $70, $91, $9e, $94, $50
+db $97, $95, $a4, $50, $95, $a8, $93, $9c, $a5, $a3, $99, $a6, $95, $50, $95, $91
+db $a2, $9c, $a9, $50, $91, $93, $93, $95, $a3, $a3, $50, $a4, $9f, $50, $9d, $a9
+db $50, $9c, $91, $a4, $95, $a3, $a4, $50, $99, $9e, $a6, $95, $9e, $a4, $99, $9f
+db $9e, $5c, $50, $a4, $98, $95, $50, $1c, $05, $01, $5e, $03, $00, $70, $87, $98
+db $91, $a4, $50, $94, $9f, $50, $a9, $9f, $a5, $50, $a3, $91, $a9, $6f
+db $0A
+dl $C812AE
+
+NPCPaulaTex:
+db $1C, $04
+db $1f, $00, $00, $7b
+db $0A
+dl NpcPaulaReturn
+NPCJeffTex:
+db $1C, $04
+db $1f, $00, $00, $7b
+db $0A
+dl NpcJeffReturn
+NPCPooTex:
+db $1C, $04
+db $1f, $00, $00, $7b
+db $0A
+dl NpcPooReturn
+PooNPCTexReal:
+db $1C, $04
+db $1f, $00, $00, $7b
+db $0A
+dl PooReturnReal
+
+TracyNessText:
+db $06, $17, $04
+dd $C76120
+db $70, $87, $98, $a9, $50, $91, $a2, $95, $50, $a9, $9f, $a5, $50, $99, $9e, $50
+db $9d, $a9, $50, $a2, $9f, $9f, $9d, $6f, $03, $00, $70, $7d, $91, $a9, $92, $95
+db $50, $99, $96, $50, $79, $50, $9b, $9e, $95, $a7, $50, $1c, $02, $01, $50, $a7
+db $91, $a3, $50, $9f, $9b, $91, $a9, $5c, $10, $05, $50, $79, $57, $94, $50, $97
+db $99, $a6, $95, $50, $a9, $9f, $a5, $50, $9d, $a9, $50, $1c, $05, $01, $5e, $03
+db $00, $70, $7f, $98, $5c, $50, $a7, $95, $9c, $9c, $5e, $03, $00, $70, $79, $96
+db $50, $a9, $9f, $a5, $50, $a7, $91, $9e, $9e, $91, $50, $93, $a2, $91, $9d, $50
+db $a3, $9f, $9d, $95, $a4, $98, $99, $9e, $97, $50, $99, $9e, $50, $a9, $9f, $a5
+db $a2, $50, $a0, $9f, $93, $9b, $95, $a4, $a3, $5c, $10, $04, $50, $9a, $a5, $a3
+db $a4, $50, $a5, $a3, $95, $50, $a4, $98, $95, $50, $82, $50, $92, $a5, $a4, $a4
+db $9f, $9e, $5e, $13, $02
+
+MagicantTentacleText:
+db $06, $17, $04
+dd $C77D9F
+db $70, $58, $71, $50, $a6, $9f, $99, $93, $95, $50, $93, $a2, $95, $95, $a0, $a3
+db $50, $99, $9e, $a4, $9f, $50
+db $0A
+dl MagicantTentaGetNessName
+db $02, $00
+MagicantNameReturn:
+db $57, $a3, $50, $9d
+db $99, $9e, $94, $5e, $5e, $5e, $03, $00, $70, $79, $a4, $50, $a3, $91, $a9, $a3
+db $5c, $10, $08, $50, $6c, $1c, $02, $01, $50, $9d, $a5, $a3, $a4, $50, $92, $95
+db $50, $a0, $a2, $95, $a3, $95, $9e, $a4, $50, $a4, $9f, $50, $a0, $a2, $9f, $93
+db $95, $95, $94, $50, $92, $95, $a9, $9f, $9e, $94, $50, $a4, $98, $99, $a3, $50
+db $a0, $9f, $99, $9e, $a4, $5e, $5e, $5e, $6e, $59, $13, $02
+
+DuckSignTex:
+db $08
+dd $C87994
+db $6E, $01
+db $08
+dd $C87994
+db $03
+db $0A
+dl $C8798B
+
+GoatSignTex:
+db $08
+dd $C87994
+db $6E, $01
+db $08
+dd $C87994
+db $03
+db $0A
+dl $C879BB
+
+SlimeSignTex:
+db $08
+dd $C87994
+db $6E, $01
+db $08
+dd $C87994
+db $03
+db $0A
+dl $C87A46
+
+JeffBoatText:
+db $19, $20
+db $0B, $01
+db $1B, $03
+dd JeffBoatSolo
+db $70, $83, $9f, $5e
+db $0A
+dl NotSoloJeff
+JeffBoatSolo:
+db $70
+db $83, $9f, $5c, $50, $a9, $9f, $a5, $57, $a2, $95, $50, $a0, $a2, $95, $a4, $a4
+db $a9, $50, $a3, $9d, $91, $a2, $a4, $5c, $50, $95, $98, $6f, $03, $00, $70, $84
+db $98, $99, $a3, $50, $92, $9f, $91, $a4, $57, $a3, $50, $91, $50, $9c, $99, $a4
+db $a4, $9c, $95, $50, $a2, $99, $93, $9b, $95, $a4, $a9, $5c, $50, $9d, $91, $a9
+db $92, $95, $50, $a9, $9f, $a5, $50, $93, $9f, $a5, $9c, $94, $50, $97, $99, $a6
+db $95, $50, $99, $a4, $50, $91, $9e, $50, $a5, $a0, $97, $a2, $91, $94, $95, $51
+db $03, $00
+db $0A
+dl $C92F88
+
+PooBoatText:
+db $19, $20
+db $0B, $01
+db $1B, $03
+dd PooBoatSolo
+db $70, $83, $17, $8b
+db $0A
+dl NotSoloPoo
+PooBoatSolo:
+db $70, $78, $95, $a9, $5c, $50, $a7, $98, $91, $a4, $57, $a3, $50, $a7, $99, $a4
+db $98, $50, $a4, $98, $95, $50, $a3, $95, $a2, $99, $9f, $a5, $a3, $50, $96, $91
+db $93, $95, $6f, $03, $00, $70, $89, $9f, $a5, $50, $97, $9f, $a4, $a4, $91, $50
+db $9c, $99, $97, $98, $a4, $95, $9e, $50, $a5, $a0, $50, $91, $50, $9c, $99, $a4
+db $a4, $9c, $95, $51, $03, $00, $70, $71, $50, $9c, $9f, $9f, $9b, $50, $9c, $99
+db $9b, $95, $50, $a4, $98, $91, $a4, $50, $93, $9f, $a5, $9c, $94, $50, $a3, $93
+db $91, $a2, $95, $50, $91, $50, $a3, $95, $91, $50, $9d, $9f, $9e, $a3, $a4, $95
+db $a2, $51
+db $03, $00
+db $0A
+dl $C92F88
+
+PaulaBoatText:
+db $19, $20
+db $0B, 01
+db $1B, $03
+dd PaulaBoatSolo
+db $70, $83, $9f, $5e
+db $0A
+dl NotSoloPaula
+PaulaBoatSolo:
+db $70, $87, $98, $91, $a4, $57, $a3, $50, $a4, $98, $91, $a4, $50, $93, $a2, $91
+db $93, $9b, $9c, $99, $9e, $97, $50, $95, $9e, $95, $a2, $97, $a9, $50, $91, $a4
+db $50, $a9, $9f, $a5, $a2, $50, $96, $99, $9e, $97, $95, $a2, $a4, $99, $a0, $a3
+db $6f, $03, $00, $70, $89, $9f, $a5, $50, $a3, $95, $95, $9d, $50, $91, $9c, $9d
+db $9f, $a3, $a4, $50, $a2, $95, $91, $94, $a9, $50, $96, $9f, $a2, $50, $91, $9e
+db $a9, $a4, $98, $99, $9e, $97, $51, $03, $00, $70, $7d, $91, $a9, $92, $95, $50
+db $a4, $98, $95, $50, $9d, $9f, $9e, $a3, $a4, $95, $a2, $a3, $50, $a3, $98, $9f
+db $a5, $9c, $94, $50, $92, $95, $50, $a2, $95, $91, $94, $a9, $50, $96, $9f, $a2
+db $50, $89, $7f, $85, $51
+db $03, $00
+db $0A
+dl $C92F88
+
+NessBarfAppear:
+db $70, $1c, $02, $01, $50, $a4, $95, $9c, $95, $a0, $9f, $a2, $a4, $95, $94, $50
+db $99, $9e, $51, $03, $02
+
+NessBarfAttack:
+db $70
+db $1c, $02, $01, $50, $a4, $a2, $99, $95, $94, $50, $80, $83, $79, $50, $82, $9f
+db $93, $9b, $99, $9e, $51
+db $03, $00
+db $70, $1F, $02, $37
+db $1C, $02, $01
+db $50, $A4, $A2, $99, $95, $94, $50
+db $1C, $12, $01, $51
+db $08
+dd $EF864C
+db $02
+
+GiantStepNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7BF36
+
+LilliputNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C000
+
+MilkyNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C193
+
+RainyNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C0D8
+
+MagnetNessText:
+db $1C, $21, $01
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C270
+
+CloudNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C32F
+
+LumineNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C42A
+
+FireNessText:
+db $08
+dd NessSancDiscover
+db $0A
+dl $C7C4E1
+
+NessSancDiscover:
+db $70
+db $06, $17, $04
+dd .NessPresent
+db $83, $9F, $9D, $95, $A7, $98, $95, $A2, $95, $5C, $50, $10, $0A
+.NessPresent:
+db $1c, $02, $01
+db $02
+
+GiantStepNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7BF60
+
+LilliputNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C02B
+
+MilkyNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C1CE
+
+RainyNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C0FD
+
+MagnetNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C299
+
+CloudNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C360
+
+LumineNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C44F
+
+FireNessName:
+db $08
+dd PrintLeader
+db $0A
+dl $C7C511
+
+EarthPowerLeader:
+db $08
+dd PrintLeader
+db $0A
+dl $EE9BE2
+
+OnettLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl OnettLeaderDone
+
+TwosonLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl TwosonLeaderDone
+
+HappyLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl HappyLeaderDone
+
+ThreedLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl ThreedLeaderDone
+
+SaturnLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl SaturnLeaderDone
+
+DunesLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl DunesLeaderDone
+
+FoursLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl FoursLeaderDone
+
+WintersLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl WintersLeaderDone
+
+SummersLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl SummersLeaderDone
+
+ScarabaLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl ScarabaLeaderDone
+
+DalaamLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl DalaamLeaderDone
+
+DarkLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl DarkLeaderDone
+
+TendaLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl TendaLeaderDone
+
+UnderLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl UnderLeaderDone
+
+MagicLeaderName:
+db $08
+dd PrintLeader2
+db $0A
+dl MagicLeaderDone
+
+OnettTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl OnettTeleNPCBack
+
+TwosonTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl TwosonTeleNPCBack
+
+HappyTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl HappyTeleNPCBack
+
+ThreedTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl ThreedTeleNPCBack
+
+SaturnTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl SaturnTeleNPCBack
+
+DunesTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl DunesTeleNPCBack
+
+FoursTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl FoursTeleNPCBack
+
+WintersTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl WintersTeleNPCBack
+
+SummersTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl SummersTeleNPCBack
+
+ScarabaTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl ScarabaTeleNPCBack
+
+DalaamTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl DalaamTeleNPCBack
+
+DarkTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl DarkTeleNPCBack
+
+TendaTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl TendaTeleNPCBack
+
+UnderTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl UnderTeleNPCBack
+
+MagicTeleNPCName:
+db $08
+dd PrintLeader2
+db $0A
+dl MagicTeleNPCBack
+
+PrintLeader:
+db $70
+db $19, $10, $01
+db $1B, $04
+db $1C, $02, $00
+db $02
+
+PrintLeader2:
+db $70
+db $58
+db $19, $10, $01
+db $1B, $04
+db $1C, $02, $00
+db $02
+
+DebugPalettePicker:
+db $18, $04, $1f, $e1, $00, $5c, $01, $02
+
+ClearAndCallDad:
+db $12
+db $0A
+dl $C63229
+
+fixed_skyrunner_text:
+db $04, $D4, $00
+db $10, $20, $1f, $02, $76, $10, $03, $18, $01, $01, $19, $10, $01, $1b, $04, $70
+db $1c, $02, $00, $50, $93, $a2, $91, $9d, $9d, $95, $94, $50, $a4, $98, $95, $50
+db $95, $9e, $97, $99, $9e, $95, $50, $99, $9e, $a4, $9f, $50, $a0, $9c, $91, $93
+db $95, $51, $03
+db $18, $04
+db $08
+dd $C91D30
+db $0A
+dl $C91E42
+
+broken_skyrunner_text:
+db $18, $01, $01
+db $70, $84, $98, $95, $50, $9d, $91, $93, $98, $99, $9e, $95, $50, $91, $a0, $a0
+db $95, $91, $a2, $a3, $50, $a4, $9f, $50, $92, $95, $50, $92, $a2, $9f, $9b, $95
+db $9e, $5e, $03, $00, $70, $80, $95, $a2, $98, $91, $a0, $a3, $50, $91, $50, $a2
+db $95, $a0, $9c, $91, $93, $95, $9d, $95, $9e, $a4, $50, $95, $9e, $97, $99, $9e
+db $95, $50, $93, $9f, $a5, $9c, $94, $50, $92, $95, $50, $96, $9f, $a5, $9e, $94
+db $5e, $10, $10, $5e, $10, $10, $5e, $10, $10, $6f, $1f, $02, $72, $13, $02
+db $02
+
+rock_text:
+db $79, $57, $9d, $50, $9e, $9f, $a4, $50, $91, $50, $a2, $9f, $93, $9b, $5e
+db $10, $10, $50, $79, $57, $9d, $50, $91, $93, $a4, $a5, $91, $9c, $9c, $a9, $50
+db $9a, $a5, $a3, $a4, $50, $91, $50, $a2, $9f, $93, $9b, $5d, $a3, $98, $91, $a0
+db $95, $94, $50, $9d, $91, $9e, $5e
+db $0A
+dl $61002C
+
+man_text:
+db $58, $7f, $9e, $50, $93, $9c, $9f, $a3, $95, $a2, $50, $99, $9e, $a3, $a0, $95
+db $93, $a4, $99, $9f, $9e, $5c, $10, $0a, $50, $99, $a4, $50, $91, $93, $a4, $a5
+db $91, $9c, $9c, $a9, $50, $91, $a0, $a0, $95, $91, $a2, $a3, $50, $a4, $9f, $50
+db $92, $95, $50, $91, $50, $9d, $91, $9e, $5d, $a3, $98, $91, $a0, $95, $94, $50
+db $a2, $9f, $93, $9b, $5e, $59
+db $0A
+dl $6100F8
+
+NessTonyHint:
+db $5E, $5E, $5E, $03
+db $08
+dd TonyLetterHintText
+db $02
+
+JeffTonyHint:
+db $a2, $95, $5e, $03
+db $08
+dd TonyLetterHintText
+db $02
+
+TonyLetterHintText:
+db $00, $70, $78, $9f, $a7, $95, $a6, $95, $a2, $5c, $50, $79, $50, $10, $06, $93
+db $9f, $a5, $9c, $94, $10, $06, $50, $a0, $a2, $9f, $92, $91, $92, $9c, $a9, $50
+db $9c, $95, $a4, $50, $a9, $9f, $a5, $50, $99, $9e, $5c, $03, $00, $70, $99, $96
+db $50, $a9, $9f, $a5, $50, $98, $91, $94, $50, $a3, $9f, $9d, $95, $a4, $98, $99
+db $9e, $97, $50, $99, $9d, $a0, $9f, $a2, $a4, $91, $9e, $a4, $50, $a4, $9f, $50
+db $94, $a2, $9f, $a0, $50, $9f, $96, $96, $5c, $50, $9c, $99, $9b, $95, $50, $91
+db $50, $1c, $05, $a7, $5e, $5e, $5e, $1f, $02, $72, $13, $02
+
+DynamicPhotoSetter:
+db $18, $04
+db $06
+db $BA, $02
+dd .CheckPhoto2
+db $0A
+dl .SetPhoto1
+
+.CheckPhoto2:
+db $06
+db $BB, $02
+dd .CheckPhoto3
+db $0A
+dl .SetPhoto2
+
+.CheckPhoto3:
+db $06
+db $BC, $02
+dd .CheckPhoto4
+db $0A
+dl .SetPhoto3
+
+.CheckPhoto4:
+db $06
+db $BD, $02
+dd .CheckPhoto5
+db $0A
+dl .SetPhoto4
+
+.CheckPhoto5:
+db $06
+db $BE, $02
+dd .CheckPhoto6
+db $0A
+dl .SetPhoto5
+
+.CheckPhoto6:
+db $06
+db $BF, $02
+dd .CheckPhoto7
+db $0A
+dl .SetPhoto6
+
+.CheckPhoto7:
+db $06
+db $C0, $02
+dd .CheckPhoto8
+db $0A
+dl .SetPhoto7
+
+.CheckPhoto8:
+db $06
+db $C1, $02
+dd .CheckPhoto9
+db $0A
+dl .SetPhoto8
+
+.CheckPhoto9:
+db $06
+db $C2, $02
+dd .CheckPhoto10
+db $0A
+dl .SetPhoto9
+
+.CheckPhoto10:
+db $06
+db $C3, $02
+dd .CheckPhoto11
+db $0A
+dl .SetPhoto10
+
+.CheckPhoto11:
+db $06
+db $C4, $02
+dd .CheckPhoto12
+db $0A
+dl .SetPhoto11
+
+.CheckPhoto12:
+db $06
+db $C5, $02
+dd .CheckPhoto13
+db $0A
+dl .SetPhoto12
+
+.CheckPhoto13:
+db $06
+db $C6, $02
+dd .CheckPhoto14
+db $0A
+dl .SetPhoto13
+
+.CheckPhoto14:
+db $06
+db $C7, $02
+dd .CheckPhoto15
+db $0A
+dl .SetPhoto14
+
+.CheckPhoto15:
+db $06
+db $C8, $02
+dd .CheckPhoto16
+db $0A
+dl .SetPhoto15
+
+.CheckPhoto16:
+db $06
+db $C9, $02
+dd .CheckPhoto17
+db $0A
+dl .SetPhoto16
+
+.CheckPhoto17:
+db $06
+db $CA, $02
+dd .CheckPhoto18
+db $0A
+dl .SetPhoto17
+
+.CheckPhoto18:
+db $06
+db $CB, $02
+dd .CheckPhoto19
+db $0A
+dl .SetPhoto18
+
+.CheckPhoto19:
+db $06
+db $CC, $02
+dd .CheckPhoto20
+db $0A
+dl .SetPhoto19
+
+.CheckPhoto20:
+db $06
+db $CD, $02
+dd .CheckPhoto21
+db $0A
+dl .SetPhoto20
+
+.CheckPhoto21:
+db $06
+db $CE, $02
+dd .CheckPhoto22
+db $0A
+dl .SetPhoto21
+
+.CheckPhoto22:
+db $06
+db $CF, $02
+dd .CheckPhoto23
+db $0A
+dl .SetPhoto22
+
+.CheckPhoto23;
+db $06
+db $D0, $02
+dd .CheckPhoto24
+db $0A
+dl .SetPhoto23
+
+.CheckPhoto24:
+db $06
+db $D1, $02
+dd .CheckPhoto25
+db $0A
+dl .SetPhoto24
+
+.CheckPhoto25:
+db $06
+db $D2, $02
+dd .CheckPhoto26
+db $0A
+dl .SetPhoto25
+
+.CheckPhoto26:
+db $06
+db $D3, $02
+dd .CheckPhoto27
+db $0A
+dl .SetPhoto26
+
+.CheckPhoto27:
+db $06
+db $D4, $02
+dd .CheckPhoto28
+db $0A
+dl .SetPhoto27
+
+.CheckPhoto28:
+db $06
+db $D5, $02
+dd .CheckPhoto29
+db $0A
+dl .SetPhoto28
+
+.CheckPhoto29:
+db $06
+db $D6, $02
+dd .CheckPhoto30
+db $0A
+dl .SetPhoto29
+
+.CheckPhoto30:
+db $06
+db $D7, $02
+dd .CheckPhoto31
+db $0A
+dl .SetPhoto30
+
+.CheckPhoto31:
+db $06
+db $D8, $02
+dd .CheckPhoto32
+db $0A
+dl .SetPhoto31
+
+.CheckPhoto32:
+db $06
+db $D9, $02
+dd .DoneScript
+db $0A
+dl .SetPhoto32
+.DoneScript:
+;script here
+
+db $02
+.SetPhoto1:
+db $1F, $D2, $01, $1C, $23
+db $04, $BA, $02
+db $02
+.SetPhoto2:
+db $1F, $D2, $02, $1C, $23
+db $04, $BB, $02
+db $02
+.SetPhoto3:
+db $1F, $D2, $03, $1C, $23
+db $04, $BC, $02
+db $02
+.SetPhoto4:
+db $1F, $D2, $04, $1C, $23
+db $04, $BD, $02
+db $02
+.SetPhoto5:
+db $1F, $D2, $05, $1C, $23
+db $04, $BE, $02
+db $02
+.SetPhoto6:
+db $1F, $D2, $06, $1C, $23
+db $04, $BF, $02
+db $02
+.SetPhoto7:
+db $1F, $D2, $07, $1C, $23
+db $04, $C0, $02
+db $02
+.SetPhoto8:
+db $1F, $D2, $08, $1C, $23
+db $04, $C1, $02
+db $02
+.SetPhoto9:
+db $1F, $D2, $09, $1C, $23
+db $04, $C2, $02
+db $02
+.SetPhoto10:
+db $1F, $D2, $0A, $1C, $23
+db $04, $C3, $02
+db $02
+.SetPhoto11:
+db $1F, $D2, $0B, $1C, $23
+db $04, $C4, $02
+db $02
+.SetPhoto12:
+db $1F, $D2, $0C, $1C, $23
+db $04, $C5, $02
+db $02
+.SetPhoto13:
+db $1F, $D2, $0D, $1C, $23
+db $04, $C6, $02
+db $02
+.SetPhoto14:
+db $1F, $D2, $0E, $1C, $23
+db $04, $C7, $02
+db $02
+.SetPhoto15:
+db $1F, $D2, $0F, $1C, $23
+db $04, $C8, $02
+db $02
+.SetPhoto16:
+db $1F, $D2, $10, $1C, $23
+db $04, $C9, $02
+db $02
+.SetPhoto17:
+db $1F, $D2, $11, $1C, $23
+db $04, $CA, $02
+db $02
+.SetPhoto18:
+db $1F, $D2, $12, $1C, $23
+db $04, $CB, $02
+db $02
+.SetPhoto19:
+db $1F, $D2, $13, $1C, $23
+db $04, $CC, $02
+db $02
+.SetPhoto20:
+db $1F, $D2, $14, $1C, $23
+db $04, $CD, $02
+db $02
+.SetPhoto21:
+db $1F, $D2, $15, $1C, $23
+db $04, $CE, $02
+db $02
+.SetPhoto22:
+db $1F, $D2, $16, $1C, $23
+db $04, $CF, $02
+db $02
+.SetPhoto23:
+db $1F, $D2, $17, $1C, $23
+db $04, $D0, $02
+db $02
+.SetPhoto24:
+db $1F, $D2, $18, $1C, $23
+db $04, $D1, $02
+db $02
+.SetPhoto25:
+db $1F, $D2, $19, $1C, $23
+db $04, $D2, $02
+db $02
+.SetPhoto26:
+db $1F, $D2, $1A, $1C, $23
+db $04, $D3, $02
+db $02
+.SetPhoto27:
+db $1F, $D2, $1B, $1C, $23
+db $04, $D4, $02
+db $02
+.SetPhoto28:
+db $1F, $D2, $1C, $1C, $23
+db $04, $D5, $02
+db $02
+.SetPhoto29:
+db $1F, $D2, $1D, $1C, $23
+db $04, $D6, $02
+db $02
+.SetPhoto30:
+db $1F, $D2, $1E, $1C, $23
+db $04, $D7, $02
+db $02
+.SetPhoto31:
+db $1F, $D2, $1F, $1C, $23
+db $04, $D8, $02
+db $02
+.SetPhoto32:
+db $1F, $D2, $20, $1C, $23
+db $04, $D9, $02
+db $02
+
+PhotoHandler:
+db $08
+dd DynamicPhotoSetter
+db $18, $01, $01
+db $70
+db $87, $98, $91, $a4, $50, $91, $50, $9e, $99, $93, $95, $50, $9d, $95, $9d, $9f
+db $a2, $a9, $51, $02
+db $02
+
+PhotoPresentText:
+db $04
+db $1C, $04
+db $08
+dd DynamicPhotoSetter
+db $05
+db $1C, $04
+db $02
+
+FixLightningTypo:
+db $9C, $99, $97, $98, $A4, $9E, $99, $9E, $97
+db $0A
+dl $EED7F5
+
+FixLightningTypo2:
+db $9C, $99, $97, $98, $A4, $9E, $99, $9E, $97
+db $0A
+dl $EED87B
+
+HandleEnergyLinkFromATM:
+db $05, $1D, $04
+db $1D, $17, $01, $00, $00, $00
+db $1B, $02
+dd $C62E79
+;Check for the energy flag here
+db $1C, $26, $01
+db $1B, $06
+db $1B, $03
+dd $C62F49
+
+db $04, $1D, $04
+db $1D, $17, $01, $00, $00, $00
+db $05, $1D, $04
+db $1B, $03
+dd $C62F49
+;Energy has been successfully donwloaded
+db $70
+db $84, $98, $95, $50, $a3, $95, $a2, $a6, $95, $a2, $50, $99, $a3, $50, $93, $a5
+db $a2, $a2, $95, $9e, $a4, $9c, $a9, $50, $a3, $a4, $9f, $a2, $99, $9e, $97, $50
+db $06, $1E, $04
+dd .OverCap
+;Cap is 9999999
+.DisplayMoney:
+db $54
+db $1B, $06
+;Argumentary has the amount
+db $04, $1D, $04
+db $1C, $01, $07, $5e, $03
+db $05, $1D, $04
+db $01
+db $04, $1D, $04
+db $08
+dd $C62F9E
+db $05, $1D, $04
+db $1B, $02
+dd $C62D8A
+db $0D, $00
+db $04, $1D, $04
+db $1D, $17, $00, $00, $00, $00
+db $05, $1D, $04
+db $1B, $03
+dd $C62EEF
+db $1B, $05
+db $70
+db $71, $a5, $a4, $98, $95, $9e, $a4, $99, $93, $91, $a4, $99, $9e, $97, $50, $a2
+db $95, $a1, $a5, $95, $a3, $a4, $5c, $50, $a0, $9c, $95, $91, $a3, $95, $50, $a7
+db $91, $99, $a4, $5e, $5e, $5e
+db $1C, $25, $01
+db $1B, $06
+db $1B, $02
+dd .FailedToAuthenticate
+db $09, $02
+dd .AuthenticateSuccessful
+dd .AuthenticateSuccessOverTotal
+db $02
+
+.OverCap:
+db $05, $1E, $04
+db $9D, $9F, $A2, $95, $50, $A4, $98, $91, $9E, $50
+db $0A
+dl .DisplayMoney
+.FailedToAuthenticate:
+db $70, $76, $91, $99, $9c, $95, $94, $50, $a4, $9f, $50, $91, $a5, $a4, $98, $95
+db $9e, $a4, $99, $93, $91, $a4, $95, $50, $a4, $9f, $50, $a3, $95, $a2, $a6, $95
+db $a2, $5e, $03, $00, $70, $80, $9c, $95, $91, $a3, $95, $50, $a4, $a2, $a9, $50
+db $91, $97, $91, $99, $9e, $5e, $03, $02
+.AuthenticateSuccessful:
+db $1B, $06
+db $0A
+dl $C62EA6
+db $02
+
+.AuthenticateSuccessOverTotal:
+db $70, $71, $9d, $9f, $a5, $9e, $a4, $50, $a2, $95, $a1, $a5, $95, $a3, $a4, $95
+db $94, $50, $95, $a8, $93, $95, $95, $94, $a3, $50, $a4, $98, $95, $50, $91, $9d
+db $9f, $a5, $9e, $a4, $50, $99, $9e, $50, $a4, $98, $95, $50, $a3, $95, $a2, $a6
+db $95, $a2, $5e, $03, $00, $70, $87, $99, $a4, $98, $94, $a2, $91, $a7, $99, $9e
+db $97, $50, $54, $1c, $0a, $00, $00, $00, $00, $50, $99, $9e, $a3, $a4, $95, $91, $94
+db $5e, $03, $01
+db $0A
+dl $C62EA6
+
+InitializeEnergyLink:
+db $0e, $00, $0d, $01
+db $1C, $24, $01
+db $0A
+dl $C62D34
+
+CheckForLockerKey:
+db $1B, $02
+dd .LockerFail
+db $08
+dl OpenLockers_OpenLockerText
+db $19, $20
+db $02
+.LockerFail:
+db $0B, $FE
+db $02
+
+PhotoBarfTextArrive:
+db $02
+
+PhotoBarfTextTake:
+db $08
+dd DynamicPhotoSetter
+db $02
+
+StonehengePhotoText:
+db $70, $83, $9f, $a2, $a2, $a9, $5c, $50, $79, $50, $94, $9f, $9e, $57, $a4, $50
+db $98, $91, $a6, $95, $50, $9d, $a9, $50, $93, $91, $9d, $95, $a2, $91, $50, $a7
+db $99, $a4, $98, $50, $9d, $95, $5e, $13, $02
+
+ShowDepositEnergy:
+db $05, $1D, $04
+db $1D, $17, $01, $00, $00, $00 ; Check if we have at least one dollar
+db $1B, $02
+dd $C63004
+db $04, $1D, $04
+db $0A
+dl $C63004
+
+ShowDadEnergy:
+db $00, $70, $54
+db $05, $1D, $04
+db $1D, $17, $01, $00, $00, $00 ; Check if we have at least one dollar
+db $1B, $02
+dd .BankMoney
+db $04, $1D, $04
+.BankMoney:
+db $1C, $01, $07
+db $05, $1D, $04
+db $0A
+dl $C63330
+
+PingDadEnergy:
+db $1C, $24, $01
+db $06, $04, $03
+dd $C75929
+db $0A
+dl $C63230
+
+;The server is currently storing [Energy]
+
+RuralEnergyText:
+db $70, $89, $9f, $a5, $50, $a7, $91, $9e, $9e, $91, $50, $93, $98, $95, $93, $9b
+db $50, $98, $9f, $a7, $50, $9d, $a5, $93, $98, $50, $9d, $9f, $9e, $95, $a9, $50
+db $99, $a3, $50, $9f, $9e, $50, $a4, $98, $95, $50, $a3, $95, $a2, $a6, $95, $a2
+db $6f, $03, $00, $70, $74, $9f, $50, $79, $50, $9c, $9f, $9f, $9b, $50, $9c, $99
+db $9b, $95, $50, $79, $50, $9b, $9e, $9f, $a7, $50, $a7, $98, $91, $a4, $50, $91
+db $50, $a3, $95, $a2, $a6, $95, $a2, $50, $99, $a3, $6f, $13, $02
+
+DarknessATM:
+db $1C, $27, $01
+db $1B, $06
+db $1B,  $02
+dd $C9EC74
+db $1D, $17, $01, $00, $00, $00
+db $1B, $03
+dd RuralEnergyText
+db $0A
+dl $C9EC74
+
+UnderworldATM:
+db $1C, $27, $01
+db $1B, $06
+db $1B,  $02
+dd $EF6049
+db $1D, $17, $01, $00, $00, $00
+db $1B, $03
+dd RuralEnergyText
+db $0A
+dl $EF6049
+
+PhotoShopText:
+db $80, $98, $9f, $a4, $9f, $5d, $9f, $a0, $00
+
+SetSaturnLadderFlag:
+db $04
+db $1F, $04
+db $02
+
+JackieMoonsideSetup:
+db $1F, $63
+dd JackieMoonsideGive
+db $0A
+dl $C9A08B
+
+JackieMoonsideGive:
+db $05, $4F, $02
+db $1F, $1A, $80, $03, $03
+db $1F, $16, $80, $03, $03
+db $10, $30
+db $1F, $1B, $80, $03
+db $18, $01, $01
+.JackieGiveItem:
+db $70, $71, $50, $a3, $a4, $a2, $91, $9e, $97, $95, $50, $9d, $91, $9e, $50, $9a
+db $a5, $a3, $a4, $50, $93, $91, $9d, $95, $50, $92, $91, $a2, $97, $99, $9e, $97
+db $50, $99, $9e, $50, $98, $95, $a2, $95, $5c, $10, $0b, $50, $9c, $9f, $9f, $9b
+db $99, $9e, $97, $50, $96, $9f, $a2, $50, $a9, $9f, $a5, $5e, $5e, $5e, $03, $00
+db $70, $79, $a3, $50, $98, $95, $50, $91, $50, $96, $a2, $99, $95, $9e, $94, $50
+db $9f, $96, $50, $a9, $9f, $a5, $a2, $a3, $6f, $10, $16, $50, $78, $95, $50, $94
+db $95, $9d, $91, $9e, $94, $95, $94, $50, $79, $50, $97, $99, $a6, $95, $50, $a9
+db $9f, $a5, $50, $a4, $98, $99, $a3, $50, $1c, $05, $01, $50, $91, $9e, $94, $50
+db $9c, $95, $96, $a4, $5e, $03
+db $1D, $03, $FF
+db $1B, $02
+dd .FullInv
+db $05, $20, $04
+db $1D, $0E, $FF, $04, $08
+dd $C7DCB6
+db $04, $DF, $03
+db $03
+db $18, $04, $02
+.FullInv:
+db $00, $70
+db $83, $99, $9e, $93, $95, $50, $a9, $9f, $a5, $a2, $50, $a0, $9f, $93, $9b, $95
+db $a4, $a3, $50, $91, $a2, $95, $50, $a3, $9f, $50, $96, $a5, $9c, $9c, $5c, $10
+db $0a, $50, $79, $57, $9c, $9c, $50, $98, $9f, $9c, $94, $50, $9f, $9e, $50, $a4
+db $9f, $50, $99, $a4, $50, $96, $9f, $a2, $50, $9e, $9f, $a7, $5e
+db $04, $20, $04
+db $03
+db $18, $04
+db $02
+
+JackieItemCheck:
+db $06
+db $20, $04
+dd JackieMoonsideGive_JackieGiveItem
+db $0A
+dl $c6f175
+
+UnlockOnettTeleport:
+db $04, $D1, $00
+db $02
+
+MagicantTentacleERText:
+db $07
+db $17, $04
+db $1B, $02
+dd .Ness
+db $1F, $63
+dd $C9B112
+.Ness:
+db $0A
+dl MagicantTentacleText
+
+MinerDialogue:
+db $06
+db $AE, $00 ;If the mine is open...
+dd $C60349;Proceed as normal
+;If the mine is closed
+db $06
+db $5A, $00 ;and we got the check
+dd $C60365 ;Run the permit script
+db $06
+db $48, $00 ;If the check is primed...
+dd $C6050B ;Give it to the player
+db $0A
+dl $C60365 ;Else run the permit script
+
+MinerText2:
+db $06, $5A, $00
+dd .Already
+db $91, $9C, $9D, $9F, $A3, $A4
+db $0A
+dl $C61231
+.Already:
+db $98, $91, $94
+db $0A
+dl $C61231
+
+CafeEverdredText:
+db $06, $91, $00
+dd .Done
+db $18, $01, $01
+db $70, $58, $71, $a2, $95, $50, $a9, $9f, $a5, $50, $a2, $95, $91, $9c, $9c, $a9
+db $50, $97, $9f, $99, $9e, $97, $50, $a4, $9f, $50, $9a, $a5, $a3, $a4, $50, $9c
+db $95, $91, $a6, $95, $50, $98, $99, $9d, $50, $9c, $a9, $99, $9e, $97, $50, $9f
+db $9e, $50, $a4, $98, $95, $50, $a3, $a4, $a2, $95, $95, $a4, $5E, $5E, $5E, $6f, $59, $03
+db $18, $04, $02
+.Done:
+db $1F, $63
+dd $C9B112
+db $02
+
+LeaderHandinBadge:
+db $70, $58
+db $19, $10, $01
+db $1B, $04
+db $1C, $02, $00
+db $0A
+dl $EEF748
+
+EverDeadText:
+db $70, $87, $98, $a9, $50, $91, $a2, $95, $50, $a9, $9f, $a5, $50, $99, $9e, $a4
+db $95, $a2, $a2, $a5, $a0, $a4, $99, $9e, $97, $50, $9d, $a9, $50, $a3, $a4, $a2
+db $95, $95, $a4, $50, $a9, $9f, $97, $91, $6f, $03, $01, $70, $85, $97, $98, $5c
+db $50, $99, $a4, $57, $a3, $50, $9e, $9f, $a4, $50, $95, $a6, $95, $9e, $50, $a2
+db $95, $9c, $91, $a8, $99, $9e, $97, $50, $9e, $9f, $a7, $5e, $13
+db $0A
+dl $C839EB
+
+StorageStoreCheck:
+db $1B, $05
+db $19, $19, $00, $00
+db $1C, $19, $01
+db $1B, $03
+dd .CheckRegular
+db $1C, $1D, $01
+.CheckRegular:
+db $1B, $06
+db $1D, $0C, $00, $00
+db $1B, $03
+dd .ClearAndFull
+db $0A
+dl BackFromCheck
+.ClearAndFull:
+db $1C, $1E, $01
+db $0A
+dd $EE9650
+
+ActivateCakeEnemies:
+db $05, $0B, $00
+db $04, $3d, $00, $02
+
+FixEpilogueWinters:
+db $04, $d1, $00
+db $04, $d2, $00
+db $04, $d4, $00
+db $0A
+dl BackfromEpilogueFix
+
+OnettHotelSetTeleport:
+db $04
+db $D1, $00
+db $0A
+dl $C9B11E
+
+MonkeyCaveShop:
+db $04, $ED, $00
+db $08 
+dd $C5DFB1
+db $05, $ED, $00
+db $02
+
+MonkeyShopGreeting: ; todo: write this
+db $70, $85, $9b, $99, $9b, $99, $50, $85, $9b, $a5, $51, $03, $00, $70, $58, $87
+db $95, $9c, $93, $9f, $9d, $95, $50, $a4, $9f, $50, $7d, $9f, $9e, $9b, $95, $a9
+db $50, $7d, $91, $a2, $a4, $5e, $59, $03, $02
+db $02
+
+MonkeyShopBuyLine:
+db $70, $7b, $a5, $50, $7b, $99, $9b, $a5, $51, $03, $00, $70, $58, $87, $98, $91
+db $a4, $50, $a7, $9f, $a5, $9c, $94, $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95
+db $6f, $03, $02
+
+MonkeyShopNotEnoughMoney:
+db $70, $85, $9b, $99, $50, $a5, $9b, $a5, $50, $a5, $9b, $a5, $9c, $95, $9c, $95
+db $51, $03, $00, $70, $58, $89, $9f, $a5, $50, $91, $a2, $95, $50, $a4, $9f, $9f
+db $50, $a0, $9f, $9f, $a2, $50, $96, $9f, $a2, $50, $a4, $98, $99, $a3, $50, $99
+db $a4, $95, $9d, $51, $59, $03, $02
+
+MonkeyShopSelectItem:
+db $70, $7b, $99, $99, $9b, $a5, $9b, $91, $50, $1c, $05, $00, $6f, $03, $00, $70
+db $58, $89, $9f, $a5, $50, $a7, $91, $9e, $a4, $50, $a4, $98, $95, $50, $1c, $05
+db $00, $6f, $59, $03, $02
+
+MonkeyShopPickCarrier:
+db $70, $7b, $a9, $a5, $9b, $a9, $9b, $99, $9b, $95, $9b, $99, $a5, $6f, $03, $00
+db $70, $58, $87, $98, $9f, $57, $a3, $50, $a4, $91, $9b, $99, $9e, $97, $50, $99
+db $a4, $6f, $59, $03, $02
+
+MonkeyShopCancelBuy:
+db $70, $85, $9b, $99, $91, $a9, $50, $a5, $9b, $99, $5e, $03, $00, $70, $58, $7f
+db $98, $5c, $10, $05, $50, $9f, $9b, $91, $a9, $5e, $59, $03, $02
+
+MonkeyShopThank:
+db $70, $85, $9b, $a5, $9b, $a5, $9b, $a5, $51, $03, $00, $70, $58, $84, $98, $91
+db $9e, $9b, $a3, $51, $59, $03, $02
+
+MonkeyShopNoBuy:
+db $70, $7b, $a9, $99, $99, $99, $95, $9b, $95, $9b, $95, $9b, $95, $6f, $03, $00
+db $70, $58, $89, $9f, $a5, $50, $94, $9f, $9e, $57, $a4, $50, $a7, $91, $9e, $a4
+db $50, $a4, $9f, $50, $92, $a5, $a9, $50, $96, $a2, $9f, $9d, $50, $91, $50, $9d
+db $9f, $9e, $9b, $95, $a9, $6f, $59, $03, $02
+
+MonkeyShopCantCarrySingle:
+db $70, $7b, $95, $95, $9b, $99, $9b, $99, $95, $95, $51, $03, $00, $70, $58, $89
+db $9f, $a5, $50, $91, $a2, $95, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50
+db $a7, $91, $a9, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $51, $59, $03, $02
+
+MonkeyShopExitThanks:
+db $70, $85, $9b, $99, $9b, $99, $9b, $99, $51, $03, $00, $70, $58, $73, $9f, $9d
+db $95, $50, $91, $97, $91, $99, $9e, $51, $59, $03, $02
+
+MonkeyShopBuyAnother:
+db $70, $85, $9b, $a9, $a5, $99, $9b, $a5, $a5, $a5, $a9, $95, $50, $7b, $a9, $95
+db $a5, $95, $9b, $a5, $9b, $9f, $5e, $03, $00, $70, $58, $87, $9f, $a5, $9c, $94
+db $50, $a9, $9f, $a5, $50, $9c, $99, $9b, $95, $50, $91, $9e, $a9, $a4, $98, $99
+db $9e, $97, $50, $95, $9c, $a3, $95, $6f, $59, $03, $00, $02
+
+MonkeyShopCantCarry:
+db $70, $1c, $02, $00, $50, $9b, $99, $9b, $99, $95, $95, $51, $03, $00, $70, $58, $1c
+db $02, $00, $50, $99, $a3, $50, $93, $91, $a2, $a2, $a9, $99, $9e, $97, $50, $a7
+db $91, $a9, $50, $a4, $9f, $9f, $50, $9d, $a5, $93, $98, $51, $59, $03, $00, $70
+db $7b, $a9, $95, $9b, $99, $9b, $99, $9f, $9b, $95, $6f, $03, $00, $70, $58, $87
+db $99, $9c, $9c, $50, $a3, $9f, $9d, $95, $9f, $9e, $95, $50, $95, $9c, $a3, $95
+db $50, $a4, $91, $9b, $95, $50, $99, $a4, $6f, $59, $03, $00, $02
+
+PostFrankGuardText:
+db $70, $7a, $a5, $a3, $a4, $50, $57, $93, $91, $a5, $a3, $95, $50, $a9, $9f, $a5
+db $50, $92, $95, $91, $a4, $50, $a5, $a0, $50, $9f, $a5, $a2, $50, $92, $9f, $a3
+db $a3, $5c, $10, $05, $50, $94, $9f, $95, $a3, $9e, $57, $a4, $50, $9d, $95, $91
+db $9e, $50, $79, $57, $9c, $9c, $50, $9d, $9f, $a6, $95, $50, $96, $9f, $a2, $50
+db $a0, $a5, $9e, $9b, $a3, $50, $9c, $99, $9b, $95, $50, $a9, $9f, $a5, $51, $03
+db $0A
+dl $C74C58
+
+MagicantTentaGetNessName:
+db $19, $10, $01, $1B, $04, $1C, $02, $00
+db $0A
+dl MagicantNameReturn
+
+AddNessToEpilogue:
+db $1F, $11, $01
+db $18, $01, $01, $70
+db $0A
+dl $C7FB5A
+
+NewBikeText:
+db $1C, $22
+db $1B, $06
+db $1B, $03
+dd $C7C6F1
+db $19, $10, $01
+db $0B, $01
+db $1B, $02
+dd .OtherCharBike
+db $70, $1C, $0D, $50
+db $0A
+dl $C9FD4A
+.OtherCharBike:
+db $70, $1C, $0D, $50
+db $a4, $a2, $99, $95, $94, $50, $a4, $9f, $50, $a2, $99, $94, $95, $50, $91, $50
+db $92, $99, $93, $a9, $93, $9c, $95, $5c, $03, $01, $70, $92, $a5, $a4, $50
+db $1C, $14, $01
+db $08
+dd $C7E602
+db $50
+db $94
+db $99, $94, $9e, $57, $a4, $50, $9b, $9e, $9f, $a7, $50, $98, $9f, $a7, $5e, $13
+db $02
+
+Truffle1:
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $19, $20
+db $02
+
+Truffle2:
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $19, $20
+db $02
+
+Truffle3:
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $19, $20
+db $02
+
+Truffle4:
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $19, $20
+db $02
+
+Truffle5:
+db $17, $79, $51, $03, $00, $70, $84, $15, $78, $91, $50, $1c, $05, $63, $50, $91
+db $16, $0e, $17, $cc, $a4, $5e, $03, $00, $1d, $03, $ff, $1b, $02, $8a, $b5, $ee
+db $ff, $1d, $0e, $ff, $01, $08, $cf, $dc, $c7, $ff, $03
+db $19, $20
+db $02
+
+FixYouWonAlignment:
+db $15, $1D
+db $18, $05, $06, $01
+db $1C, $08, $02
+db $0A
+dl $EF79E3
+
+FixPhotoManLoad:
+db $1f, $f2, $8f, $00, $c4, $01, $0a
+dl $C7AC4D
+
+PhotomanLeave:
+db $1F, $F2, $8F, $00, $83, $02
+db $0A
+dl $C7ACA4
+
+PhotoManActionScript:
+db $25, $0C, $A0
+db $03
+dd $C33B53
+
+UnsetDenyHints:
+db $06, $05, $04
+dd .DenyOnett
+db $06, $06, $04
+dd .DenyTwoson
+db $06, $07, $04
+dd .DenyThreed
+db $06, $08, $04
+dd .DenyFourside
+db $06, $09, $04
+dd .DenySummers
+db $06, $0A, $04
+dd .DenyScaraba
+db $02
+.DenyOnett:
+db $05, $05, $04
+db $02
+.DenyTwoson:
+db $05, $06, $04
+db $02
+.DenyThreed:
+db $05, $07, $04
+db $02
+.DenyFourside:
+db $05, $08, $04
+db $02
+.DenySummers:
+db $05, $09, $04
+db $02
+.DenyScaraba:
+db $05, $0A, $04
+db $02
+
+DenyHintsNoMoney:
+db $08
+dd UnsetDenyHints
+db $15, $d0, $a9, $15, $20
+db $0A
+dl $C72669
+
+DenyHintsSaidNo:
+db $08
+dd UnsetDenyHints
+db $17, $f3, $15, $10
+db $0A
+dl $C701FA
+
+LeaderPantsText:
+db $01, $70
+db $19, $10, $01
+db $1B, $04
+db $1C, $02, $00
+db $0A
+dl LavaPantsUseTxt_DoorPantsTex
+
+EndScript:
+db $02
+
+DisableCollAndAnim:
+db $42
+dl $C0A82F
+db $03
+dl $C3A09F
+
+RideSkycicle:
+db $70, $58, $87, $95, $9c, $9c, $5c, $10, $0a, $90, $99, $a4, $57, $a3, $90, $9e
+db $9f, $a4, $90, $a4, $98, $95, $50, $83, $9b, $a9, $50, $82, $a5, $9e, $9e, $95
+db $a2, $5e, $03, $01, $70, $82, $99, $94, $95, $50, $99, $a4, $50, $91, $9e, $a9
+db $a7, $91, $a9, $a3, $6f, $59, $01
+db $19, $02
+db $89, $95, $A3, $02
+db $19, $02
+db $7E, $9F, $02
+db $1C, $07, $02
+db $11
+db $09, $02
+dd .Ride
+dd .DontRide
+db $0A
+dl .DontRide
+.Ride:
+db $12
+db $70, $58
+db $08
+dd $C7E6D7
+db $50
+db $a2, $9f, $94, $95, $50, $a4, $98, $95, $50, $83, $9b, $a9, $93, $99, $93, $9c
+db $95, $5e, $59, $1f, $02, $73, $10, $30
+db $18, $04
+db $1F, $21, $DA
+db $02
+.DontRide:
+db $12
+db $70, $58, $89, $95, $91, $98, $5c, $10, $0a, $50, $79, $50, $a7, $9f, $a5, $9c
+db $94, $9e, $57, $a4, $5C, $50, $95, $99, $a4, $98, $95, $a2, $5e, $59, $13, $02
+
+CheckForRubyPoo:
+db $1D, $05, $FF, $D0 ; Check for tiny ruby
+db $1B, $03
+dd $C8A997
+db $0A
+dl $C8A8E7
+
+LavaPantsHandleItem:
+db $1B, $00
+db $08
+dd LavaPantsUseTxt
+db $1B, $01
+db $1B, $0F, $00, $00
+db $02
+
+DisableOSSOnLumine:
+db $1f, $eb, $ff, $06
+db $1F, $41, $06
+db $0A
+dl $C99CD1
+
+TwosonCopBossText:
+db $08
+dd $EEEEBC
+db $0A
+dl $EEC785
+
+SetupNessForMagicantBoost:
+db $18, $01, $01
+db $19, $10, $01
+db $70
+db $0A
+dl $EEBDA8
+
+;ORG $C7617D
+;dd DisplayAndGetMoney
+
+;ORG $C62B87
+;db $0a, $28, $ca, $ee ; Test, delete later
+
+;New New Text
+
+ORG $F3FFE0
+db $04, $1C, $04
+db $08
+dd DynamicPhotoSetter
+db $05, $1C, $04
+db $1D, $19, $01, $02
+
+ExtraPresentCheck:
+db $1B, $00
+db $0B, $06
+db $1B, 03
+dd PhotoPresentText
+db $1B, $01
+db $0A
+dl PresentNessCheck
+;dl
+
+ORG $F3FEE0
+save_chunk_size_table:
+dw sram_chunk0_size
+dw sramchunk1_size
+dw sramchunk2_size
+dw sramchunk3_size
+dw sramchunk4_size
+dw sramchunk5_size
+save_chunk_pointer_table:
+dw sramchunk0_pointer
+dw sramchunk1_pointer
+dw sram_chunk2_pointer
+dw sram_chunk3_pointer
+dw sramchunk4_pointer
+dw sramchunk5_pointer
+dw $0000
+
+ORG $F80000
+PhotocolorTable:
+dw $5A39 ; Blank
+dw $5A49 ; Giant Step as well????
+dw $5A4D ; Giant Step
+dw $5A59 ; Onett
+dw $5A85 ; Twoson
+dw $5A8D ; Happy-Happy Free
+dw $5A91 ; Happy-Happy
+dw $5A99 ; Peaceful Rest Valley
+dw $5AB1 ; Threed
+dw $5AC1 ; Rain Circle as well?????
+dw $5AC5 ; Rainy Circle
+dw $5AAD ; Threed Daytime
+dw $5AD1 ; Winters
+dw $5AED ; Saturn Valley
+dw $5AF5 ; Grapefruit Falls
+dw $5B09 ; Dusty Dunes
+dw $5B19 ; Magnet Hill as well?????
+dw $5B1D ; Magnet Hill
+dw $5B29 ; Fourside (Make sure start-of-seed fourside isnt different)
+dw $5B4D ; Summers
+dw $5B5D ; Scaraba Bazaar
+dw $5B6D ; Scaraba Desert
+dw $5B79 ; Dalaam
+dw $5B89 ; Deep Darkness
+dw $5B91 ;Tenda Village
+dw $5B99 ; Lost Underworld
+dw $5BA1 ; Memory house
+dw $5BAD ; Magicant
+dw $5BB1 ; Deep Magicant
+dw $5BB5 ; Sea of Eden
+dw $5BC1 ; Cave of the Present
+dw $5BCD ; Cave of the Past
+dw $5BD1 ; Giygas's Lair
+dw $5C09 ; Lilliput Steps
+dw $5C0D ; Lilliput steps as well????
+dw $5C2D ; Milky Well as well????
+dw $5C31 ; Milky Well
+dw $5C35 ; Milky Well outdoors
+dw $5C51 ; Pink Cloud as well????
+dw $5C55 ; Pink Cloud
+dw $5C65 ; Lumine Hall
+dw $5C69 ; Lumine Hall as well????
+dw $5D71 ; Threed Underground
+dw $5C8D ; Sea
+dw $5C9D ; Three-Two Tunnel
+dw $5CB1 ; Threed-Desert tunnel
+dw $5CC5 ; Desert Tunnel
+dw $5CD5 ; Fourside Tunnel
+dw $5CDD ; PRV Connector Cave
+dw $5CE5 ; Saturn Cave
+dw $5CED ; Giant Step Cave
+dw $5CF5 ; Lilliput Steps cave
+dw $5CFD ; Rainy Circle Cave
+dw $5D05 ; Milky Well Caves
+dw $5D0D ; Sewers
+dw $5D15 ; Pink Cloud Cave
+dw $5D1D ; Lumine Hall Cave
+dw $5D31 ; Fire Spring Cave
+dw $5D39 ; Lier's Cave
+dw $5D49 ; Bricroad's maze
+dw $5D51 ; Stonehenge Entrance
+dw $5D59 ; Stonehenge Balcony
+dw $5D61 ; Stonehenge Flashing room
+dw $5D79 ; Belch's Factory
+dw $5D81 ; Monkey Caves
+dw $5D95 ; Gold Mine
+dw $5D99 ; Moonside
+dw $5DA9 ; Pyramid
+dw $5DB1 ; Dungeon Man
+dw $5DB5 ; Arcade
+dw $5DBD ; Onett Drugstore
+dw $5DD1 ; Ness's House
+dw $5DF1 ; Burger shop
+dw $5DF9 ; Onett Hint House
+dw $5E01 ; Onett Bakery
+dw $5E09 ; Pokey's House
+dw $5E1D ; Onett Hotel
+dw $5E29 ; Police Station
+dw $5E31 ; Town Hall
+dw $5E39 ; Onett Green House
+dw $5E41 ; Onett Blue House
+dw $5E49 ; Onett seafoam house
+dw $5E51 ; Left of Hint House
+dw $5E61 ; Onett Pink House
+dw $5E71 ; Library
+dw $5E79 ; Lier's House
+dw $5E81 ; Onett hospital
+dw $5E91 ; Treehouse
+dw $5E99 ; Traveler shack
+dw $5EA1 ; Apple Kid
+dw $5EA9 ; Orange Kid
+dw $5EB1 ; Bike Shop
+dw $5EB9 ; Twoson Dept Store
+dw $5EC1 ; Everdred's House
+dw $5EC9 ; Bus Station
+dw $5ED1 ; Twoson Orange Roof
+dw $5ED9 ; Twoson Hint House
+dw $5EE9 ; Chaos Theater
+dw $5EF5 ; Twoson Hotel
+dw $5EFD ; Twoson Pizza
+dw $5F05 ; Twoson North Left House
+dw $5F0D ; Twoson North Right House
+dw $5F15 ; Twoson Cat House
+dw $5F1D ; Twoson Hospital
+dw $5F29 ; Paula's House
+dw $5F31 ; HH House
+dw $5F35 ; HH House
+dw $5F3D ; Happy HQ
+dw $5F41 ; Happy HQ
+dw $5F49 ; Happy Drugstore
+dw $5F4D ; Happy Drugstore
+dw $5F61 ; Happy Hospital
+dw $5F65 ; Happy Hospital
+dw $5F6D ; Happy Sturn House
+dw $5F55 ; Happy Hotel
+dw $5F59 ; Happy Hotel
+dw $5F7D ; Saturn Hotel
+dw $5F85 ; Saturn Hospital
+dw $5F8D ; Saturn Shop
+dw $5F95 ; Cabin
+dw $5F9D ; Threed Drugstore
+dw $5FA1 ; Threed Drugstore Scary
+dw $5FA9 ; Threed Hint Shop
+dw $5FAD ; Threed Hint Scary
+dw $5FB5 ; Threed Bakery
+dw $5FB9 ; Threed Bakery Scary
+dw $5FC9 ; Threed Hotel Scary
+dw $5FD5 ; Threed Pizza Scary
+dw $5FED ; Threed Red House Scary
+dw $600D ; Tent
+dw $6011 ; Tent Scary
+dw $6019 ; Threed Hospital
+dw $601D ; Threed Hospital Scary
+dw $6025 ; Snow Wood
+dw $6031 ; Winters drugstore
+dw $603D ; Andonuts Lab
+dw $6051 ; Winters tents
+dw $6059 ; Miner shack
+dw $6061 ; DD Drugstore
+dw $6069 ; Fourside Dept Store
+dw $607D ; Monotoli Building
+dw $608D ; Monotoli Gold Room
+dw $609D ; Monotoli upstairs
+dw $60A5 ; Monotoli Elevator
+dw $60D5 ; Monotoli Offices?
+dw $60C1 ; Monotoli penthouse
+dw $60E1 ; Topolla Theater
+dw $60F1 ; Fourside Bakery
+dw $60F5 ; Fourside Hotel
+dw $6101 ; Fourside Hotel
+dw $6109 ; Fourside Cafe
+dw $6115 ; Fourside Museum
+dw $611D ; Fourside Hospital
+dw $6125 ; Stoic Club
+dw $612D ; Summers Shop
+dw $6141 ; Summers Restaurant
+dw $6139 ; Summers Hotel
+dw $6149 ; Summers Museum
+dw $6151 ; Summers Hospital
+dw $6159 ; Toto Shop
+dw $617D ; Scaraba Shop
+dw $6189 ; Scaraba Hotel
+dw $6191 ; Scaraba House
+dw $6199 ; Scaraba Hospital
+dw $6161 ; Toto House
+dw $6169 ; Dalaam Palace
+dw $6175 ; Dalaam House
+dw $61A9 ; Magicant Shop
+dw $61B1 ; Magicant House
+dw $61BD ; Flying Man House
+dw $61C1 ; Moonside Hotel
+dw $61C9 ; Sky
+;todo here; Hotel wakeups
+;Saturn house when bad carpainter
+;run down onett house
+;tala rama
+;threed pizza shops
+;fire spring sanc
+;Mouse House
+
+GoodPhotoColors:
+dw $0000 ; Blank
+dw $0000 ; Giant Step as well????
+dw $0000 ; Giant Step
+dw $0000 ; Onett
+dw $0000 ; Twoson
+dw $0007 ; Happy-Happy Free
+dw $0007 ; Happy-Happy
+dw $0003 ; Peaceful Rest Valley
+dw $0006 ; Threed
+dw $0004 ; Rain Circle as well?????
+dw $0004 ; Rainy Circle
+dw $0006 ; Threed Daytime
+dw $0004 ; Winters
+dw $0008 ; Saturn Valley
+dw $0007 ; Grapefruit Falls
+dw $0009 ; Dusty Dunes
+dw $0009 ; Magnet Hill as well?????
+dw $0009 ; Magnet Hill
+dw $0009 ; Fourside (Make sure start-of-seed fourside isnt different)
+dw $000F ; Summers
+dw $0011 ; Scaraba Bazaar
+dw $0011 ; Scaraba Desert
+dw $000E ; Dalaam
+dw $0012 ; Deep Darkness
+dw $0013 ; Tenda Village
+dw $0012 ; Lost Underworld
+dw $0010 ; Memory house
+dw $0007 ; Magicant
+dw $0010 ; Deep Magicant
+dw $0010 ; Sea of Eden
+dw $0012 ; Cave of the Present
+dw $000F ; Cave of the Past
+dw $0005 ; Giygas's Lair
+dw $0002 ; Lilliput Steps
+dw $0002 ; Lilliput steps as well????
+dw $0008 ; Milky Well as well????
+dw $0008 ; Milky Well
+dw $0008 ; Milky Well outdoors
+dw $0002 ; Pink Cloud as well????
+dw $0002 ; Pink Cloud
+dw $0005 ; Lumine Hall
+dw $0005 ; Lumine Hall as well????
+dw $000B ; Threed Underground
+dw $0010 ; Sea
+dw $0000 ; Three-Two Tunnel
+dw $0000 ; Threed-Desert tunnel
+dw $0000 ; Desert Tunnel
+dw $0000 ; Fourside Tunnel
+dw $0005 ; PRV Connector Cave
+dw $0005 ; Saturn Cave
+dw $0010 ; Giant Step Cave
+dw $0010 ; Lilliput Steps cave
+dw $0010 ; Rainy Circle Cave
+dw $0010 ; Milky Well Caves
+dw $0011 ; Sewers
+dw $0005 ; Pink Cloud Cave
+dw $0013 ; Lumine Hall Cave
+dw $0013 ; Fire Spring Cave
+dw $0010 ; Lier's Cave
+dw $0005 ; Bricroad's maze
+dw $000A ; Stonehenge Entrance
+dw $0004 ; Stonehenge Balcony
+dw $0010 ; Stonehenge Flashing room
+dw $0002 ; Belch's Factory
+dw $0010 ; Monkey Caves
+dw $0010 ; Gold Mine
+dw $0007 ; Moonside
+dw $0013 ; Pyramid
+dw $0013 ; Dungeon Man
+dw $0008 ; Arcade
+dw $000C ; Onett Drugstore
+dw $0010 ; Ness's House
+dw $000C ; Burger shop
+dw $0010 ; Onett Hint House
+dw $000C ; Onett Bakery
+dw $0010 ; Pokey's House
+dw $0010 ; Onett Hotel
+dw $0009 ; Police Station
+dw $0010 ; Town Hall
+dw $0010 ; Onett Green House
+dw $0010 ; Onett Blue House
+dw $0010 ; Onett seafoam house
+dw $0010 ; Left of Hint House
+dw $0010 ; Onett Pink House
+dw $0009 ; Library
+dw $0010 ; Lier's House
+dw $0010 ; Onett hospital
+dw $000A ; Treehouse
+dw $0010 ; Traveler shack
+dw $0009 ; Apple Kid
+dw $0010 ; Orange Kid
+dw $000C ; Bike Shop
+dw $000C ; Twoson Dept Store
+dw $0010 ; Everdred's House
+dw $0012 ; Bus Station
+dw $0010 ; Twoson Orange Roof
+dw $0010 ; Twoson Hint House
+dw $000B ; Chaos Theater
+dw $0010 ; Twoson Hotel
+dw $0010 ; Twoson Pizza
+dw $0010 ; Twoson North Left House
+dw $0010 ; Twoson North Right House
+dw $0010 ; Twoson Cat House
+dw $0010 ; Twoson Hospital
+dw $0010 ; Paula's House
+dw $0010 ; HH House
+dw $0010 ; HH House
+dw $0008 ; Happy HQ
+dw $0008 ; Happy HQ
+dw $000C ; Happy Drugstore
+dw $000C ; Happy Drugstore
+dw $0010 ; Happy Hospital
+dw $0010 ; Happy Hospital
+dw $0010 ; Happy Sturn House
+dw $0010 ; Happy Hotel
+dw $0010 ; Happy Hotel
+dw $0010 ; Saturn Hotel
+dw $0010 ; Saturn Hospital
+dw $0010 ; Saturn Shop
+dw $0010 ; Cabin
+dw $000C ; Threed Drugstore
+dw $000C ; Threed Drugstore Scary
+dw $0010 ; Threed Hint Shop
+dw $0010 ; Threed Hint Scary
+dw $000C; Threed Bakery
+dw $000C ; Threed Bakery Scary
+dw $0010 ; Threed Hotel Scary
+dw $000C ; Threed Pizza Scary
+dw $0010 ; Threed Red House Scary
+dw $0010 ; Tent
+dw $0010 ; Tent Scary
+dw $0010 ; Threed Hospital
+dw $0010 ; Threed Hospital Scary
+dw $0010 ; Snow Wood
+dw $000C ; Winters drugstore
+dw $000B ; Andonuts Lab
+dw $0010 ; Winters tents
+dw $0010 ; Miner shack
+dw $0010 ; DD Drugstore
+dw $000C ; Fourside Dept Store
+dw $0010 ; Monotoli Building
+dw $0010 ; Monotoli Gold Room
+dw $0010 ; Monotoli upstairs
+dw $0010 ; Monotoli Elevator
+dw $0010 ; Monotoli Offices?
+dw $0010 ; Monotoli penthouse
+dw $0010 ; Topolla Theater
+dw $000C ; Fourside Bakery
+dw $000C ; Fourside Hotel
+dw $000C ; Fourside Hotel
+dw $000B ; Fourside Cafe
+dw $000B ; Fourside Museum
+dw $0010 ; Fourside Hospital
+dw $0010 ; Stoic Club
+dw $0010 ; Summers Shop
+dw $0010 ; Summers Restaurant
+dw $000B ; Summers Hotel
+dw $0010 ; Summers Museum
+dw $0010 ; Summers Hospital
+dw $0010 ; Toto Shop
+dw $0010 ; Scaraba Shop
+dw $0010 ; Scaraba Hotel
+dw $0010 ; Scaraba House
+dw $0010 ; Scaraba Hospital
+dw $0010 ; Toto House
+dw $000D ; Dalaam Palace
+dw $0010 ; Dalaam House
+dw $0000 ; Magicant Shop
+dw $0000 ; Magicant House
+dw $0000 ; Flying Man House
+dw $0010 ; Moonside Hotel
+dw $0013 ; Sky
+
+ORG $F89000
+incbin CrashFont.bin
+
+ORG $F89200
+incbin crashscreen.bin
+
+ORG $F3F000
+DisplayAndGetMoney:
+db $01
+db $1F, $02, $74
+db $18, $0A
+db $18, $03, $01
+db $10, $3C
+db $19, $10, $01
+db $1B, $04
+db $70, $58, $1C, $02, $00, $50, $97, $9F, $A4, $50, $54, $1B, $06
+db $1C, $0A, $00, $00, $00, $00
+db $5E, $59
+db $02
+
+DisplayAndGetMoneyPSI:
+db $18, $0A
+db $18, $01, $01
+db $19, $10, $01
+db $1B, $04
+db $70, $58, $1C, $02, $00, $50, $97, $9F, $A4, $50, $54, $1B, $06
+db $1C, $0A, $00, $00, $00, $00
+db $5E, $59
+db $1F, $02, $74
+db $10, $3C
+db $02
+
+DisplayAndGetMoneyPause:
+db $18, $0A
+db $18, $03, $01
+db $19, $10, $01
+db $1B, $04
+db $70, $58, $1C, $02, $00, $50, $97, $9F, $A4, $50, $54, $1B, $06
+db $1C, $0A, $00, $00, $00, $00
+db $5E, $59
+db $1F, $02, $74
+db $10, $3C
+db $03
+db $1D, $19, $01
+db $02
+
+;ORG $EEB0DA
+;dd DisplayAndGetMoneyPause
+
+;ORG $EEAA08
+;dd DisplayAndGetMoneyPSI
+
+
+
+;todo, PSI rockin?
+
+
+
+
+
+
+;ORG $C93B60
+;db $B1, $63, $03;Font test, delete later. Also update the saturn font
+
+
+;ORG $D59CD3
+;db $42;spell type test
+
+;ORG $D59CC9
+;dw $016D
+
+
+
+;;;;;;;;;;;NAME STUFF PLS DELETE
+;ORG $C1F984
+;LDA #$0006;character limit in the name screen
+
+;ORG $C193BA
+;LDA #$0006;Character limit on are you sure screen
+
+;ORG $C19924
+;LDX #$0006; Character menu header, goods/status
+
+
+;B580 reserved for new names?
+;;;;;;;;;;;;;;;;;;
+
+
+
+;ORG $C07482
+;JSL FixTentBug
+
+;ORG $FFFBE0
+;FixTentBug:
+;CMP #$0400
+;BCS .Bail
+;CPX #$0500
+;BCS .Bail
+;STY $10
+;STA $0E
+;RTL
+;.Bail:
+;SEP #$20
+;PLA
+;PLX
+;LDA #$FF
+;PLD
+;RTL
\ No newline at end of file
diff --git a/worlds/earthbound/src/new psi animations/PSI Blast Alpha.gif b/worlds/earthbound/src/new psi animations/PSI Blast Alpha.gif
new file mode 100644
index 0000000000..f969150a80
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Blast Alpha.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Blast Beta.gif b/worlds/earthbound/src/new psi animations/PSI Blast Beta.gif
new file mode 100644
index 0000000000..0180386946
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Blast Beta.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Blast Gamma.gif b/worlds/earthbound/src/new psi animations/PSI Blast Gamma.gif
new file mode 100644
index 0000000000..1fc2134e24
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Blast Gamma.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Blast Omega.gif b/worlds/earthbound/src/new psi animations/PSI Blast Omega.gif
new file mode 100644
index 0000000000..27b1f32cb4
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Blast Omega.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Missile Alpha.gif b/worlds/earthbound/src/new psi animations/PSI Missile Alpha.gif
new file mode 100644
index 0000000000..69c5ecc9eb
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Missile Alpha.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Missile Gamma.gif b/worlds/earthbound/src/new psi animations/PSI Missile Gamma.gif
new file mode 100644
index 0000000000..7e846415c6
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Missile Gamma.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Missile Omega.gif b/worlds/earthbound/src/new psi animations/PSI Missile Omega.gif
new file mode 100644
index 0000000000..66114dfe09
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Missile Omega.gif differ
diff --git a/worlds/earthbound/src/new psi animations/PSI Missile beta.gif b/worlds/earthbound/src/new psi animations/PSI Missile beta.gif
new file mode 100644
index 0000000000..6b09312318
Binary files /dev/null and b/worlds/earthbound/src/new psi animations/PSI Missile beta.gif differ
diff --git a/worlds/earthbound/test/__init__.py b/worlds/earthbound/test/__init__.py
new file mode 100644
index 0000000000..12f2a83e28
--- /dev/null
+++ b/worlds/earthbound/test/__init__.py
@@ -0,0 +1,6 @@
+from test.bases import WorldTestBase
+
+
+class EarthBoundTestBase(WorldTestBase):
+    game = "EarthBound"
+    player = 1
diff --git a/worlds/earthbound/test/test_access.py b/worlds/earthbound/test/test_access.py
new file mode 100644
index 0000000000..c2c98ea0be
--- /dev/null
+++ b/worlds/earthbound/test/test_access.py
@@ -0,0 +1,66 @@
+from . import EarthBoundTestBase
+
+
+class TestPSIShuffle(EarthBoundTestBase):
+    options = {
+        "PSIShuffle": 1
+    }
+
+
+class TestExtendedPSIShuffle(EarthBoundTestBase):
+    options = {
+        "PSIShuffle": 2
+    }
+
+
+class TestBossShuffle(EarthBoundTestBase):
+    options = {
+        "BossShuffle": 1
+    }
+
+
+class TestBossShuffleWithDD(EarthBoundTestBase):
+    options = {
+        "BossShuffle": 1,
+        "DecoupleDiamondDog": 1
+    }
+
+
+class TestBossShuffleGiygas(EarthBoundTestBase):
+    options = {
+        "BossShuffle": 1,
+        "ShuffleGiygas": 1
+    }
+
+
+class TestBossShuffleFull(EarthBoundTestBase):
+    options = {
+        "BossShuffle": 1,
+        "ShuffleGiygas": 1,
+        "DecoupleDiamondDog": 1
+    }
+
+
+class TestShopChecks(EarthBoundTestBase):
+    options = {
+        "ShopRandomizer": 2,
+    }
+
+
+class TestDungeons(EarthBoundTestBase):
+    options = {
+        "DungeonShuffle": True,
+    }
+
+
+class TestEnemizer(EarthBoundTestBase):
+    options = {
+        "EnemizerStats": True,
+        "EnemizerAttacks": True,
+        "EnemizerAttributes": True,
+    }
+
+class TestMapPalettes(EarthBoundTestBase):
+    options = {
+        "RandomMapColors": 3,
+    }
\ No newline at end of file
diff --git a/worlds/factorio/Client.py b/worlds/factorio/Client.py
old mode 100644
new mode 100755
index 51eb487f84..beec7c434e
--- a/worlds/factorio/Client.py
+++ b/worlds/factorio/Client.py
@@ -56,6 +56,10 @@ class FactorioCommandProcessor(ClientCommandProcessor):
         """Toggle filtering of item sends that get displayed in-game to only those that involve you."""
         self.ctx.toggle_filter_item_sends()
 
+    def _cmd_toggle_connection_change_filter(self):
+        """Toggle filtering of Connected/Disconnected players."""
+        self.ctx.toggle_filter_connection_changes()
+
     def _cmd_toggle_chat(self):
         """Toggle sending of chat messages from players on the Factorio server to Archipelago."""
         self.ctx.toggle_bridge_chat_out()
@@ -82,7 +86,7 @@ class FactorioContext(CommonContext):
     # updated by spinup server
     mod_version: Version = Version(0, 0, 0)
 
-    def __init__(self, server_address, password, filter_item_sends: bool, bridge_chat_out: bool,
+    def __init__(self, server_address, password, filter_connection_changes: bool, filter_item_sends: bool, bridge_chat_out: bool,
                  rcon_port: int, rcon_password: str, server_settings_path: str | None,
                  factorio_server_args: tuple[str, ...]):
         super(FactorioContext, self).__init__(server_address, password)
@@ -94,6 +98,7 @@ class FactorioContext(CommonContext):
         self.factorio_json_text_parser = FactorioJSONtoTextParser(self)
         self.energy_link_increment = 0
         self.last_deplete = 0
+        self.filter_connection_changes: bool = filter_connection_changes
         self.filter_item_sends: bool = filter_item_sends
         self.multiplayer: bool = False  # whether multiple different players have connected
         self.bridge_chat_out: bool = bridge_chat_out
@@ -130,6 +135,7 @@ class FactorioContext(CommonContext):
     def on_print_json(self, args: dict):
         if self.rcon_client:
             if (not self.filter_item_sends or not self.is_uninteresting_item_send(args)) \
+                    and (not self.filter_connection_changes or not self.is_connection_change(args)) \
                     and not self.is_echoed_chat(args):
                 text = self.factorio_json_text_parser(copy.deepcopy(args["data"]))
                 if not text.startswith(
@@ -222,6 +228,15 @@ class FactorioContext(CommonContext):
         logger.info(announcement)
         self.print_to_game(announcement)
 
+    def toggle_filter_connection_changes(self) -> None:
+        self.filter_connection_changes = not self.filter_connection_changes
+        if self.filter_connection_changes:
+            announcement = "Connection changes are now filtered."
+        else:
+            announcement = "Connection changes are no longer filtered."
+        logger.info(announcement)
+        self.print_to_game(announcement)
+
     def toggle_bridge_chat_out(self) -> None:
         self.bridge_chat_out = not self.bridge_chat_out
         if self.bridge_chat_out:
@@ -388,6 +403,9 @@ async def factorio_server_watcher(ctx: FactorioContext):
                 elif re.match(r"^[0-9.]+ Script @[^ ]+\.lua:\d+: Player command toggle-ap-send-filter$", msg):
                     factorio_server_logger.debug(msg)
                     ctx.toggle_filter_item_sends()
+                elif re.match(r"^[0-9.]+ Script @[^ ]+\.lua:\d+: Player command toggle-ap-connection-change-filter$", msg):
+                    factorio_server_logger.debug(msg)
+                    ctx.toggle_filter_connection_changes()
                 elif re.match(r"^[0-9.]+ Script @[^ ]+\.lua:\d+: Player command toggle-ap-chat$", msg):
                     factorio_server_logger.debug(msg)
                     ctx.toggle_bridge_chat_out()
@@ -566,7 +584,7 @@ def launch(*new_args: str):
 
     # args handling
     parser = get_base_parser(description="Optional arguments to Factorio Client follow. "
-                                         "Remaining arguments get passed into bound Factorio instance."
+                                         "Remaining arguments get passed into bound Factorio instance. "
                                          "Refer to Factorio --help for those.")
     parser.add_argument('--rcon-port', default='24242', type=int, help='Port to use to communicate with Factorio')
     parser.add_argument('--rcon-password', help='Password to authenticate with RCON.')
@@ -586,6 +604,7 @@ def launch(*new_args: str):
             raise FileNotFoundError(f"Could not find file {server_settings} for server_settings. Aborting.")
 
     initial_filter_item_sends = bool(settings.filter_item_sends)
+    initial_filter_connection_changes = bool(settings.filter_connection_changes)
     initial_bridge_chat_out = bool(settings.bridge_chat_out)
 
     if not os.path.exists(os.path.dirname(executable)):
@@ -600,7 +619,7 @@ def launch(*new_args: str):
 
     asyncio.run(main(lambda: FactorioContext(
         args.connect, args.password,
-        initial_filter_item_sends, initial_bridge_chat_out,
+        initial_filter_connection_changes, initial_filter_item_sends, initial_bridge_chat_out,
         rcon_port, rcon_password, server_settings, rest
     )))
     colorama.deinit()
diff --git a/worlds/factorio/Locations.py b/worlds/factorio/Locations.py
index 52f0954cba..844739b16f 100644
--- a/worlds/factorio/Locations.py
+++ b/worlds/factorio/Locations.py
@@ -1,6 +1,6 @@
 from typing import Dict, List
 
-from .Technologies import factorio_base_id
+from .Technologies import factorio_base_id, recipes
 from .Options import MaxSciencePack
 
 
@@ -21,5 +21,18 @@ for pool in location_pools.values():
     location_table.update({name: ap_id for ap_id, name in enumerate(pool, start=end_id)})
     end_id += len(pool)
 
+craftsanity_locations = []
+valid_items = []
+item_category = {}
+for recipe_name, recipe in recipes.items():
+    if not recipe_name.endswith(("-barrel", "-science-pack")):
+        for result in recipe.products:
+            if result not in valid_items:
+                valid_items.append(result)
+for i, item in enumerate(valid_items, start=end_id):
+    location_table[f"Craft {item}"] = i
+    craftsanity_locations.append(f"Craft {item}")
+    end_id += 1
+
 assert end_id - len(location_table) == factorio_base_id
 del pool
diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py
index 3cc156112d..00ef0d866a 100644
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -112,7 +112,7 @@ def generate_mod(world: "Factorio", output_directory: str):
             settings_template = template_env.get_template("settings.lua")
     # get data for templates
     locations = [(location, location.item)
-                 for location in world.science_locations]
+                 for location in world.science_locations + world.craftsanity_locations]
     mod_name = f"AP-{multiworld.seed_name}-P{player}-{multiworld.get_file_safe_player_name(player)}"
     versioned_mod_name = mod_name + "_" + Utils.__version__
 
diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 0a789669d5..70880aaaf9 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -6,7 +6,7 @@ import typing
 from schema import Schema, Optional, And, Or, SchemaError
 
 from Options import Choice, OptionDict, OptionSet, DefaultOnToggle, Range, DeathLink, Toggle, \
-    StartInventoryPool, PerGameCommonOptions, OptionGroup
+    StartInventoryPool, PerGameCommonOptions, OptionGroup, NamedRange
 
 
 # schema helpers
@@ -60,6 +60,20 @@ class Goal(Choice):
     default = 0
 
 
+class CraftSanity(NamedRange):
+    """Choose a number of researches to require crafting a specific item rather than with science packs.
+    May be capped based on the total number of locations.
+    There will always be at least 2 Science Pack research locations for automation and logistics, and 1 for rocket-silo
+    if the Rocket Silo option is not set to Spawn."""
+    display_name = "CraftSanity"
+    default = 0
+    range_start = 0
+    range_end = 183
+    special_range_names = {
+        "disabled": 0
+    }
+
+
 class TechCost(Range):
     range_start = 1
     range_end = 10000
@@ -345,6 +359,7 @@ class FactorioWorldGen(OptionDict):
         "seed": None,
         "starting_area": 1,
         "peaceful_mode": False,
+        "no_enemies_mode": False,
         "cliff_settings": {
             "name": "cliff",
             "cliff_elevation_0": 10,
@@ -394,6 +409,7 @@ class FactorioWorldGen(OptionDict):
             Optional("height"): And(int, lambda n: n >= 0),
             Optional("starting_area"): FloatRange(0.166, 6),
             Optional("peaceful_mode"): LuaBool,
+            Optional("no_enemies_mode"): LuaBool,
             Optional("cliff_settings"): {
                 "name": str, "cliff_elevation_0": FloatRange(0, 99),
                 "cliff_elevation_interval": FloatRange(0.066, 241),  # 40/frequency
@@ -473,6 +489,7 @@ class EnergyLink(Toggle):
 class FactorioOptions(PerGameCommonOptions):
     max_science_pack: MaxSciencePack
     goal: Goal
+    craftsanity: CraftSanity
     tech_tree_layout: TechTreeLayout
     min_tech_cost: MinTechCost
     max_tech_cost: MaxTechCost
diff --git a/worlds/factorio/Technologies.py b/worlds/factorio/Technologies.py
index 192cd1fefb..551276fbe3 100644
--- a/worlds/factorio/Technologies.py
+++ b/worlds/factorio/Technologies.py
@@ -334,14 +334,15 @@ required_technologies: Dict[str, FrozenSet[Technology]] = Utils.KeyedDefaultDict
     recursively_get_unlocking_technologies(ingredient_name, unlock_func=unlock)))
 
 
-def get_rocket_requirements(silo_recipe: Optional[Recipe], part_recipe: Recipe,
+def get_rocket_requirements(silo_recipe: Optional[Recipe], part_recipe: Optional[Recipe],
                             satellite_recipe: Optional[Recipe], cargo_landing_pad_recipe: Optional[Recipe]) -> Set[str]:
     techs = set()
     if silo_recipe:
         for ingredient in silo_recipe.ingredients:
             techs |= recursively_get_unlocking_technologies(ingredient)
-    for ingredient in part_recipe.ingredients:
-        techs |= recursively_get_unlocking_technologies(ingredient)
+    if part_recipe:
+        for ingredient in part_recipe.ingredients:
+            techs |= recursively_get_unlocking_technologies(ingredient)
     if cargo_landing_pad_recipe:
         for ingredient in cargo_landing_pad_recipe.ingredients:
             techs |= recursively_get_unlocking_technologies(ingredient)
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 8dc654099b..ceb758669d 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -9,7 +9,7 @@ from BaseClasses import Region, Location, Item, Tutorial, ItemClassification
 from worlds.AutoWorld import World, WebWorld
 from worlds.LauncherComponents import Component, components, Type, launch as launch_component
 from worlds.generic import Rules
-from .Locations import location_pools, location_table
+from .Locations import location_pools, location_table, craftsanity_locations
 from .Mod import generate_mod
 from .Options import (FactorioOptions, MaxSciencePack, Silo, Satellite, TechTreeInformation, Goal,
                       TechCostDistribution, option_groups)
@@ -88,6 +88,7 @@ class Factorio(World):
     skip_silo: bool = False
     origin_region_name = "Nauvis"
     science_locations: typing.List[FactorioScienceLocation]
+    craftsanity_locations: typing.List[FactorioCraftsanityLocation]
     removed_technologies: typing.Set[str]
     settings: typing.ClassVar[FactorioSettings]
     trap_names: tuple[str] = ("Evolution", "Attack", "Teleport", "Grenade", "Cluster Grenade", "Artillery",
@@ -100,6 +101,7 @@ class Factorio(World):
         self.advancement_technologies = set()
         self.custom_recipes = {}
         self.science_locations = []
+        self.craftsanity_locations = []
         self.tech_tree_layout_prerequisites = {}
 
     generate_output = generate_mod
@@ -127,17 +129,42 @@ class Factorio(World):
 
         location_pool = []
 
+        craftsanity_pool = [craft for craft in craftsanity_locations
+                            if self.options.silo != Silo.option_spawn
+                            or craft not in ["Craft rocket-silo", "Craft cargo-landing-pad"]]
+        # Ensure at least 2 science pack locations for automation and logistics, and 1 more for rocket-silo
+        # if it is not pre-spawned
+        craftsanity_count = min(self.options.craftsanity.value, len(craftsanity_pool),
+                                location_count - (2 if self.options.silo == Silo.option_spawn else 3))
+
+        location_count -= craftsanity_count
+
         for pack in sorted(self.options.max_science_pack.get_allowed_packs()):
             location_pool.extend(location_pools[pack])
         try:
-            location_names = random.sample(location_pool, location_count)
+            # Ensure there are two "AP-1-" locations for automation and logistics, and one max science pack location
+            # for rocket-silo if it is not pre-spawned
+            max_science_pack_number = len(self.options.max_science_pack.get_allowed_packs())
+            science_location_names = None
+            while (not science_location_names or
+                   len([location for location in science_location_names if location.startswith("AP-1-")]) < 2
+                    or (self.options.silo != Silo.option_spawn and len([location for location in science_location_names
+                            if location.startswith(f"AP-{max_science_pack_number}")]) < 1)):
+                science_location_names = random.sample(location_pool, location_count)
+            craftsanity_location_names = random.sample(craftsanity_pool, craftsanity_count)
+
         except ValueError as e:
             # should be "ValueError: Sample larger than population or is negative"
             raise Exception("Too many traps for too few locations. Either decrease the trap count, "
                             f"or increase the location count (higher max science pack). (Player {self.player})") from e
 
         self.science_locations = [FactorioScienceLocation(player, loc_name, self.location_name_to_id[loc_name], nauvis)
-                                  for loc_name in location_names]
+                                  for loc_name in science_location_names]
+
+        self.craftsanity_locations = [FactorioCraftsanityLocation(player, loc_name, self.location_name_to_id[loc_name], nauvis)
+                                      for loc_name in craftsanity_location_names]
+
+
         distribution: TechCostDistribution = self.options.tech_cost_distribution
         min_cost = self.options.min_tech_cost.value
         max_cost = self.options.max_tech_cost.value
@@ -159,6 +186,7 @@ class Factorio(World):
             location.count = rand_values[i]
         del rand_values
         nauvis.locations.extend(self.science_locations)
+        nauvis.locations.extend(self.craftsanity_locations)
         location = FactorioLocation(player, "Rocket Launch", None, nauvis)
         nauvis.locations.append(location)
         event = FactorioItem("Victory", ItemClassification.progression, None, player)
@@ -188,7 +216,7 @@ class Factorio(World):
         loc: FactorioScienceLocation
         if self.options.tech_tree_information == TechTreeInformation.option_full:
             # mark all locations as pre-hinted
-            for loc in self.science_locations:
+            for loc in self.science_locations + self.craftsanity_locations:
                 loc.revealed = True
         if self.skip_silo:
             self.removed_technologies |= {"rocket-silo"}
@@ -236,6 +264,23 @@ class Factorio(World):
                 location.access_rule = lambda state, ingredient=ingredient: \
                     all(state.has(technology.name, player) for technology in required_technologies[ingredient])
 
+        for location in self.craftsanity_locations:
+            if location.crafted_item == "crude-oil":
+                recipe = recipes["pumpjack"]
+            elif location.crafted_item in recipes:
+                recipe = recipes[location.crafted_item]
+            else:
+                for recipe_name, recipe in recipes.items():
+                    if recipe_name.endswith("-barrel"):
+                        continue
+                    if location.crafted_item in recipe.products:
+                        break
+                else:
+                    raise Exception(
+                        f"No recipe found for {location.crafted_item} for Craftsanity for player {self.player}")
+            location.access_rule = lambda state, recipe=recipe: \
+                state.has_all({technology.name for technology in recipe.recursive_unlocking_technologies}, player)
+
         for location in self.science_locations:
             Rules.set_rule(location, lambda state, ingredients=frozenset(location.ingredients):
                 all(state.has(f"Automated {ingredient}", player) for ingredient in ingredients))
@@ -246,14 +291,15 @@ class Factorio(World):
 
         silo_recipe = None
         cargo_pad_recipe = None
-        if self.options.silo == Silo.option_spawn:
+        if self.options.silo != Silo.option_spawn:
             silo_recipe = self.get_recipe("rocket-silo")
             cargo_pad_recipe = self.get_recipe("cargo-landing-pad")
         part_recipe = self.custom_recipes["rocket-part"]
-        satellite_recipe = None
-        if self.options.goal == Goal.option_satellite:
-            satellite_recipe = self.get_recipe("satellite")
-        victory_tech_names = get_rocket_requirements(silo_recipe, part_recipe, satellite_recipe, cargo_pad_recipe)
+        satellite_recipe = self.get_recipe("satellite")
+        victory_tech_names = get_rocket_requirements(
+            silo_recipe, part_recipe,
+            satellite_recipe if self.options.goal == Goal.option_satellite else None,
+            cargo_pad_recipe)
         if self.options.silo == Silo.option_spawn:
             victory_tech_names -= {"rocket-silo"}
         else:
@@ -263,6 +309,46 @@ class Factorio(World):
                                                                            victory_tech_names)
         self.multiworld.completion_condition[player] = lambda state: state.has('Victory', player)
 
+        if "Craft rocket-silo" in self.multiworld.regions.location_cache[self.player]:
+            victory_tech_names_r = get_rocket_requirements(silo_recipe, None, None, None)
+            if self.options.silo == Silo.option_spawn:
+                victory_tech_names_r -= {"rocket-silo"}
+            else:
+                victory_tech_names_r |= {"rocket-silo"}
+            self.get_location("Craft rocket-silo").access_rule = lambda state: all(state.has(technology, player)
+                                                                                   for technology in
+                                                                                   victory_tech_names_r)
+
+        if "Craft rocket-part" in self.multiworld.regions.location_cache[self.player]:
+            victory_tech_names_p = get_rocket_requirements(silo_recipe, part_recipe, None, None)
+            if self.options.silo == Silo.option_spawn:
+                victory_tech_names_p -= {"rocket-silo"}
+            else:
+                victory_tech_names_p |= {"rocket-silo"}
+            self.get_location("Craft rocket-part").access_rule = lambda state: all(state.has(technology, player)
+                                                                                   for technology in
+                                                                                   victory_tech_names_p)
+
+        if "Craft satellite" in self.multiworld.regions.location_cache[self.player]:
+            victory_tech_names_s = get_rocket_requirements(None, None, satellite_recipe, None)
+            if self.options.silo == Silo.option_spawn:
+                victory_tech_names_s -= {"rocket-silo"}
+            else:
+                victory_tech_names_s |= {"rocket-silo"}
+            self.get_location("Craft satellite").access_rule = lambda state: all(state.has(technology, player)
+                                                                                   for technology in
+                                                                                   victory_tech_names_s)
+
+        if "Craft cargo-landing-pad" in self.multiworld.regions.location_cache[self.player]:
+            victory_tech_names_c = get_rocket_requirements(None, None, None, cargo_pad_recipe)
+            if self.options.silo == Silo.option_spawn:
+                victory_tech_names_c -= {"rocket-silo"}
+            else:
+                victory_tech_names_c |= {"rocket-silo"}
+            self.get_location("Craft cargo-landing-pad").access_rule = lambda state: all(state.has(technology, player)
+                                                                                   for technology in
+                                                                                   victory_tech_names_c)
+
     def get_recipe(self, name: str) -> Recipe:
         return self.custom_recipes[name] if name in self.custom_recipes \
             else next(iter(all_product_sources.get(name)))
@@ -486,9 +572,17 @@ class Factorio(World):
         needed_recipes = self.options.max_science_pack.get_allowed_packs() | {"rocket-part"}
         if self.options.silo != Silo.option_spawn:
             needed_recipes |= {"rocket-silo", "cargo-landing-pad"}
-        if self.options.goal.value == Goal.option_satellite:
+        if (self.options.goal.value == Goal.option_satellite
+                or "Craft satellite" in self.multiworld.regions.location_cache[self.player]):
             needed_recipes |= {"satellite"}
 
+        needed_items = {location.crafted_item for location in self.craftsanity_locations}
+        for recipe_name, recipe in recipes.items():
+            for product in recipe.products:
+                if product in needed_items:
+                    self.advancement_technologies |= {tech.name for tech in recipe.recursive_unlocking_technologies}
+                    break
+
         for recipe in needed_recipes:
             recipe = self.custom_recipes.get(recipe, recipes[recipe])
             self.advancement_technologies |= {tech.name for tech in recipe.recursive_unlocking_technologies}
@@ -520,9 +614,23 @@ class FactorioLocation(Location):
     game: str = Factorio.game
 
 
+class FactorioCraftsanityLocation(FactorioLocation):
+    ingredients = {}
+    count = 0
+    revealed = False
+
+    def __init__(self, player: int, name: str, address: int, parent: Region):
+        super(FactorioCraftsanityLocation, self).__init__(player, name, address, parent)
+
+    @property
+    def crafted_item(self):
+        return " ".join(self.name.split(" ")[1:])
+
+
 class FactorioScienceLocation(FactorioLocation):
     complexity: int
     revealed: bool = False
+    crafted_item = None
 
     # Factorio technology properties:
     ingredients: typing.Dict[str, int]
diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index cd0c00e987..3f754d925c 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -859,6 +859,10 @@ commands.add_command("toggle-ap-send-filter", "Toggle filtering of item sends th
     log("Player command toggle-ap-send-filter") -- notifies client
 end)
 
+commands.add_command("toggle-ap-connection-change-filter", "Toggle filtering of players joining or parting", function(call)
+    log("Player command toggle-ap-connection-change-filter") -- notifies client
+end)
+
 commands.add_command("toggle-ap-chat", "Toggle sending of chat messages from players on the Factorio server to Archipelago.", function(call)
     log("Player command toggle-ap-chat") -- notifies client
 end)
diff --git a/worlds/factorio/data/mod_template/data-final-fixes.lua b/worlds/factorio/data/mod_template/data-final-fixes.lua
index 8092062bc3..e459523019 100644
--- a/worlds/factorio/data/mod_template/data-final-fixes.lua
+++ b/worlds/factorio/data/mod_template/data-final-fixes.lua
@@ -63,22 +63,6 @@ template_tech.upgrade = false
 template_tech.effects = {}
 template_tech.prerequisites = {}
 
-{%- if max_science_pack < 6 %}
-    technologies["space-science-pack"].effects = {}
-    {%- if max_science_pack == 0 %}
-        table.insert (technologies["automation"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {%- elif max_science_pack == 1 %}
-        table.insert (technologies["logistic-science-pack"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {%- elif max_science_pack == 2 %}
-        table.insert (technologies["military-science-pack"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {%- elif max_science_pack == 3 %}
-        table.insert (technologies["chemical-science-pack"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {%- elif max_science_pack == 4 %}
-        table.insert (technologies["production-science-pack"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {%- elif max_science_pack == 5 %}
-        table.insert (technologies["utility-science-pack"].effects, {type = "unlock-recipe", recipe = "satellite"})
-    {% endif %}
-{% endif %}
 {%- if silo == 2 %}
     data.raw["recipe"]["rocket-silo"].enabled = true
 {% endif %}
@@ -146,6 +130,7 @@ end
 data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
 data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
 data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes)
+data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes_off_when_no_fluid_recipe = data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes_off_when_no_fluid_recipe
 if mods["factory-levels"] then
     -- Factory-Levels allows the assembling machines to get faster (and depending on settings), more productive at crafting products, the more the
     -- assembling machine crafts the product.  If the machine crafts enough, it may auto-upgrade to the next tier.
@@ -169,9 +154,16 @@ technologies["{{ original_tech_name }}"].hidden_in_factoriopedia = true
 {#- the tech researched by the local player #}
 new_tree_copy = table.deepcopy(template_tech)
 new_tree_copy.name = "ap-{{ location.address }}-"{# use AP ID #}
+{% if location.crafted_item is not none %}
+new_tree_copy.research_trigger = {
+    type = "{{ 'craft-fluid' if location.crafted_item in liquids else 'craft-item' }}",
+    {{ 'fluid' if location.crafted_item in liquids else 'item' }} = {{ variable_to_lua(location.crafted_item) }}
+}
+new_tree_copy.unit = nil
+{% else %}
 new_tree_copy.unit.count = {{ location.count }}
 new_tree_copy.unit.ingredients = {{ variable_to_lua(location.factorio_ingredients) }}
-
+{% endif %}
 {%- if location.revealed and item.name in base_tech_table -%}
 {#- copy Factorio Technology Icon #}
 copy_factorio_icon(new_tree_copy, "{{ item.name }}")
diff --git a/worlds/factorio/docs/factorio-download.png b/worlds/factorio/docs/factorio-download.png
index b59875110a..96c41f7666 100644
Binary files a/worlds/factorio/docs/factorio-download.png and b/worlds/factorio/docs/factorio-download.png differ
diff --git a/worlds/factorio/docs/setup_en.md b/worlds/factorio/docs/setup_en.md
index 0219486b20..1cf5c09d6a 100644
--- a/worlds/factorio/docs/setup_en.md
+++ b/worlds/factorio/docs/setup_en.md
@@ -179,6 +179,18 @@ factorio_options:
   filter_item_sends: true
 ```
 
+### filter_connection_changes
+
+By default, all player joined and player stopped tracking notifications are displayed in-game. In larger async seeds this may become overly spammy.
+To hide all connection changes, do one of the following:
+- Type `/toggle-ap-connection-change-filter` in-game
+- Type `/toggle_connection_change_filter` in the Achipelago Client
+- In your `host.yaml` set
+```
+factorio_options:
+  filter_connection_changes: true
+```
+
 ### bridge_chat_out
 By default, in-game chat is bridged to Archipelago. If you prefer to be able to speak privately, you can disable this
 feature by doing one of the following:
diff --git a/worlds/factorio/settings.py b/worlds/factorio/settings.py
index a2296e7395..15d6f637aa 100644
--- a/worlds/factorio/settings.py
+++ b/worlds/factorio/settings.py
@@ -19,8 +19,12 @@ If this file does exist, then it will be used.
 
     class BridgeChatOut(settings.Bool):
         """Whether to send chat messages from players on the Factorio server to Archipelago."""
+    
+    class FilterConnectionChanges(settings.Bool):
+        """Whether to filter connection changes displayed in-game."""
 
     executable: Executable = Executable("factorio/bin/x64/factorio")
     server_settings: typing.Optional[ServerSettings] = None
     filter_item_sends: typing.Union[FilterItemSends, bool] = False
+    filter_connection_changes: typing.Union[FilterConnectionChanges, bool] = False
     bridge_chat_out: typing.Union[BridgeChatOut, bool] = True
diff --git a/worlds/ff1/archipelago.json b/worlds/ff1/archipelago.json
new file mode 100644
index 0000000000..e3cf746a3b
--- /dev/null
+++ b/worlds/ff1/archipelago.json
@@ -0,0 +1,5 @@
+{
+  "game": "Final Fantasy",
+  "world_version": "1.0.0",
+  "authors": ["Rosalie"]
+}
\ No newline at end of file
diff --git a/worlds/ffmq/Regions.py b/worlds/ffmq/Regions.py
index 4e26be1653..7bf773f5cf 100644
--- a/worlds/ffmq/Regions.py
+++ b/worlds/ffmq/Regions.py
@@ -155,6 +155,10 @@ def set_rules(self) -> None:
                             return True
             check_foresta(loc.parent_region)
 
+    if self.options.map_shuffle or self.options.crest_shuffle:
+        process_rules(self.multiworld.get_entrance("Subregion Frozen Fields to Subregion Aquaria", self.player),
+                      ["SummerAquaria"])
+
     if self.options.logic == "friendly":
         process_rules(self.multiworld.get_entrance("Overworld - Ice Pyramid", self.player),
                       ["MagicMirror"])
diff --git a/worlds/ffmq/__init__.py b/worlds/ffmq/__init__.py
index c749909a1d..f45b3bd961 100644
--- a/worlds/ffmq/__init__.py
+++ b/worlds/ffmq/__init__.py
@@ -157,15 +157,17 @@ class FFMQWorld(World):
         if "Progressive" in item.name:
             i = item.code - 256
             if remove:
+                if state.has(self.item_id_to_name[i+2], self.player):
+                    return self.item_id_to_name[i+2]
                 if state.has(self.item_id_to_name[i+1], self.player):
-                    if state.has(self.item_id_to_name[i+2], self.player):
-                        return self.item_id_to_name[i+2]
                     return self.item_id_to_name[i+1]
                 return self.item_id_to_name[i]
-
+            
+            if state.has(self.item_id_to_name[i+2], self.player):
+                return self.item_id_to_name[i+2]
+            if state.has(self.item_id_to_name[i+1], self.player):
+                return self.item_id_to_name[i+2]
             if state.has(self.item_id_to_name[i], self.player):
-                if state.has(self.item_id_to_name[i+1], self.player):
-                    return self.item_id_to_name[i+2]
                 return self.item_id_to_name[i+1]
             return self.item_id_to_name[i]
         return item.name
diff --git a/worlds/ffmq/docs/setup_en.md b/worlds/ffmq/docs/setup_en.md
index 2c8eb9a142..03e71f93be 100644
--- a/worlds/ffmq/docs/setup_en.md
+++ b/worlds/ffmq/docs/setup_en.md
@@ -60,7 +60,7 @@ validator page: [YAML Validation page](/mysterycheck)
 2. You will be presented with a "Seed Info" page.
 3. Click the "Create New Room" link.
 4. You will be presented with a server page, from which you can download your `.apmq` patch file.
-5. Go to the [FFMQR website](https://ffmqrando.net/Archipelago) and select your Final Fantasy Mystic Quest ROM
+5. Go to the [FFMQR website](https://ap.ffmqrando.net/Archipelago) and select your Final Fantasy Mystic Quest ROM
 and the .apmq file you received, choose optional preferences, and click `Generate` to get your patched ROM.
 7. Since this is a single-player game, you will no longer need the client, so feel free to close it.
 
@@ -72,7 +72,7 @@ When you join a multiworld game, you will be asked to provide your config file t
 the host will provide you with either a link to download your patch file, or with a zip file containing
 everyone's patch files. Your patch file should have a `.apmq` extension.
 
-Go to the [FFMQR website](https://ffmqrando.net/Archipelago) and select your Final Fantasy Mystic Quest ROM
+Go to the [FFMQR website](https://ap.ffmqrando.net/Archipelago) and select your Final Fantasy Mystic Quest ROM
 and the .apmq file you received, choose optional preferences, and click `Generate` to get your patched ROM.
 
 Manually launch the SNI Client, and run the patched ROM in your chosen software or hardware.
diff --git a/worlds/ffmq/docs/setup_fr.md b/worlds/ffmq/docs/setup_fr.md
index 570e18d0b2..635e014f3f 100644
--- a/worlds/ffmq/docs/setup_fr.md
+++ b/worlds/ffmq/docs/setup_fr.md
@@ -64,7 +64,7 @@ Si vous voulez valider votre fichier de configuration pour être sûr qu'il fonc
 2. Il vous sera alors présenté une page d'informations sur la seed
 3. Cliquez sur le lien "Create New Room".
 4. Vous verrez s'afficher la page du server, de laquelle vous pourrez télécharger votre fichier patch `.apmq`.
-5. Rendez-vous sur le [site FFMQR](https://ffmqrando.net/Archipelago).
+5. Rendez-vous sur le [site FFMQR](https://ap.ffmqrando.net/Archipelago).
 Sur cette page, sélectionnez votre ROM Final Fantasy Mystic Quest original dans le boîte "ROM", puis votre ficher patch `.apmq` dans la boîte "Load Archipelago Config File".
 Cliquez sur "Generate". Un téléchargement avec votre ROM aléatoire devrait s'amorcer.
 6. Puisque cette partie est à un seul joueur, vous n'avez plus besoin du client Archipelago ni du serveur, sentez-vous libre de les fermer.
@@ -77,7 +77,7 @@ Quand vous rejoignez un multiworld, il vous sera demandé de fournir votre fichi
 s'occupe de la génération. Une fois cela fait, l'hôte vous fournira soit un lien pour télécharger votre patch, soit un
 fichier `.zip` contenant les patchs de tous les joueurs. Votre patch devrait avoir l'extension `.apmq`.
 
-Allez au [site FFMQR](https://ffmqrando.net/Archipelago) et sélectionnez votre ROM Final Fantasy Mystic Quest original dans le boîte "ROM", puis votre ficher patch `.apmq` dans la boîte "Load Archipelago Config File".
+Allez au [site FFMQR](https://ap.ffmqrando.net/Archipelago) et sélectionnez votre ROM Final Fantasy Mystic Quest original dans le boîte "ROM", puis votre ficher patch `.apmq` dans la boîte "Load Archipelago Config File".
 Cliquez sur "Generate". Un téléchargement avec votre ROM aléatoire devrait s'amorcer.
 
 Ouvrez le client SNI (sur Windows ArchipelagoSNIClient.exe, sur Linux ouvrez le `.appImage` puis cliquez sur SNI Client), puis ouvrez le ROM téléchargé avec votre émulateur choisi.
diff --git a/worlds/generic/Rules.py b/worlds/generic/Rules.py
index 31d725bff7..bfb79bbc29 100644
--- a/worlds/generic/Rules.py
+++ b/worlds/generic/Rules.py
@@ -2,16 +2,10 @@ import collections
 import logging
 import typing
 
-from BaseClasses import LocationProgressType, MultiWorld, Location, Region, Entrance
+from BaseClasses import (CollectionRule, CollectionState, Entrance, Item, Location,
+                         LocationProgressType, MultiWorld, Region)
 
-if typing.TYPE_CHECKING:
-    import BaseClasses
-
-    CollectionRule = typing.Callable[[BaseClasses.CollectionState], bool]
-    ItemRule = typing.Callable[[BaseClasses.Item], bool]
-else:
-    CollectionRule = typing.Callable[[object], bool]
-    ItemRule = typing.Callable[[object], bool]
+ItemRule = typing.Callable[[Item], bool]
 
 
 def locality_needed(multiworld: MultiWorld) -> bool:
@@ -96,11 +90,11 @@ def exclusion_rules(multiworld: MultiWorld, player: int, exclude_locations: typi
                 logging.warning(f"Unable to exclude location {loc_name} in player {player}'s world.")
 
 
-def set_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"], rule: CollectionRule):
+def set_rule(spot: typing.Union[Location, Entrance], rule: CollectionRule):
     spot.access_rule = rule
 
 
-def add_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"], rule: CollectionRule, combine="and"):
+def add_rule(spot: typing.Union[Location, Entrance], rule: CollectionRule, combine="and"):
     old_rule = spot.access_rule
     # empty rule, replace instead of add
     if old_rule is Location.access_rule or old_rule is Entrance.access_rule:
@@ -112,7 +106,7 @@ def add_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"],
             spot.access_rule = lambda state: rule(state) or old_rule(state)
 
 
-def forbid_item(location: "BaseClasses.Location", item: str, player: int):
+def forbid_item(location: Location, item: str, player: int):
     old_rule = location.item_rule
     # empty rule
     if old_rule is Location.item_rule:
@@ -121,18 +115,18 @@ def forbid_item(location: "BaseClasses.Location", item: str, player: int):
         location.item_rule = lambda i: (i.name != item or i.player != player) and old_rule(i)
 
 
-def forbid_items_for_player(location: "BaseClasses.Location", items: typing.Set[str], player: int):
+def forbid_items_for_player(location: Location, items: typing.Set[str], player: int):
     old_rule = location.item_rule
     location.item_rule = lambda i: (i.player != player or i.name not in items) and old_rule(i)
 
 
-def forbid_items(location: "BaseClasses.Location", items: typing.Set[str]):
+def forbid_items(location: Location, items: typing.Set[str]):
     """unused, but kept as a debugging tool."""
     old_rule = location.item_rule
     location.item_rule = lambda i: i.name not in items and old_rule(i)
 
 
-def add_item_rule(location: "BaseClasses.Location", rule: ItemRule, combine: str = "and"):
+def add_item_rule(location: Location, rule: ItemRule, combine: str = "and"):
     old_rule = location.item_rule
     # empty rule, replace instead of add
     if old_rule is Location.item_rule:
@@ -144,7 +138,7 @@ def add_item_rule(location: "BaseClasses.Location", rule: ItemRule, combine: str
             location.item_rule = lambda item: rule(item) or old_rule(item)
 
 
-def item_name_in_location_names(state: "BaseClasses.CollectionState", item: str, player: int,
+def item_name_in_location_names(state: CollectionState, item: str, player: int,
                                 location_name_player_pairs: typing.Sequence[typing.Tuple[str, int]]) -> bool:
     for location in location_name_player_pairs:
         if location_item_name(state, location[0], location[1]) == (item, player):
@@ -153,14 +147,14 @@ def item_name_in_location_names(state: "BaseClasses.CollectionState", item: str,
 
 
 def item_name_in_locations(item: str, player: int,
-                           locations: typing.Sequence["BaseClasses.Location"]) -> bool:
+                           locations: typing.Sequence[Location]) -> bool:
     for location in locations:
         if location.item and location.item.name == item and location.item.player == player:
             return True
     return False
 
 
-def location_item_name(state: "BaseClasses.CollectionState", location: str, player: int) -> \
+def location_item_name(state: CollectionState, location: str, player: int) -> \
         typing.Optional[typing.Tuple[str, int]]:
     location = state.multiworld.get_location(location, player)
     if location.item is None:
diff --git a/worlds/generic/__init__.py b/worlds/generic/__init__.py
index 2e614eba4d..4cd80556cc 100644
--- a/worlds/generic/__init__.py
+++ b/worlds/generic/__init__.py
@@ -17,7 +17,7 @@ class GenericWeb(WebWorld):
                         'A guide detailing the commands available to the user when participating in an Archipelago session.',
                         'English', 'commands_en.md', 'commands/en', ['jat2980', 'Ijwu'])
     mac = Tutorial('Archipelago Setup Guide for Mac', 'A guide detailing how to run Archipelago clients on macOS.', 
-                   'English', 'mac_en.md','mac/en', ['Bicoloursnake'])
+                   'English', 'mac_en.md','mac/en', ['Bicoloursnake', 'silasary'])
     plando = Tutorial('Archipelago Plando Guide', 'A guide to understanding and using plando for your game.',
                       'English', 'plando_en.md', 'plando/en', ['alwaysintreble', 'Alchav'])
     setup = Tutorial('Getting Started',
@@ -26,7 +26,10 @@ class GenericWeb(WebWorld):
                      'English', 'setup_en.md', 'setup/en', ['alwaysintreble'])
     triggers = Tutorial('Archipelago Triggers Guide', 'A guide to setting up and using triggers in your game settings.',
                         'English', 'triggers_en.md', 'triggers/en', ['alwaysintreble'])
-    tutorials = [setup, mac, commands, advanced_settings, triggers, plando]
+    other_games = Tutorial('Other Games and Tools',
+                           'A guide to additional games and tools that can be used with Archipelago.',
+                           'English', 'other_en.md', 'other/en', ['Berserker'])
+    tutorials = [setup, mac, commands, advanced_settings, triggers, plando, other_games]
 
 
 class GenericWorld(World):
diff --git a/worlds/generic/docs/advanced_settings_en.md b/worlds/generic/docs/advanced_settings_en.md
index bc8754b9c6..7dc0e6ba4c 100644
--- a/worlds/generic/docs/advanced_settings_en.md
+++ b/worlds/generic/docs/advanced_settings_en.md
@@ -156,6 +156,9 @@ Options taking a choice of a number can also use a variety of `random` options t
 * `random-range-low-#-#`, `random-range-middle-#-#`, and `random-range-high-#-#` will choose a number at random from the
   specified numbers, but with the specified weights
 
+Options defining a unique set of options can also make use of the prior `random` options to select a subset of possible 
+options. The resulting number is used as the number of random items the set should contain.
+
 ### Example
 
 ```yaml
diff --git a/worlds/generic/docs/mac_en.md b/worlds/generic/docs/mac_en.md
index b06593f501..4db48d2abd 100644
--- a/worlds/generic/docs/mac_en.md
+++ b/worlds/generic/docs/mac_en.md
@@ -19,14 +19,17 @@ It is generally recommended that you use a virtual environment to run python bas
 2. Run the command `python3 -m venv venv` to create a virtual environment. Running this command will create a new directory at the specified path, so make sure that path is clear for a new directory to be created.
 3. Run the command `source venv/bin/activate` to activate the virtual environment.
 4. If you want to exit the virtual environment, run the command `deactivate`.
+## Building the App
+1. Run the command `python3 setup.py bdist_mac` to build an App Bundle.  This step may take a while.
+2. Back in Finder, go to the new `build` subdirectory, and copy the Archipelago app you just made to your Applications directory.
 ## Steps to Run the Clients 
-1. Run the command `python3 Launcher.py`.
+1. Launch the Archipelago Launcher
 2. If your game doesn't have a patch file, just click the desired client in the right side column.
 3. If your game does have a patch file, click the 'Open Patch' button and navigate to your patch file (the filename extension will look something like apsm, aplttp, apsmz3, etc.).
 4. If the patching process needs a rom, but cannot find it, it will ask you to navigate to your legally obtained rom.
 5. Your client should now be running and rom created (where applicable).
 ## Additional Steps for SNES Games
-1. If using RetroArch, the instructions to set up your emulator [here in the Link to the Past setup guide](https://archipelago.gg/tutorial/A%20Link%20to%20the%20Past/multiworld/en) also work on the macOS version of RetroArch.
+1. If using RetroArch, the instructions to set up your emulator [here in the Link to the Past setup guide](/tutorial/A%20Link%20to%20the%20Past/multiworld/en) also work on the macOS version of RetroArch.
 2. Double click on the SNI tar.gz download to extract the files to an SNI directory. If it isn't already, rename this directory to SNI to make some steps easier.
 3. Move the SNI directory out of the downloads directory, preferably into the Archipelago directory created earlier.
 4. If the SNI directory is correctly named and moved into the Archipelago directory, it should auto run with the SNI client. If it doesn't automatically run, open up the SNI directory and run the SNI executable file manually.
diff --git a/worlds/generic/docs/other_en.md b/worlds/generic/docs/other_en.md
new file mode 100644
index 0000000000..caf8372170
--- /dev/null
+++ b/worlds/generic/docs/other_en.md
@@ -0,0 +1,37 @@
+# Other Games And Tools
+
+This page provides information and links regarding various tools that may be of use with Archipelago, including additional playable games not supported by this website.
+
+You should only download and use files from sources you trust; sources listed here are not officially vetted for safety, so use your own judgement and caution.
+
+## Discord
+
+Currently, Discord is the primary hub for Archipelago; whether it be finding people to play with, developing new game implementations, or finding new playable games.
+
+The [Archipelago Official Discord](https://discord.gg/8Z65BR2) is the main hub, while the [Archipelago After Dark Discord](https://discord.gg/fqvNCCRsu4) houses additional games that may be unrated or 18+ in some territories.
+
+The `#apworld-index` channels in each of these servers contain lists of playable games which should be easily downloadable and playable with an Archipelago installation.
+
+## Wiki
+
+The community-maintained [Archipelago Wiki](https://archipelago.miraheze.org/) has information on many games as well, and acts as a great discord-free source of information.
+
+## Hint Games
+
+Hint Games are a special type of game which are not included as part of the multiworld generation process. Instead, they can log in to an ongoing multiworld, connecting to a slot designated for any game. Rather than earning items for other games in the multiworld, a Hint Game will allow you to earn hints for the slot you are connected to.
+
+Hint Games can be found from sources such as the Discord and the [Hint Game Category](https://archipelago.miraheze.org/wiki/Category:Hint_games) of the wiki, as detailed above.
+
+## Notable Tools
+
+### Options Creator
+
+The Options Creator is included in the Archipelago installation, and is accessible from the Archipelago Launcher. Using this simple GUI tool, you can easily create randomization options for any installed `.apworld` - perfect when using custom worlds you've installed that don't have options pages on the website.
+
+### PopTracker
+
+[PopTracker](https://poptracker.github.io) is a popular tool in Randomizer communities, which many games support via custom PopTracker Packs. Many Archipelago packs include the ability to directly connect to your slot for auto-tracking capabilities. (Check each game's setup guide or Discord channel to see if it has PopTracker compatibility!)
+
+### Universal Tracker
+
+[Universal Tracker](https://github.com/FarisTheAncient/Archipelago/releases?q=Tracker) is a custom tracker client that uses your .yaml files from generation (as well as the .apworld files) to attempt to provide a view of what locations are currently in-logic or not, using the actual generation logic. Specific steps may need to be taken depending on the game, or the use of randomness in your yaml. Support for UT can be found in the [#universal-tracker](https://discord.com/channels/731205301247803413/1367270230635839539) channel of the Archipelago Official Discord.
diff --git a/worlds/generic/docs/plando_en.md b/worlds/generic/docs/plando_en.md
index 69f59c739e..625601d96b 100644
--- a/worlds/generic/docs/plando_en.md
+++ b/worlds/generic/docs/plando_en.md
@@ -216,6 +216,28 @@ dungeon major item chests. Because the from_pool value is `false`, a copy of the
 while the originals remain in the item pool to be shuffled. The second block will place the Kokiri Sword in the Deku 
 Tree Slingshot Chest, again not from the pool.
 
+```yaml
+  plando_items:
+  # Example block - Hollow Knight
+    - items:
+        Claw : true
+      world:
+        - BobsWitness
+        - BobsRogueLegacy
+```
+This block will attempt to place all items in the Claw item group into any locations within the game slots named
+"BobsWitness" and "BobsRogueLegacy."
+
+**NOTE:** As item groups may contain items that are not currently present in the item pool, use of `true` with
+item groups, as shown here, is strongly recommended to avoid creation of unintended items.
+
+For example, the Claw item group for Hollow Knight includes Mantis_Claw, Left_Mantis_Claw, and Right_Mantis_Claw.
+Depending on a different yaml setting, the Generator will create either one Mantis_Claw item, or one each of the
+Left_Mantis_Claw and Right_Mantis_Claw items. By default, the Generator will create any missing item(s) in addition
+to using the intended item(s), resulting in placement of all three items from the item group: Mantis_Claw,
+Left_Mantis_Claw and Right_Mantis_Claw. Use of the true value, as shown in the example, restricts the Generator to
+using only the items from the item group that are already present in the item pool.
+
 ## Boss Plando
 
 This is currently only supported by A Link to the Past and Kirby's Dream Land 3. Boss plando allows a player to place a 
diff --git a/worlds/generic/docs/setup_en.md b/worlds/generic/docs/setup_en.md
index 1a02bf4870..cbe66d4c76 100644
--- a/worlds/generic/docs/setup_en.md
+++ b/worlds/generic/docs/setup_en.md
@@ -178,7 +178,7 @@ privileges may be gained by entering `!admin <password>` from the `ArchipelagoTe
 
 #### The room page
 
-![Screenshot of Room Page](/static/generated/docs/Archipelago/example_room.png)
+![Screenshot of Room Page](example_room.png)
 1. Server/Host Name
 2. Port
 3. Slot Name
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 317d29334b..718bf3c41c 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -189,7 +189,7 @@ class HKWorld(World):
 
     ranges: typing.Dict[str, typing.Tuple[int, int]]
     charm_costs: typing.List[int]
-    cached_filler_items = {}
+    cached_filler_items: typing.List[str]
     grub_count: int
     grub_player_count: typing.Dict[int, int]
 
@@ -201,6 +201,7 @@ class HKWorld(World):
         self.ranges = {}
         self.created_shop_items = 0
         self.vanilla_shop_costs = deepcopy(vanilla_shop_costs)
+        self.cached_filler_items = []
 
     def generate_early(self):
         options = self.options
@@ -699,7 +700,7 @@ class HKWorld(World):
         return f"{base}_{i}"
 
     def get_filler_item_name(self) -> str:
-        if self.player not in self.cached_filler_items:
+        if not self.cached_filler_items:
             fillers = ["One_Geo", "Soul_Refill"]
             exclusions = self.white_palace_exclusions()
             for group in (
@@ -709,8 +710,8 @@ class HKWorld(World):
                 if getattr(self.options, group):
                     fillers.extend(item for item in hollow_knight_randomize_options[group].items if item not in
                                    exclusions)
-            self.cached_filler_items[self.player] = fillers
-        return self.random.choice(self.cached_filler_items[self.player])
+            self.cached_filler_items = fillers
+        return self.random.choice(self.cached_filler_items)
 
 
 def create_region(multiworld: MultiWorld, player: int, name: str, location_names=None) -> Region:
diff --git a/worlds/jakanddaxter/agents/memory_reader.py b/worlds/jakanddaxter/agents/memory_reader.py
index 01035c4a2e..493fbde39e 100644
--- a/worlds/jakanddaxter/agents/memory_reader.py
+++ b/worlds/jakanddaxter/agents/memory_reader.py
@@ -1,13 +1,14 @@
 import logging
 import random
 import struct
+import sys
 from typing import ByteString, Callable
 import json
-import pymem
-from pymem import pattern
-from pymem.exception import ProcessNotFound, ProcessError, MemoryReadError, WinAPIError
+from PyMemoryEditor import OpenProcess, ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess
 from dataclasses import dataclass
 
+import Utils
+from ..game_id import jak1_gk
 from ..locs import (orb_locations as orbs,
                     cell_locations as cells,
                     scout_locations as flies,
@@ -166,7 +167,7 @@ class JakAndDaxterMemoryReader:
     initiated_connect: bool = False
 
     # The memory reader just needs the game running.
-    gk_process: pymem.process = None
+    gk_process: OpenProcess | None = None
 
     location_outbox: list[int] = []
     outbox_index: int = 0
@@ -227,8 +228,10 @@ class JakAndDaxterMemoryReader:
 
         if self.connected:
             try:
-                self.gk_process.read_bool(self.gk_process.base_address)  # Ping to see if it's alive.
-            except (ProcessError, MemoryReadError, WinAPIError):
+                # TODO - When PyMemoryEditor issue #15 is resolved, swap out this line for the commented one.
+                # self.gk_process.read_process_memory(0, bytes, 1)  # Ping to see if it's alive.
+                OpenProcess(process_name=jak1_gk)
+            except (ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess):
                 msg = (f"Error reading game memory! (Did the game crash?)\n"
                        f"Please close all open windows and reopen the Jak and Daxter Client "
                        f"from the Archipelago Launcher.\n"
@@ -272,28 +275,35 @@ class JakAndDaxterMemoryReader:
 
     async def connect(self):
         try:
-            self.gk_process = pymem.Pymem("gk.exe")  # The GOAL Kernel
-            logger.debug("Found the gk process: " + str(self.gk_process.process_id))
-        except ProcessNotFound:
+            self.gk_process = OpenProcess(process_name=jak1_gk)  # The GOAL Kernel
+            logger.debug(f"Found the gk process: {self.gk_process.pid}")
+        except ProcessNotFoundError:
             self.log_error(logger, "Could not find the game process.")
             self.connected = False
             return
 
-        # If we don't find the marker in the first loaded module, we've failed.
-        modules = list(self.gk_process.list_modules())
-        marker_address = pattern.pattern_scan_module(self.gk_process.process_handle, modules[0], self.marker)
-        if marker_address:
-            # At this address is another address that contains the struct we're looking for: the game's state.
-            # From here we need to add the length in bytes for the marker and 4 bytes of padding,
-            # and the struct address is 8 bytes long (it's an uint64).
-            goal_pointer = marker_address + len(self.marker) + 4
-            self.goal_address = int.from_bytes(self.gk_process.read_bytes(goal_pointer, sizeof_uint64),
-                                               byteorder="little",
-                                               signed=False)
-            logger.debug("Found the archipelago memory address: " + str(self.goal_address))
-            await self.verify_memory_version()
+        if Utils.is_windows or Utils.is_linux:
+            marker_addresses = list(self.gk_process.search_by_value(bytes, len(self.marker), self.marker,
+                                                                    writeable_only=True))
+            if len(marker_addresses) > 0:
+                # If we don't find the marker in the first loaded module, we've failed.
+                goal_pointer = marker_addresses[0] + len(self.marker) + 4
+
+                # At this address is another address that contains the struct we're looking for: the game's state.
+                # From here we need to add the length in bytes for the marker and 4 bytes of padding,
+                # and the struct address is 8 bytes long (it's an uint64).
+                self.goal_address = int.from_bytes(
+                    self.gk_process.read_process_memory(goal_pointer, bytes, sizeof_uint64),
+                    byteorder="little",
+                    signed=False)
+                logger.debug("Found the archipelago memory address: " + str(self.goal_address))
+                await self.verify_memory_version()
+            else:
+                self.log_error(logger, "Could not find the Archipelago marker address!")
+                self.connected = False
+
         else:
-            self.log_error(logger, "Could not find the Archipelago marker address!")
+            self.log_error(logger, f"Unsupported operating system: {sys.platform}!")
             self.connected = False
 
     async def verify_memory_version(self):
@@ -309,8 +319,8 @@ class JakAndDaxterMemoryReader:
                 self.log_success(logger, "The Memory Reader is ready!")
                 self.connected = True
             else:
-                raise MemoryReadError(memory_version_offset, sizeof_uint32)
-        except (ProcessError, MemoryReadError, WinAPIError):
+                raise Exception(memory_version_offset, sizeof_uint32)
+        except (ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess, Exception):
             if memory_version is None:
                 msg = (f"Could not find a version number in the OpenGOAL memory structure!\n"
                        f"   Expected Version: {str(expected_memory_version)}\n"
@@ -336,7 +346,7 @@ class JakAndDaxterMemoryReader:
             self.connected = False
 
     async def print_status(self):
-        proc_id = str(self.gk_process.process_id) if self.gk_process else "None"
+        proc_id = str(self.gk_process.pid) if self.gk_process else "None"
         last_loc = str(self.location_outbox[self.outbox_index - 1] if self.outbox_index else "None")
         msg = (f"Memory Reader Status:\n"
                f"   Game process ID: {proc_id}\n"
@@ -451,7 +461,7 @@ class JakAndDaxterMemoryReader:
                 self.finished_game = True
                 self.log_success(logger, "Congratulations! You finished the game!")
 
-        except (ProcessError, MemoryReadError, WinAPIError):
+        except (ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess):
             msg = (f"Error reading game memory! (Did the game crash?)\n"
                    f"Please close all open windows and reopen the Jak and Daxter Client "
                    f"from the Archipelago Launcher.\n"
@@ -467,7 +477,7 @@ class JakAndDaxterMemoryReader:
 
     def read_goal_address(self, offset: int, length: int) -> int:
         return int.from_bytes(
-            self.gk_process.read_bytes(self.goal_address + offset, length),
+            self.gk_process.read_process_memory(self.goal_address + offset, bytes, length),
             byteorder="little",
             signed=False)
 
diff --git a/worlds/jakanddaxter/agents/repl_client.py b/worlds/jakanddaxter/agents/repl_client.py
index b207bba281..2a624d7f74 100644
--- a/worlds/jakanddaxter/agents/repl_client.py
+++ b/worlds/jakanddaxter/agents/repl_client.py
@@ -8,14 +8,13 @@ from dataclasses import dataclass
 from queue import Queue
 from typing import Callable
 
-import pymem
-from pymem.exception import ProcessNotFound, ProcessError
+from PyMemoryEditor import OpenProcess, ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess
 
 import asyncio
 from asyncio import StreamReader, StreamWriter, Lock
 
 from NetUtils import NetworkItem
-from ..game_id import jak1_id, jak1_max
+from ..game_id import jak1_id, jak1_max, jak1_gk, jak1_goalc
 from ..items import item_table, trap_item_table
 from ..locs import (
     orb_locations as orbs,
@@ -66,8 +65,8 @@ class JakAndDaxterReplClient:
 
     # The REPL client needs the REPL/compiler process running, but that process
     # also needs the game running. Therefore, the REPL client needs both running.
-    gk_process: pymem.process = None
-    goalc_process: pymem.process = None
+    gk_process: OpenProcess = None
+    goalc_process: OpenProcess = None
 
     item_inbox: dict[int, NetworkItem] = {}
     inbox_index = 0
@@ -102,8 +101,10 @@ class JakAndDaxterReplClient:
 
         if self.connected:
             try:
-                self.gk_process.read_bool(self.gk_process.base_address)  # Ping to see if it's alive.
-            except ProcessError:
+                # TODO - When PyMemoryEditor issue #15 is resolved, swap out this line for the commented one.
+                # self.gk_process.read_process_memory(0, bytes, 1)  # Ping to see if it's alive.
+                OpenProcess(process_name=jak1_gk)
+            except (ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess):
                 msg = (f"Error reading game memory! (Did the game crash?)\n"
                        f"Please close all open windows and reopen the Jak and Daxter Client "
                        f"from the Archipelago Launcher.\n"
@@ -115,8 +116,10 @@ class JakAndDaxterReplClient:
                 self.log_error(logger, msg)
                 self.connected = False
             try:
-                self.goalc_process.read_bool(self.goalc_process.base_address)  # Ping to see if it's alive.
-            except ProcessError:
+                # TODO - When PyMemoryEditor issue #15 is resolved, swap out this line for the commented one.
+                # self.goalc_process.read_process_memory(0, bytes, 1)  # Ping to see if it's alive.
+                OpenProcess(process_name=jak1_goalc)
+            except (ProcessNotFoundError, ProcessIDNotExistsError, ClosedProcess):
                 msg = (f"Error sending data to compiler! (Did the compiler crash?)\n"
                        f"Please close all open windows and reopen the Jak and Daxter Client "
                        f"from the Archipelago Launcher.\n"
@@ -172,21 +175,21 @@ class JakAndDaxterReplClient:
                     logger.debug(response)
                 return True
             else:
-                self.log_error(logger, f"Unexpected response from REPL: {response}")
+                self.log_error(logger, f"Unexpected response from Compiler: {response}")
                 return False
 
     async def connect(self):
         try:
-            self.gk_process = pymem.Pymem("gk.exe")  # The GOAL Kernel
-            logger.debug("Found the gk process: " + str(self.gk_process.process_id))
-        except ProcessNotFound:
+            self.gk_process = OpenProcess(process_name=jak1_gk)  # The GOAL Kernel
+            logger.debug("Found the gk process: " + str(self.gk_process.pid))
+        except ProcessNotFoundError:
             self.log_error(logger, "Could not find the game process.")
             return
 
         try:
-            self.goalc_process = pymem.Pymem("goalc.exe")  # The GOAL Compiler and REPL
-            logger.debug("Found the goalc process: " + str(self.goalc_process.process_id))
-        except ProcessNotFound:
+            self.goalc_process = OpenProcess(process_name=jak1_goalc)  # The GOAL Compiler and REPL
+            logger.debug("Found the goalc process: " + str(self.goalc_process.pid))
+        except ProcessNotFoundError:
             self.log_error(logger, "Could not find the compiler process.")
             return
 
@@ -201,9 +204,10 @@ class JakAndDaxterReplClient:
                 logger.debug(welcome_message)
             else:
                 self.log_error(logger,
-                               f"Unable to connect to REPL websocket: unexpected welcome message \"{welcome_message}\"")
+                               f"Unable to connect to Compiler websocket: unexpected welcome message "
+                               f"\"{welcome_message}\"")
         except ConnectionRefusedError as e:
-            self.log_error(logger, f"Unable to connect to REPL websocket: {e.strerror}")
+            self.log_error(logger, f"Unable to connect to Compiler websocket: {e.strerror}")
             return
 
         ok_count = 0
@@ -248,13 +252,13 @@ class JakAndDaxterReplClient:
                 self.connected = False
 
         if self.connected:
-            self.log_success(logger, "The REPL is ready!")
+            self.log_success(logger, "The Compiler is ready!")
 
     async def print_status(self):
-        gc_proc_id = str(self.goalc_process.process_id) if self.goalc_process else "None"
-        gk_proc_id = str(self.gk_process.process_id) if self.gk_process else "None"
-        msg = (f"REPL Status:\n"
-               f"   REPL process ID: {gc_proc_id}\n"
+        gc_proc_id = str(self.goalc_process.pid) if self.goalc_process else "None"
+        gk_proc_id = str(self.gk_process.pid) if self.gk_process else "None"
+        msg = (f"Compiler Status:\n"
+               f"   Compiler process ID: {gc_proc_id}\n"
                f"   Game process ID: {gk_proc_id}\n")
         try:
             if self.reader and self.writer:
diff --git a/worlds/jakanddaxter/archipelago.json b/worlds/jakanddaxter/archipelago.json
index 8b0adcd105..6411911f2d 100644
--- a/worlds/jakanddaxter/archipelago.json
+++ b/worlds/jakanddaxter/archipelago.json
@@ -1,6 +1,6 @@
 {
     "game": "Jak and Daxter: The Precursor Legacy",
-    "world_version": "1.0.0",
+    "world_version": "1.1.5",
     "minimum_ap_version": "0.6.2",
     "authors": ["markustulliuscicero"]
 }
diff --git a/worlds/jakanddaxter/client.py b/worlds/jakanddaxter/client.py
index fa2aea5495..710e0ef89d 100644
--- a/worlds/jakanddaxter/client.py
+++ b/worlds/jakanddaxter/client.py
@@ -5,27 +5,27 @@ import logging
 import os
 import subprocess
 import sys
+import shlex
 
 from asyncio import Task
 from datetime import datetime
 from logging import Logger
+from shutil import which
 from typing import Awaitable
 
 # Misc imports
 import colorama
-import pymem
-
-from pymem.exception import ProcessNotFound
+from psutil import NoSuchProcess
 
 # Archipelago imports
 import ModuleUpdate
 import Utils
-
 from CommonClient import ClientCommandProcessor, CommonContext, server_loop, gui_enabled
 from NetUtils import ClientStatus
+from PyMemoryEditor import OpenProcess, ProcessNotFoundError
 
 # Jak imports
-from .game_id import jak1_name
+from .game_id import jak1_name, jak1_gk, jak1_goalc
 from .options import EnableOrbsanity
 from .agents.memory_reader import JakAndDaxterMemoryReader
 from .agents.repl_client import JakAndDaxterReplClient
@@ -57,9 +57,9 @@ class JakAndDaxterClientCommandProcessor(ClientCommandProcessor):
     # (which takes 10-15 seconds to compile the game) have to be requested with user-initiated flags.
     # The flags are checked by the agents every main_tick.
     def _cmd_repl(self, *arguments: str):
-        """Sends a command to the OpenGOAL REPL. Arguments:
-        - connect : connect the client to the REPL (goalc).
-        - status : check internal status of the REPL."""
+        """Sends a command to the OpenGOAL Compiler. Arguments:
+        - connect : connect the client to the compiler (goalc).
+        - status : check internal status of the Compiler."""
         if arguments:
             if arguments[0] == "connect":
                 self.ctx.on_log_info(logger, "This may take a bit... Wait for the success audio cue before continuing!")
@@ -135,6 +135,12 @@ class JakAndDaxterContext(CommonContext):
         self.tags = set()
         await self.send_connect()
 
+    async def connect(self, address: str | None = None) -> None:
+        if not self.repl.connected or not self.memr.connected:
+            self.on_log_warn(logger, "Please wait for the Compiler and Memory Reader to connect to the game!")
+            return
+        await super(JakAndDaxterContext, self).connect(address)
+
     async def disconnect(self, allow_autoreconnect: bool = False):
         self.locations_checked = set()  # Clear this set to gracefully handle server disconnects.
         await super(JakAndDaxterContext, self).disconnect(allow_autoreconnect)
@@ -336,13 +342,21 @@ class JakAndDaxterContext(CommonContext):
 
     async def run_repl_loop(self):
         while True:
-            await self.repl.main_tick()
-            await asyncio.sleep(0.1)
+            try:
+                await self.repl.main_tick()
+                await asyncio.sleep(0.1)
+            # This catch re-engages the memr loop, enabling the client to re-connect on losing the process
+            except NoSuchProcess:
+                self.on_log_info(logger, "Compiler process lost. Restarting Compiler loop.")
 
     async def run_memr_loop(self):
         while True:
-            await self.memr.main_tick()
-            await asyncio.sleep(0.1)
+            try:
+                await self.memr.main_tick()
+                await asyncio.sleep(0.1)
+            # This catch re-engages the memr loop, enabling the client to re-connect on losing the process
+            except NoSuchProcess:
+                self.on_log_info(logger, "Memory reader process lost. Restarting Memory reader loop.")
 
 
 def find_root_directory(ctx: JakAndDaxterContext):
@@ -454,21 +468,19 @@ def find_root_directory(ctx: JakAndDaxterContext):
 
 
 async def run_game(ctx: JakAndDaxterContext):
-
     # These may already be running. If they are not running, try to start them.
-    # TODO - Support other OS's. 1: Pymem is Windows-only. 2: on Linux, there's no ".exe."
     gk_running = False
     try:
-        pymem.Pymem("gk.exe")  # The GOAL Kernel
+        OpenProcess(process_name=jak1_gk)  # The GOAL Kernel
         gk_running = True
-    except ProcessNotFound:
+    except ProcessNotFoundError:
         ctx.on_log_warn(logger, "Game not running, attempting to start.")
 
     goalc_running = False
     try:
-        pymem.Pymem("goalc.exe")  # The GOAL Compiler and REPL
+        OpenProcess(process_name=jak1_goalc)  # The GOAL Compiler and REPL
         goalc_running = True
-    except ProcessNotFound:
+    except ProcessNotFoundError:
         ctx.on_log_warn(logger, "Compiler not running, attempting to start.")
 
     try:
@@ -501,8 +513,8 @@ async def run_game(ctx: JakAndDaxterContext):
             return
 
         # Now double-check the existence of the two executables we need.
-        gk_path = os.path.join(root_path, "gk.exe")
-        goalc_path = os.path.join(root_path, "goalc.exe")
+        gk_path = os.path.join(root_path, jak1_gk)
+        goalc_path = os.path.join(root_path, jak1_goalc)
         if not os.path.exists(gk_path) or not os.path.exists(goalc_path):
             msg = (f"The Game and Compiler could not be found in the ArchipelaGOAL root directory.\n"
                    f"Please check your host.yaml file.\n"
@@ -530,13 +542,26 @@ async def run_game(ctx: JakAndDaxterContext):
             log_path = os.path.join(Utils.user_path("logs"), f"JakAndDaxterGame_{timestamp}.txt")
             log_path = os.path.normpath(log_path)
             with open(log_path, "w") as log_file:
-                gk_process = subprocess.Popen(
-                    [gk_path, "--game", "jak1",
-                     "--config-path", config_path,
-                     "--", "-v", "-boot", "-fakeiso", "-debug"],
-                    stdout=log_file,
-                    stderr=log_file,
-                    creationflags=subprocess.CREATE_NO_WINDOW)
+                gk_args = [
+                    gk_path,
+                    "--game", "jak1",
+                    "--config-path", config_path,
+                    "--", "-v", "-boot", "-fakeiso", "-debug"
+                ]
+                
+                if Utils.is_windows:
+                    gk_process = subprocess.Popen(
+                        gk_args,
+                        stdout=log_file,
+                        stderr=log_file,
+                        creationflags=subprocess.CREATE_NO_WINDOW
+                    )
+                else:
+                    gk_process = subprocess.Popen(
+                        gk_args,
+                        stdout=log_file,
+                        stderr=log_file
+                    )
 
         if not goalc_running:
             # For the OpenGOAL Compiler, the existence of the "data" subfolder indicates you are running it from
@@ -586,7 +611,36 @@ async def run_game(ctx: JakAndDaxterContext):
                 goalc_args = [goalc_path, "--game", "jak1"]
 
             # This needs to be a new console. The REPL console cannot share a window with any other process.
-            goalc_process = subprocess.Popen(goalc_args, creationflags=subprocess.CREATE_NEW_CONSOLE)
+            # We make similar decisions as Launcher.launch for terminals on Linux and Mac (despite not supporting Mac).
+            if Utils.is_windows:
+                goalc_process = subprocess.Popen(goalc_args, creationflags=subprocess.CREATE_NEW_CONSOLE)
+
+            elif Utils.is_linux:
+                terminal = which('x-terminal-emulator') or which('gnome-terminal') or which('konsole') or which('xterm')
+
+                # Don't allow the terminal application to attempt loading system libraries, this can cause OpenSSL
+                # errors when launching the REPL due to version mismatches between system vs shipped libraries.
+                env = os.environ
+                if "LD_LIBRARY_PATH" in env:
+                    env = env.copy()
+                    del env["LD_LIBRARY_PATH"]
+
+                if terminal:
+                    goalc_process = subprocess.Popen([terminal, '-e', shlex.join(goalc_args)], env=env)
+                else:
+                    msg = (f"Your Linux installation does not have a supported terminal application.\n"
+                           f"We support the following options:\n"
+                           f"   x-terminal-emulator\n"
+                           f"   gnome-terminal\n"
+                           f"   konsole\n"
+                           f"   xterm\n"
+                           f"Please install one of these and try again.")
+                    ctx.on_log_error(logger, msg)
+                    return
+
+            elif Utils.is_macos:
+                terminal = [which('open'), '-W', '-a', 'Terminal.app']
+                goalc_process = subprocess.Popen([*terminal, *goalc_args])
 
     except AttributeError as e:
         if " " in e.args[0]:
@@ -601,7 +655,7 @@ async def run_game(ctx: JakAndDaxterContext):
                f"Please check your host.yaml file.\n"
                f"If the value of 'jakanddaxter_options > auto_detect_root_directory' is true, verify that OpenGOAL "
                f"is installed properly.\n"
-               f"If it is false, check the value of 'jakanddaxter_options > root_directory'."
+               f"If it is false, check the value of 'jakanddaxter_options > root_directory'. "
                f"Verify it is a valid existing path, and all backslashes have been replaced with forward slashes.")
         ctx.on_log_error(logger, msg)
         return
diff --git a/worlds/jakanddaxter/docs/setup_en.md b/worlds/jakanddaxter/docs/setup_en.md
index 9cd892a9b2..986ae75b29 100644
--- a/worlds/jakanddaxter/docs/setup_en.md
+++ b/worlds/jakanddaxter/docs/setup_en.md
@@ -5,11 +5,11 @@
 - A legally purchased copy of *Jak And Daxter: The Precursor Legacy.*
 - [The OpenGOAL Launcher](https://opengoal.dev/)
 
-At this time, this method of setup works on Windows only, but Linux support is a strong likelihood in the near future as OpenGOAL itself supports Linux.
+This method of setup works on Windows and Linux.
 
 ## Installation via OpenGOAL Launcher
 
-**You must set up a vanilla installation of Jak and Daxter before you can install mods for it.**
+**You must set up a vanilla installation of Jak and Daxter before you can install mods for it.** These instructions will work on both NTSC and PAL versions of the game.
 
 - Follow the installation process for the official OpenGOAL Launcher. See [here](https://opengoal.dev/docs/usage/installation). 
 - Follow the setup process for adding mods to the OpenGOAL Launcher. See [here](https://jakmods.dev/).
@@ -18,45 +18,7 @@ At this time, this method of setup works on Windows only, but Linux support is a
 - Click `Features` in the bottom right corner, then click `Mods`.
 - Under `Available Mods`, click `ArchipelaGOAL`. The mod should begin installing. When it is done, click `Continue` in the bottom right corner.
 - **DO NOT PLAY AN ARCHIPELAGO GAME THROUGH THE OPENGOAL LAUNCHER.** The Archipelago Client should handle everything for you.
-
-### For NTSC versions of the game, follow these steps.
-
-- Run the OpenGOAL Launcher (if you had it open before, close it and reopen it).
-- Click the Jak and Daxter logo on the left sidebar.
-- Click `Features` in the bottom right corner, then click `Mods`, then under `Installed Mods`, click `ArchipelaGOAL`.
-- In the bottom right corner, click `Advanced`, then click `Compile`.
-
-### For PAL versions of the game, follow these steps.
-
-PAL versions of the game seem to require additional troubleshooting/setup in order to work properly.
-Below are some instructions that may help. 
-If you see `-- Compilation Error! --` after pressing `Compile` or Launching the ArchipelaGOAL mod, try these steps.
-
-- Remove these folders if you have them: 
-    - `<opengoal active version directory>/iso_data`
-    - `<archipelagoal directory>/iso_data`
-    - `<archipelagoal directory>/data/iso_data`
-- Place your Jak1 ISO in `<archipelagoal directory>` and rename it to `JakAndDaxter.iso`
-- Type `cmd` in Windows search, right click `Command Prompt`, and pick `Run as Administrator`
-- Run `cd <archipelagoal directory>`
-- Then run `.\extractor.exe --extract --extract-path .\data\iso_data "JakAndDaxter.iso"` 
-    - This command should end by saying `Uses Decompiler Config Version - ntsc_v1` or `... - pal`. Take note of this message.
-- If you saw `ntsc_v1`:
-    - In cmd, run `.\decompiler.exe data\decompiler\config\jak1\jak1_config.jsonc --version "ntsc_v1" data\iso_data data\decompiler_out`
-- If you saw `pal`:
-    - Rename `<archipelagoal directory>\data\iso_data\jak1` to `jak1_pal`
-    - Back in cmd, run `.\decompiler.exe data\decompiler\config\jak1\jak1_config.jsonc --version "pal" data\iso_data data\decompiler_out`
-    - Rename `<archipelagoal directory>\data\iso_data\jak1_pal` back to `jak1`
-    - Rename `<archipelagoal directory>\data\decompiler_out\jak1_pal` back to `jak1`
-- Open a **brand new** console window and launch the compiler:
-    - `cd <archipelagoal directory>`
-    - `.\goalc.exe --user-auto --game jak1`
-    - From the compiler (in the same window): `(mi)`. This should compile the game. **Note that the parentheses are important.** 
-    - **Don't close this first terminal, you will need it at the end.**
-- Then, open **another brand new** console window and execute the game:
-    - `cd <archipelagoal directory>`
-    - `.\gk.exe -v --game jak1 -- -boot -fakeiso -debug`
-- Finally, **from the first console still in the GOALC compiler**, connect to the game: `(lt)`.
+- Once the mod is installed, in the bottom right corner, click `Advanced`, then click `Compile`.
 
 ## Updates and New Releases via OpenGOAL Launcher
 
@@ -82,7 +44,7 @@ If you are in the middle of an async game, and you do not want to update the mod
     - The game window itself will launch, and Jak will be standing outside Samos's Hut. 
         - Once compilation is complete, the title sequence will start.
     - Finally, the Archipelago text client will open.
-        - If you see **BOTH** `The REPL is ready!` and `The Memory Reader is ready!` then that should indicate a successful startup. If you do not, see the Troubleshooting section.
+        - If you see **BOTH** `The Compiler is ready!` and `The Memory Reader is ready!` then that should indicate a successful startup. If you do not, see the Troubleshooting section.
 - Once you see `CONNECT TO ARCHIPELAGO NOW` on the title screen, use the text client to connect to the Archipelago server. This will communicate your current settings and slot info to the game.
 - If you see `RECEIVING ITEMS, PLEASE WAIT...`, the game is busy receiving items from your starting inventory, assuming you have some.
 - Once you see `READY! PRESS START TO CONTINUE` on the title screen, you can press Start.
@@ -122,7 +84,7 @@ If it cannot, you may have to tell it yourself. Follow these instructions.
   root_directory: "%programfiles%/OpenGOAL-Launcher/features/jak1/mods/JakMods/archipelagoal"
 ```
 
-- Second, find the `root_directory` entry. Change this to `false`. You do not need to use double quotes.
+- Second, find the `auto_detect_root_directory` entry. Change this to `false`. You do not need to use double quotes.
 
 ```yaml
   auto_detect_root_directory: true
@@ -138,7 +100,7 @@ You may start the game via the Text Client, but it never loads in the title scre
 -- Compilation Error! --
 ```
 
-If this happens, follow these instructions. If you are using a PAL version of the game, you should skip these instructions and follow the `Special PAL Instructions` above.
+If this happens, follow these instructions.
 
 - Run the OpenGOAL Launcher (if you had it open before, close it and reopen it).
 - Click the Jak and Daxter logo on the left sidebar, then click `Advanced`, then click `Open Game Data Folder`. Copy the `iso_data` folder from this directory.
@@ -150,9 +112,9 @@ If this happens, follow these instructions. If you are using a PAL version of th
 - Click `Features` in the bottom right corner, then click `Mods`, then under `Installed Mods`, click `ArchipelaGOAL`.
 - In the bottom right corner, click `Advanced`, then click `Compile`.
 
-### The Text Client Says "Error reading game memory!" or "Error sending data to compiler"
+### The Text Client Says "Error reading game memory!" or "Error sending data to compiler!"
 
-If at any point the text client says this, you will need to restart the **all** of these applications.
+If at any point the text client says this in big red letters, you will need to restart the **all** of these applications.
 
 - Close all open windows: the client, the compiler, and the game.
 - Run the OpenGOAL Launcher, then click `Features`, then click `Mods`, then click `ArchipelaGOAL`.
@@ -161,20 +123,24 @@ If at any point the text client says this, you will need to restart the **all**
 - Then close and reopen the Jak and Daxter Client from the Archipelago Launcher.
 - Once these are done, you can enter `/repl status` and `/memr status` in the text client to verify.
 
-### The Client Cannot Open A REPL Connection
+### The Client Cannot Open A Compiler Connection
 
-If the client cannot open a REPL connection to the game, you may need to check the following steps:
+If the client cannot open a REPL (compiler) connection to the game, you may need to check the following steps:
 
 - Ensure you are not hosting anything on ports `8181` and `8112`. Those are for the REPL (goalc) and the game (gk) respectively.
 - Ensure that Windows Defender and Windows Firewall are not blocking those programs from hosting or listening on those ports.
 - You can use Windows Resource Monitor to verify those ports are open when the programs are running.
 - Ensure that you only opened those ports for your local network, not the wider internet.
 
+### Your Linux Installation Does Not Have A Supported Terminal Application
+
+If you are running Linux and your client shows this error, you will need to install a compatible terminal application like xterm.
+
 ## Known Issues
 
 - The game needs to boot in debug mode in order to allow the compiler to connect to it. **Clicking "Play" on the mod page in the OpenGOAL Launcher will not work.**
 - The Compiler console window is orphaned once you close the game - you will have to kill it manually when you stop playing.
-- The console windows cannot be run as background processes due to how the REPL works, so the best we can do is minimize them.
+- The console windows cannot be run as background processes due to how the compiler works, so the best we can do is minimize them.
 - Orbsanity checks may show up out of order in the text client.
 - Large item releases may take up to several minutes for the game to process them all. Item Messages will usually take longer to appear than Items themselves.
 - In Lost Precursor City, if you die in the Color Platforms room, the game may crash after you respawn. The cause is unknown.
diff --git a/worlds/jakanddaxter/game_id.py b/worlds/jakanddaxter/game_id.py
index d596a6cc82..afffca4c97 100644
--- a/worlds/jakanddaxter/game_id.py
+++ b/worlds/jakanddaxter/game_id.py
@@ -1,3 +1,5 @@
+import Utils
+
 # All Jak And Daxter Archipelago IDs must be offset by this number.
 jak1_id = 741000000
 
@@ -6,3 +8,9 @@ jak1_max = jak1_id + 999999
 
 # The name of the game.
 jak1_name = "Jak and Daxter: The Precursor Legacy"
+
+# The executable name of the GOAL Kernel.
+jak1_gk = "gk" + (".exe" if Utils.is_windows else "")
+
+# The executable name of the GOAL Compiler.
+jak1_goalc = "goalc" + (".exe" if Utils.is_windows else "")
\ No newline at end of file
diff --git a/worlds/jakanddaxter/requirements.txt b/worlds/jakanddaxter/requirements.txt
index ca36764fbf..9ec60e8d10 100644
--- a/worlds/jakanddaxter/requirements.txt
+++ b/worlds/jakanddaxter/requirements.txt
@@ -1 +1 @@
-Pymem>=1.13.0
+PyMemoryEditor>=1.6.0
diff --git a/worlds/jakanddaxter/test/test_trades.py b/worlds/jakanddaxter/test/test_trades.py
index 92552f9d0e..97b7c2a220 100644
--- a/worlds/jakanddaxter/test/test_trades.py
+++ b/worlds/jakanddaxter/test/test_trades.py
@@ -7,7 +7,9 @@ class TradesCostNothingTest(JakAndDaxterTestBase):
         "global_orbsanity_bundle_size": 10,
         "citizen_orb_trade_amount": 0,
         "oracle_orb_trade_amount": 0,
-        "start_inventory": {"Power Cell": 100},
+        "fire_canyon_cell_count": 0,
+        "mountain_pass_cell_count": 0,
+        "lava_tube_cell_count": 0,
     }
 
     def test_orb_items_are_filler(self):
@@ -26,7 +28,9 @@ class TradesCostEverythingTest(JakAndDaxterTestBase):
         "global_orbsanity_bundle_size": 10,
         "citizen_orb_trade_amount": 120,
         "oracle_orb_trade_amount": 150,
-        "start_inventory": {"Power Cell": 100},
+        "fire_canyon_cell_count": 0,
+        "mountain_pass_cell_count": 0,
+        "lava_tube_cell_count": 0,
     }
 
     def test_orb_items_are_progression(self):
diff --git a/worlds/kdl3/presets.py b/worlds/kdl3/presets.py
index 491ad9dca9..f07973e6b0 100644
--- a/worlds/kdl3/presets.py
+++ b/worlds/kdl3/presets.py
@@ -7,7 +7,7 @@ all_random = {
     "game_language": "random",
     "goal": "random",
     "goal_speed": "random",
-    "total_heart_stars": "random",
+    "max_heart_stars": "random",
     "heart_stars_required": "random",
     "filler_percentage": "random",
     "trap_percentage": "random",
@@ -34,7 +34,7 @@ all_random = {
 beginner = {
     "goal": "zero",
     "goal_speed": "normal",
-    "total_heart_stars": 50,
+    "max_heart_stars": 50,
     "heart_stars_required": 30,
     "filler_percentage": 25,
     "trap_percentage": 0,
diff --git a/worlds/kh1/Options.py b/worlds/kh1/Options.py
index 879ea4c331..21c55435cb 100644
--- a/worlds/kh1/Options.py
+++ b/worlds/kh1/Options.py
@@ -568,7 +568,7 @@ class DestinyIslands(Toggle):
     
     When "Destiny Islands" is found, Traverse Town will have an additional place to land - Seashore.
     
-    "Raft Materials" allow progress into Day 2 and to Homecoming.  The amount is defined in Day 2 Materials and Homecoming Materials.
+    "Raft Materials" allow progress into Day 2 and to Homecoming (Final Bosses).  The amount is defined in Day 2 Materials and Homecoming Materials.
     """
     display_name = "Destiny Islands"
 
@@ -589,7 +589,7 @@ class OrichalcumInPool(Range):
     
     You need 17 to synth every recipe that requires it.
     """
-    display_name = "Mythril In Pool"
+    display_name = "Orichalcum In Pool"
     default = 20
     range_start = 17
     range_end = 30
@@ -752,7 +752,7 @@ class Day2Materials(Range):
 
 class HomecomingMaterials(Range):
     """
-    The amount of Raft Materials required to access Homecoming.
+    The amount of Raft Materials required to access Homecoming (Final Bosses).
     """
     display_name = "Homecoming Materials"
     default = 10
@@ -761,7 +761,7 @@ class HomecomingMaterials(Range):
 
 class MaterialsInPool(Range):
     """
-    The amount of Raft Materials required to access Homecoming.
+    The amount of Raft Materials required to access Homecoming (Final Bosses).
     """
     display_name = "Materials in Pool"
     default = 16
diff --git a/worlds/kh1/__init__.py b/worlds/kh1/__init__.py
index fbdc99206a..593a612bbd 100644
--- a/worlds/kh1/__init__.py
+++ b/worlds/kh1/__init__.py
@@ -30,7 +30,7 @@ class KH1Web(WebWorld):
     theme = "ocean"
     tutorials = [Tutorial(
             "Multiworld Setup Guide",
-            "A guide to setting up the Kingdom Hearts Randomizer software on your computer."
+            "A guide to setting up the Kingdom Hearts Randomizer software on your computer. "
             "This guide covers single-player, multiworld, and related software.",
             "English",
             "kh1_en.md",
diff --git a/worlds/kh1/docs/en_Kingdom Hearts.md b/worlds/kh1/docs/en_Kingdom Hearts.md
index f086267264..2a0be26621 100644
--- a/worlds/kh1/docs/en_Kingdom Hearts.md	
+++ b/worlds/kh1/docs/en_Kingdom Hearts.md	
@@ -39,7 +39,7 @@ When the player receives an item, your client will display a message displaying
 
 ## What do I do if I encounter a bug with the game?
 
-Please reach out to Gicu#7034 on Discord.
+Please reach out to ssjgicu on Discord, or visit the #kingdom-hearts-1 channel on the Archipelago Discord server.
 
 ## Credits
 This is a collaborative effort from several individuals in the Kingdom Hearts community, but most of all, denhonator.
diff --git a/worlds/kh1/docs/kh1_en.md b/worlds/kh1/docs/kh1_en.md
index f6b6a64067..11225b2296 100644
--- a/worlds/kh1/docs/kh1_en.md
+++ b/worlds/kh1/docs/kh1_en.md
@@ -1,44 +1,49 @@
 # Kingdom Hearts Archipelago Randomizer Setup Guide
 
-<h2 style="text-transform:none";>Required software</h2>
+## Required software
 
 - KINGDOM HEARTS -HD 1.5+2.5 ReMIX- from the [Epic Games Store](https://store.epicgames.com/en-US/discover/kingdom-hearts) or [Steam](https://store.steampowered.com/app/2552430/KINGDOM_HEARTS_HD_1525_ReMIX/)
 
-- The latest release of [OpenKH](https://github.com/OpenKH/OpenKh/releases)
+- The latest release of [OpenKH](https://github.com/OpenKH/OpenKh/releases/latest)
 
-- The latest release of the [Kingdom Hearts 1FM Randomizer Software](https://github.com/gaithern/KH1FM-RANDOMIZER/releases)
+- The latest release of the [Kingdom Hearts 1FM Randomizer Software](https://github.com/gaithern/KH1FM-RANDOMIZER/releases/latest)
 
-- The latest release of [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) for the ArchipelagoKH1Client.exe
+- The latest release of [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
 
-<h2 style="text-transform:none";>Setting up the required software</h2>
+## Setting up the required software
 
-<h3 style="text-transform:none";>OpenKH</h3>
+- Before beginning, ensure that KH1 has been launched to the title screen at least once before.
+- Verify game files via Steam/Epic; clean files are needed for the modding process to work.
 
-- Extract the OpenKH files to a directory of your choosing.
+### OpenKH
+
+- Extract the OpenKH files to a directory within the same drive you have the game installed.
+- Open `OpenKh.Tools.ModsManager.exe` within the OpenKH folder.
 - When prompted for game edition, choose PC Release, select which platform you're using (EGS or Steam), navigate to your `Kingdom Hearts I.5 + II.5` installation folder in the path box and click `Next`.
 - When prompted, install Panacea, then click `Next`.
 - When prompted, check KH1 plus any other AP game you want to play, and click `Install and configure Lua backend`, then click `Next`.
 - Extract the data for KH1.
 - Click `Finish`
 
-<h3 style="text-transform:none";>Kingdom Hearts 1FM Randomizer Software</h3>
+### Kingdom Hearts 1FM Randomizer Software
 
 - Extract the Kingdom Hearts 1FM Randomizer Software files in a directory of your choosing.
 
-<h2 style="text-transform:none";>Obtaining and using the seed zip</h2>
+## Obtaining and using the patch
 
-- When you generate a game you will see a download link for a KH1 .zip seed on the room page.
+- [Generate an Archipelago game](https://archipelago.gg/generate) using the KH1 yaml generated from the KH1 [options page](https://archipelago.gg/games/Kingdom%20Hearts/player-options). 
+- When you generate a game you will see a download link for a KH1 .zip patch on the room page.
 - After downloading this zip, open `mod_generator.exe` in your Kingdom Hearts 1FM Randomizer Software folder.
-- Direct `mod_generator.exe` to both your seed zip and your KH1 data folder extracted during your OpenKH set up.
+- Direct `mod_generator.exe` to both your patch zip and your KH1 data folder extracted during your OpenKH set up.
 - Click `start`.
 - After some time, you will find a file in your `Output` folder called `mod_YYYYMMDDHHMMSS.zip`
 - Open `OpenKh.Tools.ModsManager.exe` and ensure that the dropdown in the top right is set to `Kingdom Hearts 1`
 - Click the green plus, choose `Select and install Mod Archive or Lua Script`, and direct the prompt to your new mod zip.
 - You should now see a mod on your list called `KH1 Randomizer Seed XYZ` where XYZ is your seed hex value.
-- Ensure this mod is checked, then, if you want to play right away, click `Mod Loader` at the top.
-- Click `Build and Run`.  Your modded game should now open.
+- Ensure this mod is checked `[x]`.
+- Click `Mod Loader` at the top, then click `Build and Run`.  Your modded game should now open.
 
-<h2 style="text-transform:none";>Connecting to your multiworld via the KH1 Client</h2>
+## Connecting to your multiworld via the KH1 Client
 
 - Once your game is being hosted, open `ArchipelagoLauncher.exe`.
 - Find `KH1 Client` and open it.
@@ -48,52 +53,76 @@
 - After typing your slot name, press enter.
 - If all is well, you are now connected.
 
-<h2 style="text-transform:none";>FAQ</h2>
+## FAQ
 
-<h3 style="text-transform:none";>The client did not confirm connection to the game, is that normal?</h3>
+### The client did not confirm connection to the game, is that normal?
 
 Yes, the game and client communicate via a game communication path set up in your in your `%AppData%` folder, and therefore don't need to establish a socket connection.
 
-<h3 style="text-transform:none";>I am not sending or receiving items.</h3>
+### Why aren't the evidence boxes spawning in Wonderland?
 
-Check out this [troubleshooting guide](https://docs.google.com/document/d/1oAXxJWrNeqSL-tkB_01bLR0eT0urxz2FBo4URpq3VbM/edit?usp=sharing)
+You'll need to find `Footprints`, or a second `Wonderland`, in your multiworld.
 
-<h3 style="text-transform:none";>Why aren't the evidence boxes spawning in Wonderland?</h3>
+### Why won't Phil let me start the Prelims?
 
-You'll need to find `Footprints` in your multiworld.
+You'll need to find `Entry Pass`, or a second `Olympus Colosseum`, in the multiworld.
 
-<h3 style="text-transform:none";>Why won't Phil let me start the Prelims?</h3>
+### Why aren't the slides spawning in Deep Jungle?
 
-You'll need to find `Entry Pass` in the multiworld.
+You'll need to find `Slides`, or a second `Deep Jungle`, in the multiworld.
 
-<h3 style="text-transform:none";>Why aren't the slides spawning in Deep Jungle?</h3>
+### Why can't I make progress in Atlantica?
 
-You'll need to find `Slides` in the multiworld.
+You'll need to find `Crystal Trident`, or a second `Atlantica`, in the multiworld.
 
-<h3 style="text-transform:none";>Why can't I make progress in Atlantica?</h3>
+### Why won't the doctor let me progress in Halloween Town?
 
-You'll need to find `Crystal Trident` in the multiworld.
+You'll need to find either `Forget-Me-Not` and/or `Jack-in-the-Box`, or a second `Halloween Town`, in the multiworld.
 
-<h3 style="text-transform:none";>Why won't the doctor let me progress in Halloween Town?</h3>
+### Why is there a book missing in the Hollow Bastion library?
 
-You'll need to find either `Forget-Me-Not` or `Jack-in-the-Box` in the multiworld.
+You'll need to find `Theon Vol. 6`, or a second `Hallow Bastion`, in the multiworld.
 
-<h3 style="text-transform:none";>Why is there a book missing in the Hollow Bastion library?</h3>
-
-You'll need to find `Theon Vol. 6` in the multiworld.
-
-<h3 style="text-transform:none";>How do I unlock End of the World?</h3>
+### How do I unlock End of the World?
 
 Depending on your settings, your options are either finding a specified amount of `Lucky Emblems` or finding the item `End of the World`.
 
-<h3 style="text-transform:none";>How do I enter Destiny Islands?</h3>
+### How do I enter Destiny Islands?
 
 After obtaining the item `Destiny Islands`, you can land there as an additional option in Traverse Town.
 
-<h3 style="text-transform:none";>How do I progress to Destiny Islands Day 2 and 3?</h3>
+### How do I progress to Destiny Islands Day 2 and 3?
 
-In order to access Day 2 and 3, you need to collect an amount of `Raft Materials` specified in your settings.  When you start Day 3, you'll be immediately warped to Homecoming.
+In order to access Day 2 and 3, you need to collect an amount of `Raft Materials` specified in your settings.  When you start Day 3, you'll be immediately warped to Homecoming (Final Bosses).
 
-<h3 style="text-transform:none";>Why can't I use the summon I obtained?</h3>
+### Why can't I use the summon I obtained?
 
 You need at least one magic spell before you can use summons.
+
+## Troubleshooting
+
+### Why am I not sending or receiving any items, despite being connected to the server?
+
+Make sure you are using the KH1 Client and not the Text Client. You will need to open the client via the Archipelago Launcher.
+If the correct client is being used, try reinstalling both Panacea and Lua Backend via the Setup Wizard under Settings.
+Uncommonly, the folder `KH1FM` failed to generate within `%LocalAppData%`, and needs to be manually created. Alternately, the contents within `%LocalAppData%/KH1FM/` may need to be deleted.
+
+### Why am I sending and/or receiving the wrong items?
+
+Make sure you are using the correct seed zip and mod for your Archipelago game.<br>
+It's also possible you are playing on a non-English language. Unfortunately, only English is supported.
+
+### Why don't I have any worlds on the world map? Am I supposed to play through the Dive to the Heart?
+
+If you have any of these symptoms: you find that the title screen does not have the Archipelago logo, that you had to do the entirety of Dive to the Heart, that you do not warp to the world map after choosing your Dream Weapons, or that when you get to the world map there are no worlds there;<br><br>
+
+This is likely due to the mod not being applied properly. First, reinstall both Panacea and Lua Backend via the Setup Wizard under Settings. Second, make sure the seed mod is enabled [x]. Finally, ensure the game builds with no errors after selecting Build and Run under Mod Loader.
+
+### Why did the game send checks that I had not collected?
+
+The client caches your inventory and does not clear the cache when switching slots. The game also does something similar, even if backed out to the title screen. Therefore, it's highly encouraged, whenever switching slots or connecting to a different server, to always fully close both the game and the client first.
+
+### Why is my seed missing important world progression items?
+
+This is likely related to the Stacking World Items setting. When it is off, each world will have unique items that allow progression at some point in the world. When it is on, that item is replaced with a second world item.
+Even when Stacking World Items is off, if Halloween Town Key Item Bundle is on then only the Forget-me-not is to be collected.
diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index 5a26231c0c..506354f243 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -1,1034 +1,4 @@
-import ModuleUpdate
-import Utils
-
-ModuleUpdate.update()
-
-import os
-import asyncio
-import json
-import requests
-from pymem import pymem
-from . import item_dictionary_table, exclusion_item_table, CheckDupingItems, all_locations, exclusion_table, \
-    SupportAbility_Table, ActionAbility_Table, all_weapon_slot
-from .Names import ItemName
-from .WorldLocations import *
-
-from NetUtils import ClientStatus
-from CommonClient import gui_enabled, logger, get_base_parser, CommonContext, server_loop
-
-
-class KH2Context(CommonContext):
-    # command_processor: int = KH2CommandProcessor
-    game = "Kingdom Hearts 2"
-    items_handling = 0b111  # Indicates you get items sent from other worlds.
-
-    def __init__(self, server_address, password):
-        super(KH2Context, self).__init__(server_address, password)
-
-        self.goofy_ability_to_slot = dict()
-        self.donald_ability_to_slot = dict()
-        self.all_weapon_location_id = None
-        self.sora_ability_to_slot = dict()
-        self.kh2_seed_save = None
-        self.kh2_local_items = None
-        self.growthlevel = None
-        self.kh2connected = False
-        self.kh2_finished_game = False
-        self.serverconnected = False
-        self.item_name_to_data = {name: data for name, data, in item_dictionary_table.items()}
-        self.location_name_to_data = {name: data for name, data, in all_locations.items()}
-        self.kh2_data_package = {}
-        self.kh2_loc_name_to_id = None
-        self.kh2_item_name_to_id = None
-        self.lookup_id_to_item = None
-        self.lookup_id_to_location = None
-        self.sora_ability_dict = {k: v.quantity for dic in [SupportAbility_Table, ActionAbility_Table] for k, v in
-                                  dic.items()}
-        self.location_name_to_worlddata = {name: data for name, data, in all_world_locations.items()}
-
-        self.sending = []
-        self.slot_name = None
-        self.disconnect_from_server = False
-        # list used to keep track of locations+items player has. Used for disoneccting
-        self.kh2_seed_save_cache = {
-            "itemIndex":  -1,
-            # back of soras invo is 0x25E2. Growth should be moved there
-            #  Character: [back of invo, front of invo]
-            "SoraInvo":   [0x25D8, 0x2546],
-            "DonaldInvo": [0x26F4, 0x2658],
-            "GoofyInvo":  [0x2808, 0x276C],
-            "AmountInvo": {
-                "Ability":      {},
-                "Amount":       {
-                    "Bounty": 0,
-                },
-                "Growth":       {
-                    "High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
-                    "Aerial Dodge": 0, "Glide": 0
-                },
-                "Bitmask":      [],
-                "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
-                "Equipment":    [],
-                "Magic":        {
-                    "Fire Element":     0,
-                    "Blizzard Element": 0,
-                    "Thunder Element":  0,
-                    "Cure Element":     0,
-                    "Magnet Element":   0,
-                    "Reflect Element":  0
-                },
-                "StatIncrease": {
-                    ItemName.MaxHPUp:         0,
-                    ItemName.MaxMPUp:         0,
-                    ItemName.DriveGaugeUp:    0,
-                    ItemName.ArmorSlotUp:     0,
-                    ItemName.AccessorySlotUp: 0,
-                    ItemName.ItemSlotUp:      0,
-                },
-            },
-        }
-        self.kh2seedname = None
-        self.kh2_seed_save_path_join = None
-
-        self.kh2slotdata = None
-        self.mem_json = None
-        self.itemamount = {}
-        if "localappdata" in os.environ:
-            self.game_communication_path = os.path.expandvars(r"%localappdata%\KH2AP")
-        self.hitlist_bounties = 0
-        # hooked object
-        self.kh2 = None
-        self.final_xemnas = False
-        self.worldid_to_locations = {
-            #  1:   {},  # world of darkness (story cutscenes)
-            2:  TT_Checks,
-            #  3:   {},  # destiny island doesn't have checks
-            4:  HB_Checks,
-            5:  BC_Checks,
-            6:  Oc_Checks,
-            7:  AG_Checks,
-            8:  LoD_Checks,
-            9:  HundredAcreChecks,
-            10: PL_Checks,
-            11: Atlantica_Checks,
-            12: DC_Checks,
-            13: TR_Checks,
-            14: HT_Checks,
-            15: HB_Checks,  # world map, but you only go to the world map while on the way to goa so checking hb
-            16: PR_Checks,
-            17: SP_Checks,
-            18: TWTNW_Checks,
-            #  255: {},  # starting screen
-        }
-        self.last_world_int = -1
-        # PC Address anchors
-        # epic .10 addresses
-        self.Now = 0x0716DF8
-        self.Save = 0x9A9330
-        self.Journal = 0x743260
-        self.Shop = 0x743350
-        self.Slot1 = 0x2A23018
-
-        self.kh2_game_version = None  # can be egs or steam
-
-        self.kh2_seed_save_path = None
-
-        self.chest_set = set(exclusion_table["Chests"])
-        self.keyblade_set = set(CheckDupingItems["Weapons"]["Keyblades"])
-        self.staff_set = set(CheckDupingItems["Weapons"]["Staffs"])
-        self.shield_set = set(CheckDupingItems["Weapons"]["Shields"])
-
-        self.all_weapons = self.keyblade_set.union(self.staff_set).union(self.shield_set)
-
-        self.equipment_categories = CheckDupingItems["Equipment"]
-        self.armor_set = set(self.equipment_categories["Armor"])
-        self.accessories_set = set(self.equipment_categories["Accessories"])
-        self.all_equipment = self.armor_set.union(self.accessories_set)
-
-        self.Equipment_Anchor_Dict = {
-            "Armor":       [0x2504, 0x2506, 0x2508, 0x250A],
-            "Accessories": [0x2514, 0x2516, 0x2518, 0x251A]
-        }
-
-        self.AbilityQuantityDict = {}
-        self.ability_categories = CheckDupingItems["Abilities"]
-
-        self.sora_ability_set = set(self.ability_categories["Sora"])
-        self.donald_ability_set = set(self.ability_categories["Donald"])
-        self.goofy_ability_set = set(self.ability_categories["Goofy"])
-
-        self.all_abilities = self.sora_ability_set.union(self.donald_ability_set).union(self.goofy_ability_set)
-
-        self.stat_increase_set = set(CheckDupingItems["Stat Increases"])
-        self.AbilityQuantityDict = {item: self.item_name_to_data[item].quantity for item in self.all_abilities}
-
-        #  Growth:[level 1,level 4,slot]
-        self.growth_values_dict = {
-            "High Jump":    [0x05E, 0x061, 0x25DA],
-            "Quick Run":    [0x62, 0x65, 0x25DC],
-            "Dodge Roll":   [0x234, 0x237, 0x25DE],
-            "Aerial Dodge": [0x66, 0x069, 0x25E0],
-            "Glide":        [0x6A, 0x6D, 0x25E2]
-        }
-
-        self.ability_code_list = None
-        self.master_growth = {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}
-
-        self.base_hp = 20
-        self.base_mp = 100
-        self.base_drive = 5
-        self.base_accessory_slots = 1
-        self.base_armor_slots = 1
-        self.base_item_slots = 3
-        self.front_ability_slots = [0x2546, 0x2658, 0x276C, 0x2548, 0x254A, 0x254C, 0x265A, 0x265C, 0x265E, 0x276E,
-                                    0x2770, 0x2772]
-
-    async def server_auth(self, password_requested: bool = False):
-        if password_requested and not self.password:
-            await super(KH2Context, self).server_auth(password_requested)
-        await self.get_username()
-        # if slot name != first time login or previous name
-        # and seed name is none or saved seed name
-        if not self.slot_name and not self.kh2seedname:
-            await self.send_connect()
-        elif self.slot_name == self.auth and self.kh2seedname:
-            await self.send_connect()
-        else:
-            logger.info(f"You are trying to connect with data still cached in the client. Close client or connect to the correct slot: {self.slot_name}")
-            self.serverconnected = False
-            self.disconnect_from_server = True
-
-    async def connection_closed(self):
-        self.kh2connected = False
-        self.serverconnected = False
-        if self.kh2seedname is not None and self.auth is not None:
-            with open(self.kh2_seed_save_path_join, 'w') as f:
-                f.write(json.dumps(self.kh2_seed_save, indent=4))
-        await super(KH2Context, self).connection_closed()
-
-    async def disconnect(self, allow_autoreconnect: bool = False):
-        self.kh2connected = False
-        self.serverconnected = False
-        self.locations_checked = []
-        if self.kh2seedname not in {None} and self.auth not in {None}:
-            with open(self.kh2_seed_save_path_join, 'w') as f:
-                f.write(json.dumps(self.kh2_seed_save, indent=4))
-        await super(KH2Context, self).disconnect()
-
-    @property
-    def endpoints(self):
-        if self.server:
-            return [self.server]
-        else:
-            return []
-
-    async def shutdown(self):
-        if self.kh2seedname not in {None} and self.auth not in {None}:
-            with open(self.kh2_seed_save_path_join, 'w') as f:
-                f.write(json.dumps(self.kh2_seed_save, indent=4))
-        await super(KH2Context, self).shutdown()
-
-    def kh2_read_short(self, address):
-        return self.kh2.read_short(self.kh2.base_address + address)
-
-    def kh2_write_short(self, address, value):
-        return self.kh2.write_short(self.kh2.base_address + address, value)
-
-    def kh2_write_byte(self, address, value):
-        return self.kh2.write_bytes(self.kh2.base_address + address, value.to_bytes(1, 'big'), 1)
-
-    def kh2_read_byte(self, address):
-        return int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + address, 1))
-
-    def kh2_read_int(self, address):
-        return self.kh2.read_int(self.kh2.base_address + address)
-
-    def kh2_write_int(self, address, value):
-        self.kh2.write_int(self.kh2.base_address + address, value)
-
-    def kh2_read_string(self, address, length):
-        return self.kh2.read_string(self.kh2.base_address + address, length)
-
-    def on_package(self, cmd: str, args: dict):
-        if cmd == "RoomInfo":
-            if not self.kh2seedname:
-                self.kh2seedname = args['seed_name']
-            elif self.kh2seedname != args['seed_name']:
-                self.disconnect_from_server = True
-                self.serverconnected = False
-                self.kh2connected = False
-                logger.info("Connection to the wrong seed, connect to the correct seed or close the client.")
-                return
-
-            self.kh2_seed_save_path = f"kh2save2{self.kh2seedname}{self.auth}.json"
-            self.kh2_seed_save_path_join = os.path.join(self.game_communication_path, self.kh2_seed_save_path)
-
-            if not os.path.exists(self.game_communication_path):
-                os.makedirs(self.game_communication_path)
-            if not os.path.exists(self.kh2_seed_save_path_join):
-                self.kh2_seed_save = {
-                    "Levels":        {
-                        "SoraLevel":   0,
-                        "ValorLevel":  0,
-                        "WisdomLevel": 0,
-                        "LimitLevel":  0,
-                        "MasterLevel": 0,
-                        "FinalLevel":  0,
-                        "SummonLevel": 0,
-                    },
-                    "SoldEquipment": [],
-                }
-                with open(self.kh2_seed_save_path_join, 'wt') as f:
-                    pass
-                # self.locations_checked = set()
-            elif os.path.exists(self.kh2_seed_save_path_join):
-                with open(self.kh2_seed_save_path_join) as f:
-                    self.kh2_seed_save = json.load(f)
-                    if self.kh2_seed_save is None:
-                        self.kh2_seed_save = {
-                            "Levels":        {
-                                "SoraLevel":   0,
-                                "ValorLevel":  0,
-                                "WisdomLevel": 0,
-                                "LimitLevel":  0,
-                                "MasterLevel": 0,
-                                "FinalLevel":  0,
-                                "SummonLevel": 0,
-                            },
-                            "SoldEquipment": [],
-                        }
-                    # self.locations_checked = set(self.kh2_seed_save_cache["LocationsChecked"])
-            # self.serverconneced = True
-
-        if cmd == "Connected":
-            self.kh2slotdata = args['slot_data']
-
-            self.kh2_data_package = Utils.load_data_package_for_checksum(
-                    "Kingdom Hearts 2", self.checksums["Kingdom Hearts 2"])
-
-            if "location_name_to_id" in self.kh2_data_package:
-                self.data_package_kh2_cache(
-                        self.kh2_data_package["location_name_to_id"], self.kh2_data_package["item_name_to_id"])
-                self.connect_to_game()
-            else:
-                asyncio.create_task(self.send_msgs([{"cmd": "GetDataPackage", "games": ["Kingdom Hearts 2"]}]))
-
-            self.locations_checked = set(args["checked_locations"])
-
-        if cmd == "ReceivedItems":
-            # 0x2546
-            # 0x2658
-            # 0x276A
-            start_index = args["index"]
-            if start_index == 0:
-                self.kh2_seed_save_cache = {
-                    "itemIndex":  -1,
-                    # back of soras invo is 0x25E2. Growth should be moved there
-                    #  Character: [back of invo, front of invo]
-                    "SoraInvo":   [0x25D8, 0x2546],
-                    "DonaldInvo": [0x26F4, 0x2658],
-                    "GoofyInvo":  [0x2808, 0x276C],
-                    "AmountInvo": {
-                        "Ability":      {},
-                        "Amount":       {
-                            "Bounty": 0,
-                        },
-                        "Growth":       {
-                            "High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
-                            "Aerial Dodge": 0, "Glide": 0
-                        },
-                        "Bitmask":      [],
-                        "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
-                        "Equipment":    [],
-                        "Magic":        {
-                            "Fire Element":     0,
-                            "Blizzard Element": 0,
-                            "Thunder Element":  0,
-                            "Cure Element":     0,
-                            "Magnet Element":   0,
-                            "Reflect Element":  0
-                        },
-                        "StatIncrease": {
-                            ItemName.MaxHPUp:         0,
-                            ItemName.MaxMPUp:         0,
-                            ItemName.DriveGaugeUp:    0,
-                            ItemName.ArmorSlotUp:     0,
-                            ItemName.AccessorySlotUp: 0,
-                            ItemName.ItemSlotUp:      0,
-                        },
-                    },
-                }
-            if start_index > self.kh2_seed_save_cache["itemIndex"] and self.serverconnected:
-                self.kh2_seed_save_cache["itemIndex"] = start_index
-                for item in args['items']:
-                    asyncio.create_task(self.give_item(item.item, item.location))
-
-        if cmd == "RoomUpdate":
-            if "checked_locations" in args:
-                new_locations = set(args["checked_locations"])
-                self.locations_checked |= new_locations
-
-        if cmd == "DataPackage":
-            if "Kingdom Hearts 2" in args["data"]["games"]:
-                self.data_package_kh2_cache(
-                        args["data"]["games"]["Kingdom Hearts 2"]["location_name_to_id"],
-                        args["data"]["games"]["Kingdom Hearts 2"]["item_name_to_id"])
-                self.connect_to_game()
-                asyncio.create_task(self.send_msgs([{'cmd': 'Sync'}]))
-
-    def connect_to_game(self):
-        if "KeybladeAbilities" in self.kh2slotdata.keys():
-            # sora ability to slot
-            self.AbilityQuantityDict.update(self.kh2slotdata["KeybladeAbilities"])
-            # itemid:[slots that are available for that item]
-            self.AbilityQuantityDict.update(self.kh2slotdata["StaffAbilities"])
-            self.AbilityQuantityDict.update(self.kh2slotdata["ShieldAbilities"])
-
-        self.all_weapon_location_id = {self.kh2_loc_name_to_id[loc] for loc in all_weapon_slot}
-
-        try:
-            if not self.kh2:
-                self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
-                self.get_addresses()
-#
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info("Game is not open.")
-
-        self.serverconnected = True
-        self.slot_name = self.auth
-
-    def data_package_kh2_cache(self, loc_to_id, item_to_id):
-        self.kh2_loc_name_to_id = loc_to_id
-        self.lookup_id_to_location = {v: k for k, v in self.kh2_loc_name_to_id.items()}
-        self.kh2_item_name_to_id = item_to_id
-        self.lookup_id_to_item = {v: k for k, v in self.kh2_item_name_to_id.items()}
-        self.ability_code_list = [self.kh2_item_name_to_id[item] for item in exclusion_item_table["Ability"]]
-
-    async def checkWorldLocations(self):
-        try:
-            currentworldint = self.kh2_read_byte(self.Now)
-            if self.last_world_int != currentworldint:
-                self.last_world_int = currentworldint
-                await self.send_msgs([{
-                    "cmd":     "Set", "key": "Slot: " + str(self.slot) + " :CurrentWorld",
-                    "default": 0, "want_reply": False, "operations": [{
-                        "operation": "replace",
-                        "value":     currentworldint
-                    }]
-                }])
-            if currentworldint in self.worldid_to_locations:
-                curworldid = self.worldid_to_locations[currentworldint]
-                for location, data in curworldid.items():
-                    if location in self.kh2_loc_name_to_id.keys():
-                        locationId = self.kh2_loc_name_to_id[location]
-                        if locationId not in self.locations_checked \
-                                and self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
-                            self.sending = self.sending + [(int(locationId))]
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 425")
-
-    async def checkLevels(self):
-        try:
-            for location, data in SoraLevels.items():
-                currentLevel = self.kh2_read_byte(self.Save + 0x24FF)
-                locationId = self.kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked \
-                        and currentLevel >= data.bitIndex:
-                    if self.kh2_seed_save["Levels"]["SoraLevel"] < currentLevel:
-                        self.kh2_seed_save["Levels"]["SoraLevel"] = currentLevel
-                    self.sending = self.sending + [(int(locationId))]
-            formDict = {
-                0: ["ValorLevel", ValorLevels], 1: ["WisdomLevel", WisdomLevels], 2: ["LimitLevel", LimitLevels],
-                3: ["MasterLevel", MasterLevels], 4: ["FinalLevel", FinalLevels], 5: ["SummonLevel", SummonLevels]
-            }
-            for i in range(6):
-                for location, data in formDict[i][1].items():
-                    formlevel = self.kh2_read_byte(self.Save + data.addrObtained)
-                    if location in self.kh2_loc_name_to_id.keys():
-                        # if current form level is above other form level
-                        locationId = self.kh2_loc_name_to_id[location]
-                        if locationId not in self.locations_checked \
-                                and formlevel >= data.bitIndex:
-                            if formlevel > self.kh2_seed_save["Levels"][formDict[i][0]]:
-                                self.kh2_seed_save["Levels"][formDict[i][0]] = formlevel
-                            self.sending = self.sending + [(int(locationId))]
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 456")
-
-    async def checkSlots(self):
-        try:
-            for location, data in weaponSlots.items():
-                locationId = self.kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked:
-                    if self.kh2_read_byte(self.Save + data.addrObtained) > 0:
-                        self.sending = self.sending + [(int(locationId))]
-
-            for location, data in formSlots.items():
-                locationId = self.kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked and self.kh2_read_byte(self.Save + 0x06B2) == 0:
-                    if self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
-                        self.sending = self.sending + [(int(locationId))]
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 475")
-
-    async def verifyChests(self):
-        try:
-            for location in self.locations_checked:
-                locationName = self.lookup_id_to_location[location]
-                if locationName in self.chest_set:
-                    if locationName in self.location_name_to_worlddata.keys():
-                        locationData = self.location_name_to_worlddata[locationName]
-                        if self.kh2_read_byte(
-                                self.Save + locationData.addrObtained) & 0x1 << locationData.bitIndex == 0:
-                            roomData = self.kh2_read_byte(self.Save + locationData.addrObtained)
-                            self.kh2_write_byte(self.Save + locationData.addrObtained,
-                                                roomData | 0x01 << locationData.bitIndex)
-
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 491")
-
-    async def verifyLevel(self):
-        for leveltype, anchor in {
-            "SoraLevel":   0x24FF,
-            "ValorLevel":  0x32F6,
-            "WisdomLevel": 0x332E,
-            "LimitLevel":  0x3366,
-            "MasterLevel": 0x339E,
-            "FinalLevel":  0x33D6
-        }.items():
-            if self.kh2_read_byte(self.Save + anchor) < self.kh2_seed_save["Levels"][leveltype]:
-                self.kh2_write_byte(self.Save + anchor, self.kh2_seed_save["Levels"][leveltype])
-
-    async def give_item(self, item, location):
-        try:
-            # sleep so we can get the datapackage and not miss any items that were sent to us while we didnt have our item id dicts
-            while not self.lookup_id_to_item:
-                await asyncio.sleep(0.5)
-            itemname = self.lookup_id_to_item[item]
-            itemdata = self.item_name_to_data[itemname]
-            if itemdata.ability:
-                if location in self.all_weapon_location_id:
-                    return
-                # growth have reserved ability slots because of how the goa handles them
-                if itemname in {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}:
-                    self.kh2_seed_save_cache["AmountInvo"]["Growth"][itemname] += 1
-                    return
-
-                if itemname not in self.kh2_seed_save_cache["AmountInvo"]["Ability"]:
-                    self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname] = []
-                #  appending the slot that the ability should be in
-                # abilities have a limit amount of slots.
-                # we start from the back going down to not mess with stuff.
-                # Front of Invo
-                # Sora:   Save+24F0+0x54 : 0x2546
-                # Donald: Save+2604+0x54 : 0x2658
-                # Goofy:  Save+2718+0x54 : 0x276C
-                # Back of Invo. Sora has 6 ability slots that are reserved
-                # Sora:   Save+24F0+0x54+0x92 : 0x25D8
-                # Donald: Save+2604+0x54+0x9C : 0x26F4
-                # Goofy:  Save+2718+0x54+0x9C : 0x2808
-                # seed has 2 scans in sora's abilities
-                # recieved second scan
-                # if len(seed_save(Scan:[ability slot 52]) < (2)amount of that ability they should have from slot data
-                # ability_slot = back of inventory that isnt taken
-                # add ability_slot to seed_save(Scan[]) so now its Scan:[ability slot 52,50]
-                # decrease back of inventory since its ability_slot is already taken
-                if len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < \
-                        self.AbilityQuantityDict[itemname]:
-                    if itemname in self.sora_ability_set:
-                        ability_slot = self.kh2_seed_save_cache["SoraInvo"][0]
-                        self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                        self.kh2_seed_save_cache["SoraInvo"][0] -= 2
-                    elif itemname in self.donald_ability_set:
-                        ability_slot = self.kh2_seed_save_cache["DonaldInvo"][0]
-                        self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                        self.kh2_seed_save_cache["DonaldInvo"][0] -= 2
-                    else:
-                        ability_slot = self.kh2_seed_save_cache["GoofyInvo"][0]
-                        self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                        self.kh2_seed_save_cache["GoofyInvo"][0] -= 2
-
-                    if ability_slot in self.front_ability_slots:
-                        self.front_ability_slots.remove(ability_slot)
-
-            # if itemdata in {bitmask} all the forms,summons and a few other things are bitmasks
-            elif itemdata.memaddr in {0x36C4, 0x36C5, 0x36C6, 0x36C0, 0x36CA}:
-                # if memaddr is in a bitmask location in memory
-                if itemname not in self.kh2_seed_save_cache["AmountInvo"]["Bitmask"]:
-                    self.kh2_seed_save_cache["AmountInvo"]["Bitmask"].append(itemname)
-
-            # if itemdata in {magic}
-            elif itemdata.memaddr in {0x3594, 0x3595, 0x3596, 0x3597, 0x35CF, 0x35D0}:
-                self.kh2_seed_save_cache["AmountInvo"]["Magic"][itemname] += 1
-
-            # equipment is a list instead of dict because you can only have 1 currently
-            elif itemname in self.all_equipment:
-                self.kh2_seed_save_cache["AmountInvo"]["Equipment"].append(itemname)
-
-            # weapons are done differently since you can only have one and has to check it differently
-            elif itemname in self.all_weapons:
-                if itemname in self.keyblade_set:
-                    self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Sora"].append(itemname)
-                elif itemname in self.staff_set:
-                    self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Donald"].append(itemname)
-                else:
-                    self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Goofy"].append(itemname)
-
-            # TODO: this can just be removed and put into the else below it
-            elif itemname in self.stat_increase_set:
-                self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"][itemname] += 1
-            else:
-                # "normal" items. They have a unique byte reserved for how many they have
-                if itemname in self.kh2_seed_save_cache["AmountInvo"]["Amount"]:
-                    self.kh2_seed_save_cache["AmountInvo"]["Amount"][itemname] += 1
-                else:
-                    self.kh2_seed_save_cache["AmountInvo"]["Amount"][itemname] = 1
-
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 582")
-
-    def run_gui(self):
-        """Import kivy UI system and start running it as self.ui_task."""
-        from kvui import GameManager
-
-        class KH2Manager(GameManager):
-            logging_pairs = [
-                ("Client", "Archipelago")
-            ]
-            base_title = "Archipelago KH2 Client"
-
-        self.ui = KH2Manager(self)
-        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
-
-    async def IsInShop(self, sellable):
-        # journal = 0x741230 shop = 0x741320
-        # if journal=-1 and shop = 5 then in shop
-        # if journal !=-1 and shop = 10 then journal
-
-        journal = self.kh2_read_short(self.Journal)
-        shop = self.kh2_read_short(self.Shop)
-        if (journal == -1 and shop == 5) or (journal != -1 and shop == 10):
-            # print("your in the shop")
-            sellable_dict = {}
-            for itemName in sellable:
-                itemdata = self.item_name_to_data[itemName]
-                amount = self.kh2_read_byte(self.Save + itemdata.memaddr)
-                sellable_dict[itemName] = amount
-            while (journal == -1 and shop == 5) or (journal != -1 and shop == 10):
-                journal = self.kh2_read_short(self.Journal)
-                shop = self.kh2_read_short(self.Shop)
-                await asyncio.sleep(0.5)
-            for item, amount in sellable_dict.items():
-                itemdata = self.item_name_to_data[item]
-                afterShop = self.kh2_read_byte(self.Save + itemdata.memaddr)
-                if afterShop < amount:
-                    self.kh2_seed_save["SoldEquipment"].append(item)
-
-    async def verifyItems(self):
-        try:
-            master_amount = set(self.kh2_seed_save_cache["AmountInvo"]["Amount"].keys())
-
-            master_ability = set(self.kh2_seed_save_cache["AmountInvo"]["Ability"].keys())
-
-            master_bitmask = set(self.kh2_seed_save_cache["AmountInvo"]["Bitmask"])
-
-            master_keyblade = set(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Sora"])
-            master_staff = set(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Donald"])
-            master_shield = set(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Goofy"])
-
-            master_equipment = set(self.kh2_seed_save_cache["AmountInvo"]["Equipment"])
-
-            master_magic = set(self.kh2_seed_save_cache["AmountInvo"]["Magic"].keys())
-
-            master_stat = set(self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"].keys())
-
-            master_sell = master_equipment | master_staff | master_shield
-
-            await asyncio.create_task(self.IsInShop(master_sell))
-            # print(self.kh2_seed_save_cache["AmountInvo"]["Ability"])
-            for item_name in master_amount:
-                item_data = self.item_name_to_data[item_name]
-                amount_of_items = 0
-                amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["Amount"][item_name]
-
-                if item_name == "Torn Page":
-                    # Torn Pages are handled differently because they can be consumed.
-                    # Will check the progression in 100 acre and - the amount of visits
-                    # amountofitems-amount of visits done
-                    for location, data in tornPageLocks.items():
-                        if self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
-                            amount_of_items -= 1
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and amount_of_items >= 0:
-                    self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
-
-            for item_name in master_keyblade:
-                item_data = self.item_name_to_data[item_name]
-                # if the inventory slot for that keyblade is less than the amount they should have,
-                # and they are not in stt
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 and self.kh2_read_byte(
-                        self.Save + 0x1CFF) != 13:
-                    # Checking form anchors for the keyblade to remove extra keyblades
-                    if self.kh2_read_short(self.Save + 0x24F0) == item_data.kh2id \
-                            or self.kh2_read_short(self.Save + 0x32F4) == item_data.kh2id \
-                            or self.kh2_read_short(self.Save + 0x339C) == item_data.kh2id \
-                            or self.kh2_read_short(self.Save + 0x33D4) == item_data.kh2id:
-                        self.kh2_write_byte(self.Save + item_data.memaddr, 0)
-                    else:
-                        self.kh2_write_byte(self.Save + item_data.memaddr, 1)
-
-            for item_name in master_staff:
-                item_data = self.item_name_to_data[item_name]
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 \
-                        and self.kh2_read_short(self.Save + 0x2604) != item_data.kh2id \
-                        and item_name not in self.kh2_seed_save["SoldEquipment"]:
-                    self.kh2_write_byte(self.Save + item_data.memaddr, 1)
-
-            for item_name in master_shield:
-                item_data = self.item_name_to_data[item_name]
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 \
-                        and self.kh2_read_short(self.Save + 0x2718) != item_data.kh2id \
-                        and item_name not in self.kh2_seed_save["SoldEquipment"]:
-                    self.kh2_write_byte(self.Save + item_data.memaddr, 1)
-
-            for item_name in master_ability:
-                item_data = self.item_name_to_data[item_name]
-                ability_slot = []
-                ability_slot += self.kh2_seed_save_cache["AmountInvo"]["Ability"][item_name]
-                for slot in ability_slot:
-                    current = self.kh2_read_short(self.Save + slot)
-                    ability = current & 0x0FFF
-                    if ability | 0x8000 != (0x8000 + item_data.memaddr):
-                        if current - 0x8000 > 0:
-                            self.kh2_write_short(self.Save + slot, 0x8000 + item_data.memaddr)
-                        else:
-                            self.kh2_write_short(self.Save + slot, item_data.memaddr)
-            # removes the duped ability if client gave faster than the game.
-
-            for ability in self.front_ability_slots:
-                if self.kh2_read_short(self.Save + ability) != 0:
-                    print(f"removed {self.Save + ability} from {ability}")
-                    self.kh2_write_short(self.Save + ability, 0)
-
-            # remove the dummy level 1 growths if they are in these invo slots.
-            for inventorySlot in {0x25CE, 0x25D0, 0x25D2, 0x25D4, 0x25D6, 0x25D8}:
-                current = self.kh2_read_short(self.Save + inventorySlot)
-                ability = current & 0x0FFF
-                if 0x05E <= ability <= 0x06D:
-                    self.kh2_write_short(self.Save + inventorySlot, 0)
-
-            for item_name in self.master_growth:
-                growthLevel = self.kh2_seed_save_cache["AmountInvo"]["Growth"][item_name]
-                if growthLevel > 0:
-                    slot = self.growth_values_dict[item_name][2]
-                    min_growth = self.growth_values_dict[item_name][0]
-                    max_growth = self.growth_values_dict[item_name][1]
-                    if growthLevel > 4:
-                        growthLevel = 4
-                    current_growth_level = self.kh2_read_short(self.Save + slot)
-                    ability = current_growth_level & 0x0FFF
-
-                    # if the player should be getting a growth ability
-                    if ability | 0x8000 != 0x8000 + min_growth - 1 + growthLevel:
-                        # if it should be level one of that growth
-                        if 0x8000 + min_growth - 1 + growthLevel <= 0x8000 + min_growth or ability < min_growth:
-                            self.kh2_write_short(self.Save + slot, min_growth)
-                        # if it is already in the inventory
-                        elif ability | 0x8000 < (0x8000 + max_growth):
-                            self.kh2_write_short(self.Save + slot, current_growth_level + 1)
-
-            for item_name in master_bitmask:
-                item_data = self.item_name_to_data[item_name]
-                itemMemory = self.kh2_read_byte(self.Save + item_data.memaddr)
-                if self.kh2_read_byte(self.Save + item_data.memaddr) & 0x1 << item_data.bitmask == 0:
-                    # when getting a form anti points should be reset to 0 but bit-shift doesn't trigger the game.
-                    if item_name in {"Valor Form", "Wisdom Form", "Limit Form", "Master Form", "Final Form"}:
-                        self.kh2_write_byte(self.Save + 0x3410, 0)
-                    self.kh2_write_byte(self.Save + item_data.memaddr, itemMemory | 0x01 << item_data.bitmask)
-
-            for item_name in master_equipment:
-                item_data = self.item_name_to_data[item_name]
-                is_there = False
-                if item_name in self.accessories_set:
-                    Equipment_Anchor_List = self.Equipment_Anchor_Dict["Accessories"]
-                else:
-                    Equipment_Anchor_List = self.Equipment_Anchor_Dict["Armor"]
-                    # Checking form anchors for the equipment
-                for slot in Equipment_Anchor_List:
-                    if self.kh2_read_short(self.Save + slot) == item_data.kh2id:
-                        is_there = True
-                        if self.kh2_read_byte(self.Save + item_data.memaddr) != 0:
-                            self.kh2_write_byte(self.Save + item_data.memaddr, 0)
-                        break
-                if not is_there and item_name not in self.kh2_seed_save["SoldEquipment"]:
-                    if self.kh2_read_byte(self.Save + item_data.memaddr) != 1:
-                        self.kh2_write_byte(self.Save + item_data.memaddr, 1)
-
-            for item_name in master_magic:
-                item_data = self.item_name_to_data[item_name]
-                amount_of_items = 0
-                amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["Magic"][item_name]
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and self.kh2_read_byte(
-                        self.Shop) in {10, 8}:
-                    self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
-
-            for item_name in master_stat:
-                amount_of_items = 0
-                amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"][item_name]
-                # checking if they talked to the computer to give them these
-                if self.kh2_read_byte(self.Slot1 + 0x1B2) >= 5 and (self.kh2_read_byte(self.Save + 0x1D27) & 0x1 << 3) > 0:
-                    if item_name == ItemName.MaxHPUp:
-                        if self.kh2_read_byte(self.Save + 0x2498) < 3:  # Non-Critical
-                            Bonus = 5
-                        else:  # Critical
-                            Bonus = 2
-                        if self.kh2_read_int(self.Slot1 + 0x004) != self.base_hp + (Bonus * amount_of_items):
-                            self.kh2_write_int(self.Slot1 + 0x004, self.base_hp + (Bonus * amount_of_items))
-
-                    elif item_name == ItemName.MaxMPUp:
-                        if self.kh2_read_byte(self.Save + 0x2498) < 3:  # Non-Critical
-                            Bonus = 10
-                        else:  # Critical
-                            Bonus = 5
-                        if self.kh2_read_int(self.Slot1 + 0x184) != self.base_mp + (Bonus * amount_of_items):
-                            self.kh2_write_int(self.Slot1 + 0x184, self.base_mp + (Bonus * amount_of_items))
-
-                    elif item_name == ItemName.DriveGaugeUp:
-                        current_max_drive = self.kh2_read_byte(self.Slot1 + 0x1B2)
-                        # change when max drive is changed from 6 to 4
-                        if current_max_drive < 9 and current_max_drive != self.base_drive + amount_of_items:
-                            self.kh2_write_byte(self.Slot1 + 0x1B2, self.base_drive + amount_of_items)
-
-                    elif item_name == ItemName.AccessorySlotUp:
-                        current_accessory = self.kh2_read_byte(self.Save + 0x2501)
-                        if current_accessory != self.base_accessory_slots + amount_of_items:
-                            if 4 > current_accessory < self.base_accessory_slots + amount_of_items:
-                                self.kh2_write_byte(self.Save + 0x2501, current_accessory + 1)
-                            elif self.base_accessory_slots + amount_of_items < 4:
-                                self.kh2_write_byte(self.Save + 0x2501, self.base_accessory_slots + amount_of_items)
-
-                    elif item_name == ItemName.ArmorSlotUp:
-                        current_armor_slots = self.kh2_read_byte(self.Save + 0x2500)
-                        if current_armor_slots != self.base_armor_slots + amount_of_items:
-                            if 4 > current_armor_slots < self.base_armor_slots + amount_of_items:
-                                self.kh2_write_byte(self.Save + 0x2500, current_armor_slots + 1)
-                            elif self.base_armor_slots + amount_of_items < 4:
-                                self.kh2_write_byte(self.Save + 0x2500, self.base_armor_slots + amount_of_items)
-
-                    elif item_name == ItemName.ItemSlotUp:
-                        current_item_slots = self.kh2_read_byte(self.Save + 0x2502)
-                        if current_item_slots != self.base_item_slots + amount_of_items:
-                            if 8 > current_item_slots < self.base_item_slots + amount_of_items:
-                                self.kh2_write_byte(self.Save + 0x2502, current_item_slots + 1)
-                            elif self.base_item_slots + amount_of_items < 8:
-                                self.kh2_write_byte(self.Save + 0x2502, self.base_item_slots + amount_of_items)
-
-                # if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items \
-                #        and self.kh2_read_byte(self.Slot1 + 0x1B2) >= 5 and \
-                #        self.kh2_read_byte(self.Save + 0x23DF) & 0x1 << 3 > 0 and self.kh2_read_byte(0x741320) in {10, 8}:
-                #    self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
-
-            if "PoptrackerVersionCheck" in self.kh2slotdata:
-                if self.kh2slotdata["PoptrackerVersionCheck"] > 4.2 and self.kh2_read_byte(
-                        self.Save + 0x3607) != 1:  # telling the goa they are on version 4.3
-                    self.kh2_write_byte(self.Save + 0x3607, 1)
-
-        except Exception as e:
-            if self.kh2connected:
-                self.kh2connected = False
-            logger.info(e)
-            logger.info("line 840")
-
-    def get_addresses(self):
-        if not self.kh2connected and self.kh2 is not None:
-            if self.kh2_game_version is None:
-                # current verions is .10 then runs the get from github stuff
-                if self.kh2_read_string(0x9A98B0, 4) == "KH2J":
-                    self.kh2_game_version = "STEAM"
-                    self.Now = 0x0717008
-                    self.Save = 0x09A98B0
-                    self.Slot1 = 0x2A23598
-                    self.Journal = 0x7434E0
-                    self.Shop = 0x7435D0
-                elif self.kh2_read_string(0x9A9330, 4) == "KH2J":
-                    self.kh2_game_version = "EGS"
-                else:
-                    if self.game_communication_path:
-                        logger.info("Checking with most up to date addresses from the addresses json.")
-                        #if mem addresses file is found then check version and if old get new one
-                        kh2memaddresses_path = os.path.join(self.game_communication_path, "kh2memaddresses.json")
-                        if not os.path.exists(kh2memaddresses_path):
-                            logger.info("File is not found. Downloading json with memory addresses. This might take a moment")
-                            mem_resp = requests.get("https://raw.githubusercontent.com/JaredWeakStrike/KH2APMemoryValues/master/kh2memaddresses.json")
-                            if mem_resp.status_code == 200:
-                                self.mem_json = json.loads(mem_resp.content)
-                                with open(kh2memaddresses_path, 'w') as f:
-                                    f.write(json.dumps(self.mem_json, indent=4))
-                        else:
-                            with open(kh2memaddresses_path) as f:
-                                self.mem_json = json.load(f)
-                        if self.mem_json:
-                            for key in self.mem_json.keys():
-                                if self.kh2_read_string(int(self.mem_json[key]["GameVersionCheck"], 0), 4) == "KH2J":
-                                    self.Now = int(self.mem_json[key]["Now"], 0)
-                                    self.Save = int(self.mem_json[key]["Save"], 0)
-                                    self.Slot1 = int(self.mem_json[key]["Slot1"], 0)
-                                    self.Journal = int(self.mem_json[key]["Journal"], 0)
-                                    self.Shop = int(self.mem_json[key]["Shop"], 0)
-                                    self.kh2_game_version = key
-
-            if self.kh2_game_version is not None:
-                logger.info(f"You are now auto-tracking {self.kh2_game_version}")
-                self.kh2connected = True
-            else:
-                logger.info("Your game version does not match what the client requires. Check in the "
-                            "kingdom-hearts-2-final-mix channel for more information on correcting the game "
-                            "version.")
-                self.kh2connected = False
-
-
-def finishedGame(ctx: KH2Context):
-    if ctx.kh2slotdata['FinalXemnas'] == 1:
-        if not ctx.final_xemnas and ctx.kh2_read_byte(
-                ctx.Save + all_world_locations[LocationName.FinalXemnas].addrObtained) \
-                & 0x1 << all_world_locations[LocationName.FinalXemnas].bitIndex > 0:
-            ctx.final_xemnas = True
-    # three proofs
-    if ctx.kh2slotdata['Goal'] == 0:
-        if ctx.kh2_read_byte(ctx.Save + 0x36B2) > 0 \
-                and ctx.kh2_read_byte(ctx.Save + 0x36B3) > 0 \
-                and ctx.kh2_read_byte(ctx.Save + 0x36B4) > 0:
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.final_xemnas:
-                    return True
-                return False
-            return True
-        return False
-    elif ctx.kh2slotdata['Goal'] == 1:
-        if ctx.kh2_read_byte(ctx.Save + 0x3641) >= ctx.kh2slotdata['LuckyEmblemsRequired']:
-            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
-                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
-                logger.info("The Final Door is now Open")
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.final_xemnas:
-                    return True
-                return False
-            return True
-        return False
-    elif ctx.kh2slotdata['Goal'] == 2:
-        # for backwards compat
-        if "hitlist" in ctx.kh2slotdata:
-            locations = ctx.sending
-            for boss in ctx.kh2slotdata["hitlist"]:
-                if boss in locations:
-                    ctx.hitlist_bounties += 1
-        if ctx.hitlist_bounties >= ctx.kh2slotdata["BountyRequired"] or ctx.kh2_seed_save_cache["AmountInvo"]["Amount"][
-            "Bounty"] >= ctx.kh2slotdata["BountyRequired"]:
-            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
-                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
-                logger.info("The Final Door is now Open")
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.final_xemnas:
-                    return True
-                return False
-            return True
-        return False
-    elif ctx.kh2slotdata["Goal"] == 3:
-        if ctx.kh2_seed_save_cache["AmountInvo"]["Amount"]["Bounty"] >= ctx.kh2slotdata["BountyRequired"] and \
-                ctx.kh2_read_byte(ctx.Save + 0x3641) >= ctx.kh2slotdata['LuckyEmblemsRequired']:
-            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
-                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
-                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
-                logger.info("The Final Door is now Open")
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.final_xemnas:
-                    return True
-                return False
-            return True
-        return False
-
-
-async def kh2_watcher(ctx: KH2Context):
-    while not ctx.exit_event.is_set():
-        try:
-            if ctx.kh2connected and ctx.serverconnected:
-                ctx.sending = []
-                await asyncio.create_task(ctx.checkWorldLocations())
-                await asyncio.create_task(ctx.checkLevels())
-                await asyncio.create_task(ctx.checkSlots())
-                await asyncio.create_task(ctx.verifyChests())
-                await asyncio.create_task(ctx.verifyItems())
-                await asyncio.create_task(ctx.verifyLevel())
-                if finishedGame(ctx) and not ctx.kh2_finished_game:
-                    await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
-                    ctx.kh2_finished_game = True
-                if ctx.sending:
-                    message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
-                    await ctx.send_msgs(message)
-            elif not ctx.kh2connected and ctx.serverconnected:
-                logger.info("Game Connection lost. trying to reconnect.")
-                ctx.kh2 = None
-                while not ctx.kh2connected and ctx.serverconnected:
-                    try:
-                        ctx.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
-                        ctx.get_addresses()
-                        logger.info("Game Connection Established.")
-                    except Exception as e:
-                        await asyncio.sleep(5)
-            if ctx.disconnect_from_server:
-                ctx.disconnect_from_server = False
-                await ctx.disconnect()
-        except Exception as e:
-            if ctx.kh2connected:
-                ctx.kh2connected = False
-            logger.info(e)
-            logger.info("line 940")
-        await asyncio.sleep(0.5)
-
-
-def launch():
-    async def main(args):
-        ctx = KH2Context(args.connect, args.password)
-        ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
-        if gui_enabled:
-            ctx.run_gui()
-        ctx.run_cli()
-        progression_watcher = asyncio.create_task(
-                kh2_watcher(ctx), name="KH2ProgressionWatcher")
-
-        await ctx.exit_event.wait()
-        ctx.server_address = None
-
-        await progression_watcher
-
-        await ctx.shutdown()
-
-    import colorama
-
-    parser = get_base_parser(description="KH2 Client, for text interfacing.")
-
-    args, rest = parser.parse_known_args()
-    colorama.just_fix_windows_console()
-    asyncio.run(main(args))
-    colorama.deinit()
+# this is just here for backwards compatibility so people can test.
+# ClientStuff will be named Client in the fututre and will require KH2Client.py to use
+# from worlds.kh2.Client.Client import launch
+from .ClientStuff.Client import launch
diff --git a/worlds/kh2/ClientStuff/CMDProcessor.py b/worlds/kh2/ClientStuff/CMDProcessor.py
new file mode 100644
index 0000000000..70b2368372
--- /dev/null
+++ b/worlds/kh2/ClientStuff/CMDProcessor.py
@@ -0,0 +1,95 @@
+from CommonClient import ClientCommandProcessor
+from typing import TYPE_CHECKING
+
+# I don't know what is going on here, but it works.
+if TYPE_CHECKING:
+    from . import KH2Context
+else:
+    KH2Context = object
+
+
+class KH2CommandProcessor(ClientCommandProcessor):
+    ctx: KH2Context
+
+    def _cmd_receive_notif(self, notification_type=""):
+        """Change receive notification type.Valid Inputs:Puzzle, Info, Chest and None
+        Puzzle: Puzzle Piece Popup when you receive an item.
+        Info: Displays the Information notification when you receive an item.
+        Chest: Displays the Chest notification when you receive an item.
+        None: Toggle off any of the receiving notifications.
+        """
+        notification_type = notification_type.lower()
+        if notification_type in {"puzzle", "info", "chest", "none"}:
+            temp_client_settings = self.ctx.client_settings["receive_popup_type"]
+            self.ctx.client_settings["receive_popup_type"] = notification_type
+            self.output(f"Changed receive notification type from {temp_client_settings} to {self.ctx.client_settings['receive_popup_type']}")
+        else:
+            self.output(f"Unknown receive notification type:{notification_type}. Valid Inputs: Puzzle, Info, Chest, None")
+
+    def _cmd_send_notif(self, notification_type=""):
+        """Change send notification type.Valid Inputs:Puzzle, Info, Chest and None
+        Puzzle: Puzzle Piece Popup when you send an item.
+        Info: Displays the Information notification when you send an item.
+        Chest: Displays the Chest notification when you send an item.
+        None: Toggle off any of the receiving notifications.
+        """
+        notification_type = notification_type.lower()
+        if notification_type in {"puzzle", "info", "chest", "none"}:
+            temp_client_settings = self.ctx.client_settings["send_popup_type"]
+            self.ctx.client_settings["send_popup_type"] = notification_type
+            # doing it in this order to make sure it actually changes
+            self.output(f"Changed send notification type from {temp_client_settings} to {self.ctx.client_settings['send_popup_type']}")
+        else:
+            self.output(f"Unknown send notification type:{notification_type}. Valid Inputs: Puzzle, Info, Chest, None")
+
+    def _cmd_change_send_truncation_priority(self, priority=""):
+        """Change what gets truncated first when using Chest or Puzzle piece send notification. Playername min is 5 and ItemName is 15"""
+        priority = priority.lower()
+        if priority in {"playername", "itemname"}:
+            temp_client_settings = self.ctx.client_settings["send_truncate_first"]
+            self.ctx.client_settings["send_truncate_first"] = priority
+            self.output(f"Changed receive notification type truncation from {temp_client_settings} to {self.ctx.client_settings['send_truncate_first']}")
+        else:
+            self.output(f"Unknown priority: {priority}. Valid Inputs: PlayerName, ItemName")
+
+    def _cmd_change_receive_truncation_priority(self, priority=""):
+        """Change what gets truncated first when using Chest or Puzzle piece receive notification. Playername min is 5 and ItemName is 15"""
+        priority = priority.lower()
+        if priority in {"playername", "itemname"}:
+            temp_client_settings = self.ctx.client_settings["receive_truncate_first"]
+            self.ctx.client_settings["receive_truncate_first"] = priority
+            self.output(f"Changed receive notification truncation type from {temp_client_settings} to {self.ctx.client_settings['receive_truncate_first']}")
+        else:
+            self.output(f"Unknown priority: {priority}. Valid Inputs: PlayerName, ItemName")
+
+    def _cmd_deathlink(self):
+        """Toggles Deathlink"""
+        if self.ctx.deathlink_toggle:
+            # self.ctx.tags.add("DeathLink")
+            self.ctx.deathlink_toggle = False
+            self.output(f"Death Link turned off")
+        else:
+            self.ctx.deathlink_toggle = True
+            self.output(f"Death Link turned on")
+
+    def _cmd_add_to_blacklist(self, player_name: str = ""):
+        """Adds player to deathlink blacklist"""
+        if player_name not in self.ctx.deathlink_blacklist:
+            self.ctx.deathlink_blacklist.append(player_name)
+
+    def _cmd_remove_from_blacklist(self, player_name: str = ""):
+        """Removes player from the deathlink blacklist"""
+        if player_name in self.ctx.deathlink_blacklist:
+            self.ctx.deathlink_blacklist.remove(player_name)
+
+    #def _cmd_kill(self):
+    #    self.ctx.kh2_write_byte(0x810000, 1)
+
+    #def _cmd_chest(self,itemid:int):
+    #    from .RecieveItems import to_khscii
+    #    from .ReadAndWrite import kh2_write_bytes,kh2_write_byte
+    #    displayed_string = to_khscii(self.ctx,"Yessir")
+#
+    #    kh2_write_byte(self.ctx, 0x800150, int(itemid))
+    #    kh2_write_bytes(self.ctx, address = 0x800154,value = displayed_string)
+    #    kh2_write_byte(self.ctx,  0x800000, 3)
diff --git a/worlds/kh2/ClientStuff/Client.py b/worlds/kh2/ClientStuff/Client.py
new file mode 100644
index 0000000000..4b4afd8c16
--- /dev/null
+++ b/worlds/kh2/ClientStuff/Client.py
@@ -0,0 +1,754 @@
+from __future__ import annotations
+import ModuleUpdate
+import Utils
+
+ModuleUpdate.update()
+import os
+import asyncio
+import json
+import requests
+
+from pymem import pymem
+from worlds.kh2 import item_dictionary_table, exclusion_item_table, CheckDupingItems, all_locations, exclusion_table, \
+    SupportAbility_Table, ActionAbility_Table, all_weapon_slot
+from worlds.kh2.Names import ItemName
+from .WorldLocations import *
+
+from NetUtils import ClientStatus, NetworkItem
+from CommonClient import gui_enabled, logger, get_base_parser, CommonContext, server_loop
+from .CMDProcessor import KH2CommandProcessor
+from .SendChecks import finishedGame
+
+
+class KH2Context(CommonContext):
+    command_processor = KH2CommandProcessor
+    game = "Kingdom Hearts 2"
+    items_handling = 0b111  # Indicates you get items sent from other worlds.
+
+    def __init__(self, server_address, password):
+        super(KH2Context, self).__init__(server_address, password)
+
+        self.goofy_ability_to_slot = dict()
+        self.donald_ability_to_slot = dict()
+        self.all_weapon_location_id = None
+        self.sora_ability_to_slot = dict()
+        self.kh2_seed_save = None
+        self.kh2_local_items = None
+        self.growthlevel = None
+        self.kh2connected = False
+        self.kh2_finished_game = False
+        self.serverconnected = False
+        self.item_name_to_data = {name: data for name, data, in item_dictionary_table.items()}
+        self.location_name_to_data = {name: data for name, data, in all_locations.items()}
+        self.kh2_data_package = {}
+        self.kh2_loc_name_to_id = None
+        self.kh2_item_name_to_id = None
+        self.lookup_id_to_item = None
+        self.lookup_id_to_location = None
+        self.sora_ability_dict = {k: v.quantity for dic in [SupportAbility_Table, ActionAbility_Table] for k, v in
+                                  dic.items()}
+        self.location_name_to_worlddata = {name: data for name, data, in all_world_locations.items()}
+
+        self.slot_name = None
+        self.disconnect_from_server = False
+        self.sending = []
+        # queue for the strings to display on the screen
+        self.queued_puzzle_popup = []
+        self.queued_info_popup = []
+        self.queued_chest_popup = []
+
+        # special characters for printing in game
+        # A dictionary of all the special characters, which
+        # are hard to convert through a mathematical formula.
+        self.special_dict = {
+            ' ': 0x01, '\n': 0x02, '-': 0x54, '!': 0x48, '?': 0x49, '%': 0x4A, '/': 0x4B,
+            '.': 0x4F, ',': 0x50, ';': 0x51, ':': 0x52, '\'': 0x57, '(': 0x5A, ')': 0x5B,
+            '[': 0x62, ']': 0x63, 'à': 0xB7, 'á': 0xB8, 'â': 0xB9, 'ä': 0xBA, 'è': 0xBB,
+            'é': 0xBC, 'ê': 0xBD, 'ë': 0xBE, 'ì': 0xBF, 'í': 0xC0, 'î': 0xC1, 'ï': 0xC2,
+            'ñ': 0xC3, 'ò': 0xC4, 'ó': 0xC5, 'ô': 0xC6, 'ö': 0xC7, 'ù': 0xC8, 'ú': 0xC9,
+            'û': 0xCA, 'ü': 0xCB, 'ç': 0xE8, 'À': 0xD0, 'Á': 0xD1, 'Â': 0xD2, 'Ä': 0xD3,
+            'È': 0xD4, 'É': 0xD5, 'Ê': 0xD6, 'Ë': 0xD7, 'Ì': 0xD8, 'Í': 0xD9, 'Î': 0xDA,
+            'Ï': 0xDB, 'Ñ': 0xDC, 'Ò': 0xDD, 'Ó': 0xDE, 'Ô': 0xDF, 'Ö': 0xE0, 'Ù': 0xE1,
+            'Ú': 0xE2, 'Û': 0xE3, 'Ü': 0xE4, '¡': 0xE5, '¿': 0xE6, 'Ç': 0xE7
+        }
+
+        # list used to keep track of locations+items player has. Used for disoneccting
+        self.kh2_seed_save_cache = {
+            "itemIndex":  -1,
+            # back of soras invo is 0x25E2. Growth should be moved there
+            #  Character: [back of invo, front of invo]
+            "SoraInvo":   [0x25D8, 0x2546],
+            "DonaldInvo": [0x26F4, 0x2658],
+            "GoofyInvo":  [0x2808, 0x276C],
+            "AmountInvo": {
+                "Ability":      {},
+                "Amount":       {
+                    "Bounty": 0,
+                },
+                "Growth":       {
+                    "High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
+                    "Aerial Dodge": 0, "Glide": 0
+                },
+                "Bitmask":      [],
+                "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
+                "Equipment":    {},  # ItemName: Amount
+                "Magic":        {
+                    "Fire Element":     0,
+                    "Blizzard Element": 0,
+                    "Thunder Element":  0,
+                    "Cure Element":     0,
+                    "Magnet Element":   0,
+                    "Reflect Element":  0
+                },
+                "StatIncrease": {
+                    ItemName.MaxHPUp:         0,
+                    ItemName.MaxMPUp:         0,
+                    ItemName.DriveGaugeUp:    0,
+                    ItemName.ArmorSlotUp:     0,
+                    ItemName.AccessorySlotUp: 0,
+                    ItemName.ItemSlotUp:      0,
+                },
+            },
+        }
+        self.kh2seedname = None
+        self.kh2_seed_save_path_join = None
+
+        self.kh2slotdata = None
+        self.mem_json = None
+        self.itemamount = {}
+        self.client_settings = {
+            "send_truncate_first":    "playername",  # there is no need to truncate item names for info popup
+            "receive_truncate_first": "playername",  # truncation order. Can be PlayerName or ItemName
+            "send_popup_type":        "chest",  # type of popup when you receive an item
+            "receive_popup_type":     "chest",  # can be Puzzle, Info, Chest or None
+        }
+
+        if "localappdata" in os.environ:
+            self.game_communication_path = os.path.expandvars(r"%localappdata%\KH2AP")
+            self.kh2_client_settings = f"kh2_client_settings.json"
+            self.kh2_client_settings_join = os.path.join(self.game_communication_path, self.kh2_client_settings)
+            if not os.path.exists(self.game_communication_path):
+                os.makedirs(self.game_communication_path)
+            if not os.path.exists(self.kh2_client_settings_join):
+                # make the json with the settings
+                with open(self.kh2_client_settings_join, "wt") as f:
+                    f.close()
+            elif os.path.exists(self.kh2_client_settings_join):
+                with open(self.kh2_client_settings_join) as f:
+                    # if the file isnt empty load it
+                    # this is the best I could fine to valid json stuff https://stackoverflow.com/questions/23344948/validate-and-format-json-files
+                    try:
+                        self.kh2_seed_save = json.load(f)
+                    except json.decoder.JSONDecodeError:
+                        pass
+                        # this is what is effectively doing on
+                        # self.client_settings = default
+                    f.close()
+
+        self.hitlist_bounties = 0
+        # hooked object
+        self.kh2 = None
+        self.final_xemnas = False
+        self.worldid_to_locations = {
+            #  1:   {},  # world of darkness (story cutscenes)
+            2:  TT_Checks,
+            #  3:   {},  # destiny island doesn't have checks
+            4:  HB_Checks,
+            5:  BC_Checks,
+            6:  Oc_Checks,
+            7:  AG_Checks,
+            8:  LoD_Checks,
+            9:  HundredAcreChecks,
+            10: PL_Checks,
+            11: Atlantica_Checks,
+            12: DC_Checks,
+            13: TR_Checks,
+            14: HT_Checks,
+            15: HB_Checks,  # world map, but you only go to the world map while on the way to goa so checking hb
+            16: PR_Checks,
+            17: SP_Checks,
+            18: TWTNW_Checks,
+            #  255: {},  # starting screen
+        }
+        #Sora,Donald and Goofy are always in your party
+        self.WorldIDtoParty = {
+            4:  "Beast",
+            6:  "Auron",
+            7:  "Aladdin",
+            8:  "Mulan",
+            10: "Simba",
+            14: "Jack Skellington",
+            16: "Jack Sparrow",
+            17: "Tron",
+            18: "Riku"
+        }
+        self.last_world_int = -1
+        # PC Address anchors
+        # epic .10 addresses
+        self.Now = 0x0716DF8
+        self.Save = 0x9A9330
+        self.Journal = 0x743260
+        self.Shop = 0x743350
+        self.Slot1 = 0x2A23018
+        self.InfoBarPointer = 0xABE2A8
+        self.isDead = 0x0BEEF28
+
+        self.FadeStatus = 0xABAF38
+        self.PlayerGaugePointer = 0x0ABCCC8
+
+        self.kh2_game_version = None  # can be egs or steam
+
+        self.kh2_seed_save_path = None
+
+        self.chest_set = set(exclusion_table["Chests"])
+        self.keyblade_set = set(CheckDupingItems["Weapons"]["Keyblades"])
+        self.staff_set = set(CheckDupingItems["Weapons"]["Staffs"])
+        self.shield_set = set(CheckDupingItems["Weapons"]["Shields"])
+
+        self.all_weapons = self.keyblade_set.union(self.staff_set).union(self.shield_set)
+
+        self.equipment_categories = CheckDupingItems["Equipment"]
+        self.armor_set = set(self.equipment_categories["Armor"])
+        self.accessories_set = set(self.equipment_categories["Accessories"])
+        self.all_equipment = self.armor_set.union(self.accessories_set)
+        self.CharacterAnchors = {
+            "Sora":             0x24F0,
+            "Donald":           0x2604,
+            "Goofy":            0x2718,
+            "Auron":            0x2940,
+            "Mulan":            0x2A54,
+            "Aladdin":          0x2B68,
+            "Jack Sparrow":     0x2C7C,
+            "Beast":            0x2D90,
+            "Jack Skellington": 0x2EA4,
+            "Simba":            0x2FB8,
+            "Tron":             0x30CC,
+            "Riku":             0x31E0
+        }
+        self.Equipment_Anchor_Dict = {
+            #Sora, Donald, Goofy in that order
+            # each slot is a short, Sora Anchor:0x24F0, Donald Anchor: 0x2604, Goofy Anchor: 0x2718
+            # Each of these has 8 slots that could have them no matter how many slots are unlocked
+            # If Ability Ring on slot 5 of sora
+            # ReadShort(Save+CharacterAnchors["Sora"]+Equiptment_Anchor["Accessories][4 (index 5)]) == self.item_name_to_data[item_name].memaddr
+            "Armor":       [0x14, 0x16, 0x18, 0x1A, 0x1C, 0x1E, 0x20, 0x22],
+
+            "Accessories": [0x24, 0x26, 0x28, 0x2A, 0x2C, 0x2E, 0x30, 0x32]
+        }
+
+        self.AbilityQuantityDict = {}
+        self.ability_categories = CheckDupingItems["Abilities"]
+
+        self.sora_ability_set = set(self.ability_categories["Sora"])
+        self.donald_ability_set = set(self.ability_categories["Donald"])
+        self.goofy_ability_set = set(self.ability_categories["Goofy"])
+
+        self.all_abilities = self.sora_ability_set.union(self.donald_ability_set).union(self.goofy_ability_set)
+
+        self.stat_increase_set = set(CheckDupingItems["Stat Increases"])
+        self.AbilityQuantityDict = {item: self.item_name_to_data[item].quantity for item in self.all_abilities}
+
+        #  Growth:[level 1,level 4,slot]
+        self.growth_values_dict = {
+            "High Jump":    [0x05E, 0x061, 0x25DA],
+            "Quick Run":    [0x62, 0x65, 0x25DC],
+            "Dodge Roll":   [0x234, 0x237, 0x25DE],
+            "Aerial Dodge": [0x66, 0x069, 0x25E0],
+            "Glide":        [0x6A, 0x6D, 0x25E2]
+        }
+
+        self.ability_code_list = None
+        self.master_growth = {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}
+
+        self.base_hp = 20
+        self.base_mp = 100
+        self.base_drive = 5
+        self.base_accessory_slots = 1
+        self.base_armor_slots = 1
+        self.base_item_slots = 3
+        self.front_ability_slots = [0x2546, 0x2658, 0x276C, 0x2548, 0x254A, 0x254C, 0x265A, 0x265C, 0x265E, 0x276E,
+                                    0x2770, 0x2772]
+
+        self.deathlink_toggle = False
+        self.deathlink_blacklist = []
+
+    from .ReadAndWrite import kh2_read_longlong, kh2_read_int, kh2_read_string, kh2_read_byte, kh2_write_bytes, kh2_write_int, kh2_write_short, kh2_write_byte, kh2_read_short, kh2_return_base_address
+    from .SendChecks import checkWorldLocations, checkSlots, checkLevels, verifyChests, verifyLevel
+    from .RecieveItems import displayPuzzlePieceTextinGame, displayInfoTextinGame, displayChestTextInGame, verifyItems, give_item, IsInShop, to_khscii
+
+    async def server_auth(self, password_requested: bool = False):
+        if password_requested and not self.password:
+            await super(KH2Context, self).server_auth(password_requested)
+        await self.get_username()
+        # if slot name != first time login or previous name
+        # and seed name is none or saved seed name
+        if not self.slot_name and not self.kh2seedname:
+            await self.send_connect()
+        elif self.slot_name == self.auth and self.kh2seedname:
+            await self.send_connect()
+        else:
+            logger.info(f"You are trying to connect with data still cached in the client. Close client or connect to the correct slot: {self.slot_name}")
+            self.serverconnected = False
+            self.disconnect_from_server = True
+
+    # to not softlock the client when you connect to the wrong slot/game
+    def event_invalid_slot(self):
+        self.kh2seedname = None
+        CommonContext.event_invalid_slot(self)
+
+    def event_invalid_game(self):
+        self.kh2seedname = None
+        CommonContext.event_invalid_slot(self)
+
+    async def connection_closed(self):
+        self.kh2connected = False
+        self.serverconnected = False
+        if self.kh2seedname is not None and self.auth is not None:
+            with open(self.kh2_seed_save_path_join, 'w') as f:
+                f.write(json.dumps(self.kh2_seed_save, indent=4))
+                f.close()
+        await super(KH2Context, self).connection_closed()
+
+    async def disconnect(self, allow_autoreconnect: bool = False):
+        self.kh2connected = False
+        self.serverconnected = False
+        self.locations_checked = []
+        if self.kh2seedname not in {None} and self.auth not in {None}:
+            with open(self.kh2_seed_save_path_join, 'w') as f:
+                f.write(json.dumps(self.kh2_seed_save, indent=4))
+                f.close()
+        await super(KH2Context, self).disconnect()
+
+    @property
+    def endpoints(self):
+        if self.server:
+            return [self.server]
+        else:
+            return []
+
+    async def shutdown(self):
+        if self.kh2seedname not in {None} and self.auth not in {None}:
+            with open(self.kh2_seed_save_path_join, 'w') as f:
+                f.write(json.dumps(self.kh2_seed_save, indent=4))
+                f.close()
+        with open(self.kh2_client_settings_join, 'w') as f2:
+            f2.write(json.dumps(self.client_settings, indent=4))
+            f2.close()
+        await super(KH2Context, self).shutdown()
+
+    def on_package(self, cmd: str, args: dict):
+        if cmd == "RoomInfo":
+            if not self.kh2seedname:
+                self.kh2seedname = args['seed_name']
+            elif self.kh2seedname != args['seed_name']:
+                self.disconnect_from_server = True
+                self.serverconnected = False
+                self.kh2connected = False
+                logger.info("Connection to the wrong seed, connect to the correct seed or close the client.")
+                return
+            self.kh2_seed_save_path = f"kh2save2{self.kh2seedname}{self.auth}.json"
+            self.kh2_seed_save_path_join = os.path.join(self.game_communication_path, Utils.get_file_safe_name(self.kh2_seed_save_path))
+
+            if not os.path.exists(self.kh2_seed_save_path_join):
+                self.kh2_seed_save = {
+                    "Levels":        {
+                        "SoraLevel":   0,
+                        "ValorLevel":  0,
+                        "WisdomLevel": 0,
+                        "LimitLevel":  0,
+                        "MasterLevel": 0,
+                        "FinalLevel":  0,
+                        "SummonLevel": 0,
+                    },
+                    # Item: Amount of them sold
+                    "SoldEquipment": dict(),
+                }
+                with open(self.kh2_seed_save_path_join, 'wt') as f:
+                    f.close()
+            elif os.path.exists(self.kh2_seed_save_path_join):
+                with open(self.kh2_seed_save_path_join) as f:
+                    try:
+                        self.kh2_seed_save = json.load(f)
+                    except json.decoder.JSONDecodeError:
+                        self.kh2_seed_save = None
+                    if self.kh2_seed_save is None or self.kh2_seed_save == {}:
+                        self.kh2_seed_save = {
+                            "Levels":        {
+                                "SoraLevel":   0,
+                                "ValorLevel":  0,
+                                "WisdomLevel": 0,
+                                "LimitLevel":  0,
+                                "MasterLevel": 0,
+                                "FinalLevel":  0,
+                                "SummonLevel": 0,
+                            },
+                            # Item: Amount of them sold
+                            "SoldEquipment": dict(),
+                        }
+                    f.close()
+
+        if cmd == "Connected":
+            self.kh2slotdata = args['slot_data']
+
+            self.kh2_data_package = Utils.load_data_package_for_checksum(
+                    "Kingdom Hearts 2", self.checksums["Kingdom Hearts 2"])
+
+            if "location_name_to_id" in self.kh2_data_package:
+                self.data_package_kh2_cache(
+                        self.kh2_data_package["location_name_to_id"], self.kh2_data_package["item_name_to_id"])
+                self.connect_to_game()
+            else:
+                asyncio.create_task(self.send_msgs([{"cmd": "GetDataPackage", "games": ["Kingdom Hearts 2"]}]))
+
+            self.locations_checked = set(args["checked_locations"])
+
+        if cmd == "ReceivedItems":
+            # Sora   Front of Ability List:0x2546
+            # Donald Front of Ability List:0x2658
+            # Goofy  Front of Ability List:0x276A
+            start_index = args["index"]
+            if start_index == 0:
+                self.kh2_seed_save_cache = {
+                    "itemIndex":  -1,
+                    #  back of soras invo is 0x25E2. Growth should be moved there
+                    #  Character: [back of invo, front of invo]
+                    "SoraInvo":   [0x25D8, 0x2546],
+                    "DonaldInvo": [0x26F4, 0x2658],
+                    "GoofyInvo":  [0x2808, 0x276C],
+                    "AmountInvo": {
+                        "Ability":      {},
+                        "Amount":       {
+                            "Bounty": 0,
+                        },
+                        "Growth":       {
+                            "High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
+                            "Aerial Dodge": 0, "Glide": 0
+                        },
+                        "Bitmask":      [],
+                        "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
+                        "Equipment":    {},  # ItemName: Amount
+                        "Magic":        {
+                            "Fire Element":     0,
+                            "Blizzard Element": 0,
+                            "Thunder Element":  0,
+                            "Cure Element":     0,
+                            "Magnet Element":   0,
+                            "Reflect Element":  0
+                        },
+                        "StatIncrease": {
+                            ItemName.MaxHPUp:         0,
+                            ItemName.MaxMPUp:         0,
+                            ItemName.DriveGaugeUp:    0,
+                            ItemName.ArmorSlotUp:     0,
+                            ItemName.AccessorySlotUp: 0,
+                            ItemName.ItemSlotUp:      0,
+                        },
+                    },
+                }
+            if start_index > self.kh2_seed_save_cache["itemIndex"] and self.serverconnected:
+                self.kh2_seed_save_cache["itemIndex"] = start_index
+                for item in args['items']:
+                    networkItem = NetworkItem(*item)
+
+                    # actually give player the item
+                    asyncio.create_task(self.give_item(networkItem.item, networkItem.location))
+
+        if cmd == "RoomUpdate":
+            if "checked_locations" in args:
+                new_locations = set(args["checked_locations"])
+                self.locations_checked |= new_locations
+
+        if cmd == "DataPackage":
+            if "Kingdom Hearts 2" in args["data"]["games"]:
+                self.data_package_kh2_cache(
+                        args["data"]["games"]["Kingdom Hearts 2"]["location_name_to_id"],
+                        args["data"]["games"]["Kingdom Hearts 2"]["item_name_to_id"])
+                self.connect_to_game()
+                asyncio.create_task(self.send_msgs([{'cmd': 'Sync'}]))
+
+        if cmd == "PrintJSON":
+            # shamelessly stolen from kh1
+            if args.get("type") == "ItemSend":
+                item = args["item"]
+                networkItem = NetworkItem(*item)
+                itemId = networkItem.item
+                receiverID = args["receiving"]
+                senderID = networkItem.player
+                receive_popup_type = self.client_settings["receive_popup_type"].lower()
+                send_popup_type = self.client_settings["send_popup_type"].lower()
+                receive_truncate_first = self.client_settings["receive_truncate_first"].lower()
+                send_truncate_first = self.client_settings["send_truncate_first"].lower()
+                # checking if sender is the kh2 player, and you aren't sending yourself the item
+                if receiverID == self.slot and senderID != self.slot:  # item is sent to you and is not from yourself
+                    itemName = self.item_names.lookup_in_game(itemId)
+                    playerName = self.player_names[networkItem.player]  # player that sent you the item
+                    totalLength = len(itemName) + len(playerName)
+
+                    if receive_popup_type == "info":  # no restrictions on size here
+                        temp_length = f"Obtained {itemName} from {playerName}"
+                        if totalLength > 90:
+                            self.queued_info_popup += [temp_length[:90]]  # slice it to be 90
+                        else:
+                            self.queued_info_popup += [temp_length]
+                    else:  # either chest or puzzle. they are handled the same length wise
+                        totalLength = len(itemName) + len(playerName)
+                        while totalLength > 25:
+                            if receive_truncate_first == "playername":
+                                if len(playerName) > 5:
+                                    playerName = playerName[:-1]
+                                else:
+                                    itemName = itemName[:-1]
+                            else:
+                                if len(ItemName) > 15:
+                                    itemName = itemName[:-1]
+                                else:
+                                    playerName = playerName[:-1]
+                            totalLength = len(itemName) + len(playerName)
+                        # from  =6. totalLength of the string cant be over 31 or game crash
+                        if receive_popup_type == "puzzle":  # sanitize ItemName and receiver name
+                            self.queued_puzzle_popup += [f"{itemName} from {playerName}"]
+                        else:
+                            self.queued_chest_popup += [f"{itemName} from {playerName}"]
+
+                if receiverID != self.slot and senderID == self.slot:  #item is sent to other players
+                    itemName = self.item_names.lookup_in_slot(itemId, receiverID)
+                    playerName = self.player_names[receiverID]
+                    totalLength = len(itemName) + len(playerName)
+                    if send_popup_type == "info":
+                        if totalLength > 90:
+                            temp_length = f"Sent {itemName} to {playerName}"
+                            self.queued_info_popup += [temp_length[:90]]  #slice it to be 90
+                        else:
+                            self.queued_info_popup += [f"Sent {itemName} to {playerName}"]
+                    else:  # else chest or puzzle. they are handled the same length wise
+                        while totalLength > 27:
+                            if send_truncate_first == "playername":
+                                if len(playerName) > 5: #limit player name to at least be 5 characters
+                                    playerName = playerName[:-1]
+                                else:
+                                    itemName = itemName[:-1]
+                            else:
+                                if len(ItemName) > 15: # limit item name to at least be 15 characters
+                                    itemName = itemName[:-1]
+                                else:
+                                    playerName = playerName[:-1]
+                            totalLength = len(itemName) + len(playerName)
+                        if send_popup_type == "puzzle":
+                            # to = 4 totalLength of the string cant be over 31 or game crash
+                            self.queued_puzzle_popup += [f"{itemName} to {playerName}"]
+                        else:
+                            self.queued_chest_popup += [f"{itemName} to {playerName}"]
+
+    def connect_to_game(self):
+        if "KeybladeAbilities" in self.kh2slotdata.keys():
+            # sora ability to slot
+            self.AbilityQuantityDict.update(self.kh2slotdata["KeybladeAbilities"])
+            # itemid:[slots that are available for that item]
+            self.AbilityQuantityDict.update(self.kh2slotdata["StaffAbilities"])
+            self.AbilityQuantityDict.update(self.kh2slotdata["ShieldAbilities"])
+
+        self.all_weapon_location_id = {self.kh2_loc_name_to_id[loc] for loc in all_weapon_slot}
+
+        try:
+            if not self.kh2:
+                self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
+                self.get_addresses()
+
+        except Exception as e:
+            if self.kh2connected:
+                self.kh2connected = False
+            logger.info("Game is not open. If it is open run the launcher/client as admin.")
+        self.serverconnected = True
+        self.slot_name = self.auth
+
+    def data_package_kh2_cache(self, loc_to_id, item_to_id):
+        self.kh2_loc_name_to_id = loc_to_id
+        self.lookup_id_to_location = {v: k for k, v in self.kh2_loc_name_to_id.items()}
+        self.kh2_item_name_to_id = item_to_id
+        self.lookup_id_to_item = {v: k for k, v in self.kh2_item_name_to_id.items()}
+        self.ability_code_list = [self.kh2_item_name_to_id[item] for item in exclusion_item_table["Ability"]]
+
+    def on_deathlink(self, data: typing.Dict[str, typing.Any]) -> None:
+        """Gets dispatched when a new DeathLink is triggered by another linked player."""
+        if data["source"] not in self.deathlink_blacklist:
+            self.last_death_link = max(data["time"], self.last_death_link)
+            text = data.get("cause", "")
+            if text:
+                logger.info(f"DeathLink: {text}")
+            else:
+                logger.info(f"DeathLink: Received from {data['source']}")
+            # kills sora by setting flag for the lua to read
+            self.kh2_write_byte(0x810000, 1)
+
+    async def is_dead(self):
+        # General Death link logic: if hp is 0 and sora has 5 drive gauge and deathlink flag isnt set
+        # if deathlink is on and script is hasnt killed sora and sora isnt dead
+        if self.deathlink_toggle and self.kh2_read_byte(0x810000) == 0 and self.kh2_read_byte(0x810001) != 0:
+            # set deathlink flag so it doesn't send out bunch
+            # basically making the game think it got its death from a deathlink instead of from the game
+            self.kh2_write_byte(0x810000, 0)
+            # 0x810001 is set to 1 when you die via the goa script. This is done because the polling rate for the client can miss a death
+            # but the lua script runs eveery frame so we cant miss them now
+            self.kh2_write_byte(0x810001, 0)
+            #todo: read these from the goa lua instead since the deathlink is after they contiune which means that its just before they would've gotten into the fight
+            Room = self.kh2_read_byte(0x810002)
+            Event = self.kh2_read_byte(0x810003)
+            World = self.kh2_read_byte(0x810004)
+            if (World, Room, Event) in DeathLinkPair.keys():
+
+                logger.info(f"Deathlink: {self.player_names[self.slot]} died to {DeathLinkPair[(World,Room, Event)]}.")
+                await self.send_death(death_text=f"{self.player_names[self.slot]} died to {DeathLinkPair[(World,Room, Event)]}.")
+            else:
+                logger.info(f"Deathlink: {self.player_names[self.slot]} lost their heart to darkness.")
+                await self.send_death(death_text=f"{self.player_names[self.slot]} lost their heart to darkness.")
+
+    def run_gui(self):
+        """Import kivy UI system and start running it as self.ui_task."""
+        from kvui import GameManager
+
+        class KH2Manager(GameManager):
+            logging_pairs = [
+                ("Client", "Archipelago")
+            ]
+            base_title = "Archipelago KH2 Client"
+
+        self.ui = KH2Manager(self)
+        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
+
+    def get_addresses(self):
+        if not self.kh2connected and self.kh2 is not None:
+            if self.kh2_game_version is None:
+                # current verions is .10 then runs the get from github stuff
+                if self.kh2_read_string(0x9A98B0, 4) == "KH2J":
+                    self.kh2_game_version = "STEAM"
+                    self.Now = 0x0717008
+                    self.Save = 0x09A98B0
+                    self.Slot1 = 0x2A23598
+                    self.Journal = 0x7434E0
+                    self.Shop = 0x7435D0
+                    self.InfoBarPointer = 0xABE828
+                    self.isDead = 0x0BEF4A8
+                    self.FadeStatus = 0xABB4B8
+                    self.PlayerGaugePointer = 0x0ABD248
+                elif self.kh2_read_string(0x9A9330, 4) == "KH2J":
+                    self.kh2_game_version = "EGS"
+                else:
+                    if self.game_communication_path:
+                        logger.info("Checking with most up to date addresses from the addresses json.")
+                        # if mem addresses file is found then check version and if old get new one
+                        kh2memaddresses_path = os.path.join(self.game_communication_path, "kh2memaddresses.json")
+                        if not os.path.exists(kh2memaddresses_path):
+                            logger.info("File is not found. Downloading json with memory addresses. This might take a moment")
+                            mem_resp = requests.get("https://raw.githubusercontent.com/JaredWeakStrike/KH2APMemoryValues/master/kh2memaddresses.json")
+                            if mem_resp.status_code == 200:
+                                self.mem_json = json.loads(mem_resp.content)
+                                with open(kh2memaddresses_path, 'w') as f:
+                                    f.write(json.dumps(self.mem_json, indent=4))
+                                    f.close()
+                        else:
+                            with open(kh2memaddresses_path) as f:
+                                self.mem_json = json.load(f)
+                                f.close()
+                        if self.mem_json:
+                            for key in self.mem_json.keys():
+                                if self.kh2_read_string(int(self.mem_json[key]["GameVersionCheck"], 0), 4) == "KH2J":
+                                    self.Now = int(self.mem_json[key]["Now"], 0)
+                                    self.Save = int(self.mem_json[key]["Save"], 0)
+                                    self.Slot1 = int(self.mem_json[key]["Slot1"], 0)
+                                    self.Journal = int(self.mem_json[key]["Journal"], 0)
+                                    self.Shop = int(self.mem_json[key]["Shop"], 0)
+                                    self.InfoBarPointer = int(self.mem_json[key]["InfoBarPointer"], 0)
+                                    self.isDead = int(self.mem_json[key]["isDead"], 0)
+                                    self.FadeStatus = int(self.mem_json[key]["FadeStatus"], 0)
+                                    self.PlayerGaugePointer = int(self.mem_json[key]["PlayerGaugePointer"], 0)
+                                    self.kh2_game_version = key
+
+            if self.kh2_game_version is not None:
+                logger.info(f"You are now auto-tracking {self.kh2_game_version}")
+                self.kh2connected = True
+            else:
+                logger.info("Your game version does not match what the client requires. Check in the "
+                            "kingdom-hearts-2-final-mix channel for more information on correcting the game "
+                            "version.")
+                self.kh2connected = False
+
+
+async def kh2_watcher(ctx: KH2Context):
+    while not ctx.exit_event.is_set():
+        try:
+            if ctx.kh2connected and ctx.serverconnected:
+                ctx.sending = []
+                await asyncio.create_task(ctx.checkWorldLocations())
+                await asyncio.create_task(ctx.checkLevels())
+                await asyncio.create_task(ctx.checkSlots())
+                await asyncio.create_task(ctx.verifyChests())
+                await asyncio.create_task(ctx.verifyItems())
+                await asyncio.create_task(ctx.verifyLevel())
+                await asyncio.create_task(ctx.is_dead())
+
+                if (ctx.deathlink_toggle and "DeathLink" not in ctx.tags) or (not ctx.deathlink_toggle and "DeathLink" in ctx.tags):
+                    await ctx.update_death_link(ctx.deathlink_toggle)
+
+                if finishedGame(ctx) and not ctx.kh2_finished_game:
+                    await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+                    ctx.kh2_finished_game = True
+
+                if ctx.sending:
+                    message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
+                    await ctx.send_msgs(message)
+
+                if ctx.queued_puzzle_popup:
+                    await asyncio.create_task(ctx.displayPuzzlePieceTextinGame(ctx.queued_puzzle_popup[0]))  # send the num 1 index of whats in the queue
+                if ctx.queued_info_popup:
+                    await asyncio.create_task(ctx.displayInfoTextinGame(ctx.queued_info_popup[0]))
+                if ctx.queued_chest_popup:
+                    await asyncio.create_task(ctx.displayChestTextInGame(ctx.queued_chest_popup[0]))
+
+            elif not ctx.kh2connected and ctx.serverconnected:
+                logger.info("Game Connection lost. trying to reconnect.")
+                ctx.kh2 = None
+                #todo: change this to be an option for the client to auto reconnect with the default being yes
+                # reason is because the await sleep causes the client to hang if you close the game then the client without disconnecting.
+                while not ctx.kh2connected and ctx.serverconnected:
+                    try:
+                        ctx.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
+                        ctx.get_addresses()
+                        logger.info("Game Connection Established.")
+                    except Exception as e:
+                        await asyncio.sleep(5)
+            if ctx.disconnect_from_server:
+                ctx.disconnect_from_server = False
+                await ctx.disconnect()
+        except Exception as e:
+            if ctx.kh2connected:
+                ctx.kh2connected = False
+            logger.info(e)
+            logger.info("line 940")
+        await asyncio.sleep(0.5)
+
+
+def launch():
+    async def main(args):
+        ctx = KH2Context(args.connect, args.password)
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+        if gui_enabled:
+            ctx.run_gui()
+        ctx.run_cli()
+        progression_watcher = asyncio.create_task(
+                kh2_watcher(ctx), name="KH2ProgressionWatcher")
+
+        await ctx.exit_event.wait()
+        ctx.server_address = None
+
+        await progression_watcher
+
+        await ctx.shutdown()
+
+    import colorama
+
+    parser = get_base_parser(description="KH2 Client, for text interfacing.")
+
+    args, rest = parser.parse_known_args()
+    colorama.init()
+    asyncio.run(main(args))
+    colorama.deinit()
diff --git a/worlds/kh2/ClientStuff/ReadAndWrite.py b/worlds/kh2/ClientStuff/ReadAndWrite.py
new file mode 100644
index 0000000000..c6dd6b46eb
--- /dev/null
+++ b/worlds/kh2/ClientStuff/ReadAndWrite.py
@@ -0,0 +1,47 @@
+# All the write functions return a bool for has written it but there isnt a use case for that I've found
+def kh2_read_short(self, address) -> int:
+    """Reads 2 bytes"""
+    return self.kh2.read_short(self.kh2.base_address + address)
+
+
+def kh2_write_short(self, address, value) -> None:
+    """Writes 2 bytes"""
+    self.kh2.write_short(self.kh2.base_address + address, value)
+
+
+def kh2_write_byte(self, address, value):
+    """Writes 1 byte"""
+    return self.kh2.write_bytes(self.kh2.base_address + address, value.to_bytes(1, 'big'), 1)
+
+
+def kh2_read_byte(self, address):
+    """Reads 1 byte"""
+    return int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + address, 1))
+
+
+def kh2_read_int(self, address):
+    """Reads 4 bytes"""
+    return self.kh2.read_int(self.kh2.base_address + address)
+
+
+def kh2_write_int(self, address, value):
+    """Writes 4 bytes"""
+    self.kh2.write_int(self.kh2.base_address + address, value)
+
+
+def kh2_read_longlong(self, address):
+    """Reads 8 bytes"""
+    return self.kh2.read_longlong(self.kh2.base_address + address)
+
+
+def kh2_read_string(self, address, length):
+    """Reads length amount of bytes"""
+    return self.kh2.read_string(self.kh2.base_address + address, length)
+
+
+def kh2_write_bytes(self, address, value):
+    return self.kh2.write_bytes(self.kh2.base_address + address, bytes(value), len(value))
+
+
+def kh2_return_base_address(self):
+    return self.kh2.base_address
diff --git a/worlds/kh2/ClientStuff/RecieveItems.py b/worlds/kh2/ClientStuff/RecieveItems.py
new file mode 100644
index 0000000000..e232f262e8
--- /dev/null
+++ b/worlds/kh2/ClientStuff/RecieveItems.py
@@ -0,0 +1,434 @@
+from CommonClient import logger
+from typing import TYPE_CHECKING
+from .WorldLocations import *
+from ..Names import ItemName
+import re
+import asyncio
+
+
+def to_khscii(self, item_name):
+    # credit to TopazTK for this.
+    out_list = []
+    char_count = 0
+    # Throughout the text, do:
+    while char_count < len(item_name):
+        char = item_name[char_count]
+        # Simple character conversion through mathematics.
+        if 'a' <= char <= 'z':
+            out_list.append(ord(char) + 0x39)
+            char_count += 1
+        elif 'A' <= char <= 'Z':
+            out_list.append(ord(char) - 0x13)
+            char_count += 1
+        elif '0' <= char <= '9':
+            out_list.append(ord(char) + 0x60)
+            char_count += 1
+        # If it hits a "{", we will know it's a command, not a character.
+        elif char == '{':
+            # A command is 6 characters long, in the format of "{0xTT}",
+            # with the "TT" being the 2-digit encode for that command.
+            command = item_name[char_count:char_count + 6]
+            if re.match(r'^{0x[a-fA-F0-9][a-fA-F0-9]}$', command):
+                value = command[1:5]
+                out_list.append(int(value, 16))
+                char_count += 6
+        # Should it be anything we do not know, we look through
+        # the special dictionary.
+        else:
+            if char in self.special_dict:
+                out_list.append(self.special_dict[char])
+            else:
+                out_list.append(0x01)
+            char_count += 1
+
+    # When the list ends, we add a terminator and return the string.
+    out_list.append(0x00)
+    return out_list
+
+
+async def give_item(self, item, location):
+    try:
+        #sleep so we can get the datapackage and not miss any items that were sent to us while we didnt have our item id dicts
+        while not self.lookup_id_to_item:
+            await asyncio.sleep(0.5)
+        itemname = self.lookup_id_to_item[item]
+        itemdata = self.item_name_to_data[itemname]
+        # itemcode = self.kh2_item_name_to_id[itemname]
+        if itemdata.ability:
+            if location in self.all_weapon_location_id:
+                return
+            if itemname in {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}:
+                self.kh2_seed_save_cache["AmountInvo"]["Growth"][itemname] += 1
+                return
+
+            if itemname not in self.kh2_seed_save_cache["AmountInvo"]["Ability"]:
+                self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname] = []
+                #  appending the slot that the ability should be in
+            #  appending the slot that the ability should be in
+            # abilities have a limit amount of slots.
+            # we start from the back going down to not mess with stuff.
+            # Front of Invo
+            # Sora:   Save+24F0+0x54 : 0x2546
+            # Donald: Save+2604+0x54 : 0x2658
+            # Goofy:  Save+2718+0x54 : 0x276C
+            # Back of Invo. Sora has 6 ability slots that are reserved
+            # Sora:   Save+24F0+0x54+0x92 : 0x25D8
+            # Donald: Save+2604+0x54+0x9C : 0x26F4
+            # Goofy:  Save+2718+0x54+0x9C : 0x2808
+            # seed has 2 scans in sora's abilities
+            # recieved second scan
+            # if len(seed_save(Scan:[ability slot 52]) < (2)amount of that ability they should have from slot data
+            # ability_slot = back of inventory that isnt taken
+            # add ability_slot to seed_save(Scan[]) so now its Scan:[ability slot 52,50]
+            # decrease back of inventory since its ability_slot is already taken
+            if len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < \
+                    self.AbilityQuantityDict[itemname]:
+                if itemname in self.sora_ability_set:
+                    ability_slot = self.kh2_seed_save_cache["SoraInvo"][0]
+                    self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                    self.kh2_seed_save_cache["SoraInvo"][0] -= 2
+                elif itemname in self.donald_ability_set:
+                    ability_slot = self.kh2_seed_save_cache["DonaldInvo"][0]
+                    self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                    self.kh2_seed_save_cache["DonaldInvo"][0] -= 2
+                else:
+                    ability_slot = self.kh2_seed_save_cache["GoofyInvo"][0]
+                    self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                    self.kh2_seed_save_cache["GoofyInvo"][0] -= 2
+
+                if ability_slot in self.front_ability_slots:
+                    self.front_ability_slots.remove(ability_slot)
+        # if itemdata in {bitmask} all the forms,summons and a few other things are bitmasks
+        elif itemdata.memaddr in {0x36C4, 0x36C5, 0x36C6, 0x36C0, 0x36CA}:
+            # if memaddr is in a bitmask location in memory
+            if itemname not in self.kh2_seed_save_cache["AmountInvo"]["Bitmask"]:
+                self.kh2_seed_save_cache["AmountInvo"]["Bitmask"].append(itemname)
+
+        # if itemdata in {magic}
+        elif itemdata.memaddr in {0x3594, 0x3595, 0x3596, 0x3597, 0x35CF, 0x35D0}:
+            # if memaddr is in magic addresses
+            self.kh2_seed_save_cache["AmountInvo"]["Magic"][itemname] += 1
+        # equipment is a list instead of dict because you can only have 1 currently
+        elif itemname in self.all_equipment:
+            if itemname in self.kh2_seed_save_cache["AmountInvo"]["Equipment"]:
+                self.kh2_seed_save_cache["AmountInvo"]["Equipment"][itemname] += 1
+            else:
+                self.kh2_seed_save_cache["AmountInvo"]["Equipment"][itemname] = 1
+        # weapons are done differently since you can only have one and has to check it differently
+        elif itemname in self.all_weapons:
+            if itemname in self.keyblade_set:
+                self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Sora"].append(itemname)
+            elif itemname in self.staff_set:
+                self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Donald"].append(itemname)
+            else:
+                self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Goofy"].append(itemname)
+
+        elif itemname in self.stat_increase_set:
+            self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"][itemname] += 1
+        else:
+            # "normal" items. They have a unique byte reserved for how many they have
+            if itemname in self.kh2_seed_save_cache["AmountInvo"]["Amount"]:
+                self.kh2_seed_save_cache["AmountInvo"]["Amount"][itemname] += 1
+            else:
+                self.kh2_seed_save_cache["AmountInvo"]["Amount"][itemname] = 1
+
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 582")
+
+
+async def IsInShop(self, sellable):
+    # journal = 0x741230 shop = 0x741320
+    # if journal=-1 and shop = 5 then in shop
+    # if journal !=-1 and shop = 10 then journal
+
+    journal = self.kh2_read_short(self.Journal)
+    shop = self.kh2_read_short(self.Shop)
+    if (journal == -1 and shop == 5) or (journal != -1 and shop == 10):
+        # print("your in the shop")
+        sellable_dict = {}
+        # for item that the player has received that can be sold
+        # get amount of sellable items PRE selling them
+        # basically a snapshot of what the amounts of these items are pre shopping
+        for itemName in sellable:
+            itemdata = self.item_name_to_data[itemName]
+            amount = self.kh2_read_byte(self.Save + itemdata.memaddr)
+            sellable_dict[itemName] = amount
+        # wait until user exits the shop
+        while (journal == -1 and shop == 5) or (journal != -1 and shop == 10):
+            journal = self.kh2_read_short(self.Journal)
+            shop = self.kh2_read_short(self.Shop)
+            await asyncio.sleep(0.5)
+        # for item and amount pre shop
+        for item, amount in sellable_dict.items():
+            itemdata = self.item_name_to_data[item]
+            afterShop = self.kh2_read_byte(self.Save + itemdata.memaddr)
+            alreadySold = 0
+            if item in self.kh2_seed_save["SoldEquipment"]:
+                alreadySold = self.kh2_seed_save["SoldEquipment"][item]
+            # if afterShop is < Amount post shop i.e if someone sold something
+            if afterShop < amount:
+                self.kh2_seed_save["SoldEquipment"][item] = (amount - afterShop) + alreadySold
+
+
+async def verifyItems(self):
+    try:
+        # All these sets include items that the player has recieved
+        # set of all the items that have an
+        master_amount = list(self.kh2_seed_save_cache["AmountInvo"]["Amount"].keys())
+        # set of all the items that have are abilities
+        master_ability = list(self.kh2_seed_save_cache["AmountInvo"]["Ability"].keys())
+        # set of all the items that are bitmasks
+        master_bitmask = list(self.kh2_seed_save_cache["AmountInvo"]["Bitmask"])
+        # sets of all the weapons. These are different because have to check inventory and equipped
+        master_keyblade = list(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Sora"])
+        master_staff = list(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Donald"])
+        master_shield = list(self.kh2_seed_save_cache["AmountInvo"]["Weapon"]["Goofy"])
+        # Same with weapons but a lot more slots
+        master_equipment = list(self.kh2_seed_save_cache["AmountInvo"]["Equipment"].keys())
+        # Set of magic, Can only be given when  the player is paused due to crashing in loadzones
+        master_magic = list(self.kh2_seed_save_cache["AmountInvo"]["Magic"].keys())
+        # Have to apply them to the slot that sora is in and a lot more dynamic than other amount items
+        master_stat = list(self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"].keys())
+        # Set of all things that could be sold
+        master_sell = master_equipment + master_staff + master_shield
+
+        await asyncio.create_task(self.IsInShop(master_sell))
+        # print(self.kh2_seed_save_cache["AmountInvo"]["Ability"])
+        for item_name in master_amount:
+            item_data = self.item_name_to_data[item_name]
+            amount_of_items = 0
+            amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["Amount"][item_name]
+
+            if item_name == "Torn Page":
+                # Torn Pages are handled differently because they can be consumed.
+                # Will check the progression in 100 acre and - the amount of visits
+                # amountofitems-amount of visits done
+                for location, data in tornPageLocks.items():
+                    if self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
+                        amount_of_items -= 1
+            # 255 is the max limit for a byte
+            if amount_of_items > 255:
+                amount_of_items = 255
+            if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and amount_of_items >= 0:
+                self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
+
+        for item_name in master_keyblade:
+            item_data = self.item_name_to_data[item_name]
+            # if the inventory slot for that keyblade is less than the amount they should have,
+            # and they are not in stt
+            if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 and self.kh2_read_byte(
+                    self.Save + 0x1CFF) != 13:
+                # Checking form anchors for the keyblade to remove extra keyblades
+                # Checking Normal Sora,Valor Form,Master Form and Final Forms keyblades
+                if self.kh2_read_short(self.Save + 0x24F0) == item_data.kh2id \
+                        or self.kh2_read_short(self.Save + 0x32F4) == item_data.kh2id \
+                        or self.kh2_read_short(self.Save + 0x339C) == item_data.kh2id \
+                        or self.kh2_read_short(self.Save + 0x33D4) == item_data.kh2id:
+                    self.kh2_write_byte(self.Save + item_data.memaddr, 0)
+                else:
+                    self.kh2_write_byte(self.Save + item_data.memaddr, 1)
+
+        for item_name in master_staff:
+            item_data = self.item_name_to_data[item_name]
+            if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 \
+                    and self.kh2_read_short(self.Save + 0x2604) != item_data.kh2id \
+                    and item_name not in self.kh2_seed_save["SoldEquipment"]:
+                self.kh2_write_byte(self.Save + item_data.memaddr, 1)
+
+        for item_name in master_shield:
+            item_data = self.item_name_to_data[item_name]
+            if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 \
+                    and self.kh2_read_short(self.Save + 0x2718) != item_data.kh2id \
+                    and item_name not in self.kh2_seed_save["SoldEquipment"]:
+                self.kh2_write_byte(self.Save + item_data.memaddr, 1)
+
+        for item_name in master_ability:
+            item_data = self.item_name_to_data[item_name]
+            ability_slot = []
+            ability_slot += self.kh2_seed_save_cache["AmountInvo"]["Ability"][item_name]
+            for slot in ability_slot:
+                current = self.kh2_read_short(self.Save + slot)
+                ability = current & 0x0FFF
+                if ability | 0x8000 != (0x8000 + item_data.memaddr):
+                    if current - 0x8000 > 0:
+                        self.kh2_write_short(self.Save + slot, 0x8000 + item_data.memaddr)
+                    else:
+                        self.kh2_write_short(self.Save + slot, item_data.memaddr)
+        # removes the duped ability if client gave faster than the game.
+
+        for ability in self.front_ability_slots:
+            if self.kh2_read_short(self.Save + ability) != 0:
+                print(f"removed {self.Save + ability} from {ability}")
+                self.kh2_write_short(self.Save + ability, 0)
+
+        # remove the dummy level 1 growths if they are in these invo slots.
+        for inventorySlot in {0x25CE, 0x25D0, 0x25D2, 0x25D4, 0x25D6, 0x25D8}:
+            current = self.kh2_read_short(self.Save + inventorySlot)
+            ability = current & 0x0FFF
+            if 0x05E <= ability <= 0x06D:
+                self.kh2_write_short(self.Save + inventorySlot, 0)
+
+        for item_name in self.master_growth:
+            growthLevel = self.kh2_seed_save_cache["AmountInvo"]["Growth"][item_name]
+            if growthLevel > 0:
+                slot = self.growth_values_dict[item_name][2]
+                min_growth = self.growth_values_dict[item_name][0]
+                max_growth = self.growth_values_dict[item_name][1]
+                if growthLevel > 4:
+                    growthLevel = 4
+                current_growth_level = self.kh2_read_short(self.Save + slot)
+                ability = current_growth_level & 0x0FFF
+
+                # if the player should be getting a growth ability
+                if ability | 0x8000 != 0x8000 + min_growth - 1 + growthLevel:
+                    # if it should be level one of that growth
+                    if 0x8000 + min_growth - 1 + growthLevel <= 0x8000 + min_growth or ability < min_growth:
+                        self.kh2_write_short(self.Save + slot, min_growth)
+                    # if it is already in the inventory
+                    elif ability | 0x8000 < (0x8000 + max_growth):
+                        self.kh2_write_short(self.Save + slot, current_growth_level + 1)
+
+        for item_name in master_bitmask:
+            item_data = self.item_name_to_data[item_name]
+            itemMemory = self.kh2_read_byte(self.Save + item_data.memaddr)
+            if self.kh2_read_byte(self.Save + item_data.memaddr) & 0x1 << item_data.bitmask == 0:
+                # when getting a form anti points should be reset to 0 but bit-shift doesn't trigger the game.
+                if item_name in {"Valor Form", "Wisdom Form", "Limit Form", "Master Form", "Final Form"}:
+                    self.kh2_write_byte(self.Save + 0x3410, 0)
+                self.kh2_write_byte(self.Save + item_data.memaddr, itemMemory | 0x01 << item_data.bitmask)
+
+        for item_name in master_equipment:
+            item_data = self.item_name_to_data[item_name]
+            amount_found_in_slots = 0
+            if item_name in self.accessories_set:
+                Equipment_Anchor_List = self.Equipment_Anchor_Dict["Accessories"]
+            else:
+                Equipment_Anchor_List = self.Equipment_Anchor_Dict["Armor"]
+                # Checking form anchors for the equipment
+            for partyMember in ["Sora", "Donald", "Goofy"]:
+                for SlotOffset in Equipment_Anchor_List:
+                    if self.kh2_read_short(self.Save + self.CharacterAnchors[partyMember] + SlotOffset) == item_data.kh2id:
+                        amount_found_in_slots += 1
+            if item_name in self.kh2_seed_save["SoldEquipment"]:
+                amount_found_in_slots += self.kh2_seed_save["SoldEquipment"][item_name]
+            inInventory = self.kh2_seed_save_cache["AmountInvo"]["Equipment"][item_name] - amount_found_in_slots
+            if inInventory != self.kh2_read_byte(self.Save + item_data.memaddr):
+                self.kh2_write_byte(self.Save + item_data.memaddr, inInventory)
+
+        for item_name in master_magic:
+            item_data = self.item_name_to_data[item_name]
+            amount_of_items = 0
+            amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["Magic"][item_name]
+            # - base address because it reads a pointer then in stead of reading what it points to its pointer+baseaddress which offsets
+            if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and self.kh2_read_byte(self.FadeStatus) == 0 \
+                    and self.kh2_read_longlong(self.PlayerGaugePointer) != 0 \
+                    and self.kh2_read_int(self.kh2_read_longlong(self.PlayerGaugePointer) + 0x88 - self.kh2_return_base_address()) != 0:
+                self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
+
+        for item_name in master_stat:
+            amount_of_items = 0
+            amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["StatIncrease"][item_name]
+            # checking if they talked to the computer to give them these
+            if self.kh2_read_byte(self.Slot1 + 0x1B2) >= 5 and (self.kh2_read_byte(self.Save + 0x1D27) & 0x1 << 3) > 0:
+                if item_name == ItemName.MaxHPUp:
+                    if self.kh2_read_byte(self.Save + 0x2498) < 3:  # Non-Critical
+                        Bonus = 5
+                    else:  # Critical
+                        Bonus = 2
+                    if self.kh2_read_int(self.Slot1 + 0x004) != self.base_hp + (Bonus * amount_of_items):
+                        self.kh2_write_int(self.Slot1 + 0x004, self.base_hp + (Bonus * amount_of_items))
+
+                elif item_name == ItemName.MaxMPUp:
+                    if self.kh2_read_byte(self.Save + 0x2498) < 3:  # Non-Critical
+                        Bonus = 10
+                    else:  # Critical
+                        Bonus = 5
+                    if self.kh2_read_int(self.Slot1 + 0x184) != self.base_mp + (Bonus * amount_of_items):
+                        self.kh2_write_int(self.Slot1 + 0x184, self.base_mp + (Bonus * amount_of_items))
+
+                elif item_name == ItemName.DriveGaugeUp:
+                    current_max_drive = self.kh2_read_byte(self.Slot1 + 0x1B2)
+                    # change when max drive is changed from 6 to 4
+                    # drive is maxed at 9 and base_drive is always 5 so if amount is higher set to 4 which is the max it should be
+                    amount_of_items = min(amount_of_items, 4)
+                    if current_max_drive < 9 and current_max_drive != self.base_drive + amount_of_items:
+                        self.kh2_write_byte(self.Slot1 + 0x1B2, self.base_drive + amount_of_items)
+                # need to do these differently when the amount is dynamic
+                elif item_name == ItemName.AccessorySlotUp:
+                    current_accessory = self.kh2_read_byte(self.Save + 0x2501)
+                    if current_accessory != self.base_accessory_slots + amount_of_items:
+                        if 4 > current_accessory < self.base_accessory_slots + amount_of_items:
+                            self.kh2_write_byte(self.Save + 0x2501, current_accessory + 1)
+                        elif self.base_accessory_slots + amount_of_items < 4:
+                            self.kh2_write_byte(self.Save + 0x2501, self.base_accessory_slots + amount_of_items)
+
+                elif item_name == ItemName.ArmorSlotUp:
+                    current_armor_slots = self.kh2_read_byte(self.Save + 0x2500)
+                    if current_armor_slots != self.base_armor_slots + amount_of_items:
+                        if 4 > current_armor_slots < self.base_armor_slots + amount_of_items:
+                            self.kh2_write_byte(self.Save + 0x2500, current_armor_slots + 1)
+                        elif self.base_armor_slots + amount_of_items < 4:
+                            self.kh2_write_byte(self.Save + 0x2500, self.base_armor_slots + amount_of_items)
+
+                elif item_name == ItemName.ItemSlotUp:
+                    current_item_slots = self.kh2_read_byte(self.Save + 0x2502)
+                    if current_item_slots != self.base_item_slots + amount_of_items:
+                        if 8 > current_item_slots < self.base_item_slots + amount_of_items:
+                            self.kh2_write_byte(self.Save + 0x2502, current_item_slots + 1)
+                        elif self.base_item_slots + amount_of_items < 8:
+                            self.kh2_write_byte(self.Save + 0x2502, self.base_item_slots + amount_of_items)
+
+            # if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items \
+            #        and self.kh2_read_byte(self.Slot1 + 0x1B2) >= 5 and \
+            #        self.kh2_read_byte(self.Save + 0x23DF) & 0x1 << 3 > 0 and self.kh2_read_byte(0x741320) in {10, 8}:
+            #    self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
+
+        if "PoptrackerVersionCheck" in self.kh2slotdata:
+            if self.kh2slotdata["PoptrackerVersionCheck"] > 4.2 and self.kh2_read_byte(
+                    self.Save + 0x3607) != 1:  # telling the goa they are on version 4.3
+                self.kh2_write_byte(self.Save + 0x3607, 1)
+
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 840")
+
+
+async def displayInfoTextinGame(self, string_to_display):
+    infoBarPointerRef = self.kh2_read_longlong(self.InfoBarPointer)
+    if self.kh2_read_byte(0x800000) == 0 and infoBarPointerRef != 0 and self.kh2.read_int(infoBarPointerRef + 0x48) == 0:
+        self.kh2_write_byte(0x800000, 1)  # displaying info bar popup
+        displayed_string = self.to_khscii(string_to_display)
+        self.kh2_write_bytes(0x800004, displayed_string)
+        self.queued_info_popup.remove(string_to_display)
+        await asyncio.sleep(0.5)
+
+
+async def displayPuzzlePieceTextinGame(self, string_to_display):
+    if self.kh2_read_byte(0x800000) == 0:
+        displayed_string = self.to_khscii(string_to_display)
+        self.kh2_write_bytes(0x800104, displayed_string)
+        self.kh2_write_byte(0x800000, 2)  # displaying puzzle piece popup
+        self.queued_puzzle_popup.remove(string_to_display)
+        await asyncio.sleep(0.5)
+
+
+async def displayChestTextInGame(self, string_to_display):
+    if self.kh2_read_byte(0x800000) == 0:
+
+        displayed_string = self.to_khscii(string_to_display)
+        print(f"made display string {displayed_string} from {string_to_display}")
+        self.kh2_write_byte(0x800150, 0)  # item picture. this will change from 0 when I can input icons from the items
+        print("wrote item picture")
+        self.kh2_write_bytes(0x800154, displayed_string)  # text
+        print("wrote text")
+        await asyncio.sleep(1)
+        self.kh2_write_byte(0x800000, 3)  # displaying chest popup
+        print("called chest popup")
+
+        self.queued_chest_popup.remove(string_to_display)
+        await asyncio.sleep(0.5)
diff --git a/worlds/kh2/ClientStuff/SendChecks.py b/worlds/kh2/ClientStuff/SendChecks.py
new file mode 100644
index 0000000000..c56ca8c3e7
--- /dev/null
+++ b/worlds/kh2/ClientStuff/SendChecks.py
@@ -0,0 +1,187 @@
+from CommonClient import logger
+from .WorldLocations import *
+from typing import TYPE_CHECKING
+
+# I don't know what is going on here, but it works.
+if TYPE_CHECKING:
+    from . import KH2Context
+else:
+    KH2Context = object
+
+
+def finishedGame(ctx: KH2Context):
+    if ctx.kh2slotdata['FinalXemnas'] == 1:
+        if not ctx.final_xemnas and ctx.kh2_read_byte(
+                ctx.Save + all_world_locations[LocationName.FinalXemnas].addrObtained) \
+                & 0x1 << all_world_locations[LocationName.FinalXemnas].bitIndex > 0:
+            ctx.final_xemnas = True
+    # three proofs
+    if ctx.kh2slotdata['Goal'] == 0:
+        if ctx.kh2_read_byte(ctx.Save + 0x36B2) > 0 \
+                and ctx.kh2_read_byte(ctx.Save + 0x36B3) > 0 \
+                and ctx.kh2_read_byte(ctx.Save + 0x36B4) > 0:
+            if ctx.kh2slotdata['FinalXemnas'] == 1:
+                if ctx.final_xemnas:
+                    return True
+                return False
+            return True
+        return False
+    elif ctx.kh2slotdata['Goal'] == 1:
+        if ctx.kh2_read_byte(ctx.Save + 0x3641) >= ctx.kh2slotdata['LuckyEmblemsRequired']:
+            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
+                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
+                logger.info("The Final Door is now Open")
+            if ctx.kh2slotdata['FinalXemnas'] == 1:
+                if ctx.final_xemnas:
+                    return True
+                return False
+            return True
+        return False
+    elif ctx.kh2slotdata['Goal'] == 2:
+        # for backwards compat
+        if "hitlist" in ctx.kh2slotdata:
+            locations = ctx.sending
+            for boss in ctx.kh2slotdata["hitlist"]:
+                if boss in locations:
+                    ctx.hitlist_bounties += 1
+        if ctx.hitlist_bounties >= ctx.kh2slotdata["BountyRequired"] or ctx.kh2_seed_save_cache["AmountInvo"]["Amount"][
+            "Bounty"] >= ctx.kh2slotdata["BountyRequired"]:
+            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
+                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
+                logger.info("The Final Door is now Open")
+            if ctx.kh2slotdata['FinalXemnas'] == 1:
+                if ctx.final_xemnas:
+                    return True
+                return False
+            return True
+        return False
+    elif ctx.kh2slotdata["Goal"] == 3:
+        if ctx.kh2_seed_save_cache["AmountInvo"]["Amount"]["Bounty"] >= ctx.kh2slotdata["BountyRequired"] and \
+                ctx.kh2_read_byte(ctx.Save + 0x3641) >= ctx.kh2slotdata['LuckyEmblemsRequired']:
+            if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
+                ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
+                ctx.kh2_write_byte(ctx.Save + 0x36B4, 1)
+                logger.info("The Final Door is now Open")
+            if ctx.kh2slotdata['FinalXemnas'] == 1:
+                if ctx.final_xemnas:
+                    return True
+                return False
+            return True
+        return False
+
+
+async def checkWorldLocations(self):
+    try:
+        currentworldint = self.kh2_read_byte(self.Now)
+        if self.last_world_int != currentworldint:
+            self.last_world_int = currentworldint
+            await self.send_msgs([{
+                "cmd":     "Set", "key": "Slot: " + str(self.slot) + " :CurrentWorld",
+                "default": 0, "want_reply": False, "operations": [{
+                    "operation": "replace",
+                    "value":     currentworldint
+                }]
+            }])
+        if currentworldint in self.worldid_to_locations:
+            curworldid = self.worldid_to_locations[currentworldint]
+            for location, data in curworldid.items():
+                if location in self.kh2_loc_name_to_id.keys():
+                    locationId = self.kh2_loc_name_to_id[location]
+                    if locationId not in self.locations_checked \
+                            and self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
+                        self.sending = self.sending + [(int(locationId))]
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 425")
+
+
+async def checkLevels(self):
+    try:
+        for location, data in SoraLevels.items():
+            currentLevel = self.kh2_read_byte(self.Save + 0x24FF)
+            locationId = self.kh2_loc_name_to_id[location]
+            if locationId not in self.locations_checked \
+                    and currentLevel >= data.bitIndex:
+                if self.kh2_seed_save["Levels"]["SoraLevel"] < currentLevel:
+                    self.kh2_seed_save["Levels"]["SoraLevel"] = currentLevel
+                self.sending = self.sending + [(int(locationId))]
+        formDict = {
+            0: ["ValorLevel", ValorLevels], 1: ["WisdomLevel", WisdomLevels], 2: ["LimitLevel", LimitLevels],
+            3: ["MasterLevel", MasterLevels], 4: ["FinalLevel", FinalLevels], 5: ["SummonLevel", SummonLevels]
+        }
+        for i in range(6):
+            for location, data in formDict[i][1].items():
+                formlevel = self.kh2_read_byte(self.Save + data.addrObtained)
+                if location in self.kh2_loc_name_to_id.keys():
+                    # if current form level is above other form level
+                    locationId = self.kh2_loc_name_to_id[location]
+                    if locationId not in self.locations_checked \
+                            and formlevel >= data.bitIndex:
+                        if formlevel > self.kh2_seed_save["Levels"][formDict[i][0]]:
+                            self.kh2_seed_save["Levels"][formDict[i][0]] = formlevel
+                        self.sending = self.sending + [(int(locationId))]
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 456")
+
+
+async def checkSlots(self):
+    try:
+        for location, data in weaponSlots.items():
+            locationId = self.kh2_loc_name_to_id[location]
+            if locationId not in self.locations_checked:
+                if self.kh2_read_byte(self.Save + data.addrObtained) > 0:
+                    self.sending = self.sending + [(int(locationId))]
+
+        for location, data in formSlots.items():
+            locationId = self.kh2_loc_name_to_id[location]
+            if locationId not in self.locations_checked and self.kh2_read_byte(self.Save + 0x06B2) == 0:
+                if self.kh2_read_byte(self.Save + data.addrObtained) & 0x1 << data.bitIndex > 0:
+                    self.sending = self.sending + [(int(locationId))]
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 475")
+
+
+async def verifyChests(self):
+    try:
+        for location in self.locations_checked:
+            locationName = self.lookup_id_to_location[location]
+            if locationName in self.chest_set:
+                if locationName in self.location_name_to_worlddata.keys():
+                    locationData = self.location_name_to_worlddata[locationName]
+                    if self.kh2_read_byte(
+                            self.Save + locationData.addrObtained) & 0x1 << locationData.bitIndex == 0:
+                        roomData = self.kh2_read_byte(self.Save + locationData.addrObtained)
+                        self.kh2_write_byte(self.Save + locationData.addrObtained,
+                                            roomData | 0x01 << locationData.bitIndex)
+
+    except Exception as e:
+        if self.kh2connected:
+            self.kh2connected = False
+        logger.info(e)
+        logger.info("line 491")
+
+
+async def verifyLevel(self):
+    for leveltype, anchor in {
+        "SoraLevel":   0x24FF,
+        "ValorLevel":  0x32F6,
+        "WisdomLevel": 0x332E,
+        "LimitLevel":  0x3366,
+        "MasterLevel": 0x339E,
+        "FinalLevel":  0x33D6
+    }.items():
+        if self.kh2_read_byte(self.Save + anchor) < self.kh2_seed_save["Levels"][leveltype]:
+            self.kh2_write_byte(self.Save + anchor, self.kh2_seed_save["Levels"][leveltype])
diff --git a/worlds/kh2/WorldLocations.py b/worlds/kh2/ClientStuff/WorldLocations.py
similarity index 96%
rename from worlds/kh2/WorldLocations.py
rename to worlds/kh2/ClientStuff/WorldLocations.py
index 6df18fc800..6d4cfb5943 100644
--- a/worlds/kh2/WorldLocations.py
+++ b/worlds/kh2/ClientStuff/WorldLocations.py
@@ -1,5 +1,5 @@
 import typing
-from .Names import LocationName
+from ..Names import LocationName
 
 
 class WorldLocationData(typing.NamedTuple):
@@ -896,6 +896,87 @@ tornPageLocks = {
     "TornPage4": WorldLocationData(0x1DB8, 4),  # --Scenario_4_start
     "TornPage5": WorldLocationData(0x1DB8, 7),  # --Scenario_5_start
 }
+# (Room,Event) : Boss event
+# Used for deathlink to say Sora died at : (Room,Event) which returns like Old pete
+DeathLinkPair = {
+    (2, 34, 157): "Twilight Thorn",
+    (2, 5, 88):   "Setzer",
+    (2, 20, 137): "Axel",
+    (2, 4, 80):   "Sandlot",
+    (2, 41, 186): "Mansion fight",
+    (2, 40, 161): "Betwixt and Between",
+    (2, 20, 213): "Data Axel",
+    (4, 8, 52):   "Bailey",
+    (4, 20, 86):  "Corridor",
+    (4, 18, 73):  "Dancers",
+    (4, 4, 55):   "HB Demyx",
+    (4, 16, 65):  "FF Cloud",
+    (4, 17, 66):  "1k Heartless",
+    (4, 1, 75):   "Sephiroth",
+    (4, 4, 114):  "Data Demyx",
+    (5, 11, 72):  "Thresholder",
+    (5, 3, 69):   "Beast",
+    (5, 5, 79):   "Dark Thorn",
+    (5, 4, 74):   "Dragoons",
+    (5, 15, 82):  "Xaldin",
+    (5, 15, 97):  "Data Xaldin",
+    (6, 7, 114):  "Cerberus",
+    (6, 17, 123): "OC Demyx",
+    (6, 8, 116):  "OC Pete",
+    (6, 18, 171): "Hydra",
+    (6, 6, 126):  "Auron Statue fight",
+    (6, 19, 202): "Hades",
+    (4, 34, 151): "Zexion", # all as fights are in hb "world"
+    (7, 9, 2):    "Abu",
+    (7, 13, 79):  "Chasm fight",
+    (7, 10, 58):  "Treasure Room",
+    (7, 3, 59):   "Lords",
+    (7, 14, 100): "Carpet",
+    (7, 5, 62):   "Genie Jafar",
+    (4, 33, 142): "Lexaeus",
+    (8, 5, 72):   "Cave",
+    (8, 7, 73):   "Summit",
+    (8, 9, 75):   "Shan Yu",
+    (8, 10, 78):  "Antechamber fight",
+    (8, 8, 79):   "Storm Rider",
+    (10,14, 55):  "Scar",
+    (10,15, 59):  "Groundshaker",
+    (11,2, 63):   "Tutorial",
+    (11,9, 65):   "Ursula's Revenge",
+    (11,4, 55):   "A New Day is Dawning",
+    (12,1, 53):   "Library (DC)",
+    (12,0, 51):   "Minnie Escort",
+    (13,1, 58):   "Old Pete",
+    (13,2, 52):   "Boat Pete",
+    (13,3, 53):   "DC Pete",
+    (4, 38, 145): "Marluxia",
+    (12,7, 67):   "Lingering Will",
+    (14,6, 53):   "Candy Cane Lane fight",
+    (14,3, 52):   "Prison Keeper",
+    (14,9, 55):   "Oogie Boogie",
+    (14,10, 63):  "Presents minigame",
+    (14,7, 64):   "Experiment",
+    (4, 32, 115): "Vexen",
+    (16,2, 55):   "Town",
+    (16,10, 60):  "Barbossa",
+    (16,14, 62):  "Gambler",
+    (16,1, 54):   "Grim Reaper",
+    (17,3, 54):   "Screens",
+    (17,4, 55):   "Hostile Program",
+    (17,7, 57):   "Solar Sailer",
+    (17,9, 59):   "MCP",
+    (4, 33, 143): "Larxene",
+    (18,21, 65):  "Roxas",
+    (18,10, 57):  "Xigbar",
+    (18,14, 58):  "Luxord",
+    (18,15, 56):  "Saix",
+    (18,19, 59):  "Xemnas 1",
+    (18,20, 98):  "Data Xemnas",
+    (18,21, 99):  "Data Roxas",
+    (18,10, 100): "Data Xigbar",
+    (18,15, 102): "Data Saix",
+    (18,14, 101): "Data Luxord",
+}
 all_world_locations = {
     **TWTNW_Checks,
     **TT_Checks,
diff --git a/worlds/kh2/ClientStuff/__init__.py b/worlds/kh2/ClientStuff/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/kh2/Locations.py b/worlds/kh2/Locations.py
index 100e971e7d..4b423d255a 100644
--- a/worlds/kh2/Locations.py
+++ b/worlds/kh2/Locations.py
@@ -982,7 +982,6 @@ popups_set = {
     LocationName.BaileySecretAnsemReport7,
     LocationName.BaseballCharm,
     LocationName.AnsemsStudyMasterForm,
-    LocationName.AnsemsStudySkillRecipe,
     LocationName.AnsemsStudySleepingLion,
     LocationName.FFFightsCureElement,
     LocationName.ThousandHeartlessSecretAnsemReport1,
@@ -1282,6 +1281,25 @@ exclusion_table = {
         LocationName.HadesCupTrophyParadoxCups,
         LocationName.MusicalOrichalcumPlus,
     ],
+    "HitlistCasual":          [
+        LocationName.FuturePete,
+        LocationName.BetwixtandBetweenBondofFlame,
+        LocationName.GrimReaper2,
+        LocationName.ThousandHeartless,
+        LocationName.WinnersProof,
+        LocationName.Experiment,
+        LocationName.Groundshaker,
+        LocationName.Hades,
+        LocationName.GenieJafar,
+        LocationName.Xaldin,
+        LocationName.StormRider,
+        LocationName.MansionBasementCorridorHiPotion,
+        LocationName.Xemnas1SecretAnsemReport13,
+        LocationName.XigbarSecretAnsemReport3,
+        LocationName.MCP,
+        LocationName.Lvl50,
+        LocationName.Lvl99
+    ],
     "Cups":          {
         LocationName.ProtectBeltPainandPanicCup,
         LocationName.SerenityGemPainandPanicCup,
@@ -1358,3 +1376,8 @@ location_groups = {
     Region_Name: [loc for loc in Region_Locs if "Event" not in loc]
     for Region_Name, Region_Locs in KH2REGIONS.items() if Region_Locs and "Event" not in Region_Locs[0]
 }
+
+# This seems like the not-correct way to handle these location groups, but making these sets regions so the above works
+# causes not enough items to be generated for some reason.
+location_groups["Casual Bounties"] = exclusion_table["HitlistCasual"]
+location_groups["General Bounties"] = exclusion_table["Hitlist"]
diff --git a/worlds/kh2/OpenKH.py b/worlds/kh2/OpenKH.py
index 7c67fc07de..07d728347a 100644
--- a/worlds/kh2/OpenKH.py
+++ b/worlds/kh2/OpenKH.py
@@ -5,6 +5,8 @@ import os
 import Utils
 import zipfile
 
+from datetime import datetime, UTC
+
 from .Items import item_dictionary_table
 from .Locations import all_locations, SoraLevels, exclusion_table
 from .XPValues import lvlStats, formExp, soraExp
@@ -76,7 +78,8 @@ def patch_kh2(self, output_directory):
         if self.options.LevelDepth == "level_99_sanity":
             levelsetting.extend(exclusion_table["Level99Sanity"])
 
-    mod_name = f"AP-{self.multiworld.seed_name}-P{self.player}-{self.multiworld.get_file_safe_player_name(self.player)}"
+    curr_timestamp = datetime.strftime(datetime.now(UTC), "%d%b%Y-%H%M%S")
+    mod_name = f"AP-{self.multiworld.seed_name}-P{self.player}-{self.multiworld.get_file_safe_player_name(self.player)}-{curr_timestamp}"
     all_valid_locations = {location for location, data in all_locations.items()}
 
     for location in self.multiworld.get_filled_locations(self.player):
@@ -384,7 +387,7 @@ def patch_kh2(self, output_directory):
                     {
                         'name': 'msg/sp/he.bar'
                     }
-                ],
+        ],
                 'method': 'binarc',
                 'source': [
                     {
@@ -473,7 +476,9 @@ def patch_kh2(self, output_directory):
 
     mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__)
 
-    self.mod_yml["title"] = f"Randomizer Seed {mod_name}"
+    self.mod_yml["title"] = f"Archipelago Seed - {self.multiworld.get_file_safe_player_name(self.player)}"
+    self.mod_yml["originalAuthor"] = "JaredWeakStrike"
+    self.mod_yml["description"] = f"Seed {self.multiworld.seed_name} was generated for {self.multiworld.get_file_safe_player_name(self.player)} - Player {self.player} at {curr_timestamp} UTC. Have fun! \nCredit to delilahisdidi for the icons!"
 
     openkhmod = {
         "TrsrList.yml": yaml.dump(self.formattedTrsr, line_break="\n"),
@@ -487,6 +492,44 @@ def patch_kh2(self, output_directory):
         "he.yml":       yaml.dump(self.cups_text, line_break="\n")
     }
 
+    ## I think I overlooked a really easy way to find the data folder,
+    ## but it has to determine if it's a local client generating,
+    ## if it's a server generating, if it's a build, or on the complete
+    ## offchance that it's a custom world.
+
+    iconbytes = bytes()
+    previewbytes = bytes()
+    # local build/server generating
+    apworldloc = os.path.join("worlds","kh2","data")
+    if os.path.exists(apworldloc):
+        try:
+            with open(os.path.join(apworldloc, "khapicon.png"),'rb') as icon, \
+                 open(os.path.join(apworldloc, "preview.png"),'rb') as preview:
+                iconbytes = icon.read()
+                previewbytes = preview.read()
+            openkhmod["icon.png"] = iconbytes
+            openkhmod["preview.png"] = previewbytes
+        except IOError as openerror:
+            logging.warning(openerror)
+
+    # client install generating
+    apworldloc = os.path.join("lib","worlds")
+    if not os.path.isfile(Utils.user_path(apworldloc, 'kh2.apworld')): 
+        apworldloc = os.path.join("custom_worlds", "")
+    if os.path.exists(os.path.join(apworldloc,"kh2.apworld")):
+        try: 
+            with zipfile.ZipFile(Utils.user_path(os.path.join(
+                                 apworldloc, 'kh2.apworld')), 'r') as apworld_archive:
+                # zipfile requires the forward slash
+                with apworld_archive.open('kh2/data/khapicon.png', 'r') as icon, \
+                     apworld_archive.open('kh2/data/preview.png', 'r') as preview:
+                    iconbytes = icon.read()
+                    previewbytes = preview.read()
+                openkhmod["icon.png"] = iconbytes
+                openkhmod["preview.png"] = previewbytes
+        except IOError as openerror:
+            logging.warning(openerror)
+
     mod = KH2Container(openkhmod, mod_dir, output_directory, self.player,
             self.multiworld.get_file_safe_player_name(self.player))
     mod.write()
diff --git a/worlds/kh2/Options.py b/worlds/kh2/Options.py
index ddaf36ebcb..b4978339aa 100644
--- a/worlds/kh2/Options.py
+++ b/worlds/kh2/Options.py
@@ -273,7 +273,7 @@ class BountyRequired(Range):
     If Goal is not Hitlist or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Bounties Required"
     range_start = 1
-    range_end = 26
+    range_end = 42
     default = 7
 
 
@@ -283,7 +283,7 @@ class BountyAmount(Range):
     If Goal is not Hitlist or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Bounties Available"
     range_start = 1
-    range_end = 26
+    range_end = 42
     default = 10
 
 
@@ -293,6 +293,12 @@ class BountyStartHint(Toggle):
     default = False
 
 
+class CasualBounties(Toggle):
+    """Adds more casual and generic locations that aren't superbosses to expand the bounty pool. (World Bosses, etc.)"""
+    display_name = "Add Casual Bounties"
+    default = False
+
+
 class WeaponSlotStartHint(Toggle):
     """Start with Weapon Slots' Hinted"""
     display_name = "Start with Weapon Slots Hinted"
@@ -365,6 +371,7 @@ class KingdomHearts2Options(PerGameCommonOptions):
     Visitlocking: Visitlocking
     RandomVisitLockingItem: RandomVisitLockingItem
     SuperBosses: SuperBosses
+    CasualBounties: CasualBounties
     Cups: Cups
     SummonLevelLocationToggle: SummonLevelLocationToggle
     AtlanticaToggle: AtlanticaToggle
diff --git a/worlds/kh2/Regions.py b/worlds/kh2/Regions.py
index 72b3c95b09..2104a0092e 100644
--- a/worlds/kh2/Regions.py
+++ b/worlds/kh2/Regions.py
@@ -601,7 +601,6 @@ KH2REGIONS: typing.Dict[str, typing.List[str]] = {
         LocationName.OasisAPBoost,
         LocationName.CircleofLife,
         LocationName.Hyenas1,
-
         LocationName.GoofyHyenas1
     ],
     RegionName.Scar:               [
diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 3068e7bb56..7e10dc29b7 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -3,7 +3,8 @@ from typing import List
 
 from BaseClasses import Tutorial, ItemClassification
 from Fill import fast_fill
-from worlds.LauncherComponents import Component, components, Type, launch as launch_component
+from Utils import local_path
+from worlds.LauncherComponents import Component, components, icon_paths, Type, launch as launch_component
 from worlds.AutoWorld import World, WebWorld
 from .Items import *
 from .Locations import *
@@ -16,11 +17,12 @@ from .Subclasses import KH2Item
 
 
 def launch_client():
-    from .Client import launch
+    from .ClientStuff.Client import launch
     launch_component(launch, name="KH2Client")
 
 
-components.append(Component("KH2 Client", func=launch_client, component_type=Type.CLIENT))
+icon_paths['kh2apicon'] = f"ap:{__name__}/data/khapicon.png"
+components.append(Component("KH2 Client", func=launch_client, component_type=Type.CLIENT, icon='kh2apicon'))
 
 
 class KingdomHearts2Web(WebWorld):
@@ -102,16 +104,20 @@ class KH2World(World):
                 self.goofy_ability_dict[ability] -= 1
 
         slot_data = self.options.as_dict(
-            "Goal", 
-            "FinalXemnas", 
-            "LuckyEmblemsRequired", 
-            "BountyRequired",
-            "FightLogic",
-            "FinalFormLogic",
-            "AutoFormLogic",
-            "LevelDepth",
-            "DonaldGoofyStatsanity",
-            "CorSkipToggle"
+                "Goal",
+                "FinalXemnas",
+                "LuckyEmblemsRequired",
+                "BountyRequired",
+                "FightLogic",
+                "FinalFormLogic",
+                "AutoFormLogic",
+                "LevelDepth",
+                "DonaldGoofyStatsanity",
+                "CorSkipToggle",
+                "SuperBosses",
+                "Cups",
+                "AtlanticaToggle",
+                "SummonLevelLocationToggle",
         )
         slot_data.update({
             "hitlist":                [],  # remove this after next update
@@ -201,6 +207,7 @@ class KH2World(World):
         """
         Determines the quantity of items and maps plando locations to items.
         """
+
         # Item: Quantity Map
         # Example. Quick Run: 4
         self.total_locations = len(all_locations.keys())
@@ -246,6 +253,8 @@ class KH2World(World):
         # hitlist
         if self.options.Goal not in ["lucky_emblem_hunt", "three_proofs"]:
             self.random_super_boss_list.extend(exclusion_table["Hitlist"])
+            if self.options.CasualBounties:
+                self.random_super_boss_list.extend(exclusion_table["HitlistCasual"])
             self.bounties_amount = self.options.BountyAmount.value
             self.bounties_required = self.options.BountyRequired.value
 
@@ -390,9 +399,9 @@ class KH2World(World):
         # take one of the 2 out
         # randomize the list with only
         for location in goofy_weapon_location_list:
-            random_ability = self.random.choice(self.goofy_weapon_abilities)
+            i = self.random.randrange(len(self.goofy_weapon_abilities))
+            random_ability = self.goofy_weapon_abilities.pop(i)
             location.place_locked_item(random_ability)
-            self.goofy_weapon_abilities.remove(random_ability)
 
         if not self.options.DonaldGoofyStatsanity:
             # plando goofy get bonuses
@@ -401,10 +410,9 @@ class KH2World(World):
             if len(goofy_get_bonus_location_pool) > len(self.goofy_get_bonus_abilities):
                 raise Exception(f"Too little abilities to fill goofy get bonus locations for player {self.player_name}.")
             for location in goofy_get_bonus_location_pool:
-                self.random.choice(self.goofy_get_bonus_abilities)
-                random_ability = self.random.choice(self.goofy_get_bonus_abilities)
+                i = self.random.randrange(len(self.goofy_get_bonus_abilities))
+                random_ability = self.goofy_get_bonus_abilities.pop(i)
                 location.place_locked_item(random_ability)
-                self.goofy_get_bonus_abilities.remove(random_ability)
 
     def donald_pre_fill(self):
         donald_weapon_location_list = [self.multiworld.get_location(location, self.player) for location in
@@ -413,9 +421,9 @@ class KH2World(World):
         # take one of the 2 out
         # randomize the list with only
         for location in donald_weapon_location_list:
-            random_ability = self.random.choice(self.donald_weapon_abilities)
+            i = self.random.randrange(len(self.donald_weapon_abilities))
+            random_ability = self.donald_weapon_abilities.pop(i)
             location.place_locked_item(random_ability)
-            self.donald_weapon_abilities.remove(random_ability)
         # if option is turned off
         if not self.options.DonaldGoofyStatsanity:
             donald_get_bonus_location_pool = [self.multiworld.get_location(location, self.player) for location in
@@ -423,9 +431,9 @@ class KH2World(World):
             if len(donald_get_bonus_location_pool) > len(self.donald_get_bonus_abilities):
                 raise Exception(f"Too little abilities to fill donald get bonus locations for player {self.player_name}.")
             for location in donald_get_bonus_location_pool:
-                random_ability = self.random.choice(self.donald_get_bonus_abilities)
+                i = self.random.randrange(len(self.donald_get_bonus_abilities))
+                random_ability = self.donald_get_bonus_abilities.pop(i)
                 location.place_locked_item(random_ability)
-                self.donald_get_bonus_abilities.remove(random_ability)
 
     def keyblade_pre_fill(self):
         """
@@ -482,6 +490,20 @@ class KH2World(World):
             if location in self.random_super_boss_list:
                 self.random_super_boss_list.remove(location)
 
+        if self.options.LevelDepth == "level_1":
+            if LocationName.Lvl50 in self.random_super_boss_list:
+                self.random_super_boss_list.remove(LocationName.Lvl50)
+            if LocationName.Lvl99 in self.random_super_boss_list:
+                self.random_super_boss_list.remove(LocationName.Lvl99)
+
+        # We only want the bounty corresponding to our max level, remove the other level bounty
+        if self.options.LevelDepth in ["level_50", "level_50_sanity"] and LocationName.Lvl99 in self.random_super_boss_list:
+            self.random_super_boss_list.remove(LocationName.Lvl99)
+
+        # We only want the bounty corresponding to our max level, remove the other level bounty
+        if self.options.LevelDepth in ["level_99", "level_99_sanity"] and LocationName.Lvl50 in self.random_super_boss_list:
+            self.random_super_boss_list.remove(LocationName.Lvl50)
+
         if not self.options.SummonLevelLocationToggle and LocationName.Summonlvl7 in self.random_super_boss_list:
             self.random_super_boss_list.remove(LocationName.Summonlvl7)
 
diff --git a/worlds/kh2/data/khapicon.ico b/worlds/kh2/data/khapicon.ico
new file mode 100644
index 0000000000..426c6d8e74
Binary files /dev/null and b/worlds/kh2/data/khapicon.ico differ
diff --git a/worlds/kh2/data/khapicon.png b/worlds/kh2/data/khapicon.png
new file mode 100644
index 0000000000..b3ab0555d0
Binary files /dev/null and b/worlds/kh2/data/khapicon.png differ
diff --git a/worlds/kh2/data/preview.png b/worlds/kh2/data/preview.png
new file mode 100644
index 0000000000..1f2b967a98
Binary files /dev/null and b/worlds/kh2/data/preview.png differ
diff --git a/worlds/kh2/docs/en_Kingdom Hearts 2.md b/worlds/kh2/docs/en_Kingdom Hearts 2.md
index 6924800e6c..6328b2ad8e 100644
--- a/worlds/kh2/docs/en_Kingdom Hearts 2.md	
+++ b/worlds/kh2/docs/en_Kingdom Hearts 2.md	
@@ -2,7 +2,7 @@
 
 ## Changes from the vanilla game
 
-This randomizer creates a more dynamic play experience by randomizing the locations of most items in Kingdom Hearts 2. Currently all items within Chests, Popups, Get Bonuses, Form Levels, and Sora's Levels are randomized. This allows abilities that Sora would normally have to be placed on Keyblades with random stats. Additionally, there are several options for ways to finish the game, allowing for different goals beyond beating the final boss.
+This randomizer creates a more dynamic play experience by randomizing the locations of most items in Kingdom Hearts 2. Currently all items within Chests, Popups, Get Bonuses, Form Levels, Summon Levels,and Sora's Levels are randomized. This allows abilities that Sora would normally have to be placed on Keyblades with random stats. Additionally, there are several options for ways to finish the game, allowing for different goals beyond beating the final boss.
 
 ## Where is the options page
 
@@ -39,7 +39,7 @@ In Kingdom Hearts 2, items which need to be sent to other worlds appear in any l
 ## When the player receives an item, what happens?
 
 
-It is added to your inventory. If you obtain magic, you will need to pause your game to have it show up in your inventory, then enter a new room for it to become properly usable.
+It is added to your inventory.
 
 ## What Happens if I die before Room Saving?
 
@@ -80,7 +80,30 @@ The list of possible locations that can contain a bounty:
 - Lingering Will
 - Starry Hill
 - Transport to Remembrance
-- Godess of Fate cup and Hades Paradox cup
+- Goddess of Fate cup and Hades Paradox cup
+
+For players looking for a more casual experience with the Hitlist goal, there is an "Add Casual Bounties" option to introduce more bounty locations.<br>
+The list of possible bounty locations that get added with this setting enabled:
+
+- Future Pete
+- TT3 Bond of Flame
+- Grim Reaper 2
+- 1000 Heartless
+- Winner's Proof
+- Experiment
+- Groundshaker
+- Hades
+- Genie Jafar
+- Xaldin
+- Storm Rider
+- MCP
+- STT Post Axel 2 Chest
+- Xemnas 1
+- Xigbar
+- Level 50 (Depending on choice of level checks.)
+- Level 99 (Depending on choice of level checks.)
+
+For those who only want the casual bounty locations, you can effectively disable the normal bounty locations by excluding the "General Bounties" location group.
 
 ## Quality of life:
 
@@ -97,3 +120,27 @@ With the help of Shananas, Num, and ZakTheRobot we have many QoL features such a
 - Removal of Absent Silhouette and go straight into the Data Fights.
 - And much more can be found at [Kingdom Hearts 2 GoA Overview](https://tommadness.github.io/KH2Randomizer/overview/)
 
+## What does each mod do?
+
+1. Archipelago Companion:
+- This mod under the hood is a collection of smaller mods that change things such as item icons and specific things in the GOA that make it work better for archipelago.
+This mod needs to be above the GOA because it has to overwrite the GOA lua script with its own for things to work according to the client. Such as giving you consumable items
+I.E potions, ethers, boosts etc.
+- This mod also has some consistent mods that should always be on such as Port Royal Map Skip, Better STT and Allowing you to enter drive forms where you shouldnt normally be able to (Dive to the Heart before Data Fights, 100 Acre Woods) Credit to KSX on nexus mods for the basis of the script that does this that was changed for it to work in AP.
+- Changes The Absent Silhouettes to be the data version instead of how it works traditionally where you would defeat the absent silhouette version to unlock the data fight using the same entry point.
+- The biggest misconception is that the APCompanion is the client/connects to the server like other game's companions mod. This is not the case. The apcompanion is mainly a collection of static modifications that were taken out of the apworld to reduce seed size.
+- There are many little things this mod does so if you have any questions feel free to ping me (@JaredWeakStrike) in the archipelago discord and I can hopefully answer your question.
+2. TopazTK/ArchipelagoEnablers
+- This is in sense another companion mod and is required for many things to work correctly.
+- Notification System: Allows the client to flip a byte in game for it to trigger a puzzle piece popup/information popup/chest popup
+- Deathlink: Allows the client to flip a byte to kill sora when the client sets sora's hp to 0 (normally it doesnt kill sora when his hp is set to 0)
+- Instant Movement: No need to pause when you obtain movement for it to update.
+- Instant Magic: No need to room transition to update magic
+- Autosave: Creates a save file in slot 99 that is treated like a normal save file. It is made on room transition. Do note: it does overwrite any save in slot 99
+- Soft Reset: All shoulder buttons+start. For ds4 its L1+l2+R1+R2+Options for example
+3. TopazTK/ArchipelagoEnablersLITE
+- Everything in Archipelago Enablers EXCEPT auto save and soft reset
+- This mod is to be used with H2FM-Mods-equations19/auto-save or H2FM-Mods-equations19/soft-reset
+- Both equations' mods require KH2FM-Mods-equations19/KH2-Lua-Library
+- equations19/soft-reset: Use all shoulder buttons+start to reset 
+- equations19/auto-save: To load an auto-save, hold down the Select or your equivalent on your preferred controller while choosing a NO PROGRESS save file i.e. A save file that is at the start of the game and has no progress made. Make sure to hold the button down the whole time.
diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index db0f6c86b9..55bdaa5bf1 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -16,9 +16,10 @@ Kingdom Hearts II Final Mix from the [Epic Games Store](https://store.epicgames.
 - Needed for Archipelago 
     1. [ArchipelagoKH2Client.exe](https://github.com/ArchipelagoMW/Archipelago/releases)
     2. Install the Archipelago Companion mod from `JaredWeakStrike/APCompanion` using OpenKH Mod Manager
-    3. Install the mod from `KH2FM-Mods-equations19/auto-save` using OpenKH Mod Manager
-    4. Install the mod from `KH2FM-Mods-equations19/KH2-Lua-Library` using OpenKH Mod Manager
-    5. AP Randomizer Seed
+    3. Install the mod from `TopazTK/KH2-ArchipelagoEnablers` using OpenKH Mod manager
+       1. Do Note that if you have `KH2FM-Mods-equations19/auto-save` OR `KH2FM-Mods-equations19/soft-reset` you should download `TopazTK/KH2-ArchipelagoEnablersLITE` instead
+       2. This mod overwrites slot 99 with an autosave. Make sure to copy your save data to another slot before installing.
+    4. AP Randomizer Seed
 - Optional Quality of Life Mods for Archipelago
     1. Optionally Install the Archipelago Quality Of Life mod from `JaredWeakStrike/AP_QOL` using OpenKH Mod Manager
     2. Optionally Install the Quality Of Life mod from `shananas/BearSkip` using OpenKH Mod Manager
@@ -29,9 +30,9 @@ Load this mod just like the <b>GoA ROM</b> you did during the KH2 Rando setup. `
 Have this mod second-highest priority below the .zip seed.<br>
 This mod is based upon Num's Garden of Assemblage Mod and requires it to work. Without Num this could not be possible. 
 
-### Required: Auto Save Mod and KH2 Lua Library
+### Required: Archipelago Enablers
 
-Load these mods just like you loaded the GoA ROM mod during the KH2 Rando setup. `KH2FM-Mods-equations19/auto-save` and `KH2FM-Mods-equations19/KH2-Lua-Library` Location doesn't matter, required in case of crashes. See [Best Practices](#best-practices) on how to load the auto save
+Load this mod just like <b> GoA ROM</b> `TopazTK/KH2-ArchipelagoEnablers`. <b>NOTE:</b> if you perfer `KH2FM-Mods-equations19/auto-save` or `KH2FM-Mods-equations19/soft-reset`you need to download `TopazTK/KH2-ArchipelagoEnablersLITE`
 
 ### Optional QoL Mods: AP QoL and Bear Skip
 
@@ -52,8 +53,8 @@ After Installing the seed click "Mod Loader -> Build/Build and Run". Every slot
 
 ## What the Mod Manager Should Look Like.
 
-![image](https://i.imgur.com/N0WJ8Qn.png)
-
+![image](https://i.imgur.com/3IAgeee.png)
+- if you are using APEnablers Lite, install `KH2FM-Mods-equations19/soft-reset` and  `KH2FM-Mods-equations19/KH2-Lua-Library`. Put them below the APCompanion but ABOVE the goa
 
 ## Using the KH2 Client
 
@@ -84,8 +85,10 @@ Enter The room's port number into the top box <b> where the x's are</b> and pres
     - To fix this look over the guide at [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/). Specifically the Panacea and Lua Backend Steps.
 
 -  Using a seed from the standalone KH2 Randomizer Seed Generator.
-    - The Archipelago version of the KH2 Randomizer does not use this Seed Generator; refer to the [Archipelago Setup](https://archipelago.gg/tutorial/Archipelago/setup/en) to learn how to generate and play a seed through Archipelago. 
+    - The Archipelago version of the KH2 Randomizer does not use this Seed Generator; refer to the [Archipelago Setup](/tutorial/Archipelago/setup/en) to learn how to generate and play a seed through Archipelago. 
 
+- Using equations19/auto-save OR equations19/soft-reset while using TopazTK/KH2-ArchipelagoEnablers. 
+    - Since APEnablers has both of these features they conflict with each-other. If you want to keep on using Equation's mods you need to download TopazTK/KH2-ArchipelagoEnablersLITE instead
 ## Best Practices
 
 - Make a save at the start of the GoA before opening anything. This will be the file to select when loading an autosave if/when your game crashes.
@@ -94,6 +97,7 @@ Enter The room's port number into the top box <b> where the x's are</b> and pres
 - Run the game in windows/borderless windowed mode. Fullscreen is stable but the game can crash if you alt-tab out.
 - Make sure to save in a different save slot when playing in an async or disconnecting from the server to play a different seed
 
+
 ## Logic Sheet & PopTracker Autotracking
 
 Have any questions on what's in logic? This spreadsheet made by Bulcon has the answer [Requirements/logic sheet](https://docs.google.com/spreadsheets/d/1nNi8ohEs1fv-sDQQRaP45o6NoRcMlLJsGckBonweDMY/edit?usp=sharing)
@@ -125,7 +129,7 @@ This pack will handle logic, received items, checked locations and autotabbing f
 - Why did I not load into the correct visit?
     - You need to trigger a cutscene or visit The World That Never Was for it to register that you have received the item.
 - What versions of Kingdom Hearts 2 are supported?
-    - Currently the only supported versions are Epic Games Version 1.0.0.10_WW and Steam Build Version 15194255.
+    - Currently, the only supported versions are Epic Games Version 1.0.0.10_WW and Steam Build Version 15194255.
 - Why am I getting wallpapered while going into a world for the first time?
     - Your Lua Backend was not configured correctly. Look over the step in the [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/) guide.
 - Why am I not getting magic?
@@ -138,8 +142,6 @@ This pack will handle logic, received items, checked locations and autotabbing f
 - Why am I getting dummy items or letters?
     - You will need to get the `JaredWeakStrike/APCompanion` (you can find how to get this if you scroll up)
 - Why am I not sending or receiving items?
-    - Make sure you are connected to the KH2 client and the correct room (for more information scroll up)
-- Why should I install the auto save mod at `KH2FM-Mods-equations19/auto-save` and `KH2FM-Mods-equations19/KH2-Lua-Library`?
-    - Because Kingdom Hearts 2 is prone to crashes and will keep you from losing your progress. Both mods are needed for auto save to work.
+    - Make sure you are connected to the KH2 client and the correct room (for more information scroll up). You may need to run the client/launcher as admin
 - How do I load an auto save?
     - To load an auto-save, hold down the Select or your equivalent on your preferred controller while choosing a file. Make sure to hold the button down the whole time.
diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index ed5e6cf102..9b77846ed7 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -1,11 +1,8 @@
 import binascii
 import importlib.util
 import importlib.machinery
-import os
 import random
-import pickle
 import Utils
-import settings
 from collections import defaultdict
 from typing import Dict
 
@@ -63,14 +60,56 @@ from .patches import bank34
 from .roomEditor import RoomEditor, Object
 from .patches.aesthetics import rgb_to_bin, bin_to_rgb
 
-from .. import Options
+from .logic import Logic as LADXRLogic
+from .settings import Settings as LADXRSettings
+from .worldSetup import WorldSetup as LADXRWorldSetup
+from .locations.keyLocation import KeyLocation
+
+
+class VersionError(Exception):
+    pass
 
 # Function to generate a final rom, this patches the rom with all required patches
 def generateRom(base_rom: bytes, args, patch_data: Dict):
+    from .. import LinksAwakeningWorld
+    patcher_version = LinksAwakeningWorld.world_version
+    generated_version = Utils.tuplize_version(patch_data.get("generated_world_version", "2.0.0"))
+    if generated_version.major != patcher_version.major or generated_version.minor != patcher_version.minor:
+        Utils.messagebox(
+            "Error",
+            "The apworld version that this patch was generated on is incompatible with your installed world.\n\n"
+            f"Generated on {generated_version.as_simple_string()}\n"
+            f"Installed version {patcher_version.as_simple_string()}",
+            True
+        )
+        raise VersionError(
+            f"The installed world ({patcher_version.as_simple_string()}) is incompatible with the world this patch "
+            f"was generated on ({generated_version.as_simple_string()})"
+        )
+
     random.seed(patch_data["seed"] + patch_data["player"])
     multi_key = binascii.unhexlify(patch_data["multi_key"].encode())
-    item_list = pickle.loads(binascii.unhexlify(patch_data["item_list"].encode()))
-    options = patch_data["options"]
+
+    ladxr_settings = LADXRSettings(patch_data["ladxr_settings_dict"])
+    world_setup = LADXRWorldSetup()
+    world_setup.goal = patch_data["world_setup"]["goal"]
+    world_setup.multichest = patch_data["world_setup"]["multichest"]
+    world_setup.entrance_mapping = patch_data["world_setup"]["entrance_mapping"]
+    world_setup.boss_mapping = patch_data["world_setup"]["boss_mapping"]
+    world_setup.miniboss_mapping = patch_data["world_setup"]["miniboss_mapping"]
+    ladxr_logic = LADXRLogic(configuration_options=ladxr_settings, world_setup=world_setup)
+    item_list = [item for item in ladxr_logic.iteminfo_list if not isinstance(item, KeyLocation)]
+    for spot in patch_data["rom_item_placements"]:
+        ladxr_item = next((item for item in item_list if item.nameId == spot["name_id"]), None)
+        if not ladxr_item:
+            continue
+        ladxr_item.item = spot["item"][1:] if spot["item"].startswith('*') else spot["item"]
+        ladxr_item.custom_item_name = spot["custom_item_name"]
+        mw = None
+        if patch_data["player"] != spot["item_owner"]:
+            mw = min(spot["item_owner"], 101)
+        ladxr_item.mw = mw
+
     rom_patches = []
     rom = ROMWithTables(base_rom, rom_patches)
     rom.player_names = patch_data["other_player_names"]
@@ -84,10 +123,9 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     for pymod in pymods:
         pymod.prePatch(rom)
 
-    if options["gfxmod"]:
-        user_settings = settings.get_settings()
+    if ladxr_settings.gfxmod:
         try:
-            gfx_mod_file = user_settings["ladx_options"]["gfx_mod_file"]
+            gfx_mod_file = LinksAwakeningWorld.settings.gfx_mod_file
             patches.aesthetics.gfxMod(rom, gfx_mod_file)
         except FileNotFoundError:
             pass # if user just doesnt provide gfxmod file, let patching continue
@@ -120,7 +158,7 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     assembler.const("wLinkSpawnDelay", 0xDE13)
 
     #assembler.const("HARDWARE_LINK", 1)
-    assembler.const("HARD_MODE", 1 if options["hard_mode"] else 0)
+    assembler.const("HARD_MODE", 1 if ladxr_settings.hardmode else 0)
 
     patches.core.cleanup(rom)
     patches.save.singleSaveSlot(rom)
@@ -143,17 +181,16 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     patches.core.alwaysAllowSecretBook(rom)
     patches.core.injectMainLoop(rom)
 
-    if options["shuffle_small_keys"] != Options.ShuffleSmallKeys.option_original_dungeon or\
-            options["shuffle_nightmare_keys"] != Options.ShuffleNightmareKeys.option_original_dungeon:
+    if ladxr_settings.shufflesmallkeys != 'originaldungeon' or ladxr_settings.shufflenightmarekeys != 'originaldungeon':
         patches.inventory.advancedInventorySubscreen(rom)
     patches.inventory.moreSlots(rom)
-    # if ladxr_settings["witch"]:
+    # if ladxr_settings.witch:
     patches.witch.updateWitch(rom)
     patches.softlock.fixAll(rom)
-    if not options["rooster"]:
+    if not ladxr_settings.rooster:
         patches.maptweaks.tweakMap(rom)
         patches.maptweaks.tweakBirdKeyRoom(rom)
-    if options["overworld"] == Options.Overworld.option_open_mabe:
+    if ladxr_settings.overworld == 'openmabe':
         patches.maptweaks.openMabe(rom)
     patches.chest.fixChests(rom)
     patches.shop.fixShop(rom)
@@ -165,9 +202,9 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     patches.tarin.updateTarin(rom)
     patches.fishingMinigame.updateFinishingMinigame(rom)
     patches.health.upgradeHealthContainers(rom)
-    # if ladxr_settings["owlstatues"] in ("dungeon", "both"):
+    # if ladxr_settings.owlstatues in ("dungeon", "both"):
     #    patches.owl.upgradeDungeonOwlStatues(rom)
-    # if ladxr_settings["owlstatues"] in ("overworld", "both"):
+    # if ladxr_settings.owlstatues in ("overworld", "both"):
     #    patches.owl.upgradeOverworldOwlStatues(rom)
     patches.goldenLeaf.fixGoldenLeaf(rom)
     patches.heartPiece.fixHeartPiece(rom)
@@ -178,17 +215,17 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     patches.songs.upgradeManbo(rom)
     patches.songs.upgradeMamu(rom)
 
-    patches.tradeSequence.patchTradeSequence(rom, options)
+    patches.tradeSequence.patchTradeSequence(rom, ladxr_settings)
     patches.bowwow.fixBowwow(rom, everywhere=False)
-    # if ladxr_settings["bowwow"] != 'normal':
+    # if ladxr_settings.bowwow != 'normal':
     #    patches.bowwow.bowwowMapPatches(rom)
     patches.desert.desertAccess(rom)
-    # if ladxr_settings["overworld"] == 'dungeondive':
+    # if ladxr_settings.overworld == 'dungeondive':
     #    patches.overworld.patchOverworldTilesets(rom)
     #    patches.overworld.createDungeonOnlyOverworld(rom)
-    # elif ladxr_settings["overworld"] == 'nodungeons':
+    # elif ladxr_settings.overworld == 'nodungeons':
     #    patches.dungeon.patchNoDungeons(rom)
-    #elif world.ladxr_settings["overworld"] == 'random':
+    #elif ladxr_settings.overworld == 'random':
     #    patches.overworld.patchOverworldTilesets(rom)
     #    mapgen.store_map(rom, world.ladxr_logic.world.map)
     #if settings.dungeon_items == 'keysy':
@@ -196,102 +233,94 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     # patches.reduceRNG.slowdownThreeOfAKind(rom)
     patches.reduceRNG.fixHorseHeads(rom)
     patches.bomb.onlyDropBombsWhenHaveBombs(rom)
-    if options["music_change_condition"] == Options.MusicChangeCondition.option_always:
+    if ladxr_settings.musicchange == 'always':
         patches.aesthetics.noSwordMusic(rom)
     patches.aesthetics.reduceMessageLengths(rom, random)
     patches.aesthetics.allowColorDungeonSpritesEverywhere(rom)
-    if options["music"] == Options.Music.option_shuffled:
+    if ladxr_settings.music == 'shuffled':
         patches.music.randomizeMusic(rom, random)
-    elif options["music"] == Options.Music.option_off:
+    elif ladxr_settings.music == 'off':
         patches.music.noMusic(rom)
-    if options["no_flash"]:
+    if ladxr_settings.noflash:
         patches.aesthetics.removeFlashingLights(rom)
-    if options["hard_mode"] == Options.HardMode.option_oracle:
+    if ladxr_settings.hardmode == 'oracle':
         patches.hardMode.oracleMode(rom)
-    elif options["hard_mode"] == Options.HardMode.option_hero:
+    elif ladxr_settings.hardmode == 'hero':
         patches.hardMode.heroMode(rom)
-    elif options["hard_mode"] == Options.HardMode.option_ohko:
+    elif ladxr_settings.hardmode == 'ohko':
         patches.hardMode.oneHitKO(rom)
-    #if ladxr_settings["superweapons"]:
+    #if ladxr_settings.superweapons:
     #    patches.weapons.patchSuperWeapons(rom)
-    if options["text_mode"] == Options.TextMode.option_fast:
+    if ladxr_settings.textmode == 'fast':
         patches.aesthetics.fastText(rom)
-    #if ladxr_settings["textmode"] == 'none':
+    #if ladxr_settings.textmode == 'none':
     #    patches.aesthetics.fastText(rom)
     #    patches.aesthetics.noText(rom)
-    if not options["nag_messages"]:
+    if not ladxr_settings.nagmessages:
         patches.aesthetics.removeNagMessages(rom)
-    if options["low_hp_beep"] == Options.LowHpBeep.option_slow:
+    if ladxr_settings.lowhpbeep == 'slow':
         patches.aesthetics.slowLowHPBeep(rom)
-    if options["low_hp_beep"] == Options.LowHpBeep.option_none:
+    if ladxr_settings.lowhpbeep == 'none':
         patches.aesthetics.removeLowHPBeep(rom)
-    if 0 <= options["link_palette"]:
-        patches.aesthetics.forceLinksPalette(rom, options["link_palette"])
+    if 0 <= int(ladxr_settings.linkspalette):
+        patches.aesthetics.forceLinksPalette(rom, int(ladxr_settings.linkspalette))
     if args.romdebugmode:
         # The default rom has this build in, just need to set a flag and we get this save.
         rom.patch(0, 0x0003, "00", "01")
 
     # Patch the sword check on the shopkeeper turning around.
-    if options["stealing"] == Options.Stealing.option_disabled:
+    if ladxr_settings.steal == 'disabled':
         rom.patch(4, 0x36F9, "FA4EDB", "3E0000")
         rom.texts[0x2E] = utils.formatText("Hey!  Welcome!  Did you know that I have eyes on the back of my head?")
         rom.texts[0x2F] = utils.formatText("Nothing escapes my gaze! Your thieving ways shall never prosper!")
 
-    #if ladxr_settings["hpmode"] == 'inverted':
+    #if ladxr_settings.hpmode == 'inverted':
     #    patches.health.setStartHealth(rom, 9)
-    #elif ladxr_settings["hpmode"] == '1':
+    #elif ladxr_settings.hpmode == '1':
     #    patches.health.setStartHealth(rom, 1)
 
     patches.inventory.songSelectAfterOcarinaSelect(rom)
-    if options["quickswap"] == Options.Quickswap.option_a:
+    if ladxr_settings.quickswap == 'a':
         patches.core.quickswap(rom, 1)
-    elif options["quickswap"] == Options.Quickswap.option_b:
+    elif ladxr_settings.quickswap == 'b':
         patches.core.quickswap(rom, 0)
 
-    patches.core.addBootsControls(rom, options["boots_controls"])
+    patches.core.addBootsControls(rom, ladxr_settings.bootscontrols)
 
     random.seed(patch_data["seed"] + patch_data["player"])
     hints.addHints(rom, random, patch_data["hint_texts"])
 
-    if patch_data["world_setup"]["goal"] == "raft":
+    if world_setup.goal == "raft":
         patches.goal.setRaftGoal(rom)
-    elif patch_data["world_setup"]["goal"] in ("bingo", "bingo-full"):
-        patches.bingo.setBingoGoal(rom, patch_data["world_setup"]["bingo_goals"], patch_data["world_setup"]["goal"])
-    elif patch_data["world_setup"]["goal"] == "seashells":
+    elif world_setup.goal in ("bingo", "bingo-full"):
+        patches.bingo.setBingoGoal(rom, world_setup.bingo_goals, world_setup.goal)
+    elif world_setup.goal == "seashells":
         patches.goal.setSeashellGoal(rom, 20)
     else:
-        patches.goal.setRequiredInstrumentCount(rom, patch_data["world_setup"]["goal"])
+        patches.goal.setRequiredInstrumentCount(rom, world_setup.goal)
 
     # Patch the generated logic into the rom
-    patches.chest.setMultiChest(rom, patch_data["world_setup"]["multichest"])
-    #if ladxr_settings["overworld"] not in {"dungeondive", "random"}:
-    patches.entrances.changeEntrances(rom, patch_data["world_setup"]["entrance_mapping"])
-    for spot in item_list:
-        if spot.item and spot.item.startswith("*"):
-            spot.item = spot.item[1:]
-        mw = None
-        if spot.item_owner != spot.location_owner:
-            mw = spot.item_owner
-            if mw > 101:
-                # There are only 101 player name slots (99 + "The Server" + "another world"), so don't use more than that
-                mw = 101
-        spot.patch(rom, spot.item, multiworld=mw)
-    patches.enemies.changeBosses(rom, patch_data["world_setup"]["boss_mapping"])
-    patches.enemies.changeMiniBosses(rom, patch_data["world_setup"]["miniboss_mapping"])
+    patches.chest.setMultiChest(rom, world_setup.multichest)
+    #if ladxr_settings.overworld not in {"dungeondive", "random"}:
+    patches.entrances.changeEntrances(rom, world_setup.entrance_mapping)
+    for ladxr_item in item_list:
+        ladxr_item.patch(rom, ladxr_item.item, multiworld=ladxr_item.mw)
+    patches.enemies.changeBosses(rom, world_setup.boss_mapping)
+    patches.enemies.changeMiniBosses(rom, world_setup.miniboss_mapping)
 
     if not args.romdebugmode:
         patches.core.addFrameCounter(rom, len(item_list))
 
     patches.core.warpHome(rom)  # Needs to be done after setting the start location.
     patches.titleScreen.setRomInfo(rom, patch_data)
-    if options["ap_title_screen"]:
+    if ladxr_settings.aptitlescreen:
         patches.titleScreen.setTitleGraphics(rom)
     patches.endscreen.updateEndScreen(rom)
     patches.aesthetics.updateSpriteData(rom)
     if args.doubletrouble:
         patches.enemies.doubleTrouble(rom)
 
-    if options["text_shuffle"]:
+    if ladxr_settings.textshuffle:
         excluded_ids = [
             # Overworld owl statues
             0x1B6, 0x1B7, 0x1B8, 0x1B9, 0x1BA, 0x1BB, 0x1BC, 0x1BD, 0x1BE, 0x22D,
@@ -350,14 +379,14 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
                 rom.texts[shuffled[bucket_idx][0]] = data
 
 
-    if options["trendy_game"] != Options.TrendyGame.option_normal:
+    if ladxr_settings.trendygame != 'normal':
 
         # TODO: if 0 or 4, 5, remove inaccurate conveyor tiles
 
 
         room_editor = RoomEditor(rom, 0x2A0)
 
-        if options["trendy_game"] == Options.TrendyGame.option_easy:
+        if ladxr_settings.trendygame == 'easy':
             # Set physics flag on all objects
             for i in range(0, 6):
                 rom.banks[0x4][0x6F1E + i -0x4000] = 0x4
@@ -368,7 +397,7 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
             # Add new conveyor to "push" yoshi (it's only a visual)
             room_editor.objects.append(Object(5, 3, 0xD0))
 
-            if options["trendy_game"] >= Options.TrendyGame.option_harder:
+            if ladxr_settings.trendygame in ('harder', 'hardest', 'impossible'):
                 """
                 Data_004_76A0::
                     db   $FC, $00, $04, $00, $00
@@ -377,18 +406,18 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
                     db   $00, $04, $00, $FC, $00
                 """
                 speeds = {
-                    Options.TrendyGame.option_harder: (3, 8),
-                    Options.TrendyGame.option_hardest: (3, 8),
-                    Options.TrendyGame.option_impossible: (3, 16),
+                    'harder': (3, 8),
+                    'hardest': (3, 8),
+                    'impossible': (3, 16),
                 }
                 def speed():
                     random.seed(patch_data["seed"] + patch_data["player"])
-                    return random.randint(*speeds[options["trendy_game"]])
+                    return random.randint(*speeds[ladxr_settings.trendygame])
                 rom.banks[0x4][0x76A0-0x4000] = 0xFF - speed()
                 rom.banks[0x4][0x76A2-0x4000] = speed()
                 rom.banks[0x4][0x76A6-0x4000] = speed()
                 rom.banks[0x4][0x76A8-0x4000] = 0xFF - speed()
-                if options["trendy_game"] >= Options.TrendyGame.option_hardest:
+                if ladxr_settings.trendygame in ('hardest', 'impossible'):
                     rom.banks[0x4][0x76A1-0x4000] = 0xFF - speed()
                     rom.banks[0x4][0x76A3-0x4000] = speed()
                     rom.banks[0x4][0x76A5-0x4000] = speed()
@@ -412,11 +441,11 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
             for channel in range(3):
                 color[channel] = color[channel] * 31 // 0xbc
 
-    if options["warps"] != Options.Warps.option_vanilla:
-        patches.core.addWarpImprovements(rom, options["warps"] == Options.Warps.option_improved_additional)
+    if ladxr_settings.warps != 'vanilla':
+        patches.core.addWarpImprovements(rom, ladxr_settings.warps == 'improvedadditional')
 
-    palette = options["palette"]
-    if palette != Options.Palette.option_normal:
+    palette = ladxr_settings.palette
+    if palette != 'normal':
         ranges = {
             # Object palettes
             # Overworld palettes
@@ -446,22 +475,22 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
                 r,g,b = bin_to_rgb(packed)
 
                 # 1 bit
-                if palette == Options.Palette.option_1bit:
+                if palette == '1bit':
                     r &= 0b10000
                     g &= 0b10000
                     b &= 0b10000
                 # 2 bit
-                elif palette == Options.Palette.option_1bit:
+                elif palette == '1bit':
                     r &= 0b11000
                     g &= 0b11000
                     b &= 0b11000
                 # Invert
-                elif palette == Options.Palette.option_inverted:
+                elif palette == 'inverted':
                     r = 31 - r
                     g = 31 - g
                     b = 31 - b
                 # Pink
-                elif palette == Options.Palette.option_pink:
+                elif palette == 'pink':
                     r = r // 2
                     r += 16
                     r = int(r)
@@ -470,7 +499,7 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
                     b += 16
                     b = int(b)
                     b = clamp(b, 0, 0x1F)
-                elif palette == Options.Palette.option_greyscale:
+                elif palette == 'greyscale':
                     # gray=int(0.299*r+0.587*g+0.114*b)
                     gray = (r + g + b) // 3
                     r = g = b = gray
diff --git a/worlds/ladx/LADXR/logic/dungeon1.py b/worlds/ladx/LADXR/logic/dungeon1.py
index 645c50d1d5..8bbcffe525 100644
--- a/worlds/ladx/LADXR/logic/dungeon1.py
+++ b/worlds/ladx/LADXR/logic/dungeon1.py
@@ -20,7 +20,7 @@ class Dungeon1:
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=1).add(OwlStatue(0x10A)).connect(dungeon1_right_side, STONE_BEAK1)
         dungeon1_3_of_a_kind = Location(dungeon=1).add(DungeonChest(0x10A)).connect(dungeon1_right_side, OR(r.attack_hookshot_no_bomb, SHIELD)) # three of a kind, shield stops the suit from changing
-        dungeon1_miniboss = Location(dungeon=1).connect(dungeon1_right_side, AND(r.miniboss_requirements[world_setup.miniboss_mapping[0]], FEATHER))
+        dungeon1_miniboss = Location(dungeon=1).connect(dungeon1_right_side, AND(r.miniboss_requirements[world_setup.miniboss_mapping['0']], FEATHER))
         dungeon1_boss = Location(dungeon=1).connect(dungeon1_miniboss, NIGHTMARE_KEY1)
         boss = Location(dungeon=1).add(HeartContainer(0x106), Instrument(0x102)).connect(dungeon1_boss, r.boss_requirements[world_setup.boss_mapping[0]])
 
@@ -30,7 +30,7 @@ class Dungeon1:
         
         if options.logic == 'glitched' or options.logic == 'hell':
             boss_key.connect(entrance, r.super_jump_feather)  # super jump
-            dungeon1_miniboss.connect(dungeon1_right_side, r.miniboss_requirements[world_setup.miniboss_mapping[0]]) # damage boost or buffer pause over the pit to cross or mushroom
+            dungeon1_miniboss.connect(dungeon1_right_side, r.miniboss_requirements[world_setup.miniboss_mapping['0']]) # damage boost or buffer pause over the pit to cross or mushroom
         
         if options.logic == 'hell':
             feather_chest.connect(dungeon1_upper_left, SWORD)  # keep slashing the spiked beetles until they keep moving 1 pixel close towards you and the pit, to get them to fall
diff --git a/worlds/ladx/LADXR/logic/dungeon2.py b/worlds/ladx/LADXR/logic/dungeon2.py
index 6ee6cc4a80..240bafdea0 100644
--- a/worlds/ladx/LADXR/logic/dungeon2.py
+++ b/worlds/ladx/LADXR/logic/dungeon2.py
@@ -23,7 +23,7 @@ class Dungeon2:
         dungeon2_r5 = Location(dungeon=2).connect(dungeon2_r4, AND(KEY2, FOUND(KEY2, 3)))  # push two blocks together room with owl statue
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=2).add(OwlStatue(0x12F)).connect(dungeon2_r5, STONE_BEAK2)  # owl statue is before miniboss
-        miniboss = Location(dungeon=2).add(DungeonChest(0x126)).add(DungeonChest(0x121)).connect(dungeon2_r5, AND(FEATHER, r.miniboss_requirements[world_setup.miniboss_mapping[1]]))  # post hinox
+        miniboss = Location(dungeon=2).add(DungeonChest(0x126)).add(DungeonChest(0x121)).connect(dungeon2_r5, AND(FEATHER, r.miniboss_requirements[world_setup.miniboss_mapping['1']]))  # post hinox
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=2).add(OwlStatue(0x129)).connect(miniboss, STONE_BEAK2)  # owl statue after the miniboss
 
@@ -45,7 +45,7 @@ class Dungeon2:
             dungeon2_map_chest.connect(dungeon2_l2, AND(r.attack_hookshot_powder, r.boots_bonk_pit)) # use boots to jump over the pits
             dungeon2_r4.connect(dungeon2_r3, OR(r.boots_bonk_pit, r.hookshot_spam_pit)) # can use both pegasus boots bonks or hookshot spam to cross the pit room
             dungeon2_r4.connect(shyguy_key_drop, r.rear_attack_range, one_way=True) # adjust for alternate requirements for dungeon2_r4
-            miniboss.connect(dungeon2_r5, AND(r.boots_dash_2d, r.miniboss_requirements[world_setup.miniboss_mapping[1]])) # use boots to dash over the spikes in the 2d section
+            miniboss.connect(dungeon2_r5, AND(r.boots_dash_2d, r.miniboss_requirements[world_setup.miniboss_mapping['1']])) # use boots to dash over the spikes in the 2d section
             dungeon2_pre_stairs_boss.connect(dungeon2_r6, AND(HOOKSHOT, OR(BOW, BOMB, MAGIC_ROD, AND(OCARINA, SONG1)), FOUND(KEY2, 5))) # hookshot clip through the pot using both pol's voice
             dungeon2_post_stairs_boss.connect(dungeon2_pre_stairs_boss, OR(BOMB, r.boots_jump)) # use a bomb to lower the last platform, or boots + feather to cross over top (only relevant in hell logic)
             dungeon2_pre_boss.connect(dungeon2_post_stairs_boss, AND(r.boots_bonk_pit, r.hookshot_spam_pit)) # boots bonk off bottom wall + hookshot spam across the two 1 tile pits vertically
diff --git a/worlds/ladx/LADXR/logic/dungeon3.py b/worlds/ladx/LADXR/logic/dungeon3.py
index 33782be16c..f0cfa49ea9 100644
--- a/worlds/ladx/LADXR/logic/dungeon3.py
+++ b/worlds/ladx/LADXR/logic/dungeon3.py
@@ -33,7 +33,7 @@ class Dungeon3:
         Location(dungeon=3).add(DroppedKey(0x14D)).connect(area_right, r.attack_hookshot_powder)  # key after the stairs.
 
         dungeon3_nightmare_key_chest = Location(dungeon=3).add(DungeonChest(0x147)).connect(area_right, AND(BOMB, FEATHER, PEGASUS_BOOTS))  # nightmare key chest
-        dungeon3_post_dodongo_chest = Location(dungeon=3).add(DungeonChest(0x146)).connect(area_right, AND(r.attack_hookshot_powder, r.miniboss_requirements[world_setup.miniboss_mapping[2]]))  # boots after the miniboss
+        dungeon3_post_dodongo_chest = Location(dungeon=3).add(DungeonChest(0x146)).connect(area_right, AND(r.attack_hookshot_powder, r.miniboss_requirements[world_setup.miniboss_mapping['2']]))  # boots after the miniboss
         compass_chest = Location(dungeon=3).add(DungeonChest(0x142)).connect(area_right, OR(SWORD, BOMB, AND(SHIELD, r.attack_hookshot_powder))) # bomb only activates with sword, bomb or shield
         dungeon3_3_bombite_room = Location(dungeon=3).add(DroppedKey(0x141)).connect(compass_chest, BOMB) # 3 bombite room
         Location(dungeon=3).add(DroppedKey(0x148)).connect(area_right, r.attack_no_boomerang) # 2 zol 2 owl drop key
diff --git a/worlds/ladx/LADXR/logic/dungeon4.py b/worlds/ladx/LADXR/logic/dungeon4.py
index a7e06557fa..9a360fca37 100644
--- a/worlds/ladx/LADXR/logic/dungeon4.py
+++ b/worlds/ladx/LADXR/logic/dungeon4.py
@@ -29,7 +29,7 @@ class Dungeon4:
         left_water_area = Location(dungeon=4).connect(before_miniboss, OR(FEATHER, FLIPPERS)) # area left with zol chest and 5 symbol puzzle (water area)
         left_water_area.add(DungeonChest(0x16D))  # gel chest
         left_water_area.add(DungeonChest(0x168))  # key chest near the puzzle
-        miniboss = Location(dungeon=4).connect(before_miniboss, AND(KEY4, FOUND(KEY4, 5), r.miniboss_requirements[world_setup.miniboss_mapping[3]])) 
+        miniboss = Location(dungeon=4).connect(before_miniboss, AND(KEY4, FOUND(KEY4, 5), r.miniboss_requirements[world_setup.miniboss_mapping['3']])) 
         terrace_zols_chest = Location(dungeon=4).connect(before_miniboss, FLIPPERS) # flippers to move around miniboss through 5 tile room
         miniboss = Location(dungeon=4).connect(terrace_zols_chest, POWER_BRACELET, one_way=True) # reach flippers chest through the miniboss room
         terrace_zols_chest.add(DungeonChest(0x160))  # flippers chest
diff --git a/worlds/ladx/LADXR/logic/dungeon5.py b/worlds/ladx/LADXR/logic/dungeon5.py
index b61e48e255..17a40f1e73 100644
--- a/worlds/ladx/LADXR/logic/dungeon5.py
+++ b/worlds/ladx/LADXR/logic/dungeon5.py
@@ -15,7 +15,7 @@ class Dungeon5:
             Location(dungeon=5).add(OwlStatue(0x19A)).connect(area2, STONE_BEAK5)
         Location(dungeon=5).add(DungeonChest(0x19B)).connect(area2, r.attack_hookshot_powder)  # map chest
         blade_trap_chest = Location(dungeon=5).add(DungeonChest(0x197)).connect(area2, HOOKSHOT)  # key chest on the left
-        post_gohma = Location(dungeon=5).connect(area2, AND(HOOKSHOT, r.miniboss_requirements[world_setup.miniboss_mapping[4]], KEY5, FOUND(KEY5,2))) # staircase after gohma
+        post_gohma = Location(dungeon=5).connect(area2, AND(HOOKSHOT, r.miniboss_requirements[world_setup.miniboss_mapping['4']], KEY5, FOUND(KEY5,2))) # staircase after gohma
         staircase_before_boss = Location(dungeon=5).connect(post_gohma, AND(HOOKSHOT, FEATHER)) # bottom right section pits room before boss door. Path via gohma
         after_keyblock_boss = Location(dungeon=5).connect(staircase_before_boss, AND(KEY5, FOUND(KEY5, 3))) # top right section pits room before boss door
         after_stalfos = Location(dungeon=5).add(DungeonChest(0x196)).connect(area2, AND(SWORD, BOMB)) # Need to defeat master stalfos once for this empty chest; l2 sword beams kill but obscure
diff --git a/worlds/ladx/LADXR/logic/dungeon6.py b/worlds/ladx/LADXR/logic/dungeon6.py
index cde40a6b2d..aff3e72b1c 100644
--- a/worlds/ladx/LADXR/logic/dungeon6.py
+++ b/worlds/ladx/LADXR/logic/dungeon6.py
@@ -24,7 +24,7 @@ class Dungeon6:
 
         # right side
         to_miniboss = Location(dungeon=6).connect(entrance, KEY6)
-        miniboss = Location(dungeon=6).connect(to_miniboss, AND(BOMB, r.miniboss_requirements[world_setup.miniboss_mapping[5]]))
+        miniboss = Location(dungeon=6).connect(to_miniboss, AND(BOMB, r.miniboss_requirements[world_setup.miniboss_mapping['5']]))
         lower_right_side = Location(dungeon=6).add(DungeonChest(0x1BE)).connect(entrance, AND(r.attack_wizrobe, COUNT(POWER_BRACELET, 2))) # waterway key
         medicine_chest = Location(dungeon=6).add(DungeonChest(0x1D1)).connect(lower_right_side, FEATHER) # ledge chest medicine
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
diff --git a/worlds/ladx/LADXR/logic/dungeon7.py b/worlds/ladx/LADXR/logic/dungeon7.py
index 6188138f38..e2fdf986c2 100644
--- a/worlds/ladx/LADXR/logic/dungeon7.py
+++ b/worlds/ladx/LADXR/logic/dungeon7.py
@@ -22,7 +22,7 @@ class Dungeon7:
         # Most of the dungeon can be accessed at this point.
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             bottomleft_owl = Location(dungeon=7).add(OwlStatue(0x21C)).connect(bottomleftF2_area, AND(BOMB, STONE_BEAK7))
-        nightmare_key = Location(dungeon=7).add(DungeonChest(0x224)).connect(bottomleftF2_area, r.miniboss_requirements[world_setup.miniboss_mapping[6]]) # nightmare key after the miniboss
+        nightmare_key = Location(dungeon=7).add(DungeonChest(0x224)).connect(bottomleftF2_area, r.miniboss_requirements[world_setup.miniboss_mapping['6']]) # nightmare key after the miniboss
         mirror_shield_chest = Location(dungeon=7).add(DungeonChest(0x21A)).connect(bottomleftF2_area, r.hit_switch)  # mirror shield chest, need to be able to hit a switch to reach or
         bottomleftF2_area.connect(mirror_shield_chest, AND(KEY7, FOUND(KEY7, 3)), one_way = True) # reach mirror shield chest from hinox area by opening keyblock
         toprightF1_chest = Location(dungeon=7).add(DungeonChest(0x204)).connect(bottomleftF2_area, r.hit_switch)  # chest on the F1 right ledge. Added attack_hookshot since switch needs to be hit to get back up
diff --git a/worlds/ladx/LADXR/logic/dungeon8.py b/worlds/ladx/LADXR/logic/dungeon8.py
index 5da2f8234e..0265da2c19 100644
--- a/worlds/ladx/LADXR/logic/dungeon8.py
+++ b/worlds/ladx/LADXR/logic/dungeon8.py
@@ -40,7 +40,7 @@ class Dungeon8:
         middle_center_2 = Location(dungeon=8).connect(middle_center_1, AND(KEY8, FOUND(KEY8, 4)))
         middle_center_3 = Location(dungeon=8).connect(middle_center_2, KEY8)
         miniboss_entrance = Location(dungeon=8).connect(middle_center_3, AND(HOOKSHOT, KEY8, FOUND(KEY8, 7))) # hookshot to get across to keyblock, 7 to fix keylock issues if keys are used on other keyblocks
-        miniboss = Location(dungeon=8).connect(miniboss_entrance, AND(FEATHER, r.miniboss_requirements[world_setup.miniboss_mapping[7]]))  # feather for 2d section, sword to kill
+        miniboss = Location(dungeon=8).connect(miniboss_entrance, AND(FEATHER, r.miniboss_requirements[world_setup.miniboss_mapping['7']]))  # feather for 2d section, sword to kill
         miniboss.add(DungeonChest(0x237)) # fire rod chest
 
         up_left = Location(dungeon=8).connect(upper_center, AND(r.attack_hookshot_powder, AND(KEY8, FOUND(KEY8, 4))))
@@ -94,7 +94,7 @@ class Dungeon8:
             entrance.connect(bottomright_pot_chest, r.shaq_jump, one_way=True) # use NW zamboni staircase backwards, and get a naked shaq jump off the bottom wall in the bottom right corner to pass by the pot
             gibdos_drop_key.connect(upper_center, AND(FEATHER, SHIELD)) # lock gibdos into pits and crack the tile they stand on, then use shield to bump them into the pit
             medicine_chest.connect(upper_center, AND(r.pit_buffer_boots, HOOKSHOT)) # boots bonk + lava buffer to the bottom wall, then bonk onto the middle section
-            miniboss.connect(miniboss_entrance, AND(r.boots_bonk_2d_hell, r.miniboss_requirements[world_setup.miniboss_mapping[7]])) # get through 2d section with boots bonks
+            miniboss.connect(miniboss_entrance, AND(r.boots_bonk_2d_hell, r.miniboss_requirements[world_setup.miniboss_mapping['7']])) # get through 2d section with boots bonks
             top_left_stairs.connect(map_chest, AND(r.jesus_buffer, r.boots_bonk_2d_hell, MAGIC_ROD)) # boots bonk + lava buffer from map chest to entrance_up, then boots bonk through 2d section
             nightmare_key.connect(top_left_stairs, AND(r.boots_bonk_pit, SWORD, FOUND(KEY8, 7))) # use a boots bonk to cross the 2d section + the lava in cueball room
             bottom_right.connect(entrance_up, AND(POWER_BRACELET, r.jesus_buffer), one_way=True) # take staircase to NW zamboni room, boots bonk onto the lava and water buffer all the way down to push the zamboni
diff --git a/worlds/ladx/LADXR/patches/core.py b/worlds/ladx/LADXR/patches/core.py
index 10e85f9dc5..4ae95b818a 100644
--- a/worlds/ladx/LADXR/patches/core.py
+++ b/worlds/ladx/LADXR/patches/core.py
@@ -541,8 +541,8 @@ OAMData:
         rom.banks[0x38][0x1400+n*0x20:0x1410+n*0x20] = utils.createTileData(gfx_high)
         rom.banks[0x38][0x1410+n*0x20:0x1420+n*0x20] = utils.createTileData(gfx_low)
 
-def addBootsControls(rom, boots_controls: int):
-    if boots_controls == BootsControls.option_vanilla:
+def addBootsControls(rom, bootscontrols):
+    if bootscontrols == 'vanilla':
         return
     consts = {
           "INVENTORY_PEGASUS_BOOTS": 0x8,
@@ -560,25 +560,25 @@ def addBootsControls(rom, boots_controls: int):
 
     BOOTS_START_ADDR = 0x11E8
     condition = {
-        BootsControls.option_bracelet: """
+        'bracelet': """
         ld   a, [hl]
         ; Check if we are using the bracelet
         cp   INVENTORY_POWER_BRACELET
         jr   z, .yesBoots
         """,
-        BootsControls.option_press_a: """
+        'pressa': """
         ; Check if we are using the A slot
         cp  J_A
         jr  z, .yesBoots
         ld   a, [hl]
         """,
-        BootsControls.option_press_b: """
+        'pressb': """
         ; Check if we are using the B slot
         cp  J_B
         jr  z, .yesBoots
         ld   a, [hl]
         """
-    }[boots_controls]
+    }[bootscontrols]
     
     # The new code fits exactly within Nintendo's poorly space optimzied code while having more features
     boots_code = assembler.ASM("""
diff --git a/worlds/ladx/LADXR/patches/tradeSequence.py b/worlds/ladx/LADXR/patches/tradeSequence.py
index ef6f635d45..0eb46ae23a 100644
--- a/worlds/ladx/LADXR/patches/tradeSequence.py
+++ b/worlds/ladx/LADXR/patches/tradeSequence.py
@@ -387,7 +387,7 @@ def patchVarious(rom, settings):
 
     # Boomerang trade guy
     # if settings.boomerang not in {'trade', 'gift'} or settings.overworld in {'normal', 'nodungeons'}:
-    if settings["tradequest"]:
+    if settings.tradequest:
         # Update magnifier checks
         rom.patch(0x19, 0x05EC, ASM("ld a, [wTradeSequenceItem]\ncp $0E\njp nz, $7E61"), ASM("ld a, [wTradeSequenceItem2]\nand $20\njp z, $7E61"))  # show the guy
         rom.patch(0x00, 0x3199, ASM("ld a, [wTradeSequenceItem]\ncp $0E\njr nz, $06"), ASM("ld a, [wTradeSequenceItem2]\nand $20\njr z, $06"))  # load the proper room layout
diff --git a/worlds/ladx/LADXR/settings.py b/worlds/ladx/LADXR/settings.py
index c0949f2678..23640f2164 100644
--- a/worlds/ladx/LADXR/settings.py
+++ b/worlds/ladx/LADXR/settings.py
@@ -68,7 +68,7 @@ class Setting:
 
 
 class Settings:
-    def __init__(self, ap_options):
+    def __init__(self, settings_dict):
         self.__all = [
             Setting('seed', 'Main', '<', 'Seed', placeholder='Leave empty for random seed', default="", multiworld=False,
                 description="""For multiple people to generate the same randomization result, enter the generated seed number here.
@@ -178,6 +178,14 @@ Note, some entrances can lead into water, use the warp-to-home from the save&qui
                 description='Replaces the hints from owl statues with additional randomized items'),
             Setting('superweapons', 'Special', 'q', 'Enable super weapons', default=False,
                 description='All items will be more powerful, faster, harder, bigger stronger. You name it.'),
+            Setting('trendygame', 'Special', 'a', 'Trendy Game', description="",
+                options=[('easy', 'e', 'Easy'), ('normal', 'n', 'Normal'), ('hard', 'h', 'Hard'), ('harder', 'r', 'Harder'), ('hardest', 't', 'Hardest'), ('impossible', 'i', 'Impossible')], default='normal'),
+            Setting('warps', 'Special', 'a', 'Warps', description="",
+                options=[('vanilla', 'v', 'Vanilla'), ('improved', 'i', 'Improved'), ('improvedadditional', 'a', 'Improved Additional')], default='vanilla'),
+            Setting('shufflenightmarekeys', 'Special', 'a', 'Shuffle Nightmare Keys', description="",
+                options=[('originaldungeon', '0', 'Original Dungeon'), ('owndungeons', '1', 'Own Dungeons'), ('ownworld', '2', 'Own World'), ('anyworld', '3', 'Any World'), ('differentworld', '4', 'Different World')], default="originaldungeon"),
+            Setting('shufflesmallkeys', 'Special', 'a', 'Shuffle Small Keys', description="",
+                options=[('originaldungeon', '0', 'Original Dungeon'), ('owndungeons', '1', 'Own Dungeons'), ('ownworld', '2', 'Own World'), ('anyworld', '3', 'Any World'), ('differentworld', '4', 'Different World')], default="originaldungeon"),
             Setting('quickswap', 'User options', 'Q', 'Quickswap', options=[('none', '', 'Disabled'), ('a', 'a', 'Swap A button'), ('b', 'b', 'Swap B button')], default='none',
                 description='Adds that the select button swaps with either A or B. The item is swapped with the top inventory slot. The map is not available when quickswap is enabled.',
                 aesthetic=True),
@@ -192,7 +200,7 @@ Note, some entrances can lead into water, use the warp-to-home from the save&qui
             Setting('nagmessages', 'User options', 'S', 'Show nag messages', default=False,
                 description='Enables the nag messages normally shown when touching stones and crystals',
                 aesthetic=True),
-            Setting('gfxmod', 'User options', 'c', 'Graphics', default='',
+            Setting('gfxmod', 'User options', 'c', 'Graphics', default=False,
                 description='Generally affects at least Link\'s sprite, but can alter any graphics in the game',
                 aesthetic=True),
             Setting('linkspalette', 'User options', 'C', "Link's color",
@@ -202,25 +210,31 @@ Note, some entrances can lead into water, use the warp-to-home from the save&qui
 [Normal] color of link depends on the tunic.
 [Green/Yellow/Red/Blue] forces link into one of these colors.
 [?? A/B/C/D] colors of link are usually inverted and color depends on the area you are in."""),
+            Setting('palette', 'User options', 'a', 'Palette', description="",
+                options=[('normal', 'n', 'Normal'), ('1bit', '1', '1 Bit'), ('2bit', '2', '2 Bit'), ('greyscale', 'g', 'Greyscale'), ('pink', 'p', 'Pink'), ('inverted', 'i', 'Inverted')], default='normal', aesthetic=True),
             Setting('music', 'User options', 'M', 'Music', options=[('', '', 'Default'), ('random', 'r', 'Random'), ('off', 'o', 'Disable')], default='',
                 description="""
 [Random] Randomizes overworld and dungeon music'
 [Disable] no music in the whole game""",
                 aesthetic=True),
+            Setting('musicchange', 'User options', 'a', 'Music Change Condition', description="",
+                options=[('always', 'a', 'Always'), ('sword', 's', 'Sword')], default='always', aesthetic=True),
+            Setting('bootscontrols', 'User options', 'a', 'Boots Controls', description="",
+                options=[('vanilla', 'v', 'Vanilla'), ('bracelet', 'p', 'Bracelet'), ('pressa', 'a', 'Press A'), ('pressb', 'b', 'Press B')], default='vanilla', aesthetic=True),
+            Setting('foreignitemicons', 'User options', 'a', 'Foreign Item Icons', description="",
+                options=[('guessbyname', 'g', 'Guess By Name'), ('indicateprogression', 'p', 'Indicate Progression')], default="guessbyname", aesthetic=True),
+            Setting('aptitlescreen', 'User options', 'a', 'AP Title Screen', description="", default=True),
+            Setting('textshuffle', 'User options', 'a', 'Text Shuffle', description="", default=False),
         ]
         self.__by_key = {s.key: s for s in self.__all}
 
-        # Make sure all short keys are unique
-        short_keys = set()
-        for s in self.__all:
-            assert s.short_key not in short_keys, s.label
-            short_keys.add(s.short_key)
-            self.ap_options = ap_options
+        # don't worry about unique short keys for AP
+        #short_keys = set()
+        #for s in self.__all:
+        #    assert s.short_key not in short_keys, s.label
+        #    short_keys.add(s.short_key)
 
-        for option in self.ap_options.values():
-            if not hasattr(option, 'to_ladxr_option'):
-                continue
-            name, value = option.to_ladxr_option(self.ap_options)
+        for name, value in settings_dict.items():
             if value == "true":
                 value = 1
             elif value == "false":
diff --git a/worlds/ladx/LADXR/worldSetup.py b/worlds/ladx/LADXR/worldSetup.py
index d7ca37f203..940753a7d1 100644
--- a/worlds/ladx/LADXR/worldSetup.py
+++ b/worlds/ladx/LADXR/worldSetup.py
@@ -28,7 +28,7 @@ class WorldSetup:
         self.boss_mapping = list(range(9))
         self.miniboss_mapping = {
             # Main minibosses
-            0: "ROLLING_BONES", 1: "HINOX", 2: "DODONGO", 3: "CUE_BALL", 4: "GHOMA", 5: "SMASHER", 6: "GRIM_CREEPER", 7: "BLAINO",
+            '0': "ROLLING_BONES", '1': "HINOX", '2': "DODONGO", '3': "CUE_BALL", '4': "GHOMA", '5': "SMASHER", '6': "GRIM_CREEPER", '7': "BLAINO",
             # Color dungeon needs to be special, as always.
             "c1": "AVALAUNCH", "c2": "GIANT_BUZZ_BLOB",
             # Overworld
diff --git a/worlds/ladx/LinksAwakeningClient.py b/worlds/ladx/LinksAwakeningClient.py
index 62b1a27487..b192b264e7 100644
--- a/worlds/ladx/LinksAwakeningClient.py
+++ b/worlds/ladx/LinksAwakeningClient.py
@@ -47,6 +47,10 @@ class BadRetroArchResponse(GameboyException):
     pass
 
 
+class VersionError(Exception):
+    pass
+
+
 class LAClientConstants:
     # Connector version
     VERSION = 0x01
@@ -136,7 +140,7 @@ class RAGameboy():
         return response
 
     async def async_recv(self, timeout=1.0):
-        response = await asyncio.wait_for(asyncio.get_event_loop().sock_recv(self.socket, 4096), timeout)
+        response = await asyncio.wait_for(asyncio.get_running_loop().sock_recv(self.socket, 4096), timeout)
         return response
 
     async def check_safe_gameplay(self, throw=True):
@@ -518,7 +522,7 @@ class LinksAwakeningContext(CommonContext):
                 ("Client", "Archipelago"),
                 ("Tracker", "Tracker"),
             ]
-            base_title = "Archipelago Links Awakening DX Client"
+            base_title = f"Links Awakening DX Client {LinksAwakeningWorld.world_version.as_simple_string()} | Archipelago"
 
             def build(self):
                 b = super().build()
@@ -614,11 +618,20 @@ class LinksAwakeningContext(CommonContext):
         if cmd == "Connected":
             self.game = self.slot_info[self.slot].game
             self.slot_data = args.get("slot_data", {})
+            generated_version = Utils.tuplize_version(self.slot_data.get("world_version", "2.0.0"))
+            client_version = LinksAwakeningWorld.world_version
+            if generated_version.major != client_version.major:
+                self.disconnected_intentionally = True
+                raise VersionError(
+                    f"The installed world ({client_version.as_simple_string()}) is incompatible with "
+                    f"the world this game was generated on ({generated_version.as_simple_string()})"
+                )
             # This is sent to magpie over local websocket to make its own connection
             self.slot_data.update({
                 "server_address": self.server_address,
                 "slot_name": self.player_names[self.slot],
                 "password": self.password,
+                "client_version": client_version.as_simple_string(),
             })
 
             # We can process linked items on already-checked checks now that we have slot_data
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 47328036dd..e368e9d74f 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -60,11 +60,12 @@ class TradeQuest(DefaultOffToggle, LADXROption):
     ladxr_name = "tradequest"
 
 
-class TextShuffle(DefaultOffToggle):
+class TextShuffle(DefaultOffToggle, LADXROption):
     """
     Shuffles all text in the game.
     """
     display_name = "Text Shuffle"
+    ladxr_name = "textshuffle"
 
 
 class Rooster(DefaultOnToggle, LADXROption):
@@ -112,11 +113,12 @@ class DungeonShuffle(DefaultOffToggle, LADXROption):
     ladxr_name = "dungeonshuffle"
 
 
-class APTitleScreen(DefaultOnToggle):
+class APTitleScreen(DefaultOnToggle, LADXROption):
     """
     Enables AP specific title screen and disables the intro cutscene.
     """
     display_name = "AP Title Screen"
+    ladxr_name = "aptitlescreen"
 
 
 class BossShuffle(Choice):
@@ -142,7 +144,7 @@ class DungeonItemShuffle(Choice):
     ladxr_item: str
 
 
-class ShuffleNightmareKeys(DungeonItemShuffle):
+class ShuffleNightmareKeys(DungeonItemShuffle, LADXROption):
     """
     **Original Dungeon:** The item will be within its original dungeon.
 
@@ -156,9 +158,10 @@ class ShuffleNightmareKeys(DungeonItemShuffle):
     """
     display_name = "Shuffle Nightmare Keys"
     ladxr_item = "NIGHTMARE_KEY"
+    ladxr_name = "shufflenightmarekeys"
 
 
-class ShuffleSmallKeys(DungeonItemShuffle):
+class ShuffleSmallKeys(DungeonItemShuffle, LADXROption):
     """
     **Original Dungeon:** The item will be within its original dungeon.
 
@@ -172,6 +175,7 @@ class ShuffleSmallKeys(DungeonItemShuffle):
     """
     display_name = "Shuffle Small Keys"
     ladxr_item = "KEY"
+    ladxr_name = "shufflesmallkeys"
 
 
 class ShuffleMaps(DungeonItemShuffle):
@@ -266,7 +270,7 @@ class Goal(Choice, LADXROption):
 
     def to_ladxr_option(self, all_options):
         if self.value == self.option_instruments:
-            return ("goal", all_options["instrument_count"])
+            return ("goal", int(all_options["instrument_count"]))
         else:
             return LADXROption.to_ladxr_option(self, all_options)
 
@@ -291,7 +295,7 @@ class NagMessages(DefaultOffToggle, LADXROption):
     ladxr_name = "nagmessages"
 
 
-class MusicChangeCondition(Choice):
+class MusicChangeCondition(Choice, LADXROption):
     """
     Controls how the music changes.
 
@@ -304,6 +308,7 @@ class MusicChangeCondition(Choice):
     option_sword = 0
     option_always = 1
     default = option_always
+    ladxr_name = "musicchange"
 
 
 class HardMode(Choice, LADXROption):
@@ -396,7 +401,7 @@ class NoFlash(DefaultOnToggle, LADXROption):
     ladxr_name = "noflash"
 
 
-class BootsControls(Choice):
+class BootsControls(Choice, LADXROption):
     """
     Adds an additional button to activate Pegasus Boots (does nothing if you
     haven't picked up your boots!)
@@ -418,6 +423,7 @@ class BootsControls(Choice):
     alias_a = 2
     option_press_b = 3
     alias_b = 3
+    ladxr_name = "bootscontrols"
 
 
 class LinkPalette(Choice, LADXROption):
@@ -444,7 +450,7 @@ class LinkPalette(Choice, LADXROption):
         return self.ladxr_name, str(self.value)
 
 
-class TrendyGame(Choice):
+class TrendyGame(Choice, LADXROption):
     """
     **Easy:** All of the items hold still for you.
 
@@ -468,16 +474,18 @@ class TrendyGame(Choice):
     option_hardest = 4
     option_impossible = 5
     default = option_normal
+    ladxr_name = "trendygame"
 
 
-class GfxMod(DefaultOffToggle):
+class GfxMod(DefaultOffToggle, LADXROption):
     """
     If enabled, the patcher will prompt the user for a modification file to change sprites in the game and optionally some text.
     """
     display_name = "GFX Modification"
+    ladxr_name = "gfxmod"
 
 
-class Palette(Choice):
+class Palette(Choice, LADXROption):
     """
     Sets the palette for the game.
 
@@ -504,6 +512,7 @@ class Palette(Choice):
     option_greyscale = 3
     option_pink = 4
     option_inverted = 5
+    ladxr_name = "palette"
 
 
 class Music(Choice, LADXROption):
@@ -530,7 +539,7 @@ class Music(Choice, LADXROption):
         return self.ladxr_name, s
 
 
-class Warps(Choice):
+class Warps(Choice, LADXROption):
     """
     **Improved:** Adds remake style warp screen to the game. Choose your warp
     destination on the map after jumping in a portal and press *B* to select.
@@ -544,6 +553,7 @@ class Warps(Choice):
     option_improved = 1
     option_improved_additional = 2
     default = option_vanilla
+    ladxr_name = 'warps'
 
 
 class InGameHints(DefaultOnToggle):
@@ -583,7 +593,7 @@ class StabilizeItemPool(DefaultOffToggle):
     rich_text_doc = True
 
 
-class ForeignItemIcons(Choice):
+class ForeignItemIcons(Choice, LADXROption):
     """
     Choose how to display foreign items.
 
@@ -597,6 +607,7 @@ class ForeignItemIcons(Choice):
     option_guess_by_name = 0
     option_indicate_progression = 1
     default = option_guess_by_name
+    ladxr_name = 'foreignitemicons'
 
 
 ladx_option_groups = [
diff --git a/worlds/ladx/Rom.py b/worlds/ladx/Rom.py
index c58403c7a2..faecdf38d1 100644
--- a/worlds/ladx/Rom.py
+++ b/worlds/ladx/Rom.py
@@ -1,4 +1,3 @@
-import settings
 import worlds.Files
 import hashlib
 import Utils
@@ -7,13 +6,11 @@ import json
 import pkgutil
 import bsdiff4
 import binascii
-import pickle
 from typing import TYPE_CHECKING
 from .Common import *
 from .LADXR import generator
 from .LADXR.main import get_parser
 from .LADXR.hints import generate_hint_texts
-from .LADXR.locations.keyLocation import KeyLocation
 LADX_HASH = "07c211479386825042efb4ad31bb525f"
 
 if TYPE_CHECKING:
@@ -36,7 +33,7 @@ class LADXPatchExtensions(worlds.Files.APPatchExtension):
     @staticmethod
     def patch_title_screen(caller: worlds.Files.APProcedurePatch, rom: bytes, data_file: str) -> bytes:
         patch_data = json.loads(caller.get_file(data_file).decode("utf-8"))
-        if patch_data["options"]["ap_title_screen"]:
+        if patch_data["ladxr_settings_dict"]["aptitlescreen"] == 'true':
             return bsdiff4.patch(rom, pkgutil.get_data(__name__, "LADXR/patches/title_screen.bdiff4"))
         return rom
 
@@ -57,8 +54,8 @@ class LADXProcedurePatch(worlds.Files.APProcedurePatch):
 
 
 def write_patch_data(world: "LinksAwakeningWorld", patch: LADXProcedurePatch):
-    item_list = pickle.dumps([item for item in world.ladxr_logic.iteminfo_list if not isinstance(item, KeyLocation)])
     data_dict = {
+        "generated_world_version": world.world_version.as_simple_string(),
         "out_base": world.multiworld.get_out_file_name_base(patch.player),
         "is_race": world.multiworld.is_race,
         "seed": world.multiworld.seed,
@@ -67,44 +64,16 @@ def write_patch_data(world: "LinksAwakeningWorld", patch: LADXProcedurePatch):
         "player": patch.player,
         "player_name": patch.player_name,
         "other_player_names": list(world.multiworld.player_name.values()),
-        "item_list": binascii.hexlify(item_list).decode(),
+        "rom_item_placements": world.rom_item_placements,
         "hint_texts": generate_hint_texts(world),
         "world_setup": {
             "goal": world.ladxr_logic.world_setup.goal,
-            "bingo_goals": world.ladxr_logic.world_setup.bingo_goals,
             "multichest": world.ladxr_logic.world_setup.multichest,
             "entrance_mapping": world.ladxr_logic.world_setup.entrance_mapping,
             "boss_mapping": world.ladxr_logic.world_setup.boss_mapping,
             "miniboss_mapping": world.ladxr_logic.world_setup.miniboss_mapping,
         },
-        "options": world.options.as_dict(
-            "tradequest",
-            "rooster",
-            "experimental_dungeon_shuffle",
-            "experimental_entrance_shuffle",
-            "goal",
-            "instrument_count",
-            "link_palette",
-            "warps",
-            "trendy_game",
-            "gfxmod",
-            "palette",
-            "text_shuffle",
-            "shuffle_nightmare_keys",
-            "shuffle_small_keys",
-            "music",
-            "music_change_condition",
-            "nag_messages",
-            "ap_title_screen",
-            "boots_controls",
-            "stealing",
-            "quickswap",
-            "hard_mode",
-            "low_hp_beep",
-            "text_mode",
-            "no_flash",
-            "overworld",
-        ),
+        "ladxr_settings_dict": world.ladxr_settings_dict,
     }
     patch.write_file("data.json", json.dumps(data_dict).encode('utf-8'))
 
@@ -125,9 +94,9 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
 
 
 def get_base_rom_path(file_name: str = "") -> str:
-    options = settings.get_settings()
+    from . import LinksAwakeningWorld
     if not file_name:
-        file_name = options["ladx_options"]["rom_file"]
+        file_name = LinksAwakeningWorld.settings.rom_file
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name
diff --git a/worlds/ladx/Tracker.py b/worlds/ladx/Tracker.py
index 93b746328c..adc3f1a197 100644
--- a/worlds/ladx/Tracker.py
+++ b/worlds/ladx/Tracker.py
@@ -195,21 +195,24 @@ class MagpieBridge:
     async def handler(self, websocket):
         self.ws = websocket
         while True:
-            message = json.loads(await websocket.recv())
-            if message["type"] == "handshake":
-                logger.info(
-                    f"Connected, supported features: {message['features']}")
-                self.features = message["features"]
+            try:
+                message = json.loads(await websocket.recv())
+                if message["type"] == "handshake":
+                    logger.info(
+                        f"Connected, supported features: {message['features']}")
+                    self.features = message["features"]
 
-                await self.send_handshAck()
+                    await self.send_handshAck()
 
-            if message["type"] == "sendFull":
-                if "items" in self.features:
-                    await self.send_all_inventory()
-                if "checks" in self.features:
-                    await self.send_all_checks()
-                if self.use_entrance_tracker():
-                    await self.send_gps(diff=False)
+                if message["type"] == "sendFull":
+                    if "items" in self.features:
+                        await self.send_all_inventory()
+                    if "checks" in self.features:
+                        await self.send_all_checks()
+                    if self.use_entrance_tracker():
+                        await self.send_gps(diff=False)
+            except websockets.exceptions.ConnectionClosedOK:
+                pass
 
     # Translate renamed IDs back to LADXR IDs
     @staticmethod
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index e5b3d6cc19..e36ff77a24 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -4,8 +4,10 @@ import os
 import typing
 import logging
 import re
+import struct
 
 import settings
+import Utils
 from BaseClasses import CollectionState, Entrance, Item, ItemClassification, Location, Tutorial
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
@@ -50,6 +52,17 @@ class LinksAwakeningSettings(settings.Group):
         description = "LADX ROM File"
         md5s = [LADXProcedurePatch.hash]
 
+        @classmethod
+        def validate(cls, path: str) -> None:
+            try:
+                super().validate(path)
+            except ValueError:
+                Utils.messagebox(
+                    "Error",
+                    "Provided rom does not match hash for English 1.0/revision-0 of Link's Awakening DX",
+                    True)
+                raise
+
     class RomStart(str):
         """
         Set this to false to never autostart a rom (such as after patching)
@@ -71,6 +84,24 @@ class LinksAwakeningSettings(settings.Group):
         Only .bin or .bdiff files
         The same directory will be checked for a matching text modification file
         """
+        def browse(self, filetypes=None, **kwargs):
+            filetypes = [("Binary / Patch files", [".bin", ".bdiff"])]
+            return super().browse(filetypes=filetypes, **kwargs)
+
+        @classmethod
+        def validate(cls, path: str) -> None:
+            with open(path, "rb", buffering=0) as f:
+                header, size = struct.unpack("<II", f.read()[:8])
+                if path.endswith('.bin') and header == 0xDEADBEEF and size < 1024:
+                    # detect extended spritesheets from upstream ladxr
+                    Utils.messagebox(
+                        "Error",
+                        "Extended sprite sheets are not supported. Try again with a different gfxmod file, "
+                        "or provide no file to continue without modifying graphics.",
+                        True)
+                    raise ValueError("Provided gfxmod file is an extended sheet, which is not supported")
+
+
 
     rom_file: RomFile = RomFile(RomFile.copy_to)
     rom_start: typing.Union[RomStart, bool] = True
@@ -149,7 +180,17 @@ class LinksAwakeningWorld(World):
     }
 
     def convert_ap_options_to_ladxr_logic(self):
-        self.ladxr_settings = LADXRSettings(dataclasses.asdict(self.options))
+        # store a dict of ladxr settings as a middle step so that we can also create a
+        # ladxr settings object on the other side of the patch
+        options_dict = dataclasses.asdict(self.options)
+        self.ladxr_settings_dict = {}
+        for option in options_dict.values():
+            if not hasattr(option, 'to_ladxr_option'):
+                continue
+            name, value = option.to_ladxr_option(options_dict)
+            if name:
+                self.ladxr_settings_dict[name] = value
+        self.ladxr_settings = LADXRSettings(self.ladxr_settings_dict)
 
         self.ladxr_settings.validate()
         world_setup = LADXRWorldSetup()
@@ -472,36 +513,36 @@ class LinksAwakeningWorld(World):
         return "TRADING_ITEM_LETTER"
 
     def generate_output(self, output_directory: str):
-        # copy items back to locations
+        self.rom_item_placements = []
         for r in self.multiworld.get_regions(self.player):
             for loc in r.locations:
                 if isinstance(loc, LinksAwakeningLocation):
                     assert(loc.item)
-                        
+                    spot = {}
                     # If we're a links awakening item, just use the item
                     if isinstance(loc.item, LinksAwakeningItem):
-                        loc.ladxr_item.item = loc.item.item_data.ladxr_id
+                        spot["item"] = loc.item.item_data.ladxr_id
 
                     # If the item name contains "sword", use a sword icon, etc
                     # Otherwise, use a cute letter as the icon
                     elif self.options.foreign_item_icons == 'guess_by_name':
-                        loc.ladxr_item.item = self.guess_icon_for_other_world(loc.item)
-                        loc.ladxr_item.setCustomItemName(loc.item.name)
+                        spot["item"] = self.guess_icon_for_other_world(loc.item)
 
                     else:
                         if loc.item.advancement:
-                            loc.ladxr_item.item = 'PIECE_OF_POWER'
+                            spot["item"] = 'PIECE_OF_POWER'
                         else:
-                            loc.ladxr_item.item = 'GUARDIAN_ACORN'
-                        loc.ladxr_item.custom_item_name = loc.item.name
+                            spot["item"] = 'GUARDIAN_ACORN'
+
+                    spot["custom_item_name"] = loc.item.name
 
                     if loc.item:
-                        loc.ladxr_item.item_owner = loc.item.player
+                        spot["item_owner"] = loc.item.player
                     else:
-                        loc.ladxr_item.item_owner = self.player
+                        spot["item_owner"] = self.player
 
-                    # Kind of kludge, make it possible for the location to differentiate between local and remote items
-                    loc.ladxr_item.location_owner = self.player
+                    spot["name_id"] = loc.ladxr_item.nameId
+                    self.rom_item_placements.append(spot)
 
         
         patch = LADXProcedurePatch(player=self.player, player_name=self.player_name)
@@ -539,7 +580,9 @@ class LinksAwakeningWorld(World):
         return self.random.choices(self.filler_choices, self.filler_weights)[0]
 
     def fill_slot_data(self):
-        slot_data = {}
+        slot_data = {
+            "world_version": self.world_version.as_simple_string()
+        }
 
         if not self.multiworld.is_race:
             # all of these option are NOT used by the LADX- or Text-Client.
@@ -569,7 +612,7 @@ class LinksAwakeningWorld(World):
             ]
 
             # use the default behaviour to grab options
-            slot_data = self.options.as_dict(*slot_options)
+            slot_data.update(self.options.as_dict(*slot_options))
 
             # for options which should not get the internal int value but the display name use the extra handling
             slot_data.update({
diff --git a/worlds/ladx/archipelago.json b/worlds/ladx/archipelago.json
new file mode 100644
index 0000000000..9108ee8394
--- /dev/null
+++ b/worlds/ladx/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Links Awakening DX",
+    "authors": [ "zig", "threeandthree" ],
+    "minimum_ap_version": "0.6.4",
+    "world_version": "2.0.2"
+}
diff --git a/worlds/landstalker/archipelago.json b/worlds/landstalker/archipelago.json
new file mode 100644
index 0000000000..8b8d5ea527
--- /dev/null
+++ b/worlds/landstalker/archipelago.json
@@ -0,0 +1,6 @@
+{
+  "game": "Landstalker - The Treasures of King Nole",
+  "authors": ["Dinopony"],
+  "minimum_ap_version": "0.6.4",
+  "world_version": "1.8.7"
+}
\ No newline at end of file
diff --git a/worlds/lingo/archipelago.json b/worlds/lingo/archipelago.json
new file mode 100644
index 0000000000..d065ab5c0b
--- /dev/null
+++ b/worlds/lingo/archipelago.json
@@ -0,0 +1,6 @@
+{
+  "game": "Lingo",
+  "authors": ["hatkirby"],
+  "minimum_ap_version": "0.6.3",
+  "world_version": "5.0.0"
+}
diff --git a/worlds/lingo/data/LL1.yaml b/worlds/lingo/data/LL1.yaml
index 4c41f3236f..613eedc4b6 100644
--- a/worlds/lingo/data/LL1.yaml
+++ b/worlds/lingo/data/LL1.yaml
@@ -4470,6 +4470,10 @@
             panel: SEVEN (1)
           - room: Outside The Initiated
             panel: SEVEN (2)
+      First Eight:
+        event: True
+        panels:
+          - EIGHT
       Nines:
         id:
           - Count Up Room Area Doors/Door_nine_hider
@@ -4612,7 +4616,7 @@
         enter_only: True
         orientation: east
         required_door:
-          door: Eights
+          door: First Eight
     progression:
       Progressive Number Hunt:
         panel_doors:
diff --git a/worlds/lingo/data/generated.dat b/worlds/lingo/data/generated.dat
index f5eb3e0699..dff56b10d8 100644
Binary files a/worlds/lingo/data/generated.dat and b/worlds/lingo/data/generated.dat differ
diff --git a/worlds/marioland2/docs/setup_en.md b/worlds/marioland2/docs/setup_en.md
index 581d36e786..7900fb9120 100644
--- a/worlds/marioland2/docs/setup_en.md
+++ b/worlds/marioland2/docs/setup_en.md
@@ -44,7 +44,7 @@ You can generate a yaml or download a template by visiting the [Super Mario Land
 ### Generating and Patching a Game
 
 1. Create your options file (YAML).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have a `.apsml2` file extension.
 3. Open `ArchipelagoLauncher.exe`
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/marioland2/logic.py b/worlds/marioland2/logic.py
index 492ba80a12..54685f91a0 100644
--- a/worlds/marioland2/logic.py
+++ b/worlds/marioland2/logic.py
@@ -604,8 +604,8 @@ def macro_zone_4_coins(state, player, coins):
 
 
 def marios_castle_wario(state, player):
-    return ((has_pipe_right(state, player) and has_pipe_left(state, player))
-            or state.has("Mario's Castle Midway Bell", player))
+    return (has_pipe_right(state, player) and 
+           (has_pipe_left(state, player) or state.has("Mario's Castle Midway Bell", player)))
 
 
 def marios_castle_midway_bell(state, player):
diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index 88a0cec2ca..d1b672db7d 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -1,7 +1,8 @@
 import logging
 from typing import Any, ClassVar, TextIO
 
-from BaseClasses import CollectionState, Entrance, EntranceType, Item, ItemClassification, MultiWorld, Tutorial
+from BaseClasses import CollectionState, Entrance, EntranceType, Item, ItemClassification, MultiWorld, Tutorial, \
+    PlandoOptions
 from Options import Accessibility
 from Utils import output_path
 from settings import FilePath, Group
@@ -18,6 +19,7 @@ from .rules import MessengerHardRules, MessengerOOBRules, MessengerRules
 from .shop import FIGURINES, PROG_SHOP_ITEMS, SHOP_ITEMS, USEFUL_SHOP_ITEMS, shuffle_shop_prices
 from .subclasses import MessengerItem, MessengerRegion, MessengerShopLocation
 from .transitions import disconnect_entrances, shuffle_transitions
+from .universal_tracker import reverse_portal_exits_into_portal_plando, reverse_transitions_into_plando_connections
 
 components.append(
     Component(
@@ -151,6 +153,10 @@ class MessengerWorld(World):
     reachable_locs: bool = False
     filler: dict[str, int]
 
+    @staticmethod
+    def interpret_slot_data(slot_data: dict[str, Any]) -> dict[str, Any]:
+        return slot_data
+
     def generate_early(self) -> None:
         if self.options.goal == Goal.option_power_seal_hunt:
             self.total_seals = self.options.total_seals.value
@@ -188,6 +194,11 @@ class MessengerWorld(World):
         self.spoiler_portal_mapping = {}
         self.transitions = []
 
+        if hasattr(self.multiworld, "re_gen_passthrough"):
+            slot_data = self.multiworld.re_gen_passthrough.get(self.game)
+            if slot_data:
+                self.starting_portals = slot_data["starting_portals"]
+
     def create_regions(self) -> None:
         # MessengerRegion adds itself to the multiworld
         # create simple regions
@@ -279,6 +290,16 @@ class MessengerWorld(World):
     def connect_entrances(self) -> None:
         if self.options.shuffle_transitions:
             disconnect_entrances(self)
+            keep_entrance_logic = False
+
+        if hasattr(self.multiworld, "re_gen_passthrough"):
+            slot_data = self.multiworld.re_gen_passthrough.get(self.game)
+            if slot_data:
+                self.multiworld.plando_options |= PlandoOptions.connections
+                self.options.portal_plando.value = reverse_portal_exits_into_portal_plando(slot_data["portal_exits"])
+                self.options.plando_connections.value = reverse_transitions_into_plando_connections(slot_data["transitions"])
+                keep_entrance_logic = True
+
         add_closed_portal_reqs(self)
         # i need portal shuffle to happen after rules exist so i can validate it
         attempts = 20
@@ -295,7 +316,7 @@ class MessengerWorld(World):
                 raise RuntimeError("Unable to generate valid portal output.")
 
         if self.options.shuffle_transitions:
-            shuffle_transitions(self)
+            shuffle_transitions(self, keep_entrance_logic)
 
     def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
         if self.options.available_portals < 6:
@@ -463,7 +484,7 @@ class MessengerWorld(World):
             "loc_data": {loc.address: {loc.item.name: [loc.item.code, loc.item.flags]}
                          for loc in multiworld.get_filled_locations() if loc.address},
         }
-    
+
         output = orjson.dumps(data, option=orjson.OPT_NON_STR_KEYS)
         with open(out_path, "wb") as f:
             f.write(output)
diff --git a/worlds/messenger/archipelago.json b/worlds/messenger/archipelago.json
new file mode 100644
index 0000000000..86aefc42a8
--- /dev/null
+++ b/worlds/messenger/archipelago.json
@@ -0,0 +1,4 @@
+{
+  "game": "The Messenger",
+  "authors": ["alwaysintreble"]
+}
\ No newline at end of file
diff --git a/worlds/messenger/client_setup.py b/worlds/messenger/client_setup.py
index 3ef1df75cc..02fd299a6c 100644
--- a/worlds/messenger/client_setup.py
+++ b/worlds/messenger/client_setup.py
@@ -28,6 +28,8 @@ def create_yes_no_popup(title: str, text: str, callback: Callable[[str], None])
 
 def launch_game(*args) -> None:
     """Check the game installation, then launch it"""
+    prompt: ButtonsPrompt | None = None
+
     def courier_installed() -> bool:
         """Check if Courier is installed"""
         assembly_path = os.path.join(game_folder, "TheMessenger_Data", "Managed", "Assembly-CSharp.dll")
@@ -190,7 +192,7 @@ def launch_game(*args) -> None:
 
     def launch(answer: str | None = None) -> None:
         """Launch the game."""
-        nonlocal args
+        nonlocal args, prompt
 
         if prompt:
             prompt.dismiss()
@@ -256,3 +258,5 @@ def launch_game(*args) -> None:
         prompt = create_yes_no_popup("Launch Game",
                                      "Mod installed and up to date. Would you like to launch the game now?",
                                      launch)
+    else:
+        launch()
diff --git a/worlds/messenger/portals.py b/worlds/messenger/portals.py
index c04fc696e9..11fc610108 100644
--- a/worlds/messenger/portals.py
+++ b/worlds/messenger/portals.py
@@ -306,4 +306,4 @@ def add_closed_portal_reqs(world: "MessengerWorld") -> None:
     closed_portals = [entrance for entrance in PORTALS if f"{entrance} Portal" not in world.starting_portals]
     for portal in closed_portals:
         tower_exit = world.multiworld.get_entrance(f"ToTHQ {portal} Portal", world.player)
-        tower_exit.access_rule = lambda state: state.has(portal, world.player)
+        tower_exit.access_rule = lambda state, portal_item=portal: state.has(portal_item, world.player)
diff --git a/worlds/messenger/rules.py b/worlds/messenger/rules.py
index 2d5ee1b8a9..7f17232cfb 100644
--- a/worlds/messenger/rules.py
+++ b/worlds/messenger/rules.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
-from BaseClasses import CollectionState
-from worlds.generic.Rules import CollectionRule, add_rule, allow_self_locking_items
+from BaseClasses import CollectionState, CollectionRule
+from worlds.generic.Rules import add_rule, allow_self_locking_items
 from .constants import NOTES, PHOBEKINS
 from .options import MessengerAccessibility
 
diff --git a/worlds/messenger/subclasses.py b/worlds/messenger/subclasses.py
index 2e438fdbfd..8beed43027 100644
--- a/worlds/messenger/subclasses.py
+++ b/worlds/messenger/subclasses.py
@@ -1,8 +1,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from BaseClasses import CollectionState, Entrance, EntranceType, Item, ItemClassification, Location, Region
-from entrance_rando import ERPlacementState
+from BaseClasses import CollectionState, Item, ItemClassification, Location, Region
 from .regions import LOCATIONS, MEGA_SHARDS
 from .shop import FIGURINES, SHOP_ITEMS
 
diff --git a/worlds/messenger/transitions.py b/worlds/messenger/transitions.py
index c0ae64c548..39ad591bf2 100644
--- a/worlds/messenger/transitions.py
+++ b/worlds/messenger/transitions.py
@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from BaseClasses import Entrance, Region
+from BaseClasses import Region, CollectionRule
 from entrance_rando import EntranceType, randomize_entrances
 from .connections import RANDOMIZED_CONNECTIONS, TRANSITIONS
 from .options import ShuffleTransitions, TransitionPlando
@@ -26,7 +26,6 @@ def disconnect_entrances(world: "MessengerWorld") -> None:
         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")
@@ -36,8 +35,9 @@ def disconnect_entrances(world: "MessengerWorld") -> None:
             entrance = world.get_entrance(f"{parent} -> {child}")
         disconnect_entrance()
 
-def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando) -> None:
-    def remove_dangling_exit(region: Region) -> None:
+
+def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando, keep_logic: bool = False) -> None:
+    def remove_dangling_exit(region: Region) -> CollectionRule:
         # find the disconnected exit and remove references to it
         for _exit in region.exits:
             if not _exit.connected_region:
@@ -45,6 +45,7 @@ def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando
         else:
             raise ValueError(f"Unable to find randomized transition for {plando_connection}")
         region.exits.remove(_exit)
+        return _exit.access_rule
 
     def remove_dangling_entrance(region: Region) -> None:
         # find the disconnected entrance and remove references to it
@@ -65,30 +66,35 @@ def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando
             else:
                 dangling_exit = world.get_entrance("Artificer's Challenge")
             reg1.exits.remove(dangling_exit)
+            access_rule = dangling_exit.access_rule
         else:
             reg1 = world.get_region(plando_connection.entrance)
-            remove_dangling_exit(reg1)
-        
+            access_rule = remove_dangling_exit(reg1)
+
         reg2 = world.get_region(plando_connection.exit)
         remove_dangling_entrance(reg2)
         # connect the regions
-        reg1.connect(reg2)
+        new_exit1 = reg1.connect(reg2)
+        if keep_logic:
+            new_exit1.access_rule = access_rule
 
         # 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)
+            access_rule = remove_dangling_exit(reg2)
             remove_dangling_entrance(reg1)
-            reg2.connect(reg1)
+            new_exit2 = reg2.connect(reg1)
+            if keep_logic:
+                new_exit2.access_rule = access_rule
 
 
-def shuffle_transitions(world: "MessengerWorld") -> None:
+def shuffle_transitions(world: "MessengerWorld", keep_logic: bool = False) -> None:
     coupled = world.options.shuffle_transitions == ShuffleTransitions.option_coupled
 
     plando = world.options.plando_connections
     if plando:
-        connect_plando(world, plando)
+        connect_plando(world, plando, keep_logic)
 
     result = randomize_entrances(world, coupled, {0: [0]})
 
diff --git a/worlds/messenger/universal_tracker.py b/worlds/messenger/universal_tracker.py
new file mode 100644
index 0000000000..9d752031bf
--- /dev/null
+++ b/worlds/messenger/universal_tracker.py
@@ -0,0 +1,41 @@
+from Options import PlandoConnection
+from .connections import RANDOMIZED_CONNECTIONS
+from .portals import REGION_ORDER, SHOP_POINTS, CHECKPOINTS
+from .transitions import TRANSITIONS
+
+REVERSED_RANDOMIZED_CONNECTIONS = {v: k for k, v in RANDOMIZED_CONNECTIONS.items()}
+
+
+def find_spot(portal_key: int) -> str:
+    """finds the spot associated with the portal key"""
+    parent = REGION_ORDER[portal_key // 100]
+    if portal_key % 100 == 0:
+        return f"{parent} Portal"
+    if portal_key % 100 // 10 == 1:
+        return SHOP_POINTS[parent][portal_key % 10]
+    return CHECKPOINTS[parent][portal_key % 10]
+
+
+def reverse_portal_exits_into_portal_plando(portal_exits: list[int]) -> list[PlandoConnection]:
+    return [
+        PlandoConnection("Autumn Hills", find_spot(portal_exits[0]), "both"),
+        PlandoConnection("Riviere Turquoise", find_spot(portal_exits[1]), "both"),
+        PlandoConnection("Howling Grotto", find_spot(portal_exits[2]), "both"),
+        PlandoConnection("Sunken Shrine", find_spot(portal_exits[3]), "both"),
+        PlandoConnection("Searing Crags", find_spot(portal_exits[4]), "both"),
+        PlandoConnection("Glacial Peak", find_spot(portal_exits[5]), "both"),
+    ]
+
+
+def reverse_transitions_into_plando_connections(transitions: list[list[int]]) -> list[PlandoConnection]:
+    plando_connections = []
+
+    for connection in [
+        PlandoConnection(REVERSED_RANDOMIZED_CONNECTIONS[TRANSITIONS[transition[0]]], TRANSITIONS[transition[1]], "both")
+        for transition in transitions
+    ]:
+        if connection.exit in {con.entrance for con in plando_connections}:
+            continue
+        plando_connections.append(connection)
+
+    return plando_connections
diff --git a/worlds/mlss/Client.py b/worlds/mlss/Client.py
index 17d87197ca..0334cc5abb 100644
--- a/worlds/mlss/Client.py
+++ b/worlds/mlss/Client.py
@@ -1,11 +1,11 @@
-from typing import TYPE_CHECKING, Optional, Set, List, Dict
+import asyncio
 import struct
 
+from typing import TYPE_CHECKING, Optional, Set, List, Dict
 from NetUtils import ClientStatus
 from .Locations import roomCount, nonBlock, beanstones, roomException, shop, badge, pants, eReward
 from .Items import items_by_id
 
-import asyncio
 
 import worlds._bizhawk as bizhawk
 from worlds._bizhawk.client import BizHawkClient
@@ -41,8 +41,6 @@ class MLSSClient(BizHawkClient):
         self.local_events = []
 
     async def validate_rom(self, ctx: "BizHawkClientContext") -> bool:
-        from CommonClient import logger
-
         try:
             # Check ROM name/patch version
             rom_name_bytes = await bizhawk.read(ctx.bizhawk_ctx, [(0xA0, 14, "ROM")])
@@ -72,23 +70,18 @@ class MLSSClient(BizHawkClient):
     async def set_auth(self, ctx: "BizHawkClientContext") -> None:
         ctx.auth = self.player_name
 
-    def on_package(self, ctx, cmd, args) -> None:
-        if cmd == "RoomInfo":
-            ctx.seed_name = args["seed_name"]
-
     async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
         from CommonClient import logger
-
         try:
-            if ctx.seed_name is None:
+            if ctx.server_seed_name is None:
                 return
             if not self.seed_verify:
-                seed = await bizhawk.read(ctx.bizhawk_ctx, [(0xDF00A0, len(ctx.seed_name), "ROM")])
+                seed = await bizhawk.read(ctx.bizhawk_ctx, [(0xDF00A0, len(ctx.server_seed_name), "ROM")])
                 seed = seed[0].decode("UTF-8")
-                if seed not in ctx.seed_name:
+                if seed not in ctx.server_seed_name:
                     logger.info(
                         "ERROR: The ROM you loaded is for a different game of AP. "
-                        "Please make sure the host has sent you the correct patch file,"
+                        "Please make sure the host has sent you the correct patch file, "
                         "and that you have opened the correct ROM."
                     )
                     raise bizhawk.ConnectorError("Loaded ROM is for Incorrect lobby.")
diff --git a/worlds/mlss/Data.py b/worlds/mlss/Data.py
index 7e3605f138..b305dec1e8 100644
--- a/worlds/mlss/Data.py
+++ b/worlds/mlss/Data.py
@@ -151,7 +151,6 @@ enemies = [
     0x50454C,
     0x50456C,
     0x50458C,
-    0x5045AC,
     0x50468C,
     0x5046EC,
     0x50470C
@@ -161,7 +160,6 @@ bosses = [
     0x5030CC,
     0x50320C,
     0x50322C,
-    0x50352C,
     0x50360C,
     0x5037AC,
     0x5037CC,
diff --git a/worlds/mlss/__init__.py b/worlds/mlss/__init__.py
index 1035979585..50c8409d5d 100644
--- a/worlds/mlss/__init__.py
+++ b/worlds/mlss/__init__.py
@@ -19,8 +19,7 @@ from .Rules import set_rules
 class MLSSWebWorld(WebWorld):
     theme = "partyTime"
     bug_report_page = "https://github.com/jamesbrq/ArchipelagoMLSS/issues"
-    tutorials = [
-        Tutorial(
+    setup_en =Tutorial(
             tutorial_name="Setup Guide",
             description="A guide to setting up Mario & Luigi: Superstar Saga for Archipelago.",
             language="English",
@@ -28,7 +27,17 @@ class MLSSWebWorld(WebWorld):
             link="setup/en",
             authors=["jamesbrq"],
         )
-    ]
+    
+    setup_es = Tutorial(
+            tutorial_name=setup_en.tutorial_name,
+            description=setup_en.description,
+            language="Español",
+            file_name="setup_es.md",
+            link="setup/es",
+            authors=["GreenMarco"],
+        )
+    
+    tutorials =[setup_en, setup_es]
 
 
 class MLSSSettings(settings.Group):
diff --git a/worlds/mlss/archipelago.json b/worlds/mlss/archipelago.json
new file mode 100644
index 0000000000..18e437ed7f
--- /dev/null
+++ b/worlds/mlss/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Mario & Luigi Superstar Saga",
+	"authors": [ "jamesbrq" ],
+    "minimum_ap_version": "0.6.3",
+    "world_version": "1.10.2"
+}
diff --git a/worlds/mlss/data/basepatch.bsdiff b/worlds/mlss/data/basepatch.bsdiff
index 5715660de1..b148a4c1ca 100644
Binary files a/worlds/mlss/data/basepatch.bsdiff and b/worlds/mlss/data/basepatch.bsdiff differ
diff --git a/worlds/mlss/docs/es_Mario & Luigi Superstar Saga.md b/worlds/mlss/docs/es_Mario & Luigi Superstar Saga.md
new file mode 100644
index 0000000000..b954ae7e48
--- /dev/null
+++ b/worlds/mlss/docs/es_Mario & Luigi Superstar Saga.md	
@@ -0,0 +1,64 @@
+# Mario & Luigi: Superstar Saga
+
+## ¿Dónde está la página de opciones?
+
+La [página de opciones del jugador para este juego](../player-options) contiene todas las opciones que necesitas configurar y exportar un archivo de configuración.
+
+## ¿Qué hace la randomización en este juego?
+
+Los objetos que el jugador normalmente adquiriría a lo largo del juego se han movido de sitio. La lógica se mantiene, por lo que el juego es siempre capaz de ser completado, pero debido a la barajadura de objetos, el jugador puede necesitar acceder a ciertas áreas antes de que lo haría en el juego original.
+
+El juego ha cambiado a un estilo de mundo abierto, a diferencia del estilo lineal del juego original.
+
+Se han añadido otras características para mayor comodidad, como Turbo a través de cuadros de texto (mantén pulsados L/R+A) y Pipe Warping desde cualquier ubicación (mantén pulsados L+R+SELECT).
+
+Los enemigos y jefes pueden ser aleatorios y sus estadísticas pueden escalarse para parecerse más a las del juego original.
+
+También se pueden randomizar otros aspectos del juego, como la música, los sonidos, los fondos de batalla, los colores de Mario y Luigi, etc.
+
+## ¿Cuál es el objetivo de Mario & Luigi: Superstar Saga randomizer?
+
+Derrotar al Alma de Cackletta en el Castillo de Bowser. Para ello, debes recoger las 4 piezas de la Judía Estelar (Beanstar), restaurarla y llevar el vestido extra de Peach y la Beanstar falsa a Fawful al final de Jokes End.
+
+En total, esto requiere
+- Las 4 Piezas de la Beanstar
+- El Vestido extra de Peach
+- La Beanstar falsa
+- Los Ultra martillos
+- La Mano de fuego
+- La Mano de Trueno
+- La Perla Roja
+- La Perla Verde
+- La Copa Verde
+- La Rosa de Peasley
+- El Broche de judía
+- Las 3 Frutas Chuckola
+- La Tarjeta de socio o La Copa Roja
+
+## ¿Qué objetos y ubicaciones se pueden randomizar?
+
+Ubicaciones en las que se pueden encontrar objetos:
+- Todos los Bloques de Objetos y Bloques de Monedas
+- Todos los puntos de exavación de Chuckle Beans
+- Todos los objetos de las tiendas
+- Todos los objetos de las tiendas de Medallas y Pantalones
+- Todos los cafés y sus recompensas
+- Todas las recompensas de los minijuegos
+- Todos los objetos de eventos
+
+Objetos que se pueden randomizar
+- Todos los objetos consumibles (champiñones, frutos secos, jarabes, etc.)
+- Todos los Hoo Beans y Chuckle Beans
+- Todas las insignias y pantalones
+- Todos los objetos clave (Frutas de judía, Broche de judía, Martillos, etc.)
+- Todas las recompensas del café (Gran Fuerza, Gameboy Horror SP etc.)
+
+## ¿Qué aspecto tienen los objetos de otro mundo en Mario & Luigi: Superstar Saga?
+
+Los objetos aparecerán como un Champiñón dorado en los bloques y puntos de excavación y como "Objeto AP" en todos los cuadros de texto.
+Los objetos del mundo de otro jugador que se encuentren en las tiendas se mostrarán con el nombre del jugador y el nombre del objeto además de mostrarse como un objeto AP.
+
+## ¿Qué ocurre cuando el jugador recibe un objeto?
+
+Los objetos se directamente en el inventario del jugador tras unos segundos. A veces, para que ciertos eventos y escenas se activen correctamente después de recibir un objeto, es posible que tengas que salir y volver a entrar en la sala para cargar correctamente todo lo necesario para el evento o escena correspondiente.
+
diff --git a/worlds/mlss/docs/setup_es.md b/worlds/mlss/docs/setup_es.md
new file mode 100644
index 0000000000..cf67e35b50
--- /dev/null
+++ b/worlds/mlss/docs/setup_es.md
@@ -0,0 +1,47 @@
+# Guía de instalación de Mario & Luigi: Superstar Saga Archipelago
+
+## Importante
+
+Como estamos usando Bizhawk, esta guía sólo es aplicable a sistemas Windows y Linux.
+
+## Software necesario
+
+- Bizhawk: [Lanzamientos Bizhawk por TASVideos](https://tasvideos.org/BizHawk/ReleaseHistory)
+  - Se recomienda la versión 2.9.1.
+  - Las instrucciones detalladas de instalación de Bizhawk se pueden encontrar en el enlace anterior.
+  - Los usuarios de Windows deben ejecutar primero el instalador de requisitos previos, que también se puede encontrar en el enlace anterior.
+- El cliente Bizhawk integrado, que puede instalarse [aquí](https://github.com/ArchipelagoMW/Archipelago/releases)
+- Una copia americana de Mario & Luigi: Superstar Saga
+
+## Software opcional
+
+- [Poptracker](https://github.com/black-sliver/PopTracker/releases)
+  - [MLSS Autotracker](https://github.com/seto10987/MLSS-PopTracker/releases)
+
+## Configuración de su archivo YAML
+
+### ¿Qué es un archivo YAML y por qué necesito uno?
+
+Tu archivo YAML contiene un conjunto de opciones de configuración que proporcionan al generador información sobre cómo debe generar tu juego. Cada jugador de un multiworld proporcionará su propio archivo YAML. Esta configuración permite a cada jugador disfrutar
+de una experiencia personalizada a su gusto, y distintos jugadores de un mismo multiworld pueden tener opciones diferentes.
+
+### ¿Dónde consigo un archivo YAML?
+
+Puedes personalizar tus opciones visitando 
+[Mario & Luigi Superstar Saga Options Page](/games/Mario%20&%20Luigi%20Superstar%20Saga/player-options)
+
+## Unirse a una partida MultiWorld
+
+### Obtén tu archivo para parchear el juego de GBA
+
+Cuando te unas a una partida multiworld, se te pedirá que proporciones tu archivo YAML a quien sea el anfitrión. Una vez hecho esto, el anfitrión te proporcionará o bien un enlace para descargar tu archivo parche, o bien un archivo zip que contiene los archivos de datos de todos. Tu archivo de datos debe tener la extensión `.apmlss`.
+
+Haz doble clic en su archivo `.apmlss` para iniciar el cliente se aplique el parche automaticamente al ROM. Una vez finalizado el proceso, el cliente y el emulador se iniciarán automáticamente (si has asociado la extensión al emulador como se recomienda).
+
+### Conectarse al Multiservidor
+
+Una vez iniciados tanto el cliente como el emulador, debes conectarlos. Dentro del emulador haz clic en el menú "Herramientas" y selecciona "Consola Lua". Haz clic en el botón de carpeta o pulsa Ctrl+O para abrir un script Lua.
+
+Navega a tu carpeta de instalación de Archipelago y abre `data/lua/connector_bizhawk_generic.lua`.
+
+Para conectar el cliente al multiservidor simplemente pon `<dirección>:<puerto>` en el campo de texto de la parte superior y pulsa enter (si el servidor usa contraseña, escribe en el campo de texto inferior `/connect <dirección>:<puerto> [contraseña]`)
\ No newline at end of file
diff --git a/worlds/mm2/client.py b/worlds/mm2/client.py
index 96c477757d..725023c820 100644
--- a/worlds/mm2/client.py
+++ b/worlds/mm2/client.py
@@ -140,8 +140,8 @@ def cmd_pool(self: "BizHawkClientCommandProcessor") -> None:
 
 
 def cmd_request(self: "BizHawkClientCommandProcessor", amount: str, target: str) -> None:
-    from worlds._bizhawk.context import BizHawkClientContext
     """Request a refill from EnergyLink."""
+    from worlds._bizhawk.context import BizHawkClientContext
     if self.ctx.game != "Mega Man 2":
         logger.warning("This command can only be used when playing Mega Man 2.")
         return
diff --git a/worlds/mm2/docs/setup_en.md b/worlds/mm2/docs/setup_en.md
index 3b8f833b99..7462e3f735 100644
--- a/worlds/mm2/docs/setup_en.md
+++ b/worlds/mm2/docs/setup_en.md
@@ -23,7 +23,7 @@ clear it.
 
 1. Create your options file (YAML). You can make one on the
 [Mega Man 2 options page](../../../games/Mega%20Man%202/player-options).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have the `.apmm2` file extension.
 3. Open `ArchipelagoLauncher.exe`
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/mm2/options.py b/worlds/mm2/options.py
index f333348982..c1b291a911 100644
--- a/worlds/mm2/options.py
+++ b/worlds/mm2/options.py
@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 
-from Options import Choice, Toggle, DeathLink, DefaultOnToggle, TextChoice, Range, OptionDict, PerGameCommonOptions
+from Options import (Choice, Toggle, DeathLink, DefaultOnToggle, TextChoice, Range, OptionDict, PerGameCommonOptions,
+                     Visibility)
 from schema import Schema, And, Use, Optional
 
 bosses = {
@@ -178,6 +179,7 @@ class WeaknessPlando(OptionDict):
             And(str, Use(str.title), lambda s: s in weapons_to_id): And(int, lambda i: i in range(-1, 15))
         }
     })
+    visibility = Visibility.template | Visibility.complex_ui | Visibility.spoiler
     default = {}
 
 
diff --git a/worlds/mm3/.apignore b/worlds/mm3/.apignore
new file mode 100644
index 0000000000..4ae3da2695
--- /dev/null
+++ b/worlds/mm3/.apignore
@@ -0,0 +1 @@
+/src/*
diff --git a/worlds/mm3/__init__.py b/worlds/mm3/__init__.py
new file mode 100644
index 0000000000..5b349bc9c3
--- /dev/null
+++ b/worlds/mm3/__init__.py
@@ -0,0 +1,275 @@
+import hashlib
+import logging
+from copy import deepcopy
+from typing import Any, Sequence, ClassVar
+
+from BaseClasses import Tutorial, ItemClassification, MultiWorld, Item, Location
+from worlds.AutoWorld import World, WebWorld
+from .names import (gamma, gemini_man_stage, needle_man_stage, hard_man_stage, magnet_man_stage, top_man_stage,
+                    snake_man_stage, spark_man_stage, shadow_man_stage, rush_marine, rush_jet, rush_coil)
+from .items import (item_table, item_names, MM3Item, filler_item_weights, robot_master_weapon_table,
+                    stage_access_table, rush_item_table, lookup_item_to_id)
+from .locations import (MM3Location, mm3_regions, MM3Region, lookup_location_to_id,
+                        location_groups)
+from .rom import patch_rom, MM3ProcedurePatch, MM3LCHASH, MM3VCHASH, PROTEUSHASH, MM3NESHASH
+from .options import MM3Options, Consumables
+from .client import MegaMan3Client
+from .rules import set_rules, weapon_damage, robot_masters, weapons_to_name, minimum_weakness_requirement
+import os
+import threading
+import base64
+import settings
+logger = logging.getLogger("Mega Man 3")
+
+
+class MM3Settings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the MM3 EN rom"""
+        description = "Mega Man 3 ROM File"
+        copy_to: str | None = "Mega Man 3 (USA).nes"
+        md5s = [MM3NESHASH, MM3LCHASH, PROTEUSHASH, MM3VCHASH]
+
+        def browse(self: settings.T,
+                   filetypes: Sequence[tuple[str, Sequence[str]]] | None = None,
+                   **kwargs: Any) -> settings.T | None:
+            if not filetypes:
+                file_types = [("NES", [".nes"]), ("Program", [".exe"])]  # LC1 is only a windows executable, no linux
+                return super().browse(file_types, **kwargs)
+            else:
+                return super().browse(filetypes, **kwargs)
+
+        @classmethod
+        def validate(cls, path: str) -> None:
+            """Try to open and validate file against hashes"""
+            with open(path, "rb", buffering=0) as f:
+                try:
+                    f.seek(0)
+                    if f.read(4) == b"NES\x1A":
+                        f.seek(16)
+                    else:
+                        f.seek(0)
+                    cls._validate_stream_hashes(f)
+                    base_rom_bytes = f.read()
+                    basemd5 = hashlib.md5()
+                    basemd5.update(base_rom_bytes)
+                    if basemd5.hexdigest() == PROTEUSHASH:
+                        # we need special behavior here
+                        cls.copy_to = None
+                except ValueError:
+                    raise ValueError(f"File hash does not match for {path}")
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
+class MM3WebWorld(WebWorld):
+    theme = "partyTime"
+    tutorials = [
+
+        Tutorial(
+           "Multiworld Setup Guide",
+           "A guide to setting up the Mega Man 3 randomizer connected to an Archipelago Multiworld.",
+           "English",
+           "setup_en.md",
+           "setup/en",
+           ["Silvris"]
+        )
+    ]
+
+
+class MM3World(World):
+    """
+    Following his second defeat by Mega Man, Dr. Wily has finally come to his senses. He and Dr. Light begin work on
+    Gamma, a giant peacekeeping robot. However, Gamma's power source, the Energy Elements, are being guarded by the
+    Robot Masters sent to retrieve them. It's up to Mega Man to retrieve the Energy Elements and defeat the mastermind
+    behind the Robot Masters' betrayal.
+    """
+
+    game = "Mega Man 3"
+    settings: ClassVar[MM3Settings]
+    options_dataclass = MM3Options
+    options: MM3Options
+    item_name_to_id = lookup_item_to_id
+    location_name_to_id = lookup_location_to_id
+    item_name_groups = item_names
+    location_name_groups = location_groups
+    web = MM3WebWorld()
+    rom_name: bytearray
+
+    def __init__(self, world: MultiWorld, player: int):
+        self.rom_name = bytearray()
+        self.rom_name_available_event = threading.Event()
+        super().__init__(world, player)
+        self.weapon_damage = deepcopy(weapon_damage)
+        self.wily_4_weapons: dict[int, list[int]] = {}
+
+    def create_regions(self) -> None:
+        menu = MM3Region("Menu", self.player, self.multiworld)
+        self.multiworld.regions.append(menu)
+        location: MM3Location
+        for name, region in mm3_regions.items():
+            stage = MM3Region(name, self.player, self.multiworld)
+            if not region.parent:
+                menu.connect(stage, f"To {name}",
+                             lambda state, req=tuple(region.required_items): state.has_all(req, self.player))
+            else:
+                old_stage = self.get_region(region.parent)
+                old_stage.connect(stage, f"To {name}",
+                                  lambda state, req=tuple(region.required_items): state.has_all(req, self.player))
+            stage.add_locations({loc: data.location_id for loc, data in region.locations.items()
+                                 if (not data.energy or self.options.consumables.value in (Consumables.option_weapon_health, Consumables.option_all))
+                                 and (not data.oneup_tank or self.options.consumables.value in (Consumables.option_1up_etank, Consumables.option_all))})
+            for location in stage.get_locations():
+                if location.address is None and location.name != gamma:
+                    location.place_locked_item(MM3Item(location.name, ItemClassification.progression,
+                                                       None, self.player))
+            self.multiworld.regions.append(stage)
+        goal_location = self.get_location(gamma)
+        goal_location.place_locked_item(MM3Item("Victory", ItemClassification.progression, None, self.player))
+        self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
+
+    def create_item(self, name: str, force_non_progression: bool = False) -> MM3Item:
+        item = item_table[name]
+        classification = ItemClassification.filler
+        if item.progression and not force_non_progression:
+            classification = ItemClassification.progression_skip_balancing \
+                if item.skip_balancing else ItemClassification.progression
+        if item.useful:
+            classification |= ItemClassification.useful
+        return MM3Item(name, classification, item.code, self.player)
+
+    def get_filler_item_name(self) -> str:
+        return self.random.choices(list(filler_item_weights.keys()),
+                                   weights=list(filler_item_weights.values()))[0]
+
+    def create_items(self) -> None:
+        itempool = []
+        # grab first robot master
+        robot_master = self.item_id_to_name[0x0101 + self.options.starting_robot_master.value]
+        self.multiworld.push_precollected(self.create_item(robot_master))
+        itempool.extend([self.create_item(name) for name in stage_access_table.keys()
+                         if name != robot_master])
+        itempool.extend([self.create_item(name) for name in robot_master_weapon_table.keys()])
+        itempool.extend([self.create_item(name) for name in rush_item_table.keys()])
+        total_checks = 31
+        if self.options.consumables in (Consumables.option_1up_etank,
+                                        Consumables.option_all):
+            total_checks += 33
+        if self.options.consumables in (Consumables.option_weapon_health,
+                                        Consumables.option_all):
+            total_checks += 106
+        remaining = total_checks - len(itempool)
+        itempool.extend([self.create_item(name)
+                         for name in self.random.choices(list(filler_item_weights.keys()),
+                                                         weights=list(filler_item_weights.values()),
+                                                         k=remaining)])
+        self.multiworld.itempool += itempool
+
+    set_rules = set_rules
+
+    def generate_early(self) -> None:
+        if (self.options.starting_robot_master.current_key == "gemini_man"
+            and not any(item in self.options.start_inventory for item in rush_item_table.keys())) or \
+                (self.options.starting_robot_master.current_key == "hard_man"
+                 and not any(item in self.options.start_inventory for item in [rush_coil, rush_jet])):
+            robot_master_pool = [0, 1, 4, 5, 6, 7, ]
+            if rush_marine in self.options.start_inventory:
+                robot_master_pool.append(2)
+            self.options.starting_robot_master.value = self.random.choice(robot_master_pool)
+            logger.warning(
+                f"Incompatible starting Robot Master, changing to "
+                f"{self.options.starting_robot_master.current_key.replace('_', ' ').title()}")
+
+    def fill_hook(self,
+                  prog_item_pool: list["Item"],
+                  useful_item_pool: list["Item"],
+                  filler_item_pool: list["Item"],
+                  fill_locations: list["Location"]) -> None:
+        # on a solo gen, fill can try to force Wily into sphere 2, but for most generations this is impossible
+        # MM3 is worse than MM2 here, some of the RBMs can also require Rush
+        if self.multiworld.players > 1:
+            return  # Don't need to change anything on a multi gen, fill should be able to solve it with a 4 sphere 1
+        rbm_to_item = {
+            0: needle_man_stage,
+            1: magnet_man_stage,
+            2: gemini_man_stage,
+            3: hard_man_stage,
+            4: top_man_stage,
+            5: snake_man_stage,
+            6: spark_man_stage,
+            7: shadow_man_stage
+        }
+        affected_rbm = [2, 3]  # Gemini and Hard will always have this happen
+        possible_rbm = [0, 7]  # Needle and Shadow are always valid targets, due to Rush Marine/Jet receive
+        if self.options.consumables:
+            possible_rbm.extend([4, 5])  # every stage has at least one of each consumable
+            if self.options.consumables in (Consumables.option_weapon_health, Consumables.option_all):
+                possible_rbm.extend([1, 6])
+            else:
+                affected_rbm.extend([1, 6])
+        else:
+            affected_rbm.extend([1, 4, 5, 6])  # only two checks on non consumables
+        if self.options.starting_robot_master.value in affected_rbm:
+            rbm_names = list(map(lambda s: rbm_to_item[s], possible_rbm))
+            valid_second = [item for item in prog_item_pool
+                            if item.name in rbm_names
+                            and item.player == self.player]
+            placed_item = self.random.choice(valid_second)
+            rbm_defeated = (f"{robot_masters[self.options.starting_robot_master.value].replace(' Defeated', '')}"
+                            f" - Defeated")
+            rbm_location = self.get_location(rbm_defeated)
+            rbm_location.place_locked_item(placed_item)
+            prog_item_pool.remove(placed_item)
+            fill_locations.remove(rbm_location)
+            target_rbm = (placed_item.code & 0xF) - 1
+            if self.options.strict_weakness or (self.options.random_weakness
+                                                and not (self.weapon_damage[0][target_rbm] > 0)):
+                # we need to find a weakness for this boss
+                weaknesses = [weapon for weapon in range(1, 9)
+                              if self.weapon_damage[weapon][target_rbm] >= minimum_weakness_requirement[weapon]]
+                weapons = list(map(lambda s: weapons_to_name[s], weaknesses))
+                valid_weapons = [item for item in prog_item_pool
+                                 if item.name in weapons
+                                 and item.player == self.player]
+                placed_weapon = self.random.choice(valid_weapons)
+                weapon_name = next(name for name, idx in lookup_location_to_id.items()
+                                   if idx == 0x0101 + self.options.starting_robot_master.value)
+                weapon_location = self.get_location(weapon_name)
+                weapon_location.place_locked_item(placed_weapon)
+                prog_item_pool.remove(placed_weapon)
+                fill_locations.remove(weapon_location)
+
+    def generate_output(self, output_directory: str) -> None:
+        try:
+            patch = MM3ProcedurePatch(player=self.player, player_name=self.player_name)
+            patch_rom(self, patch)
+
+            self.rom_name = patch.name
+
+            patch.write(os.path.join(output_directory,
+                                     f"{self.multiworld.get_out_file_name_base(self.player)}{patch.patch_file_ending}"))
+        except Exception:
+            raise
+        finally:
+            self.rom_name_available_event.set()  # make sure threading continues and errors are collected
+
+    def fill_slot_data(self) -> dict[str, Any]:
+        return {
+            "death_link": self.options.death_link.value,
+            "weapon_damage": self.weapon_damage,
+            "wily_4_weapons": self.wily_4_weapons
+        }
+
+    @staticmethod
+    def interpret_slot_data(slot_data: dict[str, Any]) -> dict[str, Any]:
+        local_weapon = {int(key): value for key, value in slot_data["weapon_damage"].items()}
+        local_wily = {int(key): value for key, value in slot_data["wily_4_weapons"].items()}
+        return {"weapon_damage": local_weapon, "wily_4_weapons": local_wily}
+
+    def modify_multidata(self, multidata: dict[str, Any]) -> None:
+        # wait for self.rom_name to be available.
+        self.rom_name_available_event.wait()
+        rom_name = getattr(self, "rom_name", None)
+        # we skip in case of error, so that the original error in the output thread is the one that gets raised
+        if rom_name:
+            new_name = base64.b64encode(bytes(self.rom_name)).decode()
+            multidata["connect_names"][new_name] = multidata["connect_names"][self.player_name]
diff --git a/worlds/mm3/archipelago.json b/worlds/mm3/archipelago.json
new file mode 100644
index 0000000000..ed5ecffc6c
--- /dev/null
+++ b/worlds/mm3/archipelago.json
@@ -0,0 +1,6 @@
+{
+  "game": "Mega Man 3",
+  "authors": ["Silvris"],
+  "world_version": "0.1.7",
+  "minimum_ap_version": "0.6.4"
+}
diff --git a/worlds/mm3/client.py b/worlds/mm3/client.py
new file mode 100644
index 0000000000..0e069043a7
--- /dev/null
+++ b/worlds/mm3/client.py
@@ -0,0 +1,783 @@
+import logging
+import time
+from enum import IntEnum
+from base64 import b64encode
+from typing import TYPE_CHECKING, Any
+from NetUtils import ClientStatus, color, NetworkItem
+from worlds._bizhawk.client import BizHawkClient
+
+if TYPE_CHECKING:
+    from worlds._bizhawk.context import BizHawkClientContext, BizHawkClientCommandProcessor
+
+nes_logger = logging.getLogger("NES")
+logger = logging.getLogger("Client")
+
+MM3_CURRENT_STAGE = 0x22
+MM3_MEGAMAN_STATE = 0x30
+MM3_PROG_STATE = 0x60
+MM3_ROBOT_MASTERS_DEFEATED = 0x61
+MM3_DOC_STATUS = 0x62
+MM3_HEALTH = 0xA2
+MM3_WEAPON_ENERGY = 0xA3
+MM3_WEAPONS = {
+    1: 1,
+    2: 3,
+    3: 0,
+    4: 2,
+    5: 4,
+    6: 5,
+    7: 7,
+    8: 9,
+    0x11: 6,
+    0x12: 8,
+    0x13: 10,
+}
+
+MM3_DOC_REMAP = {
+    0: 0,
+    1: 1,
+    2: 2,
+    3: 3,
+    4: 6,
+    5: 7,
+    6: 4,
+    7: 5
+}
+MM3_LIVES = 0xAE
+MM3_E_TANKS = 0xAF
+MM3_ENERGY_BAR = 0xB2
+MM3_CONSUMABLES = 0x150
+MM3_ROBOT_MASTERS_UNLOCKED = 0x680
+MM3_DOC_ROBOT_UNLOCKED = 0x681
+MM3_ENERGYLINK = 0x682
+MM3_LAST_WILY = 0x683
+MM3_RBM_STROBE = 0x684
+MM3_SFX_QUEUE = 0x685
+MM3_DOC_ROBOT_DEFEATED = 0x686
+MM3_COMPLETED_STAGES = 0x687
+MM3_RECEIVED_ITEMS = 0x688
+MM3_RUSH_RECEIVED = 0x689
+
+MM3_CONSUMABLE_TABLE: dict[int, dict[int, tuple[int, int]]] = {
+    # Stage:
+    #   Item: (byte offset, bit mask)
+    0: {
+        0x0200: (0, 5),
+        0x0201: (3, 2),
+    },
+    1: {
+        0x0202: (2, 6),
+        0x0203: (2, 5),
+        0x0204: (2, 4),
+        0x0205: (2, 3),
+        0x0206: (3, 6),
+        0x0207: (3, 5),
+        0x0208: (3, 7),
+        0x0209: (4, 0)
+    },
+    2: {
+        0x020A: (2, 7),
+        0x020B: (3, 0),
+        0x020C: (3, 1),
+        0x020D: (3, 2),
+        0x020E: (4, 2),
+        0x020F: (4, 3),
+        0x0210: (4, 7),
+        0x0211: (5, 1),
+        0x0212: (6, 1),
+        0x0213: (7, 0)
+    },
+    3: {
+        0x0214: (0, 6),
+        0x0215: (1, 5),
+        0x0216: (2, 3),
+        0x0217: (2, 7),
+        0x0218: (2, 6),
+        0x0219: (2, 5),
+        0x021A: (4, 5),
+    },
+    4: {
+        0x021B: (1, 3),
+        0x021C: (1, 5),
+        0x021D: (1, 7),
+        0x021E: (2, 0),
+        0x021F: (1, 6),
+        0x0220: (2, 4),
+        0x0221: (2, 5),
+        0x0222: (4, 5)
+    },
+    5: {
+        0x0223: (3, 0),
+        0x0224: (3, 2),
+        0x0225: (4, 5),
+        0x0226: (4, 6),
+        0x0227: (6, 4),
+    },
+    6: {
+        0x0228: (2, 0),
+        0x0229: (2, 1),
+        0x022A: (3, 1),
+        0x022B: (3, 2),
+        0x022C: (3, 3),
+        0x022D: (3, 4),
+    },
+    7: {
+        0x022E: (3, 5),
+        0x022F: (3, 4),
+        0x0230: (3, 3),
+        0x0231: (3, 2),
+    },
+    8: {
+        0x0232: (1, 4),
+        0x0233: (2, 1),
+        0x0234: (2, 2),
+        0x0235: (2, 5),
+        0x0236: (3, 5),
+        0x0237: (4, 2),
+        0x0238: (4, 4),
+        0x0239: (5, 3),
+        0x023A: (6, 0),
+        0x023B: (6, 1),
+        0x023C: (7, 5),
+
+    },
+    9: {
+        0x023D: (3, 2),
+        0x023E: (3, 6),
+        0x023F: (4, 5),
+        0x0240: (5, 4),
+    },
+    10: {
+        0x0241: (0, 2),
+        0x0242: (2, 4)
+    },
+    11: {
+        0x0243: (4, 1),
+        0x0244: (6, 0),
+        0x0245: (6, 1),
+        0x0246: (6, 2),
+        0x0247: (6, 3),
+    },
+    12: {
+        0x0248: (0, 0),
+        0x0249: (0, 3),
+        0x024A: (0, 5),
+        0x024B: (1, 6),
+        0x024C: (2, 7),
+        0x024D: (2, 3),
+        0x024E: (2, 1),
+        0x024F: (2, 2),
+        0x0250: (3, 5),
+        0x0251: (3, 4),
+        0x0252: (3, 6),
+        0x0253: (3, 7)
+    },
+    13: {
+        0x0254: (0, 3),
+        0x0255: (0, 6),
+        0x0256: (1, 0),
+        0x0257: (3, 0),
+        0x0258: (3, 2),
+        0x0259: (3, 3),
+        0x025A: (3, 4),
+        0x025B: (3, 5),
+        0x025C: (3, 6),
+        0x025D: (4, 0),
+        0x025E: (3, 7),
+        0x025F: (4, 1),
+        0x0260: (4, 2),
+    },
+    14: {
+        0x0261: (0, 3),
+        0x0262: (0, 2),
+        0x0263: (0, 6),
+        0x0264: (1, 2),
+        0x0265: (1, 7),
+        0x0266: (2, 0),
+        0x0267: (2, 1),
+        0x0268: (2, 2),
+        0x0269: (2, 3),
+        0x026A: (5, 2),
+        0x026B: (5, 3),
+    },
+    15: {
+        0x026C: (0, 0),
+        0x026D: (0, 1),
+        0x026E: (0, 2),
+        0x026F: (0, 3),
+        0x0270: (0, 4),
+        0x0271: (0, 6),
+        0x0272: (1, 0),
+        0x0273: (1, 2),
+        0x0274: (1, 3),
+        0x0275: (1, 1),
+        0x0276: (0, 7),
+        0x0277: (3, 2),
+        0x0278: (2, 2),
+        0x0279: (2, 3),
+        0x027A: (2, 4),
+        0x027B: (2, 5),
+        0x027C: (3, 1),
+        0x027D: (3, 0),
+        0x027E: (2, 7),
+        0x027F: (2, 6),
+    },
+    16: {
+        0x0280: (0, 0),
+        0x0281: (0, 3),
+        0x0282: (0, 1),
+        0x0283: (0, 2),
+    },
+    17: {
+        0x0284: (0, 2),
+        0x0285: (0, 6),
+        0x0286: (0, 1),
+        0x0287: (0, 5),
+        0x0288: (0, 3),
+        0x0289: (0, 0),
+        0x028A: (0, 4)
+    }
+}
+
+
+def to_oneup_format(val: int) -> int:
+    return ((val // 10) * 0x10) + val % 10
+
+
+def from_oneup_format(val: int) -> int:
+    return ((val // 0x10) * 10) + val % 0x10
+
+
+class MM3EnergyLinkType(IntEnum):
+    Life = 0
+    NeedleCannon = 1
+    MagnetMissile = 2
+    GeminiLaser = 3
+    HardKnuckle = 4
+    TopSpin = 5
+    SearchSnake = 6
+    SparkShot = 7
+    ShadowBlade = 8
+    OneUP = 12
+    RushCoil = 0x11
+    RushMarine = 0x12
+    RushJet = 0x13
+
+
+request_to_name: dict[str, str] = {
+    "HP": "health",
+    "NE": "Needle Cannon energy",
+    "MA": "Magnet Missile energy",
+    "GE": "Gemini Laser energy",
+    "HA": "Hard Knuckle energy",
+    "TO": "Top Spin energy",
+    "SN": "Search Snake energy",
+    "SP": "Spark Shot energy",
+    "SH": "Shadow Blade energy",
+    "RC": "Rush Coil energy",
+    "RM": "Rush Marine energy",
+    "RJ": "Rush Jet energy",
+    "1U": "lives"
+}
+
+HP_EXCHANGE_RATE = 500000000
+WEAPON_EXCHANGE_RATE = 250000000
+ONEUP_EXCHANGE_RATE = 14000000000
+
+
+def cmd_pool(self: "BizHawkClientCommandProcessor") -> None:
+    """Check the current pool of EnergyLink, and requestable refills from it."""
+    if self.ctx.game != "Mega Man 3":
+        logger.warning("This command can only be used when playing Mega Man 3.")
+        return
+    if not self.ctx.server or not self.ctx.slot:
+        logger.warning("You must be connected to a server to use this command.")
+        return
+    energylink = self.ctx.stored_data.get(f"EnergyLink{self.ctx.team}", 0)
+    health_points = energylink // HP_EXCHANGE_RATE
+    weapon_points = energylink // WEAPON_EXCHANGE_RATE
+    lives = energylink // ONEUP_EXCHANGE_RATE
+    logger.info(f"Healing available: {health_points}\n"
+                f"Weapon refill available: {weapon_points}\n"
+                f"Lives available: {lives}")
+
+
+def cmd_request(self: "BizHawkClientCommandProcessor", amount: str, target: str) -> None:
+    """Request a refill from EnergyLink."""
+    from worlds._bizhawk.context import BizHawkClientContext
+    if self.ctx.game != "Mega Man 3":
+        logger.warning("This command can only be used when playing Mega Man 3.")
+        return
+    if not self.ctx.server or not self.ctx.slot:
+        logger.warning("You must be connected to a server to use this command.")
+        return
+    valid_targets: dict[str, MM3EnergyLinkType] = {
+        "HP": MM3EnergyLinkType.Life,
+        "NE": MM3EnergyLinkType.NeedleCannon,
+        "MA": MM3EnergyLinkType.MagnetMissile,
+        "GE": MM3EnergyLinkType.GeminiLaser,
+        "HA": MM3EnergyLinkType.HardKnuckle,
+        "TO": MM3EnergyLinkType.TopSpin,
+        "SN": MM3EnergyLinkType.SearchSnake,
+        "SP": MM3EnergyLinkType.SparkShot,
+        "SH": MM3EnergyLinkType.ShadowBlade,
+        "RC": MM3EnergyLinkType.RushCoil,
+        "RM": MM3EnergyLinkType.RushMarine,
+        "RJ": MM3EnergyLinkType.RushJet,
+        "1U": MM3EnergyLinkType.OneUP
+    }
+    if target.upper() not in valid_targets:
+        logger.warning(f"Unrecognized target {target.upper()}. Available targets: {', '.join(valid_targets.keys())}")
+        return
+    ctx = self.ctx
+    assert isinstance(ctx, BizHawkClientContext)
+    client = ctx.client_handler
+    assert isinstance(client, MegaMan3Client)
+    client.refill_queue.append((valid_targets[target.upper()], int(amount)))
+    logger.info(f"Restoring {amount} {request_to_name[target.upper()]}.")
+
+
+def cmd_autoheal(self: "BizHawkClientCommandProcessor") -> None:
+    """Enable auto heal from EnergyLink."""
+    if self.ctx.game != "Mega Man 3":
+        logger.warning("This command can only be used when playing Mega Man 3.")
+        return
+    if not self.ctx.server or not self.ctx.slot:
+        logger.warning("You must be connected to a server to use this command.")
+        return
+    else:
+        assert isinstance(self.ctx.client_handler, MegaMan3Client)
+        if self.ctx.client_handler.auto_heal:
+            self.ctx.client_handler.auto_heal = False
+            logger.info(f"Auto healing disabled.")
+        else:
+            self.ctx.client_handler.auto_heal = True
+            logger.info(f"Auto healing enabled.")
+
+
+def get_sfx_writes(sfx: int) -> tuple[int, bytes, str]:
+    return MM3_SFX_QUEUE, sfx.to_bytes(1, 'little'), "RAM"
+
+
+class MegaMan3Client(BizHawkClient):
+    game = "Mega Man 3"
+    system = "NES"
+    patch_suffix = ".apmm3"
+    item_queue: list[NetworkItem] = []
+    pending_death_link: bool = False
+    # default to true, as we don't want to send a deathlink until Mega Man's HP is initialized once
+    sending_death_link: bool = True
+    death_link: bool = False
+    energy_link: bool = False
+    rom: bytes | None = None
+    weapon_energy: int = 0
+    health_energy: int = 0
+    auto_heal: bool = False
+    refill_queue: list[tuple[MM3EnergyLinkType, int]] = []
+    last_wily: int | None = None  # default to wily 1
+    doc_status: int | None = None  # default to no doc progress
+
+    async def validate_rom(self, ctx: "BizHawkClientContext") -> bool:
+        from worlds._bizhawk import RequestFailedError, read, get_memory_size
+        from . import MM3World
+
+        try:
+
+            if (await get_memory_size(ctx.bizhawk_ctx, "PRG ROM")) < 0x3FFB0:
+                # not the entire size, but enough to check validation
+                if "pool" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("pool")
+                if "request" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("request")
+                if "autoheal" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("autoheal")
+                return False
+
+            game_name, version = (await read(ctx.bizhawk_ctx, [(0x3F320, 21, "PRG ROM"),
+                                                               (0x3F33C, 3, "PRG ROM")]))
+            if game_name[:3] != b"MM3" or version != bytes(MM3World.world_version):
+                if game_name[:3] == b"MM3":
+                    # I think this is an easier check than the other?
+                    older_version = f"{version[0]}.{version[1]}.{version[2]}"
+                    logger.warning(f"This Mega Man 3 patch was generated for an different version of the apworld. "
+                                   f"Please use that version to connect instead.\n"
+                                   f"Patch version: ({older_version})\n"
+                                   f"Client version: ({'.'.join([str(i) for i in MM3World.world_version])})")
+                if "pool" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("pool")
+                if "request" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("request")
+                if "autoheal" in ctx.command_processor.commands:
+                    ctx.command_processor.commands.pop("autoheal")
+                return False
+        except UnicodeDecodeError:
+            return False
+        except RequestFailedError:
+            return False  # Should verify on the next pass
+
+        ctx.game = self.game
+        self.rom = game_name
+        ctx.items_handling = 0b111
+        ctx.want_slot_data = False
+        deathlink = (await read(ctx.bizhawk_ctx, [(0x3F336, 1, "PRG ROM")]))[0][0]
+        if deathlink & 0x01:
+            self.death_link = True
+            await ctx.update_death_link(self.death_link)
+        if deathlink & 0x02:
+            self.energy_link = True
+
+        if self.energy_link:
+            if "pool" not in ctx.command_processor.commands:
+                ctx.command_processor.commands["pool"] = cmd_pool
+            if "request" not in ctx.command_processor.commands:
+                ctx.command_processor.commands["request"] = cmd_request
+            if "autoheal" not in ctx.command_processor.commands:
+                ctx.command_processor.commands["autoheal"] = cmd_autoheal
+
+        return True
+
+    async def set_auth(self, ctx: "BizHawkClientContext") -> None:
+        if self.rom:
+            ctx.auth = b64encode(self.rom).decode()
+
+    def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: dict[str, Any]) -> None:
+        if cmd == "Bounced":
+            if "tags" in args:
+                assert ctx.slot is not None
+                if "DeathLink" in args["tags"] and args["data"]["source"] != ctx.slot_info[ctx.slot].name:
+                    self.on_deathlink(ctx)
+        elif cmd == "Retrieved":
+            if f"MM3_LAST_WILY_{ctx.team}_{ctx.slot}" in args["keys"]:
+                self.last_wily = args["keys"][f"MM3_LAST_WILY_{ctx.team}_{ctx.slot}"]
+            if f"MM3_DOC_STATUS_{ctx.team}_{ctx.slot}" in args["keys"]:
+                self.doc_status = args["keys"][f"MM3_DOC_STATUS_{ctx.team}_{ctx.slot}"]
+        elif cmd == "Connected":
+            if self.energy_link:
+                ctx.set_notify(f"EnergyLink{ctx.team}")
+                if ctx.ui:
+                    ctx.ui.enable_energy_link()
+
+    async def send_deathlink(self, ctx: "BizHawkClientContext") -> None:
+        self.sending_death_link = True
+        ctx.last_death_link = time.time()
+        await ctx.send_death("Mega Man was defeated.")
+
+    def on_deathlink(self, ctx: "BizHawkClientContext") -> None:
+        ctx.last_death_link = time.time()
+        self.pending_death_link = True
+
+    async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
+        from worlds._bizhawk import read, write
+
+        if ctx.server is None:
+            return
+
+        if ctx.slot is None:
+            return
+
+        # get our relevant bytes
+        (prog_state, robot_masters_unlocked, robot_masters_defeated, doc_status, doc_robo_unlocked, doc_robo_defeated,
+         rush_acquired, received_items, completed_stages, consumable_checks,
+            e_tanks, lives, weapon_energy, health, state, bar_state, current_stage,
+            energy_link_packet, last_wily) = await read(ctx.bizhawk_ctx, [
+                (MM3_PROG_STATE, 1, "RAM"),
+                (MM3_ROBOT_MASTERS_UNLOCKED, 1, "RAM"),
+                (MM3_ROBOT_MASTERS_DEFEATED, 1, "RAM"),
+                (MM3_DOC_STATUS, 1, "RAM"),
+                (MM3_DOC_ROBOT_UNLOCKED, 1, "RAM"),
+                (MM3_DOC_ROBOT_DEFEATED, 1, "RAM"),
+                (MM3_RUSH_RECEIVED, 1, "RAM"),
+                (MM3_RECEIVED_ITEMS, 1, "RAM"),
+                (MM3_COMPLETED_STAGES, 0x1, "RAM"),
+                (MM3_CONSUMABLES, 16, "RAM"),  # Could be more but 16 definitely catches all current
+                (MM3_E_TANKS, 1, "RAM"),
+                (MM3_LIVES, 1, "RAM"),
+                (MM3_WEAPON_ENERGY, 11, "RAM"),
+                (MM3_HEALTH, 1, "RAM"),
+                (MM3_MEGAMAN_STATE, 1, "RAM"),
+                (MM3_ENERGY_BAR, 2, "RAM"),
+                (MM3_CURRENT_STAGE, 1, "RAM"),
+                (MM3_ENERGYLINK, 1, "RAM"),
+                (MM3_LAST_WILY, 1, "RAM"),
+            ])
+
+        if bar_state[0] not in (0x00, 0x80):
+            return  # Game is not initialized
+            # Bit of a trick here, bar state can only be 0x00 or 0x80 (display health bar, or don't)
+            # This means it can double as init guard and in-stage tracker
+
+        if not ctx.finished_game and completed_stages[0] & 0x20:
+            await ctx.send_msgs([{
+                "cmd": "StatusUpdate",
+                "status": ClientStatus.CLIENT_GOAL
+            }])
+        writes = []
+
+        # deathlink
+        # only handle deathlink in bar state 0x80 (in stage)
+        if bar_state[0] == 0x80:
+            if self.pending_death_link:
+                writes.append((MM3_MEGAMAN_STATE, bytes([0x0E]), "RAM"))
+                self.pending_death_link = False
+                self.sending_death_link = True
+            if "DeathLink" in ctx.tags and ctx.last_death_link + 1 < time.time():
+                if state[0] == 0x0E and not self.sending_death_link:
+                    await self.send_deathlink(ctx)
+                elif state[0] != 0x0E:
+                    self.sending_death_link = False
+
+        if self.last_wily != last_wily[0]:
+            if self.last_wily is None:
+                # revalidate last wily from data storage
+                await ctx.send_msgs([{"cmd": "Set", "key": f"MM3_LAST_WILY_{ctx.team}_{ctx.slot}", "operations": [
+                    {"operation": "default", "value": 0xC}
+                ]}])
+                await ctx.send_msgs([{"cmd": "Get", "keys": [f"MM3_LAST_WILY_{ctx.team}_{ctx.slot}"]}])
+            elif last_wily[0] == 0:
+                writes.append((MM3_LAST_WILY, self.last_wily.to_bytes(1, "little"), "RAM"))
+            else:
+                # correct our setting
+                self.last_wily = last_wily[0]
+                await ctx.send_msgs([{"cmd": "Set", "key": f"MM3_LAST_WILY_{ctx.team}_{ctx.slot}", "operations": [
+                    {"operation": "replace", "value": self.last_wily}
+                ]}])
+
+        if self.doc_status != doc_status[0]:
+            if self.doc_status is None:
+                # revalidate doc status from data storage
+                await ctx.send_msgs([{"cmd": "Set", "key": f"MM3_DOC_STATUS_{ctx.team}_{ctx.slot}", "operations": [
+                    {"operation": "default", "value": 0}
+                ]}])
+                await ctx.send_msgs([{"cmd": "Get", "keys": [f"MM3_DOC_STATUS_{ctx.team}_{ctx.slot}"]}])
+            elif doc_status[0] == 0:
+                writes.append((MM3_DOC_STATUS, self.doc_status.to_bytes(1, "little"), "RAM"))
+            else:
+                # correct our setting
+                # shouldn't be possible to desync, but we'll account for it anyways
+                self.doc_status |= doc_status[0]
+                await ctx.send_msgs([{"cmd": "Set", "key": f"MM3_DOC_STATUS_{ctx.team}_{ctx.slot}", "operations": [
+                    {"operation": "replace", "value": self.doc_status}
+                ]}])
+
+        weapon_energy = bytearray(weapon_energy)
+        # handle receiving items
+        recv_amount = received_items[0]
+        if recv_amount < len(ctx.items_received):
+            item = ctx.items_received[recv_amount]
+            logging.info('Received %s from %s (%s) (%d/%d in list)' % (
+                color(ctx.item_names.lookup_in_slot(item.item), 'red', 'bold'),
+                color(ctx.player_names[item.player], 'yellow'),
+                ctx.location_names.lookup_in_slot(item.location, item.player), recv_amount, len(ctx.items_received)))
+
+            if item.item & 0x120 == 0:
+                # Robot Master Weapon, or Rush
+                new_weapons = item.item & 0xFF
+                weapon_energy[MM3_WEAPONS[new_weapons]] |= 0x9C
+                writes.append((MM3_WEAPON_ENERGY, weapon_energy, "RAM"))
+                writes.append(get_sfx_writes(0x32))
+            elif item.item & 0x20 == 0:
+                # Robot Master Stage Access
+                # Catch the Doc Robo here
+                if item.item & 0x10:
+                    ptr = MM3_DOC_ROBOT_UNLOCKED
+                    unlocked = doc_robo_unlocked
+                else:
+                    ptr = MM3_ROBOT_MASTERS_UNLOCKED
+                    unlocked = robot_masters_unlocked
+                new_stages = unlocked[0] | (1 << ((item.item & 0xF) - 1))
+                print(new_stages)
+                writes.append((ptr, new_stages.to_bytes(1, 'little'), "RAM"))
+                writes.append(get_sfx_writes(0x34))
+                writes.append((MM3_RBM_STROBE, b"\x01", "RAM"))
+            else:
+                # append to the queue, so we handle it later
+                self.item_queue.append(item)
+            recv_amount += 1
+            writes.append((MM3_RECEIVED_ITEMS, recv_amount.to_bytes(1, 'little'), "RAM"))
+
+        if energy_link_packet[0]:
+            pickup = energy_link_packet[0]
+            if pickup in (0x64, 0x65):
+                # Health pickups
+                if pickup == 0x65:
+                    value = 2
+                else:
+                    value = 10
+                exchange_rate = HP_EXCHANGE_RATE
+            elif pickup in (0x66, 0x67):
+                # Weapon Energy
+                if pickup == 0x67:
+                    value = 2
+                else:
+                    value = 10
+                exchange_rate = WEAPON_EXCHANGE_RATE
+            elif pickup == 0x69:
+                # 1-Up
+                value = 1
+                exchange_rate = ONEUP_EXCHANGE_RATE
+            else:
+                # if we managed to pickup something else, we should just fall through
+                value = 0
+                exchange_rate = 0
+            contribution = (value * exchange_rate) >> 1
+            if contribution:
+                await ctx.send_msgs([{
+                    "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations":
+                        [{"operation": "add", "value": contribution},
+                         {"operation": "max", "value": 0}]}])
+            logger.info(f"Deposited {contribution / HP_EXCHANGE_RATE} health into the pool.")
+            writes.append((MM3_ENERGYLINK, 0x00.to_bytes(1, "little"), "RAM"))
+
+        if self.weapon_energy:
+            # Weapon Energy
+            # We parse the whole thing to spread it as thin as possible
+            current_energy = self.weapon_energy
+            for i, weapon in zip(range(len(weapon_energy)), weapon_energy):
+                if weapon & 0x80 and (weapon & 0x7F) < 0x1C:
+                    missing = 0x1C - (weapon & 0x7F)
+                    if missing > self.weapon_energy:
+                        missing = self.weapon_energy
+                    self.weapon_energy -= missing
+                    weapon_energy[i] = weapon + missing
+                    if not self.weapon_energy:
+                        writes.append((MM3_WEAPON_ENERGY, weapon_energy, "RAM"))
+                        break
+            else:
+                if current_energy != self.weapon_energy:
+                    writes.append((MM3_WEAPON_ENERGY, weapon_energy, "RAM"))
+
+        if self.health_energy or self.auto_heal:
+            # Health Energy
+            # We save this if the player has not taken any damage
+            current_health = health[0]
+            if 0 < (current_health & 0x7F) < 0x1C:
+                health_diff = 0x1C - (current_health & 0x7F)
+                if self.health_energy:
+                    if health_diff > self.health_energy:
+                        health_diff = self.health_energy
+                    self.health_energy -= health_diff
+                else:
+                    pool = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0)
+                    if health_diff * HP_EXCHANGE_RATE > pool:
+                        health_diff = int(pool // HP_EXCHANGE_RATE)
+                    await ctx.send_msgs([{
+                        "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations":
+                            [{"operation": "add", "value": -health_diff * HP_EXCHANGE_RATE},
+                             {"operation": "max", "value": 0}]}])
+                current_health += health_diff
+                writes.append((MM3_HEALTH, current_health.to_bytes(1, 'little'), "RAM"))
+
+        if self.refill_queue:
+            refill_type, refill_amount = self.refill_queue.pop()
+            if refill_type == MM3EnergyLinkType.Life:
+                exchange_rate = HP_EXCHANGE_RATE
+            elif refill_type == MM3EnergyLinkType.OneUP:
+                exchange_rate = ONEUP_EXCHANGE_RATE
+            else:
+                exchange_rate = WEAPON_EXCHANGE_RATE
+            pool = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0)
+            request = exchange_rate * refill_amount
+            if request > pool:
+                logger.warning(
+                    f"Not enough energy to fulfill the request. Maximum request: {pool // exchange_rate}")
+            else:
+                await ctx.send_msgs([{
+                    "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations":
+                        [{"operation": "add", "value": -request},
+                         {"operation": "max", "value": 0}]}])
+                if refill_type == MM3EnergyLinkType.Life:
+                    refill_ptr = MM3_HEALTH
+                elif refill_type == MM3EnergyLinkType.OneUP:
+                    refill_ptr = MM3_LIVES
+                else:
+                    refill_ptr = MM3_WEAPON_ENERGY + MM3_WEAPONS[refill_type]
+                current_value = (await read(ctx.bizhawk_ctx, [(refill_ptr, 1, "RAM")]))[0][0]
+                if refill_type == MM3EnergyLinkType.OneUP:
+                    current_value = from_oneup_format(current_value)
+                new_value = min(0x9C if refill_type != MM3EnergyLinkType.OneUP else 99, current_value + refill_amount)
+                if refill_type == MM3EnergyLinkType.OneUP:
+                    new_value = to_oneup_format(new_value)
+                writes.append((refill_ptr, new_value.to_bytes(1, "little"), "RAM"))
+
+        if len(self.item_queue):
+            item = self.item_queue.pop(0)
+            idx = item.item & 0xF
+            if idx == 0:
+                # 1-Up
+                current_lives = from_oneup_format(lives[0])
+                if current_lives > 99:
+                    self.item_queue.append(item)
+                else:
+                    current_lives += 1
+                    current_lives = to_oneup_format(current_lives)
+                    writes.append((MM3_LIVES, current_lives.to_bytes(1, 'little'), "RAM"))
+                    writes.append(get_sfx_writes(0x14))
+            elif idx == 1:
+                self.weapon_energy += 0xE
+                writes.append(get_sfx_writes(0x1C))
+            elif idx == 2:
+                self.health_energy += 0xE
+                writes.append(get_sfx_writes(0x1C))
+            elif idx == 3:
+                current_tanks = from_oneup_format(e_tanks[0])
+                if current_tanks > 99:
+                    self.item_queue.append(item)
+                else:
+                    current_tanks += 1
+                    current_tanks = to_oneup_format(current_tanks)
+                    writes.append((MM3_E_TANKS, current_tanks.to_bytes(1, 'little'), "RAM"))
+                    writes.append(get_sfx_writes(0x14))
+
+        await write(ctx.bizhawk_ctx, writes)
+
+        new_checks = []
+        # check for locations
+        for i in range(8):
+            flag = 1 << i
+            if robot_masters_defeated[0] & flag:
+                rbm_id = 0x0001 + i
+                if rbm_id not in ctx.checked_locations:
+                    new_checks.append(rbm_id)
+                wep_id = 0x0101 + i
+                if wep_id not in ctx.checked_locations:
+                    new_checks.append(wep_id)
+            if doc_robo_defeated[0] & flag:
+                doc_id = 0x0010 + MM3_DOC_REMAP[i]
+                if doc_id not in ctx.checked_locations:
+                    new_checks.append(doc_id)
+
+        for i in range(2):
+            flag = 1 << i
+            if rush_acquired[0] & flag:
+                itm_id = 0x0111 + i
+                if itm_id not in ctx.checked_locations:
+                    new_checks.append(itm_id)
+
+        for i in (0, 1, 2, 4):
+            # Wily 4 does not have a boss check
+            boss_id = 0x0009 + i
+            if completed_stages[0] & (1 << i) != 0:
+                if boss_id not in ctx.checked_locations:
+                    new_checks.append(boss_id)
+        
+        if completed_stages[0] & 0x80 and 0x000F not in ctx.checked_locations:
+            new_checks.append(0x000F)
+
+        if bar_state[0] == 0x80:  # currently in stage
+            if (prog_state[0] > 0x00 and current_stage[0] >= 8) or prog_state[0] == 0x00:
+                # need to block the specific state of Break Man prog=0x12 stage=0x5
+                # it doesn't clean the consumable table and he doesn't have any anyways
+                for consumable in MM3_CONSUMABLE_TABLE[current_stage[0]]:
+                    consumable_info = MM3_CONSUMABLE_TABLE[current_stage[0]][consumable]
+                    if consumable not in ctx.checked_locations:
+                        is_checked = consumable_checks[consumable_info[0]] & (1 << consumable_info[1])
+                        if is_checked:
+                            new_checks.append(consumable)
+
+        for new_check_id in new_checks:
+            ctx.locations_checked.add(new_check_id)
+            location = ctx.location_names.lookup_in_game(new_check_id)
+            nes_logger.info(
+                f'New Check: {location} ({len(ctx.locations_checked)}/'
+                f'{len(ctx.missing_locations) + len(ctx.checked_locations)})')
+            await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": [new_check_id]}])
diff --git a/worlds/mm3/color.py b/worlds/mm3/color.py
new file mode 100644
index 0000000000..0944026432
--- /dev/null
+++ b/worlds/mm3/color.py
@@ -0,0 +1,331 @@
+import sys
+from typing import TYPE_CHECKING
+from . import names
+from zlib import crc32
+import struct
+import logging
+
+if TYPE_CHECKING:
+    from . import MM3World
+    from .rom import MM3ProcedurePatch
+
+HTML_TO_NES: dict[str, int] = {
+    'SNOW': 0x20,
+    'LINEN': 0x36,
+    'SEASHELL': 0x36,
+    'AZURE': 0x3C,
+    'LAVENDER': 0x33,
+    'WHITE': 0x30,
+    'BLACK': 0x0F,
+    'GREY': 0x00,
+    'GRAY': 0x00,
+    'ROYALBLUE': 0x12,
+    'BLUE': 0x11,
+    'SKYBLUE': 0x21,
+    'LIGHTBLUE': 0x31,
+    'TURQUOISE': 0x2B,
+    'CYAN': 0x2C,
+    'AQUAMARINE': 0x3B,
+    'DARKGREEN': 0x0A,
+    'GREEN': 0x1A,
+    'YELLOW': 0x28,
+    'GOLD': 0x28,
+    'WHEAT': 0x37,
+    'TAN': 0x37,
+    'CHOCOLATE': 0x07,
+    'BROWN': 0x07,
+    'SALMON': 0x26,
+    'ORANGE': 0x27,
+    'CORAL': 0x36,
+    'TOMATO': 0x16,
+    'RED': 0x16,
+    'PINK': 0x25,
+    'MAROON': 0x06,
+    'MAGENTA': 0x24,
+    'FUSCHIA': 0x24,
+    'VIOLET': 0x24,
+    'PLUM': 0x33,
+    'PURPLE': 0x14,
+    'THISTLE': 0x34,
+    'DARKBLUE': 0x01,
+    'SILVER': 0x10,
+    'NAVY': 0x02,
+    'TEAL': 0x1C,
+    'OLIVE': 0x18,
+    'LIME': 0x2A,
+    'AQUA': 0x2C,
+    # can add more as needed
+}
+
+MM3_COLORS: dict[str, tuple[int, int]] = {
+    names.gemini_laser: (0x30, 0x21),
+    names.needle_cannon: (0x30, 0x17),
+    names.hard_knuckle: (0x10, 0x01),
+    names.magnet_missile: (0x10, 0x16),
+    names.top_spin: (0x36, 0x00),
+    names.search_snake: (0x30, 0x19),
+    names.rush_coil: (0x30, 0x15),
+    names.spark_shock: (0x30, 0x26),
+    names.rush_marine: (0x30, 0x15),
+    names.shadow_blade: (0x34, 0x14),
+    names.rush_jet: (0x30, 0x15),
+    names.needle_man_stage: (0x3C, 0x11),
+    names.magnet_man_stage: (0x30, 0x15),
+    names.gemini_man_stage: (0x30, 0x21),
+    names.hard_man_stage: (0x10, 0xC),
+    names.top_man_stage: (0x30, 0x26),
+    names.snake_man_stage: (0x30, 0x29),
+    names.spark_man_stage: (0x30, 0x26),
+    names.shadow_man_stage: (0x30, 0x11),
+    names.doc_needle_stage: (0x27, 0x15),
+    names.doc_gemini_stage: (0x27, 0x15),
+    names.doc_spark_stage: (0x27, 0x15),
+    names.doc_shadow_stage: (0x27, 0x15),
+}
+
+MM3_KNOWN_COLORS: dict[str, tuple[int, int]] = {
+    **MM3_COLORS,
+    # Metroid series
+    "Varia Suit": (0x27, 0x16),
+    "Gravity Suit": (0x14, 0x16),
+    "Phazon Suit": (0x06, 0x1D),
+    # Street Fighter, technically
+    "Hadouken": (0x3C, 0x11),
+    "Shoryuken": (0x38, 0x16),
+    # X Series
+    "Z-Saber": (0x20, 0x16),
+    "Helmet Upgrade": (0x20, 0x01),
+    "Body Upgrade": (0x20, 0x01),
+    "Arms Upgrade": (0x20, 0x01),
+    "Plasma Shot Upgrade": (0x20, 0x01),
+    "Stock Charge Upgrade": (0x20, 0x01),
+    "Legs Upgrade": (0x20, 0x01),
+    # X1
+    "Homing Torpedo": (0x3D, 0x37),
+    "Chameleon Sting": (0x3B, 0x1A),
+    "Rolling Shield": (0x3A, 0x25),
+    "Fire Wave": (0x37, 0x26),
+    "Storm Tornado": (0x34, 0x14),
+    "Electric Spark": (0x3D, 0x28),
+    "Boomerang Cutter": (0x3B, 0x2D),
+    "Shotgun Ice": (0x28, 0x2C),
+    # X2
+    "Crystal Hunter": (0x33, 0x21),
+    "Bubble Splash": (0x35, 0x28),
+    "Spin Wheel": (0x34, 0x1B),
+    "Silk Shot": (0x3B, 0x27),
+    "Sonic Slicer": (0x27, 0x01),
+    "Strike Chain": (0x30, 0x23),
+    "Magnet Mine": (0x28, 0x2D),
+    "Speed Burner": (0x31, 0x16),
+    # X3
+    "Acid Burst": (0x28, 0x2A),
+    "Tornado Fang": (0x28, 0x2C),
+    "Triad Thunder": (0x2B, 0x23),
+    "Spinning Blade": (0x20, 0x16),
+    "Ray Splasher": (0x28, 0x17),
+    "Gravity Well": (0x38, 0x14),
+    "Parasitic Bomb": (0x31, 0x28),
+    "Frost Shield": (0x23, 0x2C),
+    # X4
+    "Lightning Web": (0x3D, 0x28),
+    "Aiming Laser": (0x2C, 0x14),
+    "Double Cyclone": (0x28, 0x1A),
+    "Rising Fire": (0x20, 0x16),
+    "Ground Hunter": (0x2C, 0x15),
+    "Soul Body": (0x37, 0x27),
+    "Twin Slasher": (0x28, 0x00),
+    "Frost Tower": (0x3D, 0x2C),
+}
+
+if "worlds.mm2" in sys.modules:
+    # is this the proper way to do this? who knows!
+    try:
+        mm2 = sys.modules["worlds.mm2"]
+        MM3_KNOWN_COLORS.update(mm2.color.MM2_COLORS)
+        for item in MM3_COLORS:
+            mm2.color.add_color_to_mm2(item, MM3_COLORS[item])
+    except AttributeError:
+        # pass through if an old MM2 is found
+        pass
+
+palette_pointers: dict[str, list[int]] = {
+    "Mega Buster": [0x7C8A8, 0x4650],
+    "Gemini Laser": [0x4654],
+    "Needle Cannon": [0x4658],
+    "Hard Knuckle": [0x465C],
+    "Magnet Missile": [0x4660],
+    "Top Spin": [0x4664],
+    "Search Snake": [0x4668],
+    "Rush Coil": [0x466C],
+    "Spark Shock": [0x4670],
+    "Rush Marine": [0x4674],
+    "Shadow Blade": [0x4678],
+    "Rush Jet": [0x467C],
+    "Needle Man": [0x216C],
+    "Magnet Man": [0x215C],
+    "Gemini Man": [0x217C],
+    "Hard Man": [0x2164],
+    "Top Man": [0x2194],
+    "Snake Man": [0x2174],
+    "Spark Man": [0x2184],
+    "Shadow Man": [0x218C],
+    "Doc Robot": [0x20B8]
+}
+
+
+def add_color_to_mm3(name: str, color: tuple[int, int]) -> None:
+    """
+    Add a color combo for Mega Man 3 to recognize as the color to display for a given item.
+    For information on available colors: https://www.nesdev.org/wiki/PPU_palettes#2C02
+    """
+    MM3_KNOWN_COLORS[name] = validate_colors(*color)
+
+
+def extrapolate_color(color: int) -> tuple[int, int]:
+    if color > 0x1F:
+        color_1 = color
+        color_2 = color_1 - 0x10
+    else:
+        color_2 = color
+        color_1 = color_2 + 0x10
+    return color_1, color_2
+
+
+def validate_colors(color_1: int, color_2: int, allow_match: bool = False) -> tuple[int, int]:
+    # Black should be reserved for outlines, a gray should suffice
+    if color_1 in [0x0D, 0x0E, 0x0F, 0x1E, 0x2E, 0x3E, 0x1F, 0x2F, 0x3F]:
+        color_1 = 0x10
+    if color_2 in [0x0D, 0x0E, 0x0F, 0x1E, 0x2E, 0x3E, 0x1F, 0x2F, 0x3F]:
+        color_2 = 0x10
+
+    # one final check, make sure we don't have two matching
+    if not allow_match and color_1 == color_2:
+        color_1 = 0x30  # color 1 to white works with about any paired color
+
+    return color_1, color_2
+
+
+def expand_colors(color_1: int, color_2: int) -> tuple[tuple[int, int, int], tuple[int, int, int]]:
+    if color_2 >= 0x30:
+        color_a = color_b = color_2
+    else:
+        color_a = color_2 + 0x10
+        color_b = color_2
+
+    if color_1 < 0x10:
+        color_c = color_1 + 0x10
+        color_d = color_1
+        color_e = color_1 + 0x20
+    elif color_1 >= 0x30:
+        color_c = color_1 - 0x10
+        color_d = color_1 - 0x20
+        color_e = color_1
+    else:
+        color_c = color_1
+        color_d = color_1 - 0x10
+        color_e = color_1 + 0x10
+
+    return (0x30, color_a, color_b), (color_d, color_e, color_c)
+
+
+def get_colors_for_item(name: str) -> tuple[tuple[int, int, int], tuple[int, int, int]]:
+    if name in MM3_KNOWN_COLORS:
+        return expand_colors(*MM3_KNOWN_COLORS[name])
+
+    check_colors = {color: color in name.upper().replace(" ", '') for color in HTML_TO_NES}
+    colors = [color for color in check_colors if check_colors[color]]
+    if colors:
+        # we have at least one color pattern matched
+        if len(colors) > 1:
+            # we have at least 2
+            color_1 = HTML_TO_NES[colors[0]]
+            color_2 = HTML_TO_NES[colors[1]]
+        else:
+            color_1, color_2 = extrapolate_color(HTML_TO_NES[colors[0]])
+    else:
+        # generate hash
+        crc_hash = crc32(name.encode('utf-8'))
+        hash_color = struct.pack("I", crc_hash)
+        color_1 = hash_color[0] % 0x3F
+        color_2 = hash_color[1] % 0x3F
+
+        if color_1 < color_2:
+            temp = color_1
+            color_1 = color_2
+            color_2 = temp
+
+    color_1, color_2 = validate_colors(color_1, color_2)
+
+    return expand_colors(color_1, color_2)
+
+
+def parse_color(colors: list[str]) -> tuple[int, int]:
+    color_a = colors[0]
+    if color_a.startswith("$"):
+        color_1 = int(color_a[1:], 16)
+    else:
+        # assume it's in our list of colors
+        color_1 = HTML_TO_NES[color_a.upper()]
+
+    if len(colors) == 1:
+        color_1, color_2 = extrapolate_color(color_1)
+    else:
+        color_b = colors[1]
+        if color_b.startswith("$"):
+            color_2 = int(color_b[1:], 16)
+        else:
+            color_2 = HTML_TO_NES[color_b.upper()]
+    return color_1, color_2
+
+
+def write_palette_shuffle(world: "MM3World", rom: "MM3ProcedurePatch") -> None:
+    palette_shuffle: int | str = world.options.palette_shuffle.value
+    palettes_to_write: dict[str, tuple[int, int]] = {}
+    if isinstance(palette_shuffle, str):
+        color_sets = palette_shuffle.split(";")
+        if len(color_sets) == 1:
+            palette_shuffle = world.options.palette_shuffle.option_none
+            # singularity is more correct, but this is faster
+        else:
+            palette_shuffle = world.options.palette_shuffle.options[color_sets.pop()]
+        for color_set in color_sets:
+            if "-" in color_set:
+                character, color = color_set.split("-")
+                if character.title() not in palette_pointers:
+                    logging.warning(f"Player {world.player_name} "
+                                    f"attempted to set color for unrecognized option {character}")
+                colors = color.split("|")
+                real_colors = validate_colors(*parse_color(colors), allow_match=True)
+                palettes_to_write[character.title()] = real_colors
+            else:
+                # If color is provided with no character, assume singularity
+                colors = color_set.split("|")
+                real_colors = validate_colors(*parse_color(colors), allow_match=True)
+                for character in palette_pointers:
+                    palettes_to_write[character] = real_colors
+        # Now we handle the real values
+    if palette_shuffle != 0:
+        if palette_shuffle > 1:
+            if palette_shuffle == 3:
+                # singularity
+                real_colors = validate_colors(world.random.randint(0, 0x3F), world.random.randint(0, 0x3F))
+                for character in palette_pointers:
+                    if character not in palettes_to_write:
+                        palettes_to_write[character] = real_colors
+            else:
+                for character in palette_pointers:
+                    if character not in palettes_to_write:
+                        real_colors = validate_colors(world.random.randint(0, 0x3F), world.random.randint(0, 0x3F))
+                        palettes_to_write[character] = real_colors
+        else:
+            shuffled_colors = list(MM3_COLORS.values())[:-3]  # only include one Doc Robot
+            shuffled_colors.append((0x2C, 0x11))  # Mega Buster
+            world.random.shuffle(shuffled_colors)
+            for character in palette_pointers:
+                if character not in palettes_to_write:
+                    palettes_to_write[character] = shuffled_colors.pop()
+
+    for character in palettes_to_write:
+        for pointer in palette_pointers[character]:
+            rom.write_bytes(pointer + 2, bytes(palettes_to_write[character]))
diff --git a/worlds/mm3/data/mm3_basepatch.bsdiff4 b/worlds/mm3/data/mm3_basepatch.bsdiff4
new file mode 100644
index 0000000000..f80cb76d67
Binary files /dev/null and b/worlds/mm3/data/mm3_basepatch.bsdiff4 differ
diff --git a/worlds/mm3/docs/en_Mega Man 3.md b/worlds/mm3/docs/en_Mega Man 3.md
new file mode 100644
index 0000000000..abb619858c
--- /dev/null
+++ b/worlds/mm3/docs/en_Mega Man 3.md	
@@ -0,0 +1,131 @@
+# Mega Man 3
+
+## 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?
+
+Weapons received from Robot Masters, access to each individual stage (including Doc Robot stages), and Items from Dr. Light are randomized
+into the multiworld. Access to the Wily Stages is locked behind clearing the 4 Doc Robot stages and defeating Break Man. The game is complete upon 
+viewing the ending sequence after defeating Gamma.
+
+## What Mega Man 3 items can appear in other players' worlds?
+- Robot Master weapons
+- Robot Master Access Codes (stage access)
+- Doc Robot Access Codes (stage access)
+- Rush Coil/Jet/Marine
+- 1-Ups
+- E-Tanks
+- Health Energy (L)
+- Weapon Energy (L)
+
+## What is considered a location check in Mega Man 3?
+- The defeat of a Robot Master, Doc Robot, or Wily Boss
+- Receiving a weapon or Rush item from Dr. Light
+- Optionally, 1-Ups and E-Tanks present within stages
+- Optionally, Weapon and Health Energy pickups present within stages
+
+## When the player receives an item, what happens?
+A sound effect will play based on the type of item received, and the effects of the item will be immediately applied, 
+such as unlocking the use of a weapon mid-stage. If the effects of the item cannot be fully applied (such as receiving 
+Health Energy while at full health), the remaining are withheld until they can be applied.
+
+## How do I access the Doc Robot stages?
+By pressing Select on the Robot Master screen, the screen will transition between Robot Masters and
+Doc Robots.
+
+## Useful Information
+* **NesHawk is the recommended core for this game!** Players using QuickNes (or QuickerNes) will experience graphical 
+  glitches while in Gemini Man's stage and fighting Gamma.
+* Pressing A+B+Start+Select while in a stage will take you to the Game Over screen, allowing you to leave the stage. 
+  Your E-Tanks will be preserved.
+* Your current progress through the Wily stages is saved to the multiworld, allowing you to return to the last stage you
+  reached should you need to leave and enter a Robot Master stage. If you need to return to an earlier Wily stage, holding 
+  Select while entering Break Man's stage will take you to Wily 1.
+* When Random Weaknesses are enabled, Break Man's weakness will be changed from Mega Buster to one random weapon.
+
+
+## What is EnergyLink?
+EnergyLink is an energy storage supported by certain games that is shared across all worlds in a multiworld. In Mega Man
+ 3, when enabled, drops from enemies are not applied directly to Mega Man and are instead deposited into the EnergyLink.
+Half of the energy that would be gained is lost upon transfer to the EnergyLink. 
+
+Energy from the EnergyLink storage can be converted into health, weapon energy, and lives at different conversion rates.
+You can find out how much of each type you can pull using `/pool` in the client. Additionally, you can have it 
+automatically pull from the EnergyLink storage to keep Mega Man healed using the `/autoheal` command in the client. 
+Finally, you can use the `/request` command to request a certain type of energy from the storage.
+
+## Plando Palettes
+The palette shuffle option supports specifying a specific palette for a given weapon/Robot Master. The format for doing 
+so is `Character-Color1|Color2;Option`. Character is the individual that this should apply to, and can only be one of 
+the following:
+- Mega Buster
+- Gemini Laser
+- Needle Cannon
+- Hard Knuckle
+- Magnet Missile
+- Top Spin
+- Search Snake
+- Spark Shot
+- Shadow Blade
+- Rush Coil
+- Rush Jet
+- Rush Marine
+- Needle Man
+- Magnet Man
+- Gemini Man
+- Hard Man
+- Top Man
+- Snake Man
+- Spark Man
+- Shadow Man
+- Doc Robot
+
+Colors attempt to map a list of HTML-defined colors to what the NES can render. A full list of applicable colors can be
+found [here](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/mm2/Color.py#L11). Alternatively, colors can 
+be supplied directly using `$xx` format. A full list of NES colors can be found [here](https://www.nesdev.org/wiki/PPU_palettes#2C02).
+
+You can also pass only one color (such as `Mega Buster-Red`) and it will interpret a second color based off of the color
+given. Additionally, passing only colors (such as `Red|Blue`) and not any specific boss/weapon will apply that color to 
+all weapons/bosses that did not have a prior color specified.
+
+The option is the method to be used to set the palettes of the remaining bosses/weapons, and will not overwrite any 
+plando placements.
+
+## Plando Weaknesses
+Plando Weaknesses allows you to override the amount of damage a boss should take from a given weapon, ignoring prior 
+weaknesses generated by strict/random weakness options. Formatting for this is as follows:
+```yaml
+plando_weakness:
+  Needle Man:
+    Top Spin: 0
+    Hard Knuckle: 4
+```
+This would cause Air Man to take 4 damage from Hard Knuckle, and 0 from Top Spin.
+
+Note: it is possible that plando weakness is not be respected should the plando create a situation in which the game 
+becomes impossible to complete. In this situation, the damage would be boosted to the minimum required to defeat the 
+Robot Master.
+
+
+## Unique Local Commands
+- `/pool` Only present with EnergyLink, prints the max amount of each type of request that could be fulfilled.
+- `/autoheal` Only present with EnergyLink, will automatically drain energy from the EnergyLink in order to 
+restore Mega Man's health.
+- `/request <amount> <type>` Only present with EnergyLink, sends a request of a certain type of energy to be pulled from
+the EnergyLink. Types are as follows:
+  - `HP` Health
+  - `NE` Needle Cannon
+  - `MA` Magnet Missile
+  - `GE` Gemini Laser
+  - `HA` Hard Knuckle
+  - `TO` Top Spin
+  - `SN` Search Snake
+  - `SP` Spark Shot
+  - `SH` Shadow Blade
+  - `RC` Rush Coil
+  - `RM` Rush Marine
+  - `RJ` Rush Jet
+  - `1U` Lives
\ No newline at end of file
diff --git a/worlds/mm3/docs/setup_en.md b/worlds/mm3/docs/setup_en.md
new file mode 100644
index 0000000000..07cae74a8a
--- /dev/null
+++ b/worlds/mm3/docs/setup_en.md
@@ -0,0 +1,53 @@
+# Mega Man 3 Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+- An English Mega Man 3 ROM. Alternatively, the [Mega Man Legacy Collection](https://store.steampowered.com/app/363440/Mega_Man_Legacy_Collection/) on Steam.
+- [BizHawk](https://tasvideos.org/BizHawk/ReleaseHistory) 2.7 or later. Bizhawk 2.10
+
+### Configuring Bizhawk
+
+Once you have installed BizHawk, open `EmuHawk.exe` and change the following settings:
+
+- If you're using BizHawk 2.7 or 2.8, go to `Config > Customize`. On the Advanced tab, switch the Lua Core from
+`NLua+KopiLua` to `Lua+LuaInterface`, then restart EmuHawk. (If you're using BizHawk 2.9, you can skip this step.)
+- Under `Config > Customize`, check the "Run in background" option to prevent disconnecting from the client while you're
+tabbed out of EmuHawk.
+- Open a `.nes` file in EmuHawk and go to `Config > Controllers…` to configure your inputs. If you can't click
+`Controllers…`, load any `.nes` ROM first.
+- Consider clearing keybinds in `Config > Hotkeys…` if you don't intend to use them. Select the keybind and press Esc to
+clear it.
+
+## Generating and Patching a Game
+
+1. Create your options file (YAML). You can make one on the
+[Mega Man 3 options page](../../../games/Mega%20Man%203/player-options).
+2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+This will generate an output file for you. Your patch file will have the `.apmm3` file extension.
+3. Open `ArchipelagoLauncher.exe`
+4. Select "Open Patch" on the left side and select your patch file.
+5. If this is your first time patching, you will be prompted to locate your vanilla ROM. If you are using the Legacy 
+Collection, provide `Proteus.exe` in place of your rom.
+6. A patched `.nes` file will be created in the same place as the patch file.
+7. On your first time opening a patch with BizHawk Client, you will also be asked to locate `EmuHawk.exe` in your
+BizHawk install.
+
+## Connecting to a Server
+
+By default, opening a patch file will do steps 1-5 below for you automatically. Even so, keep them in your memory just
+in case you have to close and reopen a window mid-game for some reason.
+
+1. Mega Man 3 uses Archipelago's BizHawk Client. If the client isn't still open from when you patched your game,
+you can re-open it from the launcher.
+2. Ensure EmuHawk is running the patched ROM.
+3. In EmuHawk, go to `Tools > Lua Console`. This window must stay open while playing.
+4. In the Lua Console window, go to `Script > Open Script…`.
+5. Navigate to your Archipelago install folder and open `data/lua/connector_bizhawk_generic.lua`.
+6. The emulator and client will eventually connect to each other. The BizHawk Client window should indicate that it
+connected and recognized Mega Man 3.
+7. To connect the client to the server, enter your room's address and port (e.g. `archipelago.gg:38281`) into the
+top text field of the client and click Connect.
+
+You should now be able to receive and send items. You'll need to do these steps every time you want to reconnect. It is
+perfectly safe to make progress offline; everything will re-sync when you reconnect.
diff --git a/worlds/mm3/items.py b/worlds/mm3/items.py
new file mode 100644
index 0000000000..40e6114fff
--- /dev/null
+++ b/worlds/mm3/items.py
@@ -0,0 +1,80 @@
+from BaseClasses import Item
+from typing import NamedTuple
+from .names import (needle_cannon, magnet_missile, gemini_laser, hard_knuckle, top_spin, search_snake, spark_shock,
+                    shadow_blade, rush_coil, rush_marine, rush_jet, needle_man_stage, magnet_man_stage,
+                    gemini_man_stage, hard_man_stage, top_man_stage, snake_man_stage, spark_man_stage, shadow_man_stage,
+                    doc_needle_stage, doc_gemini_stage, doc_spark_stage, doc_shadow_stage, e_tank, weapon_energy,
+                    health_energy, one_up)
+
+
+class ItemData(NamedTuple):
+    code: int
+    progression: bool
+    useful: bool = False  # primarily use this for incredibly useful items of their class, like Metal Blade
+    skip_balancing: bool = False
+
+
+class MM3Item(Item):
+    game = "Mega Man 3"
+
+
+robot_master_weapon_table = {
+    needle_cannon: ItemData(0x0001, True),
+    magnet_missile: ItemData(0x0002, True, True),
+    gemini_laser: ItemData(0x0003, True),
+    hard_knuckle: ItemData(0x0004, True),
+    top_spin: ItemData(0x0005, True, True),
+    search_snake: ItemData(0x0006, True),
+    spark_shock: ItemData(0x0007, True),
+    shadow_blade: ItemData(0x0008, True, True),
+}
+
+stage_access_table = {
+    needle_man_stage: ItemData(0x0101, True),
+    magnet_man_stage: ItemData(0x0102, True),
+    gemini_man_stage: ItemData(0x0103, True),
+    hard_man_stage: ItemData(0x0104, True),
+    top_man_stage: ItemData(0x0105, True),
+    snake_man_stage: ItemData(0x0106, True),
+    spark_man_stage: ItemData(0x0107, True),
+    shadow_man_stage: ItemData(0x0108, True),
+    doc_needle_stage: ItemData(0x0111, True, True),
+    doc_gemini_stage: ItemData(0x0113, True, True),
+    doc_spark_stage: ItemData(0x0117, True, True),
+    doc_shadow_stage: ItemData(0x0118, True, True),
+}
+
+rush_item_table = {
+    rush_coil: ItemData(0x0011, True, True),
+    rush_marine: ItemData(0x0012, True),
+    rush_jet: ItemData(0x0013, True, True),
+}
+
+filler_item_table = {
+    one_up: ItemData(0x0020, False),
+    weapon_energy: ItemData(0x0021, False),
+    health_energy: ItemData(0x0022, False),
+    e_tank: ItemData(0x0023, False, True),
+}
+
+filler_item_weights = {
+    one_up: 1,
+    weapon_energy: 4,
+    health_energy: 1,
+    e_tank: 2,
+}
+
+item_table = {
+    **robot_master_weapon_table,
+    **stage_access_table,
+    **rush_item_table,
+    **filler_item_table,
+}
+
+item_names = {
+    "Weapons": {name for name in robot_master_weapon_table.keys()},
+    "Stages": {name for name in stage_access_table.keys()},
+    "Rush": {name for name in rush_item_table.keys()}
+}
+
+lookup_item_to_id: dict[str, int] = {item_name: data.code for item_name, data in item_table.items() if data.code}
diff --git a/worlds/mm3/locations.py b/worlds/mm3/locations.py
new file mode 100644
index 0000000000..2504236bda
--- /dev/null
+++ b/worlds/mm3/locations.py
@@ -0,0 +1,312 @@
+from BaseClasses import Location, Region
+from typing import NamedTuple
+from . import names
+
+
+class MM3Location(Location):
+    game = "Mega Man 3"
+
+
+class MM3Region(Region):
+    game = "Mega Man 3"
+
+
+class LocationData(NamedTuple):
+    location_id: int | None
+    energy: bool = False
+    oneup_tank: bool = False
+
+
+class RegionData(NamedTuple):
+    locations: dict[str, LocationData]
+    required_items: list[str]
+    parent: str = ""
+
+mm3_regions: dict[str, RegionData] = {
+    "Needle Man Stage": RegionData({
+        names.needle_man: LocationData(0x0001),
+        names.get_needle_cannon: LocationData(0x0101),
+        names.get_rush_jet: LocationData(0x0111),
+        names.needle_man_c1: LocationData(0x0200, energy=True),
+        names.needle_man_c2: LocationData(0x0201, oneup_tank=True),
+    }, [names.needle_man_stage]),
+
+    "Magnet Man Stage": RegionData({
+        names.magnet_man: LocationData(0x0002),
+        names.get_magnet_missile: LocationData(0x0102),
+        names.magnet_man_c1: LocationData(0x0202, energy=True),
+        names.magnet_man_c2: LocationData(0x0203, energy=True),
+        names.magnet_man_c3: LocationData(0x0204, energy=True),
+        names.magnet_man_c4: LocationData(0x0205, energy=True),
+        names.magnet_man_c5: LocationData(0x0206, energy=True),
+        names.magnet_man_c6: LocationData(0x0207, energy=True),
+        names.magnet_man_c7: LocationData(0x0208, energy=True),
+        names.magnet_man_c8: LocationData(0x0209, energy=True),
+    }, [names.magnet_man_stage]),
+
+    "Gemini Man Stage": RegionData({
+        names.gemini_man: LocationData(0x0003),
+        names.get_gemini_laser: LocationData(0x0103),
+        names.gemini_man_c1: LocationData(0x020A, oneup_tank=True),
+        names.gemini_man_c2: LocationData(0x020B, energy=True),
+        names.gemini_man_c3: LocationData(0x020C, oneup_tank=True),
+        names.gemini_man_c4: LocationData(0x020D, energy=True),
+        names.gemini_man_c5: LocationData(0x020E, energy=True),
+        names.gemini_man_c6: LocationData(0x020F, oneup_tank=True),
+        names.gemini_man_c7: LocationData(0x0210, oneup_tank=True),
+        names.gemini_man_c8: LocationData(0x0211, energy=True),
+        names.gemini_man_c9: LocationData(0x0212, energy=True),
+        names.gemini_man_c10: LocationData(0x0213, oneup_tank=True),
+    }, [names.gemini_man_stage]),
+
+    "Hard Man Stage": RegionData({
+        names.hard_man: LocationData(0x0004),
+        names.get_hard_knuckle: LocationData(0x0104),
+        names.hard_man_c1: LocationData(0x0214, energy=True),
+        names.hard_man_c2: LocationData(0x0215, energy=True),
+        names.hard_man_c3: LocationData(0x0216, oneup_tank=True),
+        names.hard_man_c4: LocationData(0x0217, energy=True),
+        names.hard_man_c5: LocationData(0x0218, energy=True),
+        names.hard_man_c6: LocationData(0x0219, energy=True),
+        names.hard_man_c7: LocationData(0x021A, energy=True),
+    }, [names.hard_man_stage]),
+
+    "Top Man Stage": RegionData({
+        names.top_man: LocationData(0x0005),
+        names.get_top_spin: LocationData(0x0105),
+        names.top_man_c1: LocationData(0x021B, energy=True),
+        names.top_man_c2: LocationData(0x021C, energy=True),
+        names.top_man_c3: LocationData(0x021D, energy=True),
+        names.top_man_c4: LocationData(0x021E, energy=True),
+        names.top_man_c5: LocationData(0x021F, energy=True),
+        names.top_man_c6: LocationData(0x0220, oneup_tank=True),
+        names.top_man_c7: LocationData(0x0221, energy=True),
+        names.top_man_c8: LocationData(0x0222, energy=True),
+    }, [names.top_man_stage]),
+
+    "Snake Man Stage": RegionData({
+        names.snake_man: LocationData(0x0006),
+        names.get_search_snake: LocationData(0x0106),
+        names.snake_man_c1: LocationData(0x0223, energy=True),
+        names.snake_man_c2: LocationData(0x0224, energy=True),
+        names.snake_man_c3: LocationData(0x0225, oneup_tank=True),
+        names.snake_man_c4: LocationData(0x0226, oneup_tank=True),
+        names.snake_man_c5: LocationData(0x0227, energy=True),
+    }, [names.snake_man_stage]),
+
+    "Spark Man Stage": RegionData({
+        names.spark_man: LocationData(0x0007),
+        names.get_spark_shock: LocationData(0x0107),
+        names.spark_man_c1: LocationData(0x0228, energy=True),
+        names.spark_man_c2: LocationData(0x0229, energy=True),
+        names.spark_man_c3: LocationData(0x022A, energy=True),
+        names.spark_man_c4: LocationData(0x022B, energy=True),
+        names.spark_man_c5: LocationData(0x022C, energy=True),
+        names.spark_man_c6: LocationData(0x022D, energy=True),
+    }, [names.spark_man_stage]),
+
+    "Shadow Man Stage": RegionData({
+        names.shadow_man: LocationData(0x0008),
+        names.get_shadow_blade: LocationData(0x0108),
+        names.get_rush_marine: LocationData(0x0112),
+        names.shadow_man_c1: LocationData(0x022E, energy=True),
+        names.shadow_man_c2: LocationData(0x022F, energy=True),
+        names.shadow_man_c3: LocationData(0x0230, energy=True),
+        names.shadow_man_c4: LocationData(0x0231, energy=True),
+    }, [names.shadow_man_stage]),
+
+    "Doc Robot (Needle) - Air": RegionData({
+        names.doc_air: LocationData(0x0010),
+        names.doc_needle_c1: LocationData(0x0232, energy=True),
+        names.doc_needle_c2: LocationData(0x0233, oneup_tank=True),
+        names.doc_needle_c3: LocationData(0x0234, oneup_tank=True),
+    }, [names.doc_needle_stage]),
+
+    "Doc Robot (Needle) - Crash": RegionData({
+        names.doc_crash: LocationData(0x0011),
+        names.doc_needle: LocationData(None),
+        names.doc_needle_c4: LocationData(0x0235, energy=True),
+        names.doc_needle_c5: LocationData(0x0236, energy=True),
+        names.doc_needle_c6: LocationData(0x0237, energy=True),
+        names.doc_needle_c7: LocationData(0x0238, energy=True),
+        names.doc_needle_c8: LocationData(0x0239, energy=True),
+        names.doc_needle_c9: LocationData(0x023A, energy=True),
+        names.doc_needle_c10: LocationData(0x023B, energy=True),
+        names.doc_needle_c11: LocationData(0x023C, energy=True),
+    }, [], parent="Doc Robot (Needle) - Air"),
+
+    "Doc Robot (Gemini) - Flash": RegionData({
+        names.doc_flash: LocationData(0x0012),
+        names.doc_gemini_c1: LocationData(0x023D, oneup_tank=True),
+        names.doc_gemini_c2: LocationData(0x023E, oneup_tank=True),
+    }, [names.doc_gemini_stage]),
+
+    "Doc Robot (Gemini) - Bubble": RegionData({
+        names.doc_bubble: LocationData(0x0013),
+        names.doc_gemini: LocationData(None),
+        names.doc_gemini_c3: LocationData(0x023F, energy=True),
+        names.doc_gemini_c4: LocationData(0x0240, energy=True),
+    }, [], parent="Doc Robot (Gemini) - Flash"),
+
+    "Doc Robot (Shadow) - Wood": RegionData({
+        names.doc_wood: LocationData(0x0014),
+    }, [names.doc_shadow_stage]),
+
+    "Doc Robot (Shadow) - Heat": RegionData({
+        names.doc_heat: LocationData(0x0015),
+        names.doc_shadow: LocationData(None),
+        names.doc_shadow_c1: LocationData(0x0243, energy=True),
+        names.doc_shadow_c2: LocationData(0x0244, energy=True),
+        names.doc_shadow_c3: LocationData(0x0245, energy=True),
+        names.doc_shadow_c4: LocationData(0x0246, energy=True),
+        names.doc_shadow_c5: LocationData(0x0247, energy=True),
+    }, [], parent="Doc Robot (Shadow) - Wood"),
+
+    "Doc Robot (Spark) - Metal": RegionData({
+        names.doc_metal: LocationData(0x0016),
+        names.doc_spark_c1: LocationData(0x0241, energy=True),
+    }, [names.doc_spark_stage]),
+
+    "Doc Robot (Spark) - Quick": RegionData({
+        names.doc_quick: LocationData(0x0017),
+        names.doc_spark: LocationData(None),
+        names.doc_spark_c2: LocationData(0x0242, energy=True),
+    }, [], parent="Doc Robot (Spark) - Metal"),
+
+    "Break Man": RegionData({
+        names.break_man: LocationData(0x000F),
+        names.break_stage: LocationData(None),
+    }, [names.doc_needle, names.doc_gemini, names.doc_spark, names.doc_shadow]),
+
+    "Wily Stage 1": RegionData({
+        names.wily_1_boss: LocationData(0x0009),
+        names.wily_stage_1: LocationData(None),
+        names.wily_1_c1: LocationData(0x0248, oneup_tank=True),
+        names.wily_1_c2: LocationData(0x0249, oneup_tank=True),
+        names.wily_1_c3: LocationData(0x024A, energy=True),
+        names.wily_1_c4: LocationData(0x024B, oneup_tank=True),
+        names.wily_1_c5: LocationData(0x024C, energy=True),
+        names.wily_1_c6: LocationData(0x024D, energy=True),
+        names.wily_1_c7: LocationData(0x024E, energy=True),
+        names.wily_1_c8: LocationData(0x024F, oneup_tank=True),
+        names.wily_1_c9: LocationData(0x0250, energy=True),
+        names.wily_1_c10: LocationData(0x0251, energy=True),
+        names.wily_1_c11: LocationData(0x0252, energy=True),
+        names.wily_1_c12: LocationData(0x0253, energy=True),
+    }, [names.break_stage], parent="Break Man"),
+
+    "Wily Stage 2": RegionData({
+        names.wily_2_boss: LocationData(0x000A),
+        names.wily_stage_2: LocationData(None),
+        names.wily_2_c1: LocationData(0x0254, energy=True),
+        names.wily_2_c2: LocationData(0x0255, energy=True),
+        names.wily_2_c3: LocationData(0x0256, oneup_tank=True),
+        names.wily_2_c4: LocationData(0x0257, energy=True),
+        names.wily_2_c5: LocationData(0x0258, energy=True),
+        names.wily_2_c6: LocationData(0x0259, energy=True),
+        names.wily_2_c7: LocationData(0x025A, energy=True),
+        names.wily_2_c8: LocationData(0x025B, energy=True),
+        names.wily_2_c9: LocationData(0x025C, oneup_tank=True),
+        names.wily_2_c10: LocationData(0x025D, energy=True),
+        names.wily_2_c11: LocationData(0x025E, oneup_tank=True),
+        names.wily_2_c12: LocationData(0x025F, energy=True),
+        names.wily_2_c13: LocationData(0x0260, energy=True),
+    }, [names.wily_stage_1], parent="Wily Stage 1"),
+
+    "Wily Stage 3": RegionData({
+        names.wily_3_boss: LocationData(0x000B),
+        names.wily_stage_3: LocationData(None),
+        names.wily_3_c1: LocationData(0x0261, energy=True),
+        names.wily_3_c2: LocationData(0x0262, energy=True),
+        names.wily_3_c3: LocationData(0x0263, oneup_tank=True),
+        names.wily_3_c4: LocationData(0x0264, oneup_tank=True),
+        names.wily_3_c5: LocationData(0x0265, energy=True),
+        names.wily_3_c6: LocationData(0x0266, energy=True),
+        names.wily_3_c7: LocationData(0x0267, energy=True),
+        names.wily_3_c8: LocationData(0x0268, energy=True),
+        names.wily_3_c9: LocationData(0x0269, energy=True),
+        names.wily_3_c10: LocationData(0x026A, oneup_tank=True),
+        names.wily_3_c11: LocationData(0x026B, oneup_tank=True)
+    }, [names.wily_stage_2], parent="Wily Stage 2"),
+
+    "Wily Stage 4": RegionData({
+        names.wily_stage_4: LocationData(None),
+        names.wily_4_c1: LocationData(0x026C, energy=True),
+        names.wily_4_c2: LocationData(0x026D, energy=True),
+        names.wily_4_c3: LocationData(0x026E, energy=True),
+        names.wily_4_c4: LocationData(0x026F, energy=True),
+        names.wily_4_c5: LocationData(0x0270, energy=True),
+        names.wily_4_c6: LocationData(0x0271, energy=True),
+        names.wily_4_c7: LocationData(0x0272, energy=True),
+        names.wily_4_c8: LocationData(0x0273, energy=True),
+        names.wily_4_c9: LocationData(0x0274, energy=True),
+        names.wily_4_c10: LocationData(0x0275, oneup_tank=True),
+        names.wily_4_c11: LocationData(0x0276, energy=True),
+        names.wily_4_c12: LocationData(0x0277, oneup_tank=True),
+        names.wily_4_c13: LocationData(0x0278, energy=True),
+        names.wily_4_c14: LocationData(0x0279, energy=True),
+        names.wily_4_c15: LocationData(0x027A, energy=True),
+        names.wily_4_c16: LocationData(0x027B, energy=True),
+        names.wily_4_c17: LocationData(0x027C, energy=True),
+        names.wily_4_c18: LocationData(0x027D, energy=True),
+        names.wily_4_c19: LocationData(0x027E, energy=True),
+        names.wily_4_c20: LocationData(0x027F, energy=True),
+    }, [names.wily_stage_3], parent="Wily Stage 3"),
+
+    "Wily Stage 5": RegionData({
+        names.wily_5_boss: LocationData(0x000D),
+        names.wily_stage_5: LocationData(None),
+        names.wily_5_c1: LocationData(0x0280, energy=True),
+        names.wily_5_c2: LocationData(0x0281, energy=True),
+        names.wily_5_c3: LocationData(0x0282, oneup_tank=True),
+        names.wily_5_c4: LocationData(0x0283, oneup_tank=True),
+    }, [names.wily_stage_4], parent="Wily Stage 4"),
+
+    "Wily Stage 6": RegionData({
+        names.gamma: LocationData(None),
+        names.wily_6_c1: LocationData(0x0284, oneup_tank=True),
+        names.wily_6_c2: LocationData(0x0285, oneup_tank=True),
+        names.wily_6_c3: LocationData(0x0286, energy=True),
+        names.wily_6_c4: LocationData(0x0287, energy=True),
+        names.wily_6_c5: LocationData(0x0288, oneup_tank=True),
+        names.wily_6_c6: LocationData(0x0289, oneup_tank=True),
+        names.wily_6_c7: LocationData(0x028A, energy=True),
+    }, [names.wily_stage_5], parent="Wily Stage 5"),
+}
+
+
+def get_boss_locations(region: str) -> list[str]:
+    return [location for location, data in mm3_regions[region].locations.items()
+            if not data.energy and not data.oneup_tank]
+
+
+def get_energy_locations(region: str) -> list[str]:
+    return [location for location, data in mm3_regions[region].locations.items() if data.energy]
+
+
+def get_oneup_locations(region: str) -> list[str]:
+    return [location for location, data in mm3_regions[region].locations.items() if data.oneup_tank]
+
+
+location_table: dict[str, int | None] = {
+    location: data.location_id for region in mm3_regions.values() for location, data in region.locations.items()
+}
+
+
+location_groups = {
+    "Get Equipped": {
+        names.get_needle_cannon,
+        names.get_magnet_missile,
+        names.get_gemini_laser,
+        names.get_hard_knuckle,
+        names.get_top_spin,
+        names.get_search_snake,
+        names.get_spark_shock,
+        names.get_shadow_blade,
+        names.get_rush_marine,
+        names.get_rush_jet,
+    },
+    **{name: {location for location, data in region.locations.items() if data.location_id} for name, region in mm3_regions.items()}
+}
+
+lookup_location_to_id: dict[str, int] = {location: idx for location, idx in location_table.items() if idx is not None}
diff --git a/worlds/mm3/names.py b/worlds/mm3/names.py
new file mode 100644
index 0000000000..dfad752676
--- /dev/null
+++ b/worlds/mm3/names.py
@@ -0,0 +1,221 @@
+# Robot Master Weapons
+gemini_laser = "Gemini Laser"
+needle_cannon = "Needle Cannon"
+hard_knuckle = "Hard Knuckle"
+magnet_missile = "Magnet Missile"
+top_spin = "Top Spin"
+search_snake = "Search Snake"
+spark_shock = "Spark Shock"
+shadow_blade = "Shadow Blade"
+
+# Rush
+rush_coil = "Rush Coil"
+rush_jet = "Rush Jet"
+rush_marine = "Rush Marine"
+
+# Access Codes
+needle_man_stage = "Needle Man Access Codes"
+magnet_man_stage = "Magnet Man Access Codes"
+gemini_man_stage = "Gemini Man Access Codes"
+hard_man_stage = "Hard Man Access Codes"
+top_man_stage = "Top Man Access Codes"
+snake_man_stage = "Snake Man Access Codes"
+spark_man_stage = "Spark Man Access Codes"
+shadow_man_stage = "Shadow Man Access Codes"
+doc_needle_stage = "Doc Robot (Needle) Access Codes"
+doc_gemini_stage = "Doc Robot (Gemini) Access Codes"
+doc_spark_stage = "Doc Robot (Spark) Access Codes"
+doc_shadow_stage = "Doc Robot (Shadow) Access Codes"
+
+# Misc. Items
+one_up = "1-Up"
+weapon_energy = "Weapon Energy (L)"
+health_energy = "Health Energy (L)"
+e_tank = "E-Tank"
+
+needle_man = "Needle Man - Defeated"
+magnet_man = "Magnet Man - Defeated"
+gemini_man = "Gemini Man - Defeated"
+hard_man = "Hard Man - Defeated"
+top_man = "Top Man - Defeated"
+snake_man = "Snake Man - Defeated"
+spark_man = "Spark Man - Defeated"
+shadow_man = "Shadow Man - Defeated"
+doc_air = "Doc Robot (Air) - Defeated"
+doc_crash = "Doc Robot (Crash) - Defeated"
+doc_flash = "Doc Robot (Flash) - Defeated"
+doc_bubble = "Doc Robot (Bubble) - Defeated"
+doc_wood = "Doc Robot (Wood) - Defeated"
+doc_heat = "Doc Robot (Heat) - Defeated"
+doc_metal = "Doc Robot (Metal) - Defeated"
+doc_quick = "Doc Robot (Quick) - Defeated"
+break_man = "Break Man - Defeated"
+wily_1_boss = "Kamegoro Maker - Defeated"
+wily_2_boss = "Yellow Devil MK-II - Defeated"
+wily_3_boss = "Holograph Mega Man - Defeated"
+wily_5_boss = "Wily Machine 3 - Defeated"
+gamma = "Gamma - Defeated"
+
+get_gemini_laser = "Gemini Laser - Received"
+get_needle_cannon = "Needle Cannon - Received"
+get_hard_knuckle = "Hard Knuckle - Received"
+get_magnet_missile = "Magnet Missile - Received"
+get_top_spin = "Top Spin - Received"
+get_search_snake = "Search Snake - Received"
+get_spark_shock = "Spark Shock - Received"
+get_shadow_blade = "Shadow Blade - Received"
+get_rush_jet = "Rush Jet - Received"
+get_rush_marine = "Rush Marine - Received"
+
+# Wily Stage Event Items
+doc_needle = "Doc Robot (Needle) - Completed"
+doc_gemini = "Doc Robot (Gemini) - Completed"
+doc_spark = "Doc Robot (Spark) - Completed"
+doc_shadow = "Doc Robot (Shadow) - Completed"
+break_stage = "Break Man"
+wily_stage_1 = "Wily Stage 1 - Completed"
+wily_stage_2 = "Wily Stage 2 - Completed"
+wily_stage_3 = "Wily Stage 3 - Completed"
+wily_stage_4 = "Wily Stage 4 - Completed"
+wily_stage_5 = "Wily Stage 5 - Completed"
+
+# Consumable Locations
+needle_man_c1 = "Needle Man Stage - Weapon Energy 1"
+needle_man_c2 = "Needle Man Stage - E-Tank"
+magnet_man_c1 = "Magnet Man Stage - Health Energy 1"
+magnet_man_c2 = "Magnet Man Stage - Health Energy 2"
+magnet_man_c3 = "Magnet Man Stage - Health Energy 3"
+magnet_man_c4 = "Magnet Man Stage - Health Energy 4"
+magnet_man_c5 = "Magnet Man Stage - Weapon Energy 1"
+magnet_man_c6 = "Magnet Man Stage - Weapon Energy 2"
+magnet_man_c7 = "Magnet Man Stage - Weapon Energy 3"
+magnet_man_c8 = "Magnet Man Stage - Health Energy 5"
+gemini_man_c1 = "Gemini Man Stage - 1-Up 1"
+gemini_man_c2 = "Gemini Man Stage - Health Energy 1"
+gemini_man_c3 = "Gemini Man Stage - Mystery Tank"
+gemini_man_c4 = "Gemini Man Stage - Weapon Energy 1"
+gemini_man_c5 = "Gemini Man Stage - Health Energy 2"
+gemini_man_c6 = "Gemini Man Stage - 1-Up 2"
+gemini_man_c7 = "Gemini Man Stage - E-Tank 1"
+gemini_man_c8 = "Gemini Man Stage - Weapon Energy 2"
+gemini_man_c9 = "Gemini Man Stage - Weapon Energy 3"
+gemini_man_c10 = "Gemini Man Stage - E-Tank 2"
+hard_man_c1 = "Hard Man Stage - Health Energy 1"
+hard_man_c2 = "Hard Man Stage - Health Energy 2"
+hard_man_c3 = "Hard Man Stage - E-Tank"
+hard_man_c4 = "Hard Man Stage - Health Energy 3"
+hard_man_c5 = "Hard Man Stage - Health Energy 4"
+hard_man_c6 = "Hard Man Stage - Health Energy 5"
+hard_man_c7 = "Hard Man Stage - Health Energy 6"
+top_man_c1 = "Top Man Stage - Health Energy 1"
+top_man_c2 = "Top Man Stage - Health Energy 2"
+top_man_c3 = "Top Man Stage - Health Energy 3"
+top_man_c4 = "Top Man Stage - Health Energy 4"
+top_man_c5 = "Top Man Stage - Weapon Energy 1"
+top_man_c6 = "Top Man Stage - 1-Up"
+top_man_c7 = "Top Man Stage - Health Energy 5"
+top_man_c8 = "Top Man Stage - Health Energy 6"
+snake_man_c1 = "Snake Man Stage - Health Energy 1"
+snake_man_c2 = "Snake Man Stage - Health Energy 2"
+snake_man_c3 = "Snake Man Stage - Mystery Tank 1"
+snake_man_c4 = "Snake Man Stage - Mystery Tank 2"
+snake_man_c5 = "Snake Man Stage - Health Energy 3"
+spark_man_c1 = "Spark Man Stage - Health Energy 1"
+spark_man_c2 = "Spark Man Stage - Weapon Energy 1"
+spark_man_c3 = "Spark Man Stage - Weapon Energy 2"
+spark_man_c4 = "Spark Man Stage - Weapon Energy 3"
+spark_man_c5 = "Spark Man Stage - Weapon Energy 4"
+spark_man_c6 = "Spark Man Stage - Weapon Energy 5"
+shadow_man_c1 = "Shadow Man Stage - Weapon Energy 1"
+shadow_man_c2 = "Shadow Man Stage - Weapon Energy 2"
+shadow_man_c3 = "Shadow Man Stage - Weapon Energy 3"
+shadow_man_c4 = "Shadow Man Stage - Weapon Energy 4"
+doc_needle_c1 = "Doc Robot (Needle) - Health Energy 1"
+doc_needle_c2 = "Doc Robot (Needle) - 1-Up 1"
+doc_needle_c3 = "Doc Robot (Needle) - E-Tank 1"
+doc_needle_c4 = "Doc Robot (Needle) - Weapon Energy 1"
+doc_needle_c5 = "Doc Robot (Needle) - Weapon Energy 2"
+doc_needle_c6 = "Doc Robot (Needle) - Weapon Energy 3"
+doc_needle_c7 = "Doc Robot (Needle) - Weapon Energy 4"
+doc_needle_c8 = "Doc Robot (Needle) - Weapon Energy 5"
+doc_needle_c9 = "Doc Robot (Needle) - Weapon Energy 6"
+doc_needle_c10 = "Doc Robot (Needle) - Weapon Energy 7"
+doc_needle_c11 = "Doc Robot (Needle) - Health Energy 2"
+doc_gemini_c1 = "Doc Robot (Gemini) - Mystery Tank 1"
+doc_gemini_c2 = "Doc Robot (Gemini) - Mystery Tank 2"
+doc_gemini_c3 = "Doc Robot (Gemini) - Weapon Energy 1"
+doc_gemini_c4 = "Doc Robot (Gemini) - Weapon Energy 2"
+doc_spark_c1 = "Doc Robot (Spark) - Health Energy 1"
+doc_spark_c2 = "Doc Robot (Spark) - Health Energy 2"
+doc_shadow_c1 = "Doc Robot (Shadow) - Health Energy 1"
+doc_shadow_c2 = "Doc Robot (Shadow) - Weapon Energy 1"
+doc_shadow_c3 = "Doc Robot (Shadow) - Weapon Energy 2"
+doc_shadow_c4 = "Doc Robot (Shadow) - Weapon Energy 3"
+doc_shadow_c5 = "Doc Robot (Shadow) - Weapon Energy 4"
+wily_1_c1 = "Wily Stage 1 - 1-Up 1"
+wily_1_c2 = "Wily Stage 1 - E-Tank 1"
+wily_1_c3 = "Wily Stage 1 - Weapon Energy 1"
+wily_1_c4 = "Wily Stage 1 - 1-Up 2"  # Hard Knuckle
+wily_1_c5 = "Wily Stage 1 - Health Energy 1"  # Hard Knuckle
+wily_1_c6 = "Wily Stage 1 - Weapon Energy 2"  # Hard Knuckle & Rush Vertical
+wily_1_c7 = "Wily Stage 1 - Health Energy 2"  # Hard Knuckle & Rush Vertical
+wily_1_c8 = "Wily Stage 1 - E-Tank 2"  # Hard Knuckle & Rush Vertical
+wily_1_c9 = "Wily Stage 1 - Health Energy 3"
+wily_1_c10 = "Wily Stage 1 - Health Energy 4"
+wily_1_c11 = "Wily Stage 1 - Weapon Energy 3"  # Rush Vertical
+wily_1_c12 = "Wily Stage 1 - Weapon Energy 4"  # Rush Vertical
+wily_2_c1 = "Wily Stage 2 - Weapon Energy 1"
+wily_2_c2 = "Wily Stage 2 - Weapon Energy 2"
+wily_2_c3 = "Wily Stage 2 - 1-Up 1"
+wily_2_c4 = "Wily Stage 2 - Weapon Energy 3"
+wily_2_c5 = "Wily Stage 2 - Health Energy 1"
+wily_2_c6 = "Wily Stage 2 - Health Energy 2"
+wily_2_c7 = "Wily Stage 2 - Health Energy 3"
+wily_2_c8 = "Wily Stage 2 - Weapon Energy 4"
+wily_2_c9 = "Wily Stage 2 - E-Tank 1"
+wily_2_c10 = "Wily Stage 2 - Weapon Energy 5"
+wily_2_c11 = "Wily Stage 2 - E-Tank 2"
+wily_2_c12 = "Wily Stage 2 - Weapon Energy 6"
+wily_2_c13 = "Wily Stage 2 - Weapon Energy 7"
+wily_3_c1 = "Wily Stage 3 - Weapon Energy 1"  # Hard Knuckle
+wily_3_c2 = "Wily Stage 3 - Weapon Energy 2"  # Hard Knuckle
+wily_3_c3 = "Wily Stage 3 - E-Tank 1"
+wily_3_c4 = "Wily Stage 3 - 1-Up 1"
+wily_3_c5 = "Wily Stage 3 - Health Energy 1"
+wily_3_c6 = "Wily Stage 3 - Health Energy 2"
+wily_3_c7 = "Wily Stage 3 - Health Energy 3"
+wily_3_c8 = "Wily Stage 3 - Health Energy 4"
+wily_3_c9 = "Wily Stage 3 - Weapon Energy 3"
+wily_3_c10 = "Wily Stage 3 - Mystery Tank 1"  # Hard Knuckle
+wily_3_c11 = "Wily Stage 3 - Mystery Tank 2"  # Hard Knuckle
+wily_4_c1 = "Wily Stage 4 - Weapon Energy 1"
+wily_4_c2 = "Wily Stage 4 - Weapon Energy 2"
+wily_4_c3 = "Wily Stage 4 - Weapon Energy 3"
+wily_4_c4 = "Wily Stage 4 - Weapon Energy 4"
+wily_4_c5 = "Wily Stage 4 - Weapon Energy 5"
+wily_4_c6 = "Wily Stage 4 - Health Energy 1"
+wily_4_c7 = "Wily Stage 4 - Health Energy 2"
+wily_4_c8 = "Wily Stage 4 - Health Energy 3"
+wily_4_c9 = "Wily Stage 4 - Health Energy 4"
+wily_4_c10 = "Wily Stage 4 - Mystery Tank"
+wily_4_c11 = "Wily Stage 4 - Weapon Energy 6"
+wily_4_c12 = "Wily Stage 4 - 1-Up"
+wily_4_c13 = "Wily Stage 4 - Weapon Energy 7"
+wily_4_c14 = "Wily Stage 4 - Weapon Energy 8"
+wily_4_c15 = "Wily Stage 4 - Weapon Energy 9"
+wily_4_c16 = "Wily Stage 4 - Weapon Energy 10"
+wily_4_c17 = "Wily Stage 4 - Weapon Energy 11"
+wily_4_c18 = "Wily Stage 4 - Weapon Energy 12"
+wily_4_c19 = "Wily Stage 4 - Weapon Energy 13"
+wily_4_c20 = "Wily Stage 4 - Weapon Energy 14"
+wily_5_c1 = "Wily Stage 5 - Weapon Energy 1"
+wily_5_c2 = "Wily Stage 5 - Weapon Energy 2"
+wily_5_c3 = "Wily Stage 5 - Mystery Tank 1"
+wily_5_c4 = "Wily Stage 5 - Mystery Tank 2"
+wily_6_c1 = "Wily Stage 6 - Mystery Tank 1"
+wily_6_c2 = "Wily Stage 6 - Mystery Tank 2"
+wily_6_c3 = "Wily Stage 6 - Weapon Energy 1"
+wily_6_c4 = "Wily Stage 6 - Weapon Energy 2"
+wily_6_c5 = "Wily Stage 6 - 1-Up"
+wily_6_c6 = "Wily Stage 6 - E-Tank"
+wily_6_c7 = "Wily Stage 6 - Health Energy"
diff --git a/worlds/mm3/options.py b/worlds/mm3/options.py
new file mode 100644
index 0000000000..a1e9b24834
--- /dev/null
+++ b/worlds/mm3/options.py
@@ -0,0 +1,164 @@
+from dataclasses import dataclass
+
+from Options import Choice, Toggle, DeathLink, TextChoice, Range, OptionDict, PerGameCommonOptions
+from schema import Schema, And, Use, Optional
+from .rules import bosses, weapons_to_id
+
+
+class EnergyLink(Toggle):
+    """
+    Enables EnergyLink support.
+    When enabled, pickups dropped from enemies are sent to the EnergyLink pool, and healing/weapon energy/1-Ups can
+    be requested from the EnergyLink pool.
+    Some of the energy sent to the pool will be lost on transfer.
+    """
+    display_name = "EnergyLink"
+
+
+class StartingRobotMaster(Choice):
+    """
+    The initial stage unlocked at the start.
+    """
+    display_name = "Starting Robot Master"
+    option_needle_man = 0
+    option_magnet_man = 1
+    option_gemini_man = 2
+    option_hard_man = 3
+    option_top_man = 4
+    option_snake_man = 5
+    option_spark_man = 6
+    option_shadow_man = 7
+    default = "random"
+
+
+class Consumables(Choice):
+    """
+    When enabled, e-tanks/1-ups/health/weapon energy will be added to the pool of items and included as checks.
+    """
+    display_name = "Consumables"
+    option_none = 0
+    option_1up_etank = 1
+    option_weapon_health = 2
+    option_all = 3
+    default = 1
+    alias_true = 3
+    alias_false = 0
+
+    @classmethod
+    def get_option_name(cls, value: int) -> str:
+        if value == 1:
+            return "1-Ups/E-Tanks"
+        elif value == 2:
+            return "Weapon/Health Energy"
+        return super().get_option_name(value)
+
+
+class PaletteShuffle(TextChoice):
+    """
+    Change the color of Mega Man and the Robot Masters.
+    None: The palettes are unchanged.
+    Shuffled: Palette colors are shuffled amongst the robot masters.
+    Randomized: Random (usually good) palettes are generated for each robot master.
+    Singularity: one palette is generated and used for all robot masters.
+    Supports custom palettes using HTML named colors in the
+    following format: Mega Buster-Lavender|Violet;randomized
+    The first value is the character whose palette you'd like to define, then separated by - is a set of 2 colors for
+    that character. separate every color with a pipe, and separate every character as well as the remaining shuffle with
+    a semicolon.
+    """
+    display_name = "Palette Shuffle"
+    option_none = 0
+    option_shuffled = 1
+    option_randomized = 2
+    option_singularity = 3
+
+
+class EnemyWeaknesses(Toggle):
+    """
+    Randomizes the damage dealt to enemies by weapons. Certain enemies will always take damage from the buster.
+    """
+    display_name = "Random Enemy Weaknesses"
+
+
+class StrictWeaknesses(Toggle):
+    """
+    Only your starting Robot Master will take damage from the Mega Buster, the rest must be defeated with weapons.
+    Weapons that only do 1-3 damage to bosses no longer deal damage (aside from Wily/Gamma).
+    """
+    display_name = "Strict Boss Weaknesses"
+
+
+class RandomWeaknesses(Choice):
+    """
+    None: Bosses will have their regular weaknesses.
+    Shuffled: Weapon damage will be shuffled amongst the weapons, so Shadow Blade may do Top Spin damage.
+    Randomized: Weapon damage will be fully randomized.
+    """
+    display_name = "Random Boss Weaknesses"
+    option_none = 0
+    option_shuffled = 1
+    option_randomized = 2
+    alias_false = 0
+    alias_true = 2
+
+
+class Wily4Requirement(Range):
+    """
+    Change the amount of Robot Masters that are required to be defeated for
+    the door to the Wily Machine to open.
+    """
+    display_name = "Wily 4 Requirement"
+    default = 8
+    range_start = 1
+    range_end = 8
+
+
+class WeaknessPlando(OptionDict):
+    """
+    Specify specific damage numbers for boss damage. Can be used even without strict/random weaknesses.
+    plando_weakness:
+        Robot Master:
+            Weapon: Damage
+    """
+    display_name = "Plando Weaknesses"
+    schema = Schema({
+        Optional(And(str, Use(str.title), lambda s: s in bosses)): {
+            And(str, Use(str.title), lambda s: s in weapons_to_id): And(int, lambda i: i in range(0, 14))
+        }
+    })
+    default = {}
+
+
+class ReduceFlashing(Toggle):
+    """
+    Reduce flashing seen in gameplay, such as in stages and when defeating certain bosses.
+    """
+    display_name = "Reduce Flashing"
+
+
+class MusicShuffle(Choice):
+    """
+    Shuffle the music that plays in every stage
+    """
+    display_name = "Music Shuffle"
+    option_none = 0
+    option_shuffled = 1
+    option_randomized = 2
+    option_no_music = 3
+    default = 0
+
+
+@dataclass
+class MM3Options(PerGameCommonOptions):
+    death_link: DeathLink
+    energy_link: EnergyLink
+    starting_robot_master: StartingRobotMaster
+    consumables: Consumables
+    enemy_weakness: EnemyWeaknesses
+    strict_weakness: StrictWeaknesses
+    random_weakness: RandomWeaknesses
+    wily_4_requirement: Wily4Requirement
+    plando_weakness: WeaknessPlando
+    palette_shuffle: PaletteShuffle
+    reduce_flashing: ReduceFlashing
+    music_shuffle: MusicShuffle
diff --git a/worlds/mm3/rom.py b/worlds/mm3/rom.py
new file mode 100644
index 0000000000..8803f38cc5
--- /dev/null
+++ b/worlds/mm3/rom.py
@@ -0,0 +1,374 @@
+import pkgutil
+from typing import TYPE_CHECKING, Iterable
+import hashlib
+import Utils
+import os
+
+from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes
+from . import names
+from .rules import bosses
+
+from .text import MM3TextEntry
+from .color import get_colors_for_item, write_palette_shuffle
+from .options import Consumables
+
+if TYPE_CHECKING:
+    from . import MM3World
+
+MM3LCHASH = "5266687de215e790b2008284402f3917"
+PROTEUSHASH = "b69fff40212b80c94f19e786d1efbf61"
+MM3NESHASH = "4a53b6f58067d62c9a43404fe835dd5c"
+MM3VCHASH = "c50008f1ac86fae8d083232cdd3001a5"
+
+enemy_weakness_ptrs: dict[int, int] = {
+    0: 0x14100,
+    1: 0x14200,
+    2: 0x14300,
+    3: 0x14400,
+    4: 0x14500,
+    5: 0x14600,
+    6: 0x14700,
+    7: 0x14800,
+    8: 0x14900,
+}
+
+enemy_addresses: dict[str, int] = {
+    "Dada": 0x12,
+    "Potton": 0x13,
+    "New Shotman": 0x15,
+    "Hammer Joe": 0x16,
+    "Peterchy": 0x17,
+    "Bubukan": 0x18,
+    "Vault Pole": 0x19,  # Capcom..., why did you name an enemy Pole?
+    "Bomb Flier": 0x1A,
+    "Yambow": 0x1D,
+    "Metall 2": 0x1E,
+    "Cannon": 0x22,
+    "Jamacy": 0x25,
+    "Jamacy 2": 0x26,  # dunno what this is, but I won't question
+    "Jamacy 3": 0x27,
+    "Jamacy 4": 0x28,  # tf is this Capcom
+    "Mag Fly": 0x2A,
+    "Egg": 0x2D,
+    "Gyoraibo 2": 0x2E,
+    "Junk Golem": 0x2F,
+    "Pickelman Bull": 0x30,
+    "Nitron": 0x35,
+    "Pole": 0x37,
+    "Gyoraibo": 0x38,
+    "Hari Harry": 0x3A,
+    "Penpen Maker": 0x3B,
+    "Returning Monking": 0x3C,
+    "Have 'Su' Bee": 0x3E,
+    "Hive": 0x3F,
+    "Bolton-Nutton": 0x40,
+    "Walking Bomb": 0x44,
+    "Elec'n": 0x45,
+    "Mechakkero": 0x47,
+    "Chibee": 0x4B,
+    "Swimming Penpen": 0x4D,
+    "Top": 0x52,
+    "Penpen": 0x56,
+    "Komasaburo": 0x57,
+    "Parasyu": 0x59,
+    "Hologran (Static)": 0x5A,
+    "Hologran (Moving)": 0x5B,
+    "Bomber Pepe": 0x5C,
+    "Metall DX": 0x5D,
+    "Petit Snakey": 0x5E,
+    "Proto Man": 0x62,
+    "Break Man": 0x63,
+    "Metall": 0x7D,
+    "Giant Springer": 0x83,
+    "Springer Missile": 0x85,
+    "Giant Snakey": 0x99,
+    "Tama": 0x9A,
+    "Doc Robot (Flash)": 0xB0,
+    "Doc Robot (Wood)": 0xB1,
+    "Doc Robot (Crash)": 0xB2,
+    "Doc Robot (Metal)": 0xB3,
+    "Doc Robot (Bubble)": 0xC0,
+    "Doc Robot (Heat)": 0xC1,
+    "Doc Robot (Quick)": 0xC2,
+    "Doc Robot (Air)": 0xC3,
+    "Snake": 0xCA,
+    "Needle Man": 0xD0,
+    "Magnet Man": 0xD1,
+    "Top Man": 0xD2,
+    "Shadow Man": 0xD3,
+    "Top Man's Top": 0xD5,
+    "Shadow Man (Sliding)": 0xD8,  # Capcom I swear
+    "Hard Man": 0xE0,
+    "Spark Man": 0xE2,
+    "Snake Man": 0xE4,
+    "Gemini Man": 0xE6,
+    "Gemini Man (Clone)": 0xE7,  # Capcom why
+    "Yellow Devil MK-II": 0xF1,
+    "Wily Machine 3": 0xF3,
+    "Gamma": 0xF8,
+    "Kamegoro": 0x101,
+    "Kamegoro Shell": 0x102,
+    "Holograph Mega Man": 0x105,
+    "Giant Metall": 0x10C,  # This is technically FC but we're +16 from the rom header
+}
+
+# addresses printed when assembling basepatch
+wily_4_ptr: int = 0x7F570
+consumables_ptr: int = 0x7FDEA
+energylink_ptr: int = 0x7FDF9
+
+
+class MM3ProcedurePatch(APProcedurePatch, APTokenMixin):
+    hash = [MM3LCHASH, MM3NESHASH, MM3VCHASH]
+    game = "Mega Man 3"
+    patch_file_ending = ".apmm3"
+    result_file_ending = ".nes"
+    name: bytearray
+    procedure = [
+        ("apply_bsdiff4", ["mm3_basepatch.bsdiff4"]),
+        ("apply_tokens", ["token_patch.bin"]),
+    ]
+
+    @classmethod
+    def get_source_data(cls) -> bytes:
+        return get_base_rom_bytes()
+
+    def write_byte(self, offset: int, value: int) -> None:
+        self.write_token(APTokenTypes.WRITE, offset, value.to_bytes(1, "little"))
+
+    def write_bytes(self, offset: int, value: Iterable[int]) -> None:
+        self.write_token(APTokenTypes.WRITE, offset, bytes(value))
+
+
+def patch_rom(world: "MM3World", patch: MM3ProcedurePatch) -> None:
+    patch.write_file("mm3_basepatch.bsdiff4", pkgutil.get_data(__name__, os.path.join("data", "mm3_basepatch.bsdiff4")))
+    # text writing
+
+    base_address = 0x3C000
+    color_address = 0x31BC7
+    for i, offset, location in zip([0, 8, 1, 2,
+                                    3, 4, 5, 6,
+                                    7, 9],
+                                   [0x10, 0x50, 0x91, 0xD2,
+                                    0x113, 0x154, 0x195, 0x1D6,
+                                    0x217, 0x257],
+                                   [
+                                       names.get_needle_cannon,
+                                       names.get_rush_jet,
+                                       names.get_magnet_missile,
+                                       names.get_gemini_laser,
+                                       names.get_hard_knuckle,
+                                       names.get_top_spin,
+                                       names.get_search_snake,
+                                       names.get_spark_shock,
+                                       names.get_shadow_blade,
+                                       names.get_rush_marine,
+                                   ]):
+        item = world.get_location(location).item
+        if item:
+            if len(item.name) <= 13:
+                # we want to just place it in the center
+                first_str = ""
+                second_str = item.name
+                third_str = ""
+            elif len(item.name) <= 26:
+                # spread across second and third
+                first_str = ""
+                second_str = item.name[:13]
+                third_str = item.name[13:]
+            else:
+                # all three
+                first_str = item.name[:13]
+                second_str = item.name[13:26]
+                third_str = item.name[26:]
+                if len(third_str) > 13:
+                    third_str = third_str[:13]
+            player_str = world.multiworld.get_player_name(item.player)
+            if len(player_str) > 13:
+                player_str = player_str[:13]
+            y_coords = 0xA5
+            row = 0x21
+            if location in [names.get_rush_marine, names.get_rush_jet]:
+                y_coords = 0x45
+                row = 0x22
+            patch.write_bytes(base_address + offset, MM3TextEntry(first_str, y_coords, row).resolve())
+            patch.write_bytes(base_address + 16 + offset, MM3TextEntry(second_str, y_coords + 0x20, row).resolve())
+            patch.write_bytes(base_address + 32 + offset, MM3TextEntry(third_str, y_coords + 0x40, row).resolve())
+            if y_coords + 0x60 > 0xFF:
+                row += 1
+                y_coords = 0x01
+                patch.write_bytes(base_address + 48 + offset, MM3TextEntry(player_str, y_coords, row).resolve())
+                colors_high, colors_low = get_colors_for_item(item.name)
+                patch.write_bytes(color_address + (i * 8) + 1, colors_high)
+                patch.write_bytes(color_address + (i * 8) + 5, colors_low)
+            else:
+                patch.write_bytes(base_address + 48 + offset, MM3TextEntry(player_str, y_coords + 0x60, row).resolve())
+
+    write_palette_shuffle(world, patch)
+
+    enemy_weaknesses: dict[str, dict[int, int]] = {}
+
+    if world.options.strict_weakness or world.options.random_weakness or world.options.plando_weakness:
+        # we need to write boss weaknesses
+        for boss in bosses:
+            if boss == "Kamegoro Maker":
+                enemy_weaknesses["Kamegoro"] = {i: world.weapon_damage[i][bosses[boss]] for i in world.weapon_damage}
+                enemy_weaknesses["Kamegoro Shell"] = {i: world.weapon_damage[i][bosses[boss]]
+                                                      for i in world.weapon_damage}
+            elif boss == "Gemini Man":
+                enemy_weaknesses[boss] = {i: world.weapon_damage[i][bosses[boss]] for i in world.weapon_damage}
+                enemy_weaknesses["Gemini Man (Clone)"] = {i: world.weapon_damage[i][bosses[boss]]
+                                                          for i in world.weapon_damage}
+            elif boss == "Shadow Man":
+                enemy_weaknesses[boss] = {i: world.weapon_damage[i][bosses[boss]] for i in world.weapon_damage}
+                enemy_weaknesses["Shadow Man (Sliding)"] = {i: world.weapon_damage[i][bosses[boss]]
+                                                            for i in world.weapon_damage}
+            else:
+                enemy_weaknesses[boss] = {i: world.weapon_damage[i][bosses[boss]] for i in world.weapon_damage}
+
+    if world.options.enemy_weakness:
+        for enemy in enemy_addresses:
+            if enemy in [*bosses.keys(), "Kamegoro", "Kamegoro Shell", "Gemini Man (Clone)", "Shadow Man (Sliding)"]:
+                continue
+            enemy_weaknesses[enemy] = {weapon: world.random.randint(-4, 4) for weapon in enemy_weakness_ptrs}
+            if enemy in ["Tama", "Giant Snakey", "Proto Man", "Giant Metall"] and enemy_weaknesses[enemy][0] <= 0:
+                enemy_weaknesses[enemy][0] = 1
+            elif enemy == "Jamacy 2":
+                # bruh
+                if not enemy_weaknesses[enemy][8] > 0:
+                    enemy_weaknesses[enemy][8] = 1
+                if not enemy_weaknesses[enemy][3] > 0:
+                    enemy_weaknesses[enemy][3] = 1
+
+    for enemy, damage in enemy_weaknesses.items():
+        for weapon in enemy_weakness_ptrs:
+            if damage[weapon] < 0:
+                damage[weapon] = 256 + damage[weapon]
+            patch.write_byte(enemy_weakness_ptrs[weapon] + enemy_addresses[enemy], damage[weapon])
+
+    if world.options.consumables != Consumables.option_all:
+        value_a = 0x64
+        value_b = 0x6A
+        if world.options.consumables in (Consumables.option_none, Consumables.option_1up_etank):
+            value_a = 0x68
+        if world.options.consumables in (Consumables.option_none, Consumables.option_weapon_health):
+            value_b = 0x67
+        patch.write_byte(consumables_ptr - 3, value_a)
+        patch.write_byte(consumables_ptr + 1, value_b)
+
+    patch.write_byte(wily_4_ptr + 1, world.options.wily_4_requirement.value)
+
+    patch.write_byte(energylink_ptr + 1, world.options.energy_link.value)
+
+    if world.options.reduce_flashing:
+        # Spark Man
+        patch.write_byte(0x12649, 8)
+        patch.write_byte(0x1264E, 8)
+        patch.write_byte(0x12653, 8)
+        # Shadow Man
+        patch.write_byte(0x12658, 0x10)
+        # Gemini Man
+        patch.write_byte(0x12637, 0x20)
+        patch.write_byte(0x1263D, 0x20)
+        patch.write_byte(0x12643, 0x20)
+        # Gamma
+        patch.write_byte(0x7DA4A, 0xF)
+
+    if world.options.music_shuffle:
+        if world.options.music_shuffle.current_key == "no_music":
+            pool = [0xF0] * 18
+        elif world.options.music_shuffle.current_key == "randomized":
+            pool = world.random.choices(range(1, 0xC), k=18)
+        else:
+            pool = [1, 2, 3, 4, 5, 6, 7, 8, 1, 3, 7, 8, 9, 9, 10, 10, 11, 11]
+        world.random.shuffle(pool)
+        patch.write_bytes(0x7CD1C, pool)
+
+    from Utils import __version__
+    patch.name = bytearray(f'MM3{__version__.replace(".", "")[0:3]}_{world.player}_{world.multiworld.seed:11}\0',
+                           'utf8')[:21]
+    patch.name.extend([0] * (21 - len(patch.name)))
+    patch.write_bytes(0x3F330, patch.name)  # We changed this section, but this pointer is still valid!
+    deathlink_byte = world.options.death_link.value | (world.options.energy_link.value << 1)
+    patch.write_byte(0x3F346, deathlink_byte)
+
+    patch.write_bytes(0x3F34C, world.world_version)
+
+    version_map = {
+        "0": 0x00,
+        "1": 0x01,
+        "2": 0x02,
+        "3": 0x03,
+        "4": 0x04,
+        "5": 0x05,
+        "6": 0x06,
+        "7": 0x07,
+        "8": 0x08,
+        "9": 0x09,
+        ".": 0x26
+    }
+    patch.write_token(APTokenTypes.RLE, 0x653B, (11, 0x25))
+    patch.write_token(APTokenTypes.RLE, 0x6549, (25, 0x25))
+
+    # BY SILVRIS
+    patch.write_bytes(0x653B, [0x0B, 0x22, 0x25, 0x1C, 0x12, 0x15, 0x1F, 0x1B, 0x12, 0x1C])
+    # ARCHIPELAGO x.x.x
+    patch.write_bytes(0x654D,
+                      [0x0A, 0x1B, 0x0C, 0x11, 0x12, 0x19, 0x0E, 0x15, 0x0A, 0x10, 0x18])
+    patch.write_bytes(0x6559, list(map(lambda c: version_map[c], __version__)))
+
+    patch.write_file("token_patch.bin", patch.get_token_binary())
+
+
+header = b"\x4E\x45\x53\x1A\x10\x10\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+
+
+def read_headerless_nes_rom(rom: bytes) -> bytes:
+    if rom[:4] == b"NES\x1A":
+        return rom[16:]
+    else:
+        return rom
+
+
+def get_base_rom_bytes(file_name: str = "") -> bytes:
+    base_rom_bytes: bytes | None = getattr(get_base_rom_bytes, "base_rom_bytes", None)
+    if not base_rom_bytes:
+        file_name = get_base_rom_path(file_name)
+        base_rom_bytes = read_headerless_nes_rom(bytes(open(file_name, "rb").read()))
+
+        basemd5 = hashlib.md5()
+        basemd5.update(base_rom_bytes)
+        if basemd5.hexdigest() == PROTEUSHASH:
+            base_rom_bytes = extract_mm3(base_rom_bytes)
+            basemd5 = hashlib.md5()
+            basemd5.update(base_rom_bytes)
+        if basemd5.hexdigest() not in {MM3LCHASH, MM3NESHASH, MM3VCHASH}:
+            print(basemd5.hexdigest())
+            raise Exception("Supplied Base Rom does not match known MD5 for US, LC, or US VC release. "
+                            "Get the correct game and version, then dump it")
+        headered_rom = bytearray(base_rom_bytes)
+        headered_rom[0:0] = header
+        setattr(get_base_rom_bytes, "base_rom_bytes", bytes(headered_rom))
+        return bytes(headered_rom)
+    return base_rom_bytes
+
+
+def get_base_rom_path(file_name: str = "") -> str:
+    from . import MM3World
+    if not file_name:
+        file_name = MM3World.settings.rom_file
+    if not os.path.exists(file_name):
+        file_name = Utils.user_path(file_name)
+    return file_name
+
+
+prg_offset = 0xCF1B0
+prg_size = 0x40000
+chr_offset = 0x10F1B0
+chr_size = 0x20000
+
+
+def extract_mm3(proteus: bytes) -> bytes:
+    mm3 = bytearray(proteus[prg_offset:prg_offset + prg_size])
+    mm3.extend(proteus[chr_offset:chr_offset + chr_size])
+    return bytes(mm3)
diff --git a/worlds/mm3/rules.py b/worlds/mm3/rules.py
new file mode 100644
index 0000000000..b43908f42c
--- /dev/null
+++ b/worlds/mm3/rules.py
@@ -0,0 +1,388 @@
+from math import ceil
+from typing import TYPE_CHECKING
+from . import names
+from .locations import get_boss_locations, get_oneup_locations, get_energy_locations
+from worlds.generic.Rules import add_rule
+
+if TYPE_CHECKING:
+    from . import MM3World
+    from BaseClasses import CollectionState
+
+bosses: dict[str, int] = {
+    "Needle Man": 0,
+    "Magnet Man": 1,
+    "Gemini Man": 2,
+    "Hard Man": 3,
+    "Top Man": 4,
+    "Snake Man": 5,
+    "Spark Man": 6,
+    "Shadow Man": 7,
+    "Doc Robot (Metal)": 8,
+    "Doc Robot (Quick)": 9,
+    "Doc Robot (Air)": 10,
+    "Doc Robot (Crash)": 11,
+    "Doc Robot (Flash)": 12,
+    "Doc Robot (Bubble)": 13,
+    "Doc Robot (Wood)": 14,
+    "Doc Robot (Heat)": 15,
+    "Break Man": 16,
+    "Kamegoro Maker": 17,
+    "Yellow Devil MK-II": 18,
+    "Holograph Mega Man": 19,
+    "Wily Machine 3": 20,
+    "Gamma": 21
+}
+
+weapons_to_id: dict[str, int] = {
+    "Mega Buster": 0,
+    "Needle Cannon": 1,
+    "Magnet Missile": 2,
+    "Gemini Laser": 3,
+    "Hard Knuckle": 4,
+    "Top Spin": 5,
+    "Search Snake": 6,
+    "Spark Shot": 7,
+    "Shadow Blade": 8,
+}
+
+weapon_damage: dict[int, list[int]] = {
+    0: [1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 3, 1, 1, 1, 0, ],  # Mega Buster
+    1: [4, 1, 1, 0, 2, 4, 2, 1, 0, 1, 1, 2, 4, 2, 4, 2, 0, 3, 1, 1, 1, 0, ],  # Needle Cannon
+    2: [1, 4, 2, 4, 1, 0, 0, 1, 4, 2, 4, 1, 1, 0, 0, 1, 0, 3, 1, 0, 1, 0, ],  # Magnet Missile
+    3: [7, 2, 4, 1, 0, 1, 1, 1, 1, 4, 2, 0, 4, 1, 1, 1, 0, 3, 1, 1, 1, 0, ],  # Gemini Laser
+    4: [0, 2, 2, 4, 7, 2, 2, 2, 4, 1, 2, 7, 0, 2, 2, 2, 0, 1, 5, 4, 7, 4, ],  # Hard Knuckle
+    5: [1, 1, 2, 0, 4, 2, 1, 7, 0, 1, 1, 4, 1, 1, 2, 7, 0, 1, 0, 7, 0, 2, ],  # Top Spin
+    6: [1, 1, 5, 0, 1, 4, 0, 1, 0, 4, 1, 1, 1, 0, 4, 1, 0, 1, 0, 7, 4, 2, ],  # Search Snake
+    7: [0, 7, 1, 0, 1, 1, 4, 1, 2, 1, 4, 1, 0, 4, 1, 1, 0, 0, 0, 0, 7, 0, ],  # Spark Shot
+    8: [2, 7, 2, 0, 1, 2, 4, 4, 2, 2, 0, 1, 2, 4, 2, 4, 0, 1, 3, 2, 2, 2, ],  # Shadow Blade
+}
+
+weapons_to_name: dict[int, str] = {
+    1: names.needle_cannon,
+    2: names.magnet_missile,
+    3: names.gemini_laser,
+    4: names.hard_knuckle,
+    5: names.top_spin,
+    6: names.search_snake,
+    7: names.spark_shock,
+    8: names.shadow_blade
+}
+
+minimum_weakness_requirement: dict[int, int] = {
+    0: 1,  # Mega Buster is free
+    1: 1,  # 112 shots of Needle Cannon
+    2: 2,  # 14 shots of Magnet Missile
+    3: 2,  # 14 shots of Gemini Laser
+    4: 2,  # 14 uses of Hard Knuckle
+    5: 4,  # an unknown amount of Top Spin (4 means you should be able to be fine)
+    6: 1,  # 56 uses of Search Snake
+    7: 2,  # 14 functional uses of Spark Shot (fires in twos)
+    8: 1,  # 56 uses of Shadow Blade
+}
+
+robot_masters: dict[int, str] = {
+    0: "Needle Man Defeated",
+    1: "Magnet Man Defeated",
+    2: "Gemini Man Defeated",
+    3: "Hard Man Defeated",
+    4: "Top Man Defeated",
+    5: "Snake Man Defeated",
+    6: "Spark Man Defeated",
+    7: "Shadow Man Defeated"
+}
+
+weapon_costs = {
+    0: 0,
+    1: 0.25,
+    2: 2,
+    3: 2,
+    4: 2,
+    5: 7,  # Not really, but we can really only rely on Top for one RBM
+    6: 0.5,
+    7: 2,
+    8: 0.5,
+}
+
+
+def can_defeat_enough_rbms(state: "CollectionState", player: int,
+                           required: int, boss_requirements: dict[int, list[int]]) -> bool:
+    can_defeat = 0
+    for boss, reqs in boss_requirements.items():
+        if boss in robot_masters:
+            if state.has_all(map(lambda x: weapons_to_name[x], reqs), player):
+                can_defeat += 1
+                if can_defeat >= required:
+                    return True
+    return False
+
+
+def has_rush_vertical(state: "CollectionState", player: int) -> bool:
+    return state.has_any([names.rush_coil, names.rush_jet], player)
+
+
+def can_traverse_long_water(state: "CollectionState", player: int) -> bool:
+    return state.has_any([names.rush_marine, names.rush_jet], player)
+
+
+def has_any_rush(state: "CollectionState", player: int) -> bool:
+    return state.has_any([names.rush_coil, names.rush_jet, names.rush_marine], player)
+
+
+def has_rush_jet(state: "CollectionState", player: int) -> bool:
+    return state.has(names.rush_jet, player)
+
+
+def set_rules(world: "MM3World") -> None:
+    # most rules are set on region, so we only worry about rules required within stage access
+    # or rules variable on settings
+    if hasattr(world.multiworld, "re_gen_passthrough"):
+        slot_data = getattr(world.multiworld, "re_gen_passthrough")["Mega Man 3"]
+        world.weapon_damage = slot_data["weapon_damage"]
+    else:
+        if world.options.random_weakness == world.options.random_weakness.option_shuffled:
+            weapon_tables = [table.copy() for weapon, table in weapon_damage.items() if weapon != 0]
+            world.random.shuffle(weapon_tables)
+            for i in range(1, 9):
+                world.weapon_damage[i] = weapon_tables.pop()
+        elif world.options.random_weakness == world.options.random_weakness.option_randomized:
+            world.weapon_damage = {i: [] for i in range(9)}
+            for boss in range(22):
+                for weapon in world.weapon_damage:
+                    world.weapon_damage[weapon].append(min(14, max(0, int(world.random.normalvariate(3, 3)))))
+                if not any([world.weapon_damage[weapon][boss] >= 4
+                            for weapon in range(1, 9)]):
+                    # failsafe, there should be at least one defined non-Buster weakness
+                    weapon = world.random.randint(1, 7)
+                    world.weapon_damage[weapon][boss] = world.random.randint(4, 14)  # Force weakness
+            # handle Break Man
+            boss = 16
+            for weapon in world.weapon_damage:
+                world.weapon_damage[weapon][boss] = 0
+            weapon = world.random.choice(list(world.weapon_damage.keys()))
+            world.weapon_damage[weapon][boss] = minimum_weakness_requirement[weapon]
+
+        if world.options.strict_weakness:
+            for weapon in weapon_damage:
+                for i in range(22):
+                    if i == 16:
+                        continue  # Break is only weak to buster on non-random, and minimal damage on random
+                    elif weapon == 0:
+                        world.weapon_damage[weapon][i] = 0
+                    elif i in (20, 21) and not world.options.random_weakness:
+                        continue
+                        # Gamma and Wily Machine need all weaknesses present, so allow
+                    elif not world.options.random_weakness == world.options.random_weakness.option_randomized \
+                            and i == 17:
+                        if 3 > world.weapon_damage[weapon][i] > 0:
+                            # Kamegoros take 3 max from weapons on non-random
+                            world.weapon_damage[weapon][i] = 0
+                    elif 4 > world.weapon_damage[weapon][i] > 0:
+                        world.weapon_damage[weapon][i] = 0
+
+        for p_boss in world.options.plando_weakness:
+            for p_weapon in world.options.plando_weakness[p_boss]:
+                if not any(w for w in world.weapon_damage
+                           if w != weapons_to_id[p_weapon]
+                           and world.weapon_damage[w][bosses[p_boss]] > minimum_weakness_requirement[w]):
+                    # we need to replace this weakness
+                    weakness = world.random.choice([key for key in world.weapon_damage
+                                                    if key != weapons_to_id[p_weapon]])
+                    world.weapon_damage[weakness][bosses[p_boss]] = minimum_weakness_requirement[weakness]
+                world.weapon_damage[weapons_to_id[p_weapon]][bosses[p_boss]] \
+                    = world.options.plando_weakness[p_boss][p_weapon]
+
+        # handle special cases
+        for boss in range(22):
+            for weapon in range(1, 9):
+                if (0 < world.weapon_damage[weapon][boss] < minimum_weakness_requirement[weapon] and
+                        not any(world.weapon_damage[i][boss] >= minimum_weakness_requirement[weapon]
+                                for i in range(1, 8) if i != weapon)):
+                    world.weapon_damage[weapon][boss] = minimum_weakness_requirement[weapon]
+
+        if world.weapon_damage[0][world.options.starting_robot_master.value] < 1:
+            world.weapon_damage[0][world.options.starting_robot_master.value] = 1
+
+        # weakness validation, it is better to confirm a completable seed than respect plando
+        boss_health = {boss: 0x1C for boss in range(8)}
+
+        weapon_energy = {key: float(0x1C) for key in weapon_costs}
+        weapon_boss = {boss: {weapon: world.weapon_damage[weapon][boss] for weapon in world.weapon_damage}
+                       for boss in range(8)}
+        flexibility = {
+            boss: (
+                    sum(damage_value > 0 for damage_value in
+                        weapon_damages.values())  # Amount of weapons that hit this boss
+                    * sum(weapon_damages.values())  # Overall damage that those weapons do
+            )
+            for boss, weapon_damages in weapon_boss.items()
+        }
+        boss_flexibility = sorted(flexibility, key=flexibility.get)  # Fast way to sort dict by value
+        used_weapons: dict[int, set[int]] = {i: set() for i in range(8)}
+        for boss in boss_flexibility:
+            boss_damage = weapon_boss[boss]
+            weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in
+                             boss_damage.items() if weapon_energy[weapon] > 0}
+            while boss_health[boss] > 0:
+                if boss_damage[0] > 0:
+                    boss_health[boss] = 0  # if we can buster, we should buster
+                    continue
+                highest, wp = max(zip(weapon_weight.values(), weapon_weight.keys()))
+                uses = weapon_energy[wp] // weapon_costs[wp]
+                if int(uses * boss_damage[wp]) >= boss_health[boss]:
+                    used = ceil(boss_health[boss] / boss_damage[wp])
+                    weapon_energy[wp] -= weapon_costs[wp] * used
+                    boss_health[boss] = 0
+                    used_weapons[boss].add(wp)
+                elif highest <= 0:
+                    # we are out of weapons that can actually damage the boss
+                    # so find the weapon that has the most uses, and apply that as an additional weakness
+                    # it should be impossible to be out of energy
+                    max_uses, wp = max((weapon_energy[weapon] // weapon_costs[weapon], weapon)
+                                       for weapon in weapon_weight
+                                       if weapon != 0)
+                    world.weapon_damage[wp][boss] = minimum_weakness_requirement[wp]
+                    used = min(int(weapon_energy[wp] // weapon_costs[wp]),
+                               ceil(boss_health[boss] / minimum_weakness_requirement[wp]))
+                    weapon_energy[wp] -= weapon_costs[wp] * used
+                    boss_health[boss] -= int(used * minimum_weakness_requirement[wp])
+                    weapon_weight.pop(wp)
+                    used_weapons[boss].add(wp)
+                else:
+                    # drain the weapon and continue
+                    boss_health[boss] -= int(uses * boss_damage[wp])
+                    weapon_energy[wp] -= weapon_costs[wp] * uses
+                    weapon_weight.pop(wp)
+                    used_weapons[boss].add(wp)
+
+            world.wily_4_weapons = {boss: sorted(weapons) for boss, weapons in used_weapons.items()}
+
+    for i, boss_locations in zip(range(22), [
+        get_boss_locations("Needle Man Stage"),
+        get_boss_locations("Magnet Man Stage"),
+        get_boss_locations("Gemini Man Stage"),
+        get_boss_locations("Hard Man Stage"),
+        get_boss_locations("Top Man Stage"),
+        get_boss_locations("Snake Man Stage"),
+        get_boss_locations("Spark Man Stage"),
+        get_boss_locations("Shadow Man Stage"),
+        get_boss_locations("Doc Robot (Spark) - Metal"),
+        get_boss_locations("Doc Robot (Spark) - Quick"),
+        get_boss_locations("Doc Robot (Needle) - Air"),
+        get_boss_locations("Doc Robot (Needle) - Crash"),
+        get_boss_locations("Doc Robot (Gemini) - Flash"),
+        get_boss_locations("Doc Robot (Gemini) - Bubble"),
+        get_boss_locations("Doc Robot (Shadow) - Wood"),
+        get_boss_locations("Doc Robot (Shadow) - Heat"),
+        get_boss_locations("Break Man"),
+        get_boss_locations("Wily Stage 1"),
+        get_boss_locations("Wily Stage 2"),
+        get_boss_locations("Wily Stage 3"),
+        get_boss_locations("Wily Stage 5"),
+        get_boss_locations("Wily Stage 6")
+    ]):
+        if world.weapon_damage[0][i] > 0:
+            continue  # this can always be in logic
+        weapons = []
+        for weapon in range(1, 9):
+            if world.weapon_damage[weapon][i] > 0:
+                if world.weapon_damage[weapon][i] < minimum_weakness_requirement[weapon]:
+                    continue
+                weapons.append(weapons_to_name[weapon])
+        if not weapons:
+            raise Exception(f"Attempted to have boss {i} with no weakness! Seed: {world.multiworld.seed}")
+        for location in boss_locations:
+            if i in (20, 21):
+                # multi-phase fights, get all potential weaknesses
+                # we should probably do this smarter, but this works for now
+                add_rule(world.get_location(location),
+                         lambda state, weps=tuple(weapons): state.has_all(weps, world.player))
+            else:
+                add_rule(world.get_location(location),
+                         lambda state, weps=tuple(weapons): state.has_any(weps, world.player))
+
+    # Need to defeat x amount of robot masters for Wily 4
+    add_rule(world.get_location(names.wily_stage_4),
+             lambda state: can_defeat_enough_rbms(state, world.player, world.options.wily_4_requirement.value,
+                                                  world.wily_4_weapons))
+
+    # Handle Doc Robo stage connections
+    for entrance, location in (("To Doc Robot (Needle) - Crash", names.doc_air),
+                               ("To Doc Robot (Gemini) - Bubble", names.doc_flash),
+                               ("To Doc Robot (Shadow) - Heat", names.doc_wood),
+                               ("To Doc Robot (Spark) - Quick", names.doc_metal)):
+        entrance_object = world.get_entrance(entrance)
+        add_rule(entrance_object, lambda state, loc=location: state.can_reach(loc, "Location", world.player))
+
+    # finally, real logic
+    for location in get_boss_locations("Hard Man Stage"):
+        add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+
+    for location in get_boss_locations("Gemini Man Stage"):
+        add_rule(world.get_location(location), lambda state: has_any_rush(state, world.player))
+
+    add_rule(world.get_entrance("To Doc Robot (Spark) - Metal"),
+             lambda state: has_rush_vertical(state, world.player) and
+                           state.has_any([names.shadow_blade, names.gemini_laser], world.player))
+    add_rule(world.get_entrance("To Doc Robot (Needle) - Air"),
+             lambda state: has_rush_vertical(state, world.player))
+    add_rule(world.get_entrance("To Doc Robot (Needle) - Crash"),
+             lambda state: has_rush_jet(state, world.player))
+    add_rule(world.get_entrance("To Doc Robot (Gemini) - Bubble"),
+             lambda state: has_rush_vertical(state, world.player) and can_traverse_long_water(state, world.player))
+
+    for location in get_boss_locations("Wily Stage 1"):
+        add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+
+    for location in get_boss_locations("Wily Stage 2"):
+        add_rule(world.get_location(location), lambda state: has_rush_jet(state, world.player))
+
+    # Wily 3 technically needs vertical
+    # However, Wily 3 requires beating Wily 2, and Wily 2 explicitly needs Jet
+    # So we can skip the additional rule on Wily 3
+
+    if world.options.consumables in (world.options.consumables.option_1up_etank,
+                                     world.options.consumables.option_all):
+        add_rule(world.get_location(names.needle_man_c2), lambda state: has_rush_jet(state, world.player))
+        add_rule(world.get_location(names.gemini_man_c1), lambda state: has_rush_jet(state, world.player))
+        add_rule(world.get_location(names.gemini_man_c3),
+                 lambda state: has_rush_vertical(state, world.player)
+                               or state.has_any([names.gemini_laser, names.shadow_blade], world.player))
+        for location in (names.gemini_man_c6, names.gemini_man_c7, names.gemini_man_c10):
+            add_rule(world.get_location(location), lambda state: has_any_rush(state, world.player))
+        for location in get_oneup_locations("Hard Man Stage"):
+            add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.top_man_c6), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.doc_needle_c2), lambda state: has_rush_jet(state, world.player))
+        add_rule(world.get_location(names.doc_needle_c3), lambda state: has_rush_jet(state, world.player))
+        add_rule(world.get_location(names.doc_gemini_c1), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.doc_gemini_c2), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.wily_1_c8), lambda state: has_rush_vertical(state, world.player))
+        for location in [names.wily_1_c4, names.wily_1_c8]:
+            add_rule(world.get_location(location), lambda state: state.has(names.hard_knuckle, world.player))
+        for location in get_oneup_locations("Wily Stage 2"):
+            if location == names.wily_2_c3:
+                continue
+            add_rule(world.get_location(location), lambda state: has_rush_jet(state, world.player))
+    if world.options.consumables in (world.options.consumables.option_weapon_health,
+                                     world.options.consumables.option_all):
+        add_rule(world.get_location(names.gemini_man_c2), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.gemini_man_c4), lambda state: has_rush_vertical(state, world.player))
+        add_rule(world.get_location(names.gemini_man_c5), lambda state: has_rush_vertical(state, world.player))
+        for location in (names.gemini_man_c8, names.gemini_man_c9):
+            add_rule(world.get_location(location), lambda state: has_any_rush(state, world.player))
+        for location in get_energy_locations("Hard Man Stage"):
+            if location == names.hard_man_c1:
+                continue
+            add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+        for location in (names.spark_man_c1, names.spark_man_c2):
+            add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+        for location in [names.top_man_c2, names.top_man_c3, names.top_man_c4, names.top_man_c7]:
+            add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+        for location in [names.wily_1_c5, names.wily_1_c6, names.wily_1_c7]:
+            add_rule(world.get_location(location), lambda state: state.has(names.hard_knuckle, world.player))
+        for location in [names.wily_1_c6, names.wily_1_c7, names.wily_1_c11, names.wily_1_c12]:
+            add_rule(world.get_location(location), lambda state: has_rush_vertical(state, world.player))
+        for location in get_energy_locations("Wily Stage 2"):
+            if location in (names.wily_2_c1, names.wily_2_c2, names.wily_2_c4):
+                continue
+            add_rule(world.get_location(location), lambda state: has_rush_jet(state, world.player))
diff --git a/worlds/mm3/src/__init__.py b/worlds/mm3/src/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/mm3/src/mm3_basepatch.asm b/worlds/mm3/src/mm3_basepatch.asm
new file mode 100644
index 0000000000..16e0567ff5
--- /dev/null
+++ b/worlds/mm3/src/mm3_basepatch.asm
@@ -0,0 +1,781 @@
+norom
+!headersize = 16
+
+!controller_flip = $14 ; only on first frame of input, used by crash man, etc
+!controller_mirror = $16
+!current_stage = $22
+!current_state = $60
+!completed_rbm_stages = $61
+!completed_doc_stages = $62
+!current_wily = $75
+!received_rbm_stages = $680
+!received_doc_stages = $681
+; !deathlink = $30, set to $0E
+!energylink_packet = $682
+!last_wily = $683
+!rbm_strobe = $684
+!sound_effect_strobe = $685
+!doc_robo_kills = $686
+!wily_stage_completion = $687
+;!received_items = $688
+!acquired_rush = $689
+
+!current_weapon = $A0
+!current_health = $A2
+!received_weapons = $A3
+
+'0' = $00
+'1' = $01
+'2' = $02
+'3' = $03
+'4' = $04
+'5' = $05
+'6' = $06
+'7' = $07
+'8' = $08
+'9' = $09
+'A' = $0A
+'B' = $0B
+'C' = $0C
+'D' = $0D
+'E' = $0E
+'F' = $0F
+'G' = $10
+'H' = $11
+'I' = $12
+'J' = $13
+'K' = $14
+'L' = $15
+'M' = $16
+'N' = $17
+'O' = $18
+'P' = $19
+'Q' = $1A
+'R' = $1B
+'S' = $1C
+'T' = $1D
+'U' = $1E
+'V' = $1F
+'W' = $20
+'X' = $21
+'Y' = $22
+'Z' = $23
+' ' = $25
+'.' = $26
+',' = $27
+'!' = $29
+'r' = $2A
+':' = $2B
+
+; !consumable_checks = $0F80 ; have to find in-stage solutions for this, there's literally not enough ram
+
+!CONTROLLER_SELECT = #$20
+!CONTROLLER_SELECT_START = #$30
+!CONTROLLER_ALL_BUTTON = #$F0
+
+!PpuControl_2000 = $2000
+!PpuMask_2001 = $2001
+!PpuAddr_2006 = $2006
+!PpuData_2007 = $2007
+
+;!LOAD_BANK = $C000
+
+macro org(address,bank)
+    if <bank> == $3E
+        org <address>-$C000+($2000*<bank>)+!headersize ; org sets the position in the output file to write to (in norom, at least)
+        base <address> ; base sets the position that all labels are relative to - this is necessary so labels will still start from $8000, instead of $0000 or somewhere
+    else 
+      if <bank> == $3F
+          org <address>-$E000+($2000*<bank>)+!headersize ; org sets the position in the output file to write to (in norom, at least)
+          base <address> ; base sets the position that all labels are relative to - this is necessary so labels will still start from $8000, instead of $0000 or somewhere
+      else
+        if <address> >= $A000
+          org <address>-$A000+($2000*<bank>)+!headersize
+          base <address>
+        else
+          org <address>-$8000+($2000*<bank>)+!headersize
+          base <address>
+        endif
+      endif
+    endif
+endmacro
+
+; capcom.....
+; i can't keep defending you like this
+
+;P
+%org($BEBA, $13)
+RemoveP:
+db $25
+;A
+%org($BD7D, $13)
+RemoveA:
+db $25
+;S
+%org($BE7D, $13)
+RemoveS1:
+db $25
+;S
+%org($BDD5, $13)
+RemoveS2:
+db $25
+
+;W
+%org($BDC7, $13)
+RemoveW:
+db $25
+;O
+%org($BEC7, $13)
+RemoveO:
+db $25
+;R
+%org($BDCF, $13)
+RemoveR:
+db $25
+;D
+%org($BECF, $13)
+RemoveD:
+db $25
+
+%org($A17C, $02)
+AdjustWeaponRefill:
+  ; compare vs unreceived instead. Since the stage ends anyways, this just means you aren't granted the weapon if you don't have it already
+  CMP #$1C
+  BCS WeaponRefillJump
+
+%org($A18B, $02)
+WeaponRefillJump:
+  ; just as a branch target
+
+%org($A3BF, $02)
+FixPseudoSnake:
+  JMP CheckFirstWep
+  NOP
+
+%org($A3CB, $02)
+FixPseudoRush:
+  JMP CheckRushWeapon
+  NOP
+
+%org($BF80, $02)
+CheckRushWeapon:
+  AND #$01
+  BNE .Rush
+  JMP $A3CF
+  .Rush:
+  LDA $A1
+  CLC
+  ADC $B4
+  TAY
+  LDA $00A2, Y
+  BNE .Skip
+  DEC $A1
+  .Skip:
+  JMP $A477
+
+; don't even try to go past this point
+
+%org($802F, $0B)
+HookBreakMan:
+  JSR SetBreakMan
+  NOP
+
+%org($90BC, $18)
+BlockPassword:
+  AND #$08 ; originally 0C, just block down inputs
+
+%org($9258, $18)
+HookStageSelect:
+  JSR ChangeStageMode
+  NOP
+
+%org($92F2, $18)
+AccessStageTarget:
+
+%org($9316, $18)
+AccessStage:
+  JSR RewireDocRobotAccess
+  NOP #2
+  BEQ AccessStageTarget
+
+%org($9468, $18)
+HookWeaponGet:
+  JSR WeaponReceived
+  NOP #4
+
+%org($9917, $18)
+GameOverStageSelect:
+  ; fix it returning to Wily 1
+  CMP #$16
+
+%org($9966, $18)
+SwapSelectTiles:
+  ; swaps when stage select face tiles should be shown
+  JMP InvertSelectTiles
+  NOP
+
+%org($9A54, $18)
+SwapSelectSprites:
+  JMP InvertSelectSprites
+  NOP
+
+%org($9AFF, $18)
+BreakManSelect:
+  JSR ApplyLastWily
+  NOP
+
+%org($BE22, $1D)
+ConsumableHook:
+  JMP CheckConsumable
+
+%org($BE32, $1D)
+EnergyLinkHook:
+  JSR EnergyLink
+
+%org($A000, $1E)
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P"
+db $22, $45, $0C, "PLACEHOLDER 1"
+db $22, $65, $0C, "PLACEHOLDER 2"
+db $22, $85, $0C, "PLACEHOLDER 3"
+db $22, $A5, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P", $FF
+db $21, $A5, $0C, "PLACEHOLDER 1"
+db $21, $C5, $0C, "PLACEHOLDER 2"
+db $21, $E5, $0C, "PLACEHOLDER 3"
+db $22, $05, $0C, "PLACEHOLDER P"
+db $22, $45, $0C, "PLACEHOLDER 1"
+db $22, $65, $0C, "PLACEHOLDER 2"
+db $22, $85, $0C, "PLACEHOLDER 3"
+db $22, $A5, $0C, "PLACEHOLDER P", $FF
+
+ShowItemString:
+  STY $04
+  LDA ItemLower,X
+  STA $02
+  LDA ItemUpper,X
+  STA $03
+  LDY #$00
+  .LoadString:
+  LDA ($02),Y
+  ORA $10
+  STA $0780,Y
+  BMI .Return
+  INY
+  LDA ($02),Y
+  STA $0780,Y
+  INY
+  LDA ($02),Y
+  STA $0780,Y
+  STA $00
+  INY
+  .LoadCharacters:
+  LDA ($02),Y
+  STA $0780,Y
+  INY
+  DEC $00
+  BPL .LoadCharacters
+  BMI .LoadString
+  .Return:
+  STA $19
+  LDY $04
+  RTS
+
+ItemUpper:
+  db $A0, $A0, $A0, $A1, $A1, $A1, $A1, $A2, $A2
+
+ItemLower:
+  db $00, $81, $C2, $03, $44, $85, $C6, $07, $47
+
+%org($C8F7, $3E)
+RemoveRushCoil:
+  NOP #4
+
+%org($CA73, $3E)
+HookController:
+  JMP ControllerHook
+  NOP
+
+%org($DA18, $3E)
+NullWeaponGet:
+  NOP #5 ; TODO: see if I can reroute this write instead for nicer timings
+
+%org($DB99, $3E)
+HookMidDoc:
+  JSR SetMidDoc
+  NOP
+
+%org($DBB0, $3E)
+HoodEndDoc:
+  JSR SetEndDoc
+  NOP
+
+%org($DC57, $3E)
+RerouteStageComplete:
+  LDA $60
+  JSR SetStageComplete
+  NOP #2
+
+%org($DC6F, $3E)
+RerouteRushMarine:
+  JMP SetRushMarine
+  NOP
+
+%org($DC6A, $3E)
+RerouteRushJet:
+  JMP SetRushJet
+  NOP
+
+%org($DC78, $3E)
+RerouteWilyComplete:
+  JMP SetEndWily
+  NOP
+  EndWilyReturn:
+
+%org($DF81, $3E)
+NullBreak:
+  NOP #5 ; nop break man giving every weapon
+
+%org($E15F, $3F)
+Wily4:
+  JMP Wily4Comparison
+  NOP
+
+
+%org($F340, $3F)
+RewireDocRobotAccess:
+  LDA !current_state
+  BNE .DocRobo
+  LDA !received_rbm_stages
+  SEC
+  BCS .Return
+  .DocRobo:
+  LDA !received_doc_stages
+  .Return:
+  AND $9DED,Y
+  RTS
+
+ChangeStageMode:
+  ; also handles hot reload of stage select
+  ; kinda broken, sprites don't disappear and palettes go wonky with Break Man access
+  ; but like, it functions!
+  LDA !sound_effect_strobe
+  BEQ .Continue
+  JSR $F89A
+  LDA #$00
+  STA !sound_effect_strobe
+  .Continue:
+  LDA $14
+  AND #$20
+  BEQ .Next
+  LDA !current_state
+  BNE .Set
+  LDA !completed_doc_stages
+  CMP #$C5
+  BEQ .BreakMan
+  LDA #$09
+  SEC
+  BCS .Set
+  .EarlyReturn:
+  LDA $14
+  AND #$90
+  RTS
+  .BreakMan:
+  LDA #$12
+  .Set:
+  EOR !current_state
+  STA !current_state
+  LDA #$01
+  STA !rbm_strobe
+  .Next:
+  LDA !rbm_strobe
+  BEQ .EarlyReturn
+  LDA #$00
+  STA !rbm_strobe
+  ; Clear the sprite buffer
+  LDX #$98
+  .Loop:
+  LDA #$00
+  STA $01FF, X
+  DEX
+  STA $01FF, X
+  DEX
+  STA $01FF, X
+  DEX
+  LDA #$F8
+  STA $01FF, X
+  DEX
+  CPX #$00
+  BNE .Loop
+  ; Break Man Sprites
+  LDX #$24
+  .Loop2:
+  LDA #$00
+  STA $02DB, X
+  DEX
+  STA $02DB, X
+  DEX
+  STA $02DB, X
+  DEX
+  LDA #$F8
+  STA $02DB, X
+  DEX
+  CPX #$00
+  BNE .Loop2
+  ; Swap out the tilemap and write sprites
+  LDY #$10
+  LDA $11
+  BMI .B1
+  LDA $FD
+  EOR #$01
+  ASL A
+  ASL A
+  STA $10
+  LDA #$01
+  JSR $E8B4
+  LDA #$00
+  STA $70
+  STA $EE
+  .B3:
+  LDA $10
+  PHA
+  JSR $EF8C
+  PLA
+  STA $10
+  JSR $FF21
+  LDA $70
+  BNE .B3
+  JSR $995C
+  LDX #$03
+  JSR $939E
+  JSR $FF21
+  LDX #$04
+  JSR $939E
+  LDA $FD
+  EOR #$01
+  STA $FD
+  LDY #$00
+  LDA #$7E
+  STA $E9
+  JSR $FF3C
+  .B1:
+  LDX #$00
+  ; palettes
+  .B2:
+  LDA $9C33,Y
+  STA $0600,X
+  LDA $9C23,Y
+  STA $0610,X
+  INY
+  INX
+  CPX #$10
+  BNE .B2
+  LDA #$FF
+  STA $18
+  LDA #$01
+  STA $12
+  LDA #$03
+  STA $13
+  LDA $11
+  JSR $99FA
+  LDA $14
+  AND #$90
+  RTS
+
+InvertSelectTiles:
+  LDY !current_state
+  BNE .DocRobo
+  AND !received_rbm_stages
+  SEC
+  BCS .Compare
+  .DocRobo:
+  AND !received_doc_stages
+  .Compare:
+  BNE .False
+  JMP $996A
+  .False:
+  JMP $99BA
+
+InvertSelectSprites:
+  LDY !current_state
+  BNE .DocRobo
+  AND !received_rbm_stages
+  SEC
+  BCS .Compare
+  .DocRobo:
+  AND !received_doc_stages
+  .Compare:
+  BNE .False
+  JMP $9A58
+  .False:
+  JMP $9A6D
+
+SetStageComplete:
+  CMP #$00
+  BNE .DocRobo
+  LDA !completed_rbm_stages
+  ORA $DEC2, Y
+  STA !completed_rbm_stages
+  SEC
+  BCS .Return
+  .DocRobo:
+  LDA !completed_doc_stages
+  ORA $DEC2, Y
+  STA !completed_doc_stages
+  .Return:
+  RTS
+
+ControllerHook:
+  ; Jump in here too for sfx
+  LDA !sound_effect_strobe
+  BEQ .Next
+  JSR $F89A
+  LDA #$00
+  STA !sound_effect_strobe
+  .Next:
+  LDA !controller_mirror
+  CMP !CONTROLLER_ALL_BUTTON
+  BNE .Continue
+  JMP $CBB1
+  .Continue:
+  LDA !controller_flip
+  AND #$10 ; start
+  JMP $CA77
+
+SetRushMarine:
+  LDA #$01
+  SEC
+  BCS SetRushAcquire
+
+SetRushJet:
+  LDA #$02
+  SEC
+  BCS SetRushAcquire
+
+SetRushAcquire:
+  ORA !acquired_rush
+  STA !acquired_rush
+  RTS
+
+ApplyLastWily:
+  LDA !controller_mirror
+  AND !CONTROLLER_SELECT
+  BEQ .LastWily
+  .Default:
+  LDA #$00
+  SEC
+  BCS .Set
+  .LastWily:
+  LDA !last_wily
+  BEQ .Default
+  SEC
+  SBC #$0C
+  .Set:
+  STA $75 ; wily index
+  LDA #$03
+  STA !current_stage
+  RTS
+
+SetMidDoc:
+  LDA !current_stage
+  SEC
+  SBC #$08
+  ASL
+  TAY
+  LDA #$01
+  .Loop:
+  CPY #$00
+  BEQ .Return
+  DEY
+  ASL
+  SEC
+  BCS .Loop
+  .Return:
+  ORA !doc_robo_kills
+  STA !doc_robo_kills
+  LDA #$00
+  STA $30
+  RTS
+
+SetEndDoc:
+  LDA !current_stage
+  SEC
+  SBC #$08
+  ASL
+  TAY
+  INY
+  LDA #$01
+  .Loop:
+  CPY #$00
+  BEQ .Set
+  DEY
+  ASL
+  SEC
+  BCS .Loop
+  .Set:
+  ORA !doc_robo_kills
+  STA !doc_robo_kills
+  .Return:
+  LDA #$0D
+  STA $30
+  RTS
+
+SetEndWily:
+  LDA !current_wily
+  PHA
+  CLC
+  ADC #$0C
+  STA !last_wily
+  PLA
+  TAX
+  LDA #$01
+  .WLoop:
+  CPX #$00
+  BEQ .WContinue
+  DEX
+  ASL A
+  SEC
+  BCS .WLoop
+  .WContinue:
+  ORA !wily_stage_completion
+  STA !wily_stage_completion
+  INC !current_wily
+  LDA #$9C
+  JMP EndWilyReturn
+
+
+SetBreakMan:
+  LDA #$80
+  ORA !wily_stage_completion
+  STA !wily_stage_completion
+  LDA #$16
+  STA $22
+  RTS
+  
+CheckFirstWep:
+  LDA $B4
+  BEQ .SetNone
+  TAY
+  .Loop:
+  LDA $00A2,Y
+  BMI .SetNew
+  INY
+  CPY #$0C
+  BEQ .SetSame
+  BCC .Loop
+  .SetSame:
+  LDA #$80
+  STA $A1
+  JMP $A3A1
+  .SetNew:
+  TYA
+  SEC
+  SBC $B4
+  BCS .Set
+  .SetNone:
+  LDA #$00
+  .Set:
+  STA $A1
+  JMP $A3DE
+
+Wily4Comparison:
+  TYA
+  PHA
+  TXA
+  PHA
+  LDY #$00
+  LDX #$08
+  LDA #$01
+  .Loop:
+  PHA
+  AND $6E
+  BEQ .Skip
+  INY
+  .Skip:
+  PLA
+  ASL
+  DEX
+  BNE .Loop
+  print "Wily 4 Requirement:", hex(realbase())
+  CPY #$08
+  BCC .Return
+  LDA #$FF
+  STA $6E
+  .Return:
+  PLA
+  TAX
+  PLA
+  TAY
+  LDA #$0C
+  STA $EC
+  RTS
+
+; out of space here :(
+
+%org($FDBA, $3F)
+WeaponReceived:
+  TAX
+  LDA $F5
+  PHA
+  LDA #$1E
+  STA $F5
+  JSR $FF6B
+  TXA
+  JSR ShowItemString
+  PLA
+  STA $F5
+  JSR $FF6B
+  RTS
+
+CheckConsumable:
+  STA $0150, Y
+  LDA $0320, X
+  CMP #$64
+  BMI .Return
+  print "Consumables (replace 67): ", hex(realbase())
+  CMP #$6A
+  BPL .Return
+  LDA #$00
+  STA $0300, X
+  JMP $BE49
+  .Return:
+  JMP $BE25
+
+EnergyLink:
+  print "Energylink: ", hex(realbase())
+  LDA #$01
+  BEQ .Return
+  TYA
+  STA !energylink_packet
+  LDA #$49
+  STA $00
+  .Return:
+  LDA $BDEC, Y
+  RTS
+
+; out of room here :(
diff --git a/worlds/mm3/src/patch_mm3base.py b/worlds/mm3/src/patch_mm3base.py
new file mode 100644
index 0000000000..c64c83c3c0
--- /dev/null
+++ b/worlds/mm3/src/patch_mm3base.py
@@ -0,0 +1,8 @@
+import os
+
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+
+mm3 = bytearray(open("Mega Man 3 (USA).nes", 'rb').read())
+mm3[0x3C010:0x3C010] = [0] * 0x40000
+mm3[0x4] = 0x20  # have to do it here, because we don't this in the basepatch itself
+open("mm3_basepatch.nes", 'wb').write(mm3)
diff --git a/worlds/mm3/test/__init__.py b/worlds/mm3/test/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/mm3/test/bases.py b/worlds/mm3/test/bases.py
new file mode 100644
index 0000000000..38ea47ab2f
--- /dev/null
+++ b/worlds/mm3/test/bases.py
@@ -0,0 +1,5 @@
+from test.bases import WorldTestBase
+
+
+class MM3TestBase(WorldTestBase):
+    game = "Mega Man 3"
diff --git a/worlds/mm3/test/test_weakness.py b/worlds/mm3/test/test_weakness.py
new file mode 100644
index 0000000000..400eab1f4b
--- /dev/null
+++ b/worlds/mm3/test/test_weakness.py
@@ -0,0 +1,105 @@
+from math import ceil
+
+from .bases import MM3TestBase
+from ..rules import minimum_weakness_requirement, bosses
+
+
+# Need to figure out how this test should work
+def validate_wily_4(base: MM3TestBase) -> None:
+    world = base.multiworld.worlds[base.player]
+    weapon_damage = world.weapon_damage
+    weapon_costs = {
+        0: 0,
+        1: 0.25,
+        2: 2,
+        3: 1,
+        4: 2,
+        5: 7,  # Not really, but we can really only rely on Top for one RBM
+        6: 0.5,
+        7: 2,
+        8: 0.5,
+    }
+    boss_health = {boss: 0x1C for boss in range(8)}
+    weapon_energy = {key: float(0x1C) for key in weapon_costs}
+    weapon_boss = {boss: {weapon: world.weapon_damage[weapon][boss] for weapon in world.weapon_damage}
+                   for boss in range(8)}
+    flexibility = {
+        boss: (
+                sum(damage_value > 0 for damage_value in
+                    weapon_damages.values())  # Amount of weapons that hit this boss
+                * sum(weapon_damages.values())  # Overall damage that those weapons do
+        )
+        for boss, weapon_damages in weapon_boss.items()
+    }
+    boss_flexibility = sorted(flexibility, key=flexibility.get)  # Fast way to sort dict by value
+    used_weapons: dict[int, set[int]] = {i: set() for i in range(8)}
+    for boss in boss_flexibility:
+        boss_damage = weapon_boss[boss]
+        weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in
+                         boss_damage.items() if weapon_energy[weapon] > 0}
+        while boss_health[boss] > 0:
+            if boss_damage[0] > 0:
+                boss_health[boss] = 0  # if we can buster, we should buster
+                continue
+            highest, wp = max(zip(weapon_weight.values(), weapon_weight.keys()))
+            uses = weapon_energy[wp] // weapon_costs[wp]
+            used_weapons[boss].add(wp)
+            if int(uses * boss_damage[wp]) > boss_health[boss]:
+                used = ceil(boss_health[boss] / boss_damage[wp])
+                weapon_energy[wp] -= weapon_costs[wp] * used
+                boss_health[boss] = 0
+            elif highest <= 0:
+                # we are out of weapons that can actually damage the boss
+                base.fail(f"Ran out of weapon energy to damage "
+                          f"{next(name for name in bosses if bosses[name] == boss)}\n"
+                          f"Seed: {base.multiworld.seed}\n"
+                          f"Damage Table: {weapon_damage}")
+            else:
+                # drain the weapon and continue
+                boss_health[boss] -= int(uses * boss_damage[wp])
+                weapon_energy[wp] -= weapon_costs[wp] * uses
+                weapon_weight.pop(wp)
+
+
+class WeaknessTests(MM3TestBase):
+    def test_that_every_boss_has_a_weakness(self) -> None:
+        world = self.multiworld.worlds[self.player]
+        weapon_damage = world.weapon_damage
+        for boss in range(22):
+            if not any(weapon_damage[weapon][boss] >= minimum_weakness_requirement[weapon] for weapon in range(9)):
+                self.fail(f"Boss {boss} generated without weakness! Seed: {self.multiworld.seed}")
+
+    def test_wily_4(self) -> None:
+        validate_wily_4(self)
+
+
+class StrictWeaknessTests(WeaknessTests):
+    options = {
+        "strict_weakness": True,
+    }
+
+
+class RandomWeaknessTests(WeaknessTests):
+    options = {
+        "random_weakness": "randomized"
+    }
+
+
+class ShuffledWeaknessTests(WeaknessTests):
+    options = {
+        "random_weakness": "shuffled"
+    }
+
+
+class RandomStrictWeaknessTests(WeaknessTests):
+    options = {
+        "strict_weakness": True,
+        "random_weakness": "randomized",
+    }
+
+
+class ShuffledStrictWeaknessTests(WeaknessTests):
+    options = {
+        "strict_weakness": True,
+        "random_weakness": "shuffled"
+    }
diff --git a/worlds/mm3/text.py b/worlds/mm3/text.py
new file mode 100644
index 0000000000..337837244c
--- /dev/null
+++ b/worlds/mm3/text.py
@@ -0,0 +1,63 @@
+from collections import defaultdict
+from typing import DefaultDict
+
+MM3_WEAPON_ENCODING: DefaultDict[str, int] = defaultdict(lambda: 0x25, {
+    '0': 0x00,
+    '1': 0x01,
+    '2': 0x02,
+    '3': 0x03,
+    '4': 0x04,
+    '5': 0x05,
+    '6': 0x06,
+    '7': 0x07,
+    '8': 0x08,
+    '9': 0x09,
+    'A': 0x0A,
+    'B': 0x0B,
+    'C': 0x0C,
+    'D': 0x0D,
+    'E': 0x0E,
+    'F': 0x0F,
+    'G': 0x10,
+    'H': 0x11,
+    'I': 0x12,
+    'J': 0x13,
+    'K': 0x14,
+    'L': 0x15,
+    'M': 0x16,
+    'N': 0x17,
+    'O': 0x18,
+    'P': 0x19,
+    'Q': 0x1A,
+    'R': 0x1B,
+    'S': 0x1C,
+    'T': 0x1D,
+    'U': 0x1E,
+    'V': 0x1F,
+    'W': 0x20,
+    'X': 0x21,
+    'Y': 0x22,
+    'Z': 0x23,
+    ' ': 0x25,
+    '.': 0x26,
+    ',': 0x27,
+    '\'': 0x28,
+    '!': 0x29,
+    ':': 0x2B
+})
+
+
+class MM3TextEntry:
+    def __init__(self, text: str = "", y_coords: int = 0xA5, row: int = 0x21):
+        self.target_area: int = row  # don't change
+        self.coords: int = y_coords  # 0xYX, Y can only be increments of 0x20
+        self.text: str = text
+
+    def resolve(self) -> bytes:
+        data = bytearray()
+        data.append(self.target_area)
+        data.append(self.coords)
+        data.append(12)
+        data.extend([MM3_WEAPON_ENCODING[x] for x in self.text.upper()])
+        data.extend([0x25] * (13 - len(self.text)))
+        return bytes(data)
diff --git a/worlds/musedash/MuseDashCollection.py b/worlds/musedash/MuseDashCollection.py
index 2a9f56750e..4c23a5c64f 100644
--- a/worlds/musedash/MuseDashCollection.py
+++ b/worlds/musedash/MuseDashCollection.py
@@ -28,6 +28,7 @@ class MuseDashCollections:
         "Miku in Museland",  # Paid DLC not included in Muse Plus
         "Rin Len's Mirrorland",  # Paid DLC not included in Muse Plus
         "MSR Anthology_Vol.02", # Goes away January 26, 2026. 
+        "MD-level Tactical Training Blu-ray", # Goes away December 27, 2025. 
     ]
 
     REMOVED_SONGS = [
@@ -38,6 +39,7 @@ class MuseDashCollections:
         "Tsukuyomi Ni Naru Replaced",
         "Heart Message feat. Aoi Tokimori Secret",
         "Meow Rock feat. Chun Ge, Yuan Shen",
+        "Stra Stella Secret",
     ]
 
     song_items = SONG_DATA
diff --git a/worlds/musedash/MuseDashData.py b/worlds/musedash/MuseDashData.py
index f3a6becb6a..86486a4929 100644
--- a/worlds/musedash/MuseDashData.py
+++ b/worlds/musedash/MuseDashData.py
@@ -625,7 +625,7 @@ SONG_DATA: Dict[str, SongData] = {
     "Synthesis.": SongData(2900749, "83-1", "Cosmic Radio 2024", True, 6, 8, 10),
     "COSMiC FANFARE!!!!": SongData(2900750, "83-2", "Cosmic Radio 2024", False, 7, 9, 11),
     "Sharp Bubbles": SongData(2900751, "83-3", "Cosmic Radio 2024", True, 7, 9, 11),
-    "Replay": SongData(2900752, "83-4", "Cosmic Radio 2024", True, 5, 7, 9),
+    "Replay": SongData(2900752, "83-4", "Cosmic Radio 2024", False, 5, 7, 9),
     "Cosmic Dusty Girl": SongData(2900753, "83-5", "Cosmic Radio 2024", True, 5, 7, 9),
     "Meow Rock feat. Chun Ge, Yuan Shen": SongData(2900754, "84-0", "Muse Dash・Legend", True, None, None, None),
     "Even if you make an old radio song with AI": SongData(2900755, "84-1", "Muse Dash・Legend", False, 3, 6, 8),
@@ -671,4 +671,36 @@ SONG_DATA: Dict[str, SongData] = {
     "Temptation": SongData(2900795, "89-3", "Legendary Voyage, Mystic Treasure", False, 5, 8, 10),
     "PwP": SongData(2900796, "89-4", "Legendary Voyage, Mystic Treasure", True, 3, 6, 9),
     "I Can Show You": SongData(2900797, "89-5", "Legendary Voyage, Mystic Treasure", False, 5, 7, 9),
+    "An Artificial Flower Has No Right to Wilt": SongData(2900798, "90-0", "MEDIUM5 Echoes", True, 3, 5, 7),
+    "Time Stopped": SongData(2900799, "90-1", "MEDIUM5 Echoes", True, 5, 7, 9),
+    "Stranded Siren": SongData(2900800, "90-2", "MEDIUM5 Echoes", True, 6, 8, 10),
+    "City Lights": SongData(2900801, "90-3", "MEDIUM5 Echoes", True, 4, 6, 9),
+    "Polaris Wandering Night": SongData(2900802, "90-4", "MEDIUM5 Echoes", True, 5, 8, 10),
+    "Chasing the Moonlight": SongData(2900803, "90-5", "MEDIUM5 Echoes", True, 4, 6, 8),
+    "WILDCARD": SongData(2900804, "91-0", "48 Hours After Discharge", True, 3, 6, 9),
+    "It was all just a dream!": SongData(2900805, "91-1", "48 Hours After Discharge", True, 5, 7, 9),
+    "Science": SongData(2900806, "91-2", "48 Hours After Discharge", False, 4, 7, 9),
+    "Hit Maker": SongData(2900807, "91-3", "48 Hours After Discharge", False, 4, 6, 9),
+    "THX 4 playing": SongData(2900808, "91-4", "48 Hours After Discharge", True, 3, 5, 8),
+    "Theory of Existence": SongData(2900809, "91-5", "48 Hours After Discharge", True, 4, 6, 9),
+    "Kirakira Noel Story!!": SongData(2900810, "43-68", "MD Plus Project", False, 6, 8, 10),
+    "Fantasista LAST END": SongData(2900811, "92-0", "HARDCORE MOTTO TANO*C", True, 7, 9, 11),
+    "Colorful Universe": SongData(2900812, "92-1", "HARDCORE MOTTO TANO*C", True, 3, 6, 9),
+    "Future Flux": SongData(2900813, "92-2", "HARDCORE MOTTO TANO*C", True, 5, 8, 10),
+    "SOMEONE STOP ME!!!": SongData(2900814, "92-3", "HARDCORE MOTTO TANO*C", True, 6, 8, 10),
+    "Azathoth": SongData(2900815, "92-4", "HARDCORE MOTTO TANO*C", True, 6, 8, 10),
+    "Change the Game feat. Iori Matsunaga": SongData(2900816, "92-5", "HARDCORE MOTTO TANO*C", False, 6, 8, 10),
+    "Stra Stella Secret": SongData(2900817, "0-59", "Default Music", False, 6, 8, 10),
+    "Stra Stella": SongData(2900818, "0-60", "Default Music", False, 1, 4, None),
+    "Ultra-Digital Super Detox": SongData(2900819, "43-69", "MD Plus Project", False, 3, 6, 9),
+    "Otsukimi Koete Otsukiai": SongData(2900820, "43-70", "MD Plus Project", True, 6, 8, 10),
+    "Obenkyou Time": SongData(2900821, "43-71", "MD Plus Project", False, 6, 8, 11),
+    "Retry Now": SongData(2900822, "43-72", "MD Plus Project", False, 3, 6, 9),
+    "Master Bancho's Sushi Class ": SongData(2900823, "93-0", "Welcome to the Blue Hole!", False, None, None, None),
+    "CHAOTiC BATTLE": SongData(2900824, "94-0", "Cosmic Radio 2025", False, 7, 9, 11),
+    "FATAL GAME": SongData(2900825, "94-1", "Cosmic Radio 2025", False, 3, 6, 9),
+    "Aria": SongData(2900826, "94-2", "Cosmic Radio 2025", False, 4, 6, 9),
+    "+1 UNKNOWN -NUMBER": SongData(2900827, "94-3", "Cosmic Radio 2025", True, 4, 7, 10),
+    "To the Beyond, from the Nameless Seaside": SongData(2900828, "94-4", "Cosmic Radio 2025", False, 5, 8, 10),
+    "REK421": SongData(2900829, "94-5", "Cosmic Radio 2025", True, 7, 9, 11),
 }
diff --git a/worlds/musedash/archipelago.json b/worlds/musedash/archipelago.json
index d10e8369d6..dea7846b4f 100644
--- a/worlds/musedash/archipelago.json
+++ b/worlds/musedash/archipelago.json
@@ -1,6 +1,6 @@
 {
   "game": "Muse Dash",
   "authors": ["DeamonHunter"],
-  "world_version": "1.5.25",
+  "world_version": "1.5.29",
   "minimum_ap_version": "0.6.3"
 }
\ No newline at end of file
diff --git a/worlds/noita/items.py b/worlds/noita/items.py
index 4cd0b5ef87..740ce587fe 100644
--- a/worlds/noita/items.py
+++ b/worlds/noita/items.py
@@ -79,7 +79,7 @@ def create_all_items(world: NoitaWorld) -> None:
         if world.multiworld.players == 1:
             for location in world.multiworld.get_unfilled_locations(player):
                 if "Shop Item" in location.name:
-                    location.item = create_item(player, itempool.pop())
+                    world.multiworld.push_item(location, create_item(player, itempool.pop()), False)
             locations_to_fill = len(world.multiworld.get_unfilled_locations(player))
 
     itempool += create_random_items(world, filler_weights, locations_to_fill - len(itempool))
diff --git a/worlds/oot/Patches.py b/worlds/oot/Patches.py
index db7be3d4dd..98bb44efc8 100644
--- a/worlds/oot/Patches.py
+++ b/worlds/oot/Patches.py
@@ -272,7 +272,7 @@ def patch_rom(world, rom):
         world_str = ""
     rom.write_bytes(rom.sym('WORLD_STRING_TXT'), makebytes(world_str, 12))
 
-    time_str = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M") + " UTC"
+    time_str = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M") + " UTC"
     rom.write_bytes(rom.sym('TIME_STRING_TXT'), makebytes(time_str, 25))
 
     rom.write_byte(rom.sym('CFG_SHOW_SETTING_INFO'), 0x01)
diff --git a/worlds/oot/docs/setup_de.md b/worlds/oot/docs/setup_de.md
index f257ddc015..d456f69079 100644
--- a/worlds/oot/docs/setup_de.md
+++ b/worlds/oot/docs/setup_de.md
@@ -7,7 +7,7 @@ Da wir BizHawk benutzen, gilt diese Anleitung nur für Windows und Linux.
 ## Benötigte Software
 
 - BizHawk: [BizHawk Veröffentlichungen von TASVideos](https://tasvideos.org/BizHawk/ReleaseHistory)
-  - Version 2.3.1 und später werden unterstützt. Version 2.10 ist empfohlen.
+  - Version 2.10 und neuer werden unterstützt. Version 2.10 ist empfohlen.
   - Detailierte Installtionsanweisungen für BizHawk können über den obrigen Link gefunden werden.
   - Windows-Benutzer müssen die Prerequisiten installiert haben. Diese können ebenfalls über
     den obrigen Link gefunden werden.
@@ -19,11 +19,6 @@ Da wir BizHawk benutzen, gilt diese Anleitung nur für Windows und Linux.
 
 Sobald Bizhawk einmal installiert wurde, öffne **EmuHawk** und ändere die folgenen Einsteluungen:
 
-- (≤ 2.8) Gehe zu `Config > Customize`. Wechlse zu dem `Advanced`-Reiter, wechsle dann den `Lua Core` von "NLua+KopiLua" zu
-  `"Lua+LuaInterface"`. Starte danach EmuHawk neu. Dies ist zwingend notwendig, damit die Lua-Scripts, mit denen man sich mit dem Client verbindet, ordnungsgemäß funktionieren.
-  **ANMERKUNG: Selbst wenn "Lua+LuaInterface" bereits ausgewählt ist, wechsle zwischen den beiden Optionen umher und**
-  **wähle es erneut aus. Neue Installationen oder Versionen von EmuHawk neigen dazu "Lua+LuaInterface" als die**
-  **Standard-Option anzuzeigen, aber laden dennoch "NLua+KopiLua", bis dieser Schritt getan ist.**
 - Unter `Config > Customize > Advanced`, gehe sicher dass der Haken bei `AutoSaveRAM` ausgeählt ist, und klicke dann
   den 5s-Knopf. Dies verringert die Wahrscheinlichkeit den Speicherfrotschritt zu verlieren, sollte der Emulator mal
   abstürzen.
diff --git a/worlds/oot/docs/setup_en.md b/worlds/oot/docs/setup_en.md
index 31b7137bd8..a09752f0d8 100644
--- a/worlds/oot/docs/setup_en.md
+++ b/worlds/oot/docs/setup_en.md
@@ -7,7 +7,7 @@ As we are using BizHawk, this guide is only applicable to Windows and Linux syst
 ## Required Software
 
 - BizHawk: [BizHawk Releases from TASVideos](https://tasvideos.org/BizHawk/ReleaseHistory)
-  - Version 2.3.1 and later are supported. Version 2.10 is recommended for stability.
+  - Version 2.10 and later are supported. Version 2.10 is recommended for stability.
   - Detailed installation instructions for BizHawk can be found at the above link.
   - Windows users must run the prereq installer first, which can also be found at the above link.
 - The built-in Archipelago client, which can be installed [here](https://github.com/ArchipelagoMW/Archipelago/releases).
@@ -17,11 +17,6 @@ As we are using BizHawk, this guide is only applicable to Windows and Linux syst
 
 Once BizHawk has been installed, open EmuHawk and change the following settings:
 
-- (≤ 2.8) Go to Config > Customize. Switch to the Advanced tab, then switch the Lua Core from "NLua+KopiLua" to
-  "Lua+LuaInterface". Then restart EmuHawk. This is required for the Lua script to function correctly.
-  **NOTE: Even if "Lua+LuaInterface" is already selected, toggle between the two options and reselect it. Fresh installs** 
-  **of newer versions of EmuHawk have a tendency to show "Lua+LuaInterface" as the default selected option but still load** 
-  **"NLua+KopiLua" until this step is done.**
 - Under Config > Customize > Advanced, make sure the box for AutoSaveRAM is checked, and click the 5s button.
   This reduces the possibility of losing save data in emulator crashes.
 - Under Config > Customize, check the "Run in background" and "Accept background input" boxes. This will allow you to
diff --git a/worlds/oot/docs/setup_fr.md b/worlds/oot/docs/setup_fr.md
index eb2e97384a..8df50e05bd 100644
--- a/worlds/oot/docs/setup_fr.md
+++ b/worlds/oot/docs/setup_fr.md
@@ -7,7 +7,7 @@ Comme nous utilisons BizHawk, ce guide s'applique uniquement aux systèmes Windo
 ## Logiciel requis
 
 - BizHawk : [Sorties BizHawk de TASVideos](https://tasvideos.org/BizHawk/ReleaseHistory)
-   - Les versions 2.3.1 et ultérieures sont prises en charge. La version 2.10 est recommandée pour des raisons de stabilité.
+   - Les versions 2.10 et ultérieures sont prises en charge. La version 2.10 est recommandée pour des raisons de stabilité.
    - Des instructions d'installation détaillées pour BizHawk peuvent être trouvées sur le lien ci-dessus.
    - Les utilisateurs Windows doivent d'abord exécuter le programme d'installation des prérequis, qui peut également être trouvé sur le lien ci-dessus.
 - Le client Archipelago intégré, qui peut être installé [ici](https://github.com/ArchipelagoMW/Archipelago/releases)
@@ -18,10 +18,6 @@ Comme nous utilisons BizHawk, ce guide s'applique uniquement aux systèmes Windo
 
 Une fois BizHawk installé, ouvrez EmuHawk et modifiez les paramètres suivants :
 
-- (≤ 2,8) Allez dans Config > Personnaliser. Passez à l'onglet Avancé, puis faites passer le Lua Core de "NLua+KopiLua" à
-   "Lua+LuaInterface". Puis redémarrez EmuHawk. Ceci est nécessaire pour que le script Lua fonctionne correctement.
-   **REMARQUE : Même si « Lua+LuaInterface » est déjà sélectionné, basculez entre les deux options et resélectionnez-la. Nouvelles installations**
-   **des versions plus récentes d'EmuHawk ont tendance à afficher "Lua+LuaInterface" comme option sélectionnée par défaut mais ce pendant refait l'épate juste au dessus par précautions**
 - Sous Config > Personnaliser > Avancé, assurez-vous que la case AutoSaveRAM est cochée et cliquez sur le bouton 5s.
    Cela réduit la possibilité de perdre des données de sauvegarde en cas de crash de l'émulateur.
 - Sous Config > Personnaliser, cochez les cases « Exécuter en arrière-plan » et « Accepter la saisie en arrière-plan ». Cela vous permettra continuez à jouer en arrière-plan, même si une autre fenêtre est sélectionnée.
diff --git a/worlds/paint/archipelago.json b/worlds/paint/archipelago.json
new file mode 100644
index 0000000000..f87089741f
--- /dev/null
+++ b/worlds/paint/archipelago.json
@@ -0,0 +1,5 @@
+{
+    "game": "Paint",
+    "authors": ["MarioManTAW"],
+    "world_version": "0.5.2"
+}
diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index 4f2c2ef95c..10abed539f 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -123,6 +123,7 @@ class PokemonEmeraldWorld(World):
     blacklisted_wilds: Set[int]
     blacklisted_starters: Set[int]
     blacklisted_opponent_pokemon: Set[int]
+    allowed_dexsanity_species: set[int]
     hm_requirements: Dict[str, Union[int, List[str]]]
     auth: bytes
 
@@ -142,6 +143,7 @@ class PokemonEmeraldWorld(World):
         self.blacklisted_wilds = set()
         self.blacklisted_starters = set()
         self.blacklisted_opponent_pokemon = set()
+        self.allowed_dexsanity_species = set()
         self.modified_maps = copy.deepcopy(emerald_data.maps)
         self.modified_species = copy.deepcopy(emerald_data.species)
         self.modified_tmhm_moves = []
@@ -265,6 +267,7 @@ class PokemonEmeraldWorld(World):
         from .regions import create_regions
         all_regions = create_regions(self)
 
+        randomize_wild_encounters(self)
         # Categories with progression items always included
         categories = {
             LocationCategory.BADGE,
@@ -494,7 +497,6 @@ class PokemonEmeraldWorld(World):
         set_rules(self)
 
     def connect_entrances(self):
-        randomize_wild_encounters(self)
         self.shuffle_badges_hms()
         # For entrance randomization, disconnect entrances here, randomize map, then
         # undo badge/HM placement and re-shuffle them in the new map.
diff --git a/worlds/pokemon_emerald/docs/setup_en.md b/worlds/pokemon_emerald/docs/setup_en.md
index 2ae54d5e0c..fefedd2b18 100644
--- a/worlds/pokemon_emerald/docs/setup_en.md
+++ b/worlds/pokemon_emerald/docs/setup_en.md
@@ -28,7 +28,7 @@ clear it.
 
 1. Create your options file (YAML). You can make one on the
 [Pokémon Emerald options page](../../../games/Pokemon%20Emerald/player-options).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have the `.apemerald` file extension.
 3. Open `ArchipelagoLauncher.exe`
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/pokemon_emerald/docs/setup_es.md b/worlds/pokemon_emerald/docs/setup_es.md
index 1d3721862a..f32bf0a28e 100644
--- a/worlds/pokemon_emerald/docs/setup_es.md
+++ b/worlds/pokemon_emerald/docs/setup_es.md
@@ -29,7 +29,7 @@ con [PopTracker](https://github.com/black-sliver/PopTracker/releases)
 1. Crea tu archivo de configuración (YAML). Puedes hacerlo en
 [Página de Opciones de Pokémon Emerald](../../../games/Pokemon%20Emerald/player-options).
 2. Sigue las instrucciones generales de Archipelago para
-[Generar un juego](../../Archipelago/setup/en#generating-a-game). Esto generará un archivo de salida (output file) para
+[Generar un juego](/tutorial/Archipelago/setup_en#generating-a-game). Esto generará un archivo de salida (output file) para
 ti. Tu archivo de parche tendrá la extensión de archivo `.apemerald`.
 3. Abre `ArchipelagoLauncher.exe`
 4. Selecciona "Open Patch" en el lado derecho y elige tu archivo de parcheo.
diff --git a/worlds/pokemon_emerald/docs/setup_sv.md b/worlds/pokemon_emerald/docs/setup_sv.md
index 88b1d38409..d3d4d8a69f 100644
--- a/worlds/pokemon_emerald/docs/setup_sv.md
+++ b/worlds/pokemon_emerald/docs/setup_sv.md
@@ -30,7 +30,7 @@ används tillsammans med
 1. Skapa din konfigurationsfil (YAML). Du kan göra en via att använda
 [Pokémon Emerald options hemsida](../../../games/Pokemon%20Emerald/player-options).
 2. Följ de allmänna Archipelago instruktionerna för att
-[Generera ett spel](../../Archipelago/setup/en#generating-a-game).
+[Generera ett spel](/tutorial/Archipelago/setup_en#generating-a-game).
 Detta kommer generera en fil för dig. Din patchfil kommer ha `.apemerald` som sitt filnamnstillägg.
 3. Öppna `ArchipelagoLauncher.exe`
 4. Välj "Open Patch" på vänstra sidan, och välj din patchfil.
diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
index 49ce147041..fd8d0ebc7d 100644
--- a/worlds/pokemon_emerald/locations.py
+++ b/worlds/pokemon_emerald/locations.py
@@ -110,7 +110,7 @@ def create_locations_by_category(world: "PokemonEmeraldWorld", regions: Dict[str
                 national_dex_id = int(location_name[-3:])  # Location names are formatted POKEDEX_REWARD_###
 
                 # Don't create this pokedex location if player can't find it in the wild
-                if NATIONAL_ID_TO_SPECIES_ID[national_dex_id] in world.blacklisted_wilds:
+                if NATIONAL_ID_TO_SPECIES_ID[national_dex_id] in world.blacklisted_wilds or NATIONAL_ID_TO_SPECIES_ID[national_dex_id] not in world.allowed_dexsanity_species:
                     continue
 
                 location_id += POKEDEX_OFFSET + national_dex_id
diff --git a/worlds/pokemon_emerald/opponents.py b/worlds/pokemon_emerald/opponents.py
index 966d192054..00eceff9a7 100644
--- a/worlds/pokemon_emerald/opponents.py
+++ b/worlds/pokemon_emerald/opponents.py
@@ -63,7 +63,7 @@ def randomize_opponent_parties(world: "PokemonEmeraldWorld") -> None:
                 if len(merged_blacklist) < NUM_REAL_SPECIES:
                     break
             else:
-                raise RuntimeError("This should never happen")
+                merged_blacklist: Set[int] = set()
 
             candidates = [
                 species
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
index 29929bd672..9529be877e 100644
--- a/worlds/pokemon_emerald/options.py
+++ b/worlds/pokemon_emerald/options.py
@@ -4,7 +4,7 @@ Option definitions for Pokemon Emerald
 from dataclasses import dataclass
 
 from Options import (Choice, DeathLink, DefaultOnToggle, OptionSet, NamedRange, Range, Toggle, FreeText,
-                     PerGameCommonOptions, OptionGroup, StartInventory)
+                     PerGameCommonOptions, OptionGroup, StartInventory, OptionList)
 
 from .data import data
 
@@ -129,6 +129,17 @@ class Dexsanity(Toggle):
     display_name = "Dexsanity"
 
 
+class DexsanityEncounterTypes(OptionList):
+    """
+    Determines which Dexsanity encounter areas are in logic.
+
+    Logic will only consider access to Pokemon at these encounter types, but they may still be found elsewhere.
+    """
+    display_name = "Dexsanity Encounter Types"
+    valid_keys = {"Land", "Water", "Fishing"}
+    default = valid_keys.copy()
+
+
 class Trainersanity(Toggle):
     """
     Defeating a trainer gives you an item.
@@ -870,6 +881,7 @@ class PokemonEmeraldOptions(PerGameCommonOptions):
     npc_gifts: RandomizeNpcGifts
     berry_trees: RandomizeBerryTrees
     dexsanity: Dexsanity
+    dexsanity_encounter_types: DexsanityEncounterTypes
     trainersanity: Trainersanity
     item_pool_type: ItemPoolType
 
diff --git a/worlds/pokemon_emerald/pokemon.py b/worlds/pokemon_emerald/pokemon.py
index b39f8c2abf..73af6c4658 100644
--- a/worlds/pokemon_emerald/pokemon.py
+++ b/worlds/pokemon_emerald/pokemon.py
@@ -245,7 +245,7 @@ def _rename_wild_events(world: "PokemonEmeraldWorld", map_data: MapData, new_slo
             for r, sc in _encounter_subcategory_ranges[encounter_type].items()
             if i in r
         )
-        subcategory_species = []
+        subcategory_species: list[int] = []
         for k in subcategory_range:
             if new_slots[k] not in subcategory_species:
                 subcategory_species.append(new_slots[k])
@@ -264,6 +264,12 @@ def _rename_wild_events(world: "PokemonEmeraldWorld", map_data: MapData, new_slo
 
 
 def randomize_wild_encounters(world: "PokemonEmeraldWorld") -> None:
+    encounter_table = {
+        "Land": EncounterType.LAND,
+        "Water": EncounterType.WATER,
+        "Fishing": EncounterType.FISHING,
+    }
+    enabled_encounters = {encounter_table[encounter_type] for encounter_type in world.options.dexsanity_encounter_types.value}
     if world.options.wild_pokemon == RandomizeWildPokemon.option_vanilla:
         return
 
@@ -278,7 +284,7 @@ def randomize_wild_encounters(world: "PokemonEmeraldWorld") -> None:
         RandomizeWildPokemon.option_match_base_stats_and_type,
     }
 
-    already_placed = set()
+    already_placed: set[int] = set()
     num_placeable_species = NUM_REAL_SPECIES - len(world.blacklisted_wilds)
 
     priority_species = [data.constants["SPECIES_WAILORD"], data.constants["SPECIES_RELICANTH"]]
@@ -349,7 +355,7 @@ def randomize_wild_encounters(world: "PokemonEmeraldWorld") -> None:
                             if len(merged_blacklist) < NUM_REAL_SPECIES:
                                 break
                         else:
-                            raise RuntimeError("This should never happen")
+                            merged_blacklist = set()
 
                         candidates = [
                             species
@@ -365,11 +371,13 @@ def randomize_wild_encounters(world: "PokemonEmeraldWorld") -> None:
                     species_old_to_new_map[species_id] = new_species_id
 
                     if world.options.dexsanity and encounter_type != EncounterType.ROCK_SMASH \
-                            and map_name not in OUT_OF_LOGIC_MAPS:
+                            and map_name not in OUT_OF_LOGIC_MAPS and new_species_id not in world.blacklisted_wilds:
                         already_placed.add(new_species_id)
 
             # Actually create the new list of slots and encounter table
             new_slots: List[int] = []
+            if encounter_type in enabled_encounters:
+                world.allowed_dexsanity_species.update(table.slots)
             for species_id in table.slots:
                 new_slots.append(species_old_to_new_map[species_id])
 
diff --git a/worlds/pokemon_emerald/rules.py b/worlds/pokemon_emerald/rules.py
index 828eb20f72..eeadb8bea2 100644
--- a/worlds/pokemon_emerald/rules.py
+++ b/worlds/pokemon_emerald/rules.py
@@ -1548,7 +1548,7 @@ def set_rules(world: "PokemonEmeraldWorld") -> None:
         for i in range(NUM_REAL_SPECIES):
             species = data.species[NATIONAL_ID_TO_SPECIES_ID[i + 1]]
 
-            if species.species_id in world.blacklisted_wilds:
+            if species.species_id in world.blacklisted_wilds or species.species_id not in world.allowed_dexsanity_species:
                 continue
 
             set_rule(
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index 3f5a24cc17..0810ec5dc7 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -656,11 +656,20 @@ class PokemonRedBlueWorld(World):
         if self.options.dexsanity:
             mon_locations = {mon: set() for mon in poke_data.pokemon_data.keys()}
             for loc in location_data:
-                if loc.type in ["Wild Encounter", "Static Pokemon", "Legendary Pokemon", "Missable Pokemon"]:
+                if loc.type in ["Wild Encounter", "Static Pokemon", "Legendary Pokemon"]:
                     mon = self.multiworld.get_location(loc.name, self.player).item.name
-                    if mon.startswith("Static ") or mon.startswith("Missable "):
+                    if mon.startswith("Static "):
                         mon = " ".join(mon.split(" ")[1:])
-                    mon_locations[mon].add(loc.name.split(" -")[0])
+                    if "Wild" in loc.name or "Fishing" in loc.name or "Prize" in loc.name:
+                        encounter_label = loc.name.split(" -")[0]
+                    elif "Surf" in loc.name:
+                        encounter_label = f"{loc.name.split(' -')[0]} (Surf)"
+                    elif "Fake" in loc.name:
+                        encounter_label = f"{loc.name.split(' -')[0]} (Fake Pokeball)"
+                    else:
+                        split_loc_name = loc.name.split(" - ")
+                        encounter_label = f"{split_loc_name[0]} ({split_loc_name[1]})"
+                    mon_locations[mon].add(encounter_label)
             for i, mon in enumerate(mon_locations):
                 if self.dexsanity_table[i] and mon_locations[mon]:
                     hint_data[self.player][self.multiworld.get_location(f"Pokedex - {mon}", self.player).address] =\
diff --git a/worlds/pokemon_rb/docs/setup_en.md b/worlds/pokemon_rb/docs/setup_en.md
index 7e05c8c782..7bb1730710 100644
--- a/worlds/pokemon_rb/docs/setup_en.md
+++ b/worlds/pokemon_rb/docs/setup_en.md
@@ -73,7 +73,7 @@ And the following special characters (these each count as one character):
 ### Generating and Patching a Game
 
 1. Create your options file (YAML).
-2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game).
+2. Follow the general Archipelago instructions for [generating a game](/tutorial/Archipelago/setup_en#generating-a-game).
 This will generate an output file for you. Your patch file will have a `.apred` or `.apblue` file extension.
 3. Open `ArchipelagoLauncher.exe`
 4. Select "Open Patch" on the left side and select your patch file.
diff --git a/worlds/pokemon_rb/docs/setup_es.md b/worlds/pokemon_rb/docs/setup_es.md
index 5c735bfe99..8c79329f82 100644
--- a/worlds/pokemon_rb/docs/setup_es.md
+++ b/worlds/pokemon_rb/docs/setup_es.md
@@ -77,7 +77,7 @@ Y los siguientes caracteres especiales (cada uno ocupa un carácter):
 ### Generar y parchar un juego
 
 1. Crea tu archivo de opciones (YAML).
-2. Sigue las instrucciones generales de Archipelago para [generar un juego](../../Archipelago/setup/en#generating-a-game).
+2. Sigue las instrucciones generales de Archipelago para [generar un juego](/tutorial/Archipelago/setup_en#generating-a-game).
 Haciendo esto se generará un archivo de salida. Tu parche tendrá la extensión de archivo `.apred` o `.apblue`.
 3. Abre `ArchipelagoLauncher.exe`
 4. Selecciona "Open Patch" en el lado izquierdo y selecciona tu parche.
diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py
index 7873ae54bb..f52ff789eb 100644
--- a/worlds/ror2/__init__.py
+++ b/worlds/ror2/__init__.py
@@ -4,7 +4,10 @@ from .items import RiskOfRainItem, item_table, item_pool_weights, offset, filler
 from .locations import RiskOfRainLocation, item_pickups, get_locations
 from .rules import set_rules
 from .ror2environments import environment_vanilla_table, environment_vanilla_orderedstages_table, \
-    environment_sotv_orderedstages_table, environment_sotv_table, collapse_dict_list_vertical, shift_by_offset
+    environment_sotv_orderedstages_table, environment_sotv_table, environment_sost_orderedstages_table, \
+    environment_sost_table, collapse_dict_list_vertical, shift_by_offset, environment_vanilla_variants_table, \
+    environment_vanilla_variant_orderedstages_table, environment_sots_variants_table, \
+    environment_sots_variants_orderedstages_table
 
 from BaseClasses import Item, ItemClassification, Tutorial
 from .options import ItemWeights, ROR2Options, ror2_option_groups
@@ -46,7 +49,7 @@ class RiskOfRainWorld(World):
     }
     location_name_to_id = item_pickups
 
-    required_client_version = (0, 5, 0)
+    required_client_version = (0, 6, 4)
     web = RiskOfWeb()
     total_revivals: int
 
@@ -62,7 +65,9 @@ class RiskOfRainWorld(World):
                     scavengers=self.options.scavengers_per_stage.value,
                     scanners=self.options.scanner_per_stage.value,
                     altars=self.options.altars_per_stage.value,
-                    dlc_sotv=bool(self.options.dlc_sotv.value)
+                    dlc_sotv=bool(self.options.dlc_sotv.value),
+                    dlc_sots=bool(self.options.dlc_sots.value),
+                    stage_variants=bool(self.options.stage_variants)
                 )
             )
         self.total_revivals = int(self.options.total_revivals.value / 100 *
@@ -71,6 +76,8 @@ class RiskOfRainWorld(World):
             self.total_revivals -= 1
         if self.options.victory == "voidling" and not self.options.dlc_sotv:
             self.options.victory.value = self.options.victory.option_any
+        if self.options.victory == "falseson" and not self.options.dlc_sots:
+            self.options.victory.value = self.options.victory.option_any
 
     def create_regions(self) -> None:
 
@@ -105,16 +112,39 @@ class RiskOfRainWorld(World):
 
             # figure out all available ordered stages for each tier
             environment_available_orderedstages_table = environment_vanilla_orderedstages_table
+            environments_pool = shift_by_offset(environment_vanilla_table, environment_offset)
+            # Vanilla Variants
+            if self.options.stage_variants:
+                environment_available_orderedstages_table = \
+                    collapse_dict_list_vertical(environment_available_orderedstages_table,
+                                                environment_vanilla_variant_orderedstages_table)
             if self.options.dlc_sotv:
                 environment_available_orderedstages_table = \
                     collapse_dict_list_vertical(environment_available_orderedstages_table,
                                                 environment_sotv_orderedstages_table)
+            if self.options.dlc_sots:
+                environment_available_orderedstages_table = \
+                    collapse_dict_list_vertical(environment_available_orderedstages_table,
+                                                environment_sost_orderedstages_table)
+            if self.options.dlc_sots and self.options.stage_variants:
+                environment_available_orderedstages_table = \
+                    collapse_dict_list_vertical(environment_available_orderedstages_table,
+                                                environment_sots_variants_orderedstages_table)
 
-            environments_pool = shift_by_offset(environment_vanilla_table, environment_offset)
-
+            if self.options.stage_variants:
+                environment_offset_table = shift_by_offset(environment_vanilla_variants_table, environment_offset)
+                environments_pool = {**environments_pool, **environment_offset_table}
             if self.options.dlc_sotv:
                 environment_offset_table = shift_by_offset(environment_sotv_table, environment_offset)
                 environments_pool = {**environments_pool, **environment_offset_table}
+            if self.options.dlc_sots:
+                environment_offset_table = shift_by_offset(environment_sost_table, environment_offset)
+                environments_pool = {**environments_pool, **environment_offset_table}
+            # SOTS Variant Environments
+            if self.options.dlc_sots and self.options.stage_variants:
+                environment_offset_table = shift_by_offset(environment_sots_variants_table, environment_offset)
+                environments_pool = {**environments_pool, **environment_offset_table}
+
             # percollect starting environment for stage 1
             unlock = self.random.choices(list(environment_available_orderedstages_table[0].keys()), k=1)
             self.multiworld.push_precollected(self.create_item(unlock[0]))
@@ -146,7 +176,9 @@ class RiskOfRainWorld(World):
                     scavengers=self.options.scavengers_per_stage.value,
                     scanners=self.options.scanner_per_stage.value,
                     altars=self.options.altars_per_stage.value,
-                    dlc_sotv=bool(self.options.dlc_sotv.value)
+                    dlc_sotv=bool(self.options.dlc_sotv.value),
+                    dlc_sots=bool(self.options.dlc_sots.value),
+                    stage_variants=bool(self.options.stage_variants)
                 )
             )
         # Create junk items
@@ -223,7 +255,7 @@ class RiskOfRainWorld(World):
                                             "chests_per_stage", "shrines_per_stage", "scavengers_per_stage",
                                             "scanner_per_stage", "altars_per_stage", "total_revivals",
                                             "start_with_revive", "final_stage_death", "death_link", "require_stages",
-                                            "progressive_stages", casing="camel")
+                                            "progressive_stages", "stage_variants", "show_seer_portals", casing="camel")
         return {
             **options_dict,
             "seed": "".join(self.random.choice(string.digits) for _ in range(16)),
@@ -254,7 +286,7 @@ class RiskOfRainWorld(World):
             event_loc.place_locked_item(RiskOfRainItem("Stage 5", ItemClassification.progression, None, self.player))
             event_loc.show_in_spoiler = False
             event_region.locations.append(event_loc)
-            event_loc.access_rule = lambda state: state.has("Sky Meadow", self.player)
+            event_loc.access_rule = lambda state: state.has("Sky Meadow", self.player) or state.has("Helminth Hatchery", self.player)
 
         victory_region = self.multiworld.get_region("Victory", self.player)
         victory_event = RiskOfRainLocation(self.player, "Victory", None, victory_region)
diff --git a/worlds/ror2/archipelago.json b/worlds/ror2/archipelago.json
new file mode 100644
index 0000000000..78c54c1420
--- /dev/null
+++ b/worlds/ror2/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Risk of Rain 2",
+    "minimum_ap_version": "0.6.4",
+    "world_version": "1.5.0",
+    "authors": ["Kindasneaki"]
+}
\ No newline at end of file
diff --git a/worlds/ror2/docs/en_Risk of Rain 2.md b/worlds/ror2/docs/en_Risk of Rain 2.md
index 651c89a339..2acd133e26 100644
--- a/worlds/ror2/docs/en_Risk of Rain 2.md	
+++ b/worlds/ror2/docs/en_Risk of Rain 2.md	
@@ -88,12 +88,21 @@ Explore Mode items are:
 * `Commencement`
 * `All the Hidden Realms`
 
-Dlc_Sotv items
+DLC Survivors of the Void (SOTV) items
 * `Siphoned Forest`
 * `Aphelian Sanctuary`
 * `Sulfur Pools`
 * `Void Locus`
 
+DLC Seekers of the Storm (SOTS) items
+
+* `Shattered Abodes`, `Vicious Falls`, `Disturbed Impact`
+* `Reformed Altar`
+* `Treeborn Colony`, `Golden Dieback`
+* `Prime Meridian`
+* `Helminth Hatchery`
+
+
 When an explore item is granted, it will unlock that environment and will now be accessible! The 
 game will still pick randomly which environment is next, but it will first check to see if they are available. If you have
 multiple of the next environments unlocked, it will weight the game to have a ***higher chance*** to go to one you 
diff --git a/worlds/ror2/docs/setup_en.md b/worlds/ror2/docs/setup_en.md
index 6acf2654a8..cef0885970 100644
--- a/worlds/ror2/docs/setup_en.md
+++ b/worlds/ror2/docs/setup_en.md
@@ -23,6 +23,13 @@ all necessary dependencies as well.
 
 Click on the `Start modded` button in the top left in `r2modman` to start the game with the Archipelago mod installed.
 
+### Troubleshooting
+
+* The mod doesn't show up in game!
+  * `r2modman` looks for the game at its default directory. If you have the game installed somewhere else, 
+    you can update `r2modman` by going to `Settings > Change Risk of Rain 2 folder`
+    and selecting the correct directory.
+
 ## Configuring your YAML File
 ### What is a YAML and why do I need one?
 You can see the [basic multiworld setup guide](/tutorial/Archipelago/setup/en) here on the Archipelago website to learn 
@@ -59,6 +66,7 @@ also optionally connect to the multiworld using the text client, which can be fo
 
 ### In-Game Commands
 These commands are to be used in-game by using ``Ctrl + Alt + ` `` and then typing the following:
+ - `archipelago_reconnect` Reconnect to AP.
  - `archipelago_connect <url> <port> <slot> [password]` example: "archipelago_connect archipelago.gg 38281 SlotName".
  - `archipelago_deathlink true/false` Toggle deathlink.
  - `archipelago_disconnect` Disconnect from AP.
diff --git a/worlds/ror2/locations.py b/worlds/ror2/locations.py
index 13077b3e14..3297231152 100644
--- a/worlds/ror2/locations.py
+++ b/worlds/ror2/locations.py
@@ -3,7 +3,8 @@ from BaseClasses import Location
 from .options import TotalLocations, ChestsPerEnvironment, ShrinesPerEnvironment, ScavengersPerEnvironment, \
     ScannersPerEnvironment, AltarsPerEnvironment
 from .ror2environments import compress_dict_list_horizontal, environment_vanilla_orderedstages_table, \
-    environment_sotv_orderedstages_table
+    environment_sotv_orderedstages_table, environment_sost_orderedstages_table, \
+    environment_sots_variants_orderedstages_table, environment_vanilla_variant_orderedstages_table
 
 
 class RiskOfRainLocation(Location):
@@ -57,13 +58,20 @@ def get_environment_locations(chests: int, shrines: int, scavengers: int, scanne
     return locations
 
 
-def get_locations(chests: int, shrines: int, scavengers: int, scanners: int, altars: int, dlc_sotv: bool) \
+def get_locations(chests: int, shrines: int, scavengers: int, scanners: int, altars: int, dlc_sotv: bool,
+                  dlc_sots: bool, stage_variants: bool) \
         -> Dict[str, int]:
     """Get a dictionary of locations for the orderedstage environments with the locations from the parameters."""
     locations = {}
     orderedstages = compress_dict_list_horizontal(environment_vanilla_orderedstages_table)
+    if stage_variants:
+        orderedstages.update(compress_dict_list_horizontal(environment_vanilla_variant_orderedstages_table))
     if dlc_sotv:
         orderedstages.update(compress_dict_list_horizontal(environment_sotv_orderedstages_table))
+    if dlc_sots:
+        orderedstages.update(compress_dict_list_horizontal(environment_sost_orderedstages_table))
+    if dlc_sots and stage_variants:
+        orderedstages.update(compress_dict_list_horizontal(environment_sots_variants_orderedstages_table))
     # for every environment, generate the respective locations
     for environment_name, environment_index in orderedstages.items():
         locations.update(get_environment_locations(
@@ -86,4 +94,6 @@ location_table.update(get_locations(
     scanners=ScannersPerEnvironment.range_end,
     altars=AltarsPerEnvironment.range_end,
     dlc_sotv=True,
+    dlc_sots=True,
+    stage_variants=True
 ))
diff --git a/worlds/ror2/options.py b/worlds/ror2/options.py
index 381c5942b0..876a67b7fb 100644
--- a/worlds/ror2/options.py
+++ b/worlds/ror2/options.py
@@ -22,8 +22,9 @@ class Goal(Choice):
 class Victory(Choice):
     """
     Mithrix: Defeat Mithrix in Commencement
-    Voidling: Defeat the Voidling in The Planetarium (DLC required! Will select any if not enabled.)
+    Voidling: Defeat the Voidling in The Planetarium (SOTV DLC required! Will select any if not enabled.)
     Limbo: Defeat the Scavenger in Hidden Realm: A Moment, Whole
+    Falseson: Defeat False son and gift an item to the altar in Prime Meridian (SOTS DLC required! Will select any if not enabled.)
     Any: Any victory in the game will count. See Final Stage Death for additional ways.
     """
     display_name = "Victory Condition"
@@ -31,6 +32,7 @@ class Victory(Choice):
     option_mithrix = 1
     option_voidling = 2
     option_limbo = 3
+    option_falseson = 4
     default = 0
 
 
@@ -138,18 +140,26 @@ class FinalStageDeath(Toggle):
     If not use the following to tell if final stage death will count:
     Victory: mithrix - only dying in Commencement will count.
     Victory: voidling - only dying in The Planetarium will count.
-    Victory: limbo - Obliterating yourself will count."""
+    Victory: limbo - Obliterating yourself will count.
+    Victory: falseson - only dying in Prime Meridian will count."""
     display_name = "Final Stage Death is Win"
 
 
 class DLC_SOTV(Toggle):
     """
-     Enable if you are using SOTV DLC.
+     Enable if you are using Survivors of the Void DLC.
      Affects environment availability for Explore Mode.
      Adds Void Items into the item pool
      """
     display_name = "Enable DLC - SOTV"
 
+class DLC_SOTS(Toggle):
+    """
+     Enable if you are using Seekers of the Storm DLC.
+     Affects environment availability for Explore Mode.
+     """
+    display_name = "Enable DLC - SOTS"
+
 
 class RequireStages(DefaultOnToggle):
     """Add Stage items to the pool to block access to the next set of environments."""
@@ -162,6 +172,23 @@ class ProgressiveStages(DefaultOnToggle):
     display_name = "Progressive Stages"
 
 
+class StageVariants(Toggle):
+    """Enable if you want to include stage variants in the environment pool.
+    Stages included are:
+    - Distant Roost (2)
+    - Titanic Plains (2)
+    SOTS DLC Enabled:
+    - Vicious Falls
+    - Shattered Abodes
+    - Golden Dieback"""
+    display_name = "Include Stage Variants"
+
+
+class ShowSeerPortals(DefaultOnToggle):
+    """Shows Seer Portals at the teleporter to allow choosing the next environment."""
+    display_name = "Show Seer Portals"
+
+
 class GreenScrap(Range):
     """Weight of Green Scraps in the item pool.
 
@@ -384,6 +411,8 @@ ror2_option_groups = [
         AltarsPerEnvironment,
         RequireStages,
         ProgressiveStages,
+        StageVariants,
+        ShowSeerPortals,
     ]),
     OptionGroup("Classic Mode Options", [
         TotalLocations,
@@ -427,8 +456,11 @@ class ROR2Options(PerGameCommonOptions):
     start_with_revive: StartWithRevive
     final_stage_death: FinalStageDeath
     dlc_sotv: DLC_SOTV
+    dlc_sots: DLC_SOTS
     require_stages: RequireStages
     progressive_stages: ProgressiveStages
+    stage_variants: StageVariants
+    show_seer_portals: ShowSeerPortals
     death_link: DeathLink
     item_pickup_step: ItemPickupStep
     shrine_use_step: ShrineUseStep
diff --git a/worlds/ror2/regions.py b/worlds/ror2/regions.py
index def29b4728..780f66bcac 100644
--- a/worlds/ror2/regions.py
+++ b/worlds/ror2/regions.py
@@ -18,13 +18,10 @@ def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
     multiworld = ror2_world.multiworld
     # Default Locations
     non_dlc_regions: Dict[str, RoRRegionData] = {
-        "Menu":                                 RoRRegionData(None, ["Distant Roost", "Distant Roost (2)",
-                                                                     "Titanic Plains", "Titanic Plains (2)",
+        "Menu":                                 RoRRegionData(None, ["Distant Roost", "Titanic Plains",
                                                                      "Verdant Falls"]),
         "Distant Roost":                        RoRRegionData([], ["OrderedStage_1"]),
-        "Distant Roost (2)":                    RoRRegionData([], ["OrderedStage_1"]),
         "Titanic Plains":                       RoRRegionData([], ["OrderedStage_1"]),
-        "Titanic Plains (2)":                   RoRRegionData([], ["OrderedStage_1"]),
         "Verdant Falls":                        RoRRegionData([], ["OrderedStage_1"]),
         "Abandoned Aqueduct":                   RoRRegionData([], ["OrderedStage_2"]),
         "Wetland Aspect":                       RoRRegionData([], ["OrderedStage_2"]),
@@ -35,12 +32,30 @@ def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
         "Sundered Grove":                       RoRRegionData([], ["OrderedStage_4"]),
         "Sky Meadow":                           RoRRegionData([], ["Hidden Realm: Bulwark's Ambry", "OrderedStage_5"]),
     }
+    non_dlc_variant_regions: Dict[str, RoRRegionData] = {
+        "Distant Roost (2)": RoRRegionData([], ["OrderedStage_1"]),
+        "Titanic Plains (2)": RoRRegionData([], ["OrderedStage_1"]),
+    }
     # SOTV Regions
-    dlc_regions: Dict[str, RoRRegionData] = {
+    dlc_sotv_regions: Dict[str, RoRRegionData] = {
         "Siphoned Forest":                      RoRRegionData([], ["OrderedStage_1"]),
         "Aphelian Sanctuary":                   RoRRegionData([], ["OrderedStage_2"]),
         "Sulfur Pools":                         RoRRegionData([], ["OrderedStage_3"])
     }
+
+    dlc_sost_regions: Dict[str, RoRRegionData] = {
+        "Shattered Abodes":                     RoRRegionData([], ["OrderedStage_1"]),
+        "Reformed Altar":                      RoRRegionData([], ["OrderedStage_2", "Treeborn Colony"]),
+        "Treeborn Colony":                      RoRRegionData([], ["OrderedStage_3", "Prime Meridian"]),
+        "Helminth Hatchery":                    RoRRegionData([], ["Hidden Realm: Bulwark's Ambry", "OrderedStage_5"]),
+    }
+
+    dlc_sots_variant_regions: Dict[str, RoRRegionData] = {
+        "Viscous Falls": RoRRegionData([], ["OrderedStage_1"]),
+        "Disturbed Impact": RoRRegionData([], ["OrderedStage_1"]),
+        "Golden Dieback": RoRRegionData([], ["OrderedStage_3", "Prime Meridian"]),
+    }
+
     other_regions: Dict[str, RoRRegionData] = {
         "Commencement":                         RoRRegionData(None, ["Victory", "Petrichor V"]),
         "OrderedStage_5":                       RoRRegionData(None, ["Hidden Realm: A Moment, Fractured",
@@ -61,10 +76,15 @@ def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
         "Hidden Realm: Bazaar Between Time":    RoRRegionData(None, ["Void Fields"]),
         "Hidden Realm: Gilded Coast":           RoRRegionData(None, None)
     }
-    dlc_other_regions: Dict[str, RoRRegionData] = {
+    dlc_sotv_other_regions: Dict[str, RoRRegionData] = {
         "The Planetarium":                      RoRRegionData(None, ["Victory", "Petrichor V"]),
         "Void Locus":                           RoRRegionData(None, ["The Planetarium"])
     }
+
+    dlc_sost_other_regions: Dict[str, RoRRegionData] = {
+        "Prime Meridian":                       RoRRegionData(None, ["Victory", "Petrichor V"]),
+    }
+
     # Totals of each item
     chests = int(ror2_options.chests_per_stage)
     shrines = int(ror2_options.shrines_per_stage)
@@ -72,8 +92,14 @@ def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
     scanners = int(ror2_options.scanner_per_stage)
     newt = int(ror2_options.altars_per_stage)
     all_location_regions = {**non_dlc_regions}
+    if ror2_options.stage_variants:
+        all_location_regions.update(non_dlc_variant_regions)
     if ror2_options.dlc_sotv:
-        all_location_regions = {**non_dlc_regions, **dlc_regions}
+        all_location_regions.update(dlc_sotv_regions)
+    if ror2_options.dlc_sots:
+        all_location_regions.update(dlc_sost_regions)
+    if ror2_options.dlc_sots and ror2_options.stage_variants:
+        all_location_regions.update(dlc_sots_variant_regions)
 
     # Locations
     for key in all_location_regions:
@@ -99,25 +125,52 @@ def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
                 all_location_regions[key].locations.append(f"{key}: Newt Altar {i + 1}")
     regions_pool: Dict = {**all_location_regions, **other_regions}
 
-    # DLC Locations
+    # Non DLC Variant Locations
+    if ror2_options.stage_variants:
+        non_dlc_regions["Menu"].region_exits.append("Distant Roost (2)")
+        non_dlc_regions["Menu"].region_exits.append("Titanic Plains (2)")
+    # SOTV DLC Locations
     if ror2_options.dlc_sotv:
         non_dlc_regions["Menu"].region_exits.append("Siphoned Forest")
         other_regions["OrderedStage_1"].region_exits.append("Aphelian Sanctuary")
         other_regions["OrderedStage_2"].region_exits.append("Sulfur Pools")
         other_regions["Void Fields"].region_exits.append("Void Locus")
         other_regions["Commencement"].region_exits.append("The Planetarium")
-        regions_pool: Dict = {**all_location_regions, **other_regions, **dlc_other_regions}
+
+    # SOTS DLC Locations
+    if ror2_options.dlc_sots:
+        non_dlc_regions["Menu"].region_exits.append("Shattered Abodes")
+        other_regions["OrderedStage_1"].region_exits.append("Reformed Altar")
+        other_regions["OrderedStage_4"].region_exits.append("Helminth Hatchery")
+
+    # SOTS Variant Locations
+    if ror2_options.dlc_sots and ror2_options.stage_variants:
+        non_dlc_regions["Menu"].region_exits.append("Viscous Falls")
+        non_dlc_regions["Menu"].region_exits.append("Disturbed Impact")
+        dlc_sost_regions["Reformed Altar"].region_exits.append("Golden Dieback")
+
+    if ror2_options.dlc_sotv:
+        regions_pool.update(dlc_sotv_other_regions)
+    if ror2_options.dlc_sots:
+        regions_pool.update(dlc_sost_other_regions)
 
     # Check to see if Victory needs to be removed from regions
     if ror2_options.victory == "mithrix":
         other_regions["Hidden Realm: A Moment, Whole"].region_exits.pop(0)
-        dlc_other_regions["The Planetarium"].region_exits.pop(0)
+        dlc_sotv_other_regions["The Planetarium"].region_exits.pop(0)
+        dlc_sost_other_regions["Prime Meridian"].region_exits.pop(0)
     elif ror2_options.victory == "voidling":
         other_regions["Commencement"].region_exits.pop(0)
         other_regions["Hidden Realm: A Moment, Whole"].region_exits.pop(0)
+        dlc_sost_other_regions["Prime Meridian"].region_exits.pop(0)
     elif ror2_options.victory == "limbo":
         other_regions["Commencement"].region_exits.pop(0)
-        dlc_other_regions["The Planetarium"].region_exits.pop(0)
+        dlc_sotv_other_regions["The Planetarium"].region_exits.pop(0)
+        dlc_sost_other_regions["Prime Meridian"].region_exits.pop(0)
+    elif ror2_options.victory == "falseson":
+        other_regions["Commencement"].region_exits.pop(0)
+        other_regions["Hidden Realm: A Moment, Whole"].region_exits.pop(0)
+        dlc_sotv_other_regions["The Planetarium"].region_exits.pop(0)
 
     # Create all the regions
     for name, data in regions_pool.items():
diff --git a/worlds/ror2/ror2environments.py b/worlds/ror2/ror2environments.py
index 61707b3362..40e63a35b1 100644
--- a/worlds/ror2/ror2environments.py
+++ b/worlds/ror2/ror2environments.py
@@ -4,11 +4,14 @@ from typing import Dict, List, TypeVar
 
 environment_vanilla_orderedstage_1_table: Dict[str, int] = {
     "Distant Roost":                            7,  # blackbeach
-    "Distant Roost (2)":                        8,  # blackbeach2
     "Titanic Plains":                          15,  # golemplains
-    "Titanic Plains (2)":                      16,  # golemplains2
     "Verdant Falls":                           28,  # lakes
 }
+environment_vanilla_variant_orderedstage_1_table: Dict[str, int] = {
+    "Distant Roost (2)": 8,  # blackbeach2
+    "Titanic Plains (2)": 16,  # golemplains2
+}
+
 environment_vanilla_orderedstage_2_table: Dict[str, int] = {
     "Abandoned Aqueduct":                      17,  # goolake
     "Wetland Aspect":                          12,  # foggyswamp
@@ -54,6 +57,34 @@ environment_sotv_special_table: Dict[str, int] = {
     "The Planetarium":                         45,  # voidraid
 }
 
+environment_sost_orderstage_1_table: Dict[str, int] = {
+    "Shattered Abodes":                        54,  # village
+
+}
+environment_sost_variant_orderstage_1_table: Dict[str, int] = {
+    "Viscous Falls": 34,  # lakesnight
+    "Disturbed Impact": 55,  # villagenight
+}
+
+environment_sost_orderstage_2_table: Dict[str, int] = {
+    "Reformed Altar":                         36,  # lemuriantemple
+}
+
+environment_sost_orderstage_3_table: Dict[str, int] = {
+    "Treeborn Colony":                         21,  # habitat
+}
+environment_sost_variant_orderstage_3_table: Dict[str, int] = {
+    "Golden Dieback": 22,  # habitatfall
+}
+
+environment_sost_orderstage_5_table: Dict[str, int] = {
+    "Helminth Hatchery":                    23,  # helminthroost
+}
+
+environment_sost_special_table: Dict[str, int] = {
+    "Prime Meridian":                          40,  # meridian
+}
+
 X = TypeVar("X")
 Y = TypeVar("Y")
 
@@ -100,18 +131,32 @@ environment_vanilla_orderedstages_table = \
 environment_vanilla_table = \
     {**compress_dict_list_horizontal(environment_vanilla_orderedstages_table),
      **environment_vanilla_hidden_realm_table, **environment_vanilla_special_table}
+# Vanilla Variants
+environment_vanilla_variant_orderedstages_table = \
+    [environment_vanilla_variant_orderedstage_1_table]
+environment_vanilla_variants_table = \
+    {**compress_dict_list_horizontal(environment_vanilla_variant_orderedstages_table)}
 
+# SoTV
 environment_sotv_orderedstages_table = \
     [environment_sotv_orderedstage_1_table, environment_sotv_orderedstage_2_table,
      environment_sotv_orderedstage_3_table]
 environment_sotv_table = \
     {**compress_dict_list_horizontal(environment_sotv_orderedstages_table), **environment_sotv_special_table}
+# SoST
+environment_sost_orderedstages_table = \
+    [environment_sost_orderstage_1_table, environment_sost_orderstage_2_table,
+     environment_sost_orderstage_3_table, {}, environment_sost_orderstage_5_table] # There is no new stage 4 in SoST
+environment_sost_table = \
+    {**compress_dict_list_horizontal(environment_sost_orderedstages_table), **environment_sost_special_table}
+# SOTS Variants
+environment_sots_variants_orderedstages_table = \
+    [environment_sost_variant_orderstage_1_table, {}, environment_sost_variant_orderstage_3_table]
+environment_sots_variants_table = \
+    {**compress_dict_list_horizontal(environment_sots_variants_orderedstages_table)}
 
-environment_non_orderedstages_table = \
-    {**environment_vanilla_hidden_realm_table, **environment_vanilla_special_table, **environment_sotv_special_table}
-environment_orderedstages_table = \
-    collapse_dict_list_vertical(environment_vanilla_orderedstages_table, environment_sotv_orderedstages_table)
-environment_all_table = {**environment_vanilla_table, **environment_sotv_table}
+environment_all_table = {**environment_vanilla_table, **environment_sotv_table, **environment_sost_table,
+                         **environment_vanilla_variants_table, **environment_sots_variants_table}
 
 
 def shift_by_offset(dictionary: Dict[str, int], offset: int) -> Dict[str, int]:
diff --git a/worlds/ror2/rules.py b/worlds/ror2/rules.py
index f0ab9f2831..d8d92ca270 100644
--- a/worlds/ror2/rules.py
+++ b/worlds/ror2/rules.py
@@ -1,7 +1,9 @@
 from worlds.generic.Rules import set_rule, add_rule
 from BaseClasses import MultiWorld
 from .locations import get_locations
-from .ror2environments import environment_vanilla_orderedstages_table, environment_sotv_orderedstages_table
+from .ror2environments import environment_vanilla_orderedstages_table, environment_sotv_orderedstages_table, \
+    environment_sost_orderedstages_table, environment_vanilla_variant_orderedstages_table, \
+    environment_sots_variants_orderedstages_table
 from typing import Set, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -43,6 +45,24 @@ def has_location_access_rule(multiworld: MultiWorld, environment: str, player: i
         multiworld.get_location(location_name, player).access_rule = \
             lambda state: state.has(environment, player)
 
+def explore_environment_location_rules(table, multiworld, player, chests, shrines, newts, scavengers, scanners):
+    for i in range(len(table)):
+        for environment_name, _ in table[i].items():
+            # Make sure to go through each location
+            if scavengers == 1:
+                has_location_access_rule(multiworld, environment_name, player, scavengers, "Scavenger")
+            if scanners == 1:
+                has_location_access_rule(multiworld, environment_name, player, scanners, "Radio Scanner")
+            for chest in range(1, chests + 1):
+                has_location_access_rule(multiworld, environment_name, player, chest, "Chest")
+            for shrine in range(1, shrines + 1):
+                has_location_access_rule(multiworld, environment_name, player, shrine, "Shrine")
+            if newts > 0:
+                for newt in range(1, newts + 1):
+                    has_location_access_rule(multiworld, environment_name, player, newt, "Newt Altar")
+            if i > 0:
+                has_stage_access_rule(multiworld, f"Stage {i}", i, environment_name, player)
+
 
 def set_rules(ror2_world: "RiskOfRainWorld") -> None:
     player = ror2_world.player
@@ -60,7 +80,9 @@ def set_rules(ror2_world: "RiskOfRainWorld") -> None:
                 scavengers=ror2_options.scavengers_per_stage.value,
                 scanners=ror2_options.scanner_per_stage.value,
                 altars=ror2_options.altars_per_stage.value,
-                dlc_sotv=bool(ror2_options.dlc_sotv.value)
+                dlc_sotv=bool(ror2_options.dlc_sotv.value),
+                dlc_sots=bool(ror2_options.dlc_sots.value),
+                stage_variants=bool(ror2_options.stage_variants)
             )
         )
 
@@ -101,40 +123,25 @@ def set_rules(ror2_world: "RiskOfRainWorld") -> None:
         newts = ror2_options.altars_per_stage.value
         scavengers = ror2_options.scavengers_per_stage.value
         scanners = ror2_options.scanner_per_stage.value
-        for i in range(len(environment_vanilla_orderedstages_table)):
-            for environment_name, _ in environment_vanilla_orderedstages_table[i].items():
-                # Make sure to go through each location
-                if scavengers == 1:
-                    has_location_access_rule(multiworld, environment_name, player, scavengers, "Scavenger")
-                if scanners == 1:
-                    has_location_access_rule(multiworld, environment_name, player, scanners, "Radio Scanner")
-                for chest in range(1, chests + 1):
-                    has_location_access_rule(multiworld, environment_name, player, chest, "Chest")
-                for shrine in range(1, shrines + 1):
-                    has_location_access_rule(multiworld, environment_name, player, shrine, "Shrine")
-                if newts > 0:
-                    for newt in range(1, newts + 1):
-                        has_location_access_rule(multiworld, environment_name, player, newt, "Newt Altar")
-                if i > 0:
-                    has_stage_access_rule(multiworld, f"Stage {i}", i, environment_name, player)
-
+        # Vanilla stages
+        explore_environment_location_rules(environment_vanilla_orderedstages_table, multiworld, player, chests, shrines, newts,
+                                           scavengers, scanners)
+        # Vanilla Variant stages
+        if ror2_options.stage_variants:
+            explore_environment_location_rules(environment_vanilla_variant_orderedstages_table, multiworld, player, chests, shrines, newts,
+                                               scavengers, scanners)
+        # SoTv stages
         if ror2_options.dlc_sotv:
-            for i in range(len(environment_sotv_orderedstages_table)):
-                for environment_name, _ in environment_sotv_orderedstages_table[i].items():
-                    # Make sure to go through each location
-                    if scavengers == 1:
-                        has_location_access_rule(multiworld, environment_name, player, scavengers, "Scavenger")
-                    if scanners == 1:
-                        has_location_access_rule(multiworld, environment_name, player, scanners, "Radio Scanner")
-                    for chest in range(1, chests + 1):
-                        has_location_access_rule(multiworld, environment_name, player, chest, "Chest")
-                    for shrine in range(1, shrines + 1):
-                        has_location_access_rule(multiworld, environment_name, player, shrine, "Shrine")
-                    if newts > 0:
-                        for newt in range(1, newts + 1):
-                            has_location_access_rule(multiworld, environment_name, player, newt, "Newt Altar")
-                    if i > 0:
-                        has_stage_access_rule(multiworld, f"Stage {i}", i, environment_name, player)
+            explore_environment_location_rules(environment_sotv_orderedstages_table, multiworld, player, chests, shrines,
+                                               newts, scavengers, scanners)
+        # SoTS stages
+        if ror2_options.dlc_sots:
+            explore_environment_location_rules(environment_sost_orderedstages_table, multiworld, player, chests, shrines,
+                                               newts, scavengers, scanners)
+        if ror2_options.dlc_sots and ror2_options.stage_variants:
+            explore_environment_location_rules(environment_sots_variants_orderedstages_table, multiworld, player, chests, shrines,
+                                               newts, scavengers, scanners)
+
         has_entrance_access_rule(multiworld, "Hidden Realm: A Moment, Fractured", "Hidden Realm: A Moment, Whole",
                                  player)
         has_stage_access_rule(multiworld, "Stage 1", 1, "Hidden Realm: Bazaar Between Time", player)
@@ -147,6 +154,8 @@ def set_rules(ror2_world: "RiskOfRainWorld") -> None:
             has_entrance_access_rule(multiworld, "Stage 5", "Void Locus", player)
             if ror2_options.victory == "voidling":
                 has_all_items(multiworld, {"Stage 5", "The Planetarium"}, "Commencement", player)
+        if ror2_options.dlc_sots:
+            has_entrance_access_rule(multiworld, "Stage 5", "Prime Meridian", player)
 
     # Win Condition
     multiworld.completion_condition[player] = lambda state: state.has("Victory", player)
diff --git a/worlds/ror2/test/test_any_goal.py b/worlds/ror2/test/test_any_goal.py
index 18d4994419..7dbd549c9f 100644
--- a/worlds/ror2/test/test_any_goal.py
+++ b/worlds/ror2/test/test_any_goal.py
@@ -4,23 +4,33 @@ from . import RoR2TestBase
 class DLCTest(RoR2TestBase):
     options = {
         "dlc_sotv": "true",
-        "victory": "any"
+        "victory": "any",
+        "dlc_sots": "true",
     }
 
     def test_commencement_victory(self) -> None:
-        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Victory"])
+        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Prime Meridian",
+                              "Victory"])
         self.assertBeatable(False)
         self.collect_by_name("Commencement")
         self.assertBeatable(True)
 
     def test_planetarium_victory(self) -> None:
-        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Victory"])
+        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Prime Meridian",
+                              "Victory"])
         self.assertBeatable(False)
         self.collect_by_name("The Planetarium")
         self.assertBeatable(True)
 
     def test_moment_whole_victory(self) -> None:
-        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Victory"])
+        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Prime Meridian",
+                              "Victory"])
         self.assertBeatable(False)
         self.collect_by_name("Hidden Realm: A Moment, Whole")
         self.assertBeatable(True)
+    def test_false_son_victory(self) -> None:
+        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "Prime Meridian",
+                              "Victory"])
+        self.assertBeatable(False)
+        self.collect_by_name("Prime Meridian")
+        self.assertBeatable(True)
diff --git a/worlds/ror2/test/test_falseson_goal.py b/worlds/ror2/test/test_falseson_goal.py
new file mode 100644
index 0000000000..3cf815c942
--- /dev/null
+++ b/worlds/ror2/test/test_falseson_goal.py
@@ -0,0 +1,17 @@
+from . import RoR2TestBase
+
+
+class FalseSonGoalTest(RoR2TestBase):
+    options = {
+        "dlc_sots": "true",
+        "victory": "falseson",
+        "stage_variants": "true"
+    }
+
+    def test_false_son(self) -> None:
+        self.collect_all_but(["Prime Meridian", "Victory"])
+        self.assertFalse(self.can_reach_region("Prime Meridian"))
+        self.assertBeatable(False)
+        self.collect_by_name("Prime Meridian")
+        self.assertTrue(self.can_reach_region("Prime Meridian"))
+        self.assertBeatable(True)
diff --git a/worlds/satisfactory/CriticalPathCalculator.py b/worlds/satisfactory/CriticalPathCalculator.py
new file mode 100644
index 0000000000..fc055b4e04
--- /dev/null
+++ b/worlds/satisfactory/CriticalPathCalculator.py
@@ -0,0 +1,273 @@
+from random import Random
+from typing import Optional
+from collections.abc import Iterable
+from .GameLogic import GameLogic, Recipe
+from .Options import SatisfactoryOptions
+
+
+class CriticalPathCalculator:
+    logic: GameLogic
+    random: Random
+    final_elevator_phase: int
+    randomize_starter_recipes: bool
+
+    required_parts: set[str]
+    required_buildings: set[str]
+    required_item_names: set[str]
+    required_power_level: int
+
+    __potential_required_belt_speed: int
+
+    parts_to_exclude: set[str]
+    recipes_to_exclude: set[str]
+    buildings_to_exclude: set[str]
+
+    implicitly_unlocked: set[str]
+    handcraftable_parts: dict[str, list[Recipe]]
+    tier_0_recipes: set[str]
+
+    def __init__(self, logic: GameLogic, seed: float, options: SatisfactoryOptions):
+        self.logic = logic
+        self.random = Random(seed)
+        self.final_elevator_phase = options.final_elevator_phase.value
+        self.randomize_starter_recipes = bool(options.randomize_starter_recipes.value)
+
+    def calculate(self) -> None:
+        self.required_parts = set[str]()
+        self.required_buildings = set[str]()
+        self.required_power_level: int = 1
+
+        self.__potential_required_belt_speed = 1
+
+        self.configure_implicitly_unlocked_and_handcraftable_parts()
+
+        self.select_minimal_required_parts_for(
+            self.logic.space_elevator_phases[self.final_elevator_phase-1].keys())
+
+        for tree in self.logic.man_trees.values():
+            self.select_minimal_required_parts_for(tree.access_items)
+
+            for node in tree.nodes:
+                if node.minimal_phase > self.final_elevator_phase:
+                    continue
+
+                self.select_minimal_required_parts_for(node.unlock_cost)
+
+        self.select_minimal_required_parts_for_building("MAM")
+        self.select_minimal_required_parts_for_building("AWESOME Sink")
+        self.select_minimal_required_parts_for_building("AWESOME Shop")
+        self.select_minimal_required_parts_for_building("Space Elevator")
+        self.select_minimal_required_parts_for_building("Conveyor Splitter")
+        self.select_minimal_required_parts_for_building("Conveyor Merger")
+        self.select_minimal_required_parts_for_building("Equipment Workshop")
+        self.select_minimal_required_parts_for_building("Foundation")
+        self.select_minimal_required_parts_for_building("Walls Orange")
+        self.select_minimal_required_parts_for_building("Power Storage")
+        self.select_minimal_required_parts_for_building("Miner Mk.2")
+        self.select_minimal_required_parts_for_building("Pipes Mk.1")
+        self.select_minimal_required_parts_for_building("Pipes Mk.2")
+        self.select_minimal_required_parts_for_building("Pipeline Pump Mk.1")
+        self.select_minimal_required_parts_for_building("Pipeline Pump Mk.2")
+
+        if self.logic.recipes["Uranium"][0].minimal_phase <= self.final_elevator_phase:
+            self.select_minimal_required_parts_for(("Hazmat Suit", "Iodine-Infused Filter"))
+
+        for i in range(1, self.__potential_required_belt_speed + 1):
+            self.select_minimal_required_parts_for_building(f"Conveyor Mk.{i}")
+
+        for i in range(1, self.required_power_level + 1):
+            power_recipe = self.random.choice(self.logic.requirement_per_powerlevel[i])
+            self.select_minimal_required_parts_for(power_recipe.inputs)
+            self.select_minimal_required_parts_for_building(power_recipe.building)
+
+        self.required_item_names = {
+            recipe.name
+            for part in self.required_parts
+            for recipe in self.logic.recipes[part]
+            if recipe.minimal_phase <= self.final_elevator_phase
+        }
+        self.required_item_names.update({"Building: " + building for building in self.required_buildings})
+
+        self.calculate_excluded_things()
+        self.select_starter_recipes()
+
+    def select_minimal_required_parts_for_building(self, building: str) -> None:
+        self.select_minimal_required_parts_for(self.logic.buildings[building].inputs)
+        self.required_buildings.add(building)
+
+    def select_minimal_required_parts_for(self, parts: Optional[Iterable[str]]) -> None:
+        if parts is None:
+            return
+
+        for part in parts:
+            if part in self.required_parts:
+                continue
+
+            self.required_parts.add(part)
+
+            for recipe in self.logic.recipes[part]:
+                if recipe.minimal_phase > self.final_elevator_phase:
+                    continue
+
+                self.__potential_required_belt_speed = \
+                    max(self.__potential_required_belt_speed, recipe.minimal_belt_speed)
+
+                self.select_minimal_required_parts_for(recipe.inputs)
+
+                if recipe.building:
+                    self.select_minimal_required_parts_for(self.logic.buildings[recipe.building].inputs)
+                    self.required_buildings.add(recipe.building)
+
+                    if self.logic.buildings[recipe.building].power_requirement:
+                        self.required_power_level = \
+                            max(self.required_power_level,
+                                self.logic.buildings[recipe.building].power_requirement)
+
+    def calculate_excluded_things(self) -> None:
+        self.parts_to_exclude = set[str]()
+        self.buildings_to_exclude = set[str]()
+        self.recipes_to_exclude = {
+            recipe.name
+            for part in self.logic.recipes
+            for recipe in self.logic.recipes[part]
+            if recipe.minimal_phase > self.final_elevator_phase
+        }
+
+        excluded_count = len(self.recipes_to_exclude)
+        while True:
+            for part in self.logic.recipes:
+                if part in self.parts_to_exclude:
+                    continue
+
+                for recipe in self.logic.recipes[part]:
+                    if recipe.name in self.recipes_to_exclude:
+                        continue
+
+                    if recipe.inputs and any(input in self.parts_to_exclude for input in recipe.inputs):
+                        self.recipes_to_exclude.add(recipe.name)
+
+                if all(r.name in self.recipes_to_exclude for r in self.logic.recipes[part]):
+                    self.parts_to_exclude.add(part)
+
+                new_buildings_to_exclude = {
+                    building_name
+                    for building_name, building in self.logic.buildings.items()
+                    if building_name not in self.buildings_to_exclude
+                    and building.inputs and any(input in self.parts_to_exclude for input in building.inputs)
+                }
+
+                self.recipes_to_exclude.update({
+                    recipe_per_part.name
+                    for recipes_per_part in self.logic.recipes.values()
+                    for recipe_per_part in recipes_per_part
+                    if recipe_per_part.building in new_buildings_to_exclude
+                })
+
+                self.buildings_to_exclude.update(new_buildings_to_exclude)
+
+            new_length = len(self.recipes_to_exclude)
+            if new_length == excluded_count:
+                break
+            excluded_count = new_length
+
+    def configure_implicitly_unlocked_and_handcraftable_parts(self) -> None:
+        self.implicitly_unlocked: set[str] = {
+            recipe.name
+            for recipes_per_part in self.logic.recipes.values()
+            for recipe in recipes_per_part if recipe.implicitly_unlocked
+        }
+        self.implicitly_unlocked.update({
+            building.name
+            for building in self.logic.buildings.values() if building.implicitly_unlocked
+        })
+
+        self.handcraftable_parts: dict[str, list[Recipe]] = {}
+        for part, recipes_per_part in self.logic.recipes.items():
+            for recipe in recipes_per_part:
+                if recipe.handcraftable:
+                    self.handcraftable_parts.setdefault(part, []).append(recipe)
+
+    def select_starter_recipes(self) -> None:
+        # cable is left unaffected as all its alternative recipes require refinery
+        if not self.randomize_starter_recipes:
+            self.tier_0_recipes = {
+                "Recipe: Iron Ingot",
+                "Recipe: Iron Plate",
+                "Recipe: Iron Rod",
+                "Recipe: Copper Ingot",
+                "Recipe: Wire",
+                "Recipe: Concrete",
+                "Recipe: Screw",
+                "Recipe: Reinforced Iron Plate"
+            }
+        else:
+            # we only allow basic parts to be made without the need of refineries
+            # could be made more based of GameLogic rather than hardcoded but this is likely faster
+            # would likely need to be based of GameLogic when we add mod support
+            self.tier_0_recipes = set()
+
+            self.tier_0_recipes.add(self.random.choice(
+                ("Recipe: Iron Ingot", "Recipe: Basic Iron Ingot", "Recipe: Iron Alloy Ingot")))
+
+            selected_recipe = self.random.choice(
+                ("Recipe: Iron Plate", "Recipe: Iron Plate", "Recipe: Iron Plate", "Recipe: Steel Cast Plate"))
+            self.tier_0_recipes.add(selected_recipe)
+            if selected_recipe == "Recipe: Steel Cast Plate":
+                self.add_steel_ingot_to_starter_recipes()
+
+            selected_recipe = self.random.choice(
+                ("Recipe: Iron Rod", "Recipe: Iron Rod", "Recipe: Iron Rod", "Recipe: Steel Rod"))
+            self.tier_0_recipes.add(selected_recipe)
+            if selected_recipe == "Recipe: Steel Rod":
+                self.add_steel_ingot_to_starter_recipes()
+
+            self.tier_0_recipes.add(self.random.choice(("Recipe: Copper Ingot", "Recipe: Copper Alloy Ingot")))
+
+            selected_recipe = self.random.choice(
+                ("Recipe: Wire", "Recipe: Caterium Wire", "Recipe: Fused Wire", "Recipe: Iron Wire"))
+            self.tier_0_recipes.add(selected_recipe)
+            if selected_recipe in {"Recipe: Caterium Wire", "Recipe: Fused Wire"}:
+                # add Caterium Ingot
+                self.tier_0_recipes.add("Recipe: Caterium Ingot")
+
+            selected_recipe = self.random.choice(("Recipe: Concrete", "Recipe: Fine Concrete"))
+            self.tier_0_recipes.add(selected_recipe)
+            if selected_recipe == "Recipe: Fine Concrete":
+                # add Silica
+                self.tier_0_recipes.add(self.random.choice(("Recipe: Silica", "Recipe: Cheap Silica")))
+
+            selected_recipe = self.random.choice(
+                ("Recipe: Screw", "Recipe: Screw", "Recipe: Cast Screw", "Recipe: Cast Screw", "Recipe: Steel Screw"))
+
+            self.tier_0_recipes.add(selected_recipe)
+            if selected_recipe == "Recipe: Steel Screw":
+                # add Steel Beam and steel Ingot
+                self.add_steel_ingot_to_starter_recipes()
+                self.tier_0_recipes.add(self.random.choice(("Recipe: Steel Beam", "Recipe: Molded Beam")))
+
+            self.tier_0_recipes.add(self.random.choice(
+                ("Recipe: Reinforced Iron Plate", "Recipe: Bolted Iron Plate", "Recipe: Stitched Iron Plate")))
+
+        for part, recipes in self.logic.recipes.items():
+            for recipe in recipes:
+                if recipe.name in self.tier_0_recipes:
+                    if part in self.handcraftable_parts:
+                        self.handcraftable_parts[part].append(recipe)
+                    else:
+                        self.handcraftable_parts[part] = [recipe]
+                    self.tier_0_recipes.add(self.logic.buildings[recipe.building].name)
+
+        self.implicitly_unlocked.update(self.tier_0_recipes)
+
+    def add_steel_ingot_to_starter_recipes(self) -> None:
+        if "Recipe: Steel Ingot" not in self.tier_0_recipes \
+                and "Recipe: Compacted Steel Ingot" not in self.tier_0_recipes \
+                and "Recipe: Solid Steel Ingot" not in self.tier_0_recipes:
+
+            selected_recipe = self.random.choice(
+                ("Recipe: Steel Ingot", "Recipe: Compacted Steel Ingot", "Recipe: Solid Steel Ingot"))
+
+            self.tier_0_recipes.add(selected_recipe)
+
+            if selected_recipe == "Recipe: Compacted Steel Ingot":
+                self.tier_0_recipes.add("Recipe: Compacted Coal")
diff --git a/worlds/satisfactory/GameLogic.py b/worlds/satisfactory/GameLogic.py
new file mode 100644
index 0000000000..a1039a7efe
--- /dev/null
+++ b/worlds/satisfactory/GameLogic.py
@@ -0,0 +1,992 @@
+from typing import Optional
+from dataclasses import dataclass
+from enum import IntEnum
+
+
+class PowerInfrastructureLevel(IntEnum):
+    Basic = 1
+    Automated = 2
+    Advanced = 3
+    Complex = 4
+
+    def to_name(self) -> str:
+        return "Power level: " + self.name
+
+
+liquids: set[str] = {
+    "Water",
+    "Liquid Biofuel",
+    "Crude Oil",
+    "Fuel",
+    "Heavy Oil Residue",
+    "Turbofuel",
+    "Alumina Solution",
+    "Sulfuric Acid",
+    "Nitrogen Gas",
+    "Nitric Acid",
+    "Dissolved Silica",
+    "Rocket Fuel",
+    "Ionized Fuel",
+    "Excited Photonic Matter",
+    "Dark Matter Residue"
+}
+
+radio_actives: set[str] = {
+    "Uranium",
+    "Encased Uranium Cell",
+    "Uranium Fuel Rod"
+    "Uranium Waste",
+    "Non-fissile Uranium",
+    "Plutonium Pellet",
+    "Encased Plutonium Cell",
+    "Plutonium Fuel Rod",
+    "Plutonium Waste",
+    "Ficsonium",
+    "Ficsonium Fuel Rod"
+}
+
+
+class Recipe:
+    """
+    Relationship between components and what is required to produce them (input ingredients, production building, etc.)
+    Not all recipes are Satisfactory FGRecipes - for example, Water has a Recipe, but it's not an FGRecipe
+    """
+    name: str
+    building: Optional[str]
+    inputs: Optional[tuple[str, ...]]
+    minimal_belt_speed: int
+    handcraftable: bool
+    implicitly_unlocked: bool
+    """No explicit location/item is needed to unlock this recipe, you have access as soon as dependencies are met 
+    (ex. Water, Leaves, tutorial starting items)"""
+    additional_outputs: Optional[tuple[str, ...]]
+    minimal_phase: int
+
+    needs_pipes: bool
+    is_radio_active: bool
+
+    def __init__(self, name: str, building: Optional[str] = None, inputs: Optional[tuple[str, ...]] = None,
+                minimal_belt_speed: int = 1, handcraftable: bool = False, implicitly_unlocked: bool = False,
+                additional_outputs: Optional[tuple[str, ...]] = None, minimal_phase: Optional[int] = 1):
+        self.name = "Recipe: " + name
+        self.building = building
+        self.inputs = inputs
+        self.minimal_belt_speed = minimal_belt_speed
+        self.handcraftable = handcraftable
+        self.implicitly_unlocked = implicitly_unlocked
+        self.additional_outputs = additional_outputs
+        self.minimal_phase = minimal_phase
+
+        all_parts: list[str] = [name]
+        if inputs:
+            all_parts += inputs
+        if additional_outputs:
+            all_parts += additional_outputs
+
+        self.needs_pipes = not liquids.isdisjoint(all_parts)
+        self.is_radio_active = not radio_actives.isdisjoint(all_parts)
+
+
+class Building(Recipe):
+    power_requirement: Optional[PowerInfrastructureLevel]
+    can_produce: bool
+
+    def __init__(self, name: str, inputs: Optional[tuple[str, ...]] = None,
+                 power_requirement: Optional[PowerInfrastructureLevel] = None, can_produce: bool = True,
+                 implicitly_unlocked: bool = False):
+        super().__init__(name, None, inputs, handcraftable=True, implicitly_unlocked=implicitly_unlocked)
+        self.name = "Building: " + name
+        self.power_requirement = power_requirement
+        self.can_produce = can_produce
+        self.implicitly_unlocked = implicitly_unlocked
+
+
+class MamNode:
+    name: str
+    unlock_cost: dict[str, int]
+    """All game items must be submitted to purchase this MamNode"""
+    depends_on: tuple[str, ...]
+    """At least one of these prerequisite MamNodes must be unlocked to purchase this MamNode"""
+    minimal_phase: Optional[int]
+
+    def __init__(self, name: str, unlock_cost: dict[str, int], depends_on: tuple[str, ...],
+                 minimal_phase: Optional[int] = 1):
+        self.name = name
+        self.unlock_cost = unlock_cost
+        self.depends_on = depends_on
+        self.minimal_phase = minimal_phase
+
+
+class MamTree:
+    access_items: tuple[str, ...]
+    """At least one of these game items must enter the player inventory for this MamTree to be available"""
+    nodes: tuple[MamNode, ...]
+
+    def __init__(self, access_items: tuple[str, ...], nodes: tuple[MamNode, ...]):
+        self.access_items = access_items
+        self.nodes = nodes
+
+
+@dataclass
+class DropPodData:
+    x: int
+    y: int
+    z: int
+    item: Optional[str]
+    power: int
+    gassed: Optional[bool] = None
+    radioactive: Optional[bool] = None
+
+
+class GameLogic:
+    indirect_recipes: dict[str, str] = {
+        "Recipe: Quartz Purification": "Recipe: Distilled Silica"
+    }
+
+    recipes: dict[str, tuple[Recipe, ...]] = {
+        # This Dict should only contain items that are used somewhere in a logic chain
+
+        # Exploration Items
+        "Leaves": (
+            Recipe("Leaves", handcraftable=True, implicitly_unlocked=True), ),
+        "Wood": (
+            Recipe("Wood", handcraftable=True, implicitly_unlocked=True), ),
+        "Hatcher Remains": (
+            Recipe("Hatcher Remains", handcraftable=True, implicitly_unlocked=True), ),
+        "Hog Remains": (
+            Recipe("Hog Remains", handcraftable=True, implicitly_unlocked=True), ),
+        "Plasma Spitter Remains": (
+            Recipe("Plasma Spitter Remains", handcraftable=True, implicitly_unlocked=True), ),
+        "Stinger Remains": (
+            Recipe("Stinger Remains", handcraftable=True, implicitly_unlocked=True), ),
+        "Mycelia": (
+            Recipe("Mycelia", handcraftable=True, implicitly_unlocked=True), ),
+        "Beryl Nut": (
+            Recipe("Beryl Nut", handcraftable=True, implicitly_unlocked=True), ),
+        "Paleberry": (
+            Recipe("Paleberry", handcraftable=True, implicitly_unlocked=True), ),
+        "Bacon Agaric": (
+            Recipe("Bacon Agaric", handcraftable=True, implicitly_unlocked=True), ),
+        "Blue Power Slug": (
+            Recipe("Blue Power Slug", handcraftable=True, implicitly_unlocked=True), ),
+        "Yellow Power Slug": (
+            Recipe("Yellow Power Slug", handcraftable=True, implicitly_unlocked=True), ),
+        "Purple Power Slug": (
+            Recipe("Purple Power Slug", handcraftable=True, implicitly_unlocked=True), ),
+        "Hard Drive": (
+            Recipe("Hard Drive", handcraftable=True, implicitly_unlocked=True), ),
+        "Mercer Sphere": (
+            Recipe("Mercer Sphere", handcraftable=True, implicitly_unlocked=True), ),
+        "Somersloop": (
+            Recipe("Somersloop", handcraftable=True, implicitly_unlocked=True), ),
+
+        # Raw Resources
+        "Water": (
+            Recipe("Water", "Water Extractor", implicitly_unlocked=True),
+            Recipe("Water (Resource Well)", "Resource Well Pressurizer", implicitly_unlocked=True, minimal_phase=2)),
+        "Limestone": (
+            Recipe("Limestone", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Raw Quartz": (
+            Recipe("Raw Quartz", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Iron Ore": (
+            Recipe("Iron Ore", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Copper Ore": (
+            Recipe("Copper Ore", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Coal": (
+            Recipe("Coal", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Sulfur": (
+            Recipe("Sulfur", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Caterium Ore": (
+            Recipe("Caterium Ore", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Crude Oil": (
+            Recipe("Crude Oil", "Oil Extractor", implicitly_unlocked=True),
+            Recipe("Crude Oil (Resource Well)", "Resource Well Pressurizer", implicitly_unlocked=True, minimal_phase=2)),
+        "Bauxite": (
+            Recipe("Bauxite", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True, minimal_phase=2), ),
+        "Nitrogen Gas": (
+            Recipe("Nitrogen Gas", "Resource Well Pressurizer", implicitly_unlocked=True, minimal_phase=2), ),
+        "Uranium": (
+            Recipe("Uranium", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True, minimal_phase=2), ),
+
+        # Special Items
+        "Uranium Waste": (
+            Recipe("Uranium Waste", "Nuclear Power Plant", ("Uranium Fuel Rod", "Water"), implicitly_unlocked=True, minimal_phase=2), ),
+        # "Plutonium Waste": (
+        #    Recipe("Plutonium Waste", "Nuclear Power Plant", ("Plutonium Fuel Rod", "Water"), implicitly_unlocked=True), ),
+
+        # Recipes
+        "Reinforced Iron Plate": (
+            Recipe("Reinforced Iron Plate", "Assembler", ("Iron Plate", "Screw")),
+            Recipe("Adhered Iron Plate", "Assembler", ("Iron Plate", "Rubber")),
+            Recipe("Bolted Iron Plate", "Assembler", ("Iron Plate", "Screw"), minimal_belt_speed=3),
+            Recipe("Stitched Iron Plate", "Assembler", ("Iron Plate", "Wire"))),
+        "Rotor": (
+            Recipe("Rotor", "Assembler", ("Iron Rod", "Screw"), minimal_belt_speed=2, handcraftable=True),
+            Recipe("Copper Rotor", "Assembler", ("Copper Sheet", "Screw"), minimal_belt_speed=3),
+            Recipe("Steel Rotor", "Assembler", ("Steel Pipe", "Wire"))),
+        "Stator": (
+            Recipe("Stator", "Assembler", ("Steel Pipe", "Wire"), handcraftable=True),
+            Recipe("Quickwire Stator", "Assembler", ("Steel Pipe", "Quickwire"))),
+        "Plastic": (
+            Recipe("Plastic", "Refinery", ("Crude Oil", ), additional_outputs=("Heavy Oil Residue", )),
+            Recipe("Residual Plastic", "Refinery", ("Polymer Resin", "Water")),
+            Recipe("Recycled Plastic", "Refinery", ("Rubber", "Fuel"))),
+        "Rubber": (
+            Recipe("Rubber", "Refinery", ("Crude Oil", ), additional_outputs=("Heavy Oil Residue", )),
+            Recipe("Residual Rubber", "Refinery", ("Polymer Resin", "Water")),
+            Recipe("Recycled Rubber", "Refinery", ("Plastic", "Fuel"))),
+        "Iron Plate": (
+            Recipe("Iron Plate", "Constructor", ("Iron Ingot", )),
+            Recipe("Coated Iron Plate", "Assembler", ("Iron Ingot", "Plastic"), minimal_belt_speed=2),
+            Recipe("Steel Cast Plate", "Foundry", ("Iron Ingot", "Steel Ingot"))),
+        "Iron Rod": (
+            Recipe("Iron Rod", "Constructor", ("Iron Ingot", )),
+            Recipe("Steel Rod", "Constructor", ("Steel Ingot", )),
+            Recipe("Aluminum Rod", "Constructor", ("Aluminum Ingot", ))),
+        "Screw": (
+            Recipe("Screw", "Constructor", ("Iron Rod", )),
+            Recipe("Cast Screw", "Constructor", ("Iron Ingot", )),
+            Recipe("Steel Screw", "Constructor", ("Steel Beam", ), minimal_belt_speed=3)),
+        "Wire": (
+            Recipe("Wire", "Constructor", ("Copper Ingot", )),
+            Recipe("Fused Wire", "Assembler", ("Copper Ingot", "Caterium Ingot"), minimal_belt_speed=2),
+            Recipe("Iron Wire", "Constructor", ("Iron Ingot", )),
+            Recipe("Caterium Wire", "Constructor", ("Caterium Ingot", ), minimal_belt_speed=2)),
+        "Cable": (
+            Recipe("Cable", "Constructor", ("Wire", ), handcraftable=True, implicitly_unlocked=True),
+            Recipe("Coated Cable", "Refinery", ("Wire", "Heavy Oil Residue"), minimal_belt_speed=2),
+            Recipe("Insulated Cable", "Assembler", ("Wire", "Rubber"), minimal_belt_speed=2),
+            Recipe("Quickwire Cable", "Assembler", ("Quickwire", "Rubber"))),
+        "Quickwire": (
+            Recipe("Quickwire", "Constructor", ("Caterium Ingot", ), handcraftable=True),
+            Recipe("Fused Quickwire", "Assembler", ("Caterium Ingot", "Copper Ingot"), minimal_belt_speed=2)),
+        "Copper Sheet": (
+            Recipe("Copper Sheet", "Constructor", ("Copper Ingot", ), handcraftable=True),
+            Recipe("Steamed Copper Sheet", "Refinery", ("Copper Ingot", "Water"))),
+        "Steel Pipe": (
+            Recipe("Steel Pipe", "Constructor", ("Steel Ingot", ), handcraftable=True),
+            Recipe("Iron Pipe", "Constructor", ("Iron Ingot", ), minimal_belt_speed=2),
+            Recipe("Molded Steel Pipe", "Foundry", ("Steel Ingot", "Concrete"))),
+        "Steel Beam": (
+            Recipe("Steel Beam", "Constructor", ("Steel Ingot", ), handcraftable=True),
+            Recipe("Aluminum Beam", "Constructor", ("Aluminum Ingot", ), minimal_phase=2),
+            Recipe("Molded Beam", "Foundry", ("Steel Ingot", "Concrete"), minimal_belt_speed=2)),
+        "Heavy Oil Residue": (
+            Recipe("Heavy Oil Residue", "Refinery", ("Crude Oil", ), additional_outputs=("Polymer Resin", )),
+            Recipe("Plastic", "Refinery", ("Crude Oil", ), additional_outputs=("Plastic", )),
+            Recipe("Rubber", "Refinery", ("Crude Oil", ), additional_outputs=("Rubber", )),
+            Recipe("Polymer Resin", "Refinery", ("Crude Oil", ), additional_outputs=("Polymer Resin", ), minimal_belt_speed=3)),
+        "Polymer Resin": (
+            Recipe("Polymer Resin", "Refinery", ("Crude Oil", ), additional_outputs=("Heavy Oil Residue", ), minimal_belt_speed=2),
+            Recipe("Fuel", "Refinery", ("Crude Oil", ), additional_outputs=("Fuel", )),
+            Recipe("Heavy Oil Residue", "Refinery", ("Crude Oil", ), additional_outputs=("Heavy Oil Residue", ), minimal_belt_speed=3)),
+        "Fuel": (
+            Recipe("Fuel", "Refinery", ("Crude Oil", ), additional_outputs=("Polymer Resin", )),
+            Recipe("Diluted Fuel", "Blender", ("Heavy Oil Residue", "Water"), minimal_phase=2),
+            Recipe("Residual Fuel", "Refinery", ("Heavy Oil Residue", ))),
+        "Concrete": (
+            Recipe("Concrete", "Constructor", ("Limestone", )),
+            Recipe("Fine Concrete", "Assembler", ("Limestone", "Silica")),
+            Recipe("Rubber Concrete", "Assembler", ("Limestone", "Rubber")),
+            Recipe("Wet Concrete", "Refinery", ("Limestone", "Water"), minimal_belt_speed=2)),
+        "Silica": (
+            Recipe("Silica", "Constructor", ("Raw Quartz", ), handcraftable=True),
+            Recipe("Alumina Solution", "Refinery", ("Bauxite", "Water"), additional_outputs=("Alumina Solution", ), minimal_belt_speed=2, minimal_phase=2),
+            Recipe("Cheap Silica", "Assembler", ("Raw Quartz", "Limestone")),
+            Recipe("Distilled Silica", "Blender", ("Dissolved Silica", "Limestone", "Water"), additional_outputs=("Water", ), minimal_phase=2)),
+        "Dissolved Silica": (
+            Recipe("Quartz Purification", "Refinery", ("Raw Quartz", "Nitric Acid"), additional_outputs=("Quartz Crystal", ), minimal_belt_speed=2, minimal_phase=2), ),
+        "Quartz Crystal": (
+            Recipe("Quartz Crystal", "Constructor", ("Raw Quartz", ), handcraftable=True),
+            Recipe("Pure Quartz Crystal", "Refinery", ("Raw Quartz", "Water"), minimal_belt_speed=2),
+            Recipe("Fused Quartz Crystal", "Foundry", ("Raw Quartz", "Coal"), minimal_belt_speed=2),
+            Recipe("Quartz Purification", "Refinery", ("Raw Quartz", "Nitric Acid"), additional_outputs=("Dissolved Silica", ), minimal_belt_speed=2, minimal_phase=2)),
+        "Iron Ingot": (
+            Recipe("Iron Ingot", "Smelter", ("Iron Ore", )),
+            Recipe("Pure Iron Ingot", "Refinery", ("Iron Ore", "Water"), minimal_belt_speed=2),
+            Recipe("Iron Alloy Ingot", "Foundry", ("Iron Ore", "Copper Ore")),
+            Recipe("Basic Iron Ingot", "Foundry", ("Iron Ore", "Limestone")),
+            Recipe("Leached Iron ingot", "Refinery", ("Iron Ore", "Sulfuric Acid"), minimal_belt_speed=2)),
+        "Steel Ingot": (
+            Recipe("Steel Ingot", "Foundry", ("Iron Ore", "Coal"), handcraftable=True),
+            Recipe("Coke Steel Ingot", "Foundry", ("Iron Ore", "Petroleum Coke"), minimal_belt_speed=2),
+            Recipe("Compacted Steel Ingot", "Foundry", ("Iron Ore", "Compacted Coal")),
+            Recipe("Solid Steel Ingot", "Foundry", ("Iron Ingot", "Coal"))),
+        "Copper Ingot": (
+            Recipe("Copper Ingot", "Smelter", ("Copper Ore", )),
+            Recipe("Copper Alloy Ingot", "Foundry", ("Copper Ore", "Iron Ore"), minimal_belt_speed=2),
+            Recipe("Pure Copper Ingot", "Refinery", ("Copper Ore", "Water")),
+            Recipe("Leached Copper Ingot", "Refinery", ("Copper Ore", "Sulfuric Acid"), minimal_belt_speed=2),
+            Recipe("Tempered Copper Ingot", "Foundry", ("Copper Ore", "Petroleum Coke"))),
+        "Caterium Ingot": (
+            Recipe("Caterium Ingot", "Smelter", ("Caterium Ore", ), handcraftable=True),
+            Recipe("Pure Caterium Ingot", "Refinery", ("Caterium Ore", "Water")),
+            Recipe("Leached Caterium Ingot", "Refinery", ("Caterium Ore", "Sulfuric Acid")),
+            Recipe("Tempered Caterium Ingot", "Foundry", ("Caterium Ore", "Petroleum Coke"))),
+        "Petroleum Coke": (
+            Recipe("Petroleum Coke", "Refinery", ("Heavy Oil Residue", ), minimal_belt_speed=2), ),
+        "Compacted Coal": (
+            Recipe("Compacted Coal", "Assembler", ("Coal", "Sulfur")), ),
+        "Motor": (
+            Recipe("Motor", "Assembler", ("Rotor", "Stator"), handcraftable=True),
+            Recipe("Rigor Motor", "Manufacturer", ("Rotor", "Stator", "Crystal Oscillator")),
+            Recipe("Electric Motor", "Assembler", ("Electromagnetic Control Rod", "Rotor"))),
+        "Modular Frame": (
+            Recipe("Modular Frame", "Assembler", ("Reinforced Iron Plate", "Iron Rod"), handcraftable=True),
+            Recipe("Bolted Frame", "Assembler", ("Reinforced Iron Plate", "Screw"), minimal_belt_speed=3),
+            Recipe("Steeled Frame", "Assembler", ("Reinforced Iron Plate", "Steel Pipe"))),
+        "Heavy Modular Frame": (
+            Recipe("Heavy Modular Frame", "Manufacturer", ("Modular Frame", "Steel Pipe", "Encased Industrial Beam", "Screw"), minimal_belt_speed=3, handcraftable=True),
+            Recipe("Heavy Flexible Frame", "Manufacturer", ("Modular Frame", "Encased Industrial Beam", "Rubber", "Screw"), minimal_belt_speed=4),
+            Recipe("Heavy Encased Frame", "Manufacturer", ("Modular Frame", "Encased Industrial Beam", "Steel Pipe", "Concrete"))),
+        "Encased Industrial Beam": (
+            Recipe("Encased Industrial Beam", "Assembler", ("Steel Beam", "Concrete"), handcraftable=True),
+            Recipe("Encased Industrial Pipe", "Assembler", ("Steel Pipe", "Concrete"))),
+        "Computer": (
+            Recipe("Computer", "Manufacturer", ("Circuit Board", "Cable", "Plastic"), minimal_belt_speed=3, handcraftable=True),
+            Recipe("Crystal Computer", "Assembler", ("Circuit Board", "Crystal Oscillator")),
+            Recipe("Caterium Computer", "Manufacturer", ("Circuit Board", "Quickwire", "Rubber"), minimal_belt_speed=2)),
+        "Circuit Board": (
+            Recipe("Circuit Board", "Assembler", ("Copper Sheet", "Plastic"), handcraftable=True),
+            Recipe("Electrode Circuit Board", "Assembler", ("Rubber", "Petroleum Coke")),
+            Recipe("Silicon Circuit Board", "Assembler", ("Copper Sheet", "Silica")),
+            Recipe("Caterium Circuit Board", "Assembler", ("Plastic", "Quickwire"))),
+        "Crystal Oscillator": (
+            Recipe("Crystal Oscillator", "Manufacturer", ("Quartz Crystal", "Cable", "Reinforced Iron Plate"), handcraftable=True),
+            Recipe("Insulated Crystal Oscillator", "Manufacturer", ("Quartz Crystal", "Rubber", "AI Limiter"))),
+        "AI Limiter": (
+            Recipe("AI Limiter", "Assembler", ("Copper Sheet", "Quickwire"), minimal_belt_speed=2, handcraftable=True),
+            Recipe("Plastic AI Limiter", "Assembler", ("Quickwire", "Plastic"), minimal_belt_speed=2)),
+        "Electromagnetic Control Rod": (
+            Recipe("Electromagnetic Control Rod", "Assembler", ("Stator", "AI Limiter"), handcraftable=True),
+            Recipe("Electromagnetic Connection Rod", "Assembler", ("Stator", "High-Speed Connector"))),
+        "High-Speed Connector": (
+            Recipe("High-Speed Connector", "Manufacturer", ("Quickwire", "Cable", "Circuit Board"), minimal_belt_speed=3, handcraftable=True),
+            Recipe("Silicon High-Speed Connector", "Manufacturer", ("Quickwire", "Silica", "Circuit Board"), minimal_belt_speed=2)),
+        "Smart Plating": (
+            Recipe("Smart Plating", "Assembler", ("Reinforced Iron Plate", "Rotor")),
+            Recipe("Plastic Smart Plating", "Manufacturer", ("Reinforced Iron Plate", "Rotor", "Plastic"))),
+        "Versatile Framework": (
+            Recipe("Versatile Framework", "Assembler", ("Modular Frame", "Steel Beam"), minimal_phase=2),
+            Recipe("Flexible Framework", "Manufacturer", ("Modular Frame", "Steel Beam", "Rubber"), minimal_phase=2)),
+        "Automated Wiring": (
+            Recipe("Automated Wiring", "Assembler", ("Stator", "Cable"), minimal_phase=2),
+            Recipe("Automated Speed Wiring", "Manufacturer", ("Stator", "Wire", "High-Speed Connector"), minimal_belt_speed=2, minimal_phase=2)),
+        "Modular Engine": (
+            Recipe("Modular Engine", "Manufacturer", ("Motor", "Rubber", "Smart Plating"), minimal_phase=3), ),
+        "Adaptive Control Unit": (
+            Recipe("Adaptive Control Unit", "Manufacturer", ("Automated Wiring", "Circuit Board", "Heavy Modular Frame", "Computer"), minimal_phase=3), ),
+        "Portable Miner": (
+            Recipe("Portable Miner", "Equipment Workshop", ("Iron Rod", "Iron Plate"), handcraftable=True, minimal_belt_speed=0, implicitly_unlocked=True),
+            Recipe("Automated Miner", "Assembler", ("Steel Pipe", "Iron Plate")), ),
+        "Alumina Solution": (
+            Recipe("Alumina Solution", "Refinery", ("Bauxite", "Water"), additional_outputs=("Silica", ), minimal_belt_speed=2, minimal_phase=2),
+            Recipe("Sloppy Alumina", "Refinery", ("Bauxite", "Water"), minimal_belt_speed=3, minimal_phase=2)),
+        "Aluminum Scrap": (
+            Recipe("Aluminum Scrap", "Refinery", ("Alumina Solution", "Coal"), additional_outputs=("Water", ), minimal_belt_speed=4, minimal_phase=2),
+            Recipe("Electrode Aluminum Scrap", "Refinery", ("Alumina Solution", "Petroleum Coke"), additional_outputs=("Water", ), minimal_belt_speed=4, minimal_phase=2),
+            Recipe("Instant Scrap", "Blender", ("Bauxite", "Coal", "Sulfuric Acid", "Water"), additional_outputs=("Water", ), minimal_belt_speed=3, minimal_phase=2)),
+        "Aluminum Ingot": (
+            Recipe("Aluminum Ingot", "Foundry", ("Aluminum Scrap", "Silica"), minimal_belt_speed=2, handcraftable=True, minimal_phase=2),
+            Recipe("Pure Aluminum Ingot", "Smelter", ("Aluminum Scrap", ), minimal_phase=2)),
+        "Alclad Aluminum Sheet": (
+            Recipe("Alclad Aluminum Sheet", "Assembler", ("Aluminum Ingot", "Copper Ingot"), handcraftable=True, minimal_phase=2), ),
+        "Aluminum Casing": (
+            Recipe("Aluminum Casing", "Constructor", ("Alclad Aluminum Sheet", ), handcraftable=True, minimal_phase=2),
+            Recipe("Alclad Casing", "Assembler", ("Aluminum Ingot", "Copper Ingot"), minimal_phase=2)),
+        "Heat Sink": (
+            Recipe("Heat Sink", "Assembler", ("Alclad Aluminum Sheet", "Silica"), minimal_belt_speed=2, handcraftable=True, minimal_phase=2),
+            Recipe("Heat Exchanger", "Assembler", ("Aluminum Casing", "Rubber"), minimal_belt_speed=3, minimal_phase=2)),
+        "Nitric Acid": (
+            Recipe("Nitric Acid", "Blender", ("Nitrogen Gas", "Water", "Iron Plate"), minimal_phase=2), ),
+        "Fused Modular Frame": (
+            Recipe("Fused Modular Frame", "Blender", ("Heavy Modular Frame", "Aluminum Casing", "Nitrogen Gas"), minimal_belt_speed=2, minimal_phase=2),
+            Recipe("Heat-Fused Frame", "Blender", ("Heavy Modular Frame", "Aluminum Ingot", "Nitric Acid", "Fuel"), minimal_belt_speed=3, minimal_phase=2)),
+        "Radio Control Unit": (
+            Recipe("Radio Control Unit", "Manufacturer", ("Aluminum Casing", "Crystal Oscillator", "Computer"), handcraftable=True, minimal_phase=2),
+            Recipe("Radio Connection Unit", "Manufacturer", ("Heat Sink", "High-Speed Connector", "Quartz Crystal"), minimal_phase=2),
+            Recipe("Radio Control System", "Manufacturer", ("Crystal Oscillator", "Circuit Board", "Aluminum Casing", "Rubber"), minimal_belt_speed=2, minimal_phase=2)),
+        "Pressure Conversion Cube": (
+            Recipe("Pressure Conversion Cube", "Assembler", ("Fused Modular Frame", "Radio Control Unit"), handcraftable=True, minimal_phase=2), ),
+        "Cooling System": (
+            Recipe("Cooling System", "Blender", ("Heat Sink", "Rubber", "Water", "Nitrogen Gas"), minimal_phase=2),
+            Recipe("Cooling Device", "Blender", ("Heat Sink", "Motor", "Nitrogen Gas"), minimal_phase=2)),
+        "Turbo Motor": (
+            Recipe("Turbo Motor", "Manufacturer", ("Cooling System", "Radio Control Unit", "Motor", "Rubber"), handcraftable=True, minimal_phase=2),
+            Recipe("Turbo Electric Motor", "Manufacturer", ("Motor", "Radio Control Unit", "Electromagnetic Control Rod", "Rotor"), minimal_phase=2),
+            Recipe("Turbo Pressure Motor", "Manufacturer", ("Motor", "Pressure Conversion Cube", "Packaged Nitrogen Gas", "Stator"), minimal_phase=2)),
+        "Battery": (
+            Recipe("Battery", "Blender", ("Sulfuric Acid", "Alumina Solution", "Aluminum Casing"), additional_outputs=("Water", ), minimal_phase=2),
+            Recipe("Classic Battery", "Manufacturer", ("Sulfur", "Alclad Aluminum Sheet", "Plastic", "Wire"), minimal_belt_speed=2, minimal_phase=2)),
+        "Supercomputer": (
+            Recipe("Supercomputer", "Manufacturer", ("Computer", "AI Limiter", "High-Speed Connector", "Plastic"), handcraftable=True, minimal_phase=2),
+            Recipe("OC Supercomputer", "Assembler", ("Radio Control Unit", "Cooling System"), minimal_phase=2),
+            Recipe("Super-State Computer", "Manufacturer", ("Computer", "Electromagnetic Control Rod", "Battery", "Wire"), minimal_phase=2)),
+        "Sulfuric Acid": (
+            Recipe("Sulfuric Acid", "Refinery", ("Sulfur", "Water")), ),
+        "Encased Uranium Cell": (
+            Recipe("Encased Uranium Cell", "Blender", ("Uranium", "Concrete", "Sulfuric Acid"), additional_outputs=("Sulfuric Acid", )),
+            Recipe("Infused Uranium Cell", "Manufacturer", ("Uranium", "Silica", "Sulfur", "Quickwire"), minimal_belt_speed=2)),
+        "Uranium Fuel Rod": (
+            Recipe("Uranium Fuel Rod", "Manufacturer", ("Encased Uranium Cell", "Encased Industrial Beam", "Electromagnetic Control Rod")),
+            Recipe("Uranium Fuel Unit", "Manufacturer", ("Encased Uranium Cell", "Electromagnetic Control Rod", "Crystal Oscillator", "Rotor"))),
+        "Non-fissile Uranium": (
+            Recipe("Non-fissile Uranium", "Blender", ("Uranium Waste", "Silica", "Nitric Acid", "Sulfuric Acid"), additional_outputs=("Water", )),
+            Recipe("Fertile Uranium", "Blender", ("Uranium", "Uranium Waste", "Nitric Acid", "Sulfuric Acid"), additional_outputs=("Water", ), minimal_belt_speed=2)),
+        "Plutonium Pellet": (
+            Recipe("Plutonium Pellet", "Particle Accelerator", ("Non-fissile Uranium", "Uranium Waste"), minimal_belt_speed=2), ),
+        "Encased Plutonium Cell": (
+            Recipe("Encased Plutonium Cell", "Assembler", ("Plutonium Pellet", "Concrete")),
+            Recipe("Instant Plutonium Cell", "Particle Accelerator", ("Non-fissile Uranium", "Aluminum Casing"), minimal_belt_speed=2)),
+        "Plutonium Fuel Rod": (
+            Recipe("Plutonium Fuel Rod", "Manufacturer", ("Encased Plutonium Cell", "Steel Beam", "Electromagnetic Control Rod", "Heat Sink")),
+            Recipe("Plutonium Fuel Unit", "Assembler", ("Encased Plutonium Cell", "Pressure Conversion Cube"))),
+        "Gas Filter": (
+            Recipe("Gas Filter", "Manufacturer", ("Coal", "Rubber", "Fabric"), handcraftable=True), ),
+        "Iodine-Infused Filter": (
+            Recipe("Iodine-Infused Filter", "Manufacturer", ("Gas Filter", "Quickwire", "Aluminum Casing"), handcraftable=True, minimal_phase=2), ),
+        "Hazmat Suit": (
+            Recipe("Hazmat Suit", "Equipment Workshop", ("Rubber", "Plastic", "Fabric", "Alclad Aluminum Sheet"), handcraftable=True, minimal_phase=2), ),
+        "Assembly Director System": (
+            Recipe("Assembly Director System", "Assembler", ("Adaptive Control Unit", "Supercomputer"), minimal_phase=4), ),
+        "Magnetic Field Generator": (
+            Recipe("Magnetic Field Generator", "Assembler", ("Versatile Framework", "Electromagnetic Control Rod"), minimal_phase=4), ),
+        "Copper Powder": (
+            Recipe("Copper Powder", "Constructor", ("Copper Ingot", ), handcraftable=True), ),
+        "Nuclear Pasta": (
+            Recipe("Nuclear Pasta", "Particle Accelerator", ("Copper Powder", "Pressure Conversion Cube"), minimal_phase=2), ),
+        "Thermal Propulsion Rocket": (
+            Recipe("Thermal Propulsion Rocket", "Manufacturer", ("Modular Engine", "Turbo Motor", "Cooling System", "Fused Modular Frame"), minimal_phase=4), ),
+        "Alien Protein": (
+            Recipe("Hatcher Protein", "Constructor", ("Hatcher Remains", ), handcraftable=True),
+            Recipe("Hog Protein", "Constructor", ("Hog Remains", ), handcraftable=True),
+            Recipe("Spitter Protein", "Constructor", ("Plasma Spitter Remains", ), handcraftable=True),
+            Recipe("Stinger Protein", "Constructor", ("Stinger Remains", ), handcraftable=True)),
+        "Biomass": (
+            Recipe("Biomass (Leaves)", "Constructor", ("Leaves", ), minimal_belt_speed=2, handcraftable=True, implicitly_unlocked=True),
+            Recipe("Biomass (Wood)", "Constructor", ("Wood", ), minimal_belt_speed=4, handcraftable=True, implicitly_unlocked=True),
+            Recipe("Biomass (Mycelia)", "Constructor", ("Mycelia", ), minimal_belt_speed=3, handcraftable=True),
+            Recipe("Biomass (Alien Protein)", "Constructor", ("Alien Protein", ), minimal_belt_speed=4, handcraftable=True)),
+        "Fabric": (
+            Recipe("Fabric", "Assembler", ("Biomass", "Mycelia"), handcraftable=True, minimal_belt_speed=2),
+            Recipe("Polyester Fabric", "Refinery", ("Polymer Resin", "Water"))),
+        "Solid Biofuel": (
+            Recipe("Solid Biofuel", "Constructor", ("Biomass", ), minimal_belt_speed=2, handcraftable=True), ),
+        "Liquid Biofuel": (
+            Recipe("Liquid Biofuel", "Refinery", ("Solid Biofuel", "Water"), minimal_belt_speed=2), ),
+        "Empty Canister": (
+            Recipe("Empty Canister", "Constructor", ("Plastic", ), handcraftable=True),
+            Recipe("Coated Iron Canister", "Assembler", ("Iron Plate", "Copper Sheet")),
+            Recipe("Steel Canister", "Constructor", ("Steel Ingot", ))),
+        "Empty Fluid Tank": (
+            Recipe("Empty Fluid Tank", "Constructor", ("Aluminum Ingot", ), handcraftable=True, minimal_phase=2), ),
+        "Packaged Alumina Solution": (
+            Recipe("Packaged Alumina Solution", "Packager", ("Alumina Solution", "Empty Canister"), minimal_belt_speed=2), ),
+        "Packaged Fuel": (
+            Recipe("Packaged Fuel", "Packager", ("Fuel", "Empty Canister")),
+            Recipe("Diluted Packaged Fuel", "Refinery", ("Heavy Oil Residue", "Packaged Water"))),
+        "Packaged Heavy Oil Residue": (
+            Recipe("Packaged Heavy Oil Residue", "Packager", ("Heavy Oil Residue", "Empty Canister")), ),
+        "Packaged Liquid Biofuel": (
+            Recipe("Packaged Liquid Biofuel", "Packager", ("Liquid Biofuel", "Empty Canister")), ),
+        "Packaged Nitric Acid": (
+            Recipe("Packaged Nitric Acid", "Packager", ("Nitric Acid", "Empty Fluid Tank")), ),
+        "Packaged Nitrogen Gas": (
+            Recipe("Packaged Nitrogen Gas", "Packager", ("Nitrogen Gas", "Empty Fluid Tank")), ),
+        "Packaged Oil": (
+            Recipe("Packaged Oil", "Packager", ("Crude Oil", "Empty Canister")), ),
+        "Packaged Sulfuric Acid": (
+            Recipe("Packaged Sulfuric Acid", "Packager", ("Sulfuric Acid", "Empty Canister")), ),
+        "Packaged Turbofuel": (
+            Recipe("Packaged Turbofuel", "Packager", ("Turbofuel", "Empty Canister")), ),
+        "Packaged Water": (
+            Recipe("Packaged Water", "Packager", ("Water", "Empty Canister")), ),
+        "Turbofuel": (
+            Recipe("Turbofuel", "Refinery", ("Fuel", "Compacted Coal")),
+            Recipe("Turbo Heavy Fuel", "Refinery", ("Heavy Oil Residue", "Compacted Coal")),
+            Recipe("Turbo Blend Fuel", "Blender", ("Fuel", "Heavy Oil Residue", "Sulfur", "Petroleum Coke"), minimal_phase=2)),
+        "Gas Mask": (
+            Recipe("Gas Mask", "Equipment Workshop", ("Rubber", "Plastic", "Fabric"), handcraftable=True, minimal_belt_speed=0), ),
+        "Alien DNA Capsule": (
+            Recipe("Alien DNA Capsule", "Constructor", ("Alien Protein", ), handcraftable=True), ),
+        "Black Powder": (
+            Recipe("Black Powder", "Equipment Workshop", ("Coal", "Sulfur"), handcraftable=True),
+            Recipe("Fine Black Powder", "Assembler", ("Sulfur", "Compacted Coal"))),
+        "Smokeless Powder": (
+            Recipe("Smokeless Powder", "Refinery", ("Black Powder", "Heavy Oil Residue")), ),
+        "Rifle Ammo": (
+            Recipe("Rifle Ammo", "Assembler", ("Copper Sheet", "Smokeless Powder"), handcraftable=True, minimal_belt_speed=2), ),
+        "Iron Rebar": (
+            Recipe("Iron Rebar", "Constructor", ("Iron Rod", ), handcraftable=True), ),
+        "Nobelisk": (
+            Recipe("Nobelisk", "Assembler", ("Black Powder", "Steel Pipe"), handcraftable=True), ),
+        "Power Shard": (
+            Recipe("Power Shard (1)", "Constructor", ("Blue Power Slug", ), handcraftable=True),
+            Recipe("Power Shard (2)", "Constructor", ("Yellow Power Slug", ), handcraftable=True),
+            Recipe("Power Shard (5)", "Constructor", ("Purple Power Slug", ), handcraftable=True),
+            Recipe("Synthetic Power Shard", "Quantum Encoder", ("Dark Matter Residue", "Excited Photonic Matter", "Time Crystal", "Dark Matter Crystal", "Quartz Crystal"), minimal_phase=4)),  # 1.0
+        "Object Scanner": (
+            Recipe("Object Scanner", "Equipment Workshop", ("Reinforced Iron Plate", "Wire", "Screw"), handcraftable=True), ),
+        "Xeno-Zapper": (
+            Recipe("Xeno-Zapper", "Equipment Workshop", ("Iron Rod", "Reinforced Iron Plate", "Cable", "Wire"), handcraftable=True, implicitly_unlocked=True), ),
+
+# 1.0
+        "Rocket Fuel": (
+            Recipe("Rocket Fuel", "Blender", ("Turbofuel", "Nitric Acid"), additional_outputs=("Compacted Coal", ), minimal_phase=2),
+            Recipe("Nitro Rocket Fuel", "Blender", ("Fuel", "Nitrogen Gas", "Sulfur", "Coal"), minimal_belt_speed=2, additional_outputs=("Compacted Coal", ), minimal_phase=2)),
+        "Ionized Fuel": (
+            Recipe("Ionized Fuel", "Refinery", ("Rocket Fuel", "Power Shard"), additional_outputs=("Compacted Coal", )),
+            Recipe("Dark-Ion Fuel", "Blender", ("Packaged Rocket Fuel", "Dark Matter Crystal"), minimal_belt_speed=3, additional_outputs=("Compacted Coal", ), minimal_phase=4)),
+        "Packaged Rocket Fuel": (
+            Recipe("Packaged Rocket Fuel", "Packager", ("Rocket Fuel", "Empty Fluid Tank")), ),
+        "Packaged Ionized Fuel": (
+            Recipe("Packaged Ionized Fuel", "Packager", ("Ionized Fuel", "Empty Fluid Tank")), ),
+        "Diamonds": (
+            Recipe("Diamonds", "Particle Accelerator", ("Coal", ), minimal_belt_speed=5),
+            Recipe("Cloudy Diamonds", "Particle Accelerator", ("Coal", "Limestone"), minimal_belt_speed=4),
+            Recipe("Oil-Based Diamonds", "Particle Accelerator", ("Crude Oil", )),
+            Recipe("Petroleum Diamonds", "Particle Accelerator", ("Petroleum Coke", ), minimal_belt_speed=5),
+            Recipe("Pink Diamonds", "Converter", ("Coal", "Quartz Crystal"), minimal_belt_speed=2),
+            Recipe("Turbo Diamonds", "Particle Accelerator", ("Coal", "Packaged Turbofuel"), minimal_belt_speed=5)),
+        "Time Crystal": (
+            Recipe("Time Crystal", "Converter", ("Diamonds", )), ),
+        "Ficsite Ingot": (
+            Recipe("Ficsite Ingot (Aluminum)", "Converter", ("Reanimated SAM", "Aluminum Ingot"), minimal_belt_speed=2),
+            Recipe("Ficsite Ingot (Caterium)", "Converter", ("Reanimated SAM", "Caterium Ingot")),
+            Recipe("Ficsite Ingot (Iron)", "Converter", ("Reanimated SAM", "Iron Ingot"), minimal_belt_speed=3)),
+        "Ficsite Trigon": (
+            Recipe("Ficsite Trigon", "Constructor", ("Ficsite Ingot", ), handcraftable=True), ),
+        "SAM": (
+            Recipe("SAM", "Miner Mk.1", handcraftable=True, implicitly_unlocked=True), ),
+        "Reanimated SAM": (
+            Recipe("Reanimated SAM", "Constructor", ("SAM", ), handcraftable=True, minimal_belt_speed=2), ),
+        "SAM Fluctuator": (
+            Recipe("SAM Fluctuator", "Manufacturer", ("Reanimated SAM", "Steel Pipe", "Wire"), handcraftable=True), ),
+        "Excited Photonic Matter": (
+            Recipe("Excited Photonic Matter", "Converter", implicitly_unlocked=True), ),
+        "Dark Matter Crystal": (
+            Recipe("Dark Matter Crystal", "Particle Accelerator", ("Diamonds", ), additional_outputs=("Dark Matter Residue", )),
+            Recipe("Dark Matter Crystallization", "Particle Accelerator", additional_outputs=("Dark Matter Residue", )),
+            Recipe("Dark Matter Trap", "Particle Accelerator", ("Time Crystal", ), additional_outputs=("Dark Matter Residue", ))),
+        "Singularity Cell": (
+            Recipe("Singularity Cell", "Manufacturer", ("Nuclear Pasta", "Dark Matter Crystal", "Iron Plate", "Concrete"), minimal_belt_speed=3), ),
+        "Biochemical Sculptor": (
+            Recipe("Biochemical Sculptor", "Blender", ("Assembly Director System", "Ficsite Trigon", "Water"), minimal_phase=5), ),
+        "Ballistic Warp Drive": (
+            Recipe("Ballistic Warp Drive", "Manufacturer", ("Thermal Propulsion Rocket", "Singularity Cell", "Superposition Oscillator", "Dark Matter Crystal"), minimal_phase=5), ),
+
+        # All Quantum Encoder recipes have `Dark Matter Residue` set as an input, this hack makes the logic make sure you can get rid of it
+        "Dark Matter Residue": (
+            # Recipe("Ficsonium", "Particle Accelerator", ("Plutonium Waste", "Singularity Cell"), additional_outputs=("Ficsonium", )),
+            Recipe("Dark Matter Crystal", "Particle Accelerator", ("Diamonds", ), additional_outputs=("Dark Matter Crystal", )),
+            Recipe("Dark Matter Crystallization", "Particle Accelerator", additional_outputs=("Dark Matter Crystal", )),
+            Recipe("Dark Matter Trap", "Particle Accelerator", ("Time Crystal", ), additional_outputs=("Dark Matter Crystal", )),
+            Recipe("Dark Matter Residue", "Converter", ("Reanimated SAM", ))),
+        "Superposition Oscillator": (
+            Recipe("Superposition Oscillator", "Quantum Encoder", ("Dark Matter Residue", "Excited Photonic Matter", "Dark Matter Crystal", "Crystal Oscillator", "Alclad Aluminum Sheet")), ),
+        "Neural-Quantum Processor": (
+            Recipe("Neural-Quantum Processor", "Quantum Encoder", ("Dark Matter Residue", "Excited Photonic Matter", "Time Crystal", "Supercomputer", "Ficsite Trigon")), ),
+        "AI Expansion Server": (
+            Recipe("AI Expansion Server", "Quantum Encoder", ("Dark Matter Residue", "Excited Photonic Matter", "Magnetic Field Generator", "Neural-Quantum Processor", "Superposition Oscillator"), minimal_phase=5), ),
+        ###
+# 1.0
+        # For exclusion logic
+        "Hoverpack": (
+            Recipe("Hoverpack", "Equipment Workshop", ("Motor", "Heavy Modular Frame", "Computer", "Alclad Aluminum Sheet")), ),
+        "Turbo Rifle Ammo": (
+            Recipe("Turbo Rifle Ammo", "Blender", ("Rifle Ammo", "Aluminum Casing", "Turbofuel"), minimal_belt_speed=3),
+            Recipe("Turbo Rifle Ammo (Packaged)", "Manufacturer", ("Rifle Ammo", "Aluminum Casing", "Packaged Turbofuel"), minimal_belt_speed=2, minimal_phase=2)),
+        "Homing Rifle Ammo": (
+            Recipe("Homing Rifle Ammo", "Assembler", ("Rifle Ammo", "High-Speed Connector")), ),
+        ###
+    }
+
+    buildings: dict[str, Building] = {
+        "Constructor": Building("Constructor", ("Reinforced Iron Plate", "Cable"), PowerInfrastructureLevel.Basic),
+        "Assembler": Building("Assembler", ("Reinforced Iron Plate", "Iron Rod", "Cable"), PowerInfrastructureLevel.Basic),  # Simplified , used ("Reinforced Iron Plate", "Rotor", "Cable")
+        "Manufacturer": Building("Manufacturer", ("Motor", "Heavy Modular Frame", "Cable", "Plastic"), PowerInfrastructureLevel.Advanced),
+        "Packager": Building("Packager", ("Steel Beam", "Rubber", "Plastic"), PowerInfrastructureLevel.Basic),
+        "Refinery": Building("Refinery", ("Motor", "Encased Industrial Beam", "Steel Pipe", "Copper Sheet"), PowerInfrastructureLevel.Automated),
+        "Blender": Building("Blender", ("Motor", "Heavy Modular Frame", "Aluminum Casing", "Radio Control Unit"), PowerInfrastructureLevel.Advanced),
+        "Particle Accelerator": Building("Particle Accelerator", ("Radio Control Unit", "Electromagnetic Control Rod", "Supercomputer", "Cooling System", "Fused Modular Frame", "Turbo Motor"), PowerInfrastructureLevel.Complex),
+        "Biomass Burner": Building("Biomass Burner", ("Iron Plate", "Iron Rod", "Wire"), implicitly_unlocked=True),
+        "Coal Generator": Building("Coal Generator", ("Reinforced Iron Plate", "Rotor", "Cable")),
+        "Fuel Generator": Building("Fuel Generator", ("Computer", "Heavy Modular Frame", "Motor", "Rubber", "Quickwire")),
+        "Geothermal Generator": Building("Geothermal Generator", ("Motor", "Modular Frame", "High-Speed Connector", "Copper Sheet", "Wire")),
+        "Nuclear Power Plant": Building("Nuclear Power Plant", ("Concrete", "Heavy Modular Frame", "Supercomputer", "Cable", "Alclad Aluminum Sheet")),
+        "Miner Mk.1": Building("Miner Mk.1", ("Iron Plate", "Concrete"), PowerInfrastructureLevel.Basic, implicitly_unlocked=True),
+        "Miner Mk.2": Building("Miner Mk.2", ("Encased Industrial Beam", "Steel Pipe", "Modular Frame"), PowerInfrastructureLevel.Automated, can_produce=False),
+        "Miner Mk.3": Building("Miner Mk.3", ("Steel Pipe", "Supercomputer", "Fused Modular Frame", "Turbo Motor"), PowerInfrastructureLevel.Advanced, can_produce=False),
+        "Oil Extractor": Building("Oil Extractor", ("Motor", "Encased Industrial Beam", "Cable")),
+        "Water Extractor": Building("Water Extractor", ("Copper Sheet", "Reinforced Iron Plate", "Rotor")),
+        "Smelter": Building("Smelter", ("Iron Rod", "Wire"), PowerInfrastructureLevel.Basic),
+        "Foundry": Building("Foundry", ("Reinforced Iron Plate", "Iron Rod", "Concrete"), PowerInfrastructureLevel.Basic),  # Simplified, used ("Modular Frame", "Rotor", "Concrete")
+        "Resource Well Pressurizer": Building("Resource Well Pressurizer", ("Steel Pipe", "Heavy Modular Frame", "Motor", "Reinforced Iron Plate", "Copper Sheet", "Steel Beam"), PowerInfrastructureLevel.Advanced),  # Simplified, used ("Radio Control Unit", "Heavy Modular Frame", "Motor", "Alclad Aluminum Sheet", "Rubber", "Steel Beam", "Aluminum Casing")
+        "Equipment Workshop": Building("Equipment Workshop", ("Iron Plate", "Iron Rod"), implicitly_unlocked=True),
+        "AWESOME Sink": Building("AWESOME Sink", ("Reinforced Iron Plate", "Cable", "Concrete"), can_produce=False),
+        "AWESOME Shop": Building("AWESOME Shop", ("Screw", "Iron Plate", "Cable"), can_produce=False),
+        "MAM": Building("MAM", ("Reinforced Iron Plate", "Wire", "Cable"), can_produce=False),
+        "Pipes Mk.1": Building("Pipes Mk.1", ("Copper Sheet", "Iron Plate", "Concrete"), can_produce=False),
+        "Pipes Mk.2": Building("Pipes Mk.2", ("Copper Sheet", "Plastic", "Iron Plate", "Concrete"), can_produce=False),
+        "Pipeline Pump Mk.1": Building("Pipeline Pump Mk.1", ("Copper Sheet", "Rotor"), can_produce=False),
+        "Pipeline Pump Mk.2": Building("Pipeline Pump Mk.2", ("Motor", "Encased Industrial Beam", "Plastic"), can_produce=False),
+        "Conveyor Merger": Building("Conveyor Merger", ("Iron Plate", "Iron Rod"), can_produce=False),
+        "Conveyor Splitter": Building("Conveyor Splitter", ("Iron Plate", "Cable"), can_produce=False),
+        "Conveyor Mk.1": Building("Conveyor Mk.1", ("Iron Plate", "Iron Rod", "Concrete"), can_produce=False, implicitly_unlocked=True),
+        "Conveyor Mk.2": Building("Conveyor Mk.2", ("Reinforced Iron Plate", "Iron Plate", "Iron Rod", "Concrete"), can_produce=False),
+        "Conveyor Mk.3": Building("Conveyor Mk.3", ("Steel Beam", "Iron Plate", "Iron Rod", "Concrete"), can_produce=False),
+        "Conveyor Mk.4": Building("Conveyor Mk.4", ("Encased Industrial Beam", "Iron Plate", "Iron Rod", "Concrete"), can_produce=False),
+        "Conveyor Mk.5": Building("Conveyor Mk.5", ("Alclad Aluminum Sheet", "Iron Plate", "Iron Rod", "Concrete"), can_produce=False),
+        "Conveyor Mk.6": Building("Conveyor Mk.6", ("Ficsite Trigon", "Time Crystal", "Iron Plate", "Iron Rod", "Concrete"), can_produce=False),
+        "Power Pole Mk.1": Building("Power Pole Mk.1", ("Iron Plate", "Iron Rod", "Concrete"), can_produce=False, implicitly_unlocked=True),
+        # higher level power poles arent in logic (yet)
+        # "Power Pole Mk.2": Building("Power Pole Mk.2", ("Quickwire", "Iron Rod", "Concrete"), False),
+        # "Power Pole Mk.3": Building("Power Pole Mk.3", ("High-Speed Connector", "Steel Pipe", "Rubber"), False),
+        "Power Storage": Building("Power Storage", ("Wire", "Modular Frame", "Stator"), can_produce=False),
+        "Foundation": Building("Foundation", ("Iron Plate", "Concrete"), can_produce=False),
+        "Walls Orange": Building("Walls Orange", ("Iron Plate", "Concrete"), can_produce=False),
+        "Space Elevator": Building("Space Elevator", ("Concrete", "Iron Plate", "Iron Rod", "Wire"), can_produce=False),
+
+# 1.0
+        "Converter": Building("Converter", ("Fused Modular Frame", "Cooling System", "Radio Control Unit", "SAM Fluctuator"), PowerInfrastructureLevel.Complex),
+        "Quantum Encoder": Building("Quantum Encoder", ("Turbo Motor", "Supercomputer", "Cooling System", "Time Crystal", "Ficsite Trigon"), PowerInfrastructureLevel.Complex),
+        "Alien Power Augmenter": Building("Alien Power Augmenter", ("SAM Fluctuator", "Cable", "Encased Industrial Beam", "Motor", "Computer")),
+# 1.0
+
+        # For exclusion logic
+        "Portal": Building("Portal", ("Turbo Motor", "Radio Control Unit", "Superposition Oscillator", "SAM Fluctuator", "Ficsite Trigon", "Singularity Cell"), PowerInfrastructureLevel.Advanced),
+        ###
+    }
+
+    requirement_per_powerlevel: dict[PowerInfrastructureLevel, tuple[Recipe, ...]] = {
+        # no need to polute the logic by including higher level recipes based on previus recipes
+        PowerInfrastructureLevel.Basic: (
+            Recipe("Biomass Power (Biomass)", "Biomass Burner", ("Biomass", ), implicitly_unlocked=True),
+        ),
+        PowerInfrastructureLevel.Automated: (
+            Recipe("Biomass Power (Solid Biofuel)", "Biomass Burner", ("Solid Biofuel", ), implicitly_unlocked=True),
+            # Recipe("Coal Generator Power (Petroleum Coke)", "Coal Generator", ("Petroleum Coke", "Water"), implicitly_unlocked=True),
+            Recipe("Coal Generator Power (Coal)", "Coal Generator", ("Coal", "Water"), implicitly_unlocked=True),
+        ),
+        PowerInfrastructureLevel.Advanced: (
+            Recipe("Coal Generator Power (Compacted Coal)", "Coal Generator", ("Compacted Coal", "Water"), implicitly_unlocked=True),
+            Recipe("Geothermal Generator Power", "Geothermal Generator", implicitly_unlocked=True),
+            Recipe("Fuel Generator Power (Liquid Biofuel)", "Fuel Generator", ("Liquid Biofuel", ), implicitly_unlocked=True),
+            Recipe("Fuel Generator Power (Fuel)", "Fuel Generator", ("Fuel", ), implicitly_unlocked=True),
+            Recipe("Alien Power Augmenter Power", "Alien Power Augmenter", implicitly_unlocked=True),
+        ),
+        PowerInfrastructureLevel.Complex: (
+            Recipe("Fuel Generator Power (Turbofuel)", "Fuel Generator", ("Turbofuel", ), implicitly_unlocked=True),
+            # Recipe("Fuel Generator Power (Rocket Fuel)", "Fuel Generator", ("Rocket Fuel", ), implicitly_unlocked=True),
+            # Recipe("Fuel Generator Power (Ionized Fuel)", "Fuel Generator", ("Ionized Fuel", ), implicitly_unlocked=True),
+            Recipe("Nuclear Power Plant Power (Uranium)", "Nuclear Power Plant", ("Uranium Fuel Rod", "Water"), implicitly_unlocked=True),
+            # Recipe("Nuclear Power Plant Power (Plutonium)", "Nuclear Power Plant", ("Plutonium Fuel Rod", "Water"), implicitly_unlocked=True),
+            # Recipe("Nuclear Power Plant Power (Ficsonium)", "Nuclear Power Plant", ("Ficsonium Fuel Rod", "Water"), implicitly_unlocked=True),
+            # Recipe("Alien Power Augmenter Power (Alien Power Matrix)", "Alien Power Augmenter", ("Alien Power Matrix"), implicitly_unlocked=True),
+        )
+    }
+
+    slots_per_milestone: int = 8
+
+    hub_layout: tuple[tuple[dict[str, int], ...], ...] = (
+        # Regenerate via /Script/Engine.Blueprint'/Archipelago/Debug/CC_BuildHubData.CC_BuildHubData'
+        (  # Tier 1
+            {"Concrete": 200, "Iron Plate": 100, "Iron Rod": 100, },  # Schematic: Base Building (Schematic_1-1_C)
+            {"Iron Plate": 150, "Iron Rod": 150, "Wire": 300, },  # Schematic: Logistics (Schematic_1-2_C)
+            {"Wire": 300, "Screw": 300, "Iron Plate": 100, },  # Schematic: Field Research (Schematic_1-3_C)
+            {"Wire": 100, "Screw": 200, "Concrete": 200, },  # Schematic: Archipelago Additional Tier1 (Schem_ApExtraTier1_C)
+        ),
+        (  # Tier 2
+            {"Cable": 200, "Iron Rod": 200, "Screw": 500, "Iron Plate": 300, },  # Schematic: Part Assembly (Schematic_2-1_C)
+            {"Screw": 500, "Cable": 100, "Concrete": 100, },  # Schematic: Obstacle Clearing (Schematic_2-2_C)
+            {"Rotor": 50, "Iron Plate": 300, "Cable": 150, },  # Schematic: Jump Pads (Schematic_2-3_C)
+            {"Concrete": 400, "Wire": 500, "Iron Rod": 200, "Iron Plate": 200, },  # Schematic: Resource Sink Bonus Program (Schematic_2-5_C)
+            {"Reinforced Iron Plate": 50, "Concrete": 200, "Iron Rod": 300, "Iron Plate": 300, },  # Schematic: Logistics Mk.2 (Schematic_3-2_C)
+        ),
+        (  # Tier 3
+            {"Reinforced Iron Plate": 150, "Rotor": 50, "Cable": 500, },  # Schematic: Coal Power (Schematic_3-1_C)
+            {"Modular Frame": 25, "Rotor": 100, "Cable": 100, "Iron Plate": 400, },  # Schematic: Vehicular Transport (Schematic_3-3_C)
+            {"Modular Frame": 50, "Rotor": 150, "Concrete": 500, "Wire": 1000, },  # Schematic: Basic Steel Production (Schematic_3-4_C)
+            {"Reinforced Iron Plate": 100, "Iron Rod": 600, "Wire": 1500, },  # Schematic: Improved Melee Combat (Schematic_4-2_C)
+        ),
+        (  # Tier 4
+            {"Modular Frame": 100, "Steel Beam": 200, "Cable": 500, "Concrete": 1000, },  # Schematic: FICSIT Blueprints (Schematic_4-5_C)
+            {"Steel Beam": 200, "Steel Pipe": 200, "Reinforced Iron Plate": 400, },  # Schematic: Logistics Mk.3 (Schematic_5-3_C)
+            {"Steel Pipe": 100, "Modular Frame": 100, "Rotor": 200, "Concrete": 500, },  # Schematic: Advanced Steel Production (Schematic_4-1_C)
+            {"Encased Industrial Beam": 50, "Steel Beam": 100, "Modular Frame": 200, "Wire": 2000, },  # Schematic: Expanded Power Infrastructure (Schematic_4-3_C)
+            {"Copper Sheet": 500, "Steel Pipe": 300, "Encased Industrial Beam": 50, },  # Schematic: Hypertubes (Schematic_4-4_C)
+        ),
+        (  # Tier 5
+            {"Motor": 50, "Cable": 100, "Iron Plate": 500, },  # Something jetpack
+            {"Motor": 50, "Encased Industrial Beam": 100, "Steel Pipe": 500, "Copper Sheet": 500, },  # Schematic: Oil Processing (Schematic_5-1_C)
+            {"Rubber": 200, "Encased Industrial Beam": 300, "Modular Frame": 400, },
+            {"Plastic": 200, "Steel Beam": 400, "Copper Sheet": 1000, },  # Schematic: Alternative Fluid Transport (Schematic_5-4_C)
+            {"Motor": 100, "Encased Industrial Beam": 100, "Plastic": 200, "Rubber": 200, },  # Schematic: Industrial Manufacturing (Schematic_5-2_C)
+        ),
+        (  # Tier 6
+            {"Motor": 200, "Modular Frame": 200, "Plastic": 400, "Cable": 1000, },  # Schematic: Industrial Manufacturing (Schematic_5-2_C)
+            {"Motor": 250, "Encased Industrial Beam": 500, "Steel Pipe": 1000, "Steel Beam": 1000, },  # Schematic: Monorail Train Technology (Schematic_6-3_C)
+            {"Computer": 50, "Steel Pipe": 4000, "Copper Sheet": 1000, },
+            {"Heavy Modular Frame": 50, "Plastic": 1000, "Rubber": 1000, },  # Schematic: Pipeline Engineering Mk.2 (Schematic_6-5_C)
+            {"Heavy Modular Frame": 50, "Computer": 100, "Rubber": 400, "Concrete": 1000, },
+        ),
+        (  # Tier 7
+            {"Computer": 100, "Heavy Modular Frame": 100, "Motor": 250, "Rubber": 500, },  # Schematic: Bauxite Refinement (Schematic_7-1_C)
+            {"Alclad Aluminum Sheet": 100, "Heavy Modular Frame": 100, "Computer": 100, "Motor": 250, },  # Schematic: Hover Pack (Schematic_8-3_C)
+            {"Alclad Aluminum Sheet": 200, "Encased Industrial Beam": 400, "Reinforced Iron Plate": 600, },  # Schematic: Logistics Mk.5 (Schematic_7-2_C)
+            {"Gas Filter": 50, "Aluminum Casing": 100, "Quickwire": 500, },  # Schematic: Hazmat Suit (Schematic_7-3_C)
+            {"Alclad Aluminum Sheet": 200, "Aluminum Casing": 400, "Computer": 200, "Plastic": 1000, },  # Schematic: Aeronautical Engineering (Schematic_7-4_C)
+        ),
+        (  # Tier 8
+            {"Radio Control Unit": 50, "Alclad Aluminum Sheet": 100, "Aluminum Casing": 200, "Motor": 300, },  # Schematic: Aeronautical Engineering (Schematic_7-4_C)
+            {"Supercomputer": 50, "Heavy Modular Frame": 200, "Cable": 1000, "Concrete": 2000, },  # Schematic: Nuclear Power (Schematic_8-1_C)
+            {"Radio Control Unit": 50, "Aluminum Casing": 200, "Alclad Aluminum Sheet": 400, "Wire": 3000, },  # Schematic: Advanced Aluminum Production (Schematic_8-2_C)
+            {"Fused Modular Frame": 50, "Supercomputer": 100, "Steel Pipe": 1000, },  # Schematic: Leading-edge Production (Schematic_8-4_C)
+            {"Turbo Motor": 50, "Fused Modular Frame": 100,  "Cooling System": 200, "Quickwire": 2500, },  # Schematic: Particle Enrichment (Schematic_8-5_C)
+        ),
+        (  # Tier 9
+            {"Fused Modular Frame": 100, "Radio Control Unit": 250, "Cooling System": 500, },
+            {"Time Crystal": 50, "Ficsite Trigon": 100, "Turbo Motor": 200, "Supercomputer": 400, },
+            {"Neural-Quantum Processor": 100, "Time Crystal": 250, "Ficsite Trigon": 500, "Fused Modular Frame": 500, },
+            {"Superposition Oscillator": 100, "Turbo Motor": 250, "Radio Control Unit": 500, "SAM Fluctuator": 1000, },
+            {"Time Crystal": 250, "Ficsite Trigon": 250, "Alclad Aluminum Sheet": 500, "Iron Plate": 10000, },
+        ),
+    )
+
+    # Values from /Game/FactoryGame/Schematics/Progression/BP_GamePhaseManager.BP_GamePhaseManager
+    space_elevator_phases: tuple[dict[str, int], ...] = (
+        {"Smart Plating": 50},
+        {"Smart Plating": 500, "Versatile Framework": 500, "Automated Wiring": 100},
+        {"Versatile Framework": 2500, "Modular Engine": 500, "Adaptive Control Unit": 100},
+        {"Assembly Director System": 4000, "Magnetic Field Generator": 4000, "Nuclear Pasta": 1000, "Thermal Propulsion Rocket": 1000},
+        {"Nuclear Pasta": 1000, "Biochemical Sculptor": 1000, "AI Expansion Server": 256, "Ballistic Warp Drive": 200}
+    )
+
+    # Do not regenerate as format got changed
+    # Regenerate via /Script/Engine.Blueprint'/Archipelago/Debug/CC_BuildMamData.CC_BuildMamData'
+    man_trees: dict[str, MamTree] = {
+        "Alien Organisms": MamTree(("Hog Remains", "Plasma Spitter Remains", "Stinger Remains", "Hatcher Remains"), (  # Alien Organisms (BPD_ResearchTree_AlienOrganisms_C)
+            MamNode("Inflated Pocket Dimension", {"Alien Protein": 3, "Cable": 1000, }, depends_on=("Bio-Organic Properties", )),  # (Research_AOrgans_3_C)
+            MamNode("Hostile Organism Detection", {"Alien DNA Capsule": 10, "Crystal Oscillator": 5, "High-Speed Connector": 5, }, depends_on=("Bio-Organic Properties", )),  # (Research_AOrganisms_2_C)
+            MamNode("Expanded Toolbelt", {"Alien DNA Capsule": 5, "Steel Beam": 500, }, depends_on=("Inflated Pocket Dimension", )),  # (Research_ACarapace_3_C)
+            MamNode("Bio-Organic Properties", {"Alien Protein": 5, }, depends_on=("Spitter Research", "Hog Research", "Hatcher Research", "Stinger Research")),  # (Research_AO_DNACapsule_C)
+            MamNode("Stinger Research", {"Stinger Remains": 1, }, depends_on=tuple()),  # (Research_AO_Stinger_C)
+            MamNode("Hatcher Research", {"Hatcher Remains": 1, }, depends_on=tuple()),  # (Research_AO_Hatcher_C)
+            MamNode("Hog Research", {"Hog Remains": 1, }, depends_on=tuple()),  # (Research_ACarapace_0_C)
+            MamNode("Spitter Research", {"Plasma Spitter Remains": 1, }, depends_on=tuple()),  # (Research_AOrgans_0_C)
+            MamNode("Structural Analysis", {"Alien DNA Capsule": 5, "Iron Rod": 100, }, depends_on=("Bio-Organic Properties", )),  # (Research_AO_Pre_Rebar_C)
+            MamNode("Protein Inhaler", {"Alien Protein": 2, "Beryl Nut": 20, "Rotor": 50, }, depends_on=("Bio-Organic Properties", )),  # (Research_AOrgans_2_C)
+            MamNode("The Rebar Gun", {"Rotor": 25, "Reinforced Iron Plate": 50, "Screw": 500, }, depends_on=("Structural Analysis", )),  # (Research_ACarapace_2_C)
+        )),
+        # 1.0
+        "Alien Technology": MamTree(("SAM", "Mercer Sphere", "Somersloop"), (
+            MamNode("SAM Analysis", {"SAM": 10, }, depends_on=tuple()),
+            MamNode("SAM Reanimation", {"SAM": 20, }, depends_on=("SAM Analysis",)),
+            MamNode("SAM Fluctuator", {"Reanimated SAM": 10, "Steel Pipe": 100, "Wire": 200, }, depends_on=("SAM Reanimation",)),
+            MamNode("Mercer Sphere Analysis", {"Mercer Sphere": 1, }, depends_on=tuple()),
+            MamNode("Dimensional Depot", {"Mercer Sphere": 1, "SAM Fluctuator": 11, }, depends_on=("Mercer Sphere Analysis", "SAM Fluctuator")),
+            MamNode("Manual Depot Uploader", {"Mercer Sphere": 3, "Computer": 17, "SAM Fluctuator": 19, }, depends_on=("Dimensional Depot",)),
+            MamNode("Depot Expansion (200%)", {"Mercer Sphere": 3, "SAM Fluctuator": 47, }, depends_on=("Dimensional Depot",)),
+            MamNode("Depot Expansion (300%)", {"Mercer Sphere": 7, "SAM Fluctuator": 103, }, depends_on=("Depot Expansion (200%)",)),
+            MamNode("Depot Expansion (400%)", {"Mercer Sphere": 13, "SAM Fluctuator": 151, }, depends_on=("Depot Expansion (300%)",)),
+            MamNode("Depot Expansion (500%)", {"Mercer Sphere": 23, "SAM Fluctuator": 199, }, depends_on=("Depot Expansion (400%)",)),
+            MamNode("Upload Upgrade: 30/min", {"Mercer Sphere": 3, "SAM Fluctuator": 47, }, depends_on=("Dimensional Depot",)),
+            MamNode("Upload Upgrade: 60/min", {"Mercer Sphere": 7, "SAM Fluctuator": 103, }, depends_on=("Upload Upgrade: 30/min",)),
+            MamNode("Upload Upgrade: 120/min", {"Mercer Sphere": 13, "SAM Fluctuator": 151, }, depends_on=("Upload Upgrade: 60/min",)),
+            MamNode("Upload Upgrade: 240/min", {"Mercer Sphere": 23, "SAM Fluctuator": 199, }, depends_on=("Upload Upgrade: 120/min",)),
+            MamNode("Somersloop Analysis", {"Somersloop": 1, }, depends_on=tuple()),
+            MamNode("Alien Energy Harvesting", {"SAM Fluctuator": 10, }, depends_on=("Somersloop Analysis", "SAM Fluctuator")),
+            MamNode("Production Amplifier", {"Somersloop": 1, "SAM Fluctuator": 100, "Circuit Board": 50, }, depends_on=("Alien Energy Harvesting",)),
+            MamNode("Power Augmenter", {"Somersloop": 1, "SAM Fluctuator": 100, "Computer": 50, }, depends_on=("Alien Energy Harvesting",)),
+            MamNode("Alien Power Matrix", {"Singularity Cell": 50, "Power Shard": 100, "SAM Fluctuator": 500, }, depends_on=("Power Augmenter",), minimal_phase=4),
+        )),
+        # 1.0
+        "Caterium": MamTree(("Caterium Ore", ), (  # Caterium (BPD_ResearchTree_Caterium_C)
+            MamNode("Caterium Electronics", {"Quickwire": 100, }, depends_on=("Quickwire", )),  # (Research_Caterium_3_C)
+            MamNode("Bullet Guidance System", {"High-Speed Connector": 10, "Rifle Ammo": 500, }, depends_on=("High-Speed Connector", )),  # (Research_Caterium_6_3_C)
+            MamNode("High-Speed Connector", {"Quickwire": 500, "Plastic": 50, }, depends_on=("Caterium Electronics", )),  # (Research_Caterium_5_C)
+            MamNode("Caterium", {"Caterium Ore": 10, }, depends_on=tuple()),  # (Research_Caterium_0_C)
+            MamNode("Caterium Ingots", {"Caterium Ore": 50, }, depends_on=("Caterium", )),  # (Research_Caterium_1_C)
+            MamNode("Quickwire", {"Caterium Ingot": 50, }, depends_on=("Caterium Ingots", )),  # (Research_Caterium_2_C)
+            MamNode("Power Switch", {"Steel Beam": 100, "AI Limiter": 50, }, depends_on=("AI Limiter", )),  # (Research_Caterium_4_1_2_C)
+            MamNode("Priority Power Switch", {"High-Speed Connector": 25, "Quickwire": 500, }, depends_on=("High-Speed Connector", )),  # 1.0
+            MamNode("Power Poles Mk.2", {"Quickwire": 300, }, depends_on=("Caterium Electronics", )),  # (Research_Caterium_4_2_C)
+            MamNode("AI Limiter", {"Quickwire": 200, "Copper Sheet": 50, }, depends_on=("Caterium Electronics", )),  # (Research_Caterium_4_1_C)
+            MamNode("Smart Splitter", {"AI Limiter": 10, "Reinforced Iron Plate": 50, }, depends_on=("AI Limiter", )),  # (Research_Caterium_4_1_1_C)
+            MamNode("Programmable Splitter", {"AI Limiter": 100, "Computer": 50, "Heavy Modular Frame": 50, }, depends_on=("AI Limiter", "High-Speed Connector")),  # (Research_Caterium_7_1_C) # 1.0
+            MamNode("Zipline", {"Quickwire": 100, "Cable": 50, }, depends_on=("Quickwire", )),  # (Research_Caterium_2_1_C)
+            MamNode("Geothermal Generator", {"High-Speed Connector": 100, "Quickwire": 1000, "Motor": 50, }, depends_on=("AI Limiter", "High-Speed Connector")),  # (Research_Caterium_7_2_C) # 1.0
+            MamNode("Stun Rebar", {"Quickwire": 50, "Iron Rebar": 10, }, depends_on=("Quickwire", )),  # (Research_Caterium_3_2_C)
+            MamNode("Power Poles Mk.3", {"High-Speed Connector": 50, "Steel Pipe": 200, }, depends_on=("Power Poles Mk.2", )),  # (Research_Caterium_6_2_C) # 1.0
+        )),
+        "Mycelia": MamTree(("Mycelia", ), (  # Mycelia (BPD_ResearchTree_Mycelia_C)
+            MamNode("Therapeutic Inhaler", {"Mycelia": 15, "Bacon Agaric": 1, "Alien Protein": 1, }, depends_on=("Medical Properties", )),  # (Research_Mycelia_6_C)
+            MamNode("Expanded Toolbelt", {"Fabric": 50, "Rotor": 100, }, depends_on=("Fabric", )),  # (Research_Mycelia_7_C)
+            MamNode("Mycelia", {"Mycelia": 5, }, depends_on=tuple()),  # (Research_Mycelia_1_C)
+            MamNode("Fabric", {"Mycelia": 25, "Biomass": 100, }, depends_on=("Mycelia", )),  # (Research_Mycelia_2_C)
+            MamNode("Medical Properties", {"Mycelia": 25, "Stator": 10, }, depends_on=("Mycelia", )),  # (Research_Mycelia_4_C)
+            MamNode("Toxic Cellular Modification", {"Nobelisk": 10, "Mycelia": 100, "Biomass": 200, }, depends_on=("Mycelia", )),  # (Research_Mycelia_8_C)
+            MamNode("Vitamin Inhaler", {"Mycelia": 10, "Paleberry": 5, }, depends_on=("Medical Properties", )),  # (Research_Mycelia_5_C)
+            MamNode("Parachute", {"Fabric": 10, "Cable": 50, }, depends_on=("Fabric", )),  # (Research_Mycelia_3_C)
+            MamNode("Synthethic Polyester Fabric", {"Fabric": 25, "Polymer Resin": 100, }, depends_on=("Fabric", )),  # (Research_Mycelia_2_1_C)
+            MamNode("Gas Mask", {"Coal": 10, "Fabric": 50, "Steel Pipe": 50, }, depends_on=("Fabric", )),  # 1.0
+        )),
+        "Nutrients": MamTree(("Paleberry", "Beryl Nut", "Bacon Agaric"), (  # Nutrients (BPD_ResearchTree_Nutrients_C)
+            MamNode("Bacon Agaric", {"Bacon Agaric": 1, }, depends_on=tuple()),  # (Research_Nutrients_2_C)
+            MamNode("Beryl Nut", {"Beryl Nut": 5, }, depends_on=tuple()),  # (Research_Nutrients_1_C)
+            MamNode("Paleberry", {"Paleberry": 2, }, depends_on=tuple()),  # (Research_Nutrients_0_C)
+            MamNode("Nutritional Processor", {"Modular Frame": 25, "Steel Pipe": 50, "Wire": 500, }, depends_on=("Beryl Nut", "Bacon Agaric", "Paleberry")),  # (Research_Nutrients_3_C)
+            MamNode("Nutritional Inhaler", {"Bacon Agaric": 2, "Paleberry": 4, "Beryl Nut": 10, }, depends_on=("Nutritional Processor", )),  # (Research_Nutrients_4_C)
+        )),
+        "Power Slugs": MamTree(("Blue Power Slug", ), (  # Power Slugs (BPD_ResearchTree_PowerSlugs_C)
+            MamNode("Slug Scanning", {"Iron Rod": 50, "Wire": 100, "Screw": 200, }, depends_on=("Blue Power Slugs", )),  # (Research_PowerSlugs_3_C)
+            MamNode("Blue Power Slugs", {"Blue Power Slug": 1, }, depends_on=tuple()),  # (Research_PowerSlugs_1_C)
+            MamNode("Yellow Power Shards", {"Yellow Power Slug": 1, "Rotor": 25, "Cable": 100, }, depends_on=("Blue Power Slugs", )),  # (Research_PowerSlugs_4_C)
+            MamNode("Purple Power Shards", {"Purple Power Slug": 1, "Modular Frame": 25, "Copper Sheet": 100, }, depends_on=("Yellow Power Shards", )),  # (Research_PowerSlugs_5_C)
+            MamNode("Overclock Production", {"Power Shard": 1, "Iron Plate": 50, "Wire": 50, }, depends_on=("Blue Power Slugs", )),  # (Research_PowerSlugs_2_C)
+            MamNode("Synthetic Power Shards", {"Power Shard": 10, "Time Crystal": 100, "Quartz Crystal": 200, }, depends_on=("Purple Power Shards", ), minimal_phase=4),  # 1.0
+        )),
+        "Quartz": MamTree(("Raw Quartz", ), (  # Quartz (BPD_ResearchTree_Quartz_C)
+            MamNode("Crystal Oscillator", {"Quartz Crystal": 100, "Reinforced Iron Plate": 50, }, depends_on=("Quartz Crystals", )),  # (Research_Quartz_2_C)
+            MamNode("Quartz Crystals", {"Raw Quartz": 20, }, depends_on=("Quartz", )),  # (Research_Quartz_1_1_C)
+            MamNode("Quartz", {"Raw Quartz": 10, }, depends_on=tuple()),  # (Research_Quartz_0_C)
+            MamNode("Shatter Rebar", {"Quartz Crystal": 30, "Iron Rebar": 150, }, depends_on=("Quartz Crystals", )),  # (Research_Quartz_2_1_C)
+            MamNode("Silica", {"Raw Quartz": 20, }, depends_on=("Quartz", )),  # (Research_Quartz_1_2_C)
+            MamNode("Explosive Resonance Application", {"Crystal Oscillator": 5, "Nobelisk": 100, }, depends_on=("Crystal Oscillator", )),  # (Research_Quartz_3_4_C)
+            MamNode("Blade Runners", {"Silica": 50, "Modular Frame": 10, }, depends_on=("Silica", )),  # (Research_Caterium_4_3_C)
+            MamNode("The Explorer", {"Crystal Oscillator": 10, "Modular Frame": 100, }, depends_on=("Crystal Oscillator", )),  # (Research_Quartz_3_1_C)
+            MamNode("Material Resonance Screening", {"Crystal Oscillator": 15, "Reinforced Iron Plate": 100, }, depends_on=("Crystal Oscillator", )),  # (Research_Quartz_PriorityMerger_C)
+            MamNode("Radio Signal Scanning", {"Crystal Oscillator": 100, "Motor": 100, "Object Scanner": 1, }, depends_on=("Crystal Oscillator", )),  # (Research_Quartz_4_1_C)
+            MamNode("Inflated Pocket Dimension", {"Silica": 200, }, depends_on=("Silica", )),  # (Research_Caterium_3_1_C)
+            MamNode("Radar Technology", {"Crystal Oscillator": 50, "Heavy Modular Frame": 50, "Computer": 50, }, depends_on=("Crystal Oscillator", )),  # (Research_Quartz_4_C) # 1.0
+        )),
+        "Sulfur": MamTree(("Sulfur", ), (  # Sulfur (BPD_ResearchTree_Sulfur_C)
+            MamNode("The Nobelisk Detonator", {"Black Powder": 50, "Steel Pipe": 100, "Cable": 200, }, depends_on=("Black Powder", )),  # (Research_Sulfur_3_1_C)
+            MamNode("Smokeless Powder", {"Black Powder": 100, "Plastic": 50, }, depends_on=("Black Powder", )),  # (Research_Sulfur_3_C)
+            MamNode("Sulfur", {"Sulfur": 10, }, depends_on=tuple()),  # (Research_Sulfur_0_C)
+            MamNode("Inflated Pocket Dimension", {"Smokeless Powder": 50, "Computer": 50, }, depends_on=("Nuclear Deterrent Development", "Turbo Rifle Ammo", "Cluster Nobelisk", "The Rifle")),  # (Research_Sulfur_6_C)
+            MamNode("The Rifle", {"Smokeless Powder": 50, "Motor": 100, "Rubber": 200, }, depends_on=("Smokeless Powder", )),  # (Research_Sulfur_4_1_C)
+            MamNode("Compacted Coal", {"Hard Drive": 1, "Sulfur": 25, "Coal": 25, }, depends_on=("Experimental Power Generation", )),  # (Research_Sulfur_CompactedCoal_C)
+            MamNode("Black Powder", {"Sulfur": 50, "Coal": 25, }, depends_on=("Sulfur", )),  # (Research_Sulfur_1_C)
+            MamNode("Explosive Rebar", {"Smokeless Powder": 200, "Iron Rebar": 200, "Steel Beam": 200, }, depends_on=("Smokeless Powder", )),  # (Research_Sulfur_4_2_C)
+            MamNode("Cluster Nobelisk", {"Smokeless Powder": 100, "Nobelisk": 200, }, depends_on=("Smokeless Powder", )),  # (Research_Sulfur_4_C)
+            MamNode("Experimental Power Generation", {"Sulfur": 25, "Modular Frame": 50, "Rotor": 100, }, depends_on=("Sulfur", )),  # (Research_Sulfur_ExperimentalPower_C)
+            MamNode("Turbo Rifle Ammo", {"Rifle Ammo": 1000, "Packaged Turbofuel": 50, "Aluminum Casing": 100, }, depends_on=("The Rifle", ), minimal_phase=2),  # (Research_Sulfur_5_2_C) # 1.0
+            MamNode("Turbo Fuel", {"Hard Drive": 1, "Compacted Coal": 15, "Packaged Fuel": 50, }, depends_on=("Experimental Power Generation", )),  # (Research_Sulfur_TurboFuel_C)
+            MamNode("Expanded Toolbelt", {"Black Powder": 100, "Encased Industrial Beam": 50, }, depends_on=("Black Powder", )),  # (Research_Sulfur_5_C)
+            MamNode("Nuclear Deterrent Development", {"Nobelisk": 500, "Encased Uranium Cell": 10, "AI Limiter": 100, }, depends_on=("Cluster Nobelisk", ), minimal_phase=2),  # (Research_Sulfur_5_1_C) # 1.0
+            MamNode("Rocket Fuel", {"Hard Drive": 1, "Empty Fluid Tank": 10, "Packaged Turbofuel": 100, }, depends_on=("Turbo Fuel", ), minimal_phase=3),  # 1.0
+            MamNode("Ionized Fuel", {"Hard Drive": 1, "Power Shard": 100, "Packaged Rocket Fuel": 200, }, depends_on=("Turbo Fuel", ), minimal_phase=4),  # 1.0
+        ))
+    }
+
+    drop_pods: list[DropPodData] = [
+        # Regenerate via /Script/Engine.Blueprint'/Archipelago/Debug/CC_BuildDropPodLocations.CC_BuildDropPodLocations' 
+        DropPodData(-29068, -22640, 17384,  "Encased Industrial Beam", 0),  # Unlocks with: 4 x Desc_SteelPlateReinforced_C
+        DropPodData(-33340, 5176,   23519,  "Crystal Oscillator", 0),  # Unlocks with: 5 x Desc_CrystalOscillator_C
+        DropPodData(8680,   -41777, 13053,  "Steel Pipe", 0),  # Unlocks with: 7 x Desc_SteelPipe_C
+        DropPodData(35082,  16211,  22759,  "Supercomputer", 0),  # Unlocks with: 7 x Desc_ComputerSuper_C
+        # DropPodData(-3511, 62314,  22109,  "Quantum Computer", 0),  # Unlocks with: 1 x Desc_ComputerQuantum_C
+        DropPodData(66652,  -13642, 13420,  "Encased Industrial Beam", 50),  # Unlocks with: 3 x Desc_SteelPlateReinforced_C
+        DropPodData(55247,  -51316, 14363,  None, 25),  # Unlocks with: (No Item)
+        DropPodData(-4706,  -76301, 13618,  "Black Powder", 0),  # Unlocks with: 10 x Desc_Gunpowder_C
+        DropPodData(-40194, 62956,  26261,  "Superposition Oscillator", 138),  # Unlocks with: 2 x Desc_QuantumOscillator_C
+        DropPodData(80980,  -44100, 8303,   "Rotor", 0),  # Unlocks with: 3 x Desc_Rotor_C
+        DropPodData(-56144, -72864, 27668,  "Quartz Crystal", 0),  # Unlocks with: 2 x Desc_QuartzCrystal_C
+        DropPodData(-95228, 6970,   25142,  "High-Speed Connector", 112),  # Unlocks with: 11 x Desc_HighSpeedConnector_C
+        DropPodData(-89284, -50630, 16019,  None, 50),  # Unlocks with: (No Item)
+        DropPodData(-94708, 40337,  19832,  "Heat Sink", 138),  # Unlocks with: 2 x Desc_AluminumPlateReinforced_C
+        DropPodData(94267,  47237,  9435,   "Motor", 0),  # Unlocks with: 1 x Desc_Motor_C
+        DropPodData(87739,  -62975, 13444,  None, 30),  # Unlocks with: (No Item)
+        DropPodData(12249,  114177, 26721,  "AI Limiter", 267),  # Unlocks with: 9 x Desc_CircuitBoardHighSpeed_C
+        DropPodData(115978, 21424,  15519,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(-78236, 90857,  20305,  "Radio Control Unit", 0),  # Unlocks with: 6 x Desc_ModularFrameLightweight_C
+        DropPodData(-35359, 116594, 21827,  "Turbo Motor", 0),  # Unlocks with: 6 x Desc_MotorLightweight_C
+        DropPodData(111479, -54515, 17081,  "Stator", 20),  # Unlocks with: 1 x Desc_Stator_C
+        DropPodData(121061, 45324,  17373,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(125497, -34949, 8220,   None, 50),  # Unlocks with: (No Item)
+        DropPodData(-26327, -129047, 7780,   "Modular Frame", 0),  # Unlocks with: 1 x Desc_ModularFrame_C
+        DropPodData(21373,  132336, 2510,   "Motor", 20),  # Unlocks with: 2 x Desc_Motor_C
+        DropPodData(17807,  -136922, 13621,  "Rotor", 0),  # Unlocks with: 1 x Desc_Rotor_C
+        DropPodData(-118480, 74929,  16995,  None, 420),  # Unlocks with: (No Item)
+        DropPodData(94940,  105482, 9860,   "Heavy Modular Frame", 0),  # Unlocks with: 1 x Desc_ModularFrameHeavy_C
+        DropPodData(-129115, 60165,  4800,   None, 53),  # Unlocks with: (No Item)
+        DropPodData(-142000, 23970,  32660,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(46048,  141933, 13064,  None, 40),  # Unlocks with: (No Item)
+        DropPodData(144456, 36294,  17301,  "Circuit Board", 48),  # Unlocks with: 20 x Desc_CircuitBoard_C
+        DropPodData(-43144, 145820, 7472,   "Modular Frame", 0),  # Unlocks with: 5 x Desc_ModularFrame_C
+        DropPodData(-108774, 107811, 10154,  "Crystal Oscillator", 0),  # Unlocks with: 1 x Desc_CrystalOscillator_C
+        DropPodData(-56987, -144603, 2072,   "Rotor", 10),  # Unlocks with: 1 x Desc_Rotor_C
+        DropPodData(-152676, 33864,  19283,  None, 256),  # Unlocks with: (No Item)
+        DropPodData(90313,  129583, 9112,   "Crystal Oscillator", 20),  # Unlocks with: 2 x Desc_CrystalOscillator_C
+        DropPodData(111212, -113040, 12036,  "Screw", 10),  # Unlocks with: 15 x Desc_IronScrew_C
+        DropPodData(-157077, -6312,  25128,  "Turbo Motor", 0),  # Unlocks with: 8 x Desc_MotorLightweight_C
+        DropPodData(157249, -40206, 13694,  "High-Speed Connector", 0),  # Unlocks with: 2 x Desc_HighSpeedConnector_C
+        DropPodData(-151842, 72468,  9945,   "Encased Industrial Beam", 0),  # Unlocks with: 3 x Desc_SteelPlateReinforced_C
+        DropPodData(64696,  156038, 14067,  "Modular Frame", 0),  # Unlocks with: 6 x Desc_ModularFrame_C
+        DropPodData(-157080, -67028, 11766,  "Rotor", 0),  # Unlocks with: 4 x Desc_Rotor_C
+        DropPodData(170057, -10579, 18823,  None, 50),  # Unlocks with: (No Item)
+        DropPodData(143671, 92573,  24990,  "Crystal Oscillator", 20),  # Unlocks with: 2 x Desc_CrystalOscillator_C
+        DropPodData(127215, -116866, -1397,  "Rubber", 0),  # Unlocks with: 10 x Desc_Rubber_C
+        DropPodData(163999, 61333,  21481,  "AI Limiter", 0),  # Unlocks with: 3 x Desc_CircuitBoardHighSpeed_C
+        DropPodData(98306,  -149781, 2552,   None, 40),  # Unlocks with: (No Item)
+        DropPodData(5302,   -187090, -1608,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(188304, 17059,  12949,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(84256,  -171122, -290,   None, 0),  # Unlocks with: (No Item)
+        DropPodData(191366, 37694,  5676,   "Computer", 0),  # Unlocks with: 4 x Desc_Computer_C
+        DropPodData(28695,  193441, 17459,  "Quickwire", 0),  # Unlocks with: 9 x Desc_HighSpeedWire_C
+        DropPodData(-146044, -137047, 2357,   "Modular Frame", 0),  # Unlocks with: 9 x Desc_ModularFrame_C
+        DropPodData(-200203, -17766, 12193,  "Solid Biofuel", 0),  # Unlocks with: 10 x Desc_Biofuel_C
+        DropPodData(47834,  195703, 2943,   "Black Powder", 0),  # Unlocks with: 4 x Desc_Gunpowder_C
+        DropPodData(198418, -41186, 13786,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(-195756, -59210, -84,    None, 30),  # Unlocks with: (No Item)
+        DropPodData(-121994, 166916, -49,    "Steel Beam", 20),  # Unlocks with: 4 x Desc_SteelPlate_C
+        DropPodData(88323,  188913, 1420,   None, 30),  # Unlocks with: (No Item)
+        DropPodData(-123677, -167107, 29710,  "Motor", 0),  # Unlocks with: 4 x Desc_Motor_C
+        DropPodData(150633, 146698, 7727,   "Crystal Oscillator", 20),  # Unlocks with: 2 x Desc_CrystalOscillator_C
+        DropPodData(-55111, -204857, 7844,   "Motor", 0),  # Unlocks with: 30 x Desc_Motor_C
+        DropPodData(216096, -268,   -1592,  "Heat Sink", 0),  # Unlocks with: 7 x Desc_AluminumPlateReinforced_C
+        DropPodData(159088, -145116, 23164,  "Motor", 0),  # Unlocks with: 30 x Desc_Motor_C
+        DropPodData(207683, -68352, 3927,   "Encased Industrial Beam", 20),  # Unlocks with: 27 x Desc_SteelPlateReinforced_C
+        DropPodData(-189258, 116331, -1764,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(46951,  221859, 5917,   None, 20),  # Unlocks with: (No Item)
+        DropPodData(-9988,  227625, -1017,  None, 40),  # Unlocks with: (No Item)
+        DropPodData(232515, -20519, 8979,   "Crystal Oscillator", 15),  # Unlocks with: 2 x Desc_CrystalOscillator_C
+        DropPodData(232138, 27191,  -1629,  "Supercomputer", 0),  # Unlocks with: 5 x Desc_ComputerSuper_C
+        DropPodData(-135,   -237257, -1760,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(-232498, -51432, -386,   "Rotor", 0),  # Unlocks with: 21 x Desc_Rotor_C
+        DropPodData(-238333, 17321,  19741,  "Heat Sink", 0),  # Unlocks with: 3 x Desc_AluminumPlateReinforced_C
+        DropPodData(200510, 131912, 6341,   "Motor", 0),  # Unlocks with: 30 x Desc_Motor_C
+        DropPodData(-108812, 214051, 3200,   "Quickwire", 0),  # Unlocks with: 1 x Desc_HighSpeedWire_C
+        DropPodData(232255, 79925,  -1275,  "Turbo Motor", 67),  # Unlocks with: 2 x Desc_MotorLightweight_C
+        DropPodData(226418, 98109,  7339,   None, 200),  # Unlocks with: (No Item)
+        DropPodData(156569, 191767, -9312,  "Rubber", 0),  # Unlocks with: 4 x Desc_Rubber_C
+        DropPodData(44579,  -244343, -874,   None, 0),  # Unlocks with: (No Item)
+        DropPodData(118349, 221905, -7063,  "Encased Industrial Beam", 0),  # Unlocks with: 6 x Desc_SteelPlateReinforced_C
+        # DropPodData(249919, 59534,  2430,   "Quantum Computer", 0), # Unlocks with: 1 x Desc_ComputerQuantum_C
+        DropPodData(188233, 177201, 9608,   "Quickwire", 0),  # Unlocks with: 12 x Desc_HighSpeedWire_C
+        DropPodData(-174494, -197134, -1538,  None, 30),  # Unlocks with: (No Item)
+        DropPodData(-50655, -259272, -1667,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(30383,  266975, -987,   "Screw", 0),  # Unlocks with: 12 x Desc_IronScrew_C
+        DropPodData(272715, 28087,  -1586,  "Supercomputer", 0),  # Unlocks with: 2 x Desc_ComputerSuper_C
+        DropPodData(-152279, 229520, 1052,   "Modular Frame", 0),  # Unlocks with: 5 x Desc_ModularFrame_C
+        DropPodData(241532, 131343, 17157,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(-259577, 105048, -1548,  None, 0),  # Unlocks with: (No Item)
+        DropPodData(275070, -52585, 5980,   None, 0),  # Unlocks with: (No Item)
+        DropPodData(-247303, -142348, 4524,   "Rotor", 0),  # Unlocks with: 4 x Desc_Rotor_C
+        DropPodData(261797, 124616, -2597,  "AI Limiter", 73),  # Unlocks with: 3 x Desc_CircuitBoardHighSpeed_C
+        DropPodData(187056, 223656, -3215,  None, 42),  # Unlocks with: (No Item)
+        DropPodData(293299, 51,     522,    "Crystal Oscillator", 42),  # Unlocks with: 8 x Desc_CrystalOscillator_C
+        DropPodData(219146, -199880, 6503,   "Rotor", 0),  # Unlocks with: 10 x Desc_Rotor_C
+        DropPodData(176423, 243273, -9780,  "Motor", 19),  # Unlocks with: 3 x Desc_Motor_C
+        DropPodData(291821, 74782, -1574,  "Superposition Oscillator", 0),  # Unlocks with: 5 x Desc_QuantumOscillator_C
+        DropPodData(-78884, 292640, -4763,  "Modular Frame", 0),  # Unlocks with: 5 x Desc_ModularFrame_C
+        DropPodData(174948, -276436, 21151,  "Motor", 0),  # Unlocks with: 30 x Desc_Motor_C
+        DropPodData(295166, -173139, 8083,   None, 0),  # Unlocks with: (No Item)
+        DropPodData(349295, -38831, -1485,  "Motor", 0),  # Unlocks with: 10 x Desc_Motor_C
+        DropPodData(360114, -106614, 11815,  "Motor", 0),  # Unlocks with: 35 x Desc_Motor_C
+        DropPodData(303169, -246169, 5487,   None, 50),  # Unlocks with: (No Item)
+        DropPodData(236508, -312236, 9971,   "Motor", 0),  # Unlocks with: 30 x Desc_Motor_C
+        DropPodData(360285, -217558, 3900,   None, 70),  # Unlocks with: (No Item)
+        DropPodData(366637, -303548, -7288,  None, 0),  # Unlocks with: (No Item)
+    ]
diff --git a/worlds/satisfactory/ItemData.py b/worlds/satisfactory/ItemData.py
new file mode 100644
index 0000000000..a56a147323
--- /dev/null
+++ b/worlds/satisfactory/ItemData.py
@@ -0,0 +1,46 @@
+from enum import IntFlag
+from dataclasses import dataclass
+from BaseClasses import ItemClassification
+
+
+class ItemGroups(IntFlag):
+    Parts = 1 << 1
+    Equipment = 1 << 2
+    Ammo = 1 << 3
+    Recipe = 1 << 4
+    Building = 1 << 5
+    Trap = 1 << 6
+    Lights = 1 << 7
+    Foundations = 1 << 8
+    Transport = 1 << 9
+    Trains = 1 << 10
+    ConveyorMk1 = 1 << 11
+    ConveyorMk2 = 1 << 12
+    ConveyorMk3 = 1 << 13
+    ConveyorMk4 = 1 << 14
+    ConveyorMk5 = 1 << 15
+    ConveyorSupports = 1 << 16
+    PipesMk1 = 1 << 17
+    PipesMk2 = 1 << 18
+    PipelineSupports = 1 << 19
+    HyperTubes = 1 << 20
+    Signs = 1 << 21
+    Pilars = 1 << 22
+    Beams = 1 << 23
+    Walls = 1 << 24
+    Upgrades = 1 << 25
+    Vehicles = 1 << 26
+    Customizer = 1 << 27
+    ConveyorMk6 = 1 << 28
+    NeverExclude = 1 << 29
+
+
+@dataclass
+class ItemData:
+    """Represents an item in the pool, it could be a resource bundle, production recipe, trap, etc."""
+    category: ItemGroups
+    code: int
+    type: ItemClassification = ItemClassification.filler
+    count: int = 1
+    """How many of this item exists in the pool. 0 means none, but still defines the item so it can be added in the 
+    starting inventory for example"""
diff --git a/worlds/satisfactory/Items.py b/worlds/satisfactory/Items.py
new file mode 100644
index 0000000000..d92a10cd2f
--- /dev/null
+++ b/worlds/satisfactory/Items.py
@@ -0,0 +1,991 @@
+from random import Random
+from typing import ClassVar, Optional
+from collections.abc import Sequence
+from BaseClasses import Item, ItemClassification as C
+from .GameLogic import GameLogic
+from .Options import SatisfactoryOptions
+from .ItemData import ItemData, ItemGroups as G
+from .CriticalPathCalculator import CriticalPathCalculator
+
+
+class Items:
+    item_data: ClassVar[dict[str, ItemData]] = {
+        # Resource Bundles
+        "Bundle: Adaptive Control Unit": ItemData(G.Parts, 1338000, count=0),
+        "Bundle: AI Limiter": ItemData(G.Parts, 1338001),
+        "Bundle: Alclad Aluminum Sheet": ItemData(G.Parts, 1338002),
+        "Bundle: Blue Power Slug": ItemData(G.Parts, 1338003),
+        "Bundle: Yellow Power Slug": ItemData(G.Parts, 1338004),
+        "Bundle: Alien Protein": ItemData(G.Parts, 1338005),
+        "Bundle: Purple Power Slug": ItemData(G.Parts, 1338006),
+        "Bundle: Aluminum Casing": ItemData(G.Parts, 1338007),
+        "Bundle: Aluminum Ingot": ItemData(G.Parts, 1338008),
+        "Bundle: Aluminum Scrap": ItemData(G.Parts, 1338009),
+        "Bundle: Assembly Director System": ItemData(G.Parts, 1338010, count=0),
+        "Bundle: Automated Wiring": ItemData(G.Parts, 1338011, count=0),
+        "Bundle: Battery": ItemData(G.Parts, 1338012),
+        "Bundle: Bauxite": ItemData(G.Parts, 1338013),
+        "Bundle: Neural-Quantum Processor": ItemData(G.Parts, 1338014),  # 1.0
+        "Bundle: Biomass": ItemData(G.Parts, 1338015),
+        "Bundle: Black Powder": ItemData(G.Parts, 1338016),
+        "Bundle: Cable": ItemData(G.Parts, 1338017),
+        "Bundle: Caterium Ingot": ItemData(G.Parts, 1338018),
+        "Bundle: Caterium Ore": ItemData(G.Parts, 1338019),
+        "Bundle: Circuit Board": ItemData(G.Parts, 1338020),
+        "Bundle: Coal": ItemData(G.Parts, 1338021),
+        "Bundle: Singularity Cell": ItemData(G.Parts, 1338022),  # 1.0
+        "Bundle: Compacted Coal": ItemData(G.Parts, 1338023),
+        "Bundle: Computer": ItemData(G.Parts, 1338024),
+        "Bundle: Concrete": ItemData(G.Parts, 1338025),
+        "Bundle: Cooling System": ItemData(G.Parts, 1338026),
+        "Bundle: Copper Ingot": ItemData(G.Parts, 1338027),
+        "Bundle: Copper Ore": ItemData(G.Parts, 1338028),
+        "Bundle: Copper Powder": ItemData(G.Parts, 1338029),
+        "Bundle: Copper Sheet": ItemData(G.Parts, 1338030),
+        "Bundle: Adequate Pioneering Statue": ItemData(G.Parts, 1338031),
+        "Bundle: Crystal Oscillator": ItemData(G.Parts, 1338032),
+        "Bundle: Electromagnetic Control Rod": ItemData(G.Parts, 1338033),
+        "Bundle: Empty Canister": ItemData(G.Parts, 1338034),
+        "Bundle: Empty Fluid Tank": ItemData(G.Parts, 1338035),
+        "Bundle: Encased Industrial Beam": ItemData(G.Parts, 1338036),
+        "Bundle: Encased Plutonium Cell": ItemData(G.Trap, 1338037, C.trap),
+        "Bundle: Encased Uranium Cell": ItemData(G.Trap, 1338038, C.trap),
+        "Bundle: Fabric": ItemData(G.Parts, 1338039),
+        "Bundle: FICSIT Coupon": ItemData(G.Parts, 1338040, count=0),
+        "Bundle: AI Expansion Server": ItemData(G.Parts, 1338041, count=0),  # 1.0
+        "Bundle: Fused Modular Frame": ItemData(G.Parts, 1338042),
+        "Bundle: Hard Drive": ItemData(G.Parts, 1338043, count=0),
+        "Bundle: Heat Sink": ItemData(G.Parts, 1338044),
+        "Bundle: Heavy Modular Frame": ItemData(G.Parts, 1338045),
+        "Bundle: High-Speed Connector": ItemData(G.Parts, 1338046),
+        "Bundle: Satisfactory Pioneering Statue": ItemData(G.Parts, 1338047),
+        "Bundle: Pretty Good Pioneering Statue": ItemData(G.Parts, 1338048),
+        "Bundle: Iron Ingot": ItemData(G.Parts, 1338049),
+        "Bundle: Iron Ore": ItemData(G.Parts, 1338050),
+        "Bundle: Iron Plate": ItemData(G.Parts, 1338051),
+        "Bundle: Iron Rod": ItemData(G.Parts, 1338052),
+        "Bundle: Golden Nut Statue": ItemData(G.Parts, 1338053),
+        "Bundle: Leaves": ItemData(G.Parts, 1338054),
+        "Bundle: Limestone": ItemData(G.Parts, 1338055),
+        "Bundle: Magnetic Field Generator": ItemData(G.Parts, 1338056, count=0),
+        "Bundle: Mercer Sphere": ItemData(G.Parts, 1338057, count=0),
+        "Bundle: Modular Engine": ItemData(G.Parts, 1338058, count=0),
+        "Bundle: Modular Frame": ItemData(G.Parts, 1338059),
+        "Bundle: Motor": ItemData(G.Parts, 1338060),
+        "Bundle: Mycelia": ItemData(G.Parts, 1338061),
+        "Bundle: Non-fissile Uranium": ItemData(G.Trap, 1338062, C.trap),
+        "Bundle: Nuclear Pasta": ItemData(G.Parts, 1338063, count=0),
+        "Bundle: Lizard Doggo Statue": ItemData(G.Parts, 1338064),
+        "Bundle: Organic Data Capsule": ItemData(G.Parts, 1338065),
+        "Bundle: Packaged Alumina Solution": ItemData(G.Parts, 1338066),
+        "Bundle: Packaged Fuel": ItemData(G.Parts, 1338067),
+        "Bundle: Packaged Heavy Oil Residue": ItemData(G.Parts, 1338068),
+        "Bundle: Packaged Liquid Biofuel": ItemData(G.Parts, 1338069),
+        "Bundle: Packaged Nitric Acid": ItemData(G.Parts, 1338070),
+        "Bundle: Packaged Nitrogen Gas": ItemData(G.Parts, 1338071),
+        "Bundle: Packaged Oil": ItemData(G.Parts, 1338072),
+        "Bundle: Packaged Sulfuric Acid": ItemData(G.Parts, 1338073),
+        "Bundle: Packaged Turbofuel": ItemData(G.Parts, 1338074),
+        "Bundle: Packaged Water": ItemData(G.Parts, 1338075),
+        "Bundle: Petroleum Coke": ItemData(G.Parts, 1338076),
+        "Bundle: Plastic": ItemData(G.Parts, 1338077),
+        "Bundle: Plutonium Fuel Rod": ItemData(G.Trap, 1338078, C.trap),
+        "Bundle: Plutonium Pellet": ItemData(G.Trap, 1338079, C.trap),
+        "Bundle: Plutonium Waste": ItemData(G.Trap, 1338080, C.trap),
+        "Bundle: Polymer Resin": ItemData(G.Parts, 1338081),
+        "Bundle: Power Shard": ItemData(G.Parts, 1338082, count=0),
+        "Bundle: Confusing Creature Statue": ItemData(G.Parts, 1338083),
+        "Bundle: Pressure Conversion Cube": ItemData(G.Parts, 1338084),
+        "Bundle: Alien Power Matrix": ItemData(G.Parts, 1338085),  # 1.0
+        "Bundle: Quartz Crystal": ItemData(G.Parts, 1338086),
+        "Bundle: Quickwire": ItemData(G.Parts, 1338087),
+        "Bundle: Radio Control Unit": ItemData(G.Parts, 1338088),
+        "Bundle: Raw Quartz": ItemData(G.Parts, 1338089),
+        "Bundle: Reinforced Iron Plate": ItemData(G.Parts, 1338090),
+        "Bundle: Rotor": ItemData(G.Parts, 1338091),
+        "Bundle: Rubber": ItemData(G.Parts, 1338092),
+        "Bundle: SAM": ItemData(G.Parts, 1338093),  # 1.0
+        "Bundle: Screw": ItemData(G.Parts, 1338094),
+        "Bundle: Silica": ItemData(G.Parts, 1338095),
+        "Bundle: Smart Plating": ItemData(G.Parts, 1338096, count=0),
+        "Bundle: Smokeless Powder": ItemData(G.Parts, 1338097),
+        "Bundle: Solid Biofuel": ItemData(G.Parts, 1338098, C.useful),
+        "Bundle: Somersloop": ItemData(G.Parts, 1338099, count=0),
+        "Bundle: Stator": ItemData(G.Parts, 1338100),
+        "Bundle: Silver Hog Statue": ItemData(G.Parts, 1338101),
+        "Bundle: Steel Beam": ItemData(G.Parts, 1338102),
+        "Bundle: Steel Ingot": ItemData(G.Parts, 1338103),
+        "Bundle: Steel Pipe": ItemData(G.Parts, 1338104),
+        "Bundle: Sulfur": ItemData(G.Parts, 1338105),
+        "Bundle: Supercomputer": ItemData(G.Parts, 1338106),
+        "Bundle: Superposition Oscillator": ItemData(G.Parts, 1338107),
+        "Bundle: Thermal Propulsion Rocket": ItemData(G.Parts, 1338108, count=0),
+        "Bundle: Turbo Motor": ItemData(G.Parts, 1338109),
+        "Bundle: Hog Remains": ItemData(G.Parts, 1338110),
+        "Bundle: Uranium": ItemData(G.Trap, 1338111, C.trap),
+        "Bundle: Uranium Fuel Rod": ItemData(G.Trap, 1338112, C.trap),
+        "Bundle: Uranium Waste": ItemData(G.Trap, 1338113, C.trap),
+        "Bundle: Versatile Framework": ItemData(G.Parts, 1338114, count=0),
+        "Bundle: Wire": ItemData(G.Parts, 1338115),
+        "Bundle: Wood": ItemData(G.Parts, 1338116),
+        "Bundle: Plasma Spitter Remains": ItemData(G.Parts, 1338117),
+        "Bundle: Stinger Remains": ItemData(G.Parts, 1338118),
+        "Bundle: Hatcher Remains": ItemData(G.Parts, 1338119),
+        "Bundle: Alien DNA Capsule": ItemData(G.Parts, 1338120),
+        "Bundle: Diamonds": ItemData(G.Parts, 1338121),
+        "Bundle: Time Crystal": ItemData(G.Parts, 1338122),
+        "Bundle: Ficsite Ingot": ItemData(G.Parts, 1338123),
+        "Bundle: Ficsite Trigon": ItemData(G.Parts, 1338124),
+        "Bundle: Reanimated SAM": ItemData(G.Parts, 1338125),
+        "Bundle: SAM Fluctuator": ItemData(G.Parts, 1338126),
+        "Bundle: Biochemical Sculptor": ItemData(G.Parts, 1338127, count=0),
+        "Bundle: Ballistic Warp Drive": ItemData(G.Parts, 1338128, count=0),
+        "Bundle: Ficsonium": ItemData(G.Trap, 1338129, C.trap),
+        "Bundle: Ficsonium Fuel Rod": ItemData(G.Trap, 1338130, C.trap),
+        "Bundle: Packaged Rocket Fuel": ItemData(G.Parts, 1338131),
+        "Bundle: Packaged Ionized Fuel": ItemData(G.Parts, 1338132),
+        "Bundle: Dark Matter Crystal": ItemData(G.Parts, 1338133),
+        # 1338134 - 1338149 Reserved for future parts
+        # 1338150 - 1338199 Equipment / Ammo
+        "Bundle: Bacon Agaric": ItemData(G.Ammo, 1338150, count=0),
+        "Bundle: Beryl Nut": ItemData(G.Ammo, 1338151, count=0),
+        "Bundle: Blade Runners": ItemData(G.Equipment, 1338152, count=0),
+        "Bundle: Boom Box": ItemData(G.Equipment, 1338153, count=0),
+        "Bundle: Chainsaw": ItemData(G.Equipment, 1338154, count=0),
+        "Bundle: Cluster Nobelisk": ItemData(G.Ammo, 1338155),
+        "Bundle: Iodine-Infused Filter": ItemData(G.Equipment, 1338156, count=3),  # 1.1
+        "Bundle: Cup": ItemData(G.Equipment, 1338157, count=0),
+        "Bundle: Cup (gold)": ItemData(G.Equipment, 1338158, count=0),
+        "Bundle: Explosive Rebar": ItemData(G.Ammo, 1338159),
+        "Bundle: Factory Cart": ItemData(G.Equipment, 1338160, count=0),
+        "Bundle: Factory Cart (golden)": ItemData(G.Equipment, 1338161, count=0),
+        "Bundle: Gas Mask": ItemData(G.Equipment, 1338162, count=0),
+        "Bundle: Gas Nobelisk": ItemData(G.Ammo, 1338163),
+        "Bundle: Hazmat Suit": ItemData(G.Equipment, 1338164, count=0),
+        "Bundle: Homing Rifle Ammo": ItemData(G.Ammo, 1338165),
+        "Bundle: Hoverpack": ItemData(G.Equipment, 1338166, count=0),
+        "Bundle: Iron Rebar": ItemData(G.Ammo, 1338167),
+        "Bundle: Jetpack": ItemData(G.Equipment, 1338168, count=0),
+        "Bundle: Medicinal Inhaler": ItemData(G.Ammo, 1338169),
+        "Bundle: Nobelisk": ItemData(G.Ammo, 1338170),
+        "Bundle: Nobelisk Detonator": ItemData(G.Equipment, 1338171, count=0),
+        "Bundle: Nuke Nobelisk": ItemData(G.Ammo, 1338172),
+        "Bundle: Object Scanner": ItemData(G.Equipment, 1338173, count=0),
+        "Bundle: Paleberry": ItemData(G.Ammo, 1338174, count=0),
+        "Bundle: Parachute": ItemData(G.Equipment, 1338175, count=0),
+        "Bundle: Pulse Nobelisk": ItemData(G.Ammo, 1338176),
+        "Bundle: Rebar Gun": ItemData(G.Equipment, 1338177, count=0),
+        "Bundle: Rifle": ItemData(G.Equipment, 1338178, count=0),
+        "Bundle: Rifle Ammo": ItemData(G.Ammo, 1338179),
+        "Bundle: Shatter Rebar": ItemData(G.Ammo, 1338180),
+        "Bundle: Stun Rebar": ItemData(G.Ammo, 1338181),
+        "Bundle: Turbo Rifle Ammo": ItemData(G.Ammo, 1338182),
+        "Bundle: Xeno-Basher": ItemData(G.Equipment, 1338183, count=0),
+        "Bundle: Xeno-Zapper": ItemData(G.Equipment, 1338184, count=0),
+        "Bundle: Zipline": ItemData(G.Equipment, 1338185, count=0),
+        "Bundle: Portable Miner": ItemData(G.Equipment, 1338186, count=0),
+        "Bundle: Gas Filter": ItemData(G.Equipment, 1338187, count=3),
+        # Special cases
+        "Small Inflated Pocket Dimension": ItemData(G.Upgrades, 1338188, C.useful, 11),
+        "Inflated Pocket Dimension": ItemData(G.Upgrades, 1338189, C.useful, 5),
+        "Expanded Toolbelt": ItemData(G.Upgrades, 1338190, C.useful, 5),
+        "Dimensional Depot upload from inventory": ItemData(G.Upgrades, 1338191, C.useful),
+# added in 1.1
+        "Bundle of Three: Power Shards": ItemData(G.Parts, 1338192),
+        "Bundle of Three: Mercer Spheres": ItemData(G.Parts, 1338193),
+        "Bundle of Four: Somersloops": ItemData(G.Parts, 1338194),
+        "Bundle of Three: Hard Drives": ItemData(G.Parts, 1338195),
+#
+        # 1338196 - 1338199 Reserved for future equipment/ammo
+
+        # 1338200+ Recipes / buildings / schematics
+        "Recipe: Reinforced Iron Plate": ItemData(G.Recipe, 1338200, C.progression),
+        "Recipe: Adhered Iron Plate": ItemData(G.Recipe, 1338201, C.progression),
+        "Recipe: Bolted Iron Plate": ItemData(G.Recipe, 1338202, C.progression),
+        "Recipe: Stitched Iron Plate": ItemData(G.Recipe, 1338203, C.progression),
+        "Recipe: Rotor": ItemData(G.Recipe, 1338204, C.progression),
+        "Recipe: Copper Rotor": ItemData(G.Recipe, 1338205, C.progression),
+        "Recipe: Steel Rotor": ItemData(G.Recipe, 1338206, C.progression),
+        "Recipe: Stator": ItemData(G.Recipe, 1338207, C.progression),
+        "Recipe: Quickwire Stator": ItemData(G.Recipe, 1338208, C.progression),
+        "Recipe: Plastic": ItemData(G.Recipe, 1338209, C.progression),
+        "Recipe: Residual Plastic": ItemData(G.Recipe, 1338210, C.progression),
+        "Recipe: Recycled Plastic": ItemData(G.Recipe, 1338211, C.progression),
+        "Recipe: Rubber": ItemData(G.Recipe, 1338212, C.progression),
+        "Recipe: Residual Rubber": ItemData(G.Recipe, 1338213, C.progression),
+        "Recipe: Recycled Rubber": ItemData(G.Recipe, 1338214, C.progression),
+        "Recipe: Iron Plate": ItemData(G.Recipe, 1338215, C.progression),
+        "Recipe: Coated Iron Plate": ItemData(G.Recipe, 1338216, C.progression),
+        "Recipe: Steel Cast Plate": ItemData(G.Recipe, 1338217, C.progression),  # 1.0
+        "Recipe: Iron Rod": ItemData(G.Recipe, 1338218, C.progression),
+        "Recipe: Steel Rod": ItemData(G.Recipe, 1338219, C.progression),
+        "Recipe: Screw": ItemData(G.Recipe, 1338220, C.progression),
+        "Recipe: Cast Screw": ItemData(G.Recipe, 1338221, C.progression),
+        "Recipe: Steel Screw": ItemData(G.Recipe, 1338222, C.progression),
+        "Recipe: Wire": ItemData(G.Recipe, 1338223, C.progression),
+        "Recipe: Fused Wire": ItemData(G.Recipe, 1338224, C.progression),
+        "Recipe: Iron Wire": ItemData(G.Recipe, 1338225, C.progression),
+        "Recipe: Caterium Wire": ItemData(G.Recipe, 1338226, C.progression),
+        "Recipe: Cable": ItemData(G.Recipe, 1338227, C.progression),
+        "Recipe: Coated Cable": ItemData(G.Recipe, 1338228, C.progression),
+        "Recipe: Insulated Cable": ItemData(G.Recipe, 1338229, C.progression),
+        "Recipe: Quickwire Cable": ItemData(G.Recipe, 1338230, C.progression),
+        "Recipe: Quickwire": ItemData(G.Recipe, 1338231, C.progression),
+        "Recipe: Fused Quickwire": ItemData(G.Recipe, 1338232, C.progression),
+        "Recipe: Copper Sheet": ItemData(G.Recipe, 1338233, C.progression),
+        "Recipe: Steamed Copper Sheet": ItemData(G.Recipe, 1338234, C.progression),
+        "Recipe: Steel Pipe": ItemData(G.Recipe, 1338235, C.progression),
+        "Recipe: Steel Beam": ItemData(G.Recipe, 1338236, C.progression),
+        "Recipe: Neural-Quantum Processor": ItemData(G.Recipe, 1338237, C.progression),  # 1.0
+        "Recipe: Heavy Oil Residue": ItemData(G.Recipe, 1338238, C.progression),
+        "Recipe: Polymer Resin": ItemData(G.Recipe, 1338239, C.progression),
+        "Recipe: Fuel": ItemData(G.Recipe, 1338240, C.progression),
+        "Recipe: Residual Fuel": ItemData(G.Recipe, 1338241, C.progression),
+        "Recipe: Diluted Packaged Fuel": ItemData(G.Recipe, 1338242, C.progression),
+        "Recipe: AI Expansion Server": ItemData(G.Recipe, 1338243, C.progression),  # 1.0
+        "Recipe: Concrete": ItemData(G.Recipe, 1338244, C.progression),
+        "Recipe: Rubber Concrete": ItemData(G.Recipe, 1338245, C.progression),
+        "Recipe: Wet Concrete": ItemData(G.Recipe, 1338246, C.progression),
+        "Recipe: Fine Concrete": ItemData(G.Recipe, 1338247, C.progression),
+        "Recipe: Silica": ItemData(G.Recipe, 1338248, C.progression),
+        "Recipe: Cheap Silica": ItemData(G.Recipe, 1338249, C.progression),
+        "Recipe: Quartz Crystal": ItemData(G.Recipe, 1338250, C.progression),
+        "Recipe: Pure Quartz Crystal": ItemData(G.Recipe, 1338251, C.progression),
+        "Recipe: Iron Ingot": ItemData(G.Recipe, 1338252, C.progression),
+        "Recipe: Pure Iron Ingot": ItemData(G.Recipe, 1338253, C.progression),
+        "Recipe: Iron Alloy Ingot": ItemData(G.Recipe, 1338254, C.progression),
+        "Recipe: Steel Ingot": ItemData(G.Recipe, 1338255, C.progression),
+        "Recipe: Coke Steel Ingot": ItemData(G.Recipe, 1338256, C.progression),
+        "Recipe: Compacted Steel Ingot": ItemData(G.Recipe, 1338257, C.progression),
+        "Recipe: Solid Steel Ingot": ItemData(G.Recipe, 1338258, C.progression),
+        "Recipe: Copper Ingot": ItemData(G.Recipe, 1338259, C.progression),
+        "Recipe: Copper Alloy Ingot": ItemData(G.Recipe, 1338260, C.progression),
+        "Recipe: Pure Copper Ingot": ItemData(G.Recipe, 1338261, C.progression),
+        "Recipe: Caterium Ingot": ItemData(G.Recipe, 1338262, C.progression),
+        "Recipe: Pure Caterium Ingot": ItemData(G.Recipe, 1338263, C.progression),
+        "Recipe: Alien Power Matrix": ItemData(G.Recipe, 1338264),  # 1.0
+        "Recipe: Ficsite Ingot (Aluminum)": ItemData(G.Recipe, 1338265, C.progression),  # 1.0
+        "Recipe: Ficsite Ingot (Caterium)": ItemData(G.Recipe, 1338266, C.progression),  # 1.0
+        "Recipe: Ficsite Ingot (Iron)": ItemData(G.Recipe, 1338267, C.progression),  # 1.0
+        "Recipe: Ficsite Trigon": ItemData(G.Recipe, 1338268, C.progression),  # 1.0
+        "Recipe: Reanimated SAM": ItemData(G.Recipe, 1338269, C.progression),  # 1.0
+        "Recipe: SAM Fluctuator": ItemData(G.Recipe, 1338270, C.progression),  # 1.0
+        "Recipe: Petroleum Coke": ItemData(G.Recipe, 1338271, C.progression),
+        "Recipe: Compacted Coal": ItemData(G.Recipe, 1338272, C.progression),
+        "Recipe: Motor": ItemData(G.Recipe, 1338273, C.progression),
+        "Recipe: Rigor Motor": ItemData(G.Recipe, 1338274, C.progression),
+        "Recipe: Electric Motor": ItemData(G.Recipe, 1338275, C.progression),
+        "Recipe: Modular Frame": ItemData(G.Recipe, 1338276, C.progression),
+        "Recipe: Bolted Frame": ItemData(G.Recipe, 1338277, C.progression),
+        "Recipe: Steeled Frame": ItemData(G.Recipe, 1338278, C.progression),
+        "Recipe: Heavy Modular Frame": ItemData(G.Recipe, 1338279, C.progression),
+        "Recipe: Heavy Flexible Frame": ItemData(G.Recipe, 1338280, C.progression),
+        "Recipe: Heavy Encased Frame": ItemData(G.Recipe, 1338281, C.progression),
+        "Recipe: Encased Industrial Beam": ItemData(G.Recipe, 1338282, C.progression),
+        "Recipe: Encased Industrial Pipe": ItemData(G.Recipe, 1338283, C.progression),
+        "Recipe: Computer": ItemData(G.Recipe, 1338284, C.progression),
+        "Recipe: Crystal Computer": ItemData(G.Recipe, 1338285, C.progression),
+        "Recipe: Caterium Computer": ItemData(G.Recipe, 1338286, C.progression),
+        "Recipe: Circuit Board": ItemData(G.Recipe, 1338287, C.progression),
+        "Recipe: Electrode Circuit Board": ItemData(G.Recipe, 1338288, C.progression),
+        "Recipe: Silicon Circuit Board": ItemData(G.Recipe, 1338289, C.progression),
+        "Recipe: Caterium Circuit Board": ItemData(G.Recipe, 1338290, C.progression),
+        "Recipe: Crystal Oscillator": ItemData(G.Recipe, 1338291, C.progression),
+        "Recipe: Insulated Crystal Oscillator": ItemData(G.Recipe, 1338292, C.progression),
+        "Recipe: AI Limiter": ItemData(G.Recipe, 1338293, C.progression),
+        "Recipe: Electromagnetic Control Rod": ItemData(G.Recipe, 1338294, C.progression),
+        "Recipe: Electromagnetic Connection Rod": ItemData(G.Recipe, 1338295, C.progression),
+        "Recipe: High-Speed Connector": ItemData(G.Recipe, 1338296, C.progression),
+        "Recipe: Silicon High-Speed Connector": ItemData(G.Recipe, 1338297, C.progression),
+        "Recipe: Smart Plating": ItemData(G.Recipe, 1338298, C.progression),
+        "Recipe: Plastic Smart Plating": ItemData(G.Recipe, 1338299, C.progression),
+        "Recipe: Versatile Framework": ItemData(G.Recipe, 1338300, C.progression),
+        "Recipe: Flexible Framework": ItemData(G.Recipe, 1338301, C.progression),
+        "Recipe: Automated Wiring": ItemData(G.Recipe, 1338302, C.progression),
+        "Recipe: Automated Speed Wiring": ItemData(G.Recipe, 1338303, C.progression),
+        "Recipe: Modular Engine": ItemData(G.Recipe, 1338304, C.progression),
+        "Recipe: Adaptive Control Unit": ItemData(G.Recipe, 1338305, C.progression),
+        "Recipe: Diluted Fuel": ItemData(G.Recipe, 1338306, C.progression),
+        "Recipe: Alumina Solution": ItemData(G.Recipe, 1338307, C.progression),
+        "Recipe: Automated Miner": ItemData(G.Recipe, 1338308, C.progression),
+        "Recipe: Singularity Cell": ItemData(G.Recipe, 1338309, C.progression),  # 1.0
+        "Recipe: Aluminum Scrap": ItemData(G.Recipe, 1338310, C.progression),
+        "Recipe: Electrode Aluminum Scrap": ItemData(G.Recipe, 1338311, C.progression),
+        "Recipe: Instant Scrap": ItemData(G.Recipe, 1338312, C.progression),
+        "Recipe: Aluminum Ingot": ItemData(G.Recipe, 1338313, C.progression),
+        "Recipe: Pure Aluminum Ingot": ItemData(G.Recipe, 1338314, C.progression),
+        "Recipe: Alclad Aluminum Sheet": ItemData(G.Recipe, 1338315, C.progression),
+        "Recipe: Aluminum Casing": ItemData(G.Recipe, 1338316, C.progression),
+        "Recipe: Alclad Casing": ItemData(G.Recipe, 1338317, C.progression),
+        "Recipe: Heat Sink": ItemData(G.Recipe, 1338318, C.progression),
+        "Recipe: Heat Exchanger": ItemData(G.Recipe, 1338319, C.progression),
+        "Recipe: Synthetic Power Shard": ItemData(G.Recipe, 1338320, C.progression),
+        "Recipe: Nitric Acid": ItemData(G.Recipe, 1338321, C.progression),
+        "Recipe: Fused Modular Frame": ItemData(G.Recipe, 1338322, C.progression),
+        "Recipe: Heat-Fused Frame": ItemData(G.Recipe, 1338323, C.progression),
+        "Recipe: Radio Control Unit": ItemData(G.Recipe, 1338324, C.progression),
+        "Recipe: Radio Connection Unit": ItemData(G.Recipe, 1338325, C.progression),
+        "Recipe: Radio Control System": ItemData(G.Recipe, 1338326, C.progression),
+        "Recipe: Pressure Conversion Cube": ItemData(G.Recipe, 1338327, C.progression),
+        "Recipe: Cooling System": ItemData(G.Recipe, 1338328, C.progression),
+        "Recipe: Cooling Device": ItemData(G.Recipe, 1338329, C.progression),
+        "Recipe: Turbo Motor": ItemData(G.Recipe, 1338330, C.progression),
+        "Recipe: Turbo Electric Motor": ItemData(G.Recipe, 1338331, C.progression),
+        "Recipe: Turbo Pressure Motor": ItemData(G.Recipe, 1338332, C.progression),
+        "Recipe: Battery": ItemData(G.Recipe, 1338333, C.progression),
+        "Recipe: Classic Battery": ItemData(G.Recipe, 1338334, C.progression),
+        "Recipe: Supercomputer": ItemData(G.Recipe, 1338335, C.progression),
+        "Recipe: OC Supercomputer": ItemData(G.Recipe, 1338336, C.progression),
+        "Recipe: Super-State Computer": ItemData(G.Recipe, 1338337, C.progression),
+        "Recipe: Biochemical Sculptor": ItemData(G.Recipe, 1338338, C.progression),  # 1.0
+        "Recipe: Sulfuric Acid": ItemData(G.Recipe, 1338339, C.progression),
+        "Recipe: Ballistic Warp Drive": ItemData(G.Recipe, 1338340, C.progression),  # 1.0
+        "Recipe: Encased Uranium Cell": ItemData(G.Recipe, 1338341, C.progression),
+        "Recipe: Infused Uranium Cell": ItemData(G.Recipe, 1338342, C.progression),
+        "Recipe: Uranium Fuel Rod": ItemData(G.Recipe, 1338343, C.progression),
+        "Recipe: Uranium Fuel Unit": ItemData(G.Recipe, 1338344, C.progression),
+        "Recipe: Aluminum Beam": ItemData(G.Recipe, 1338345, C.progression),  # 1.0
+        "Recipe: Aluminum Rod": ItemData(G.Recipe, 1338346, C.progression),  # 1.0
+        "Recipe: Basic Iron Ingot": ItemData(G.Recipe, 1338347, C.progression),  # 1.0
+        "Recipe: Non-fissile Uranium": ItemData(G.Recipe, 1338348, C.progression),
+        "Recipe: Fertile Uranium": ItemData(G.Recipe, 1338349, C.progression),
+        "Recipe: Plutonium Pellet": ItemData(G.Recipe, 1338350),
+        "Recipe: Encased Plutonium Cell": ItemData(G.Recipe, 1338351),
+        "Recipe: Instant Plutonium Cell": ItemData(G.Recipe, 1338352),
+        "Recipe: Plutonium Fuel Rod": ItemData(G.Recipe, 1338353),
+        "Recipe: Plutonium Fuel Unit": ItemData(G.Recipe, 1338354),
+        "Recipe: Gas Filter": ItemData(G.Recipe, 1338355, C.progression),
+        "Recipe: Iodine-Infused Filter": ItemData(G.Recipe, 1338356, C.progression),
+        "Recipe: Assembly Director System": ItemData(G.Recipe, 1338357, C.progression),
+        "Recipe: Magnetic Field Generator": ItemData(G.Recipe, 1338358, C.progression),
+        "Recipe: Copper Powder": ItemData(G.Recipe, 1338359, C.progression),
+        "Recipe: Nuclear Pasta": ItemData(G.Recipe, 1338360, C.progression),
+        "Recipe: Thermal Propulsion Rocket": ItemData(G.Recipe, 1338361, C.progression),
+        "Recipe: Ficsonium": ItemData(G.Recipe, 1338362),  # 1.0
+        "Recipe: Ficsonium Fuel Rod": ItemData(G.Recipe, 1338363),  # 1.0
+        "Recipe: Dark Matter Crystal": ItemData(G.Recipe, 1338364, C.progression),  # 1.0
+        "Recipe: Dark Matter Crystallization": ItemData(G.Recipe, 1338365, C.progression),  # 1.0
+        "Recipe: Dark Matter Trap": ItemData(G.Recipe, 1338366, C.progression),  # 1.0
+        "Recipe: Pulse Nobelisk":  ItemData(G.Recipe, 1338367, C.useful),
+        "Recipe: Hatcher Protein": ItemData(G.Recipe, 1338368, C.progression),
+        "Recipe: Hog Protein": ItemData(G.Recipe, 1338369, C.progression),
+        "Recipe: Spitter Protein": ItemData(G.Recipe, 1338370, C.progression),
+        "Recipe: Stinger Protein": ItemData(G.Recipe, 1338371, C.progression),
+        "Recipe: Biomass (Leaves)": ItemData(G.Recipe, 1338372, C.progression),
+        "Recipe: Biomass (Wood)": ItemData(G.Recipe, 1338373, C.progression),
+        "Recipe: Biomass (Mycelia)": ItemData(G.Recipe, 1338374, C.progression),
+        "Recipe: Biomass (Alien Protein)": ItemData(G.Recipe, 1338375, C.progression),
+        "Recipe: Turbo Rifle Ammo (Packaged)": ItemData(G.Recipe, 1338376, C.useful),
+        "Recipe: Fabric": ItemData(G.Recipe, 1338377, C.progression),
+        "Recipe: Polyester Fabric": ItemData(G.Recipe, 1338378, C.progression),
+        "Recipe: Solid Biofuel": ItemData(G.Recipe, 1338379, C.progression),
+        "Recipe: Liquid Biofuel": ItemData(G.Recipe, 1338380, C.progression),
+        "Recipe: Empty Canister": ItemData(G.Recipe, 1338381, C.progression),
+        "Recipe: Coated Iron Canister": ItemData(G.Recipe, 1338382, C.progression),
+        "Recipe: Steel Canister": ItemData(G.Recipe, 1338383, C.progression),
+        "Recipe: Empty Fluid Tank": ItemData(G.Recipe, 1338384, C.progression),
+        "Recipe: Packaged Alumina Solution": ItemData(G.Recipe, 1338385, C.progression),
+        "Recipe: Packaged Fuel": ItemData(G.Recipe, 1338386, C.progression),
+        # "Recipe: Diluted Packaged Fuel": ItemData(G.Recipe, 1338387, C.progression),  # Duplicated
+        "Recipe: Packaged Heavy Oil Residue": ItemData(G.Recipe, 1338388, C.progression),
+        "Recipe: Packaged Liquid Biofuel": ItemData(G.Recipe, 1338389, C.progression),
+        "Recipe: Packaged Nitric Acid": ItemData(G.Recipe, 1338390, C.progression),
+        "Recipe: Packaged Nitrogen Gas": ItemData(G.Recipe, 1338391, C.progression),
+        "Recipe: Packaged Oil": ItemData(G.Recipe, 1338392, C.progression),
+        "Recipe: Packaged Sulfuric Acid": ItemData(G.Recipe, 1338393, C.progression),
+        "Recipe: Packaged Turbofuel": ItemData(G.Recipe, 1338394, C.progression),
+        "Recipe: Packaged Water": ItemData(G.Recipe, 1338395, C.progression),
+        "Recipe: Turbofuel": ItemData(G.Recipe, 1338396, C.progression),
+        "Recipe: Turbo Heavy Fuel": ItemData(G.Recipe, 1338397, C.progression),
+        "Recipe: Turbo Blend Fuel": ItemData(G.Recipe, 1338398, C.progression),
+        "Recipe: Hazmat Suit": ItemData(G.Recipe, 1338399, C.progression),
+        "Recipe: Gas Mask": ItemData(G.Recipe, 1338400, C.progression),
+        "Recipe: Black Powder": ItemData(G.Recipe, 1338401, C.progression),
+        "Recipe: Blade Runners": ItemData(G.Recipe, 1338402, C.useful),
+        "Recipe: Chainsaw": ItemData(G.Recipe, 1338403, C.useful),
+        "Recipe: Cluster Nobelisk":  ItemData(G.Recipe, 1338404, C.useful),
+        "Recipe: Explosive Rebar":  ItemData(G.Recipe, 1338405, C.useful),
+        "Recipe: Factory Cart": ItemData(G.Recipe, 1338406, C.useful),
+        "Recipe: Gas Nobelisk":  ItemData(G.Recipe, 1338407, C.useful),
+        "Recipe: Golden Factory Cart":  ItemData(G.Recipe, 1338408),
+        "Recipe: Homing Rifle Ammo": ItemData(G.Recipe, 1338409, C.useful),
+        "Recipe: Iron Rebar":  ItemData(G.Recipe, 1338410, C.progression),
+        "Recipe: Nobelisk":  ItemData(G.Recipe, 1338411, C.progression),
+        "Recipe: Nuke Nobelisk": ItemData(G.Recipe, 1338412, C.useful),
+        "Recipe: Nutritional Inhaler":  ItemData(G.Recipe, 1338413, C.useful),
+        "Recipe: Object Scanner":  ItemData(G.Recipe, 1338414, C.progression),
+        "Recipe: Parachute":  ItemData(G.Recipe, 1338415, C.useful),
+        "Recipe: Protein Inhaler": ItemData(G.Recipe, 1338416, C.useful),
+        "Recipe: Rebar Gun":  ItemData(G.Recipe, 1338417, C.useful),
+        "Recipe: Rifle": ItemData(G.Recipe, 1338418, C.useful),
+        "Recipe: Rifle Ammo":  ItemData(G.Recipe, 1338419, C.progression),
+        "Recipe: Shatter Rebar":  ItemData(G.Recipe, 1338420, C.useful),
+        "Recipe: Stun Rebar":  ItemData(G.Recipe, 1338421, C.useful),
+        "Recipe: Therapeutic Inhaler": ItemData(G.Recipe, 1338422, C.useful),
+        "Recipe: Turbo Rifle Ammo":  ItemData(G.Recipe, 1338423, C.useful),
+        "Recipe: Vitamin Inhaler":  ItemData(G.Recipe, 1338424, C.useful),
+        "Recipe: Xeno-Basher": ItemData(G.Recipe, 1338425, C.useful),
+        "Recipe: Xeno-Zapper":  ItemData(G.Recipe, 1338426, C.useful),
+        "Recipe: Zipline":  ItemData(G.Recipe, 1338427, C.useful),
+        "Recipe: Fine Black Powder": ItemData(G.Recipe, 1338428, C.progression),
+        "Recipe: Smokeless Powder": ItemData(G.Recipe, 1338429, C.progression),
+        "Recipe: Alien DNA Capsule": ItemData(G.Recipe, 1338430, C.progression),
+        "Recipe: Power Shard (1)": ItemData(G.Recipe, 1338431, C.progression),
+        "Recipe: Power Shard (2)": ItemData(G.Recipe, 1338432, C.useful),
+        "Recipe: Power Shard (5)": ItemData(G.Recipe, 1338433, C.useful),
+
+# 1.0
+        "Recipe: Diamonds": ItemData(G.Recipe, 1338434, C.progression),
+        "Recipe: Cloudy Diamonds": ItemData(G.Recipe, 1338435, C.progression),
+        "Recipe: Oil-Based Diamonds": ItemData(G.Recipe, 1338436, C.progression),
+        "Recipe: Petroleum Diamonds": ItemData(G.Recipe, 1338437, C.progression),
+        "Recipe: Pink Diamonds": ItemData(G.Recipe, 1338438, C.progression),
+        "Recipe: Turbo Diamonds": ItemData(G.Recipe, 1338439, C.progression),
+        "Recipe: Time Crystal": ItemData(G.Recipe, 1338440, C.progression),
+        "Recipe: Superposition Oscillator": ItemData(G.Recipe, 1338441, C.progression),
+        # "Recipe: Excited Photonic Matter": ItemData(G.Recipe, 1338442, C.progression), unlocked with converter
+        "Recipe: Rocket Fuel": ItemData(G.Recipe, 1338443, C.progression),
+        "Recipe: Nitro Rocket Fuel": ItemData(G.Recipe, 1338444, C.progression),
+        "Recipe: Ionized Fuel": ItemData(G.Recipe, 1338445, C.useful),
+        "Recipe: Packaged Rocket Fuel": ItemData(G.Recipe, 1338446, C.progression),
+        "Recipe: Packaged Ionized Fuel": ItemData(G.Recipe, 1338447, C.useful),
+        "Recipe: Dark-Ion Fuel": ItemData(G.Recipe, 1338448, C.useful),
+        "Recipe: Quartz Purification": ItemData(G.Recipe, 1338449, C.progression),
+        "Recipe: Fused Quartz Crystal": ItemData(G.Recipe, 1338450, C.progression),
+        "Recipe: Leached Caterium Ingot": ItemData(G.Recipe, 1338451, C.progression),
+        "Recipe: Leached Copper Ingot": ItemData(G.Recipe, 1338452, C.progression),
+        "Recipe: Leached Iron ingot": ItemData(G.Recipe, 1338453, C.progression),
+        "Recipe: Molded Beam": ItemData(G.Recipe, 1338454, C.progression),
+        "Recipe: Molded Steel Pipe": ItemData(G.Recipe, 1338455, C.progression),
+        "Recipe: Plastic AI Limiter": ItemData(G.Recipe, 1338456, C.progression),
+        "Recipe: Tempered Caterium Ingot": ItemData(G.Recipe, 1338457, C.progression),
+        "Recipe: Tempered Copper Ingot": ItemData(G.Recipe, 1338458, C.progression),
+# 1.0
+
+# added in 1.1 or missed
+        "Recipe: Iron Pipe": ItemData(G.Recipe, 1338459, C.progression),
+        "Recipe: Biocoal": ItemData(G.Recipe, 1338460, C.useful),
+        "Recipe: Charcoal": ItemData(G.Recipe, 1338461, C.useful),
+        "Recipe: Sloppy Alumina": ItemData(G.Recipe, 1338462, C.progression),
+        "Recipe: Hoverpack": ItemData(G.Recipe, 1338463, C.useful),
+        "Recipe: Jetpack": ItemData(G.Recipe | G.NeverExclude, 1338464, C.useful),
+        "Recipe: Nobelisk Detonator": ItemData(G.Recipe, 1338465, C.progression),
+        "Recipe: Portable Miner": ItemData(G.Recipe, 1338466, C.progression),
+# 
+        "Recipe: Dark Matter Residue": ItemData(G.Recipe, 1338467, C.progression),
+
+        # 1338468 - 1338599 Reserved for future recipes
+        # 1338400 - 1338899 buildings / others
+        "Building: Constructor": ItemData(G.Building, 1338600, C.progression),  # unlocked by default
+        "Building: Assembler": ItemData(G.Building, 1338601, C.progression),
+        "Building: Manufacturer": ItemData(G.Building, 1338602, C.progression),
+        "Building: Packager": ItemData(G.Building, 1338603, C.progression),
+        "Building: Refinery": ItemData(G.Building, 1338604, C.progression),
+        "Building: Blender": ItemData(G.Building, 1338605, C.progression),
+        "Building: Particle Accelerator": ItemData(G.Building, 1338606, C.progression),
+        "Building: Biomass Burner": ItemData(G.Building, 1338607, C.progression),  # unlocked by default
+        "Building: Coal Generator": ItemData(G.Building, 1338608, C.progression),
+        "Building: Geothermal Generator": ItemData(G.Building, 1338609, C.progression),
+        "Building: Nuclear Power Plant": ItemData(G.Building, 1338610, C.progression),
+        "Building: Miner Mk.1": ItemData(G.Building, 1338611, C.progression),  # unlocked by default
+        "Building: Miner Mk.2": ItemData(G.Building, 1338612, C.progression),
+        "Building: Miner Mk.3": ItemData(G.Building, 1338613, C.progression),
+        "Building: Oil Extractor": ItemData(G.Building, 1338614, C.progression),
+        "Building: Water Extractor": ItemData(G.Building, 1338615, C.progression),
+        "Building: Smelter": ItemData(G.Building, 1338616, C.progression),  # unlocked by default
+        "Building: Foundry": ItemData(G.Building, 1338617, C.progression),
+        "Building: Fuel Generator": ItemData(G.Building, 1338618, C.progression),
+        "Building: Resource Well Pressurizer": ItemData(G.Building, 1338619, C.progression),
+        "Building: Equipment Workshop": ItemData(G.Building, 1338620, C.progression),
+        "Building: AWESOME Sink": ItemData(G.Building | G.NeverExclude, 1338621, C.progression),
+        "Building: AWESOME Shop": ItemData(G.Building | G.NeverExclude, 1338622, C.progression),
+        "Building: Structural Beam Pack": ItemData(G.Beams, 1338623, C.filler),
+        "Building: Blueprint Designer": ItemData(G.Building, 1338624, C.filler, 0),  # unlocked by default
+        "Building: Fluid Buffer": ItemData(G.Building | G.NeverExclude, 1338625, C.useful),
+        "Building: Industrial Fluid Buffer": ItemData(G.Building | G.NeverExclude, 1338626, C.useful),
+        "Building: Jump Pad": ItemData(G.Building, 1338627, C.filler),
+        "Building: Ladder": ItemData(G.Building, 1338628, C.filler),
+        "Building: MAM": ItemData(G.Building | G.NeverExclude, 1338629, C.progression),
+        "Building: Personal Storage Box": ItemData(G.Building, 1338630, C.filler),
+        "Building: Power Storage": ItemData(G.Building | G.NeverExclude, 1338631, C.progression),
+        "Building: U-Jelly Landing Pad": ItemData(G.Building, 1338632, C.useful),
+        "Building: Power Switch": ItemData(G.Building | G.NeverExclude, 1338633, C.useful),
+        "Building: Priority Power Switch": ItemData(G.Building | G.NeverExclude, 1338634, C.useful),
+        "Building: Storage Container": ItemData(G.Building, 1338635, C.useful, 0),
+        "Building: Lookout Tower": ItemData(G.Building, 1338636, C.filler),
+        # "Building: Power Pole Mk.1": ItemData(G.Building, 1338637, C.progression), # unlocked by default
+        "Building: Power Pole Mk.2": ItemData(G.Building | G.NeverExclude, 1338638, C.useful),
+        "Building: Power Pole Mk.3": ItemData(G.Building | G.NeverExclude, 1338639, C.useful),
+        "Building: Industrial Storage Container": ItemData(G.Building | G.NeverExclude, 1338640, C.useful),
+        "Building: Conveyor Merger": ItemData(G.Building | G.NeverExclude, 1338641, C.progression),
+        "Building: Conveyor Splitter": ItemData(G.Building | G.NeverExclude, 1338642, C.progression),
+        "Building: Conveyor Mk.1": ItemData(G.Building | G.ConveyorMk1, 1338643, C.progression),  # unlocked by default
+        "Building: Conveyor Mk.2": ItemData(G.Building | G.ConveyorMk2, 1338644, C.progression),
+        "Building: Conveyor Mk.3": ItemData(G.Building | G.ConveyorMk3, 1338645, C.progression),
+        "Building: Conveyor Mk.4": ItemData(G.Building | G.ConveyorMk4, 1338646, C.progression),
+        "Building: Conveyor Mk.5": ItemData(G.Building | G.ConveyorMk5, 1338647, C.progression),
+        "Building: Conveyor Lift Mk.1": ItemData(G.Building | G.ConveyorMk1, 1338648, C.useful),
+        "Building: Conveyor Lift Mk.2": ItemData(G.Building | G.ConveyorMk2, 1338649, C.useful),
+        "Building: Conveyor Lift Mk.3": ItemData(G.Building | G.ConveyorMk3, 1338650, C.useful),
+        "Building: Conveyor Lift Mk.4": ItemData(G.Building | G.ConveyorMk4, 1338651, C.useful),
+        "Building: Conveyor Lift Mk.5": ItemData(G.Building | G.ConveyorMk5, 1338652, C.useful),
+        "Building: Cable Beam Pack": ItemData(G.Beams, 1338653, C.filler, 0),
+        "Building: Stackable Conveyor Pole": ItemData(G.Building | G.ConveyorSupports, 1338654, C.useful),
+        "Building: Conveyor Wall Mount": ItemData(G.Building | G.ConveyorSupports, 1338655, C.useful, 0),
+        "Building: Conveyor Lift Floor Hole": ItemData(G.Building | G.ConveyorSupports, 1338656, C.useful, 0),
+        "Building: Conveyor Ceiling Mount": ItemData(G.Building | G.ConveyorSupports, 1338657, C.useful, 0),
+        "Building: Pipes Mk.1": ItemData(G.Building | G.PipesMk1, 1338658, C.progression),
+        "Building: Pipes Mk.2": ItemData(G.Building | G.PipesMk2, 1338659, C.progression),
+        "Building: Pipeline Pump Mk.1": ItemData(G.Building | G.PipesMk1, 1338660, C.progression),
+        "Building: Pipeline Pump Mk.2": ItemData(G.Building | G.PipesMk2, 1338661, C.progression),
+        "Building: Pipeline Junction Cross": ItemData(G.Building | G.PipesMk1 | G.PipesMk2, 1338662, C.progression),
+        "Building: Valve": ItemData(G.Building | G.PipesMk1 | G.PipesMk2, 1338663, C.useful),
+        "Building: Stackable Pipeline Support": ItemData(G.Building | G.PipelineSupports, 1338664, C.useful, 0),
+        "Building: Wall Pipeline Support": ItemData(G.Building | G.PipelineSupports, 1338665, C.useful, 0),
+        "Building: Pipeline Wall Hole": ItemData(G.Building | G.PipelineSupports, 1338666, C.useful, 0),
+        "Building: Pipeline Floor Hole": ItemData(G.Building | G.PipelineSupports, 1338667, C.useful, 0),
+        "Building: Lights Control Panel": ItemData(G.Building | G.Lights, 1338668, C.filler, 0),
+        "Building: Wall Mounted Flood Light": ItemData(G.Building | G.Lights, 1338669, C.filler, 0),
+        "Building: Street Light": ItemData(G.Building | G.Lights, 1338670, C.filler, 0),
+        "Building: Flood Light Tower": ItemData(G.Building | G.Lights, 1338671, C.filler, 0),
+        "Building: Ceiling Light": ItemData(G.Building | G.Lights, 1338672, C.filler, 0),
+        "Building: Power Tower": ItemData(G.Building | G.NeverExclude, 1338673, C.useful),
+        "Building: Walls Orange": ItemData(G.Building | G.Walls, 1338674, C.progression),
+        "Building: Radar Tower": ItemData(G.Building, 1338675, C.useful),
+        "Building: Smart Splitter": ItemData(G.Building | G.NeverExclude, 1338676, C.useful),
+        "Building: Programmable Splitter": ItemData(G.Building | G.NeverExclude, 1338677, C.useful),
+        "Building: Label Sign Bundle": ItemData(G.Building | G.Signs, 1338678, C.filler, 0),
+        "Building: Display Sign Bundle": ItemData(G.Building | G.Signs, 1338679, C.filler, 0),
+        "Building: Billboard Set": ItemData(G.Building | G.Signs, 1338680, C.filler, 0),
+        # 1338681 Moved to cosmetics - 1.1
+        "Building: Metal Pillar": ItemData(G.Pilars, 1338682, C.filler, 0),
+        "Building: Concrete Pillar": ItemData(G.Pilars, 1338683, C.filler, 0),
+        "Building: Frame Pillar": ItemData(G.Pilars, 1338684, C.filler, 0),
+        # 1338685 - 1338691 Moved to cosmetics - 1.1
+        "Building: Foundation": ItemData(G.Building | G.Foundations | G.NeverExclude, 1338692, C.progression),
+        "Building: Half Foundation": ItemData(G.Foundations, 1338693, C.filler, 0),
+        "Building: Corner Ramp Pack": ItemData(G.Foundations, 1338694, C.filler, 0),
+        "Building: Inverted Ramp Pack": ItemData(G.Foundations, 1338695, C.filler, 0),
+        "Building: Inverted Corner Ramp Pack": ItemData(G.Foundations, 1338696, C.filler, 0),
+        "Building: Quarter Pipes Pack": ItemData(G.Foundations, 1338697, C.filler, 0),
+        "Building: Quarter Pipe Extensions Pack": ItemData(G.Foundations, 1338698, C.filler, 0),
+        "Building: Frame Foundation": ItemData(G.Foundations, 1338699, C.filler, 0),
+        "Building: Wall Outlet Mk.1": ItemData(G.Building, 1338700, C.useful),
+        "Building: Wall Outlet Mk.2": ItemData(G.Building, 1338701, C.useful),
+        "Building: Wall Outlet Mk.3": ItemData(G.Building, 1338702, C.useful),
+        "Building: Modern Catwalks": ItemData(G.Building, 1338703, C.filler, 0),
+        "Building: Industrial Walkways": ItemData(G.Building, 1338704, C.filler, 0),
+        "Building: Stairs": ItemData(G.Building, 1338705, C.filler, 0),
+        "Building: Clean Pipeline Mk.1": ItemData(G.Building, 1338706, C.filler, 0),
+        "Building: Clean Pipeline Mk.2": ItemData(G.Building, 1338707, C.filler, 0),
+        "Building: Road Barrier": ItemData(G.Building, 1338708, C.filler, 0),
+        "Building: Modern Railing": ItemData(G.Building, 1338709, C.filler, 0),
+        "Building: Industrial Railing": ItemData(G.Building, 1338710, C.filler, 0),
+        "Building: Double Ramp Pack": ItemData(G.Foundations, 1338711, C.filler, 0),
+        "Building: Conveyor Walls": ItemData(G.Walls, 1338712, C.filler, 0),
+        "Building: Inverted Ramp Wall Bundle": ItemData(G.Walls, 1338713, C.filler, 0),
+        "Building: Ramp Wall Bundle": ItemData(G.Walls, 1338714, C.filler, 0),
+        "Building: Door Walls": ItemData(G.Walls, 1338715, C.filler, 0),
+        "Building: Tilted Walls": ItemData(G.Walls, 1338716, C.filler, 0),
+        "Building: Windowed Walls": ItemData(G.Walls, 1338717, C.filler, 0),
+        "Building: Steel-framed Windows": ItemData(G.Walls, 1338718, C.filler, 0),
+        "Building: Gates": ItemData(G.Walls, 1338719, C.filler, 0),
+        "Building: Roofs": ItemData(G.Walls, 1338720, C.filler, 0),
+        "Building: Roof Corners": ItemData(G.Walls, 1338721, C.filler, 0),
+        "Building: Converter": ItemData(G.Building, 1338722, C.progression),
+        "Building: Quantum Encoder": ItemData(G.Building, 1338723, C.progression),
+        "Building: Portal": ItemData(G.Building, 1338724, C.useful),
+        "Building: Conveyor Mk.6": ItemData(G.Building | G.ConveyorMk6, 1338725, C.progression),
+        "Building: Conveyor Lift Mk.6": ItemData(G.Building | G.ConveyorMk6, 1338726, C.useful),
+        "Building: Alien Power Augmenter": ItemData(G.Building, 1338727, C.progression),
+        "Building: Dimensional Depot Uploader": ItemData(G.Building, 1338728, C.useful),
+# Added in 1.1
+        "Building: Priority Merger": ItemData(G.Building | G.NeverExclude, 1338729, C.useful),
+        "Building: Conveyor Wall Hole": ItemData(G.Building, 1338730, C.useful, 0),
+        "Building: Conveyor Throughput Monitor": ItemData(G.Building, 1338731, C.useful, 0),
+        "Building: Basic Shelf Unit": ItemData(G.Building, 1338732, C.useful, 0),
+        "Building: Beam Expansion Pack": ItemData(G.Beams, 1338733, C.filler, 0),
+        "Building: Ventilation Bundle": ItemData(G.Building, 1338734, C.filler, 0),
+###
+        # 1338729 - 1338749 Reserved for buildings
+        "Customizer: Asphalt Foundation Material": ItemData(G.Customizer | G.Foundations, 1338750, C.filler, 0),
+        "Customizer: Concrete Foundation Material": ItemData(G.Customizer | G.Foundations, 1338751, C.filler, 0),
+        "Customizer: Concrete Wall Material": ItemData(G.Customizer | G.Walls, 1338752, C.filler, 0),
+        "Customizer: Glass Roof Material": ItemData(G.Customizer | G.Walls, 1338753, C.filler, 0),
+        "Customizer: Grip Metal Foundation Material": ItemData(G.Customizer | G.Foundations, 1338754, C.filler, 0),
+        "Customizer: Coated Concrete Foundation Material": ItemData(G.Customizer | G.Foundations, 1338755, C.filler, 0),
+        "Customizer: Metal Roof Material": ItemData(G.Customizer | G.Walls, 1338756, C.filler, 0),
+        "Customizer: Steel Wall Material": ItemData(G.Customizer | G.Walls, 1338757, C.filler, 0),
+        "Customizer: Tar Roof Material": ItemData(G.Customizer | G.Walls, 1338758, C.filler, 0),
+        "Customizer: Arrow Patterns": ItemData(G.Customizer | G.Foundations, 1338759, C.filler, 0),
+        "Customizer: Dotted Line Patterns": ItemData(G.Customizer | G.Foundations, 1338760, C.filler, 0),
+        "Customizer: Solid Line Patterns": ItemData(G.Customizer | G.Foundations, 1338761, C.filler, 0),
+        "Customizer: Factory Icon Patterns": ItemData(G.Customizer | G.Foundations, 1338762, C.filler, 0),
+        "Customizer: Transportation Icon Patterns": ItemData(G.Customizer | G.Foundations, 1338763, C.filler, 0),
+        "Customizer: Number Patterns": ItemData(G.Customizer | G.Foundations, 1338764, C.filler, 0),
+        "Customizer: Pathway Patterns": ItemData(G.Customizer | G.Foundations, 1338765, C.filler, 0),
+        "Customizer: Factory Zone Patterns": ItemData(G.Customizer | G.Foundations, 1338766, C.filler, 0),
+        "Customizer: Steel-Framed Windows": ItemData(G.Customizer | G.Walls, 1338767, C.filler, 0), 
+        "Customizer: Construction Fences": ItemData(G.Customizer, 1338768, C.filler, 0), 
+        "Customizer: Unpainted Finish": ItemData(G.Customizer, 1338769, C.filler, 0), 
+        "Customizer: Copper Paint Finish": ItemData(G.Customizer, 1338770, C.filler, 0), 
+        "Customizer: Chrome Paint Finish": ItemData(G.Customizer, 1338771, C.filler, 0), 
+        "Customizer: Carbon Steel Finish": ItemData(G.Customizer, 1338772, C.filler, 0), 
+        "Customizer: Caterium Paint Finish": ItemData(G.Customizer, 1338773, C.filler, 0), 
+
+        # 1338776 - 1338799 Reserved for Cosmetics
+
+        # Transports 1338800 - 1338899
+        # Drones (including Drone)
+        "Transport: Drones": ItemData(G.Transport, 1338800, C.useful),
+        # Trains (including Empty Platform, rails, station, locomotive, train stop)  # 1.1
+        "Transport: Trains": ItemData(G.Transport | G.Trains, 1338801, C.useful),
+        "Transport: Fluid Trains": ItemData(G.Transport | G.Trains, 1338802, C.useful),
+        # Tracker / Truck (including truck station)
+        "Transport: Tractor": ItemData(G.Transport | G.Vehicles, 1338803, C.useful),
+        "Transport: Truck": ItemData(G.Transport | G.Vehicles, 1338804, C.useful),
+        "Transport: Explorer": ItemData(G.Transport | G.Vehicles, 1338805, C.useful),
+        "Transport: Factory Cart": ItemData(G.Transport | G.Vehicles, 1338806, C.useful),
+        "Transport: Factory Cart (golden)": ItemData(G.Transport | G.Vehicles, 1338807, C.filler),
+        "Transport: Cyber Wagon": ItemData(G.Transport | G.Vehicles | G.Trap, 1338808, C.filler),
+        # Hypertubes (including supports / pipes / entrance / holes)
+        "Transport: Hypertube": ItemData(G.Transport | G.HyperTubes, 1338809, C.useful),
+        "Transport: Hypertube Floor Hole": ItemData(G.Transport | G.HyperTubes, 1338810, C.filler),
+        "Transport: Hypertube Wall Support": ItemData(G.Transport | G.HyperTubes, 1338811, C.filler),
+        "Transport: Hypertube Wall Hole": ItemData(G.Transport | G.HyperTubes, 1338812, C.filler),
+        # Personal Elevator (including additional floors)
+        "Transport: Personal Elevator": ItemData(G.Transport, 1338813, C.useful),  # 1.1
+
+        # 1338900 - 1338998 Handled by trap system (includes a few non-trap things)
+        # Regenerate via /Script/Blutility.EditorUtilityWidgetBlueprint'/Archipelago/Debug/EU_GenerateTrapIds.EU_GenerateTrapIds'
+        "Trap: Hog": ItemData(G.Trap, 1338900, C.trap),
+        "Trap: Alpha Hog": ItemData(G.Trap, 1338901, C.trap),
+        "Trap: Johnny": ItemData(G.Trap, 1338902, C.trap),
+        "Trap: Cliff Hog": ItemData(G.Trap, 1338903, C.trap),
+        "Trap: Nuclear Hog": ItemData(G.Trap, 1338904, C.trap),
+        "Trap: Not the Bees": ItemData(G.Trap, 1338905, C.trap),
+        "Trap: Hatcher": ItemData(G.Trap, 1338906, C.trap),
+        "Trap: Doggo with Pulse Nobelisk": ItemData(G.Trap, 1338907, C.trap),
+        "Trap: Doggo with Nuke Nobelisk": ItemData(G.Trap, 1338908, C.trap),
+        "Doggo with Power Slug": ItemData(G.Parts, 1338909, C.filler),
+        "Trap: Doggo with Gas Nobelisk": ItemData(G.Trap, 1338910, C.trap),
+        "Trap: Spore Flower": ItemData(G.Trap, 1338911, C.trap),
+        "Trap: Stinger": ItemData(G.Trap, 1338912, C.trap),
+        "Trap: Gas Stinger": ItemData(G.Trap, 1338913, C.trap),
+        "Trap: Small Stinger": ItemData(G.Trap, 1338914, C.trap),
+        "Trap: Spitter": ItemData(G.Trap, 1338915, C.trap),
+        "Trap: Alpha Spitter": ItemData(G.Trap, 1338916, C.trap),
+        "Trap: Nuclear Waste Drop": ItemData(G.Trap, 1338917, C.trap),
+        "Trap: Plutonium Waste Drop": ItemData(G.Trap, 1338918, C.trap),
+        "Trap: Elite Hatcher": ItemData(G.Trap, 1338919, C.trap),
+        "Trap: Can of Beans": ItemData(G.Trap, 1338920, C.trap),
+        "Trap: Fart Cloud": ItemData(G.Trap, 1338921, C.trap),
+
+        "Building: Space Elevator": ItemData(G.Building, 1338999, C.progression),
+
+        # Resource singles
+        "Single: Adaptive Control Unit": ItemData(G.Parts, 1339000, count=0),
+        "Single: AI Limiter": ItemData(G.Parts, 1339001, count=0),
+        "Single: Alclad Aluminum Sheet": ItemData(G.Parts, 1339002, count=0),
+        "Single: Blue Power Slug": ItemData(G.Parts, 1339003, count=0),
+        "Single: Yellow Power Slug": ItemData(G.Parts, 1339004, count=0),
+        "Single: Alien Protein": ItemData(G.Parts, 1339005, count=0),
+        "Single: Purple Power Slug": ItemData(G.Parts, 1339006, count=0),
+        "Single: Aluminum Casing": ItemData(G.Parts, 1339007, count=0),
+        "Single: Aluminum Ingot": ItemData(G.Parts, 1339008, count=0),
+        "Single: Aluminum Scrap": ItemData(G.Parts, 1339009, count=0),
+        "Single: Assembly Director System": ItemData(G.Parts, 1339010, count=0),
+        "Single: Automated Wiring": ItemData(G.Parts, 1339011, count=0),
+        "Single: Battery": ItemData(G.Parts, 1339012, count=0),
+        "Single: Bauxite": ItemData(G.Parts, 1339013, count=0),
+        "Single: Neural-Quantum Processor": ItemData(G.Parts, 1339014, count=0),
+        "Single: Biomass": ItemData(G.Parts, 1339015, count=0),
+        "Single: Black Powder": ItemData(G.Parts, 1339016, count=0),
+        "Single: Cable": ItemData(G.Parts, 1339017, count=0),
+        "Single: Caterium Ingot": ItemData(G.Parts, 1339018, count=0),
+        "Single: Caterium Ore": ItemData(G.Parts, 1339019, count=0),
+        "Single: Circuit Board": ItemData(G.Parts, 1339020, count=0),
+        "Single: Coal": ItemData(G.Parts, 1339021, count=0),
+        "Single: Singularity Cell": ItemData(G.Parts, 1339022, count=0),
+        "Single: Compacted Coal": ItemData(G.Parts, 1339023, count=0),
+        "Single: Computer": ItemData(G.Parts, 1339024, count=0),
+        "Single: Concrete": ItemData(G.Parts, 1339025, count=0),
+        "Single: Cooling System": ItemData(G.Parts, 1339026, count=0),
+        "Single: Copper Ingot": ItemData(G.Parts, 1339027, count=0),
+        "Single: Copper Ore": ItemData(G.Parts, 1339028, count=0),
+        "Single: Copper Powder": ItemData(G.Parts, 1339029, count=0),
+        "Single: Copper Sheet": ItemData(G.Parts, 1339030, count=0),
+        "Single: Adequate Pioneering Statue": ItemData(G.Parts, 1339031, count=0),
+        "Single: Crystal Oscillator": ItemData(G.Parts, 1339032, count=0),
+        "Single: Electromagnetic Control Rod": ItemData(G.Parts, 1339033, count=0),
+        "Single: Empty Canister": ItemData(G.Parts, 1339034, count=0),
+        "Single: Empty Fluid Tank": ItemData(G.Parts, 1339035, count=0),
+        "Single: Encased Industrial Beam": ItemData(G.Parts, 1339036, count=0),
+        "Single: Encased Plutonium Cell": ItemData(G.Trap, 1339037, C.trap, count=0),
+        "Single: Encased Uranium Cell": ItemData(G.Trap, 1339038, C.trap, count=0),
+        "Single: Fabric": ItemData(G.Parts, 1339039, count=0),
+        "Single: FICSIT Coupon": ItemData(G.Parts, 1339040, count=0),
+        "Single: AI Expansion Server": ItemData(G.Parts, 1339041, count=0),
+        "Single: Fused Modular Frame": ItemData(G.Parts, 1339042, count=0),
+        "Single: Hard Drive": ItemData(G.Parts, 1339043, count=0),
+        "Single: Heat Sink": ItemData(G.Parts, 1339044, count=0),
+        "Single: Heavy Modular Frame": ItemData(G.Parts, 1339045, count=0),
+        "Single: High-Speed Connector": ItemData(G.Parts, 1339046, count=0),
+        "Single: Satisfactory Pioneering Statue": ItemData(G.Parts, 1339047, count=0),
+        "Single: Pretty Good Pioneering Statue": ItemData(G.Parts, 1339048, count=0),
+        "Single: Iron Ingot": ItemData(G.Parts, 1339049, count=0),
+        "Single: Iron Ore": ItemData(G.Parts, 1339050, count=0),
+        "Single: Iron Plate": ItemData(G.Parts, 1339051, count=0),
+        "Single: Iron Rod": ItemData(G.Parts, 1339052, count=0),
+        "Single: Golden Nut Statue": ItemData(G.Parts, 1339053, count=0),
+        "Single: Leaves": ItemData(G.Parts, 1339054, count=0),
+        "Single: Limestone": ItemData(G.Parts, 1339055, count=0),
+        "Single: Magnetic Field Generator": ItemData(G.Parts, 1339056, count=0),
+        "Single: Mercer Sphere": ItemData(G.Parts, 1339057, count=0),
+        "Single: Modular Engine": ItemData(G.Parts, 1339058, count=0),
+        "Single: Modular Frame": ItemData(G.Parts, 1339059, count=0),
+        "Single: Motor": ItemData(G.Parts, 1339060, count=0),
+        "Single: Mycelia": ItemData(G.Parts, 1339061, count=0),
+        "Single: Non-fissile Uranium": ItemData(G.Trap, 1339062, C.trap, count=0),
+        "Single: Nuclear Pasta": ItemData(G.Parts, 1339063, count=0),
+        "Single: Lizard Doggo Statue": ItemData(G.Parts, 1339064, count=0),
+        "Single: Organic Data Capsule": ItemData(G.Parts, 1339065, count=0),
+        "Single: Packaged Alumina Solution": ItemData(G.Parts, 1339066, count=0),
+        "Single: Packaged Fuel": ItemData(G.Parts, 1339067, count=0),
+        "Single: Packaged Heavy Oil Residue": ItemData(G.Parts, 1339068, count=0),
+        "Single: Packaged Liquid Biofuel": ItemData(G.Parts, 1339069, count=0),
+        "Single: Packaged Nitric Acid": ItemData(G.Parts, 1339070, count=0),
+        "Single: Packaged Nitrogen Gas": ItemData(G.Parts, 1339071, count=0),
+        "Single: Packaged Oil": ItemData(G.Parts, 1339072, count=0),
+        "Single: Packaged Sulfuric Acid": ItemData(G.Parts, 1339073, count=0),
+        "Single: Packaged Turbofuel": ItemData(G.Parts, 1339074, count=0),
+        "Single: Packaged Water": ItemData(G.Parts, 1339075, count=0),
+        "Single: Petroleum Coke": ItemData(G.Parts, 1339076, count=0),
+        "Single: Plastic": ItemData(G.Parts, 1339077, count=0),
+        "Single: Plutonium Fuel Rod": ItemData(G.Trap, 1339078, C.trap, count=0),
+        "Single: Plutonium Pellet": ItemData(G.Trap, 1339079, C.trap, count=0),
+        "Single: Plutonium Waste": ItemData(G.Trap, 1339080, C.trap, count=0),
+        "Single: Polymer Resin": ItemData(G.Parts, 1339081, count=0),
+        "Single: Power Shard": ItemData(G.Parts, 1339082, count=0),
+        "Single: Confusing Creature Statue": ItemData(G.Parts, 1339083, count=0),
+        "Single: Pressure Conversion Cube": ItemData(G.Parts, 1339084, count=0),
+        "Single: Alien Power Matrix": ItemData(G.Parts, 1339085, count=0),
+        "Single: Quartz Crystal": ItemData(G.Parts, 1339086, count=0),
+        "Single: Quickwire": ItemData(G.Parts, 1339087, count=0),
+        "Single: Radio Control Unit": ItemData(G.Parts, 1339088, count=0),
+        "Single: Raw Quartz": ItemData(G.Parts, 1339089, count=0),
+        "Single: Reinforced Iron Plate": ItemData(G.Parts, 1339090, count=0),
+        "Single: Rotor": ItemData(G.Parts, 1339091, count=0),
+        "Single: Rubber": ItemData(G.Parts, 1339092, count=0),
+        "Single: SAM": ItemData(G.Parts, 1339093, count=0),
+        "Single: Screw": ItemData(G.Parts, 1339094, count=0),
+        "Single: Silica": ItemData(G.Parts, 1339095, count=0),
+        "Single: Smart Plating": ItemData(G.Parts, 1339096, count=0),
+        "Single: Smokeless Powder": ItemData(G.Parts, 1339097, count=0),
+        "Single: Solid Biofuel": ItemData(G.Parts, 1339098, count=0),
+        "Single: Somersloop": ItemData(G.Parts, 1339099, count=0),
+        "Single: Stator": ItemData(G.Parts, 1339100, count=0),
+        "Single: Silver Hog Statue": ItemData(G.Parts, 1339101, count=0),
+        "Single: Steel Beam": ItemData(G.Parts, 1339102, count=0),
+        "Single: Steel Ingot": ItemData(G.Parts, 1339103, count=0),
+        "Single: Steel Pipe": ItemData(G.Parts, 1339104, count=0),
+        "Single: Sulfur": ItemData(G.Parts, 1339105, count=0),
+        "Single: Supercomputer": ItemData(G.Parts, 1339106, count=0),
+        "Single: Superposition Oscillator": ItemData(G.Parts, 1339107, count=0),
+        "Single: Thermal Propulsion Rocket": ItemData(G.Parts, 1339108, count=0),
+        "Single: Turbo Motor": ItemData(G.Parts, 1339109, count=0),
+        "Single: Hog Remains": ItemData(G.Parts, 1339110, count=0),
+        "Single: Uranium": ItemData(G.Trap, 1339111, C.trap, count=0),
+        "Single: Uranium Fuel Rod": ItemData(G.Trap, 1339112, C.trap, count=0),
+        "Single: Uranium Waste": ItemData(G.Trap, 1339113, C.trap, count=0),
+        "Single: Versatile Framework": ItemData(G.Parts, 1339114, count=0),
+        "Single: Wire": ItemData(G.Parts, 1339115, count=0),
+        "Single: Wood": ItemData(G.Parts, 1339116, count=0),
+        "Single: Plasma Spitter Remains": ItemData(G.Parts, 1339117, count=0),
+        "Single: Stinger Remains": ItemData(G.Parts, 1339118, count=0),
+        "Single: Hatcher Remains": ItemData(G.Parts, 1339119, count=0),
+        "Single: Alien DNA Capsule": ItemData(G.Parts, 1339120, count=0),
+        "Single: Diamonds": ItemData(G.Parts, 1339121, count=0),
+        "Single: Time Crystal": ItemData(G.Parts, 1339122, count=0),
+        "Single: Ficsite Ingot": ItemData(G.Parts, 1339123, count=0),
+        "Single: Ficsite Trigon": ItemData(G.Parts, 1339124, count=0),
+        "Single: Reanimated SAM": ItemData(G.Parts, 1339125, count=0),
+        "Single: SAM Fluctuator": ItemData(G.Parts, 1339126, count=0),
+        "Single: Biochemical Sculptor": ItemData(G.Parts, 1339127, count=0),
+        "Single: Ballistic Warp Drive": ItemData(G.Parts, 1339128, count=0),
+        "Single: Ficsonium": ItemData(G.Trap, 1339129, C.trap, count=0),
+        "Single: Ficsonium Fuel Rod": ItemData(G.Trap, 1339130, C.trap, count=0),
+        "Single: Packaged Rocket Fuel": ItemData(G.Parts, 1339131, count=0),
+        "Single: Packaged Ionized Fuel": ItemData(G.Parts, 1339132, count=0),
+        "Single: Dark Matter Crystal": ItemData(G.Parts, 1339133, count=0),
+        # 1339134 - 1339149 Reserved for future parts
+        # 1339150 - 1339199 Equipment / Ammo
+        "Single: Bacon Agaric": ItemData(G.Ammo, 1339150, count=0),
+        "Single: Beryl Nut": ItemData(G.Ammo, 1339151, count=0),
+        "Single: Blade Runners": ItemData(G.Equipment, 1339152),
+        "Single: Boom Box": ItemData(G.Equipment, 1339153),
+        "Single: Chainsaw": ItemData(G.Equipment, 1339154, C.useful),
+        "Single: Cluster Nobelisk": ItemData(G.Ammo, 1339155, count=0),
+        "Single: Iodine-Infused Filter": ItemData(G.Equipment, 1339156, count=0),  # 1.1
+        "Single: Cup": ItemData(G.Equipment, 1339157),
+        "Single: Cup (gold)": ItemData(G.Equipment, 1339158, count=0),
+        "Single: Explosive Rebar": ItemData(G.Ammo, 1339159, count=0),
+        "Single: Factory Cart": ItemData(G.Equipment, 1339160, C.useful),
+        "Single: Factory Cart (golden)": ItemData(G.Equipment, 1339161, count=0),
+        "Single: Gas Mask": ItemData(G.Equipment, 1339162, C.useful),
+        "Single: Gas Nobelisk": ItemData(G.Ammo, 1339163, count=0),
+        "Single: Hazmat Suit": ItemData(G.Equipment, 1339164, C.useful),
+        "Single: Homing Rifle Ammo": ItemData(G.Ammo, 1339165, count=0),
+        "Single: Hoverpack": ItemData(G.Equipment, 1339166, C.useful),
+        "Single: Iron Rebar": ItemData(G.Ammo, 1339167, count=0),
+        "Single: Jetpack": ItemData(G.Equipment, 1339168, C.useful),
+        "Single: Medicinal Inhaler": ItemData(G.Ammo, 1339169, count=0),
+        "Single: Nobelisk": ItemData(G.Ammo, 1339170, count=0),
+        "Single: Nobelisk Detonator": ItemData(G.Equipment, 1339171, C.useful),
+        "Single: Nuke Nobelisk": ItemData(G.Ammo, 1339172, count=0),
+        "Single: Object Scanner": ItemData(G.Equipment, 1339173),
+        "Single: Paleberry": ItemData(G.Ammo, 1339174, count=0),
+        "Single: Parachute": ItemData(G.Equipment, 1339175, C.useful),
+        "Single: Pulse Nobelisk": ItemData(G.Ammo, 1339176, count=0),
+        "Single: Rebar Gun": ItemData(G.Equipment, 1339177, C.useful),
+        "Single: Rifle": ItemData(G.Equipment, 1339178, C.useful),
+        "Single: Rifle Ammo": ItemData(G.Ammo, 1339179, count=0),
+        "Single: Shatter Rebar": ItemData(G.Ammo, 1339180, count=0),
+        "Single: Stun Rebar": ItemData(G.Ammo, 1339181, count=0),
+        "Single: Turbo Rifle Ammo": ItemData(G.Ammo, 1339182, count=0),
+        "Single: Xeno-Basher": ItemData(G.Equipment, 1339183, C.useful),
+        "Single: Xeno-Zapper": ItemData(G.Equipment, 1339184, C.useful),
+        "Single: Zipline": ItemData(G.Equipment, 1339185, C.useful),
+        "Single: Portable Miner": ItemData(G.Equipment, 1339186),
+        "Single: Gas Filter": ItemData(G.Equipment, 1339187, count=0)
+    }
+
+    item_names_and_ids: ClassVar[dict[str, int]] = {name: data.code for name, data in item_data.items()}
+    filler_items: ClassVar[tuple[str, ...]] = tuple(item for item, details in item_data.items() 
+                                                    if details.count > 0 and details.category & (G.Parts | G.Ammo))
+
+    @classmethod
+    def get_item_names_per_category(cls, game_logic: GameLogic) -> dict[str, set[str]]:
+        groups: dict[str, set[str]] = {}
+
+        # To allow hinting for first part recipe in logic
+        for part, recipes in game_logic.recipes.items():
+            recipes_for_part: set[str] = {recipe.name for recipe in recipes if not recipe.implicitly_unlocked}
+            if recipes_for_part:
+
+                for original, indirect in game_logic.indirect_recipes.items():
+                    if indirect in recipes_for_part:
+                        recipes_for_part.remove(indirect)
+                        recipes_for_part.add(original)
+
+                groups[part] = recipes_for_part
+
+        for name, data in cls.item_data.items():
+            for category in data.category:
+                if category != G.NeverExclude:
+                    groups.setdefault(category.name, set()).add(name)
+                
+        return groups
+
+    player: int
+    logic: GameLogic
+    random: Random
+    critical_path: CriticalPathCalculator
+
+    trap_chance: int 
+    enabled_traps: tuple[str, ...]
+
+    def __init__(self, player: Optional[int], logic: GameLogic, random: Random,
+                 options: SatisfactoryOptions, critical_path: CriticalPathCalculator):
+        self.player = player
+        self.logic = logic
+        self.random = random
+        self.critical_path = critical_path
+        self.options = options
+
+        self.trap_chance = self.options.trap_chance.value
+        self.enabled_traps = tuple(sorted(self.options.trap_selection_override.value))
+
+    @classmethod
+    def create_item_uninitialized(cls, name: str, player: int) -> Item:
+        data: ItemData = cls.item_data[name]
+        return Item(name, data.type, data.code, player)
+
+    def create_item(self, name: str, player: int) -> Item:
+        data: ItemData = self.item_data[name]
+        item_type = data.type
+
+        if item_type == C.progression \
+            and (data.category & (G.Recipe | G.Building)) and not (data.category & G.NeverExclude) \
+                and self.critical_path.required_item_names and name not in self.critical_path.required_item_names:
+            item_type = C.useful
+
+        return Item(name, item_type, data.code, player)
+
+    @classmethod
+    def get_filler_item_name_uninitialized(cls, random: Random) -> str:
+        return random.choice(cls.filler_items)
+
+    def get_filler_item_name(self, random: Random, filler_items: Sequence[str] | None) -> str:
+        if self.enabled_traps and random.random() < (self.trap_chance / 100):
+            return random.choice(self.enabled_traps)
+        else:
+            if filler_items:
+                return random.choice(filler_items)
+            else:
+                return Items.get_filler_item_name_uninitialized(random)
+
+    def get_excluded_items(self, precollected_items: list[Item]) -> set[str]:
+        excluded_items: set[str] = { 
+            item.name 
+            for item in precollected_items
+            if item.name in self.item_data and item.name not in self.options.start_inventory_from_pool.value
+        }
+
+        excluded_items.update({"Building: " + building for building in self.critical_path.buildings_to_exclude})
+        excluded_items.update({"Bundle: " + part for part in self.critical_path.parts_to_exclude})
+        excluded_items.update({"Single: " + part for part in self.critical_path.parts_to_exclude})
+
+        excluded_items.update({recipe for recipe in self.critical_path.recipes_to_exclude})
+        excluded_items.update(self.critical_path.implicitly_unlocked)
+
+        # since we dont have part logic setup for Transports
+        if self.options.final_elevator_phase == 1:
+            excluded_items.add("Transport: Drones")
+
+        # Remove excluded items that arent unique
+        excluded_items = excluded_items - {
+            item_name
+            for item_name, data in self.item_data.items()
+            if data.category & (G.Parts | G.Equipment | G.Ammo | G.Trap | G.Upgrades)
+        }
+
+        return excluded_items
+
+    def build_item_pool(self, random: Random, precollected_items: list[Item], number_of_locations: int) -> list[Item]:
+        excluded_from_pool: set[str] = self.get_excluded_items(precollected_items)
+
+        pool_items: list[Item] = [
+            self.create_item(name, self.player)
+            for name, data in self.item_data.items()
+            for _ in range(data.count)
+            if data.category & (G.Recipe | G.Building | G.Equipment | G.Ammo | G.Transport | G.Upgrades)
+            and name not in excluded_from_pool
+        ]
+        pool: list[Item] = [
+            item 
+            for item in pool_items 
+            if item.classification != C.filler or self.item_data[item.name].category & (G.Equipment | G.Ammo)
+        ]
+
+        free_space: int = number_of_locations - len(pool)
+        if free_space < 0:
+            raise Exception(f"Location pool starved, trying to add {len(pool)} items to {number_of_locations} locations")
+
+        non_excluded_filler_items: list[str] = [item for item in self.filler_items if item not in excluded_from_pool]
+        pool += [
+            self.create_item(self.get_filler_item_name(random, non_excluded_filler_items), self.player)
+            for _ in range(free_space)
+        ]
+
+        return pool
diff --git a/worlds/satisfactory/Locations.py b/worlds/satisfactory/Locations.py
new file mode 100644
index 0000000000..0174b178f8
--- /dev/null
+++ b/worlds/satisfactory/Locations.py
@@ -0,0 +1,426 @@
+from typing import ClassVar, Optional
+from collections.abc import Iterable, Callable
+from math import ceil, floor
+from BaseClasses import CollectionState
+from .GameLogic import GameLogic, Recipe, Building, PowerInfrastructureLevel, DropPodData
+from .StateLogic import StateLogic, EventId, part_event_prefix, building_event_prefix
+from .Items import Items
+from .Options import SatisfactoryOptions
+from .CriticalPathCalculator import CriticalPathCalculator
+
+
+class LocationData:
+    __slots__ = ("region", "name", "event_name", "code", "non_progression", "rule")
+    region: str
+    name: str
+    event_name: str
+    code: Optional[int]
+    non_progression: Optional[bool]
+    rule: Optional[Callable[[CollectionState], bool]]
+
+    def __init__(self, region: str, name: str, code: Optional[int], event_name: Optional[str] = None,
+                 non_progression: Optional[bool] = False, rule: Optional[Callable[[CollectionState], bool]] = None):
+        self.region = region
+        self.name = name
+        self.code = code
+        self.rule = rule
+        self.non_progression = non_progression
+        self.event_name = event_name or name
+
+
+class Part(LocationData):
+    @staticmethod
+    def get_parts(state_logic: StateLogic, recipes: tuple[Recipe, ...], name: str,
+                  final_elevator_phase: int) -> list[LocationData]:
+        recipes_per_region: dict[str, list[Recipe]] = {}
+
+        for recipe in recipes:
+            if recipe.minimal_phase > final_elevator_phase:
+                continue
+
+            recipes_per_region.setdefault(recipe.building or "Overworld", []).append(recipe)
+
+        return [Part(state_logic, region, recipes_for_region, name) 
+                for region, recipes_for_region in recipes_per_region.items()]
+
+    def __init__(self, state_logic: StateLogic, region: str, recipes: Iterable[Recipe], name: str):
+        super().__init__(region, part_event_prefix + name + " in " + region, EventId, part_event_prefix + name,
+                         rule=Part.can_produce_any_recipe_for_part(state_logic, recipes))
+
+    @staticmethod
+    def can_produce_any_recipe_for_part(state_logic: StateLogic, recipes: Iterable[Recipe]) \
+            -> Callable[[CollectionState], bool]:
+        
+        recipe_rules = tuple(state_logic.get_can_produce_specific_recipe_for_part_rule(recipe) for recipe in recipes)
+
+        def can_build_by_any_recipe(state: CollectionState) -> bool:
+            return any(rule(state) for rule in recipe_rules)
+
+        return can_build_by_any_recipe
+
+
+class EventBuilding(LocationData):
+    def __init__(self, state_logic: StateLogic, building_name: str, building: Building):
+        super().__init__("Overworld", building_event_prefix + building_name, EventId,
+                         rule=EventBuilding.get_can_create_building_rule(state_logic, building))
+
+    @staticmethod
+    def get_can_create_building_rule(state_logic: StateLogic, building: Building) \
+            -> Callable[[CollectionState], bool]:
+        handcrafting_rule = state_logic.get_can_produce_all_allowing_handcrafting_rule(building.inputs)
+
+        def can_build(state: CollectionState) -> bool:
+            return state_logic.has_recipe(state, building) \
+                and state_logic.can_power(state, building.power_requirement) \
+                and handcrafting_rule(state)
+
+        return can_build
+
+
+class PowerInfrastructure(LocationData):
+    def __init__(self, state_logic: StateLogic, 
+                 power_level: PowerInfrastructureLevel, recipes: Iterable[Recipe]):
+        super().__init__("Overworld", building_event_prefix + power_level.to_name(), EventId,
+                         rule=PowerInfrastructure.get_can_create_power_infrastructure_rule(state_logic, power_level, recipes))
+
+    @staticmethod
+    def get_can_create_power_infrastructure_rule(state_logic: StateLogic,
+                                                 power_level: PowerInfrastructureLevel, recipes: Iterable[Recipe])\
+            -> Callable[[CollectionState], bool]:
+
+        higher_levels = tuple(level for level in PowerInfrastructureLevel if level > power_level)
+
+        def can_power(state: CollectionState) -> bool:
+            return any(state_logic.can_power(state, higher_level) for higher_level in higher_levels) \
+                or any(state_logic.can_build(state, recipe.building) for recipe in recipes)
+
+        return can_power
+
+
+class ElevatorPhase(LocationData):
+    def __init__(self, phase_index: int, state_logic: StateLogic, game_logic: GameLogic):
+        super().__init__("Overworld", f"Elevator Phase {phase_index + 1}", EventId,
+                         rule=lambda state: state_logic.can_build(state, "Space Elevator") and
+                              state_logic.can_produce_all(state, game_logic.space_elevator_phases[phase_index].keys()))
+
+
+class HubSlot(LocationData):
+    def __init__(self, tier: int, milestone: int, slot: int, location_id: int):
+        super().__init__(f"Hub {tier}-{milestone}", f"Hub {tier}-{milestone}, item {slot}", location_id)
+
+
+class MamSlot(LocationData):
+    def __init__(self, tree: str, node_name: str, location_id: int):
+        super().__init__(f"{tree}: {node_name}", f"{tree}: {node_name}", location_id)
+
+
+class ShopSlot(LocationData):
+    def __init__(self, state_logic: Optional[StateLogic], slot: int, cost: int, location_id: int):
+        super().__init__("AWESOME Shop", f"AWESOME Shop purchase {slot}", location_id,
+                         rule=ShopSlot.can_purchase_from_shop(state_logic, cost))
+
+    @staticmethod
+    def can_purchase_from_shop(state_logic: Optional[StateLogic], cost: int) -> Callable[[CollectionState], bool]:
+        def can_purchase(state: CollectionState) -> bool:
+            if not state_logic or cost < 20:
+                return True
+            elif 20 <= cost < 50:
+                return state_logic.is_elevator_phase(state, 1)
+            elif 50 <= cost < 100:
+                return state_logic.is_elevator_phase(state, 2)
+            else:
+                return state_logic.is_elevator_phase(state, 3)
+            
+        return can_purchase
+
+
+class HardDrive(LocationData):
+    def __init__(self, data: DropPodData, state_logic: Optional[StateLogic],
+                 location_id: int, tier: int, can_hold_progression: bool):
+
+        # drop pod locations are unlocked by hard drives, there is currently no direct mapping between location and hard drive
+        # we currently do not know how many hdd require gas or radioactive protection
+        # coordinates are for us to reference them, there is no real link between coordinate and check
+        def get_region(gassed: Optional[bool], radioactive: Optional[bool]) -> str:
+            return f"Hub Tier {tier}"
+
+        def get_rule(unlocked_by: Optional[str], power_needed: int) -> Callable[[CollectionState], bool]:
+            # Power is kept out of logic. with energy link its simple, 
+            # without you just going to have to figure it your yourself
+
+            def logic_rule(state: CollectionState) -> bool:
+                return state_logic.can_build(state, "MAM") and (
+                    (not unlocked_by) or (state_logic and state_logic.can_produce(state, unlocked_by)))
+
+            return logic_rule
+
+        super().__init__(
+            get_region(data.gassed, data.radioactive),
+            f"Hard drive random check {(location_id - 1338600) + 1}", location_id,
+            non_progression=not can_hold_progression, rule=get_rule(data.item, data.power))
+
+
+class Locations:
+    game_logic: Optional[GameLogic]
+    options: Optional[SatisfactoryOptions]
+    state_logic: Optional[StateLogic]
+    items: Optional[Items]
+    critical_path: Optional[CriticalPathCalculator]
+
+    hub_location_start: ClassVar[int] = 1338000
+    max_tiers: ClassVar[int] = 10
+    max_milestones: ClassVar[int] = 5
+    max_slots: ClassVar[int] = 10
+    drop_pod_location_id_start: ClassVar[int] = 1338600
+    drop_pod_location_id_end: ClassVar[int] = 1338699
+
+    def __init__(self, game_logic: Optional[GameLogic] = None, options: Optional[SatisfactoryOptions] = None,
+                 state_logic: Optional[StateLogic] = None, items: Optional[Items] = None,
+                 critical_path: Optional[CriticalPathCalculator] = None):
+        self.game_logic = game_logic
+        self.options = options
+        self.state_logic = state_logic
+        self.items = items
+        self.critical_path = critical_path
+
+    def get_base_location_table(self, max_tier: int) -> list[LocationData]:
+        all_locations = [
+            MamSlot("Alien Organisms", "Inflated Pocket Dimension", 1338500),
+            MamSlot("Alien Organisms", "Hostile Organism Detection", 1338501),
+            MamSlot("Alien Organisms", "Expanded Toolbelt", 1338502),
+            MamSlot("Alien Organisms", "Bio-Organic Properties", 1338503),
+            MamSlot("Alien Organisms", "Stinger Research", 1338504),
+            MamSlot("Alien Organisms", "Hatcher Research", 1338505),
+            MamSlot("Alien Organisms", "Hog Research", 1338506),
+            MamSlot("Alien Organisms", "Spitter Research", 1338507),
+            MamSlot("Alien Organisms", "Structural Analysis", 1338508),
+            MamSlot("Alien Organisms", "Protein Inhaler", 1338509),
+            MamSlot("Alien Organisms", "The Rebar Gun", 1338510),
+            MamSlot("Caterium", "Caterium Electronics", 1338511),
+            MamSlot("Caterium", "Bullet Guidance System", 1338512),
+            MamSlot("Caterium", "High-Speed Connector", 1338513),
+            MamSlot("Caterium", "Caterium", 1338514),
+            MamSlot("Caterium", "Caterium Ingots", 1338515),
+            MamSlot("Caterium", "Quickwire", 1338516),
+            MamSlot("Caterium", "Power Switch", 1338517),
+            MamSlot("Caterium", "Power Poles Mk.2", 1338518),
+            MamSlot("Caterium", "AI Limiter", 1338519),
+            MamSlot("Caterium", "Smart Splitter", 1338520),
+            MamSlot("Caterium", "Programmable Splitter", 1338521),
+            MamSlot("Mycelia", "Gas Mask", 1338522),  # 1.0
+            MamSlot("Caterium", "Zipline", 1338523),
+            MamSlot("Caterium", "Geothermal Generator", 1338524),
+            MamSlot("Caterium", "Priority Power Switch", 1338525),
+            MamSlot("Caterium", "Stun Rebar", 1338526),
+            MamSlot("Caterium", "Power Poles Mk.3", 1338527),
+            MamSlot("Mycelia", "Therapeutic Inhaler", 1338528),
+            MamSlot("Mycelia", "Expanded Toolbelt", 1338529),
+            MamSlot("Mycelia", "Mycelia", 1338530),
+            MamSlot("Mycelia", "Fabric", 1338531),
+            MamSlot("Mycelia", "Medical Properties", 1338532),
+            MamSlot("Mycelia", "Toxic Cellular Modification", 1338533),
+            MamSlot("Mycelia", "Vitamin Inhaler", 1338534),
+            MamSlot("Mycelia", "Parachute", 1338535),
+            MamSlot("Mycelia", "Synthethic Polyester Fabric", 1338536),
+            MamSlot("Nutrients", "Bacon Agaric", 1338537),
+            MamSlot("Nutrients", "Beryl Nut", 1338538),
+            MamSlot("Nutrients", "Paleberry", 1338539),
+            MamSlot("Nutrients", "Nutritional Processor", 1338540),
+            MamSlot("Nutrients", "Nutritional Inhaler", 1338541),
+            MamSlot("Power Slugs", "Slug Scanning", 1338542),
+            MamSlot("Power Slugs", "Blue Power Slugs", 1338543),
+            MamSlot("Power Slugs", "Yellow Power Shards", 1338544),
+            MamSlot("Power Slugs", "Purple Power Shards", 1338545),
+            MamSlot("Power Slugs", "Overclock Production", 1338546),
+            MamSlot("Quartz", "Crystal Oscillator", 1338547),
+            MamSlot("Quartz", "Quartz Crystals", 1338548),
+            MamSlot("Quartz", "Quartz", 1338549),
+            MamSlot("Quartz", "Shatter Rebar", 1338550),
+            MamSlot("Quartz", "Silica", 1338551),
+            MamSlot("Quartz", "Explosive Resonance Application", 1338552),
+            MamSlot("Quartz", "Blade Runners", 1338553),
+            MamSlot("Quartz", "The Explorer", 1338554),
+            MamSlot("Quartz", "Radio Signal Scanning", 1338555),
+            MamSlot("Quartz", "Inflated Pocket Dimension", 1338556),
+            MamSlot("Quartz", "Radar Technology", 1338557),
+            MamSlot("Sulfur", "The Nobelisk Detonator", 1338558),
+            MamSlot("Sulfur", "Smokeless Powder", 1338559),
+            MamSlot("Sulfur", "Sulfur", 1338560),
+            MamSlot("Sulfur", "Inflated Pocket Dimension", 1338561),
+            MamSlot("Sulfur", "The Rifle", 1338562),
+            MamSlot("Sulfur", "Compacted Coal", 1338563),
+            MamSlot("Sulfur", "Black Powder", 1338564),
+            MamSlot("Sulfur", "Explosive Rebar", 1338565),
+            MamSlot("Sulfur", "Cluster Nobelisk", 1338566),
+            MamSlot("Sulfur", "Experimental Power Generation", 1338567),
+            # 1338568 Turbo Rifle Ammo
+            MamSlot("Sulfur", "Turbo Fuel", 1338569),
+            MamSlot("Sulfur", "Expanded Toolbelt", 1338570),
+            # 1338571 Nuclear Deterrent Development
+            # 1338572 Synthetic Power Shards
+            # 1338573 Rocket Fuel
+            # 1338574 Ionized Fuel
+            MamSlot("Alien Technology", "SAM Analysis", 1338575),
+            MamSlot("Alien Technology", "SAM Reanimation", 1338576),
+            MamSlot("Alien Technology", "SAM Fluctuator", 1338577),
+            MamSlot("Alien Technology", "Mercer Sphere Analysis", 1338578),
+            MamSlot("Alien Technology", "Dimensional Depot", 1338579),
+            MamSlot("Alien Technology", "Manual Depot Uploader", 1338580),
+            MamSlot("Alien Technology", "Depot Expansion (200%)", 1338581),
+            MamSlot("Alien Technology", "Depot Expansion (300%)", 1338582),
+            MamSlot("Alien Technology", "Depot Expansion (400%)", 1338583),
+            MamSlot("Alien Technology", "Depot Expansion (500%)", 1338584),
+            MamSlot("Alien Technology", "Upload Upgrade: 30/min", 1338585),
+            MamSlot("Alien Technology", "Upload Upgrade: 60/min", 1338586),
+            MamSlot("Alien Technology", "Upload Upgrade: 120/min", 1338587),
+            MamSlot("Alien Technology", "Upload Upgrade: 240/min", 1338588),
+            MamSlot("Alien Technology", "Somersloop Analysis", 1338589),
+            MamSlot("Alien Technology", "Alien Energy Harvesting", 1338590),
+            MamSlot("Alien Technology", "Production Amplifier", 1338591),
+            MamSlot("Alien Technology", "Power Augmenter", 1338592),
+            # 1338593 Alien Power Matrix
+            MamSlot("Quartz", "Material Resonance Screening", 1338594),  # 1.1
+            # 1338600 - 1338699 - Harddrives - Harddrives
+            ShopSlot(self.state_logic, 1, 3, 1338700),
+            ShopSlot(self.state_logic, 2, 3, 1338701),
+            ShopSlot(self.state_logic, 3, 5, 1338702),
+            ShopSlot(self.state_logic, 4, 5, 1338703),
+            ShopSlot(self.state_logic, 5, 10, 1338704),
+            ShopSlot(self.state_logic, 6, 10, 1338705),
+            ShopSlot(self.state_logic, 7, 20, 1338706),
+            ShopSlot(self.state_logic, 8, 20, 1338707),
+            ShopSlot(self.state_logic, 9, 50, 1338708),
+            ShopSlot(self.state_logic, 10, 50, 1338709)
+        ]
+
+        if max_tier > 8:
+            all_locations.append(MamSlot("Power Slugs", "Synthetic Power Shards", 1338572))
+        if max_tier > 8:
+            all_locations.append(MamSlot("Alien Technology", "Alien Power Matrix", 1338593))
+        if max_tier > 2:
+            all_locations.append(MamSlot("Sulfur", "Turbo Rifle Ammo", 1338568))
+        if max_tier > 2:
+            all_locations.append(MamSlot("Sulfur", "Nuclear Deterrent Development", 1338571))
+        if max_tier > 4:
+            all_locations.append(MamSlot("Sulfur", "Rocket Fuel", 1338573))
+        if max_tier > 6:
+            all_locations.append(MamSlot("Sulfur", "Ionized Fuel", 1338574))
+
+        return all_locations
+
+    def get_locations_for_data_package(self) -> dict[str, int]:
+        """Must include all possible location names and their id's"""
+
+        # 1338000 - 1338499 - Milestones
+        # 1338500 - 1338599 - Mam
+        # 1338600 - 1338699 - Harddrives
+        # 1338700 - 1338709 - Shop
+        # 1338999 - Upper bound
+
+        location_table = self.get_base_location_table(self.max_tiers)
+        location_table.extend(self.get_hub_locations(True, self.max_tiers))
+        location_table.extend(self.get_hard_drive_locations(True, self.max_tiers, set()))
+        location_table.append(LocationData("Overworld", "UpperBound", 1338999))
+
+        return {location.name: location.code for location in location_table}
+
+    def get_locations(self) -> list[LocationData]:
+        """Only return location used in this game based on settings"""
+
+        if not self.game_logic or not self.options or not self.state_logic or not self.items:
+            raise Exception("Locations need to be initialized with logic, options and items before using this method")
+
+        max_tier_for_game = min(self.options.final_elevator_phase * 2, len(self.game_logic.hub_layout))
+
+        location_table = self.get_base_location_table(max_tier_for_game)
+        location_table.extend(self.get_hub_locations(False, max_tier_for_game))
+        location_table.extend(self.get_hard_drive_locations(False, max_tier_for_game, self.critical_path.required_parts))
+        location_table.extend(self.get_logical_event_locations(self.options.final_elevator_phase.value))
+
+        return location_table
+
+    def get_hub_locations(self, for_data_package: bool, max_tier: int) -> list[LocationData]:
+        location_table: list[LocationData] = []
+
+        number_of_slots_per_milestone_for_game: int
+        if for_data_package:
+            number_of_slots_per_milestone_for_game = self.max_slots
+        else:
+            if self.options.final_elevator_phase <= 2:
+                number_of_slots_per_milestone_for_game = self.max_slots
+            else:
+                number_of_slots_per_milestone_for_game = self.game_logic.slots_per_milestone
+
+        hub_location_id = self.hub_location_start
+        for tier in range(1, max_tier + 1):
+            for milestone in range(1, self.max_milestones + 1):
+                for slot in range(1, self.max_slots + 1):
+                    if for_data_package:
+                        location_table.append(HubSlot(tier, milestone, slot, hub_location_id))
+                    else:
+                        if tier <= max_tier \
+                                and milestone <= len(self.game_logic.hub_layout[tier - 1]) \
+                                and slot <= number_of_slots_per_milestone_for_game:
+                            
+                            location_table.append(HubSlot(tier, milestone, slot, hub_location_id))
+
+                    hub_location_id += 1
+                
+        return location_table
+
+    def get_logical_event_locations(self, final_elevator_phase: int) -> list[LocationData]:
+        location_table: list[LocationData] = []
+
+        # for performance plan is to upfront calculated everything we need
+        # and than create one massive state.has_all for each logical gate (hub tiers, elevator phases)
+
+        location_table.extend(
+            ElevatorPhase(phaseIndex, self.state_logic, self.game_logic) 
+            for phaseIndex, _ in enumerate(self.game_logic.space_elevator_phases)
+            if phaseIndex < final_elevator_phase)
+        location_table.extend(
+            part
+            for part_name, recipes in self.game_logic.recipes.items() 
+            if part_name in self.critical_path.required_parts
+            for part in Part.get_parts(self.state_logic, recipes, part_name, final_elevator_phase))
+        location_table.extend(
+            EventBuilding(self.state_logic, name, building) 
+            for name, building in self.game_logic.buildings.items()
+            if name in self.critical_path.required_buildings)
+        location_table.extend(
+            PowerInfrastructure(self.state_logic, power_level, recipes) 
+            for power_level, recipes in self.game_logic.requirement_per_powerlevel.items()
+            if power_level <= self.critical_path.required_power_level)
+
+        return location_table
+    
+    def get_hard_drive_locations(self, for_data_package: bool, max_tier: int, available_parts: set[str]) \
+            -> list[LocationData]:
+        hard_drive_locations: list[LocationData] = []
+
+        bucket_size: int
+        drop_pod_data: list[DropPodData]
+        if for_data_package:
+            bucket_size = 0
+            drop_pod_data = []
+        else:
+            bucket_size = floor((self.drop_pod_location_id_end - self.drop_pod_location_id_start) / max_tier)
+            drop_pod_data = self.game_logic.drop_pods
+            # sort, easily obtainable first, should be deterministic
+            drop_pod_data.sort(key=lambda dp: ("!" if dp.item is None else dp.item) + str(dp.x - dp.z))
+
+        for location_id in range(self.drop_pod_location_id_start, self.drop_pod_location_id_end + 1):
+            if for_data_package:
+                hard_drive_locations.append(HardDrive(DropPodData(0, 0, 0, None, 0), None, location_id, 1, False))
+            else:
+                location_id_normalized: int = location_id - self.drop_pod_location_id_start
+
+                data: DropPodData = drop_pod_data[location_id_normalized]
+                can_hold_progression: bool = location_id_normalized < self.options.hard_drive_progression_limit.value
+                tier = min(ceil((location_id_normalized + 1) / bucket_size), max_tier)
+
+                if not data.item or data.item in available_parts:
+                    hard_drive_locations.append(
+                        HardDrive(data, self.state_logic, location_id, tier, can_hold_progression))
+
+        return hard_drive_locations
diff --git a/worlds/satisfactory/Options.py b/worlds/satisfactory/Options.py
new file mode 100644
index 0000000000..012cdf79df
--- /dev/null
+++ b/worlds/satisfactory/Options.py
@@ -0,0 +1,614 @@
+from dataclasses import dataclass
+from typing import ClassVar, Any, cast
+from enum import IntEnum
+from schema import Schema, And
+from Options import PerGameCommonOptions, DeathLinkMixin, AssembleOptions, OptionGroup
+from Options import Range, NamedRange, Toggle, DefaultOnToggle, OptionSet, StartInventoryPool, Choice
+
+
+class Placement(IntEnum):
+    starting_inventory = 0
+    early = 1
+    somewhere = 2
+
+
+class PlacementLogicMeta(AssembleOptions):
+    def __new__(mcs, name: str, bases: tuple[type], attrs: dict[Any, Any]) -> "PlacementLogicMeta":
+        if "default" in attrs and isinstance(attrs["default"], Placement):
+            attrs["default"] = int(attrs["default"])
+
+        cls = super(PlacementLogicMeta, mcs).__new__(mcs, name, bases, attrs)
+        return cast(PlacementLogicMeta, cls)
+
+
+class PlacementLogic(Choice, metaclass=PlacementLogicMeta):
+    option_unlocked_from_start = Placement.starting_inventory.value
+    option_early_game = Placement.early.value
+    option_somewhere = Placement.somewhere.value
+
+
+class ChoiceMapMeta(AssembleOptions):
+    def __new__(mcs, name: str, bases: tuple[type], attrs: dict[Any, Any]) -> "ChoiceMapMeta":
+        if "choices" in attrs:
+            for index, choice in enumerate(attrs["choices"]):
+                option_name = "option_" + choice.replace(' ', '_')
+                attrs[option_name] = index
+
+                if "default" in attrs and attrs["default"] == choice:
+                    attrs["default"] = index
+
+        cls = super(ChoiceMapMeta, mcs).__new__(mcs, name, bases, attrs)
+        return cast(ChoiceMapMeta, cls)
+
+
+class ChoiceMap(Choice, metaclass=ChoiceMapMeta):
+    choices: ClassVar[dict[str, list[str]]]
+    default: str
+
+    def get_selected_list(self) -> list[str]:
+        for index, choice in enumerate(self.choices):
+            if index == self.value:
+                return self.choices[choice]
+            
+        raise Exception(f"ChoiceMap: selected choice {self.value} is not valid, valid choices are: {self.choices.keys()}")
+
+
+class ElevatorPhase(NamedRange):
+    """
+    Put the milestones accessible BEFORE this Space Elevator Phase in logic.
+    Milestones after the selected Phase are empty and contain nothing.
+    If your goal selection contains *Space Elevator Phase* then submitting this Phase's elevator package completes that goal.
+    If the goal is not enabled, this setting simply limits the HUB's content.
+    
+    Estimated in-game completion times:
+    
+    - **Phase 1 (Tiers 1-2)**: ~3 Hours
+    - **Phase 2 (Tiers 1-4)**: ~8 Hours
+    - **Phase 3 (Tiers 1-6)**: ~50 Hours
+    - **Phase 4 (Tiers 1-8)**: ~100 Hours
+    - **Phase 5 (Tiers 1-9)**: ~150 Hours
+    """
+    display_name = "Final Space Elevator Phase in logic"
+    default = 2
+    range_start = 1
+    range_end = 5
+    special_range_names = {
+        "phase 1 (tiers 1-2)": 1,
+        "phase 2 (tiers 1-4)": 2,
+        "phase 3 (tiers 1-6)": 3,
+        "phase 4 (tiers 1-8)": 4,
+        "phase 5 (tiers 1-9)": 5,
+    }
+
+
+class ResourceSinkPointsTotal(NamedRange):
+    """
+    Does nothing if *AWESOME Sink Points (total)* goal is not enabled.
+
+    Sink an amount of items totalling this amount of points to finish.
+    This setting is a *point count*, not a *coupon* count!
+
+    In the base game, it takes 347 coupons to unlock every non-repeatable purchase, or 1895 coupons to purchase every non-producible item.
+
+    Use the **TFIT - Ficsit Information Tool** mod or the Satisfactory wiki to find out how many points items are worth.
+
+    If you have *Free Samples* enabled, consider setting this higher so that you can't reach the goal just by sinking your Free Samples.
+    """
+    # Coupon data for above comment from https://satisfactory.wiki.gg/wiki/AWESOME_Shop
+    display_name = "AWESOME Sink points total"
+    default = 2166000
+    range_start = 2166000
+    range_end = 18436379500
+    special_range_names = {
+        "50 coupons (~2m points)": 2166000,
+        "100 coupons (~18m points)": 17804500,
+        "150 coupons (~61m points)": 60787500,
+        "200 coupons (~145m points)": 145053500,
+        "250 coupons (~284m points)": 284442000,
+        "300 coupons (~493m points)": 492825000,
+        "350 coupons (~784m points)": 784191000,
+        "400 coupons (~1,2b points)": 1172329500,
+        "450 coupons (~1,7b points)": 1671112500,
+        "500 coupons (~2b points)": 2294578500,
+        "550 coupons (~3b points)": 3056467000,
+        "600 coupons (~4b points)": 3970650000,
+        "650 coupons (~5b points)": 5051216000,
+        "700 coupons (~6b points)": 6311854500,
+        "750 coupons (~8b points)": 7766437500,
+        "800 coupons (~9b points)": 9429103500,
+        "850 coupons (~11b points)": 11313492000,
+        "900 coupons (~13b points)": 13433475000,
+        "950 coupons (~16b points)": 15803241000,
+        "1000 coupons (~18b points)": 18436379500
+    }
+
+
+class ResourceSinkPointsPerMinute(NamedRange):
+    """
+    Does nothing if *AWESOME Sink Points (per minute)* goal is not enabled.
+
+    Sink items to maintain a sink points per minute of the chosen amount for 10 minutes to finish.
+    This setting is in *points per minute* on the orange track, so DNA Capsules don't count.
+    This option's presets are example production thresholds - you don't have to sink exactly those specific items.
+
+    Use the **TFIT - Ficsit Information Tool** mod or the Satisfactory wiki to find out how many points items are worth.
+    """
+    # Coupon data for above comment from https://satisfactory.wiki.gg/wiki/AWESOME_Shop
+    display_name = "AWESOME Sink points per minute"
+    default = 50000
+    range_start = 1000
+    range_end = 10000000
+    special_range_names = {
+        "~500 screw/min": 1000,
+        "~100 reinforced iron plate/min": 12000,
+        "~100 stator/min": 24000,
+        "~100 modular frame/min": 40000,
+        "~100 smart plating/min": 50000,
+        "~20 crystal oscillator/min": 60000,
+        "~50 motor/min": 76000,
+        "~10 heavy modular frame/min": 100000,
+        "~10 radio control unit/min": 300000,
+        "~10 fused modular frame/min": 625000,
+        "~10 supercomputer/min": 1000000,
+        "~10 pressure conversion cube/min": 2500000,
+        "~10 nuclear pasta/min": 5000000,
+        "~4 ballistic warp drive/min": 10000000,
+    }
+
+
+class HardDriveProgressionLimit(Range):
+    """
+    How many Hard Drives can contain progression items.
+    Hard Drives above this count cannot contain progression, but can still be Useful.
+    
+    There are 118 total hard drives in the world and the current implementation supports up to 100 progression hard drives.
+    """
+    display_name = "Hard Drive Progression Items"
+    default = 20
+    range_start = 0
+    range_end = 100
+
+
+class FreeSampleEquipment(Range):
+    """
+    How many free sample Equipment items are given when they are unlocked.
+    
+    (ex. Jetpack, Rifle)
+    """
+    display_name = "Free Samples: Equipment"
+    default = 1
+    range_start = 0
+    range_end = 10
+
+
+class FreeSampleBuildings(Range):
+    """
+    How many copies of a Building's construction cost are given as a free sample when they are unlocked.
+    Space Elevator is always excluded.
+    
+    (ex. Packager, Constructor, Smelter)
+    """
+    display_name = "Free Samples: Buildings"
+    default = 5
+    range_start = 0
+    range_end = 10
+
+
+class FreeSampleParts(NamedRange):
+    """
+    How many general crafting component free samples are given when their recipe is unlocked.
+    Space Elevator Project Parts are always excluded.
+    
+    Negative numbers mean that fraction of a full stack.
+    
+    (ex. Iron Plate, Packaged Turbofuel, Reinforced Modular Frame)
+    """
+    display_name = "Free Samples: Parts"
+    default = -2
+    range_start = -5
+    range_end = 500
+    special_range_names = {
+        "disabled": 0,
+        "half_stack": -2,
+        "one_stack": -1,
+        "1": 1,
+        "50": 50,
+        "100": 100,
+        "200": 200,
+        "500": 500,
+    }
+
+
+class FreeSampleRadioactive(Toggle):
+    """
+    Allow free samples to include radioactive parts.
+    Remember, they are delivered directly to your player inventory.
+    """
+    display_name = "Free Samples: Radioactive"
+
+
+class TrapChance(Range):
+    """
+    Chance of traps in the item pool.
+    Traps will only replace filler items such as parts and resources.
+    
+    - **0:** No traps will be present
+    - **100:** Every filler item will be a trap.
+    """
+    display_name = "Trap Chance"
+    range_start = 0
+    range_end = 100
+    default = 10
+
+
+_trap_types = {
+        "Trap: Doggo with Pulse Nobelisk", 
+        "Trap: Doggo with Nuke Nobelisk", 
+        "Trap: Doggo with Gas Nobelisk", 
+        "Trap: Hog",
+        "Trap: Alpha Hog",
+        "Trap: Cliff Hog",
+        "Trap: Nuclear Hog",
+        "Trap: Johnny",
+        "Trap: Hatcher",
+        "Trap: Elite Hatcher",
+        "Trap: Small Stinger",
+        "Trap: Stinger",
+        "Trap: Gas Stinger",
+        "Trap: Spore Flower",
+        "Trap: Spitter",
+        "Trap: Alpha Spitter",
+        "Trap: Not the Bees",
+        "Trap: Nuclear Waste Drop",
+        "Trap: Plutonium Waste Drop",
+        "Trap: Can of Beans",
+        "Trap: Fart Cloud",
+
+        # Radioactive parts delivered via portal
+        "Bundle: Uranium",
+        "Bundle: Uranium Fuel Rod",
+        "Bundle: Uranium Waste",
+        "Bundle: Plutonium Fuel Rod",
+        "Bundle: Plutonium Pellet",
+        "Bundle: Plutonium Waste",
+        "Bundle: Non-fissile Uranium",
+        "Bundle: Ficsonium",
+        "Bundle: Ficsonium Fuel Rod"
+    }
+
+
+class TrapSelectionPreset(ChoiceMap):
+    """
+    Themed presets of trap types to enable.
+
+    If you want more control, use *Trap Override* or visit the Weighted Options page.
+    """
+    display_name = "Trap Presets"
+    choices = {
+        "Gentle": ["Trap: Doggo with Pulse Nobelisk", "Trap: Hog", "Trap: Spitter", "Trap: Can of Beans"],
+        "Normal": ["Trap: Doggo with Pulse Nobelisk", "Trap: Doggo with Gas Nobelisk", "Trap: Hog", "Trap: Alpha Hog", "Trap: Hatcher", "Trap: Elite Hatcher", "Trap: Small Stinger", "Trap: Stinger", "Trap: Spitter", "Trap: Alpha Spitter", "Trap: Not the Bees", "Trap: Nuclear Waste Drop", "Bundle: Uranium", "Bundle: Non-fissile Uranium", "Trap: Can of Beans", "Trap: Fart Cloud"],
+        "Harder": ["Trap: Doggo with Pulse Nobelisk", "Trap: Doggo with Nuke Nobelisk", "Trap: Doggo with Gas Nobelisk", "Trap: Alpha Hog", "Trap: Cliff Hog", "Trap: Spore Flower", "Trap: Hatcher", "Trap: Elite Hatcher", "Trap: Stinger", "Trap: Alpha Spitter", "Trap: Not the Bees", "Trap: Fart Cloud", "Trap: Nuclear Waste Drop", "Trap: Plutonium Waste Drop", "Bundle: Uranium", "Bundle: Uranium Fuel Rod", "Bundle: Uranium Waste", "Bundle: Plutonium Fuel Rod", "Bundle: Plutonium Pellet", "Bundle: Plutonium Waste", "Bundle: Non-fissile Uranium"],
+        "All": list(_trap_types),
+        "Ruthless": ["Trap: Doggo with Nuke Nobelisk", "Trap: Nuclear Hog", "Trap: Cliff Hog", "Trap: Elite Hatcher", "Trap: Spore Flower", "Trap: Gas Stinger", "Trap: Nuclear Waste Drop", "Trap: Plutonium Waste Drop", "Bundle: Uranium Fuel Rod", "Bundle: Uranium Waste", "Bundle: Plutonium Fuel Rod", "Bundle: Plutonium Pellet", "Bundle: Plutonium Waste", "Bundle: Non-fissile Uranium", "Bundle: Ficsonium", "Bundle: Ficsonium Fuel Rod"],
+        "All Arachnids All the Time": ["Trap: Small Stinger", "Trap: Stinger", "Trap: Gas Stinger"],
+        "Whole Hog": ["Trap: Hog", "Trap: Alpha Hog", "Trap: Cliff Hog", "Trap: Nuclear Hog", "Trap: Johnny"],
+        "Nicholas Cage": ["Trap: Hatcher", "Trap: Elite Hatcher", "Trap: Not the Bees"],
+        "Fallout": ["Trap: Doggo with Nuke Nobelisk", "Trap: Nuclear Hog", "Trap: Nuclear Waste Drop", "Trap: Plutonium Waste Drop", "Bundle: Uranium", "Bundle: Uranium Fuel Rod", "Bundle: Uranium Waste", "Bundle: Plutonium Fuel Rod", "Bundle: Plutonium Waste", "Bundle: Ficsonium", "Bundle: Ficsonium Fuel Rod"],
+    }
+    default = "Normal"
+
+
+class TrapSelectionOverride(OptionSet):
+    """
+    Precise list of traps that may be in the item pool to find.
+    If you select anything with this option it will be used instead of the *Trap Presets* setting.
+    """
+    display_name = "Trap Override"
+    valid_keys = _trap_types
+
+
+class EnergyLink(DefaultOnToggle):
+    """
+    Allow transferring energy to and from other worlds using the Power Storage building.
+    No energy is lost in the transfer on Satisfactory's side, but other worlds may have other settings.
+    """
+    display_name = "EnergyLink"
+
+
+class MamLogic(PlacementLogic):
+    """
+    Where to place the MAM building in logic.
+    Earlier means it will be more likely that you will need to interact with it for progression purposes.
+    """
+    display_name = "MAM Placement"
+    default = Placement.early.value
+
+
+class AwesomeLogic(PlacementLogic):
+    """
+    Where to place the AWESOME Shop and Sink buildings in logic.
+    Earlier means it will be more likely that you will need to interact with it for progression purposes.
+    """
+    display_name = "AWESOME Stuff Placement"
+    default = Placement.early.value
+
+
+class EnergyLinkLogic(PlacementLogic):
+    """
+    Where to place the EnergyLink building (or Power Storage if EnergyLink is disabled) in logic.
+    Earlier means it will be more likely that you will need to interact with it for progression purposes.
+    """
+    display_name = "EnergyLink Placement"
+    default = Placement.early.value
+
+
+class SplitterLogic(PlacementLogic):
+    """
+    Where to place the Conveyor Splitter and Merger buildings in logic.
+    Earlier means it will be more likely that you will need to interact with it for progression purposes.
+    """
+    display_name = "Splitter and Merger Placement"
+    default = Placement.starting_inventory.value
+
+
+_skip_tutorial_starting_items = [
+    # https://satisfactory.wiki.gg/wiki/Onboarding
+    "Single: Portable Miner",
+    "Single: Portable Miner",
+    "Single: Portable Miner",
+    "Single: Portable Miner",
+    "Bundle: Iron Plate",
+    "Bundle: Concrete",
+    "Bundle: Iron Rod",
+    "Bundle: Wire",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Single: Reinforced Iron Plate",
+    "Bundle: Cable",
+    "Bundle: Iron Ore"
+]
+
+_default_starting_items = _skip_tutorial_starting_items + [
+    "Bundle: Iron Ingot",
+    "Bundle: Copper Ingot",
+    "Bundle: Concrete",
+    "Bundle: Solid Biofuel",  # user's choice if they want to hold onto it for chainsaw or burn it right away
+    "Building: Blueprint Designer",
+    "Expanded Toolbelt",
+    "Inflated Pocket Dimension",
+    "Building: Personal Storage Box"
+]
+
+_default_plus_foundations_starting_items = _default_starting_items + [
+    "Building: Foundation",
+    "Building: Half Foundation"
+]
+
+_explorer_starting_items = _default_plus_foundations_starting_items + [
+    "Single: Parachute",
+    "Single: Blade Runners",
+    "Single: Object Scanner",
+    "Single: Boom Box",
+    "Expanded Toolbelt",
+    "Inflated Pocket Dimension"
+]
+
+_foundation_lover_starting_items = _default_plus_foundations_starting_items + [
+    "Bundle: Iron Plate", "Bundle: Iron Plate", "Bundle: Iron Plate",
+    "Bundle: Concrete", "Bundle: Concrete", "Bundle: Concrete"
+]
+
+
+class StartingInventoryPreset(ChoiceMap):
+    """
+    What resources (and buildings) the player should start with in their inventory.
+    If you want more control, visit the Weighted Options page or edit the YAML directly.
+
+    - **Barebones**: Nothing but the default xeno zapper and buildings.
+    - **Skip Tutorial Inspired**: Inspired by the items you would have if you skipped the base game's tutorial.
+    - **Archipelago**: The starting items we think will lead to a fun experience.
+    - **Foundations**: 'Archipelago' option, but also guaranteeing that you have foundations unlocked at the start.
+    - **Foundation Lover**: You really like foundations.
+    - **Explorer**: 'Foundations' option plus one set of early exploration equipment (Parachute, Blade Runners, Object Scanner, Boom Box).
+    """
+    display_name = "Starting Goodies Presets"
+    choices = {
+        "Barebones": [],  # Nothing but the xeno zapper
+        "Skip Tutorial Inspired": _skip_tutorial_starting_items,
+        "Archipelago": _default_starting_items,
+        "Foundations": _default_plus_foundations_starting_items,
+        "Foundation Lover": _foundation_lover_starting_items,
+        "Explorer": _explorer_starting_items
+    }
+    default = "Archipelago"
+
+
+class ExplorationCollectableCount(Range):
+    """
+    Does nothing if *Exploration Collectables* goal is not enabled.
+
+    Collect this amount of Mercer Spheres, Somersloops, Hard Drives, Paleberries, Beryl Nuts, and Bacon Agarics each to finish.
+
+    - The amount of **Mercer Spheres** is **2x** the selected amount
+    - The amount of **Somersloops** is **the** selected amount
+    - The amount of **Hard Drives** is **1/5th** the selected amount
+    - The amount of **Paleberries** is **10x** the selected amount
+    - The amount of **Beryl Nuts** is **20x** the selected amount
+    - The amount of **Bacon Agarics** is **the** selected amount
+    """
+    display_name = "Exploration Collectables"
+    default = 20
+    range_start = 5
+    range_end = 100
+
+
+class MilestoneCostMultiplier(Range):
+    """
+    Multiplies the amount of resources needed to unlock a Milestone by this factor.
+
+    The value is a percentage:
+
+    - **50** = half cost
+    - **100** = normal milestone cost
+    - **200** = double the cost
+    """
+    display_name = "Milestone cost multiplier %"
+    default = 100
+    range_start = 1
+    range_end = 500
+
+
+class GoalSelection(OptionSet):
+    """
+    What will be your goal(s)?
+    Configure them further with other options.
+
+    Possible values are:
+    - **Space Elevator Phase**
+    - **AWESOME Sink Points (total)**
+    - **AWESOME Sink Points (per minute)**
+    - **Exploration Collectables**
+    """
+    display_name = "Select your Goals"
+    valid_keys = {
+        "Space Elevator Phase",
+        "AWESOME Sink Points (total)",
+        "AWESOME Sink Points (per minute)",
+        "Exploration Collectables",
+        # "Erect a FICSMAS Tree",
+    }
+    default = {"Space Elevator Phase"}
+    schema = Schema(And(set, len),
+                    error="yaml does not specify a goal, the Satisfactory option `goal_selection` is empty")
+
+
+class GoalRequirement(Choice):
+    """
+    Of the goals selected in *Select your Goals*, how many must be reached to complete your slot?
+    """
+    display_name = "Goal Requirements"
+    option_require_any_one_goal = 0
+    option_require_all_goals = 1
+    default = 0
+
+
+class RandomizeTier0(DefaultOnToggle):
+    """
+    Randomizes what recipes you use to craft the default unlocked parts:
+    Iron Ingot, Iron Plate, Iron Rod, Copper Ingot, Wire, Concrete, Screw, Reinforced Iron Plate
+
+    * Could require usage of Foundries or Assemblers (which get unlocked by default if needed, at reduced build costs)
+    * Could require other ores to be mixed in via alt recipes (which will become hand-craftable if needed)
+    """
+    display_name = "Randomize Default Part Recipes"
+
+
+@dataclass
+class SatisfactoryOptions(PerGameCommonOptions, DeathLinkMixin):
+    goal_selection: GoalSelection
+    goal_requirement: GoalRequirement
+    final_elevator_phase: ElevatorPhase
+    goal_awesome_sink_points_total: ResourceSinkPointsTotal
+    goal_awesome_sink_points_per_minute: ResourceSinkPointsPerMinute
+    goal_exploration_collectables_amount: ExplorationCollectableCount
+    hard_drive_progression_limit: HardDriveProgressionLimit
+    free_sample_equipment: FreeSampleEquipment
+    free_sample_buildings: FreeSampleBuildings
+    free_sample_parts: FreeSampleParts
+    free_sample_radioactive: FreeSampleRadioactive
+    starting_inventory_preset: StartingInventoryPreset
+    mam_logic_placement: MamLogic
+    awesome_logic_placement: AwesomeLogic
+    energy_link_logic_placement: EnergyLinkLogic
+    splitter_placement: SplitterLogic
+    milestone_cost_multiplier: MilestoneCostMultiplier
+    trap_chance: TrapChance
+    trap_selection_preset: TrapSelectionPreset
+    trap_selection_override: TrapSelectionOverride
+    energy_link: EnergyLink
+    start_inventory_from_pool: StartInventoryPool
+    randomize_starter_recipes: RandomizeTier0
+
+
+option_groups = [
+    OptionGroup("Game Scope", [
+        ElevatorPhase,
+        HardDriveProgressionLimit
+    ]),
+    OptionGroup("Goal Selection", [
+        GoalSelection,
+        GoalRequirement,
+        ResourceSinkPointsTotal,
+        ResourceSinkPointsPerMinute,
+        ExplorationCollectableCount
+    ]),
+    OptionGroup("Placement logic", [
+        StartingInventoryPreset,
+        RandomizeTier0,
+        MamLogic,
+        AwesomeLogic,
+        SplitterLogic,
+        EnergyLinkLogic
+    ], start_collapsed=True),
+    OptionGroup("Free Samples", [
+        FreeSampleEquipment,
+        FreeSampleBuildings,
+        FreeSampleParts,
+        FreeSampleRadioactive
+    ], start_collapsed=True),
+    OptionGroup("Traps", [
+        TrapChance,
+        TrapSelectionPreset,
+        TrapSelectionOverride
+    ], start_collapsed=True)
+]
+
+option_presets: dict[str, dict[str, Any]] = {
+    "Short": {
+        "final_elevator_phase": 1,
+        "goal_selection": {"Space Elevator Phase", "AWESOME Sink Points (total)"},
+        "goal_requirement": GoalRequirement.option_require_any_one_goal,
+        "goal_awesome_sink_points_total": 17804500,  # 100 coupons
+        "hard_drive_progression_limit": 20,
+        "starting_inventory_preset": 3,  # "Foundations"
+        "randomize_starter_recipes": False,
+        "mam_logic_placement": Placement.starting_inventory.value,
+        "awesome_logic_placement": Placement.starting_inventory.value,
+        "energy_link_logic_placement": Placement.starting_inventory.value,
+        "splitter_placement": Placement.starting_inventory.value,
+        "milestone_cost_multiplier": 50,
+        "trap_selection_preset": 1  # Gentle
+    },
+    "Long": {
+        "final_elevator_phase": 3,
+        "goal_selection": {"Space Elevator Phase", "AWESOME Sink Points (per minute)"},
+        "goal_requirement": GoalRequirement.option_require_all_goals,
+        "goal_awesome_sink_points_per_minute": 100000,  # ~10 heavy modular frame/min
+        "hard_drive_progression_limit": 60,
+        "mam_logic_placement": Placement.somewhere.value,
+        "awesome_logic_placement": Placement.somewhere.value,
+        "energy_link_logic_placement": Placement.somewhere.value,
+        "splitter_placement": Placement.somewhere.value,
+        "trap_selection_preset": 3  # Harder
+    },
+    "Extra Long": {
+        "final_elevator_phase": 5,
+        "goal_selection": {"Space Elevator Phase", "AWESOME Sink Points (per minute)"},
+        "goal_requirement": GoalRequirement.option_require_all_goals,
+        "goal_awesome_sink_points_per_minute": 625000,  # ~10 fused modular frame/min
+        "hard_drive_progression_limit": 100,
+        "mam_logic_placement": Placement.somewhere.value,
+        "awesome_logic_placement": Placement.somewhere.value,
+        "energy_link_logic_placement": Placement.somewhere.value,
+        "splitter_placement": Placement.somewhere.value,
+        "milestone_cost_multiplier": 300,
+        "trap_selection_preset": 4  # All
+    }
+} 
diff --git a/worlds/satisfactory/Regions.py b/worlds/satisfactory/Regions.py
new file mode 100644
index 0000000000..4ab4ea327d
--- /dev/null
+++ b/worlds/satisfactory/Regions.py
@@ -0,0 +1,199 @@
+from typing import Optional
+from collections.abc import Callable
+from BaseClasses import MultiWorld, Region, Location, Item, CollectionState
+from .Locations import LocationData
+from .GameLogic import GameLogic, PowerInfrastructureLevel
+from .StateLogic import StateLogic
+from .Options import SatisfactoryOptions, Placement
+from .CriticalPathCalculator import CriticalPathCalculator
+
+
+class SatisfactoryLocation(Location):
+    game: str = "Satisfactory"
+    event_name: Optional[str]
+
+    def __init__(self, player: int, data: LocationData, region: Region):
+        super().__init__(player, data.name, data.code, region)
+
+        self.event_name = data.event_name
+
+        if data.code is None:
+            self.event = True
+            self.locked = True
+
+        if data.rule:
+            self.access_rule = data.rule
+
+        if data.non_progression:
+            self.item_rule = self.non_progression_only
+
+    @staticmethod
+    def non_progression_only(item: Item) -> bool:
+        return not item.advancement
+
+
+def create_regions_and_return_locations(multiworld: MultiWorld, options: SatisfactoryOptions, player: int,
+                                        game_logic: GameLogic, state_logic: StateLogic,
+                                        critical_path: CriticalPathCalculator, locations: list[LocationData]) -> None:
+    
+    region_names: list[str] = [
+        "Overworld",
+        "Mam",
+        "AWESOME Shop"
+    ]
+
+    for hub_tier, milestones_per_hub_tier in enumerate(game_logic.hub_layout, 1):
+        if hub_tier > (options.final_elevator_phase * 2):
+            break
+
+        region_names.append(f"Hub Tier {hub_tier}")
+
+        for milestone, _ in enumerate(milestones_per_hub_tier, 1):
+            region_names.append(f"Hub {hub_tier}-{milestone}")
+
+    region_names += [
+        building_name
+        for building_name, building in game_logic.buildings.items()
+        if building.can_produce and building_name in critical_path.required_buildings
+    ]
+
+    for tree_name, tree in game_logic.man_trees.items():
+        region_names.append(tree_name)
+
+        for node in tree.nodes:
+            if node.minimal_phase <= options.final_elevator_phase:
+                region_names.append(f"{tree_name}: {node.name}")
+
+    locations_per_region: dict[str, list[LocationData]] = get_locations_per_region(locations)
+    regions: dict[str, Region] = create_regions(multiworld, player, locations_per_region, region_names)
+
+    if __debug__:
+        throw_if_any_location_is_not_assigned_to_a__region(regions, locations_per_region)
+        
+    multiworld.regions += regions.values()
+
+    super_early_game_buildings: list[str] = [
+        "Foundation", 
+        "Walls Orange"
+    ]
+
+    early_game_buildings: list[str] = [
+        PowerInfrastructureLevel.Automated.to_name()
+    ]
+
+    if options.mam_logic_placement.value == Placement.early:
+        early_game_buildings.append("MAM")
+    if options.awesome_logic_placement.value == Placement.early:
+        early_game_buildings.append("AWESOME Sink")
+        early_game_buildings.append("AWESOME Shop")
+    if options.energy_link_logic_placement.value == Placement.early:
+        early_game_buildings.append("Power Storage")
+    if options.splitter_placement == Placement.early:
+        super_early_game_buildings.append("Conveyor Splitter")
+        super_early_game_buildings.append("Conveyor Merger")
+
+    if options.final_elevator_phase == 1:
+        super_early_game_buildings.extend(early_game_buildings)
+
+    # Hub Tier 1 and 2 are always accessible, so universal tracker should display them out the gates
+    is_universal_tracker = getattr(multiworld, "generation_is_fake", False)
+
+    connect(regions, "Overworld", "Hub Tier 1")
+    connect(regions, "Hub Tier 1", "Hub Tier 2",
+            lambda state: is_universal_tracker or state_logic.can_build_all(state, super_early_game_buildings))
+
+    if options.final_elevator_phase >= 2:
+        connect(regions, "Hub Tier 2", "Hub Tier 3", lambda state: state.has("Elevator Phase 1", player)
+                and (is_universal_tracker or state_logic.can_build_all(state, early_game_buildings)))
+        connect(regions, "Hub Tier 3", "Hub Tier 4")
+    if options.final_elevator_phase >= 3:
+        connect(regions, "Hub Tier 4", "Hub Tier 5", lambda state: state.has("Elevator Phase 2", player))
+        connect(regions, "Hub Tier 5", "Hub Tier 6")
+    if options.final_elevator_phase >= 4:
+        connect(regions, "Hub Tier 6", "Hub Tier 7", lambda state: state.has("Elevator Phase 3", player))
+        connect(regions, "Hub Tier 7", "Hub Tier 8")
+    if options.final_elevator_phase >= 5:
+        connect(regions, "Hub Tier 8", "Hub Tier 9", lambda state: state.has("Elevator Phase 4", player))
+
+    connect(regions, "Overworld", "Mam", lambda state: state_logic.can_build(state, "MAM"))
+    connect(regions, "Overworld", "AWESOME Shop",
+            lambda state: state_logic.can_build_all(state, ("AWESOME Shop", "AWESOME Sink")))
+
+    for hub_tier, milestones_per_hub_tier in enumerate(game_logic.hub_layout, 1):
+        if hub_tier > (options.final_elevator_phase * 2):
+            break
+
+        for milestone, parts_per_milestone in enumerate(milestones_per_hub_tier, 1):
+            connect(regions, f"Hub Tier {hub_tier}", f"Hub {hub_tier}-{milestone}",
+                    state_logic.get_can_produce_all_allowing_handcrafting_rule(parts_per_milestone))
+            
+    for building_name, building in game_logic.buildings.items():
+        if building.can_produce and building_name in critical_path.required_buildings:
+            connect(regions, "Overworld", building_name,
+                    lambda state, name=building_name: state_logic.can_build(state, name))
+        
+    for tree_name, tree in game_logic.man_trees.items():
+        connect(regions, "Mam", tree_name)
+
+        for node in tree.nodes:
+            if node.minimal_phase > options.final_elevator_phase:
+                continue
+
+            if not node.depends_on:
+                connect(regions, tree_name, f"{tree_name}: {node.name}",
+                        lambda state, parts=node.unlock_cost: state_logic.can_produce_all(state, parts))
+            else:
+                for parent in node.depends_on:
+                    if f"{tree_name}: {parent}" in region_names:
+                        connect(regions, f"{tree_name}: {parent}", f"{tree_name}: {node.name}",
+                                lambda state, parts=node.unlock_cost: state_logic.can_produce_all(state, parts))
+
+
+def throw_if_any_location_is_not_assigned_to_a__region(regions: dict[str, Region],
+                                                       region_names: dict[str, list[LocationData]]) -> None:
+    existing_regions = set(regions)
+    existing_region_names = set(region_names)
+
+    if existing_region_names - existing_regions:
+        raise Exception(f"Satisfactory: the following regions are used in locations: "
+                        f"{existing_region_names - existing_regions}, but no such region exists")
+
+
+def create_region(multiworld: MultiWorld, player: int,
+                  locations_per_region: dict[str, list[LocationData]], name: str) -> Region:
+
+    region = Region(name, player, multiworld)
+
+    if name in locations_per_region:
+        region.locations += [
+            SatisfactoryLocation(player, location_data, region)
+            for location_data in locations_per_region[name]
+        ]
+
+    return region
+
+
+def create_regions(multiworld: MultiWorld, player: int, locations_per_region: dict[str, list[LocationData]],
+                   region_names: list[str]) -> dict[str, Region]:
+    return {
+        name: create_region(multiworld, player, locations_per_region, name)
+        for name in region_names
+    }
+
+
+def connect(regions: dict[str, Region], source: str, target: str,
+            rule: Optional[Callable[[CollectionState], bool]] = None) -> None:
+
+    source_region = regions[source]
+    target_region = regions[target]
+
+    source_region.connect(target_region, rule=rule)
+
+
+def get_locations_per_region(locations: list[LocationData]) -> dict[str, list[LocationData]]:
+    per_region: dict[str, list[LocationData]] = {}
+
+    for location in locations:
+        per_region.setdefault(location.region, []).append(location)
+
+    return per_region
diff --git a/worlds/satisfactory/StateLogic.py b/worlds/satisfactory/StateLogic.py
new file mode 100644
index 0000000000..58406d4eec
--- /dev/null
+++ b/worlds/satisfactory/StateLogic.py
@@ -0,0 +1,171 @@
+from typing import Optional, Callable, ClassVar, Tuple
+from collections.abc import Iterable
+from BaseClasses import CollectionState
+from .GameLogic import Recipe, PowerInfrastructureLevel
+from .Options import SatisfactoryOptions
+from .CriticalPathCalculator import CriticalPathCalculator
+
+EventId: Optional[int] = None
+
+part_event_prefix = "Can Produce: "
+building_event_prefix = "Can Build: "
+
+
+def true_rule(_: CollectionState) -> bool:
+    return True
+
+
+def to_part_event(part: str) -> str:
+    return part_event_prefix + part
+
+
+def to_building_event(part: str) -> str:
+    return building_event_prefix + part
+
+
+def to_belt_name(power_level: int) -> str:
+    return "Conveyor Mk." + str(power_level)
+
+
+class StateLogic:
+    player: int
+    options: SatisfactoryOptions
+    critical_path: CriticalPathCalculator
+    initial_unlocked_items: set[str]
+
+    pipe_events: ClassVar[tuple[str, str]] = \
+        tuple(to_building_event(building) for building in ("Pipes Mk.1", "Pipes Mk.2"))
+    pump_events: ClassVar[tuple[str, str]] = \
+        tuple(to_building_event(building) for building in ("Pipeline Pump Mk.1", "Pipeline Pump Mk.2"))
+    hazmat_events: ClassVar[tuple[str, str]] = \
+        tuple(to_part_event(part) for part in ("Hazmat Suit", "Iodine-Infused Filter"))
+    belt_events: ClassVar[tuple[tuple[str, ...], ...]] = tuple(
+        tuple(map(to_building_event, map(to_belt_name, range(speed, 6))))
+        for speed in range(1, 6)
+    )
+
+    pipes_rule: Callable[[CollectionState], bool]
+    radio_active_rule: Callable[[CollectionState], bool]
+    belt_rules: Tuple[Callable[[CollectionState], bool], ...]
+
+    def __init__(self, player: int, options: SatisfactoryOptions, critical_path: CriticalPathCalculator):
+        self.player = player
+        self.options = options
+        self.critical_path = critical_path
+
+        self.pipes_rule = self.get_requires_pipes_rule()
+        self.radio_active_rule = self.get_requires_hazmat_rule()
+        self.belt_rule = tuple(self.get_belt_speed_rule(speed) for speed in range(1, 6))
+
+    def has_recipe(self, state: CollectionState, recipe: Recipe) -> bool:
+        return state.has(recipe.name, self.player) or recipe.name in self.critical_path.implicitly_unlocked
+
+    def can_build(self, state: CollectionState, building_name: Optional[str]) -> bool:
+        return building_name is None or state.has(building_event_prefix + building_name, self.player)
+
+    def can_build_any(self, state: CollectionState, building_names: Optional[Iterable[str]]) -> bool:
+        return building_names is None or \
+            state.has_any(map(to_building_event, building_names), self.player)
+
+    def can_build_all(self, state: CollectionState, building_names: Optional[Iterable[str]]) -> bool:
+        return building_names is None or \
+            state.has_all(map(to_building_event, building_names), self.player)
+
+    def can_produce(self, state: CollectionState, part_name: Optional[str]) -> bool:
+        return part_name is None or state.has(part_event_prefix + part_name, self.player)
+
+    def can_power(self, state: CollectionState, power_level: Optional[PowerInfrastructureLevel]) -> bool:
+        return power_level is None or state.has(building_event_prefix + power_level.to_name(), self.player)
+
+    def can_produce_all(self, state: CollectionState, parts: Optional[Iterable[str]]) -> bool:
+        return parts is None or \
+            state.has_all(map(to_part_event, parts), self.player)
+
+    def can_handcraft_single_part(self, state: CollectionState, part: str) -> bool:
+        if self.can_produce(state, part):
+            return True
+
+        if part not in self.critical_path.handcraftable_parts:
+            return False
+
+        recipes: list[Recipe] = self.critical_path.handcraftable_parts[part]
+        return any(
+            self.has_recipe(state, recipe)
+            and (not recipe.inputs or all(
+                self.can_handcraft_single_part(state, recipe_part)
+                for recipe_part in recipe.inputs))
+            for recipe in recipes)
+
+    def get_can_produce_all_allowing_handcrafting_rule(self, parts: Optional[Iterable[str]]) \
+            -> Callable[[CollectionState], bool]:
+        if not parts:
+            return true_rule
+
+        return lambda state: all(self.can_handcraft_single_part(state, part) for part in parts)
+
+    def get_requires_pipes_rule(self) -> Callable[[CollectionState], bool]:
+        return lambda state: \
+            state.has_any(self.pipe_events, self.player) and state.has_any(self.pump_events, self.player)
+
+    def get_requires_hazmat_rule(self) -> Callable[[CollectionState], bool]:
+        return lambda state: state.has_all(self.hazmat_events, self.player)
+
+    def get_belt_speed_rule(self, belt_speed: int) -> Callable[[CollectionState], bool]:
+        return lambda state: state.has_any(self.belt_events[belt_speed], self.player)
+
+    def is_recipe_producible(self, state: CollectionState, recipe: Recipe) -> bool:
+        return self.has_recipe(state, recipe) \
+               and self.can_build(state, recipe.building) \
+               and self.can_produce_all(state, recipe.inputs)
+
+    def get_can_produce_specific_recipe_for_part_rule(self, recipe: Recipe) -> Callable[[CollectionState], bool]:
+        if recipe.needs_pipes:
+            if recipe.is_radio_active:
+                if recipe.minimal_belt_speed:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.pipes_rule(state) \
+                        and self.radio_active_rule(state) \
+                        and self.belt_rule[recipe.minimal_belt_speed - 1]
+                else:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.pipes_rule(state) \
+                        and self.radio_active_rule(state)
+            else:
+                if recipe.minimal_belt_speed:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.pipes_rule(state) \
+                        and self.belt_rule[recipe.minimal_belt_speed - 1]
+                else:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.pipes_rule(state)
+        else:
+            if recipe.is_radio_active:
+                if recipe.minimal_belt_speed:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.radio_active_rule(state) \
+                        and self.belt_rule[recipe.minimal_belt_speed - 1]
+                else:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.radio_active_rule(state)
+            else:
+                if recipe.minimal_belt_speed:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe) \
+                        and self.belt_rule[recipe.minimal_belt_speed - 1]
+                else:
+                    return lambda state: \
+                        self.is_recipe_producible(state, recipe)
+
+    def is_elevator_phase(self, state: CollectionState, phase: int) -> bool:
+        limited_phase = min(self.options.final_elevator_phase - 1, phase)
+
+        if limited_phase != 0:
+            return state.has(f"Elevator Phase {limited_phase}", self.player)
+        else:
+            return True
diff --git a/worlds/satisfactory/Web.py b/worlds/satisfactory/Web.py
new file mode 100644
index 0000000000..1504b9f299
--- /dev/null
+++ b/worlds/satisfactory/Web.py
@@ -0,0 +1,20 @@
+from BaseClasses import Tutorial
+from .Options import option_groups, option_presets
+from ..AutoWorld import WebWorld
+
+
+class SatisfactoryWebWorld(WebWorld):
+    theme = "dirt"
+    setup = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Satisfactory Archipelago mod and connecting it to an Archipelago Multiworld",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Robb", "Jarno"]
+    )
+    tutorials = [setup]
+    rich_text_options_doc = True
+
+    option_groups = option_groups
+    options_presets = option_presets
diff --git a/worlds/satisfactory/__init__.py b/worlds/satisfactory/__init__.py
new file mode 100644
index 0000000000..fc5c6f2edf
--- /dev/null
+++ b/worlds/satisfactory/__init__.py
@@ -0,0 +1,263 @@
+from typing import TextIO, ClassVar, Any
+from collections.abc import Iterable
+from BaseClasses import Item, ItemClassification, CollectionState
+from NetUtils import Hint
+from .GameLogic import GameLogic
+from .Items import Items
+from .Locations import Locations, LocationData
+from .StateLogic import EventId, StateLogic
+from .Options import SatisfactoryOptions, Placement
+from .Regions import SatisfactoryLocation, create_regions_and_return_locations
+from .CriticalPathCalculator import CriticalPathCalculator
+from .Web import SatisfactoryWebWorld
+from ..AutoWorld import World
+
+
+class SatisfactoryWorld(World):
+    """
+    Satisfactory is a first-person open-world factory building game with a dash of exploration and combat.
+    Explore an alien planet, create multi-story factories, and enter conveyor belt heaven!
+    """
+
+    game = "Satisfactory"
+    options_dataclass = SatisfactoryOptions
+    options: SatisfactoryOptions
+    topology_present = False
+    web = SatisfactoryWebWorld()
+    origin_region_name = "Overworld"
+    required_client_version = (0, 6, 0)
+    ut_can_gen_without_yaml = True
+
+    game_logic: ClassVar[GameLogic] = GameLogic()
+
+    # These are set in generate_early and thus aren't always available
+    state_logic: StateLogic | None = None
+    items: Items | None = None
+    critical_path: CriticalPathCalculator | None = None
+    critical_path_seed: float | None = None
+    #
+
+    item_name_to_id = Items.item_names_and_ids
+    location_name_to_id = Locations().get_locations_for_data_package()
+    item_name_groups = Items.get_item_names_per_category(game_logic)
+
+    def generate_early(self) -> None:
+        self.process_universal_tracker_slot_data_if_available()
+
+        if not self.critical_path_seed:
+            self.critical_path_seed = self.random.random()
+
+        if self.options.mam_logic_placement.value == Placement.starting_inventory:
+            self.push_precollected_by_name("Building: MAM")
+        if self.options.awesome_logic_placement.value == Placement.starting_inventory:
+            self.push_precollected_by_name("Building: AWESOME Sink")
+            self.push_precollected_by_name("Building: AWESOME Shop")
+        if self.options.energy_link_logic_placement.value == Placement.starting_inventory:
+            self.push_precollected_by_name("Building: Power Storage")
+        if self.options.splitter_placement == Placement.starting_inventory:
+            self.push_precollected_by_name("Building: Conveyor Splitter")
+            self.push_precollected_by_name("Building: Conveyor Merger")
+
+        if not self.options.trap_selection_override.value:
+            self.options.trap_selection_override.value = set(self.options.trap_selection_preset.get_selected_list())
+
+        self.critical_path = CriticalPathCalculator(self.game_logic, self.critical_path_seed, self.options)
+        self.critical_path.calculate()
+
+        self.state_logic = StateLogic(self.player, self.options, self.critical_path)
+        self.items = Items(self.player, self.game_logic, self.random, self.options, self.critical_path)
+
+        starting_inventory: list[str] = self.options.starting_inventory_preset.get_selected_list()
+        for item_name in starting_inventory:
+            self.push_precollected_by_name(item_name)
+
+    def create_regions(self) -> None:
+        locations: list[LocationData] = \
+            Locations(self.game_logic, self.options, self.state_logic, self.items, self.critical_path).get_locations()
+        create_regions_and_return_locations(
+            self.multiworld, self.options, self.player, self.game_logic, self.state_logic, self.critical_path,
+            locations)
+
+    def create_items(self) -> None:
+        self.setup_events()
+
+        number_of_locations: int = len(self.multiworld.get_unfilled_locations(self.player))
+        precollected_items: list[Item] = self.multiworld.precollected_items[self.player]
+
+        self.multiworld.itempool += \
+            self.items.build_item_pool(self.random, precollected_items, number_of_locations)
+
+    def set_rules(self) -> None:
+        resource_sink_goal: bool = "AWESOME Sink Points (total)" in self.options.goal_selection \
+                                   or "AWESOME Sink Points (per minute)" in self.options.goal_selection
+
+        required_parts = set(self.game_logic.space_elevator_phases[self.options.final_elevator_phase.value - 1].keys())
+
+        if resource_sink_goal:
+            required_parts.union(self.game_logic.buildings["AWESOME Sink"].inputs)
+
+        self.multiworld.completion_condition[self.player] = \
+            lambda state: self.state_logic.can_produce_all(state, required_parts)
+
+    def collect(self, state: CollectionState, item: Item) -> bool:
+        change = super().collect(state, item)
+        if change and item.name in self.game_logic.indirect_recipes:
+            state.prog_items[self.player][self.game_logic.indirect_recipes[item.name]] += 1
+        return change
+
+    def remove(self, state: CollectionState, item: Item) -> bool:
+        change = super().remove(state, item)
+        if change and item.name in self.game_logic.indirect_recipes:
+            state.prog_items[self.player][self.game_logic.indirect_recipes[item.name]] -= 1
+        return change
+
+    def fill_slot_data(self) -> dict[str, object]:
+        slot_hub_layout: list[list[dict[str, int]]] = []
+
+        for tier, milestones in enumerate(self.game_logic.hub_layout, 1):
+            slot_hub_layout.append([])
+            for milestone, parts in enumerate(milestones, 1):
+                slot_hub_layout[tier - 1].append({})
+                for part, amount in parts.items():
+                    multiplied_amount = int(max(amount * (self.options.milestone_cost_multiplier / 100), 1))
+                    slot_hub_layout[tier - 1][milestone - 1][self.item_id_str(part)] = multiplied_amount
+
+        starting_recipes: tuple[int, ...] = tuple(
+            self.item_name_to_id[recipe_name]
+            for recipe_name in self.critical_path.tier_0_recipes
+        )
+
+        return {
+            "Data": {
+                "HubLayout": slot_hub_layout,
+                "ExplorationCosts": {
+                    self.item_id_str("Mercer Sphere"): int(self.options.goal_exploration_collectables_amount.value * 2),
+                    self.item_id_str("Somersloop"): self.options.goal_exploration_collectables_amount.value,
+                    self.item_id_str("Hard Drive"): int(self.options.goal_exploration_collectables_amount.value / 5),
+                    self.item_id_str("Paleberry"): self.options.goal_exploration_collectables_amount.value * 10,
+                    self.item_id_str("Beryl Nut"): self.options.goal_exploration_collectables_amount.value * 20,
+                    self.item_id_str("Bacon Agaric"): self.options.goal_exploration_collectables_amount.value,
+                },
+                "Options": {
+                    "GoalSelection": self.options.goal_selection.value,
+                    "GoalRequirement": self.options.goal_requirement.value,
+                    "FinalElevatorPhase": self.options.final_elevator_phase.value,
+                    "FinalResourceSinkPointsTotal": self.options.goal_awesome_sink_points_total.value,
+                    "FinalResourceSinkPointsPerMinute": self.options.goal_awesome_sink_points_per_minute.value,
+                    "FreeSampleEquipment": self.options.free_sample_equipment.value,
+                    "FreeSampleBuildings": self.options.free_sample_buildings.value,
+                    "FreeSampleParts": self.options.free_sample_parts.value,
+                    "FreeSampleRadioactive": bool(self.options.free_sample_radioactive),
+                    "EnergyLink": bool(self.options.energy_link),
+                    "StartingRecipies": starting_recipes
+                },
+                "SlotDataVersion": 1,
+                "UT": {
+                    "Seed": self.critical_path_seed,
+                    "RandomizeTier0": bool(self.options.randomize_starter_recipes)
+                }
+            },
+            "DeathLink": bool(self.options.death_link)
+        }
+
+    @staticmethod
+    def interpret_slot_data(slot_data: dict[str, Any] | None) -> dict[str, Any] | None:
+        """Used by Universal Tracker, return value is passed to self.multiworld.re_gen_passthrough["Satisfactory"]"""
+        return slot_data
+
+    def process_universal_tracker_slot_data_if_available(self) -> None:
+        """Used by Universal Tracker to correctly rebuild state"""
+
+        slot_data: dict[str, Any] | None = None
+        if (hasattr(self.multiworld, "re_gen_passthrough")
+                and isinstance(self.multiworld.re_gen_passthrough, dict)
+                and "Satisfactory" in self.multiworld.re_gen_passthrough):
+            slot_data = self.multiworld.re_gen_passthrough["Satisfactory"]
+
+        if not slot_data:
+            return
+
+        if slot_data["Data"]["SlotDataVersion"] != 1:
+            raise Exception("The slot_data version mismatch, the UT's Satisfactory .apworld is different from the one "
+                            "used during generation")
+
+        self.options.goal_selection.value = slot_data["Data"]["Options"]["GoalSelection"]
+        self.options.goal_requirement.value = slot_data["Data"]["Options"]["GoalRequirement"]
+        self.options.final_elevator_phase.value = slot_data["Data"]["Options"]["FinalElevatorPhase"]
+        self.options.goal_awesome_sink_points_total.value = slot_data["Data"]["Options"]["FinalResourceSinkPointsTotal"]
+        self.options.goal_awesome_sink_points_per_minute.value = \
+            slot_data["Data"]["Options"]["FinalResourceSinkPointsPerMinute"]
+        self.options.free_sample_equipment.value = slot_data["Data"]["Options"]["FreeSampleEquipment"]
+        self.options.free_sample_buildings.value = slot_data["Data"]["Options"]["FreeSampleBuildings"]
+        self.options.free_sample_parts.value = slot_data["Data"]["Options"]["FreeSampleParts"]
+        self.options.free_sample_radioactive.value = int(slot_data["Data"]["Options"]["FreeSampleRadioactive"])
+        self.options.energy_link.value = int(slot_data["Data"]["Options"]["EnergyLink"])
+
+        self.options.milestone_cost_multiplier.value = 100 * \
+            (slot_data["Data"]["HubLayout"][0][0][self.item_id_str("Concrete")]
+                / self.game_logic.hub_layout[0][0]["Concrete"])
+        self.options.goal_exploration_collectables_amount.value = \
+            slot_data["Data"]["ExplorationCosts"][self.item_id_str("Somersloop")]
+
+        self.critical_path_seed = slot_data["Data"]["UT"]["Seed"]
+        self.options.randomize_starter_recipes.value = slot_data["Data"]["UT"]["RandomizeTier0"]
+
+    def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
+        if self.options.randomize_starter_recipes:
+            spoiler_handle.write(f'Starter Recipes:                 {sorted(self.critical_path.tier_0_recipes)}\n')
+
+    def setup_events(self) -> None:
+        location: SatisfactoryLocation
+        for location in self.get_locations():
+            if location.address == EventId:
+                item_name = location.event_name
+
+                item = Item(item_name, ItemClassification.progression, EventId, self.player)
+
+                location.place_locked_item(item)
+                location.show_in_spoiler = False
+
+    def get_filler_item_name(self) -> str:
+        if self.items:
+            return self.items.get_filler_item_name(self.random, None)
+        else:
+            return Items.get_filler_item_name_uninitialized(self.random)
+
+    def create_item(self, name: str) -> Item:
+        if self.items:
+            return self.items.create_item(name, self.player)
+        else:
+            return Items.create_item_uninitialized(name, self.player)
+
+    def extend_hint_information(self, _: dict[int, dict[int, str]]):
+        """
+        Normally used for adding entrance information, 
+        but in this case we want to create hints for locations that hold usefull items.
+        Since we only know item placements after generation is completed it was either this 
+            or fill_slot_data or modify_multidata, and this method seemed the best fit
+        """
+
+        locations_visible_from_start: set[int] = set(range(1338000, 1338099))  # ids of Hub 1-1,1 to 2-5,10
+
+        if "Building: AWESOME Shop" in self.options.start_inventory \
+                or "Building: AWESOME Shop" in self.options.start_inventory_from_pool \
+                or self.options.awesome_logic_placement.value == Placement.starting_inventory:
+            locations_visible_from_start.update(range(1338700, 1338709))  # ids of shop locations 1 to 10
+
+            location_names_with_useful_items: Iterable[str] = [
+                location.name
+                for location in self.get_locations()
+                if location.address in locations_visible_from_start and location.item \
+                        and location.item.flags & (ItemClassification.progression | ItemClassification.useful) > 0
+            ]
+
+            self.options.start_location_hints.value.update(location_names_with_useful_items)
+
+    def push_precollected_by_name(self, item_name: str) -> None:
+        item = self.create_item(item_name)
+        self.push_precollected(item)
+
+    def item_id_str(self, item_name: str) -> str:
+        # ItemIDs of bundles are shared with their component item
+        bundled_name = f"Bundle: {item_name}"
+        return str(self.item_name_to_id[bundled_name])
diff --git a/worlds/satisfactory/archipelago.json b/worlds/satisfactory/archipelago.json
new file mode 100644
index 0000000000..8788f36583
--- /dev/null
+++ b/worlds/satisfactory/archipelago.json
@@ -0,0 +1,9 @@
+{
+    "game": "Satisfactory",
+    "authors": [
+        "Jarno",
+        "Robb"
+    ],
+    "minimum_ap_version": "0.6.3",
+    "world_version": "2.2.0"
+}
diff --git a/worlds/satisfactory/docs/en_Satisfactory.md b/worlds/satisfactory/docs/en_Satisfactory.md
new file mode 100644
index 0000000000..299bdacd58
--- /dev/null
+++ b/worlds/satisfactory/docs/en_Satisfactory.md
@@ -0,0 +1,208 @@
+# Satisfactory
+
+<!-- Spellchecker config - cspell:ignore FICSIT Nobelisk Zoop -->
+
+## Where is the settings page?
+
+The [player settings 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?
+
+In Satisfactory, the HUB Milestones and MAM Research Nodes are shuffled,
+causing technologies to be obtained in a non-standard order.
+Hard Drive scanning results also contain Archipelago items,
+meaning alternate recipes could now become part of your required progression path.
+There are also a few new purchases in the AWESOME Shop.
+The materials required for constructing Assemblers and Foundries is altered to increase early game recipe variety.
+
+## What is the goal of Satisfactory?
+
+The player can choose from a number of goals using their YAML settings:
+
+- Complete the selected number of **[Space Elevator](https://satisfactory.wiki.gg/wiki/Space_Elevator) Phases**.
+  - The goal completes upon submitting your selected Space Elevator Phase. Any other progression you may have access to (HUB, MAM, AWESOME Shop) is not required for goal completion.
+  - Selecting Phase 5 is equivalent to beating the vanilla game by launching Project Assembly.
+  - Expect Phase 1 to take ~3 hours to finish, Phase 2 to take ~8 hours, Phase 3 to take ~2 days, Phase 4 to take ~1 week, and Phase 5 to take ~1.5 weeks on default settings.
+- Supply items to the [AWESOME Sink](https://satisfactory.wiki.gg/wiki/AWESOME_Sink) **totalling a configurable amount of points** to finish.
+  - The goal is tracked in the background and completes once the points total is reached.
+  - Your selected point total can be reviewed in the AWESOME Sink graph.
+  - Time to finish this goal varies significantly depending on your goal level and Free Sample settings, and can technically be reached by AFKing at any point after you unlock the Sink.
+- Supply items to the [AWESOME Sink](https://satisfactory.wiki.gg/wiki/AWESOME_Sink) **maintaining a configurable level of points per minute** to finish.
+  - The goal is tracked in the background and completes once you have maintained the selected sink points rate for 10 minutes.
+  - This goal requires establishing a more robust factory since it can't be AFKed like the points total or elevator goals.
+  - Your selected points rate can be reviewed in the AWESOME Sink graph.
+  - Time to finish this goal varies significantly depending on your Space Elevator packages in logic and the resource sink point improvement ratios of the recipes you have access to.
+- **Explore the world to gather exotic items** and submit them in the HUB.
+  - The goal completes upon submitting the HUB milestone.
+  - There is no partial progress system for this goal - combining it with another goal is recommended.
+  - Time to finish this goal varies significantly depending on your map knowledge, equipment, and movement skills.
+
+You can also configure whether completing your slot requires *any one* goal or *all* goals to be met.
+
+## What Satisfactory items can appear in other players' worlds?
+
+Satisfactory's technologies are removed from the HUB, MAM, and Hard Drives and placed into other players' worlds.
+When those technologies are found, they are sent back to Satisfactory
+along with, optionally, free samples of those technologies.
+
+Other players' worlds may have Resource Bundles of building materials, equipment, ammunition, or FICSIT Coupons.
+They may also contain Traps.
+
+## What is a Free Sample?
+
+A free sample is a package of items in Satisfactory granted in addition to a technology received from another world.
+For equipment and component crafting recipes, this is the output product.
+For buildings, this is the ingredients for the building.
+For example, receiving the [Nobelisk Detonator MAM Node](https://satisfactory.wiki.gg/wiki/Nobelisk_Detonator#Unlocking)
+would give you one Nobelisk Detonator and 50 Nobelisk,
+receiving the [Jump Pads Milestone](https://satisfactory.wiki.gg/wiki/Milestones#Tier_2)
+would give you the ingredients to construct 5 Jump Pads and 5 U-Jelly Landing Pads, etc.
+In Satisfactory multiplayer, each Satisfactory player gets a copy of the sample.
+Certain recipes and items, like Somersloops, are always excluded from samples.
+
+You can separately configure how many samples to receive for buildings, equipment, and crafting components
+in your player settings.
+
+## What is a Resource Bundle?
+
+A Resource Bundle is a package of items received as a check from another world.
+All resource bundle type items are named either `Single: <item name>` or `Bundle: <item name>` to distinguish them from component recipes.
+They must be collected by constructing an Archipelago Portal.
+For example, `Single: Jetpack` would contain a single jetpack, and `Bundle: Biomass` would contain one stack of biomass.
+
+Any Resource Bundle type items added to your starting inventory will be delivered to your player inventory when you initally spawn,
+unless they can't fit, in which case they can be collected by building an Archipelago Portal.
+
+## What is a Trap?
+
+Traps are items intended to disrupt the player that replace non-progression filler items.
+Satisfactory's traps currently include spawning disruptive creatures or sending inconvenient items to your Archipelago Portal.
+The player settings page gives full control over which traps are enabled,
+how many traps replace filler items,
+as well as some pre-selected groups of themed traps.
+
+A complete list of traps and their effects is intentionally omitted to keep some surprise and mystery.
+In the current implementation, the most severe traps could temporarily lock you out of a small area until you have gas/radiation protection.
+
+## What does another world's item look like in Satisfactory?
+
+In Satisfactory, items which need to be sent to other worlds appear in the HUB and MAM as info cards
+in a similar manner to the base game's building and recipe unlocks.
+Info cards have the Archipelago icon
+and are color coded to indicate what Archipelago progression type they are.
+
+Hover over them to read a description, since many Satisfactory UIs (such as the MAM) cut this information off.
+
+![screenshot of HUB with some remote and some local items](https://raw.githubusercontent.com/Jarno458/SatisfactoryArchipelagoMod/main/Docs/localAndRemoteItems.JPG)
+
+Upon successful unlock of the technology, the item will be sent to its home world.
+
+## When the pioneer receives an item, what happens?
+
+When the player receives a technology, it is instantly unlocked and able to be crafted or constructed.
+A message will appear in the chat to notify the player,
+and if free samples are enabled the player may also receive some items delivered directly to their inventory.
+Bundles will instantly be added to the Archipelago Portal network and can be collected at any Archipelago Portal.
+
+## What is EnergyLink?
+
+EnergyLink is an energy storage supported by certain games that is shared across all worlds in a multiworld.
+In Satisfactory, if enabled in the player settings, all base-game Power Storage buildings will act as Energy Link interfaces.
+They will deposit surplus produced energy and draw energy from the shared storage when needed.
+
+Just like the base game, there is no limit to the discharge/draw rate of one building,
+and each Power Storage provides 100 MW of charging throughput.
+The shared storage has unlimited capacity, and only a small amount of energy is lost during depositing.
+The amount of energy currently in the shared storage is displayed in the Archipelago client
+and appears in the Power Storage building UI.
+
+You can find a list of Energy Link compatible games on the
+[Archipelago Discord](https://discord.com/channels/731205301247803413/1010929117748809758/1174728119568048130).
+
+## What is the Archipelago Portal?
+
+The Archipelago Portal is a building that serves multiple purposes:
+
+- Collecting received "Resource Bundle"-type items.
+- Transfering items within your Satisfactory world to other Portals
+- Transfering items between multiple Satisfactory worlds
+- Gifting items to other games that support the **Archipelago Gifting** system.
+
+The building requires power to operate.
+You can build multiple portals or use faster belts to increase their bandwith.
+However, they currently have no filtering capabilities,
+so you must deal with this problem when handling their output items.
+
+You can find a list of Gifting compatible games on the
+[Archipelago Discord](https://discord.com/channels/731205301247803413/1134306496042258482/1247617772993908891).
+
+## How do Hard Drives work?
+
+All base game Hard Drive contents (alternate recipes) have been moved into the normal Archipelago pool.
+Instead, Hard Drives can contain Archipelago items from a dedicated "Hard Drive" pool.
+Scanning a drive presents a choice between 2 items from the pool,
+and the scan time has been reduced from 10 minutes to 3 seconds.
+
+Unlike the base game, Archipelago hard drive results have no hard progression requirements,
+other than access to the MAM itself.
+The random contents selection system prefers to pick items earlier in progression,
+but keeping unselected Hard Drives in the Hard Drive Library will force later progression items to be presented.
+
+The "Hard Drive Progression Items" option controls how many Hard Drives contain progression items,
+the rest are filler or useful.
+
+## Where do I run Archipelago commands?
+
+You can use the game's built-in chat menu.
+Check the game's keybinding options to see how to open it.
+Run the `/help` command to list all available commands.
+Note that Archipelago commands are *not* prefixed with `!` inside of Satisfactory.
+
+Note that multiple base-game bugs affect the chat menu's functionality
+and Archipelago can put a lot of info into the chat.
+You may wish to launch the Archipelago Text Client and use it to run commands instead of the game's chat.
+
+### Hints
+
+Archipelago's hint system is available within Satisfactory via the `/hint` command.
+Most multiworld item names have a prefix to distinguish recipes from bundles.
+For example, to hint for the Assembler, run `/hint Building: Assembler`.
+
+Satisfactory's hint system has special behavior for Satisfactory crafting items.
+If you hint the unprefixed name of an item with multiple recipes, the system will hint the recipe you are expected to find first in randomizer logic.
+For example, hinting `Smart Plating` will return the logically first Smart Plating recipe,
+but hinting `Recipe: Smart Plating` or `Recipe: Plastic Smart Plating` will hint that specific recipe for Smart Plating,
+which may or may not be in logic.
+
+Exact Archipelago Item names (for hints/starting inventory/etc.) can be found
+[on the mod's GitHub](https://github.com/Jarno458/Archipelago/blob/Satisfactory/worlds/satisfactory/Items.py).
+
+## Multiplayer and Dedicated Servers
+
+It is possible to host a Satisfactory Archipelago Slot using the game's built in multiplayer,
+allowing other Satisfactory players to join in constructing your factory.
+This experience is wonderful - but there are few things not yet properly working for multiplayer:
+
+- Death-links do not kill clients
+- Starting inventory for clients is missing
+
+Remember that client players must have the same mods installed as the host player to join,
+however, they do not need to configure Archipelago connection settings.
+
+Dedicated server support is only working for Windows at the moment.
+
+## Additional Mods
+
+It is possible to use other Satisfactory mods in tandem with the Archipelago Satisfactory mod.
+However, no guarantee is made that they will work correctly,
+especially if they affect game progression, recipes, or add unlocks to base-game technologies.
+
+Content added by unaffiliated mods may end up inaccessible based on your chosen slot settings,
+for example, its milestones could be in a tier that is after your goal.
+You may be able to write patches using [ContentLib](https://ficsit.app/mod/ContentLib)
+to adjust other mods to work with your slot settings,
+but doing so is out of the scope of this guide.
+
+[The Satisfactory Archipelago mod GitHub](https://github.com/Jarno458/SatisfactoryArchipelagoMod/blob/main/Docs/AdditionalMods.md)
+maintains a list of additional mods that have been tested with Archipelago to some extent.
diff --git a/worlds/satisfactory/docs/setup_en.md b/worlds/satisfactory/docs/setup_en.md
new file mode 100644
index 0000000000..4486f1bb49
--- /dev/null
+++ b/worlds/satisfactory/docs/setup_en.md
@@ -0,0 +1,230 @@
+# Satisfactory Setup Guide
+
+<!-- Spellchecker config - cspell:ignore FICSIT Randomizer Plando -->
+
+## Required Software
+
+- Satisfactory, either
+  - Steam [Satisfactory (Steam)](https://store.steampowered.com/app/526870/Satisfactory/)
+  - Epic [Satisfactory (Epic)](https://www.epicgames.com/store/en-US/product/satisfactory/home)
+- Satisfactory Mod Manager, either
+  - Automatically via [smm.ficsit.app](https://smm.ficsit.app/) or
+  - Manually via [latest stable release on GitHub](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/latest/)
+
+## Overview
+
+This guide walks you through installing the Satisfactory Archipelago mod via the Satisfactory Mod Manager,
+configuring an Archipelago slot for Satisfactory,
+and playing the game with a Satisfactory client.
+
+### Defining Some Terms
+
+In Archipelago, multiple Satisfactory worlds may be played simultaneously.
+Each of these worlds must be hosted by a Satisfactory Host which is connected to the Archipelago Server via the Archipelago mod.
+
+This guide uses the following terms to refer to the software:
+
+- **Archipelago Server** - The central Archipelago server, which connects all games to each other.
+- **Archipelago Client** - The desktop application used by many Archipelago games as middleware. Satisfactory does NOT require this software, unless you would like to generate a world locally.
+- **Archipelago (Satisfactory) mod** - The Satisfactory mod which implements Archipelago in-game functionality and connectivity.
+  All Satisfactory hosts and clients must have this mod installed.
+- **Satisfactory Host** - The Satisfactory instance which will be used to host the game.
+  This could be a Satisfactory Client using Singleplayer or host-and-play multiplayer, or it could be a Satisfactory dedicated server.
+  It must be supplied with the Archipelago Server connection details.
+  *Any number of Satisfactory Clients may connect to this server.*
+- **Satisfactory Client** - The Satisfactory instance (game client) with which additional players can use to connect to the same Satisfactory world.
+
+### What a Playable State Looks Like
+
+- An Archipelago Server
+- One running modded Satisfactory Host (game client or dedicated server) per Satisfactory world
+- Optionally, additional modded Satisfactory Clients for additional players
+
+### Additional Resources
+
+- Satisfactory Wiki: [Satisfactory Official Wiki](https://satisfactory.wiki.gg/wiki/)
+- Satisfactory Modding 'Frequently Asked Questions' page: [Satisfactory Modding Documentation FAQ](https://docs.ficsit.app/satisfactory-modding/latest/faq.html)
+- Satisfactory Archipelago Item names (for hints/starting inventory/etc.) can be found [on the mod's github](https://github.com/Jarno458/Archipelago/blob/Satisfactory/worlds/satisfactory/Items.py)
+
+## Preparing to Play Satisfactory Archipelago
+
+### Installing Satisfactory
+
+Purchase and install Satisfactory via one the sources linked [above](#required-software).
+Launch the game at least once to ensure that the Mod Manager can detect the game's install location.
+
+Make sure that you are running the correct branch of the game (Release or Experimental) that Archipelago supports.
+Learn how to switch branches here:
+[Satisfactory Modding Documentation FAQ: Switching Branches](https://docs.ficsit.app/satisfactory-modding/latest/faq.html#_how_do_i_get_the_experimental_or_early_access_branch_of_the_game)
+
+### Installing Satisfactory Mod Manager
+
+The Mod Manager is used to install and manage mods for Satisfactory.
+It automatically detects your game install location and automatically handles mod dependencies for you.
+
+Download the Mod Manager here:
+[Satisfactory Mod Manager automatic download via ficsit.app](https://smm.ficsit.app/)
+
+Directions for setting and using up the Mod Manager can be found here:
+[Satisfactory Modding Documentation FAQ: Installing the Mod Manager](https://docs.ficsit.app/satisfactory-modding/latest/ForUsers/SatisfactoryModManager.html)
+
+### Installing the Archipelago Mod
+
+Once the Mod Manager is installed you can install mods directly in the manager or via the Satisfactory Mod Repository website.
+
+Inside the Mod Manager, search for and install the "Archipelago Randomizer".
+Alternatively, visit the mod page: [Archipelago Randomizer mod on ficsit.app](https://ficsit.app/mod/Archipelago).
+Once on the mod page, click the "Install" link in the Latest Versions card.
+
+The Mod Manager will install all required dependency mods for you with no additional action required.
+
+As soon as you have the relevant mods installed,
+you do not need to launch the game through the Mod Manager -
+desktop shortcuts, Steam, Epic. etc. will all launch the game with mods still loaded.
+
+### Installing Additional Mods
+
+You may also wish to install some of the suggested mods mentioned on the
+[Archipelago Info page for Satisfactory](/games/Satisfactory/info/en#additional-mods).
+If you are playing multiplayer in the same Satisfactory world, all Satisfactory Clients should have the same mods installed.
+The Mod Manager's profile import/export feature makes coordinating this easy.
+
+## Connecting to Someone Else's Satisfactory Game
+
+If you are joining someone else's existing Satisfactory game,
+your setup process is almost complete.
+If your host has sent you a Mod Manager profile containing additional mods,
+be sure to install it.
+See [Satisfactory Modding Documentation: Profiles](https://docs.ficsit.app/satisfactory-modding/latest/ForUsers/SatisfactoryModManager.html#_profiles) for more information.
+
+To get started playing, connect to the Satisfactory Host using the connection details provided by your host.
+([Satisfactory Wiki: Joining a Session](https://satisfactory.wiki.gg/wiki/Multiplayer#Joining_a_session))
+
+See the [Troubleshooting section below](#troubleshooting) if you encounter any issues.
+
+## Hosting Your Own Satisfactory Game
+
+If you're hosting your own Satisfactory game,
+you will need to configure an Archipelago world and set up the Satisfactory Host you will be playing on.
+
+### Create a Config (.yaml) File
+
+#### What is a config file and why do I need one?
+
+Your config file contains a set of configuration options
+which provide the generator with information about how it should generate your game.
+Each player of a multiworld will provide their own config file.
+This setup allows each player to enjoy an experience customized for their taste,
+and different players in the same multiworld can all have different options.
+
+#### Where do I get a config file?
+
+The Player Settings page on the website
+allows you to configure your personal settings and export a config file from them.
+Satisfactory player settings page: [Satisfactory Settings Page](/games/Satisfactory/player-settings)
+
+#### Verifying Your Config File
+
+If you would like to validate your config file to make sure it works,
+you may do so on the YAML Validator page.
+YAML Validator page: [Yaml Validation Page](/mysterycheck)
+
+#### Starting Inventory
+
+The Player Settings page provides a few options for controlling what materials you start with
+and when certain key technologies are unlocked.
+Any Resource Bundle type items added to your starting inventory will be delivered to your player inventory when you initally spawn,
+unless they can't fit, in which case they can be collected by building an Archipelago Portal.
+
+Advanced users can use Plando, Weighted Options, and manual yaml editing to further configure the starting inventory.
+If you don't wish to use these techniques, consider using Satisfactory's
+[Advanced Game Settings (Satisfactory Wiki)](https://satisfactory.wiki.gg/wiki/Advanced_Game_Settings)
+to spawn the items you desire.
+
+#### Advanced Configuration
+
+Advanced users can utilize the
+[Weighted Options Page](/weighted-options)
+and [Plando](/tutorial/Archipelago/plando)
+to futher customize their experience.
+
+### Generating and Hosting the Multiworld
+
+Generating a game and hosting an Archipelago server is explained in the [Archipelago Setup Guide](/tutorial/Archipelago/setup/en).
+
+### Creating the Satisfactory World
+
+After you have installed the mods, launch the game via the Mod Manager or via your preferred method.
+Once the game has launched, start creating a new game.
+
+Select your starting location and Skip Intro if you wish to skip the tutorial sequence,
+then click the "Mod Savegame Settings" button in the bottom right corner of the screen.
+Next, enter the connection details in the relevant fields.
+
+- **Server URI**: Archipelago Server URI and port, for example, `archipelago.gg:49236`
+- **User Name**: The name you entered as your Player Name when you created your config file. It's also listed in the Name column of your room page.
+- **Password**: The password for your Archipelago room, blank if you did not assign or receive one.
+
+Note that the Satisfactory Host/Client does *not* need a copy of your Archipelago config file.
+The mod communicates with the Archipelago Server, which already has your config file,
+to generate the required content at runtime.
+
+Consider setting the following options in the "Options" > "Gameplay" section, especially because they are per-user and persist across your game saves:
+
+- **Creature Hostility**: `Default` (the game's default). Some of the mod's Traps involve creatures, and having them Passive or Retaliate cheapens the experience.
+- **Keep Inventory**: `Keep Everything` or `Keep Equipment` (the game's default). Although dying and dropping items will never lock you out of progression, Free Samples and Bundles means you can easily gain items you can't easily replace.
+
+### Verifying Connection Success
+
+After you have created your new world,
+you should see in-game chat messages confirming that you have connected to the Archipelago Server.
+
+You can issue the `/help` command in the game's chat to list available commands, such as `/hint`.
+For more information about the commands you can use, see the [Commands Guide](/tutorial/Archipelago/commands/en).
+Note that Archipelago commands are not prefixed with `!` inside of Satisfactory.
+You may wish to use the Text Client to run commands since Satisfactory's in game chat is not very user friendly.
+
+Check out the HUB to get started!
+
+See the [Troubleshooting section below](#troubleshooting) if you encounter any issues.
+
+### Allowing Other People to Join Your Game
+
+Additional players can join your game using the game's built-in multiplayer functionality.
+For more information, see [Satisfactory Wiki: Multiplayer](https://satisfactory.wiki.gg/wiki/Multiplayer).
+
+Have anyone you want to join follow the [Preparing to Play Satisfactory Archipelago](#preparing-to-play-satisfactory-archipelago) section above.
+If you're using any additional mods, be sure to export a profile using the Mod Manager for players to import.
+[Satisfactory Modding Documentation: Sharing Mod Manager Profiles](https://docs.ficsit.app/satisfactory-modding/latest/ForUsers/SatisfactoryModManager.html#_sharing_profiles)
+
+As mentioned above, it is possible to use a Satisfactory dedicated Server as your Satisfactory Host.
+The process for setting up and configuring a dedicated server is out of scope of this guide,
+but you can find more information here: [Satisfactory Modding Documentation: Installing Mods on Dedicated Servers](https://docs.ficsit.app/satisfactory-modding/latest/ForUsers/DedicatedServerSetup.html).
+
+It is important to note that the Satisfactory Archipelago mod
+is not yet compatible with Linux dedicated servers - only Windows dedicated servers are supported.
+
+### Port Changes
+
+If you are using a public Archipelago Server to host your game,
+rooms are automatically put to sleep after a period of inactivity.
+The room can be awoken by visiting the room page on the Archipelago website.
+This may cause the room's assigned port to change,
+requiring you to update your "Mod Savegame Settings" with the new Server URI.
+To do this, open your save, go to the pause menu's "Mod Savegame Settings" section,
+enter the updated Server URI, then save and reload the game.
+
+## Troubleshooting
+
+- If you are having trouble connecting to the Archipelago Server,
+  make sure you have entered the correct server address and port.
+  The server port may have changed if the room went to sleep.
+  See the [Port Changes section](#port-changes) above for more information.
+- If you are having trouble using the Satisfactory Mod Manager, join the [Satisfactory Modding Discord](https://discord.ficsit.app) for support.
+- If you encounter a game crash, please report it to us via the [Satisfactory Modding Discord](https://discord.ficsit.app).
+  Please include the following information:
+  - What you were doing when the crash occurred.
+  - If you were a Satisfactory multiplayer host or client, and if you were playing on a dedicated server.
+  - Use the Mod Manager to generate a debug zip and attach that file.
+   [Satisfactory Modding Documentation FAQ: Generating a debug zip](https://docs.ficsit.app/satisfactory-modding/latest/faq.html#_where_can_i_find_the_games_log_files)
+  - Attach your Archipelago config file and spoiler to your report.
diff --git a/worlds/saving_princess/Client.py b/worlds/saving_princess/Client.py
index 29a97bb667..195a6a5703 100644
--- a/worlds/saving_princess/Client.py
+++ b/worlds/saving_princess/Client.py
@@ -1,4 +1,5 @@
 import argparse
+import ssl
 import zipfile
 from io import BytesIO
 
@@ -8,12 +9,13 @@ import hashlib
 import json
 import logging
 import os
+
+import certifi
 import requests
-import secrets
 import shutil
-import subprocess
+import subprocess  # nosec
 from tkinter import messagebox
-from typing import Any, Dict, Set
+from typing import Any, Dict, Set, List
 import urllib
 import urllib.parse
 
@@ -90,7 +92,7 @@ def get_timestamp(date: str) -> float:
 
 def send_request(request_url: str) -> UrlResponse:
     """Fetches status code and json response from given url"""
-    response = requests.get(request_url)
+    response = requests.get(request_url, timeout=10)
     if response.status_code == 200:  # success
         try:
             data = response.json()
@@ -129,13 +131,16 @@ def update(target_asset: str, url: str) -> bool:
         if update_available and messagebox.askyesnocancel(f"New {target_asset}",
                                                           "Would you like to install the new version now?"):
             # unzip and patch
-            with urllib.request.urlopen(release_url) as download:
+            if not release_url.lower().startswith("https"):
+                raise ValueError(f'Unexpected scheme for url "{release_url}".')
+            context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=certifi.where())
+            with urllib.request.urlopen(release_url, context=context) as download:  # nosec
                 with zipfile.ZipFile(BytesIO(download.read())) as zf:
                     zf.extractall()
             patch_game()
             set_date(target_asset, newest_date)
-    except (ValueError, RuntimeError, urllib.error.HTTPError):
-        update_error = f"Failed to apply update."
+    except (ValueError, RuntimeError, urllib.error.HTTPError, urllib.error.URLError) as e:
+        update_error = f"Failed to apply update:\n{e}"
         messagebox.showerror("Failure", update_error)
         raise RuntimeError(update_error)
     return True
@@ -158,8 +163,8 @@ def is_install_valid() -> bool:
         if not os.path.exists(file_name):
             return False
         with open(file_name, "rb") as clean:
-            current_hash = hashlib.md5(clean.read()).hexdigest()
-        if not secrets.compare_digest(current_hash, expected_hash):
+            current_hash = hashlib.md5(clean.read(), usedforsecurity=False).hexdigest()
+        if current_hash != expected_hash:
             return False
     return True
 
@@ -189,12 +194,16 @@ def install() -> None:
 
     logging.info("Extracting files from cab archive.")
     if Utils.is_windows:
-        subprocess.run(["Extrac32", "/Y", "/E", "saving_princess.cab"])
+        windows_path = os.environ["WINDIR"]
+        extractor_path = f"{windows_path}/System32/Extrac32"
+        subprocess.run([extractor_path, "/Y", "/E", "saving_princess.cab"])  #nosec
     else:
-        if shutil.which("wine") is not None:
-            subprocess.run(["wine", "Extrac32", "/Y", "/E", "saving_princess.cab"])
-        elif shutil.which("7z") is not None:
-            subprocess.run(["7z", "e", "saving_princess.cab"])
+        wine_path = shutil.which("wine")
+        p7zip_path = shutil.which("7z")
+        if wine_path is not None:
+            subprocess.run([wine_path, "Extrac32", "/Y", "/E", "saving_princess.cab"])  #nosec
+        elif p7zip_path is not None:
+            subprocess.run([p7zip_path, "e", "saving_princess.cab"])  #nosec
         else:
             error = "Could not find neither wine nor 7z.\n\nPlease install either the wine or the p7zip package."
             messagebox.showerror("Missing package!", f"Error: {error}")
@@ -250,7 +259,10 @@ def launch(*args: str) -> Any:
     if SavingPrincessWorld.settings.launch_game:
         logging.info("Launching game.")
         try:
-            subprocess.Popen(f"{SavingPrincessWorld.settings.launch_command} {name} {password} {server}")
+            game: str = os.path.join(os.getcwd(), "Saving Princess v0_8.exe")
+            launch_command: List[str] = (SavingPrincessWorld.settings.launch_command_with_args
+                                         + [game, name, password, server])
+            subprocess.Popen(launch_command)  # nosec
         except FileNotFoundError:
             error = ("Could not run the game!\n\n"
                      "Please check that launch_command in options.yaml or host.yaml is set up correctly.")
diff --git a/worlds/saving_princess/__init__.py b/worlds/saving_princess/__init__.py
index f731012abc..0c6208638a 100644
--- a/worlds/saving_princess/__init__.py
+++ b/worlds/saving_princess/__init__.py
@@ -1,3 +1,4 @@
+import shutil
 from typing import ClassVar, Dict, Any, Type, List, Union
 
 import Utils
@@ -20,6 +21,15 @@ components.append(
 )
 
 
+def get_default_launch_command() -> List[str]:
+    """Returns platform-dependant default launch command for Saving Princess"""
+    if Utils.is_windows:
+        return []
+    else:
+        wine_path = shutil.which("wine")
+        return [wine_path] if wine_path is not None else ["/usr/bin/wine"]
+
+
 class SavingPrincessSettings(Group):
     class GamePath(UserFilePath):
         """Path to the game executable from which files are extracted"""
@@ -34,17 +44,17 @@ class SavingPrincessSettings(Group):
     class LaunchGame(Bool):
         """Set this to false to never autostart the game"""
 
-    class LaunchCommand(str):
+    class LaunchCommandWithArgs(List[str]):
         """
         The console command that will be used to launch the game
         The command will be executed with the installation folder as the current directory
+        Additional items in the list will be passed in as arguments
         """
 
     exe_path: GamePath = GamePath("Saving Princess.exe")
     install_folder: InstallFolder = InstallFolder("Saving Princess")
     launch_game: Union[LaunchGame, bool] = True
-    launch_command: LaunchCommand = LaunchCommand('"Saving Princess v0_8.exe"' if Utils.is_windows
-                                                  else 'wine "Saving Princess v0_8.exe"')
+    launch_command_with_args: LaunchCommandWithArgs = LaunchCommandWithArgs(get_default_launch_command())
 
 
 class SavingPrincessWeb(WebWorld):
@@ -97,11 +107,12 @@ class SavingPrincessWorld(World):
     settings: ClassVar[SavingPrincessSettings]
 
     is_pool_expanded: bool = False
-    music_table: List[int] = list(range(16))
+    music_table: List[int]
 
     def generate_early(self) -> None:
         if not self.player_name.isascii():
             raise OptionError(f"{self.player_name}'s name must be only ASCII.")
+        self.music_table = list(range(16))
         self.is_pool_expanded = self.options.expanded_pool > 0
         if self.options.music_shuffle:
             self.random.shuffle(self.music_table)
diff --git a/worlds/saving_princess/archipelago.json b/worlds/saving_princess/archipelago.json
new file mode 100644
index 0000000000..d4f65dabff
--- /dev/null
+++ b/worlds/saving_princess/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Saving Princess",
+    "authors": [ "LeonarthCG" ],
+    "minimum_ap_version": "0.6.6",
+    "world_version": "1.0.0"
+}
diff --git a/worlds/saving_princess/docs/setup_en.md b/worlds/saving_princess/docs/setup_en.md
index 5f7cfb49f5..8dde0b30fe 100644
--- a/worlds/saving_princess/docs/setup_en.md
+++ b/worlds/saving_princess/docs/setup_en.md
@@ -135,7 +135,7 @@ Additionally, if you get an item while already having the max for that item (for
 It is likely that you do not have release or collect permissions, or that there is nothing to release or collect.
 Another option is that your connection was interrupted.
 
-If you would still like to use release or collect, refer to [this section of the server commands page](https://archipelago.gg/tutorial/Archipelago/commands/en#collect/release).
+If you would still like to use release or collect, refer to [this section of the server commands page](/tutorial/Archipelago/commands/en#collectrelease).
 
 You may use the in-game console to execute the commands, if your slot has permissions to do so.
 
diff --git a/worlds/sc2/__init__.py b/worlds/sc2/__init__.py
index b5c7b5f0cf..c57f54aa70 100644
--- a/worlds/sc2/__init__.py
+++ b/worlds/sc2/__init__.py
@@ -12,8 +12,10 @@ from .item.item_tables import (
     get_full_item_list,
     not_balanced_starting_units, WEAPON_ARMOR_UPGRADE_MAX_LEVEL,
 )
-from .item import FilterItem, ItemFilterFlags, StarcraftItem, item_groups, item_names, item_tables, item_parents, \
+from .item import (
+    FilterItem, ItemFilterFlags, StarcraftItem, item_groups, item_names, item_tables, item_parents,
     ZergItemType, ProtossItemType, ItemData
+)
 from .locations import (
 	get_locations, DEFAULT_LOCATION_LIST, get_location_types, get_location_flags,
     get_plando_locations, LocationType, lookup_location_id_to_type
@@ -117,17 +119,48 @@ class SC2World(World):
         data = get_full_item_list()[name]
         return StarcraftItem(name, data.classification, data.code, self.player)
 
-    def create_regions(self):
+    def generate_early(self) -> None:
+        # Do some options validation/recovery here
+        if not self.options.selected_races.value:
+            self.options.selected_races.value = set(options.SelectedRaces.default)
+        if not self.options.enabled_campaigns.value:
+            self.options.enabled_campaigns.value = set(options.EnabledCampaigns.default)
+
+        # Disable campaigns on vanilla-like mission orders if their race is disabled
+        if self.options.mission_order.value in options.static_mission_orders:
+            enabled_campaigns = set(self.options.enabled_campaigns.value)
+            if self.options.enable_race_swap.value == options.EnableRaceSwapVariants.option_disabled:
+                if SC2Race.TERRAN.get_title() not in self.options.selected_races.value:
+                    enabled_campaigns.discard(SC2Campaign.WOL.campaign_name)
+                if SC2Race.ZERG.get_title() not in self.options.selected_races.value:
+                    enabled_campaigns.discard(SC2Campaign.HOTS.campaign_name)
+                if SC2Race.PROTOSS.get_title() not in self.options.selected_races.value:
+                    enabled_campaigns.discard(SC2Campaign.PROPHECY.campaign_name)
+                    enabled_campaigns.discard(SC2Campaign.PROLOGUE.campaign_name)
+                    enabled_campaigns.discard(SC2Campaign.LOTV.campaign_name)
+            # Epilogue and NCO don't have raceswaps currently
+            if SC2Race.TERRAN.get_title() not in self.options.selected_races.value:
+                enabled_campaigns.discard(SC2Campaign.NCO.campaign_name)
+            if len(self.options.selected_races.value) < 3:
+                enabled_campaigns.discard(SC2Campaign.EPILOGUE.campaign_name)
+            if not enabled_campaigns:
+                raise OptionError(
+                    "Campaign and race exclusions remove all possible missions from the pool. "
+                    "Either include more campaigns, include more races, or enable race swap."
+                )
+            self.options.enabled_campaigns.value = enabled_campaigns
+
+    def create_regions(self) -> None:
         self.logic = SC2Logic(self)
         self.custom_mission_order = create_mission_order(
             self, get_locations(self), self.location_cache
         )
         self.logic.nova_used = (
-                MissionFlag.Nova in self.custom_mission_order.get_used_flags()
-                or (
-                        MissionFlag.WoLNova in self.custom_mission_order.get_used_flags()
-                        and self.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
-                )
+            MissionFlag.Nova in self.custom_mission_order.get_used_flags()
+            or (
+                MissionFlag.WoLNova in self.custom_mission_order.get_used_flags()
+                and self.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
+            )
         )
 
     def create_items(self) -> None:
@@ -148,7 +181,6 @@ class SC2World(World):
         flag_start_inventory(self, item_list)
         flag_unused_upgrade_types(self, item_list)
         flag_unreleased_items(item_list)
-        flag_user_excluded_item_sets(self, item_list)
         flag_war_council_items(self, item_list)
         flag_and_add_resource_locations(self, item_list)
         flag_mission_order_required_items(self, item_list)
@@ -209,14 +241,14 @@ class SC2World(World):
         enabled_campaigns = get_enabled_campaigns(self)
         slot_data["plando_locations"] = get_plando_locations(self)
         slot_data["use_nova_nco_fallback"] = (
-                enabled_campaigns == {SC2Campaign.NCO}
-                and self.options.mission_order == MissionOrder.option_vanilla
+            enabled_campaigns == {SC2Campaign.NCO}
+            and self.options.mission_order == MissionOrder.option_vanilla
         )
         if (self.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
-                or (
-                        self.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_auto
-                        and MissionFlag.Nova in self.custom_mission_order.get_used_flags().keys()
-                )
+            or (
+                self.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_auto
+                and MissionFlag.Nova in self.custom_mission_order.get_used_flags().keys()
+            )
         ):
             slot_data["use_nova_wol_fallback"] = False
         else:
@@ -225,7 +257,9 @@ class SC2World(World):
         slot_data["custom_mission_order"] = self.custom_mission_order.get_slot_data()
         slot_data["version"] = 4
 
-        if SC2Campaign.HOTS not in enabled_campaigns:
+        if (SC2Campaign.HOTS not in enabled_campaigns
+            or SC2Race.ZERG.get_title() not in self.options.selected_races.value
+        ):
             slot_data["kerrigan_presence"] = KerriganPresence.option_not_present
 
         if self.options.mission_order_scouting != MissionOrderScouting.option_none:
@@ -260,8 +294,8 @@ class SC2World(World):
         assert self.logic is not None
         self.logic.total_mission_count = self.custom_mission_order.get_mission_count()
         if (
-                self.options.generic_upgrade_missions > 0
-                and self.options.required_tactics != RequiredTactics.option_no_logic
+            self.options.generic_upgrade_missions > 0
+            and self.options.required_tactics != RequiredTactics.option_no_logic
         ):
             # Attempt to resolve a situation when the option is too high for the mission order rolled
             weapon_armor_item_names = [
@@ -278,8 +312,8 @@ class SC2World(World):
 
             self._fill_needed_items(state_with_kerrigan_levels, weapon_armor_item_names, WEAPON_ARMOR_UPGRADE_MAX_LEVEL)
         if (
-                self.options.kerrigan_levels_per_mission_completed > 0
-                and self.options.required_tactics != RequiredTactics.option_no_logic
+            self.options.kerrigan_levels_per_mission_completed > 0
+            and self.options.required_tactics != RequiredTactics.option_no_logic
         ):
             # Attempt to solve being locked by Kerrigan level requirements
             self._fill_needed_items(lambda: self.multiworld.get_all_state(False), [item_names.KERRIGAN_LEVELS_1], 70)
@@ -375,45 +409,67 @@ def create_and_flag_explicit_item_locks_and_excludes(world: SC2World) -> List[Fi
     Handles `excluded_items`, `locked_items`, and `start_inventory`
     Returns a list of all possible non-filler items that can be added, with an accompanying flags bitfield.
     """
-    excluded_items = world.options.excluded_items
-    unexcluded_items = world.options.unexcluded_items
-    locked_items = world.options.locked_items
-    start_inventory = world.options.start_inventory
+    excluded_items: dict[str, int] = world.options.excluded_items.value
+    unexcluded_items: dict[str, int] = world.options.unexcluded_items.value
+    locked_items: dict[str, int] = world.options.locked_items.value
+    start_inventory: dict[str, int] = world.options.start_inventory.value
     key_items = world.custom_mission_order.get_items_to_lock()
 
-    def resolve_count(count: Optional[int], max_count: int) -> int:
-        if count == 0:
+    def resolve_exclude(count: int, max_count: int) -> int:
+        if count < 0:
             return max_count
-        if count is None:
-            return 0
-        if max_count == 0:
-            return count
-        return min(count, max_count)
+        return count
+
+    def resolve_count(count: int, max_count: int, negative_value: int | None = None) -> int:
+        """
+        Handles `count` being out of range.
+        * If `count > max_count`, returns `max_count`.
+        * If `count < 0`, returns `negative_value` (returns `max_count` if `negative_value` is unspecified)
+        """
+        if count < 0:
+            if negative_value is None:
+                return max_count
+            return negative_value
+        if max_count and count > max_count:
+            return max_count
+        return count
     
-    auto_excludes = {item_name: 1 for item_name in item_groups.legacy_items}
+    auto_excludes = Counter({item_name: 1 for item_name in item_groups.legacy_items})
     if world.options.exclude_overpowered_items.value == ExcludeOverpoweredItems.option_true:
         for item_name in item_groups.overpowered_items:
             auto_excludes[item_name] = 1
+    if world.options.vanilla_items_only.value == VanillaItemsOnly.option_true:
+        for item_name, item_data in item_tables.item_table.items():
+            if item_name in item_groups.terran_original_progressive_upgrades:
+                auto_excludes[item_name] = max(item_data.quantity - 1, auto_excludes.get(item_name, 0))
+            elif item_name in item_groups.vanilla_items:
+                continue
+            elif item_name in item_groups.nova_equipment:
+                continue
+            else:
+                auto_excludes[item_name] = item_data.quantity
+
 
     result: List[FilterItem] = []
     for item_name, item_data in item_tables.item_table.items():
         max_count = item_data.quantity
-        auto_excluded_count = auto_excludes.get(item_name)
+        auto_excluded_count = auto_excludes.get(item_name, 0)
         excluded_count = excluded_items.get(item_name, auto_excluded_count)
-        unexcluded_count = unexcluded_items.get(item_name)
-        locked_count = locked_items.get(item_name)
-        start_count: Optional[int] = start_inventory.get(item_name)
+        unexcluded_count = unexcluded_items.get(item_name, 0)
+        locked_count = locked_items.get(item_name, 0)
+        start_count = start_inventory.get(item_name, 0)
         key_count = key_items.get(item_name, 0)
-        # specifying 0 in the yaml means exclude / lock all
-        # start_inventory doesn't allow specifying 0
-        # not specifying means don't exclude/lock/start
-        excluded_count = resolve_count(excluded_count, max_count)
-        unexcluded_count = resolve_count(unexcluded_count, max_count)
+        # Specifying a negative number in the yaml means exclude / lock / start all.
+        # In the case of excluded/unexcluded, resolve negatives to max_count before subtracting them,
+        # and after subtraction resolve negatives to just 0 (when unexcluded > excluded).
+        excluded_count = resolve_count(
+            resolve_exclude(excluded_count, max_count) - resolve_exclude(unexcluded_count, max_count),
+            max_count,
+            negative_value=0
+        )
         locked_count = resolve_count(locked_count, max_count)
         start_count = resolve_count(start_count, max_count)
 
-        excluded_count = max(0, excluded_count - unexcluded_count)
-
         # Priority: start_inventory >> locked_items >> excluded_items >> unspecified
         if max_count == 0:
             if excluded_count:
@@ -476,8 +532,9 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
                 item.flags |= ItemFilterFlags.FilterExcluded
                 continue
         if not zerg_missions and item.data.race == SC2Race.ZERG:
-            if item.data.type != item_tables.ZergItemType.Ability \
-                    and item.data.type != ZergItemType.Level:
+            if (item.data.type != item_tables.ZergItemType.Ability
+                and item.data.type != ZergItemType.Level
+            ):
                 item.flags |= ItemFilterFlags.FilterExcluded
                 continue
         if not protoss_missions and item.data.race == SC2Race.PROTOSS:
@@ -496,9 +553,9 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
                 item.flags |= ItemFilterFlags.FilterExcluded
         if (not protoss_build_missions
             and item.data.type in (
-                        item_tables.ProtossItemType.Unit,
-                        item_tables.ProtossItemType.Unit_2,
-                        item_tables.ProtossItemType.Building,
+                item_tables.ProtossItemType.Unit,
+                item_tables.ProtossItemType.Unit_2,
+                item_tables.ProtossItemType.Building,
             )
         ):
             # Note(mm): This doesn't exclude things like automated assimilators or warp gate improvements
@@ -506,9 +563,9 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
             if (SC2Mission.TEMPLAR_S_RETURN not in missions
                 or world.options.grant_story_tech.value == GrantStoryTech.option_grant
                 or item.name not in (
-                            item_names.IMMORTAL, item_names.ANNIHILATOR,
-                            item_names.COLOSSUS, item_names.VANGUARD, item_names.REAVER, item_names.DARK_TEMPLAR,
-                            item_names.SENTRY, item_names.HIGH_TEMPLAR,
+                    item_names.IMMORTAL, item_names.ANNIHILATOR,
+                    item_names.COLOSSUS, item_names.VANGUARD, item_names.REAVER, item_names.DARK_TEMPLAR,
+                    item_names.SENTRY, item_names.HIGH_TEMPLAR,
                 )
             ):
                 item.flags |= ItemFilterFlags.FilterExcluded
@@ -543,15 +600,16 @@ def flag_mission_based_item_excludes(world: SC2World, item_list: List[FilterItem
         mission for mission in missions
         if MissionFlag.Nova in mission.flags
            or (
-                   world.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
-                   and MissionFlag.WoLNova in mission.flags
+                world.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
+                and MissionFlag.WoLNova in mission.flags
            )
     ]
 
     kerrigan_is_present = (
-            len(kerrigan_missions) > 0
-            and world.options.kerrigan_presence in kerrigan_unit_available
-            and SC2Campaign.HOTS in get_enabled_campaigns(world) # TODO: Kerrigan available all Zerg/Everywhere
+        len(kerrigan_missions) > 0
+        and world.options.kerrigan_presence in kerrigan_unit_available
+        and SC2Campaign.HOTS in get_enabled_campaigns(world) # TODO: Kerrigan available all Zerg/Everywhere
+        and SC2Race.ZERG.get_title() in world.options.selected_races.value
     )
 
     # TvX build missions -- check flags
@@ -631,7 +689,7 @@ def flag_mission_based_item_excludes(world: SC2World, item_list: List[FilterItem
             item.flags |= ItemFilterFlags.FilterExcluded
 
         # Remove Spear of Adun passives
-        if item.name in item_tables.spear_of_adun_castable_passives and not soa_passive_presence:
+        if item.name in item_groups.spear_of_adun_passives and not soa_passive_presence:
             item.flags |= ItemFilterFlags.FilterExcluded
 
         # Remove matchup-specific items if you don't play that matchup
@@ -836,26 +894,6 @@ def flag_unreleased_items(item_list: List[FilterItem]) -> None:
             item.flags |= ItemFilterFlags.Removed
 
 
-def flag_user_excluded_item_sets(world: SC2World, item_list: List[FilterItem]) -> None:
-    """Excludes items based on item set options (`only_vanilla_items`)"""
-    vanilla_nonprogressive_count = {
-        item_name: 0 for item_name in item_groups.terran_original_progressive_upgrades
-    }
-    if world.options.vanilla_items_only.value == VanillaItemsOnly.option_true:
-        vanilla_items = item_groups.vanilla_items + item_groups.nova_equipment
-        for item in item_list:
-            if ItemFilterFlags.UserExcluded in item.flags:
-                continue
-            if item.name not in vanilla_items:
-                item.flags |= ItemFilterFlags.UserExcluded
-            if item.name in item_groups.terran_original_progressive_upgrades:
-                if vanilla_nonprogressive_count[item.name]:
-                    item.flags |= ItemFilterFlags.UserExcluded
-                vanilla_nonprogressive_count[item.name] += 1
-
-    excluded_count: Dict[str, int] = dict()
-
-
 def flag_war_council_items(world: SC2World, item_list: List[FilterItem]) -> None:
     """Excludes / start-inventories items based on `nerf_unit_baselines` option.
     Will skip items that are excluded by other sources."""
diff --git a/worlds/sc2/archipelago.json b/worlds/sc2/archipelago.json
new file mode 100644
index 0000000000..01817550f1
--- /dev/null
+++ b/worlds/sc2/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Starcraft 2",
+    "authors": ["The Archipelago SC2 Team"],
+    "world_version": "4.0.0",
+    "minimum_ap_version": "0.6.4"
+}
diff --git a/worlds/sc2/client.py b/worlds/sc2/client.py
index e9f46f93b7..708b00cd27 100644
--- a/worlds/sc2/client.py
+++ b/worlds/sc2/client.py
@@ -21,7 +21,6 @@ import random
 import concurrent.futures
 import time
 import uuid
-import argparse
 from pathlib import Path
 
 # CommonClient import first to trigger ModuleUpdater
@@ -41,6 +40,7 @@ from .options import (
     SpearOfAdunPassivesPresentInNoBuild, EnableVoidTrade, VoidTradeAgeLimit, void_trade_age_limits_ms, VoidTradeWorkers,
     DifficultyDamageModifier, MissionOrderScouting, GenericUpgradeResearchSpeedup, MercenaryHighlanders, WarCouncilNerfs,
     is_mission_in_soa_presence,
+    upgrade_included_names,
 )
 from .mission_order.slot_data import CampaignSlotData, LayoutSlotData, MissionSlotData, MissionOrderObjectSlotData
 from .mission_order.entry_rules import SubRuleRuleData, CountMissionsRuleData, MissionEntryRules
@@ -72,17 +72,19 @@ from .mission_tables import (
 )
 
 import colorama
-from .options import Option, upgrade_included_names
 from NetUtils import ClientStatus, NetworkItem, JSONtoTextParser, JSONMessagePart, add_json_item, add_json_location, add_json_text, JSONTypes
 from MultiServer import mark_raw
 
+if typing.TYPE_CHECKING:
+    from Options import Option
+
 pool = concurrent.futures.ThreadPoolExecutor(1)
 loop = asyncio.get_event_loop_policy().new_event_loop()
 nest_asyncio.apply(loop)
 MAX_BONUS: int = 28
 
 # GitHub repo where the Map/mod data is hosted for /download_data command
-DATA_REPO_OWNER = "Ziktofel"
+DATA_REPO_OWNER = "archipelago-sc2"
 DATA_REPO_NAME = "Archipelago-SC2-data"
 DATA_API_VERSION = "API4"
 
diff --git a/worlds/sc2/client_gui.py b/worlds/sc2/client_gui.py
index 6b2abcd9e9..33969a0699 100644
--- a/worlds/sc2/client_gui.py
+++ b/worlds/sc2/client_gui.py
@@ -1,3 +1,4 @@
+import inspect
 from typing import *
 import asyncio
 import logging
@@ -362,13 +363,25 @@ class SC2Manager(GameManager):
 
         text = mission_obj.mission_name
         tooltip: str = ""
-        remaining_locations, plando_locations, remaining_count = self.sort_unfinished_locations(mission_id)
+        mission_remaining_locations, plando_locations, remaining_count = self.sort_unfinished_locations(mission_id)
+        remaining_goal_missions_locations_by_mission = [
+            mission_locations for mission_locations, _, _ in [
+                self.sort_unfinished_locations(final_mission_id)
+                for final_mission_id in self.ctx.final_mission_ids
+            ]
+        ]
+        remaining_goal_victory_locations = [
+            location for mission_locations
+            in remaining_goal_missions_locations_by_mission
+            for location in mission_locations
+            if location[0] == LocationType.VICTORY
+        ]
         campaign_locked = campaign_id not in available_campaigns
         layout_locked = layout_id not in available_layouts[campaign_id]
 
         # Map has uncollected locations
         if mission_id in unfinished_missions:
-            if self.any_valuable_locations(remaining_locations):
+            if self.any_valuable_locations(mission_remaining_locations):
                 text = f"[color={COLOR_MISSION_IMPORTANT}]{text}[/color]"
             else:
                 text = f"[color={COLOR_MISSION_UNIMPORTANT}]{text}[/color]"
@@ -428,10 +441,21 @@ class SC2Manager(GameManager):
                 tooltip += "\n\n"
             elif exit_for:
                 tooltip += "\n"
-            if any(location_type == LocationType.VICTORY for (location_type, _, _) in remaining_locations):
+            if any(location_type == LocationType.VICTORY for (location_type, _, _) in mission_remaining_locations):
                 tooltip += f"[color={COLOR_FINAL_MISSION_REMINDER}]Required to beat the world[/color]"
             else:
-                tooltip += "This goal mission is already beaten.\nBeat the remaining goal missions to beat the world."
+                if len(remaining_goal_victory_locations) > 0:
+                    tooltip += inspect.cleandoc("""
+                        This goal mission is already beaten.
+                        Beat the remaining goal missions to beat the world.
+                        """)
+                elif not self.ctx.finished_game:
+                    # All goal locations may have been collected. Beat any goal mission to beat the world then.
+                    tooltip += inspect.cleandoc("""
+                        This is a goal mission.
+                        Beat any goal mission to beat the world.
+                        """
+                    )
 
         # Populate remaining location list
         if remaining_count > 0:
@@ -444,18 +468,18 @@ class SC2Manager(GameManager):
             if self.ctx.mission_order_scouting != MissionOrderScouting.option_none:
                 mission_available =  mission_id in available_missions
 
-                scoutable = self.is_scoutable(remaining_locations, mission_available, layout_locked, campaign_locked)
+                scoutable = self.is_scoutable(mission_remaining_locations, mission_available, layout_locked, campaign_locked)
             else:
                 scoutable = False
 
-            for location_type, location_name, _ in remaining_locations:
+            for location_type, location_name, _ in mission_remaining_locations:
                 if location_type in (LocationType.VICTORY, LocationType.VICTORY_CACHE) and victory_printed:
                     continue
                 if location_type != last_location_type:
                     tooltip += f"\n[color={COLOR_MISSION_IMPORTANT}]{self.get_location_type_title(location_type)}:[/color]"
                     last_location_type = location_type
                 if location_type == LocationType.VICTORY:
-                    victory_count = len([loc for loc in remaining_locations if loc[0] in (LocationType.VICTORY, LocationType.VICTORY_CACHE)])
+                    victory_count = len([loc for loc in mission_remaining_locations if loc[0] in (LocationType.VICTORY, LocationType.VICTORY_CACHE)])
                     victory_loc = location_name.replace(":", f":[color={COLOR_VICTORY_LOCATION}]")
                     if victory_count > 1:
                         victory_loc += f' ({victory_count})'
diff --git a/worlds/sc2/docs/custom_mission_orders_en.md b/worlds/sc2/docs/custom_mission_orders_en.md
index 6aba753b69..c8d7c25c7c 100644
--- a/worlds/sc2/docs/custom_mission_orders_en.md
+++ b/worlds/sc2/docs/custom_mission_orders_en.md
@@ -60,7 +60,7 @@
 
 This is usage documentation for the `custom_mission_order` YAML option for Starcraft 2. You can enable Custom Mission Orders by setting `mission_order: custom` in your YAML.
 
-You will need to know how to write a YAML before engaging with this feature, and should read the [Archipelago YAML documentation](https://archipelago.gg/tutorial/Archipelago/advanced_settings/en) before continuing here.
+You will need to know how to write a YAML before engaging with this feature, and should read the [Archipelago YAML documentation](/tutorial/Archipelago/advanced_settings/en) before continuing here.
 
 Every example in this document should be valid to generate.
 
diff --git a/worlds/sc2/docs/setup_en.md b/worlds/sc2/docs/setup_en.md
index a8d03d5a3d..d6f9f6cda5 100644
--- a/worlds/sc2/docs/setup_en.md
+++ b/worlds/sc2/docs/setup_en.md
@@ -145,7 +145,7 @@ That's the default value in the template, which should let you know to use this
 #### How do I know the exact names of items and locations?
 
 You can look up a complete list of the item names in the 
-[Icon Repository](https://matthewmarinets.github.io/ap_sc2_icons/) page.
+[APSC2 Item Docs](https://archipelago-sc2.github.io/content-docs/) page.
 This page also contains supplementary information of each item.
 
 Locations are of the format `<mission name>: <location name>`. Names are most easily looked up by hovering
diff --git a/worlds/sc2/docs/setup_fr.md b/worlds/sc2/docs/setup_fr.md
index 4e7a9663aa..f5c3b93c16 100644
--- a/worlds/sc2/docs/setup_fr.md
+++ b/worlds/sc2/docs/setup_fr.md
@@ -117,7 +117,7 @@ La page [*datapackage*](/datapackage) d'Archipelago liste l'ensemble des *items*
 que le site web prend en charge actuellement, dont ceux de *StarCraft 2*.
 
 Vous trouverez aussi la liste complète des *items* de *StarCraft 2 Archipelago* à la page 
-[*Icon Repository*](https://matthewmarinets.github.io/ap_sc2_icons/). 
+[*APSC2 Item Docs*](https://archipelago-sc2.github.io/content-docs/). 
 Notez que cette page contient diverses informations supplémentaires sur chacun des *items*.
 Cependant, l'information présente dans cette dernière peut différer de celle du *datapackage* d'Archipelago 
 puisqu'elle est générée, habituellement, à partir de la version en développement de *StarCraft 2 Archipelago* qui 
diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py
index f1520df142..45ab2b384d 100644
--- a/worlds/sc2/item/item_descriptions.py
+++ b/worlds/sc2/item/item_descriptions.py
@@ -775,7 +775,7 @@ item_descriptions = {
     item_names.BULLFROG_BROODLINGS: "Bullfrogs spawn two broodlings on impact, in addition to unloading their cargo.",
     item_names.BULLFROG_HARD_IMPACT: "Bullfrogs deal more damage and stun longer on impact.",
     item_names.INFESTED_BANSHEE_BRACED_EXOSKELETON: "Infested Banshees gain +100 life.",
-    item_names.INFESTED_BANSHEE_RAPID_HIBERNATION: "Infested Banshees regenerate 20 life and energy per second while burrowed.",
+    item_names.INFESTED_BANSHEE_RAPID_HIBERNATION: "Allows Infested Banshees to Burrow. Infested Banshees regenerate 20 life and energy per second while burrowed.",
     item_names.INFESTED_BANSHEE_FLESHFUSED_TARGETING_OPTICS: "Infested Banshees gain +2 range while cloaked.",
     item_names.INFESTED_LIBERATOR_CLOUD_DISPERSAL: "Infested Liberators instantly transform into a cloud of microscopic organisms while attacking, reducing the damage they take by 85%.",
     item_names.INFESTED_LIBERATOR_VIRAL_CONTAMINATION: "Increases the damage Infested Liberators deal to their primary target by 100%.",
@@ -951,14 +951,14 @@ item_descriptions = {
     item_names.TEMPEST_GRAVITY_SLING: "Tempests gain +8 range against air targets and +8 cast range.",
     item_names.TEMPEST_INTERPLANETARY_RANGE: "Tempests gain +8 weapon range against all targets.",
     item_names.PHOENIX_CLASS_IONIC_WAVELENGTH_FLUX: "Increases Phoenix, Mirage, and Skirmisher weapon damage by +2.",
-    item_names.PHOENIX_CLASS_ANION_PULSE_CRYSTALS: "Increases Phoenix, Mirage, and Skirmiser range by +2.",
+    item_names.PHOENIX_CLASS_ANION_PULSE_CRYSTALS: "Increases Phoenix, Mirage, and Skirmisher range by +2.",
     item_names.CORSAIR_STEALTH_DRIVE: "Corsairs become permanently cloaked.",
     item_names.CORSAIR_ARGUS_JEWEL: "Corsairs can store 2 charges of disruption web.",
     item_names.CORSAIR_SUSTAINING_DISRUPTION: "Corsair disruption webs last longer.",
     item_names.CORSAIR_NEUTRON_SHIELDS: "Increases corsair maximum shields by +20.",
     item_names.ORACLE_STEALTH_DRIVE: "Oracles become permanently cloaked.",
     item_names.ORACLE_SKYWARD_CHRONOANOMALY: "The Oracle's Stasis Ward can affect air units.",
-    item_names.ORACLE_TEMPORAL_ACCELERATION_BEAM: "Oracles no longer need to to spend energy to attack.",
+    item_names.ORACLE_TEMPORAL_ACCELERATION_BEAM: "Oracles no longer need to spend energy to attack.",
     item_names.ORACLE_BOSONIC_CORE: "Increases starting energy by 150 and maximum energy by 50.",
     item_names.ARBITER_CHRONOSTATIC_REINFORCEMENT: "Arbiters gain +50 maximum life and +1 armor.",
     item_names.ARBITER_KHAYDARIN_CORE: _get_start_and_max_energy_desc("Arbiters"),
diff --git a/worlds/sc2/item/item_groups.py b/worlds/sc2/item/item_groups.py
index ea65dc3e4a..c842731906 100644
--- a/worlds/sc2/item/item_groups.py
+++ b/worlds/sc2/item/item_groups.py
@@ -111,6 +111,9 @@ class ItemGroupNames:
     TERRAN_ORIGINAL_PROGRESSIVE_UPGRADES = "Terran Original Progressive Upgrades"
     """Progressive items where level 1 appeared in WoL"""
     MENGSK_UNITS = "Mengsk Units"
+    TERRAN_SC1_UNITS = "Terran SC1 Units"
+    TERRAN_SC1_BUILDINGS = "Terran SC1 Buildings"
+    TERRAN_LADDER_UNITS = "Terran Ladder Units"
     TERRAN_VETERANCY_UNITS = "Terran Veterancy Units"
     ORBITAL_COMMAND_ABILITIES = "Orbital Command Abilities"
     WOL_ORBITAL_COMMAND_ABILITIES = "WoL Command Center Abilities"
@@ -154,6 +157,8 @@ class ItemGroupNames:
     """All items from Stukov co-op subfaction"""
     INF_TERRAN_UNITS = "Infested Terran Units"
     INF_TERRAN_UPGRADES = "Infested Terran Upgrades"
+    ZERG_SC1_UNITS = "Zerg SC1 Units"
+    ZERG_LADDER_UNITS = "Zerg Ladder Units"
 
     PROTOSS_ITEMS = "Protoss Items"
     PROTOSS_UNITS = "Protoss Units"
@@ -167,6 +172,7 @@ class ItemGroupNames:
     LOTV_UNITS = "LotV Units"
     LOTV_ITEMS = "LotV Items"
     LOTV_GLOBAL_UPGRADES = "LotV Global Upgrades"
+    SOA_PASSIVES = "SOA Passive Abilities"
     SOA_ITEMS = "SOA"
     PROTOSS_GLOBAL_UPGRADES = "Protoss Global Upgrades"
     PROTOSS_BUILDINGS = "Protoss Buildings"
@@ -175,6 +181,9 @@ class ItemGroupNames:
     NERAZIM_UNITS = "Nerazim"
     TAL_DARIM_UNITS = "Tal'Darim"
     PURIFIER_UNITS = "Purifier"
+    PROTOSS_SC1_UNITS = "Protoss SC1 Units"
+    PROTOSS_SC1_BUILDINGS = "Protoss SC1 Buildings"
+    PROTOSS_LADDER_UNITS = "Protoss Ladder Units"
 
     VANILLA_ITEMS = "Vanilla Items"
     OVERPOWERED_ITEMS = "Overpowered Items"
@@ -287,8 +296,14 @@ item_name_groups[ItemGroupNames.WOL_BUILDINGS] = wol_buildings = [
     item_names.HIVE_MIND_EMULATOR, item_names.PSI_DISRUPTER,
 ]
 item_name_groups[ItemGroupNames.TERRAN_BUILDINGS] = terran_buildings = [
-    item_name for item_name, item_data in item_tables.item_table.items()
-    if item_data.type == item_tables.TerranItemType.Building or item_name in wol_buildings
+    *[
+        item_name for item_name, item_data in item_tables.item_table.items()
+        if item_data.type == item_tables.TerranItemType.Building or item_name in wol_buildings
+    ],
+    item_names.PSI_SCREEN,
+    item_names.SONIC_DISRUPTER,
+    item_names.PSI_INDOCTRINATOR,
+    item_names.ARGUS_AMPLIFIER,
 ]
 item_name_groups[ItemGroupNames.MENGSK_UNITS] = [
     item_names.AEGIS_GUARD, item_names.EMPERORS_SHADOW,
@@ -316,6 +331,41 @@ spider_mine_sources = [
     item_names.SIEGE_TANK_SPIDER_MINES,
     item_names.RAVEN_SPIDER_MINES,
 ]
+item_name_groups[ItemGroupNames.TERRAN_SC1_UNITS] = [
+    item_names.MARINE,
+    item_names.FIREBAT,
+    item_names.GHOST,
+    item_names.MEDIC,
+    item_names.VULTURE,
+    item_names.SIEGE_TANK,
+    item_names.GOLIATH,
+    item_names.WRAITH,
+    # No dropship
+    item_names.SCIENCE_VESSEL,
+    item_names.BATTLECRUISER,
+    item_names.VALKYRIE,
+]
+item_name_groups[ItemGroupNames.TERRAN_SC1_BUILDINGS] = [
+    item_names.BUNKER,
+    item_names.MISSILE_TURRET,
+]
+item_name_groups[ItemGroupNames.TERRAN_LADDER_UNITS] = [
+    item_names.MARINE,
+    item_names.MARAUDER,
+    item_names.REAPER,
+    item_names.GHOST,
+    item_names.HELLION,
+    item_names.WIDOW_MINE,
+    item_names.SIEGE_TANK,
+    item_names.THOR,
+    item_names.CYCLONE,
+    item_names.VIKING,
+    item_names.MEDIVAC,
+    item_names.LIBERATOR,
+    item_names.RAVEN,
+    item_names.BANSHEE,
+    item_names.BATTLECRUISER,
+]
 
 # Terran Upgrades
 item_name_groups[ItemGroupNames.WOL_UPGRADES] = wol_upgrades = [
@@ -550,7 +600,7 @@ item_name_groups[ItemGroupNames.KERRIGAN_LOGIC_ACTIVE_ABILITIES] = kerrigan_logi
     item_name for item_name in kerrigan_active_abilities if item_name != item_names.KERRIGAN_ASSIMILATION_AURA
 ]
 item_name_groups[ItemGroupNames.KERRIGAN_TIER_1] = kerrigan_tier_1 = [
-    item_names.KERRIGAN_CRUSHING_GRIP, item_names.KERRIGAN_HEROIC_FORTITUDE, item_names.KERRIGAN_LEAPING_STRIKE
+    item_names.KERRIGAN_KINETIC_BLAST, item_names.KERRIGAN_HEROIC_FORTITUDE, item_names.KERRIGAN_LEAPING_STRIKE
 ]
 item_name_groups[ItemGroupNames.KERRIGAN_TIER_2] = kerrigan_tier_2= [
     item_names.KERRIGAN_CRUSHING_GRIP, item_names.KERRIGAN_CHAIN_REACTION, item_names.KERRIGAN_PSIONIC_SHIFT
@@ -596,6 +646,38 @@ item_name_groups[ItemGroupNames.OVERLORD_UPGRADES] = [
     item_names.OVERLORD_IMPROVED_OVERLORDS,
     item_names.OVERLORD_OVERSEER_ASPECT,
 ]
+item_name_groups[ItemGroupNames.ZERG_SC1_UNITS] = [
+    item_names.ZERGLING,
+    item_names.HYDRALISK,
+    item_names.MUTALISK,
+    item_names.SCOURGE,
+    item_names.BROOD_QUEEN,
+    item_names.DEFILER,
+    item_names.ULTRALISK,
+    item_names.HYDRALISK_LURKER_ASPECT,
+    item_names.MUTALISK_CORRUPTOR_DEVOURER_ASPECT,
+    item_names.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT,
+    item_names.DEVOURING_ONES,
+    item_names.HUNTER_KILLERS,
+    item_names.TORRASQUE_MERC,
+]
+item_name_groups[ItemGroupNames.ZERG_LADDER_UNITS] = [
+    item_names.ZERGLING,
+    item_names.SWARM_QUEEN,  # Replace: Hive Queen
+    item_names.ZERGLING_BANELING_ASPECT,
+    item_names.ROACH,
+    item_names.ROACH_RAVAGER_ASPECT,
+    item_names.OVERLORD_OVERSEER_ASPECT,
+    item_names.HYDRALISK,
+    item_names.HYDRALISK_LURKER_ASPECT,
+    item_names.MUTALISK,
+    item_names.CORRUPTOR,
+    item_names.MUTALISK_CORRUPTOR_VIPER_ASPECT,
+    item_names.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT,
+    item_names.INFESTOR,
+    item_names.SWARM_HOST,
+    item_names.ULTRALISK,
+]
 
 # Zerg Upgrades
 item_name_groups[ItemGroupNames.HOTS_STRAINS] = hots_strains = [
@@ -777,11 +859,21 @@ item_name_groups[ItemGroupNames.PURIFIER_UNITS] = [
     item_names.MIRAGE, item_names.DAWNBRINGER, item_names.TRIREME, item_names.TEMPEST,
     item_names.CALADRIUS,
 ]
-item_name_groups[ItemGroupNames.SOA_ITEMS] = soa_items = [
+item_name_groups[ItemGroupNames.SOA_PASSIVES] = spear_of_adun_passives = [
+    item_names.RECONSTRUCTION_BEAM,
+    item_names.OVERWATCH,
+    item_names.GUARDIAN_SHELL,
+]
+spear_of_adun_actives = [
     *[item_name for item_name, item_data in item_tables.item_table.items() if item_data.type == item_tables.ProtossItemType.Spear_Of_Adun],
     item_names.SOA_PROGRESSIVE_PROXY_PYLON,
 ]
-lotv_soa_items = [item_name for item_name in soa_items if item_name != item_names.SOA_PYLON_OVERCHARGE]
+item_name_groups[ItemGroupNames.SOA_ITEMS] = soa_items = spear_of_adun_actives + spear_of_adun_passives
+lotv_soa_items = [
+    item_name
+    for item_name in soa_items
+    if item_name not in (item_names.SOA_PYLON_OVERCHARGE, item_names.OVERWATCH)
+]
 item_name_groups[ItemGroupNames.PROTOSS_GLOBAL_UPGRADES] = [
     item_name for item_name, item_data in item_tables.item_table.items() if item_data.type == item_tables.ProtossItemType.Solarite_Core
 ]
@@ -815,6 +907,45 @@ item_name_groups[ItemGroupNames.LOTV_ITEMS] = vanilla_lotv_items = (
     + protoss_generic_upgrades
     + lotv_war_council_upgrades
 )
+item_name_groups[ItemGroupNames.PROTOSS_SC1_UNITS] = [
+    item_names.ZEALOT,
+    item_names.DRAGOON,
+    item_names.HIGH_TEMPLAR,
+    item_names.DARK_TEMPLAR,
+    item_names.DARK_ARCHON,
+    item_names.DARK_TEMPLAR_DARK_ARCHON_MELD,
+    # No shuttle
+    item_names.REAVER,
+    item_names.OBSERVER,
+    item_names.SCOUT,
+    item_names.CARRIER,
+    item_names.ARBITER,
+    item_names.CORSAIR,
+]
+item_name_groups[ItemGroupNames.PROTOSS_SC1_BUILDINGS] = [
+    item_names.PHOTON_CANNON,
+    item_names.SHIELD_BATTERY,
+]
+item_name_groups[ItemGroupNames.PROTOSS_LADDER_UNITS] = [
+    item_names.ZEALOT,
+    item_names.STALKER,
+    item_names.SENTRY,
+    item_names.ADEPT,
+    item_names.HIGH_TEMPLAR,
+    item_names.DARK_TEMPLAR,
+    item_names.DARK_TEMPLAR_ARCHON_MERGE,
+    item_names.OBSERVER,
+    item_names.WARP_PRISM,
+    item_names.IMMORTAL,
+    item_names.COLOSSUS,
+    item_names.DISRUPTOR,
+    item_names.PHOENIX,
+    item_names.VOID_RAY,
+    item_names.ORACLE,
+    item_names.CARRIER,
+    item_names.TEMPEST,
+    item_names.MOTHERSHIP,  # Replace: Aiur Mothership
+]
 
 item_name_groups[ItemGroupNames.VANILLA_ITEMS] = vanilla_items = (
     vanilla_wol_items + vanilla_hots_items + vanilla_lotv_items
diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py
index d63b00489f..46d1ceacba 100644
--- a/worlds/sc2/item/item_tables.py
+++ b/worlds/sc2/item/item_tables.py
@@ -2151,127 +2151,6 @@ not_balanced_starting_units = {
     item_names.TEMPEST,
 }
 
-
-# Defense rating table
-# Commented defense ratings are handled in LogicMixin
-tvx_defense_ratings = {
-    item_names.SIEGE_TANK: 5,
-    # "Graduating Range": 1,
-    item_names.PLANETARY_FORTRESS: 3,
-    # Bunker w/ Marine/Marauder: 3,
-    item_names.PERDITION_TURRET: 2,
-    item_names.DEVASTATOR_TURRET: 2,
-    item_names.VULTURE: 1,
-    item_names.BANSHEE: 1,
-    item_names.BATTLECRUISER: 1,
-    item_names.LIBERATOR: 4,
-    item_names.WIDOW_MINE: 1,
-    # "Concealment (Widow Mine)": 1
-}
-tvz_defense_ratings = {
-    item_names.PERDITION_TURRET: 2,
-    # Bunker w/ Firebat: 2,
-    item_names.LIBERATOR: -2,
-    item_names.HIVE_MIND_EMULATOR: 3,
-    item_names.PSI_DISRUPTER: 3,
-}
-tvx_air_defense_ratings = {
-    item_names.MISSILE_TURRET: 2,
-}
-zvx_defense_ratings = {
-    # Note that this doesn't include Kerrigan because this is just for race swaps, which doesn't involve her (for now)
-    item_names.SPINE_CRAWLER: 3,
-    # w/ Twin Drones: 1
-    item_names.SWARM_QUEEN: 1,
-    item_names.SWARM_HOST: 1,
-    # impaler: 3
-    #  "Hardened Tentacle Spines (Impaler)": 2
-    # lurker: 1
-    #  "Seismic Spines (Lurker)": 2
-    #  "Adapted Spines (Lurker)": 1
-    # brood lord : 2
-    # corpser roach: 1
-    # creep tumors (swarm queen or overseer): 1
-    # w/ malignant creep: 1
-    # tanks with ammo: 5
-    item_names.INFESTED_BUNKER: 3,
-    item_names.BILE_LAUNCHER: 2,
-}
-# zvz_defense_ratings = {
-    # corpser roach: 1
-    # primal igniter: 2
-    # lurker: 1
-    # w/ adapted spines: -1
-    # impaler: -1
-# }
-zvx_air_defense_ratings = {
-    item_names.SPORE_CRAWLER: 2,
-    # w/ Twin Drones: 1
-    item_names.INFESTED_MISSILE_TURRET: 2,
-}
-pvx_defense_ratings = {
-    item_names.PHOTON_CANNON: 2,
-    item_names.KHAYDARIN_MONOLITH: 3,
-    item_names.SHIELD_BATTERY: 1,
-    item_names.NEXUS_OVERCHARGE: 2,
-    item_names.SKYLORD: 1,
-    item_names.MATRIX_OVERLOAD: 1,
-    item_names.COLOSSUS: 1,
-    item_names.VANGUARD: 1,
-    item_names.REAVER: 1,
-}
-pvz_defense_ratings = {
-    item_names.KHAYDARIN_MONOLITH: -2,
-    item_names.COLOSSUS: 1,
-}
-
-terran_passive_ratings = {
-    item_names.AUTOMATED_REFINERY: 4,
-    item_names.COMMAND_CENTER_MULE: 4,
-    item_names.ORBITAL_DEPOTS: 2,
-    item_names.COMMAND_CENTER_COMMAND_CENTER_REACTOR: 2,
-    item_names.COMMAND_CENTER_EXTRA_SUPPLIES: 2,
-    item_names.MICRO_FILTERING: 2,
-    item_names.TECH_REACTOR: 2
-}
-
-zerg_passive_ratings = {
-    item_names.TWIN_DRONES: 7,
-    item_names.AUTOMATED_EXTRACTORS: 4,
-    item_names.VESPENE_EFFICIENCY: 3,
-    item_names.OVERLORD_IMPROVED_OVERLORDS: 4,
-    item_names.MALIGNANT_CREEP: 2
-}
-
-protoss_passive_ratings = {
-    item_names.QUATRO: 4,
-    item_names.ORBITAL_ASSIMILATORS: 4,
-    item_names.AMPLIFIED_ASSIMILATORS: 3,
-    item_names.PROBE_WARPIN: 2,
-    item_names.ELDER_PROBES: 2,
-    item_names.MATRIX_OVERLOAD: 2
-}
-
-soa_energy_ratings = {
-    item_names.SOA_SOLAR_LANCE: 8,
-    item_names.SOA_DEPLOY_FENIX: 7,
-    item_names.SOA_TEMPORAL_FIELD: 6,
-    item_names.SOA_PROGRESSIVE_PROXY_PYLON: 5,  # Requires Lvl 2 (Warp in Reinforcements)
-    item_names.SOA_SHIELD_OVERCHARGE: 5,
-    item_names.SOA_ORBITAL_STRIKE: 4
-}
-
-soa_passive_ratings = {
-    item_names.GUARDIAN_SHELL: 4,
-    item_names.OVERWATCH: 2
-}
-
-soa_ultimate_ratings = {
-    item_names.SOA_TIME_STOP: 4,
-    item_names.SOA_PURIFIER_BEAM: 3,
-    item_names.SOA_SOLAR_BOMBARDMENT: 3
-}
-
 kerrigan_levels = [
     item_name for item_name, item_data in item_table.items()
     if item_data.type == ZergItemType.Level and item_data.race == SC2Race.ZERG
@@ -2293,12 +2172,6 @@ spear_of_adun_calldowns = {
     item_names.SOA_SOLAR_BOMBARDMENT
 }
 
-spear_of_adun_castable_passives = {
-    item_names.RECONSTRUCTION_BEAM,
-    item_names.OVERWATCH,
-    item_names.GUARDIAN_SHELL,
-}
-
 nova_equipment = {
     *[item_name for item_name, item_data in get_full_item_list().items()
       if item_data.type == TerranItemType.Nova_Gear],
diff --git a/worlds/sc2/locations.py b/worlds/sc2/locations.py
index 34245d8637..318d52f856 100644
--- a/worlds/sc2/locations.py
+++ b/worlds/sc2/locations.py
@@ -3950,8 +3950,11 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Victory",
             SC2LOTV_LOC_ID_OFFSET + 500,
             LocationType.VICTORY,
-            lambda state: logic.protoss_common_unit(state)
-            and (adv_tactics or logic.protoss_moderate_anti_air(state)),
+            lambda state: (
+                logic.protoss_common_unit(state)
+                and logic.protoss_moderate_anti_air(state)
+            ),
+            hard_rule=logic.protoss_any_anti_air_unit_or_soa,
         ),
         make_location_data(
             SC2Mission.THE_GROWING_SHADOW.mission_name,
@@ -3986,8 +3989,11 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Templar Base",
             SC2LOTV_LOC_ID_OFFSET + 505,
             LocationType.EXTRA,
-            lambda state: logic.protoss_common_unit(state)
-            and (adv_tactics or logic.protoss_moderate_anti_air(state)),
+            lambda state: (
+                logic.protoss_common_unit(state)
+                and logic.protoss_moderate_anti_air(state)
+            ),
+            hard_rule=logic.protoss_any_anti_air_unit_or_soa,
         ),
         make_location_data(
             SC2Mission.THE_SPEAR_OF_ADUN.mission_name,
@@ -12170,8 +12176,9 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.VICTORY,
             lambda state: (
                 logic.terran_common_unit(state)
-                and (adv_tactics or logic.terran_moderate_anti_air(state))
+                and logic.terran_moderate_anti_air(state)
             ),
+            hard_rule=logic.terran_any_anti_air,
         ),
         make_location_data(
             SC2Mission.THE_GROWING_SHADOW_T.mission_name,
@@ -12218,8 +12225,9 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.EXTRA,
             lambda state: (
                 logic.terran_common_unit(state)
-                and (adv_tactics or logic.terran_moderate_anti_air(state))
+                and logic.terran_moderate_anti_air(state)
             ),
+            hard_rule=logic.terran_any_anti_air,
         ),
         make_location_data(
             SC2Mission.THE_GROWING_SHADOW_Z.mission_name,
diff --git a/worlds/sc2/mission_order/mission_pools.py b/worlds/sc2/mission_order/mission_pools.py
index a3ab99f461..1c95f4896a 100644
--- a/worlds/sc2/mission_order/mission_pools.py
+++ b/worlds/sc2/mission_order/mission_pools.py
@@ -56,18 +56,21 @@ class SC2MOGenMissionPools:
     """
     master_list: Set[int]
     difficulty_pools: Dict[Difficulty, Set[int]]
+    exclude_mission_variants_on_pull: bool
     _used_flags: Dict[MissionFlag, int]
     _used_missions: List[SC2Mission]
     _updated_difficulties: Dict[int, Difficulty]
     _flag_ratios: Dict[MissionFlag, float]
     _flag_weights: Dict[MissionFlag, int]
+    _unexcluded_missions: Iterable[SC2Mission]
 
-    def __init__(self) -> None:
+    def __init__(self, exclude_mission_variants_on_pull: bool) -> None:
         self.master_list = {mission.id for mission in SC2Mission}
         self.difficulty_pools = {
             diff: {mission.id for mission in SC2Mission if mission.pool + 1 == diff}
             for diff in Difficulty if diff != Difficulty.RELATIVE
         }
+        self.exclude_mission_variants_on_pull = exclude_mission_variants_on_pull
         self._used_flags = {}
         self._used_missions = []
         self._updated_difficulties = {}
@@ -78,10 +81,24 @@ class SC2MOGenMissionPools:
         """Prevents all the missions that appear in the `excluded` list, but not in the `unexcluded` list,
         from appearing in the mission order."""
         total_exclusions = [mission.id for mission in excluded if mission not in unexcluded]
+        self._unexcluded_missions = unexcluded
         self.master_list.difference_update(total_exclusions)
 
+    def exclude_mission(self, mission: SC2Mission) -> None:
+        """Excludes a single mission unless it is unexcluded."""
+        if not mission in self._unexcluded_missions:
+            self.master_list.remove(mission.id)
+            self.difficulty_pools[self.get_modified_mission_difficulty(mission)].remove(mission.id)
+
     def get_allowed_mission_count(self) -> int:
-        return len(self.master_list)
+        if self.exclude_mission_variants_on_pull:
+            used_files = set(
+                lookup_id_to_mission[mission].map_file
+                for mission in self.master_list
+            )
+            return len(used_files)
+        else:
+            return len(self.master_list)
     
     def count_allowed_missions(self, campaign: SC2Campaign) -> int:
         allowed_missions = [
@@ -192,6 +209,17 @@ class SC2MOGenMissionPools:
             if flag & mission.flags == flag:
                 self._used_flags.setdefault(flag, 0)
                 self._used_flags[flag] += 1
+        
+        # Exclude race swap variants
+        if self.exclude_mission_variants_on_pull and mission.flags & (MissionFlag.HasRaceSwap|MissionFlag.RaceSwap):
+            variants = [
+                other_mission
+                for other_mission in self.master_list
+                if lookup_id_to_mission[other_mission].map_file == mission.map_file and other_mission != mission.id
+            ]
+            for variant in variants:
+                self.exclude_mission(lookup_id_to_mission[variant])
+
         self._used_missions.append(mission)
 
     def pull_random_mission(self, world: World, slot: 'SC2MOGenMission', *, prefer_close_difficulty: bool = False) -> SC2Mission:
diff --git a/worlds/sc2/mission_order/options.py b/worlds/sc2/mission_order/options.py
index 84630ba13a..aa1c6727c7 100644
--- a/worlds/sc2/mission_order/options.py
+++ b/worlds/sc2/mission_order/options.py
@@ -176,8 +176,7 @@ class CustomMissionOrder(OptionDict):
         # This function constructs self.value by parts,
         # so the parent constructor isn't called
         self.value: Dict[str, Dict[str, Any]] = {}
-        if yaml_value == self.default: # If this option is default, it shouldn't mess with its own values
-            yaml_value = copy.deepcopy(self.default)
+        yaml_value = copy.deepcopy(yaml_value) # Ensure that all the mutations are local to the world
 
         for campaign in yaml_value:
             self.value[campaign] = {}
diff --git a/worlds/sc2/mission_tables.py b/worlds/sc2/mission_tables.py
index 3dfe50ff2b..6857d178f5 100644
--- a/worlds/sc2/mission_tables.py
+++ b/worlds/sc2/mission_tables.py
@@ -118,23 +118,23 @@ class SC2Mission(Enum):
     # Wings of Liberty
     LIBERATION_DAY = 1, "Liberation Day", SC2Campaign.WOL, "Mar Sara", SC2Race.ANY, MissionPools.STARTER, "ap_liberation_day", MissionFlag.Terran|MissionFlag.NoBuild|MissionFlag.VsTerran
     THE_OUTLAWS = 2, "The Outlaws (Terran)", SC2Campaign.WOL, "Mar Sara", SC2Race.TERRAN, MissionPools.EASY, "ap_the_outlaws", MissionFlag.Terran|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
-    ZERO_HOUR = 3, "Zero Hour (Terran)", SC2Campaign.WOL, "Mar Sara", SC2Race.TERRAN, MissionPools.EASY, "ap_zero_hour", MissionFlag.Terran|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
-    EVACUATION = 4, "Evacuation (Terran)", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.EASY, "ap_evacuation", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
+    ZERO_HOUR = 3, "Zero Hour (Terran)", SC2Campaign.WOL, "Mar Sara", SC2Race.TERRAN, MissionPools.STARTER, "ap_zero_hour", MissionFlag.Terran|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
+    EVACUATION = 4, "Evacuation (Terran)", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.STARTER, "ap_evacuation", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
     OUTBREAK = 5, "Outbreak (Terran)", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.EASY, "ap_outbreak", MissionFlag.Terran|MissionFlag.Defense|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
     SAFE_HAVEN = 6, "Safe Haven (Terran)", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_safe_haven", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
     HAVENS_FALL = 7, "Haven's Fall (Terran)", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_havens_fall", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
-    SMASH_AND_GRAB = 8, "Smash and Grab (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.EASY, "ap_smash_and_grab", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsPZ|MissionFlag.HasRaceSwap
+    SMASH_AND_GRAB = 8, "Smash and Grab (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.STARTER, "ap_smash_and_grab", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsPZ|MissionFlag.HasRaceSwap
     THE_DIG = 9, "The Dig (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_dig", MissionFlag.Terran|MissionFlag.TimedDefense|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
     THE_MOEBIUS_FACTOR = 10, "The Moebius Factor (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_moebius_factor", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
     SUPERNOVA = 11, "Supernova (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.HARD, "ap_supernova", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
     MAW_OF_THE_VOID = 12, "Maw of the Void (Terran)", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.HARD, "ap_maw_of_the_void", MissionFlag.Terran|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
-    DEVILS_PLAYGROUND = 13, "Devil's Playground (Terran)", SC2Campaign.WOL, "Covert", SC2Race.TERRAN, MissionPools.EASY, "ap_devils_playground", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
+    DEVILS_PLAYGROUND = 13, "Devil's Playground (Terran)", SC2Campaign.WOL, "Covert", SC2Race.TERRAN, MissionPools.STARTER, "ap_devils_playground", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
     WELCOME_TO_THE_JUNGLE = 14, "Welcome to the Jungle (Terran)", SC2Campaign.WOL, "Covert", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_welcome_to_the_jungle", MissionFlag.Terran|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
     BREAKOUT = 15, "Breakout", SC2Campaign.WOL, "Covert", SC2Race.ANY, MissionPools.STARTER, "ap_breakout", MissionFlag.Terran|MissionFlag.NoBuild|MissionFlag.VsTerran
     GHOST_OF_A_CHANCE = 16, "Ghost of a Chance", SC2Campaign.WOL, "Covert", SC2Race.ANY, MissionPools.STARTER, "ap_ghost_of_a_chance", MissionFlag.Terran|MissionFlag.NoBuild|MissionFlag.VsTerran|MissionFlag.WoLNova
     THE_GREAT_TRAIN_ROBBERY = 17, "The Great Train Robbery (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.EASY, "ap_the_great_train_robbery", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
-    CUTTHROAT = 18, "Cutthroat (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_cutthroat", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
-    ENGINE_OF_DESTRUCTION = 19, "Engine of Destruction (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.HARD, "ap_engine_of_destruction", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
+    CUTTHROAT = 18, "Cutthroat (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.EASY, "ap_cutthroat", MissionFlag.Terran|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
+    ENGINE_OF_DESTRUCTION = 19, "Engine of Destruction (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_engine_of_destruction", MissionFlag.Terran|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
     MEDIA_BLITZ = 20, "Media Blitz (Terran)", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_media_blitz", MissionFlag.Terran|MissionFlag.VsTerran|MissionFlag.HasRaceSwap
     PIERCING_OF_THE_SHROUD = 21, "Piercing the Shroud", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.STARTER, "ap_piercing_the_shroud", MissionFlag.Terran|MissionFlag.NoBuild|MissionFlag.VsAll
     GATES_OF_HELL = 26, "Gates of Hell (Terran)", SC2Campaign.WOL, "Char", SC2Race.TERRAN, MissionPools.HARD, "ap_gates_of_hell", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
@@ -145,7 +145,7 @@ class SC2Mission(Enum):
     # Prophecy
     WHISPERS_OF_DOOM = 22, "Whispers of Doom", SC2Campaign.PROPHECY, "_1", SC2Race.ANY, MissionPools.STARTER, "ap_whispers_of_doom", MissionFlag.Protoss|MissionFlag.NoBuild|MissionFlag.VsZerg
     A_SINISTER_TURN = 23, "A Sinister Turn (Protoss)", SC2Campaign.PROPHECY, "_2", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_a_sinister_turn", MissionFlag.Protoss|MissionFlag.VsProtoss|MissionFlag.HasRaceSwap
-    ECHOES_OF_THE_FUTURE = 24, "Echoes of the Future (Protoss)", SC2Campaign.PROPHECY, "_3", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_echoes_of_the_future", MissionFlag.Protoss|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
+    ECHOES_OF_THE_FUTURE = 24, "Echoes of the Future (Protoss)", SC2Campaign.PROPHECY, "_3", SC2Race.PROTOSS, MissionPools.EASY, "ap_echoes_of_the_future", MissionFlag.Protoss|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
     IN_UTTER_DARKNESS = 25, "In Utter Darkness (Protoss)", SC2Campaign.PROPHECY, "_4", SC2Race.PROTOSS, MissionPools.HARD, "ap_in_utter_darkness", MissionFlag.Protoss|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.HasRaceSwap
 
     # Heart of the Swarm
@@ -177,7 +177,7 @@ class SC2Mission(Enum):
 
     # LotV
     FOR_AIUR = 53, "For Aiur!", SC2Campaign.LOTV, "Aiur", SC2Race.ANY, MissionPools.STARTER, "ap_for_aiur", MissionFlag.Protoss|MissionFlag.NoBuild|MissionFlag.VsZerg
-    THE_GROWING_SHADOW = 54, "The Growing Shadow (Protoss)", SC2Campaign.LOTV, "Aiur", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_growing_shadow", MissionFlag.Protoss|MissionFlag.VsPZ|MissionFlag.HasRaceSwap
+    THE_GROWING_SHADOW = 54, "The Growing Shadow (Protoss)", SC2Campaign.LOTV, "Aiur", SC2Race.PROTOSS, MissionPools.STARTER, "ap_the_growing_shadow", MissionFlag.Protoss|MissionFlag.VsPZ|MissionFlag.HasRaceSwap
     THE_SPEAR_OF_ADUN = 55, "The Spear of Adun (Protoss)", SC2Campaign.LOTV, "Aiur", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_spear_of_adun", MissionFlag.Protoss|MissionFlag.VanillaSoa|MissionFlag.VsPZ|MissionFlag.HasRaceSwap
     SKY_SHIELD = 56, "Sky Shield (Protoss)", SC2Campaign.LOTV, "Korhal", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_sky_shield", MissionFlag.Protoss|MissionFlag.VanillaSoa|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.AiTerranAlly|MissionFlag.HasRaceSwap
     BROTHERS_IN_ARMS = 57, "Brothers in Arms (Protoss)", SC2Campaign.LOTV, "Korhal", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_brothers_in_arms", MissionFlag.Protoss|MissionFlag.VanillaSoa|MissionFlag.VsTerran|MissionFlag.AiTerranAlly|MissionFlag.HasRaceSwap
@@ -202,13 +202,13 @@ class SC2Mission(Enum):
     AMON_S_FALL = 74, "Amon's Fall", SC2Campaign.EPILOGUE, "_3", SC2Race.ZERG, MissionPools.VERY_HARD, "ap_amon_s_fall", MissionFlag.Zerg|MissionFlag.AutoScroller|MissionFlag.VsAll|MissionFlag.AiTerranAlly|MissionFlag.AiProtossAlly
 
     # Nova Covert Ops
-    THE_ESCAPE = 75, "The Escape", SC2Campaign.NCO, "_1", SC2Race.ANY, MissionPools.MEDIUM, "ap_the_escape", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.NoBuild|MissionFlag.VsTerran
+    THE_ESCAPE = 75, "The Escape", SC2Campaign.NCO, "_1", SC2Race.ANY, MissionPools.EASY, "ap_the_escape", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.NoBuild|MissionFlag.VsTerran
     SUDDEN_STRIKE = 76, "Sudden Strike", SC2Campaign.NCO, "_1", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_sudden_strike", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.TimedDefense|MissionFlag.VsZerg
     ENEMY_INTELLIGENCE = 77, "Enemy Intelligence", SC2Campaign.NCO, "_1", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_enemy_intelligence", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.Defense|MissionFlag.VsZerg
     TROUBLE_IN_PARADISE = 78, "Trouble In Paradise", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.HARD, "ap_trouble_in_paradise", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.Countdown|MissionFlag.VsPZ
     NIGHT_TERRORS = 79, "Night Terrors", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.HARD, "ap_night_terrors", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.VsPZ
     FLASHPOINT = 80, "Flashpoint", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.HARD, "ap_flashpoint", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.VsZerg
-    IN_THE_ENEMY_S_SHADOW = 81, "In the Enemy's Shadow", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_in_the_enemy_s_shadow", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.NoBuild|MissionFlag.VsTerran
+    IN_THE_ENEMY_S_SHADOW = 81, "In the Enemy's Shadow", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.EASY, "ap_in_the_enemy_s_shadow", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.NoBuild|MissionFlag.VsTerran
     DARK_SKIES = 82, "Dark Skies", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.HARD, "ap_dark_skies", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.TimedDefense|MissionFlag.VsProtoss
     END_GAME = 83, "End Game", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.VERY_HARD, "ap_end_game", MissionFlag.Terran|MissionFlag.Nova|MissionFlag.Defense|MissionFlag.VsTerran
 
@@ -218,10 +218,10 @@ class SC2Mission(Enum):
     THE_OUTLAWS_P = 87, "The Outlaws (Protoss)", SC2Campaign.WOL, "Mar Sara", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_outlaws", MissionFlag.Protoss|MissionFlag.VsTerran|MissionFlag.RaceSwap
     ZERO_HOUR_Z = 88, "Zero Hour (Zerg)", SC2Campaign.WOL, "Mar Sara", SC2Race.ZERG, MissionPools.MEDIUM, "ap_zero_hour", MissionFlag.Zerg|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.RaceSwap
     ZERO_HOUR_P = 89, "Zero Hour (Protoss)", SC2Campaign.WOL, "Mar Sara", SC2Race.PROTOSS, MissionPools.EASY, "ap_zero_hour", MissionFlag.Protoss|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.RaceSwap
-    EVACUATION_Z = 90, "Evacuation (Zerg)", SC2Campaign.WOL, "Colonist", SC2Race.ZERG, MissionPools.EASY, "ap_evacuation", MissionFlag.Zerg|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.RaceSwap
-    EVACUATION_P = 91, "Evacuation (Protoss)", SC2Campaign.WOL, "Colonist", SC2Race.PROTOSS, MissionPools.EASY, "ap_evacuation", MissionFlag.Protoss|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    EVACUATION_Z = 90, "Evacuation (Zerg)", SC2Campaign.WOL, "Colonist", SC2Race.ZERG, MissionPools.STARTER, "ap_evacuation", MissionFlag.Zerg|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    EVACUATION_P = 91, "Evacuation (Protoss)", SC2Campaign.WOL, "Colonist", SC2Race.PROTOSS, MissionPools.STARTER, "ap_evacuation", MissionFlag.Protoss|MissionFlag.AutoScroller|MissionFlag.VsZerg|MissionFlag.RaceSwap
     OUTBREAK_Z = 92, "Outbreak (Zerg)", SC2Campaign.WOL, "Colonist", SC2Race.ZERG, MissionPools.MEDIUM, "ap_outbreak", MissionFlag.Zerg|MissionFlag.Defense|MissionFlag.VsZerg|MissionFlag.RaceSwap
-    OUTBREAK_P = 93, "Outbreak (Protoss)", SC2Campaign.WOL, "Colonist", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_outbreak", MissionFlag.Protoss|MissionFlag.Defense|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    OUTBREAK_P = 93, "Outbreak (Protoss)", SC2Campaign.WOL, "Colonist", SC2Race.PROTOSS, MissionPools.EASY, "ap_outbreak", MissionFlag.Protoss|MissionFlag.Defense|MissionFlag.VsZerg|MissionFlag.RaceSwap
     SAFE_HAVEN_Z = 94, "Safe Haven (Zerg)", SC2Campaign.WOL, "Colonist", SC2Race.ZERG, MissionPools.MEDIUM, "ap_safe_haven", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     SAFE_HAVEN_P = 95, "Safe Haven (Protoss)", SC2Campaign.WOL, "Colonist", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_safe_haven", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     HAVENS_FALL_Z = 96, "Haven's Fall (Zerg)", SC2Campaign.WOL, "Colonist", SC2Race.ZERG, MissionPools.MEDIUM, "ap_havens_fall", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
@@ -236,16 +236,16 @@ class SC2Mission(Enum):
     SUPERNOVA_P = 105, "Supernova (Protoss)", SC2Campaign.WOL, "Artifact", SC2Race.PROTOSS, MissionPools.HARD, "ap_supernova", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     MAW_OF_THE_VOID_Z = 106, "Maw of the Void (Zerg)", SC2Campaign.WOL, "Artifact", SC2Race.ZERG, MissionPools.HARD, "ap_maw_of_the_void", MissionFlag.Zerg|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     MAW_OF_THE_VOID_P = 107, "Maw of the Void (Protoss)", SC2Campaign.WOL, "Artifact", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_maw_of_the_void", MissionFlag.Protoss|MissionFlag.VsProtoss|MissionFlag.RaceSwap
-    DEVILS_PLAYGROUND_Z = 108, "Devil's Playground (Zerg)", SC2Campaign.WOL, "Covert", SC2Race.ZERG, MissionPools.EASY, "ap_devils_playground", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
-    DEVILS_PLAYGROUND_P = 109, "Devil's Playground (Protoss)", SC2Campaign.WOL, "Covert", SC2Race.PROTOSS, MissionPools.EASY, "ap_devils_playground", MissionFlag.Protoss|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    DEVILS_PLAYGROUND_Z = 108, "Devil's Playground (Zerg)", SC2Campaign.WOL, "Covert", SC2Race.ZERG, MissionPools.STARTER, "ap_devils_playground", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    DEVILS_PLAYGROUND_P = 109, "Devil's Playground (Protoss)", SC2Campaign.WOL, "Covert", SC2Race.PROTOSS, MissionPools.STARTER, "ap_devils_playground", MissionFlag.Protoss|MissionFlag.VsZerg|MissionFlag.RaceSwap
     WELCOME_TO_THE_JUNGLE_Z = 110, "Welcome to the Jungle (Zerg)", SC2Campaign.WOL, "Covert", SC2Race.ZERG, MissionPools.HARD, "ap_welcome_to_the_jungle", MissionFlag.Zerg|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     WELCOME_TO_THE_JUNGLE_P = 111, "Welcome to the Jungle (Protoss)", SC2Campaign.WOL, "Covert", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_welcome_to_the_jungle", MissionFlag.Protoss|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     # 112/113 - Breakout
     # 114/115 - Ghost of a Chance
     THE_GREAT_TRAIN_ROBBERY_Z = 116, "The Great Train Robbery (Zerg)", SC2Campaign.WOL, "Rebellion", SC2Race.ZERG, MissionPools.EASY, "ap_the_great_train_robbery", MissionFlag.Zerg|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap
     THE_GREAT_TRAIN_ROBBERY_P = 117, "The Great Train Robbery (Protoss)", SC2Campaign.WOL, "Rebellion", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_great_train_robbery", MissionFlag.Protoss|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap
-    CUTTHROAT_Z = 118, "Cutthroat (Zerg)", SC2Campaign.WOL, "Rebellion", SC2Race.ZERG, MissionPools.MEDIUM, "ap_cutthroat", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
-    CUTTHROAT_P = 119, "Cutthroat (Protoss)", SC2Campaign.WOL, "Rebellion", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_cutthroat", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
+    CUTTHROAT_Z = 118, "Cutthroat (Zerg)", SC2Campaign.WOL, "Rebellion", SC2Race.ZERG, MissionPools.EASY, "ap_cutthroat", MissionFlag.Zerg|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
+    CUTTHROAT_P = 119, "Cutthroat (Protoss)", SC2Campaign.WOL, "Rebellion", SC2Race.PROTOSS, MissionPools.EASY, "ap_cutthroat", MissionFlag.Protoss|MissionFlag.Countdown|MissionFlag.VsTerran|MissionFlag.RaceSwap
     ENGINE_OF_DESTRUCTION_Z = 120, "Engine of Destruction (Zerg)", SC2Campaign.WOL, "Rebellion", SC2Race.ZERG, MissionPools.HARD, "ap_engine_of_destruction", MissionFlag.Zerg|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap
     ENGINE_OF_DESTRUCTION_P = 121, "Engine of Destruction (Protoss)", SC2Campaign.WOL, "Rebellion", SC2Race.PROTOSS, MissionPools.HARD, "ap_engine_of_destruction", MissionFlag.Protoss|MissionFlag.AutoScroller|MissionFlag.VsTerran|MissionFlag.RaceSwap
     MEDIA_BLITZ_Z = 122, "Media Blitz (Zerg)", SC2Campaign.WOL, "Rebellion", SC2Race.ZERG, MissionPools.HARD, "ap_media_blitz", MissionFlag.Zerg|MissionFlag.VsTerran|MissionFlag.RaceSwap
@@ -254,8 +254,8 @@ class SC2Mission(Enum):
     # 126/127 - Whispers of Doom
     A_SINISTER_TURN_T = 128, "A Sinister Turn (Terran)", SC2Campaign.PROPHECY, "_2", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_a_sinister_turn", MissionFlag.Terran|MissionFlag.VsProtoss|MissionFlag.RaceSwap
     A_SINISTER_TURN_Z = 129, "A Sinister Turn (Zerg)", SC2Campaign.PROPHECY, "_2", SC2Race.ZERG, MissionPools.MEDIUM, "ap_a_sinister_turn", MissionFlag.Zerg|MissionFlag.VsProtoss|MissionFlag.RaceSwap
-    ECHOES_OF_THE_FUTURE_T = 130, "Echoes of the Future (Terran)", SC2Campaign.PROPHECY, "_3", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_echoes_of_the_future", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.RaceSwap
-    ECHOES_OF_THE_FUTURE_Z = 131, "Echoes of the Future (Zerg)", SC2Campaign.PROPHECY, "_3", SC2Race.ZERG, MissionPools.MEDIUM, "ap_echoes_of_the_future", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    ECHOES_OF_THE_FUTURE_T = 130, "Echoes of the Future (Terran)", SC2Campaign.PROPHECY, "_3", SC2Race.TERRAN, MissionPools.EASY, "ap_echoes_of_the_future", MissionFlag.Terran|MissionFlag.VsZerg|MissionFlag.RaceSwap
+    ECHOES_OF_THE_FUTURE_Z = 131, "Echoes of the Future (Zerg)", SC2Campaign.PROPHECY, "_3", SC2Race.ZERG, MissionPools.EASY, "ap_echoes_of_the_future", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
     IN_UTTER_DARKNESS_T = 132, "In Utter Darkness (Terran)", SC2Campaign.PROPHECY, "_4", SC2Race.TERRAN, MissionPools.HARD, "ap_in_utter_darkness", MissionFlag.Terran|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.RaceSwap
     IN_UTTER_DARKNESS_Z = 133, "In Utter Darkness (Zerg)", SC2Campaign.PROPHECY, "_4", SC2Race.ZERG, MissionPools.HARD, "ap_in_utter_darkness", MissionFlag.Zerg|MissionFlag.TimedDefense|MissionFlag.VsZerg|MissionFlag.RaceSwap
     GATES_OF_HELL_Z = 134, "Gates of Hell (Zerg)", SC2Campaign.WOL, "Char", SC2Race.ZERG, MissionPools.HARD, "ap_gates_of_hell", MissionFlag.Zerg|MissionFlag.VsZerg|MissionFlag.RaceSwap
diff --git a/worlds/sc2/options.py b/worlds/sc2/options.py
index 1df082fea4..c8cc244dd3 100644
--- a/worlds/sc2/options.py
+++ b/worlds/sc2/options.py
@@ -5,14 +5,13 @@ from datetime import timedelta
 
 from Options import (
     Choice, Toggle, DefaultOnToggle, OptionSet, Range,
-    PerGameCommonOptions, Option, VerifyKeys, StartInventory,
+    PerGameCommonOptions, VerifyKeys, StartInventory,
     is_iterable_except_str, OptionGroup, Visibility, ItemDict,
-    Accessibility, ProgressionBalancing
+    OptionCounter,
 )
 from Utils import get_fuzzy_results
 from BaseClasses import PlandoOptions
-from .item import item_names, item_tables
-from .item.item_groups import kerrigan_active_abilities, kerrigan_passives, nova_weapons, nova_gadgets
+from .item import item_names, item_tables, item_groups
 from .mission_tables import (
     SC2Campaign, SC2Mission, lookup_name_to_mission, MissionPools, get_missions_with_any_flags_in_list,
     campaign_mission_table, SC2Race, MissionFlag
@@ -700,7 +699,7 @@ class KerriganMaxActiveAbilities(Range):
     """
     display_name = "Kerrigan Maximum Active Abilities"
     range_start = 0
-    range_end = len(kerrigan_active_abilities)
+    range_end = len(item_groups.kerrigan_active_abilities)
     default = range_end
 
 
@@ -711,7 +710,7 @@ class KerriganMaxPassiveAbilities(Range):
     """
     display_name = "Kerrigan Maximum Passive Abilities"
     range_start = 0
-    range_end = len(kerrigan_passives)
+    range_end = len(item_groups.kerrigan_passives)
     default = range_end
 
 
@@ -829,7 +828,7 @@ class SpearOfAdunMaxAutocastAbilities(Range):
     """
     display_name = "Spear of Adun Maximum Passive Abilities"
     range_start = 0
-    range_end = sum(item.quantity for item_name, item in item_tables.get_full_item_list().items() if item_name in item_tables.spear_of_adun_castable_passives)
+    range_end = sum(item_tables.item_table[item_name].quantity for item_name in item_groups.spear_of_adun_passives)
     default = range_end
 
 
@@ -883,7 +882,7 @@ class NovaMaxWeapons(Range):
     """
     display_name = "Nova Maximum Weapons"
     range_start = 0
-    range_end = len(nova_weapons)
+    range_end = len(item_groups.nova_weapons)
     default = range_end
 
 
@@ -897,7 +896,7 @@ class NovaMaxGadgets(Range):
     """
     display_name = "Nova Maximum Gadgets"
     range_start = 0
-    range_end = len(nova_gadgets)
+    range_end = len(item_groups.nova_gadgets)
     default = range_end
 
 
@@ -932,33 +931,48 @@ class TakeOverAIAllies(Toggle):
     display_name = "Take Over AI Allies"
 
 
-class Sc2ItemDict(Option[Dict[str, int]], VerifyKeys, Mapping[str, int]):
-    """A branch of ItemDict that supports item counts of 0"""
+class Sc2ItemDict(OptionCounter, VerifyKeys, Mapping[str, int]):
+    """A branch of ItemDict that supports negative item counts"""
     default = {}
     supports_weighting = False
     verify_item_name = True
     # convert_name_groups = True
     display_name = 'Unnamed dictionary'
-    minimum_value: int = 0
+    # Note(phaneros): Limiting minimum to -1 means that if two triggers add -1 to the same item,
+    # the validation fails. So give trigger people space to stack a bunch of triggers.
+    min: int = -1000
+    max: int = 1000
+    valid_keys = set(item_tables.item_table) | set(item_groups.item_name_groups)
 
-    def __init__(self, value: Dict[str, int]):
+    def __init__(self, value: dict[str, int]):
         self.value = {key: val for key, val in value.items()}
 
     @classmethod
-    def from_any(cls, data: Union[List[str], Dict[str, int]]) -> 'Sc2ItemDict':
+    def from_any(cls, data: list[str] | dict[str, int]) -> 'Sc2ItemDict':
         if isinstance(data, list):
-            # This is a little default that gets us backwards compatibility with lists.
-            # It doesn't play nice with trigger merging dicts and lists together, though, so best not to advertise it overmuch.
-            data = {item: 0 for item in data}
+            raise ValueError(
+                f"{cls.display_name}: Cannot convert from list. "
+                f"Use dict syntax (no dashes, 'value: number' synax)."
+            )
         if isinstance(data, dict):
             for key, value in data.items():
                 if not isinstance(value, int):
-                    raise ValueError(f"Invalid type in '{cls.display_name}': element '{key}' maps to '{value}', expected an integer")
-                if value < cls.minimum_value:
-                    raise ValueError(f"Invalid value for '{cls.display_name}': element '{key}' maps to {value}, which is less than the minimum ({cls.minimum_value})")
+                    raise ValueError(
+                        f"Invalid type in '{cls.display_name}': "
+                        f"element '{key}' maps to '{value}', expected an integer"
+                    )
+                if value < cls.min:
+                    raise ValueError(
+                        f"Invalid value for '{cls.display_name}': "
+                        f"element '{key}' maps to {value}, which is less than the minimum ({cls.min})"
+                    )
+                if value > cls.max:
+                    raise ValueError(f"Invalid value for '{cls.display_name}': "
+                    f"element '{key}' maps to {value}, which is greater than the maximum ({cls.max})"
+                )
             return cls(data)
         else:
-            raise NotImplementedError(f"Cannot Convert from non-dictionary, got {type(data)}")
+            raise NotImplementedError(f"{cls.display_name}: Cannot convert from non-dictionary, got {type(data)}")
 
     def verify(self, world: Type['World'], player_name: str, plando_options: PlandoOptions) -> None:
         """Overridden version of function from Options.VerifyKeys for a better error message"""
@@ -974,15 +988,16 @@ class Sc2ItemDict(Option[Dict[str, int]], VerifyKeys, Mapping[str, int]):
         self.value = new_value
         for item_name in self.value:
             if item_name not in world.item_names:
-                from .item import item_groups
                 picks = get_fuzzy_results(
                     item_name,
                     list(world.item_names) + list(item_groups.ItemGroupNames.get_all_group_names()),
                     limit=1,
                 )
-                raise Exception(f"Item {item_name} from option {self} "
-                                f"is not a valid item name from {world.game}. "
-                                f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")
+                raise Exception(
+                    f"Item {item_name} from option {self} "
+                    f"is not a valid item name from {world.game}. "
+                    f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)"
+                )
 
     def get_option_name(self, value):
         return ", ".join(f"{key}: {v}" for key, v in value.items())
@@ -998,25 +1013,25 @@ class Sc2ItemDict(Option[Dict[str, int]], VerifyKeys, Mapping[str, int]):
 
 
 class Sc2StartInventory(Sc2ItemDict):
-    """Start with these items."""
+    """Start with these items. Use an amount of -1 to start with all copies of an item."""
     display_name = StartInventory.display_name
 
 
 class LockedItems(Sc2ItemDict):
     """Guarantees that these items will be unlockable, in the amount specified.
-    Specify an amount of 0 to lock all copies of an item."""
+    Specify an amount of -1 to lock all copies of an item."""
     display_name = "Locked Items"
 
 
 class ExcludedItems(Sc2ItemDict):
     """Guarantees that these items will not be unlockable, in the amount specified.
-    Specify an amount of 0 to exclude all copies of an item."""
+    Specify an amount of -1 to exclude all copies of an item."""
     display_name = "Excluded Items"
 
 
 class UnexcludedItems(Sc2ItemDict):
     """Undoes an item exclusion; useful for whitelisting or fine-tuning a category.
-    Specify an amount of 0 to unexclude all copies of an item."""
+    Specify an amount of -1 to unexclude all copies of an item."""
     display_name = "Unexcluded Items"
 
 
@@ -1294,7 +1309,7 @@ class MaximumSupplyReductionPerItem(Range):
 class LowestMaximumSupply(Range):
     """Controls how far max supply reduction traps can reduce maximum supply."""
     display_name = "Lowest Maximum Supply"
-    range_start = 100
+    range_start = 50
     range_end = 200
     default = 180
 
@@ -1561,7 +1576,7 @@ def get_option_value(world: Union['SC2World', None], name: str) -> int:
 
 
 def get_enabled_races(world: Optional['SC2World']) -> Set[SC2Race]:
-    race_names = world.options.selected_races.value if world and len(world.options.selected_races.value) > 0 else SelectedRaces.valid_keys
+    race_names = world.options.selected_races.value if world else SelectedRaces.default
     return {race for race in SC2Race if race.get_title() in race_names}
 
 
@@ -1569,16 +1584,7 @@ def get_enabled_campaigns(world: Optional['SC2World']) -> Set[SC2Campaign]:
     if world is None:
         return {campaign for campaign in SC2Campaign if campaign.campaign_name in EnabledCampaigns.default}
     campaign_names = world.options.enabled_campaigns
-    campaigns = {campaign for campaign in SC2Campaign if campaign.campaign_name in campaign_names}
-    if (world.options.mission_order.value == MissionOrder.option_vanilla
-        and get_enabled_races(world) != {SC2Race.TERRAN, SC2Race.ZERG, SC2Race.PROTOSS}
-        and SC2Campaign.EPILOGUE in campaigns
-    ):
-        campaigns.remove(SC2Campaign.EPILOGUE)
-    if len(campaigns) == 0:
-        # Everything is disabled, roll as everything enabled
-        return {campaign for campaign in SC2Campaign if campaign != SC2Campaign.GLOBAL}
-    return campaigns
+    return {campaign for campaign in SC2Campaign if campaign.campaign_name in campaign_names}
 
 
 def get_disabled_campaigns(world: 'SC2World') -> Set[SC2Campaign]:
@@ -1591,8 +1597,8 @@ def get_disabled_campaigns(world: 'SC2World') -> Set[SC2Campaign]:
 
 def get_disabled_flags(world: 'SC2World') -> MissionFlag:
     excluded = (
-            (MissionFlag.Terran | MissionFlag.Zerg | MissionFlag.Protoss)
-            ^ functools.reduce(lambda a, b: a | b, [race.get_mission_flag() for race in get_enabled_races(world)])
+        (MissionFlag.Terran | MissionFlag.Zerg | MissionFlag.Protoss)
+        ^ functools.reduce(lambda a, b: a | b, [race.get_mission_flag() for race in get_enabled_races(world)])
     )
     # filter out no-build missions
     if not world.options.shuffle_no_build.value:
@@ -1640,21 +1646,8 @@ def get_excluded_missions(world: 'SC2World') -> Set[SC2Mission]:
     # Omitting missions not in enabled campaigns
     for campaign in disabled_campaigns:
         excluded_missions = excluded_missions.union(campaign_mission_table[campaign])
-    # Omitting unwanted mission variants
-    if world.options.enable_race_swap.value in [EnableRaceSwapVariants.option_pick_one, EnableRaceSwapVariants.option_pick_one_non_vanilla]:
-        swaps = [
-            mission for mission in SC2Mission
-            if mission not in excluded_missions
-            and mission.flags & (MissionFlag.HasRaceSwap|MissionFlag.RaceSwap)
-        ]
-        while len(swaps) > 0:
-            curr = swaps[0]
-            variants = [mission for mission in swaps if mission.map_file == curr.map_file]
-            variants.sort(key=lambda mission: mission.id)
-            swaps = [mission for mission in swaps if mission not in variants]
-            if len(variants) > 1:
-                variants.pop(world.random.randint(0, len(variants)-1))
-                excluded_missions = excluded_missions.union(variants)
+
+    # Exclusions for race_swap: pick_one are handled during mission order generation
 
     return excluded_missions
 
diff --git a/worlds/sc2/pool_filter.py b/worlds/sc2/pool_filter.py
index 31e47934ee..0ffa08e010 100644
--- a/worlds/sc2/pool_filter.py
+++ b/worlds/sc2/pool_filter.py
@@ -3,8 +3,7 @@ from typing import Callable, Dict, List, Set, Tuple, TYPE_CHECKING, Iterable
 
 from BaseClasses import Location, ItemClassification
 from .item import StarcraftItem, ItemFilterFlags, item_names, item_parents, item_groups
-from .item.item_tables import item_table, TerranItemType, ZergItemType, spear_of_adun_calldowns, \
-    spear_of_adun_castable_passives
+from .item.item_tables import item_table, TerranItemType, ZergItemType, spear_of_adun_calldowns
 from .options import RequiredTactics
 
 if TYPE_CHECKING:
@@ -272,7 +271,7 @@ class ValidInventory:
         self.world.random.shuffle(spear_of_adun_actives)
         cull_items_over_maximum(spear_of_adun_actives, self.world.options.spear_of_adun_max_active_abilities.value)
 
-        spear_of_adun_autocasts = [item for item in inventory if item.name in spear_of_adun_castable_passives]
+        spear_of_adun_autocasts = [item for item in inventory if item.name in item_groups.spear_of_adun_passives]
         self.world.random.shuffle(spear_of_adun_autocasts)
         cull_items_over_maximum(spear_of_adun_autocasts, self.world.options.spear_of_adun_max_passive_abilities.value)
 
diff --git a/worlds/sc2/regions.py b/worlds/sc2/regions.py
index 26d127a1c5..4b02d294d1 100644
--- a/worlds/sc2/regions.py
+++ b/worlds/sc2/regions.py
@@ -36,7 +36,8 @@ def create_mission_order(
     # whenever the event location becomes accessible
 
     # Set up mission pools
-    mission_pools = SC2MOGenMissionPools()
+    race_swap_pick_one = world.options.enable_race_swap.value in [EnableRaceSwapVariants.option_pick_one, EnableRaceSwapVariants.option_pick_one_non_vanilla]
+    mission_pools = SC2MOGenMissionPools(race_swap_pick_one)
     mission_pools.set_exclusions(get_excluded_missions(world), []) # TODO set unexcluded
     adjust_mission_pools(world, mission_pools)
     setup_mission_pool_balancing(world, mission_pools)
@@ -73,71 +74,37 @@ def adjust_mission_pools(world: 'SC2World', pools: SC2MOGenMissionPools):
     # Mission pool changes
     mission_order_type = world.options.mission_order.value
     enabled_campaigns = get_enabled_campaigns(world)
-    adv_tactics = world.options.required_tactics.value != RequiredTactics.option_standard
-    shuffle_no_build = world.options.shuffle_no_build.value
-    extra_locations = world.options.extra_locations.value
     grant_story_tech = world.options.grant_story_tech.value
     grant_story_levels = world.options.grant_story_levels.value
     war_council_nerfs = world.options.war_council_nerfs.value == WarCouncilNerfs.option_true
+    kerriganless = (
+        world.options.kerrigan_presence.value not in kerrigan_unit_available
+        or SC2Campaign.HOTS not in enabled_campaigns
+    )
 
-    # WoL
-    if shuffle_no_build == ShuffleNoBuild.option_false or adv_tactics:
-        # Replacing No Build missions with Easy missions
-        # WoL
-        pools.move_mission(SC2Mission.ZERO_HOUR, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.EVACUATION, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.EVACUATION_Z, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.EVACUATION_P, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.DEVILS_PLAYGROUND, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.DEVILS_PLAYGROUND_Z, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.DEVILS_PLAYGROUND_P, Difficulty.EASY, Difficulty.STARTER)
-        if world.options.required_tactics != RequiredTactics.option_any_units:
-            # Per playtester feedback: doing this mission with only one unit is flaky
-            # but there are enough viable comps that >= 2 random units is probably workable
-            pools.move_mission(SC2Mission.THE_GREAT_TRAIN_ROBBERY, Difficulty.EASY, Difficulty.STARTER)
-            pools.move_mission(SC2Mission.THE_GREAT_TRAIN_ROBBERY_Z, Difficulty.EASY, Difficulty.STARTER)
-            pools.move_mission(SC2Mission.THE_GREAT_TRAIN_ROBBERY_P, Difficulty.EASY, Difficulty.STARTER)
-        # LotV
-        pools.move_mission(SC2Mission.THE_GROWING_SHADOW, Difficulty.EASY, Difficulty.STARTER)
-        if shuffle_no_build == ShuffleNoBuild.option_false:
-            # Pushing Outbreak to Normal, as it cannot be placed as the second mission on Build-Only
-            pools.move_mission(SC2Mission.OUTBREAK, Difficulty.EASY, Difficulty.MEDIUM)
-            # Pushing extra Normal missions to Easy
-            pools.move_mission(SC2Mission.ECHOES_OF_THE_FUTURE, Difficulty.MEDIUM, Difficulty.EASY)
-            pools.move_mission(SC2Mission.CUTTHROAT, Difficulty.MEDIUM, Difficulty.EASY)
-        # Additional changes on Advanced Tactics
-        if adv_tactics:
+    # General changes for standard tactics
+    if world.options.required_tactics.value == RequiredTactics.option_standard:
+        pools.move_mission(SC2Mission.SMASH_AND_GRAB, Difficulty.STARTER, Difficulty.EASY)
+
+        if world.options.shuffle_no_build.value == ShuffleNoBuild.option_false:
             # WoL
-            pools.move_mission(SC2Mission.SMASH_AND_GRAB, Difficulty.EASY, Difficulty.STARTER)
-            pools.move_mission(SC2Mission.THE_MOEBIUS_FACTOR, Difficulty.MEDIUM, Difficulty.EASY)
-            pools.move_mission(SC2Mission.THE_MOEBIUS_FACTOR_Z, Difficulty.MEDIUM, Difficulty.EASY)
-            pools.move_mission(SC2Mission.THE_MOEBIUS_FACTOR_P, Difficulty.MEDIUM, Difficulty.EASY)
-            pools.move_mission(SC2Mission.WELCOME_TO_THE_JUNGLE, Difficulty.MEDIUM, Difficulty.EASY)
-            pools.move_mission(SC2Mission.ENGINE_OF_DESTRUCTION, Difficulty.HARD, Difficulty.MEDIUM)
-    # Prophecy needs to be adjusted if by itself
+            pools.move_mission(SC2Mission.ZERO_HOUR, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.EVACUATION, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.EVACUATION_Z, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.EVACUATION_P, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.DEVILS_PLAYGROUND, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.DEVILS_PLAYGROUND_Z, Difficulty.STARTER, Difficulty.EASY)
+            pools.move_mission(SC2Mission.DEVILS_PLAYGROUND_P, Difficulty.STARTER, Difficulty.EASY)
+
+            # LotV
+            pools.move_mission(SC2Mission.THE_GROWING_SHADOW, Difficulty.STARTER, Difficulty.EASY)
+
+    # Mission-specific adjustments for particular options
+    # Cement Prophecy's mission order if it is the only campaign
     if enabled_campaigns == {SC2Campaign.PROPHECY}:
         pools.move_mission(SC2Mission.A_SINISTER_TURN, Difficulty.MEDIUM, Difficulty.EASY)
-    # Prologue's only valid starter is the goal mission
-    if enabled_campaigns == {SC2Campaign.PROLOGUE} \
-            or mission_order_type in static_mission_orders \
-            and world.options.shuffle_campaigns.value == ShuffleCampaigns.option_false:
-        pools.move_mission(SC2Mission.DARK_WHISPERS, Difficulty.EASY, Difficulty.STARTER)
-    # HotS
-    kerriganless = world.options.kerrigan_presence.value not in kerrigan_unit_available \
-        or SC2Campaign.HOTS not in enabled_campaigns
-    if grant_story_tech == GrantStoryTech.option_grant:
-        # Additional starter mission if player is granted story tech
-        pools.move_mission(SC2Mission.ENEMY_WITHIN, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.TEMPLAR_S_RETURN, Difficulty.MEDIUM, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.THE_ESCAPE, Difficulty.MEDIUM, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.IN_THE_ENEMY_S_SHADOW, Difficulty.MEDIUM, Difficulty.STARTER)
-    if not war_council_nerfs:
-        pools.move_mission(SC2Mission.TEMPLAR_S_RETURN, Difficulty.MEDIUM, Difficulty.STARTER)
-    if (grant_story_tech == GrantStoryTech.option_grant and grant_story_levels) or kerriganless:
-        # The player has, all the stuff he needs, provided under these settings
-        pools.move_mission(SC2Mission.SUPREME, Difficulty.MEDIUM, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.THE_INFINITE_CYCLE, Difficulty.HARD, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.CONVICTION, Difficulty.MEDIUM, Difficulty.STARTER)
+
+    # Don't start on Ghost of a Chance if it will require Nova items
     if (grant_story_tech != GrantStoryTech.option_grant
         and (
             world.options.nova_ghost_of_a_chance_variant == NovaGhostOfAChanceVariant.option_nco
@@ -149,13 +116,36 @@ def adjust_mission_pools(world: 'SC2World', pools: SC2MOGenMissionPools):
     ):
         # Using NCO tech for this mission that must be acquired
         pools.move_mission(SC2Mission.GHOST_OF_A_CHANCE, Difficulty.STARTER, Difficulty.MEDIUM)
+
+    # Cement Prophecy's mission order if it is the only campaign
+    if (enabled_campaigns == {SC2Campaign.PROLOGUE}
+        or (mission_order_type in static_mission_orders
+            and world.options.shuffle_campaigns.value == ShuffleCampaigns.option_false
+        )
+    ):
+        pools.move_mission(SC2Mission.DARK_WHISPERS, Difficulty.EASY, Difficulty.STARTER)
+
+    # Grant Story Tech
+    if grant_story_tech == GrantStoryTech.option_grant:
+        # Additional starter mission if player is granted story tech
+        pools.move_mission(SC2Mission.ENEMY_WITHIN, Difficulty.EASY, Difficulty.STARTER)
+        pools.move_mission(SC2Mission.THE_ESCAPE, Difficulty.MEDIUM, Difficulty.STARTER)
+        pools.move_mission(SC2Mission.IN_THE_ENEMY_S_SHADOW, Difficulty.MEDIUM, Difficulty.STARTER)
+    if not war_council_nerfs or grant_story_tech == GrantStoryTech.option_grant:
+        pools.move_mission(SC2Mission.TEMPLAR_S_RETURN, Difficulty.MEDIUM, Difficulty.STARTER)
+    if (grant_story_tech == GrantStoryTech.option_grant and grant_story_levels) or kerriganless:
+        # The player has, all the stuff he needs, provided under these settings
+        pools.move_mission(SC2Mission.SUPREME, Difficulty.MEDIUM, Difficulty.STARTER)
+        pools.move_mission(SC2Mission.THE_INFINITE_CYCLE, Difficulty.HARD, Difficulty.STARTER)
+        pools.move_mission(SC2Mission.CONVICTION, Difficulty.MEDIUM, Difficulty.STARTER)
+    
+    # Take over AI allies
     if world.options.take_over_ai_allies.value == TakeOverAIAllies.option_true:
         pools.move_mission(SC2Mission.HARBINGER_OF_OBLIVION, Difficulty.MEDIUM, Difficulty.STARTER)
-    if pools.get_pool_size(Difficulty.STARTER) < 2 and not kerriganless or adv_tactics:
-        # Conditionally moving Easy missions to Starter
-        pools.move_mission(SC2Mission.HARVEST_OF_SCREAMS, Difficulty.EASY, Difficulty.STARTER)
-        pools.move_mission(SC2Mission.DOMINATION, Difficulty.EASY, Difficulty.STARTER)
+
+    # Final pool size adjustments
     if pools.get_pool_size(Difficulty.STARTER) < 2:
+        pools.move_mission(SC2Mission.HARVEST_OF_SCREAMS, Difficulty.EASY, Difficulty.STARTER)
         pools.move_mission(SC2Mission.DOMINATION, Difficulty.EASY, Difficulty.STARTER)
         pools.move_mission(SC2Mission.DOMINATION_T, Difficulty.EASY, Difficulty.STARTER)
         pools.move_mission(SC2Mission.DOMINATION_P, Difficulty.EASY, Difficulty.STARTER)
diff --git a/worlds/sc2/rules.py b/worlds/sc2/rules.py
index 2298c2cea6..28a8804e5e 100644
--- a/worlds/sc2/rules.py
+++ b/worlds/sc2/rules.py
@@ -19,26 +19,13 @@ from .options import (
     get_enabled_races,
 )
 from .item.item_tables import (
-    tvx_defense_ratings,
-    tvz_defense_ratings,
-    tvx_air_defense_ratings,
     kerrigan_levels,
     get_full_item_list,
-    zvx_air_defense_ratings,
-    zvx_defense_ratings,
-    pvx_defense_ratings,
-    pvz_defense_ratings,
     no_logic_basic_units,
     advanced_basic_units,
     basic_units,
     upgrade_bundle_inverted_lookup,
     WEAPON_ARMOR_UPGRADE_MAX_LEVEL,
-    soa_ultimate_ratings,
-    soa_energy_ratings,
-    terran_passive_ratings,
-    soa_passive_ratings,
-    zerg_passive_ratings,
-    protoss_passive_ratings,
 )
 from .mission_tables import SC2Race, SC2Campaign
 from .item import item_groups, item_names
@@ -116,7 +103,7 @@ class SC2Logic:
         # has_group with count = 0 is always true for item placement and always false for SC2 item filtering
         return state.has_group("Missions", self.player, 0)
 
-    def get_very_hard_required_upgrade_level(self) -> bool:
+    def get_very_hard_required_upgrade_level(self) -> int:
         return 2 if self.advanced_tactics else 3
 
     def weapon_armor_upgrade_count(self, upgrade_item: str, state: CollectionState) -> int:
@@ -140,7 +127,7 @@ class SC2Logic:
             count += 1
         return count
 
-    def soa_power_rating(self, state: CollectionState) -> bool:
+    def soa_power_rating(self, state: CollectionState) -> int:
         power_rating = 0
         # Spear of Adun Ultimates (Strongest)
         for item, rating in soa_ultimate_ratings.items():
@@ -256,26 +243,23 @@ class SC2Logic:
         )
 
     def terran_any_air_unit(self, state: CollectionState) -> bool:
-        return state.has_any(
-            {
-                item_names.VIKING,
-                item_names.MEDIVAC,
-                item_names.RAVEN,
-                item_names.BANSHEE,
-                item_names.SCIENCE_VESSEL,
-                item_names.BATTLECRUISER,
-                item_names.WRAITH,
-                item_names.HERCULES,
-                item_names.LIBERATOR,
-                item_names.VALKYRIE,
-                item_names.SKY_FURY,
-                item_names.NIGHT_HAWK,
-                item_names.EMPERORS_GUARDIAN,
-                item_names.NIGHT_WOLF,
-                item_names.PRIDE_OF_AUGUSTRGRAD,
-            },
-            self.player,
-        )
+        return state.has_any((
+            item_names.VIKING,
+            item_names.MEDIVAC,
+            item_names.RAVEN,
+            item_names.BANSHEE,
+            item_names.SCIENCE_VESSEL,
+            item_names.BATTLECRUISER,
+            item_names.WRAITH,
+            item_names.HERCULES,
+            item_names.LIBERATOR,
+            item_names.VALKYRIE,
+            item_names.SKY_FURY,
+            item_names.NIGHT_HAWK,
+            item_names.EMPERORS_GUARDIAN,
+            item_names.NIGHT_WOLF,
+            item_names.PRIDE_OF_AUGUSTRGRAD,
+        ), self.player)
 
     def terran_competent_ground_to_air(self, state: CollectionState) -> bool:
         """
@@ -288,10 +272,12 @@ class SC2Logic:
                 and self.terran_bio_heal(state)
                 and self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_TERRAN_INFANTRY_WEAPON, state) >= 2
             )
-            or self.advanced_tactics
-            and (
-                state.has(item_names.CYCLONE, self.player)
-                or state.has_all((item_names.THOR, item_names.THOR_PROGRESSIVE_HIGH_IMPACT_PAYLOAD), self.player)
+            or (
+                self.advanced_tactics
+                and (
+                    state.has(item_names.CYCLONE, self.player)
+                    or state.has_all((item_names.THOR, item_names.THOR_PROGRESSIVE_HIGH_IMPACT_PAYLOAD), self.player)
+                )
             )
         )
 
@@ -381,33 +367,28 @@ class SC2Logic:
         Basic AA to deal with few air units
         """
         return (
-            state.has_any(
-                (
-                    item_names.MISSILE_TURRET,
-                    item_names.WAR_PIGS,
-                    item_names.SPARTAN_COMPANY,
-                    item_names.HELS_ANGELS,
-                    item_names.WINGED_NIGHTMARES,
-                    item_names.BRYNHILDS,
-                    item_names.SKY_FURY,
-                    item_names.SON_OF_KORHAL,
-                    item_names.BULWARK_COMPANY,
-                ),
-                self.player,
-            )
+            state.has_any((
+                item_names.MISSILE_TURRET,
+                item_names.WAR_PIGS,
+                item_names.SPARTAN_COMPANY,
+                item_names.HELS_ANGELS,
+                item_names.WINGED_NIGHTMARES,
+                item_names.BRYNHILDS,
+                item_names.SKY_FURY,
+                item_names.SON_OF_KORHAL,
+                item_names.BULWARK_COMPANY,
+            ), self.player)
             or self.terran_moderate_anti_air(state)
-            or self.advanced_tactics
-            and (
-                state.has_any(
-                    (
+            or (self.advanced_tactics
+                and (
+                    state.has_any((
                         item_names.WIDOW_MINE,
                         item_names.PRIDE_OF_AUGUSTRGRAD,
                         item_names.BLACKHAMMER,
                         item_names.EMPERORS_SHADOW,
                         item_names.EMPERORS_GUARDIAN,
                         item_names.NIGHT_HAWK,
-                    ),
-                    self.player,
+                    ), self.player)
                 )
             )
         )
@@ -422,30 +403,37 @@ class SC2Logic:
         """
         defense_score = sum((tvx_defense_ratings[item] for item in tvx_defense_ratings if state.has(item, self.player)))
         # Manned Bunker
-        if state.has_any({item_names.MARINE, item_names.DOMINION_TROOPER, item_names.MARAUDER}, self.player) and state.has(
-            item_names.BUNKER, self.player
+        if (state.has_any((item_names.MARINE, item_names.DOMINION_TROOPER, item_names.MARAUDER), self.player)
+            and state.has(item_names.BUNKER, self.player)
         ):
             defense_score += 3
         elif zerg_enemy and state.has(item_names.FIREBAT, self.player) and state.has(item_names.BUNKER, self.player):
             defense_score += 2
         # Siege Tank upgrades
-        if state.has_all({item_names.SIEGE_TANK, item_names.SIEGE_TANK_MAELSTROM_ROUNDS}, self.player):
+        if state.has_all((item_names.SIEGE_TANK, item_names.SIEGE_TANK_MAELSTROM_ROUNDS), self.player):
             defense_score += 2
-        if state.has_all({item_names.SIEGE_TANK, item_names.SIEGE_TANK_GRADUATING_RANGE}, self.player):
+        if state.has_all((item_names.SIEGE_TANK, item_names.SIEGE_TANK_GRADUATING_RANGE), self.player):
             defense_score += 1
         # Widow Mine upgrade
-        if state.has_all({item_names.WIDOW_MINE, item_names.WIDOW_MINE_CONCEALMENT}, self.player):
+        if state.has_all((item_names.WIDOW_MINE, item_names.WIDOW_MINE_CONCEALMENT), self.player):
             defense_score += 1
         # Viking with splash
-        if state.has_all({item_names.VIKING, item_names.VIKING_SHREDDER_ROUNDS}, self.player):
+        if state.has_all((item_names.VIKING, item_names.VIKING_SHREDDER_ROUNDS), self.player):
             defense_score += 2
 
         # General enemy-based rules
         if zerg_enemy:
-            defense_score += sum((tvz_defense_ratings[item] for item in tvz_defense_ratings if state.has(item, self.player)))
+            defense_score += sum((
+                tvz_defense_ratings[item]
+                for item in tvz_defense_ratings
+                if state.has(item, self.player)
+            ))
         if air_enemy:
             # Capped at 2
-            defense_score += min(sum((tvx_air_defense_ratings[item] for item in tvx_air_defense_ratings if state.has(item, self.player))), 2)
+            defense_score += min2(
+                2,
+                sum((tvx_air_defense_ratings[item] for item in tvx_air_defense_ratings if state.has(item, self.player))),
+            )
         if air_enemy and zerg_enemy and state.has(item_names.VALKYRIE, self.player):
             # Valkyries shred mass Mutas, the most common air enemy that's massed in these cases
             defense_score += 2
@@ -461,19 +449,24 @@ class SC2Logic:
         # Infantry with Healing
         infantry_weapons = self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_TERRAN_INFANTRY_WEAPON, state)
         infantry_armor = self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_TERRAN_INFANTRY_ARMOR, state)
-        infantry = state.has_any({item_names.MARINE, item_names.DOMINION_TROOPER, item_names.MARAUDER}, self.player)
-        if infantry_weapons >= upgrade_level + 1 and infantry_armor >= upgrade_level and infantry and self.terran_bio_heal(state):
+        infantry = state.has_any((item_names.MARINE, item_names.DOMINION_TROOPER, item_names.MARAUDER), self.player)
+        if (infantry_weapons >= upgrade_level + 1
+            and infantry_armor >= upgrade_level
+            and infantry
+            and self.terran_bio_heal(state)
+        ):
             return True
         # Mass Air-To-Ground
         ship_weapons = self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_TERRAN_SHIP_WEAPON, state)
         ship_armor = self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_TERRAN_SHIP_ARMOR, state)
         if ship_weapons >= upgrade_level and ship_armor >= upgrade_level:
             air = (
-                state.has_any({item_names.BANSHEE, item_names.BATTLECRUISER}, self.player)
-                or state.has_all({item_names.LIBERATOR, item_names.LIBERATOR_RAID_ARTILLERY}, self.player)
-                or state.has_all({item_names.WRAITH, item_names.WRAITH_ADVANCED_LASER_TECHNOLOGY}, self.player)
-                or state.has_all({item_names.VALKYRIE, item_names.VALKYRIE_FLECHETTE_MISSILES}, self.player)
-                and ship_weapons >= 2
+                state.has_any((item_names.BANSHEE, item_names.BATTLECRUISER), self.player)
+                or state.has_all((item_names.LIBERATOR, item_names.LIBERATOR_RAID_ARTILLERY), self.player)
+                or state.has_all((item_names.WRAITH, item_names.WRAITH_ADVANCED_LASER_TECHNOLOGY), self.player)
+                or (state.has_all((item_names.VALKYRIE, item_names.VALKYRIE_FLECHETTE_MISSILES), self.player)
+                    and ship_weapons >= 2
+                )
             )
             if air and self.terran_mineral_dump(state):
                 return True
@@ -499,9 +492,11 @@ class SC2Logic:
         Can build something using only minerals
         """
         return (
-            state.has_any({item_names.MARINE, item_names.VULTURE, item_names.HELLION, item_names.SON_OF_KORHAL}, self.player)
-            or state.has_all({item_names.REAPER, item_names.REAPER_RESOURCE_EFFICIENCY}, self.player)
-            or (self.advanced_tactics and state.has_any({item_names.PERDITION_TURRET, item_names.DEVASTATOR_TURRET}, self.player))
+            state.has_any((item_names.MARINE, item_names.VULTURE, item_names.HELLION, item_names.SON_OF_KORHAL), self.player)
+            or state.has_all((item_names.REAPER, item_names.REAPER_RESOURCE_EFFICIENCY), self.player)
+            or (self.advanced_tactics
+                and state.has_any((item_names.PERDITION_TURRET, item_names.DEVASTATOR_TURRET), self.player)
+            )
         )
 
     def terran_beats_protoss_deathball(self, state: CollectionState) -> bool:
@@ -510,12 +505,15 @@ class SC2Logic:
         """
         return (
             (
-                state.has_any({item_names.BANSHEE, item_names.BATTLECRUISER}, self.player)
-                or state.has_all({item_names.LIBERATOR, item_names.LIBERATOR_RAID_ARTILLERY}, self.player)
+                (
+                    state.has_any((item_names.BANSHEE, item_names.BATTLECRUISER), self.player)
+                    or state.has_all((item_names.LIBERATOR, item_names.LIBERATOR_RAID_ARTILLERY), self.player)
+                )
+                and self.terran_competent_anti_air(state)
+            )
+            or (self.terran_competent_comp(state)
+                and self.terran_air_anti_air(state)
             )
-            and self.terran_competent_anti_air(state)
-            or self.terran_competent_comp(state)
-            and self.terran_air_anti_air(state)
         ) and self.terran_army_weapon_armor_upgrade_min_level(state) >= 2
 
     def marine_medic_upgrade(self, state: CollectionState) -> bool:
@@ -523,10 +521,17 @@ class SC2Logic:
         Infantry upgrade to infantry-only no-build segments
         """
         return (
-            state.has_any({item_names.MARINE_COMBAT_SHIELD, item_names.MARINE_MAGRAIL_MUNITIONS, item_names.MEDIC_STABILIZER_MEDPACKS}, self.player)
-            or (state.count(item_names.MARINE_PROGRESSIVE_STIMPACK, self.player) >= 2 and state.has_group("Missions", self.player, 1))
-            or self.advanced_tactics
-            and state.has(item_names.MARINE_LASER_TARGETING_SYSTEM, self.player)
+            state.has_any((
+                item_names.MARINE_COMBAT_SHIELD,
+                item_names.MARINE_MAGRAIL_MUNITIONS,
+                item_names.MEDIC_STABILIZER_MEDPACKS,
+            ), self.player)
+            or (state.count(item_names.MARINE_PROGRESSIVE_STIMPACK, self.player) >= 2
+                and state.has_group("Missions", self.player, 1)
+            )
+            or (self.advanced_tactics
+                and state.has(item_names.MARINE_LASER_TARGETING_SYSTEM, self.player)
+            )
         )
 
     def marine_medic_firebat_upgrade(self, state: CollectionState) -> bool:
@@ -977,15 +982,22 @@ class SC2Logic:
         if self.zerg_army_weapon_armor_upgrade_min_level(state) < 2:
             return False
         advanced = self.advanced_tactics
-        core_unit = state.has_any(
-            {item_names.ROACH, item_names.ABERRATION, item_names.ZERGLING, item_names.INFESTED_DIAMONDBACK}, self.player
-        ) or self.morph_igniter(state)
+        core_unit = (
+            state.has_any((
+                item_names.ROACH,
+                item_names.ABERRATION,
+                item_names.ZERGLING,
+                item_names.INFESTED_DIAMONDBACK,
+            ), self.player)
+            or self.morph_igniter(state)
+        )
         support_unit = (
             state.has_any({item_names.SWARM_QUEEN, item_names.HYDRALISK, item_names.INFESTED_BANSHEE}, self.player)
             or self.morph_brood_lord(state)
             or state.has_all((item_names.MUTALISK, item_names.MUTALISK_SEVERING_GLAIVE, item_names.MUTALISK_VICIOUS_GLAIVE), self.player)
-            or advanced
-            and (state.has_any({item_names.INFESTOR, item_names.DEFILER}, self.player) or self.morph_viper(state))
+            or (advanced
+                and (state.has_any((item_names.INFESTOR, item_names.DEFILER), self.player) or self.morph_viper(state))
+            )
         )
         if core_unit and support_unit:
             return True
@@ -997,8 +1009,9 @@ class SC2Logic:
                     (item_names.GUARDIAN_SORONAN_ACID, item_names.GUARDIAN_EXPLOSIVE_SPORES, item_names.GUARDIAN_PRIMORDIAL_FURY), self.player
                 )
             )
-            or advanced
-            and self.morph_viper(state)
+            or (advanced
+                and self.morph_viper(state)
+            )
         )
         return vespene_unit and state.has_any({item_names.ZERGLING, item_names.SWARM_QUEEN}, self.player)
 
@@ -1057,22 +1070,22 @@ class SC2Logic:
                 self.zerg_ranged_weapon_armor_upgrade_min_level(state) >= self.get_very_hard_required_upgrade_level()
                 and (
                     self.morph_impaler(state)
-                    or self.morph_lurker(state)
-                    and state.has_all((item_names.LURKER_SEISMIC_SPINES, item_names.LURKER_ADAPTED_SPINES), self.player)
-                    or state.has_all(
-                        (
-                            item_names.ROACH,
-                            item_names.ROACH_CORPSER_STRAIN,
-                            item_names.ROACH_ADAPTIVE_PLATING,
-                            item_names.ROACH_GLIAL_RECONSTITUTION,
-                        ),
-                        self.player,
+                    or (self.morph_lurker(state)
+                        and state.has_all((item_names.LURKER_SEISMIC_SPINES, item_names.LURKER_ADAPTED_SPINES), self.player)
+                    )
+                    or state.has_all((
+                        item_names.ROACH,
+                        item_names.ROACH_CORPSER_STRAIN,
+                        item_names.ROACH_ADAPTIVE_PLATING,
+                        item_names.ROACH_GLIAL_RECONSTITUTION,
+                    ), self.player)
+                    or (self.morph_igniter(state)
+                        and state.has(item_names.PRIMAL_IGNITER_PRIMAL_TENACITY, self.player)
                     )
-                    or self.morph_igniter(state)
-                    and state.has(item_names.PRIMAL_IGNITER_PRIMAL_TENACITY, self.player)
                     or state.has_all((item_names.INFESTOR, item_names.INFESTOR_INFESTED_TERRAN), self.player)
-                    or self.spread_creep(state, False)
-                    and state.has(item_names.INFESTED_BUNKER, self.player)
+                    or (self.spread_creep(state, False)
+                        and state.has(item_names.INFESTED_BUNKER, self.player)
+                    )
                     or self.zerg_infested_tank_with_ammo(state)
                     # Highly-upgraded swarm hosts may also work, but that would require promoting many upgrades to progression
                 )
@@ -1081,8 +1094,9 @@ class SC2Logic:
                 self.zerg_flyer_weapon_armor_upgrade_min_level(state) >= self.get_very_hard_required_upgrade_level()
                 and (
                     self.morph_brood_lord(state)
-                    or self.morph_guardian(state)
-                    and state.has_all((item_names.GUARDIAN_PROPELLANT_SACS, item_names.GUARDIAN_SORONAN_ACID), self.player)
+                    or (self.morph_guardian(state)
+                        and state.has_all((item_names.GUARDIAN_PROPELLANT_SACS, item_names.GUARDIAN_SORONAN_ACID), self.player)
+                    )
                     or state.has_all((item_names.INFESTED_BANSHEE, item_names.INFESTED_BANSHEE_FLESHFUSED_TARGETING_OPTICS), self.player)
                     # Highly-upgraded anti-ground devourers would also be good
                 )
@@ -1128,7 +1142,10 @@ class SC2Logic:
         return levels >= target
 
     def basic_kerrigan(self, state: CollectionState, story_tech_available=True) -> bool:
-        if story_tech_available and self.grant_story_tech == GrantStoryTech.option_grant:
+        if story_tech_available and (
+            self.grant_story_tech == GrantStoryTech.option_grant
+            or not self.kerrigan_unit_available
+        ):
             return True
         # One active ability that can be used to defeat enemies directly
         if not state.has_any(
@@ -1152,13 +1169,12 @@ class SC2Logic:
         return False
 
     def two_kerrigan_actives(self, state: CollectionState, story_tech_available=True) -> bool:
-        if story_tech_available and self.grant_story_tech == GrantStoryTech.option_grant:
+        if story_tech_available and (
+            self.grant_story_tech == GrantStoryTech.option_grant
+            or not self.kerrigan_unit_available
+        ):
             return True
-        count = 0
-        for i in range(7):
-            if state.has_any(kerrigan_logic_active_abilities, self.player):
-                count += 1
-        return count >= 2
+        return state.count_from_list(item_groups.kerrigan_logic_active_abilities, self.player) >= 2
 
     # Global Protoss
     def protoss_power_rating(self, state: CollectionState) -> int:
@@ -1346,7 +1362,6 @@ class SC2Logic:
                     item_names.MISTWING,
                     item_names.CALADRIUS,
                     item_names.OPPRESSOR,
-                    item_names.PULSAR,
                     item_names.DRAGOON,
                 },
                 self.player,
@@ -1354,8 +1369,14 @@ class SC2Logic:
             or state.has_all({item_names.TRIREME, item_names.TRIREME_SOLAR_BEAM}, self.player)
             or state.has_all({item_names.WRATHWALKER, item_names.WRATHWALKER_AERIAL_TRACKING}, self.player)
             or state.has_all({item_names.WARP_PRISM, item_names.WARP_PRISM_PHASE_BLASTER}, self.player)
-            or self.advanced_tactics
-            and state.has_any({item_names.HIGH_TEMPLAR, item_names.SIGNIFIER, item_names.SENTRY, item_names.ENERGIZER}, self.player)
+            or (self.advanced_tactics
+                and state.has_any((
+                    item_names.HIGH_TEMPLAR,
+                    item_names.SIGNIFIER,
+                    item_names.SENTRY,
+                    item_names.ENERGIZER,
+                ), self.player)
+            )
             or self.protoss_can_merge_archon(state)
             or self.protoss_can_merge_dark_archon(state)
         )
@@ -1629,8 +1650,9 @@ class SC2Logic:
         return (
             state.has_any((item_names.ZEALOT, item_names.SENTINEL, item_names.PHOTON_CANNON), self.player)
             or state.has_all((item_names.CENTURION, item_names.CENTURION_RESOURCE_EFFICIENCY), self.player)
-            or self.advanced_tactics
-            and state.has_any((item_names.SUPPLICANT, item_names.SHIELD_BATTERY), self.player)
+            or (self.advanced_tactics
+                and state.has_any((item_names.SUPPLICANT, item_names.SHIELD_BATTERY), self.player)
+            )
         )
 
     def zealot_sentry_slayer_start(self, state: CollectionState) -> bool:
@@ -1770,8 +1792,12 @@ class SC2Logic:
         return self.zerg_havens_fall_requirement(state) and (
             self.morph_devourer(state)
             or state.has_any({item_names.MUTALISK, item_names.CORRUPTOR}, self.player)
-            or self.advanced_tactics
-            and (self.morph_viper(state) or state.has_any({item_names.BROOD_QUEEN, item_names.SCOURGE}, self.player))
+            or (self.advanced_tactics
+                and (
+                    self.morph_viper(state)
+                    or state.has_any((item_names.BROOD_QUEEN, item_names.SCOURGE), self.player)
+                )
+            )
         )
 
     def protoss_havens_fall_requirement(self, state: CollectionState) -> bool:
@@ -1780,12 +1806,12 @@ class SC2Logic:
             and self.protoss_competent_anti_air(state)
             and (
                 self.protoss_competent_comp(state)
+                or state.has_any((item_names.TEMPEST, item_names.SKYLORD, item_names.DESTROYER), self.player)
                 or (
-                    state.has_any((item_names.TEMPEST, item_names.SKYLORD, item_names.DESTROYER), self.player)
-                    or (
-                        self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_PROTOSS_AIR_WEAPON, state) >= 2
-                        and state.has(item_names.CARRIER, self.player)
-                        or state.has_all((item_names.SKIRMISHER, item_names.SKIRMISHER_PEER_CONTEMPT), self.player)
+                    self.weapon_armor_upgrade_count(item_names.PROGRESSIVE_PROTOSS_AIR_WEAPON, state) >= 2
+                    and (
+                        state.has_all((item_names.SKIRMISHER, item_names.SKIRMISHER_PEER_CONTEMPT), self.player)
+                        or (state.has(item_names.CARRIER, self.player))
                     )
                 )
             )
@@ -1795,30 +1821,33 @@ class SC2Logic:
         """
         Can deal quickly with Brood Lords and Mutas in Haven's Fall and being able to progress the mission
         """
-        return self.protoss_havens_fall_requirement(state) and (
-            state.has_any({item_names.CARRIER, item_names.SKYLORD, item_names.DESTROYER, item_names.TEMPEST}, self.player)
-            # handle mutas
-            or (
-                state.has_any(
-                    {
-                        item_names.PHOENIX,
-                        item_names.MIRAGE,
-                        item_names.CORSAIR,
-                    },
-                    self.player,
-                )
-                or state.has_all((item_names.SKIRMISHER, item_names.SKIRMISHER_PEER_CONTEMPT), self.player)
-            )
-            # handle brood lords and virophages
+        return (
+            self.protoss_havens_fall_requirement(state)
             and (
-                state.has_any(
-                    {
-                        item_names.VOID_RAY,
-                    },
-                    self.player,
+                # One-unit solutions
+                state.has_any((
+                    item_names.CARRIER,
+                    item_names.SKYLORD,
+                    item_names.DESTROYER,
+                    item_names.TEMPEST,
+                    item_names.VOID_RAY,
+                    item_names.SCOUT,
+                ), self.player)
+                or (
+                    (
+                        # handle mutas
+                        state.has_any((
+                            item_names.PHOENIX,
+                            item_names.MIRAGE,
+                            item_names.CORSAIR,
+                        ), self.player)
+                        or state.has_all((item_names.SKIRMISHER, item_names.SKIRMISHER_PEER_CONTEMPT), self.player)
+                    )
+                    and (
+                        # handle brood lords and virophages
+                        state.has(item_names.MISTWING, self.player)
+                    )
                 )
-                or self.advanced_tactics
-                and state.has_all({item_names.SCOUT, item_names.MISTWING}, self.player)
             )
         )
 
@@ -1876,22 +1905,19 @@ class SC2Logic:
         Able to shoot by a long range or from air to claim the rock formation separated by a chasm
         """
         return (
-            state.has_any(
-                {
-                    item_names.MEDIVAC,
-                    item_names.HERCULES,
-                    item_names.VIKING,
-                    item_names.BANSHEE,
-                    item_names.WRAITH,
-                    item_names.SIEGE_TANK,
-                    item_names.BATTLECRUISER,
-                    item_names.NIGHT_HAWK,
-                    item_names.NIGHT_WOLF,
-                    item_names.SHOCK_DIVISION,
-                    item_names.SKY_FURY,
-                },
-                self.player,
-            )
+            state.has_any((
+                item_names.MEDIVAC,
+                item_names.HERCULES,
+                item_names.VIKING,
+                item_names.BANSHEE,
+                item_names.WRAITH,
+                item_names.SIEGE_TANK,
+                item_names.BATTLECRUISER,
+                item_names.NIGHT_HAWK,
+                item_names.NIGHT_WOLF,
+                item_names.SHOCK_DIVISION,
+                item_names.SKY_FURY,
+            ), self.player)
             or state.has_all({item_names.VALKYRIE, item_names.VALKYRIE_FLECHETTE_MISSILES}, self.player)
             or state.has_all({item_names.RAVEN, item_names.RAVEN_HUNTER_SEEKER_WEAPON}, self.player)
             or (
@@ -1901,19 +1927,18 @@ class SC2Logic:
             or (
                 self.advanced_tactics
                 and (
-                    state.has_any(
-                        {
-                            item_names.HELS_ANGELS,
-                            item_names.DUSK_WINGS,
-                            item_names.WINGED_NIGHTMARES,
-                            item_names.SIEGE_BREAKERS,
-                            item_names.BRYNHILDS,
-                            item_names.JACKSONS_REVENGE,
-                        },
-                        self.player,
-                    )
+                    state.has_any((
+                        item_names.HELS_ANGELS,
+                        item_names.DUSK_WINGS,
+                        item_names.WINGED_NIGHTMARES,
+                        item_names.SIEGE_BREAKERS,
+                        item_names.BRYNHILDS,
+                        item_names.JACKSONS_REVENGE,
+                    ), self.player)
+                    or state.has_all((
+                        item_names.MIDNIGHT_RIDERS, item_names.LIBERATOR_RAID_ARTILLERY,
+                    ), self.player)
                 )
-                or state.has_all({item_names.MIDNIGHT_RIDERS, item_names.LIBERATOR_RAID_ARTILLERY}, self.player)
             )
         )
 
@@ -1947,15 +1972,9 @@ class SC2Logic:
             )
             or state.has_all({item_names.MUTALISK, item_names.MUTALISK_SUNDERING_GLAIVE}, self.player)
             or state.has_all((item_names.HYDRALISK, item_names.HYDRALISK_MUSCULAR_AUGMENTS), self.player)
-            or (
-                state.has(item_names.ZERGLING, self.player)
-                and (
-                    state.has_any(
-                        (item_names.ZERGLING_SHREDDING_CLAWS, item_names.ZERGLING_SHREDDING_CLAWS, item_names.ZERGLING_RAPTOR_STRAIN), self.player
-                    )
-                )
-                and (self.advanced_tactics or state.has_any((item_names.ZERGLING_METABOLIC_BOOST, item_names.ZERGLING_RAPTOR_STRAIN), self.player))
-            )
+            # Note: Zerglings were tested by Snarky, and it was found they'd need >= 3 upgrades to be viable,
+            # so they are not included in this logic.
+            # Raptor + 2 of (Shredding, Adrenal, +2 attack upgrade)
             or self.zerg_infested_tank_with_ammo(state)
             or (self.advanced_tactics and (self.morph_tyrannozor(state)))
         )
@@ -1965,13 +1984,18 @@ class SC2Logic:
         Ability to deal with trains (moving target with a lot of HP)
         """
         return (
-            state.has_any(
-                (item_names.ANNIHILATOR, item_names.IMMORTAL, item_names.STALKER, item_names.WRATHWALKER, item_names.VOID_RAY, item_names.DESTROYER),
-                self.player,
-            )
-            or state.has_all({item_names.SLAYER, item_names.SLAYER_PHASE_BLINK}, self.player)
+            state.has_any((
+                item_names.ANNIHILATOR,
+                item_names.IMMORTAL,
+                item_names.STALKER,
+                item_names.ADEPT,  # Tested by Snarky, "An easy 1-item solve"
+                item_names.WRATHWALKER,
+                item_names.VOID_RAY,
+                item_names.DESTROYER,
+            ), self.player)
+            or state.has_all((item_names.SLAYER, item_names.SLAYER_PHASE_BLINK), self.player)
             or state.has_all((item_names.REAVER, item_names.REAVER_KHALAI_REPLICATORS), self.player)
-            or state.has_all({item_names.VANGUARD, item_names.VANGUARD_FUSION_MORTARS}, self.player)
+            or state.has_all((item_names.VANGUARD, item_names.VANGUARD_FUSION_MORTARS), self.player)
             or (
                 state.has(item_names.INSTIGATOR, self.player)
                 and state.has_any((item_names.INSTIGATOR_BLINK_OVERDRIVE, item_names.INSTIGATOR_MODERNIZED_SERVOS), self.player)
@@ -1982,8 +2006,7 @@ class SC2Logic:
                 self.advanced_tactics
                 and (
                     state.has(item_names.TEMPEST, self.player)
-                    or state.has_all((item_names.ADEPT, item_names.ADEPT_RESONATING_GLAIVES), self.player)
-                    or state.has_all({item_names.VANGUARD, item_names.VANGUARD_RAPIDFIRE_CANNON}, self.player)
+                    or state.has_all((item_names.VANGUARD, item_names.VANGUARD_RAPIDFIRE_CANNON), self.player)
                     or state.has_all((item_names.OPPRESSOR, item_names.SCOUT_GRAVITIC_THRUSTERS, item_names.OPPRESSOR_VULCAN_BLASTER), self.player)
                     or state.has_all((item_names.ASCENDANT, item_names.ASCENDANT_POWER_OVERWHELMING, item_names.SUPPLICANT), self.player)
                     or state.has_all(
@@ -2005,7 +2028,12 @@ class SC2Logic:
         """
         Rescuing in The Moebius Factor
         """
-        return state.has_any({item_names.MEDIVAC, item_names.HERCULES, item_names.RAVEN, item_names.VIKING}, self.player) or self.advanced_tactics
+        return (
+            state.has_any((
+                item_names.MEDIVAC, item_names.HERCULES, item_names.RAVEN, item_names.VIKING
+            ), self.player)
+            or self.advanced_tactics
+        )
 
     def terran_supernova_requirement(self, state) -> bool:
         return self.terran_beats_protoss_deathball(state) and self.terran_power_rating(state) >= 6
@@ -2024,7 +2052,10 @@ class SC2Logic:
                 or (self.advanced_tactics and state.has(item_names.PROGRESSIVE_WARP_RELOCATE, self.player))
             )
             and self.protoss_competent_anti_air(state)
-            and (self.protoss_fleet(state) or (self.protoss_competent_comp(state) and self.protoss_power_rating(state) >= 6))
+            and (
+                self.protoss_fleet(state)
+                or (self.protoss_competent_comp(state) and self.protoss_power_rating(state) >= 6)
+            )
         )
 
     def terran_maw_requirement(self, state: CollectionState) -> bool:
@@ -2079,18 +2110,25 @@ class SC2Logic:
             return True
         usable_muta = (
             state.has_all((item_names.MUTALISK, item_names.MUTALISK_RAPID_REGENERATION), self.player)
-            and state.has_any((item_names.MUTALISK_SEVERING_GLAIVE, item_names.MUTALISK_VICIOUS_GLAIVE), self.player)
-            and (
-                state.has(item_names.MUTALISK_SUNDERING_GLAIVE, self.player)
-                or state.has_all((item_names.MUTALISK_SEVERING_GLAIVE, item_names.MUTALISK_VICIOUS_GLAIVE), self.player)
-            )
+            and state.count_from_list_unique((
+                item_names.MUTALISK_SEVERING_GLAIVE,
+                item_names.MUTALISK_SUNDERING_GLAIVE,
+                item_names.MUTALISK_VICIOUS_GLAIVE,
+            ), self.player) >= 2
         )
         return (
             # Heal
             (
                 state.has(item_names.SWARM_QUEEN, self.player)
-                or self.advanced_tactics
-                and ((self.morph_tyrannozor(state) and state.has(item_names.TYRANNOZOR_HEALING_ADAPTATION, self.player)) or (usable_muta))
+                or (self.advanced_tactics
+                    and (
+                        (
+                            self.morph_tyrannozor(state)
+                            and state.has(item_names.TYRANNOZOR_HEALING_ADAPTATION, self.player)
+                        )
+                        or usable_muta
+                    )
+                )
             )
             # Cross the gap
             and (
@@ -2147,8 +2185,9 @@ class SC2Logic:
         else:
             return (
                 state.has_any((item_names.WRAITH, item_names.BATTLECRUISER), self.player)
-                or self.terran_air_anti_air(state)
-                and state.has_any((item_names.BANSHEE, item_names.LIBERATOR), self.player)
+                or (self.terran_air_anti_air(state)
+                    and state.has_any((item_names.BANSHEE, item_names.LIBERATOR), self.player)
+                )
             )
 
     def zerg_engine_of_destruction_requirement(self, state: CollectionState) -> bool:
@@ -2328,6 +2367,7 @@ class SC2Logic:
             # Note(mm): This check isn't necessary as self.kerrigan_levels cover it,
             # and it's not fully desirable in future when we support non-grant story tech + kerriganless.
             # or not self.kerrigan_presence
+            or not self.kerrigan_unit_available
             or state.has_any((
                 # Cases tested by Snarky
                 item_names.KERRIGAN_KINETIC_BLAST,
@@ -2366,22 +2406,23 @@ class SC2Logic:
     def supreme_requirement(self, state: CollectionState) -> bool:
         return (
             self.grant_story_tech == GrantStoryTech.option_grant
-            or not self.kerrigan_unit_available or (self.grant_story_tech == GrantStoryTech.option_allow_substitutes
-                    and state.has_any((
-                        item_names.KERRIGAN_LEAPING_STRIKE,
-                        item_names.OVERLORD_VENTRAL_SACS,
-                        item_names.YGGDRASIL,
-                        item_names.MUTALISK_CORRUPTOR_VIPER_ASPECT,
-                        item_names.NYDUS_WORM,
-                        item_names.BULLFROG,
-                    ), self.player)
-                    and state.has_any((
-                        item_names.KERRIGAN_MEND,
-                        item_names.SWARM_QUEEN,
-                        item_names.INFESTED_MEDICS,
-                    ), self.player)
-                    and self.kerrigan_levels(state, 35)
-                )
+            or not self.kerrigan_unit_available
+            or (self.grant_story_tech == GrantStoryTech.option_allow_substitutes
+                and state.has_any((
+                    item_names.KERRIGAN_LEAPING_STRIKE,
+                    item_names.OVERLORD_VENTRAL_SACS,
+                    item_names.YGGDRASIL,
+                    item_names.MUTALISK_CORRUPTOR_VIPER_ASPECT,
+                    item_names.NYDUS_WORM,
+                    item_names.BULLFROG,
+                ), self.player)
+                and state.has_any((
+                    item_names.KERRIGAN_MEND,
+                    item_names.SWARM_QUEEN,
+                    item_names.INFESTED_MEDICS,
+                ), self.player)
+                and self.kerrigan_levels(state, 35)
+            )
             or (state.has_all((item_names.KERRIGAN_LEAPING_STRIKE, item_names.KERRIGAN_MEND), self.player) and self.kerrigan_levels(state, 35))
         )
 
@@ -2469,15 +2510,12 @@ class SC2Logic:
                 self.grant_story_tech == GrantStoryTech.option_grant
                 or not self.kerrigan_unit_available
                 or (
-                    state.has_any(
-                        (
-                            item_names.KERRIGAN_KINETIC_BLAST,
-                            item_names.KERRIGAN_SPAWN_BANELINGS,
-                            item_names.KERRIGAN_LEAPING_STRIKE,
-                            item_names.KERRIGAN_SPAWN_LEVIATHAN,
-                        ),
-                        self.player,
-                    )
+                    state.has_any((
+                        item_names.KERRIGAN_KINETIC_BLAST,
+                        item_names.KERRIGAN_SPAWN_BANELINGS,
+                        item_names.KERRIGAN_LEAPING_STRIKE,
+                        item_names.KERRIGAN_SPAWN_LEVIATHAN,
+                    ), self.player)
                     and self.basic_kerrigan(state)
                 )
             )
@@ -2488,50 +2526,47 @@ class SC2Logic:
             self.grant_story_tech == GrantStoryTech.option_grant
             or self.advanced_tactics
             or (
-                state.has_any(
-                    (
-                        item_names.IMMORTAL,
-                        item_names.ANNIHILATOR,
-                        item_names.VANGUARD,
-                        item_names.COLOSSUS,
-                        item_names.WRATHWALKER,
-                        item_names.REAVER,
-                        item_names.DARK_TEMPLAR,
-                        item_names.HIGH_TEMPLAR,
-                        item_names.ENERGIZER,
-                        item_names.SENTRY,
-                    ),
-                    self.player,
-                )
+                state.has_any((
+                    item_names.IMMORTAL,
+                    item_names.ANNIHILATOR,
+                    item_names.VANGUARD,
+                    item_names.COLOSSUS,
+                    item_names.WRATHWALKER,
+                    item_names.REAVER,
+                    item_names.DARK_TEMPLAR,
+                    item_names.HIGH_TEMPLAR,
+                    item_names.ENERGIZER,
+                    item_names.SENTRY,
+                ), self.player)
             )
         )
 
     def templars_return_phase_3_reach_colossus_requirement(self, state: CollectionState) -> bool:
         return self.templars_return_phase_2_requirement(state) and (
             self.grant_story_tech == GrantStoryTech.option_grant
-            or self.advanced_tactics
-            and state.has_any({item_names.ZEALOT_WHIRLWIND, item_names.VANGUARD_RAPIDFIRE_CANNON}, self.player)
-            or state.has_all((
-                    item_names.ZEALOT_WHIRLWIND, item_names.VANGUARD_RAPIDFIRE_CANNON
+            or (self.advanced_tactics
+                and state.has_any((
+                    item_names.ZEALOT_WHIRLWIND, item_names.VANGUARD_RAPIDFIRE_CANNON,
                 ), self.player)
+            )
+            or state.has_all((
+                item_names.ZEALOT_WHIRLWIND, item_names.VANGUARD_RAPIDFIRE_CANNON
+            ), self.player)
         )
 
     def templars_return_phase_3_reach_dts_requirement(self, state: CollectionState) -> bool:
         return self.templars_return_phase_3_reach_colossus_requirement(state) and (
             self.grant_story_tech == GrantStoryTech.option_grant
+            or state.has_all((
+                item_names.COLOSSUS_PACIFICATION_PROTOCOL,
+                item_names.ENERGIZER_MOBILE_CHRONO_BEAM,
+            ), self.player)
             or (
-                (self.advanced_tactics or state.has(item_names.ENERGIZER_MOBILE_CHRONO_BEAM, self.player))
-                and (state.has(item_names.COLOSSUS_FIRE_LANCE, self.player)
-                or (
-                    state.has_all(
-                        {
-                            item_names.COLOSSUS_PACIFICATION_PROTOCOL,
-                            item_names.ENERGIZER_MOBILE_CHRONO_BEAM,
-                        },
-                        self.player,
-                    )
+                state.has(item_names.COLOSSUS_FIRE_LANCE, self.player)
+                and (self.advanced_tactics
+                    or state.has(item_names.ENERGIZER_MOBILE_CHRONO_BEAM, self.player)
                 )
-            ))
+            )
         )
 
     def terran_spear_of_adun_requirement(self, state: CollectionState) -> bool:
@@ -2627,8 +2662,9 @@ class SC2Logic:
                 self.morph_lurker(state)
                 or state.has_all({item_names.MUTALISK, item_names.MUTALISK_SEVERING_GLAIVE, item_names.MUTALISK_VICIOUS_GLAIVE}, self.player)
                 or self.zerg_infested_tank_with_ammo(state)
-                or self.advanced_tactics
-                and state.has_all({item_names.ULTRALISK, item_names.ULTRALISK_CHITINOUS_PLATING, item_names.ULTRALISK_MONARCH_BLADES}, self.player)
+                or (self.advanced_tactics
+                    and state.has_all((item_names.ULTRALISK, item_names.ULTRALISK_CHITINOUS_PLATING, item_names.ULTRALISK_MONARCH_BLADES), self.player)
+                )
             )
             and (
                 self.morph_impaler(state)
@@ -2639,8 +2675,9 @@ class SC2Logic:
             and (
                 self.morph_devourer(state)
                 or state.has_all({item_names.MUTALISK, item_names.MUTALISK_SUNDERING_GLAIVE}, self.player)
-                or self.advanced_tactics
-                and state.has(item_names.BROOD_QUEEN, self.player)
+                or (self.advanced_tactics
+                    and state.has(item_names.BROOD_QUEEN, self.player)
+                )
             )
             and self.zerg_mineral_dump(state)
             and self.zerg_army_weapon_armor_upgrade_min_level(state) >= 2
@@ -2674,9 +2711,10 @@ class SC2Logic:
         return (
             self.protoss_anti_armor_anti_air(state)
             and (
-                self.take_over_ai_allies
-                and (self.protoss_common_unit(state) or self.zerg_common_unit(state))
-                or (self.protoss_competent_comp(state) and self.protoss_hybrid_counter(state))
+                (self.protoss_competent_comp(state) and self.protoss_hybrid_counter(state))
+                or (self.take_over_ai_allies
+                    and (self.protoss_common_unit(state) or self.zerg_common_unit(state))
+                )
             )
             and self.protoss_power_rating(state) >= 6
         )
@@ -2685,11 +2723,18 @@ class SC2Logic:
         return (
             self.terran_competent_anti_air(state)
             and (
-                self.take_over_ai_allies
-                and (self.terran_common_unit(state) or self.zerg_common_unit(state))
-                or (
+                (
                     self.terran_beats_protoss_deathball(state)
-                    and state.has_any({item_names.BATTLECRUISER, item_names.LIBERATOR, item_names.SIEGE_TANK, item_names.THOR}, self.player)
+                    and state.has_any((
+                        item_names.BATTLECRUISER,
+                        item_names.LIBERATOR,
+                        item_names.SIEGE_TANK,
+                        item_names.THOR,
+                    ), self.player)
+                )
+                or (
+                    self.take_over_ai_allies
+                    and (self.terran_common_unit(state) or self.zerg_common_unit(state))
                 )
             )
             and self.terran_power_rating(state) >= 6
@@ -2727,10 +2772,12 @@ class SC2Logic:
                             state.has_all({item_names.LIBERATOR, item_names.LIBERATOR_SMART_SERVOS}, self.player)
                             and (
                                 (
-                                    state.has_all({item_names.HELLION, item_names.HELLION_HELLBAT}, self.player)
-                                    or state.has(item_names.FIREBAT, self.player)
+                                    (
+                                        state.has_all((item_names.HELLION, item_names.HELLION_HELLBAT), self.player)
+                                        or state.has(item_names.FIREBAT, self.player)
+                                    )
+                                    and self.terran_bio_heal(state)
                                 )
-                                and self.terran_bio_heal(state)
                                 or state.has_all({item_names.VIKING, item_names.VIKING_SHREDDER_ROUNDS}, self.player)
                                 or state.has(item_names.BANSHEE, self.player)
                             )
@@ -2921,12 +2968,20 @@ class SC2Logic:
 
     def protoss_the_host_requirement(self, state: CollectionState) -> bool:
         return (
-            self.protoss_fleet(state) and self.protoss_static_defense(state) and self.protoss_army_weapon_armor_upgrade_min_level(state) >= 2
-        ) or (
-            self.protoss_deathball(state)
-            and state.has(item_names.SOA_TIME_STOP, self.player)
-            or self.advanced_tactics
-            and (state.has_any((item_names.SOA_SHIELD_OVERCHARGE, item_names.SOA_SOLAR_BOMBARDMENT), self.player))
+            (
+                self.protoss_fleet(state)
+                and self.protoss_static_defense(state)
+                and self.protoss_army_weapon_armor_upgrade_min_level(state) >= 2
+            )
+            or (
+                self.protoss_deathball(state)
+                and (
+                    state.has(item_names.SOA_TIME_STOP, self.player)
+                    or (self.advanced_tactics
+                        and (state.has_any((item_names.SOA_SHIELD_OVERCHARGE, item_names.SOA_SOLAR_BOMBARDMENT), self.player))
+                    )
+                )
+            )
         )
 
     def terran_the_host_requirement(self, state: CollectionState) -> bool:
@@ -2947,10 +3002,21 @@ class SC2Logic:
                     )
                 )
                 or (
-                    self.spear_of_adun_presence == SpearOfAdunPresence.option_everywhere
-                    and state.has(item_names.SOA_TIME_STOP, self.player)
-                    or self.advanced_tactics
-                    and (state.has_any((item_names.SOA_SHIELD_OVERCHARGE, item_names.SOA_SOLAR_BOMBARDMENT), self.player))
+                    (
+                        self.spear_of_adun_presence == SpearOfAdunPresence.option_everywhere
+                        or self.spear_of_adun_presence == SpearOfAdunPresence.option_any_race_lotv
+                    )
+                    and (
+                        state.has(item_names.SOA_TIME_STOP, self.player)
+                        or (self.advanced_tactics
+                            and (
+                                state.has_any((
+                                    item_names.SOA_SHIELD_OVERCHARGE,
+                                    item_names.SOA_SOLAR_BOMBARDMENT,
+                                ), self.player)
+                            )
+                        )
+                    )
                 )
             )
         )
@@ -2963,29 +3029,50 @@ class SC2Logic:
             and self.zerg_base_buster(state)
             and self.zerg_big_monsters(state)
             and (
-                (self.morph_brood_lord(state) or self.morph_guardian(state))
-                and (
-                    (self.morph_devourer(state) and state.has(item_names.MUTALISK, self.player))
-                    or state.has_all((item_names.INFESTED_LIBERATOR, item_names.INFESTED_LIBERATOR_CLOUD_DISPERSAL), self.player)
-                )
-                or (
-                    state.has_all(
-                        (
-                            item_names.MUTALISK,
-                            item_names.MUTALISK_SEVERING_GLAIVE,
-                            item_names.MUTALISK_VICIOUS_GLAIVE,
-                            item_names.MUTALISK_SUNDERING_GLAIVE,
-                            item_names.MUTALISK_RAPID_REGENERATION,
-                        ),
-                        self.player,
+                (
+                    (
+                        (self.morph_brood_lord(state) or self.morph_guardian(state))
+                        and (
+                                self.morph_devourer(state) and state.has(item_names.MUTALISK, self.player)
+                                or state.has_all(
+                                (
+                                    item_names.INFESTED_LIBERATOR,
+                                    item_names.INFESTED_LIBERATOR_CLOUD_DISPERSAL
+                                ),
+                                self.player
+                            )
+                        )
+                    )
+                    or (
+                        state.has_all(
+                            (
+                                item_names.MUTALISK,
+                                item_names.MUTALISK_SEVERING_GLAIVE,
+                                item_names.MUTALISK_VICIOUS_GLAIVE,
+                                item_names.MUTALISK_SUNDERING_GLAIVE,
+                                item_names.MUTALISK_RAPID_REGENERATION,
+                            ),
+                            self.player,
+                        )
+                    )
+                )
+                or (
+                    (
+                        self.spear_of_adun_presence == SpearOfAdunPresence.option_everywhere
+                        or self.spear_of_adun_presence == SpearOfAdunPresence.option_any_race_lotv
+                    )
+                    and (
+                        state.has(item_names.SOA_TIME_STOP, self.player)
+                        or (self.advanced_tactics
+                            and (
+                                state.has_any((
+                                    item_names.SOA_SHIELD_OVERCHARGE,
+                                    item_names.SOA_SOLAR_BOMBARDMENT
+                                ), self.player)
+                            )
+                        )
                     )
                 )
-            )
-            or (
-                self.spear_of_adun_presence == SpearOfAdunPresence.option_everywhere
-                and state.has(item_names.SOA_TIME_STOP, self.player)
-                or self.advanced_tactics
-                and (state.has_any((item_names.SOA_SHIELD_OVERCHARGE, item_names.SOA_SOLAR_BOMBARDMENT), self.player))
             )
         )
 
@@ -3249,19 +3336,22 @@ class SC2Logic:
                     (
                         # Regular infesteds
                         (
-                            state.has_any((item_names.FIREBAT, item_names.REAPER), self.player)
-                            or state.has_all({item_names.HELLION, item_names.HELLION_HELLBAT}, self.player)
+                            self.terran_bio_heal(state)
+                            and (
+                                state.has_any((item_names.FIREBAT, item_names.REAPER), self.player)
+                                or state.has_all((item_names.HELLION, item_names.HELLION_HELLBAT), self.player)
+                            )
                         )
-                        and self.terran_bio_heal(state)
-                        or (self.advanced_tactics and state.has_any({item_names.PERDITION_TURRET, item_names.PLANETARY_FORTRESS}, self.player))
+                        or (self.advanced_tactics and state.has_any((item_names.PERDITION_TURRET, item_names.PLANETARY_FORTRESS), self.player))
                     )
                     and (
                         # Volatile infesteds
                         state.has(item_names.LIBERATOR, self.player)
                         or (
                             self.advanced_tactics
-                            and state.has(item_names.VULTURE, self.player)
-                            or (state.has(item_names.HERC, self.player) and self.terran_bio_heal(state))
+                            and (state.has(item_names.VULTURE, self.player)
+                                or (state.has(item_names.HERC, self.player) and self.terran_bio_heal(state))
+                            )
                         )
                     )
                 )
@@ -3303,14 +3393,25 @@ class SC2Logic:
     def enemy_shadow_first_stage(self, state: CollectionState) -> bool:
         return self.enemy_shadow_domination(state) and (
             self.grant_story_tech == GrantStoryTech.option_grant
-            or ((self.nova_full_stealth(state) and self.enemy_shadow_tripwires_tool(state)) or (self.nova_heal(state) and self.nova_splash(state)))
+            or (self.nova_full_stealth(state)
+                and self.enemy_shadow_tripwires_tool(state)
+            )
+            or (self.nova_heal(state)
+                and self.nova_splash(state)
+            )
         )
 
     def enemy_shadow_second_stage(self, state: CollectionState) -> bool:
         return self.enemy_shadow_first_stage(state) and (
             self.grant_story_tech == GrantStoryTech.option_grant
-            or (self.nova_splash(state) or self.nova_heal(state) or self.nova_escape_assist(state))
-            and (self.advanced_tactics or state.has(item_names.NOVA_GHOST_VISOR, self.player))
+            or (
+                (self.advanced_tactics or state.has(item_names.NOVA_GHOST_VISOR, self.player))
+                and (
+                    self.nova_splash(state)
+                    or self.nova_heal(state)
+                    or self.nova_escape_assist(state)
+                )
+            )
         )
 
     def enemy_shadow_door_controls(self, state: CollectionState) -> bool:
@@ -3495,21 +3596,21 @@ class SC2Logic:
                         and state.has(item_names.DEVOURER_PRESCIENT_SPORES, self.player)
                     )
                     or (
-                    state.has_any((
-                        # Mercs with <= 300s first drop time
-                        item_names.DEVOURING_ONES,
-                        item_names.HUNTER_KILLERS,
-                        item_names.CAUSTIC_HORRORS,
-                        item_names.HUNTERLING,
-                    ), self.player)
-                    # + 2 upgrades that allow getting faster/earlier mercs
-                    and state.count_from_list((
-                        item_names.UNRESTRICTED_MUTATION,
-                        item_names.EVOLUTIONARY_LEAP,
-                        item_names.CELL_DIVISION,
-                        item_names.SELF_SUFFICIENT,
-                    ), self.player) >= 2
-                )
+                        state.has_any((
+                            # Mercs with <= 300s first drop time
+                            item_names.DEVOURING_ONES,
+                            item_names.HUNTER_KILLERS,
+                            item_names.CAUSTIC_HORRORS,
+                            item_names.HUNTERLING,
+                        ), self.player)
+                        # + 2 upgrades that allow getting faster/earlier mercs
+                        and state.count_from_list((
+                            item_names.UNRESTRICTED_MUTATION,
+                            item_names.EVOLUTIONARY_LEAP,
+                            item_names.CELL_DIVISION,
+                            item_names.SELF_SUFFICIENT,
+                        ), self.player) >= 2
+                    )
                 )
             )
 
@@ -3603,3 +3704,124 @@ def get_basic_units(logic_level: int, race: SC2Race) -> Set[str]:
         return advanced_basic_units[race]
     else:
         return basic_units[race]
+
+
+# Defense rating table
+# Commented defense ratings are handled in the defense_rating function
+tvx_defense_ratings = {
+    item_names.SIEGE_TANK: 5,
+    # "Graduating Range": 1,
+    item_names.PLANETARY_FORTRESS: 3,
+    # Bunker w/ Marine/Marauder: 3,
+    item_names.PERDITION_TURRET: 2,
+    item_names.DEVASTATOR_TURRET: 2,
+    item_names.VULTURE: 1,
+    item_names.BANSHEE: 1,
+    item_names.BATTLECRUISER: 1,
+    item_names.LIBERATOR: 4,
+    item_names.WIDOW_MINE: 1,
+    # "Concealment (Widow Mine)": 1
+}
+tvz_defense_ratings = {
+    item_names.PERDITION_TURRET: 2,
+    # Bunker w/ Firebat: 2,
+    item_names.LIBERATOR: -2,
+    item_names.HIVE_MIND_EMULATOR: 3,
+    item_names.PSI_DISRUPTER: 3,
+}
+tvx_air_defense_ratings = {
+    item_names.MISSILE_TURRET: 2,
+}
+zvx_defense_ratings = {
+    # Note that this doesn't include Kerrigan because this is just for race swaps, which doesn't involve her (for now)
+    item_names.SPINE_CRAWLER: 3,
+    # w/ Twin Drones: 1
+    item_names.SWARM_QUEEN: 1,
+    item_names.SWARM_HOST: 1,
+    # impaler: 3
+    #  "Hardened Tentacle Spines (Impaler)": 2
+    # lurker: 1
+    #  "Seismic Spines (Lurker)": 2
+    #  "Adapted Spines (Lurker)": 1
+    # brood lord : 2
+    # corpser roach: 1
+    # creep tumors (swarm queen or overseer): 1
+    # w/ malignant creep: 1
+    # tanks with ammo: 5
+    item_names.INFESTED_BUNKER: 3,
+    item_names.BILE_LAUNCHER: 2,
+}
+# zvz_defense_ratings = {
+    # corpser roach: 1
+    # primal igniter: 2
+    # lurker: 1
+    # w/ adapted spines: -1
+    # impaler: -1
+# }
+zvx_air_defense_ratings = {
+    item_names.SPORE_CRAWLER: 2,
+    # w/ Twin Drones: 1
+    item_names.INFESTED_MISSILE_TURRET: 2,
+}
+pvx_defense_ratings = {
+    item_names.PHOTON_CANNON: 2,
+    item_names.KHAYDARIN_MONOLITH: 3,
+    item_names.SHIELD_BATTERY: 1,
+    item_names.NEXUS_OVERCHARGE: 2,
+    item_names.SKYLORD: 1,
+    item_names.MATRIX_OVERLOAD: 1,
+    item_names.COLOSSUS: 1,
+    item_names.VANGUARD: 1,
+    item_names.REAVER: 1,
+}
+pvz_defense_ratings = {
+    item_names.KHAYDARIN_MONOLITH: -2,
+    item_names.COLOSSUS: 1,
+}
+
+terran_passive_ratings = {
+    item_names.AUTOMATED_REFINERY: 4,
+    item_names.COMMAND_CENTER_MULE: 4,
+    item_names.ORBITAL_DEPOTS: 2,
+    item_names.COMMAND_CENTER_COMMAND_CENTER_REACTOR: 2,
+    item_names.COMMAND_CENTER_EXTRA_SUPPLIES: 2,
+    item_names.MICRO_FILTERING: 2,
+    item_names.TECH_REACTOR: 2
+}
+
+zerg_passive_ratings = {
+    item_names.TWIN_DRONES: 7,
+    item_names.AUTOMATED_EXTRACTORS: 4,
+    item_names.VESPENE_EFFICIENCY: 3,
+    item_names.OVERLORD_IMPROVED_OVERLORDS: 4,
+    item_names.MALIGNANT_CREEP: 2
+}
+
+protoss_passive_ratings = {
+    item_names.QUATRO: 4,
+    item_names.ORBITAL_ASSIMILATORS: 4,
+    item_names.AMPLIFIED_ASSIMILATORS: 3,
+    item_names.PROBE_WARPIN: 2,
+    item_names.ELDER_PROBES: 2,
+    item_names.MATRIX_OVERLOAD: 2
+}
+
+soa_energy_ratings = {
+    item_names.SOA_SOLAR_LANCE: 8,
+    item_names.SOA_DEPLOY_FENIX: 7,
+    item_names.SOA_TEMPORAL_FIELD: 6,
+    item_names.SOA_PROGRESSIVE_PROXY_PYLON: 5,  # Requires Lvl 2 (Warp in Reinforcements)
+    item_names.SOA_SHIELD_OVERCHARGE: 5,
+    item_names.SOA_ORBITAL_STRIKE: 4
+}
+
+soa_passive_ratings = {
+    item_names.GUARDIAN_SHELL: 4,
+    item_names.OVERWATCH: 2
+}
+
+soa_ultimate_ratings = {
+    item_names.SOA_TIME_STOP: 4,
+    item_names.SOA_PURIFIER_BEAM: 3,
+    item_names.SOA_SOLAR_BOMBARDMENT: 3
+}
diff --git a/worlds/sc2/test/test_generation.py b/worlds/sc2/test/test_generation.py
index 61de392c0c..329cd593e1 100644
--- a/worlds/sc2/test/test_generation.py
+++ b/worlds/sc2/test/test_generation.py
@@ -18,19 +18,19 @@ class TestItemFiltering(Sc2SetupTestBase):
         world_options = {
             **self.ALL_CAMPAIGNS,
             'locked_items': {
-                item_names.MARINE: 0,
-                item_names.MARAUDER: 0,
+                item_names.MARINE: -1,
+                item_names.MARAUDER: -1,
                 item_names.MEDIVAC: 1,
                 item_names.FIREBAT: 1,
-                item_names.ZEALOT: 0,
+                item_names.ZEALOT: -1,
                 item_names.PROGRESSIVE_REGENERATIVE_BIO_STEEL: 2,
             },
             'excluded_items': {
-                item_names.MARINE: 0,
-                item_names.MARAUDER: 0,
-                item_names.MEDIVAC: 0,
+                item_names.MARINE: -1,
+                item_names.MARAUDER: -1,
+                item_names.MEDIVAC: -1,
                 item_names.FIREBAT: 1,
-                item_names.ZERGLING: 0,
+                item_names.ZERGLING: -1,
                 item_names.PROGRESSIVE_REGENERATIVE_BIO_STEEL: 2,
             }
         }
@@ -50,38 +50,38 @@ class TestItemFiltering(Sc2SetupTestBase):
         world_options = {
             'grant_story_tech': options.GrantStoryTech.option_grant,
             'excluded_items': {
-                item_groups.ItemGroupNames.NOVA_EQUIPMENT: 15,
+                item_groups.ItemGroupNames.NOVA_EQUIPMENT: -1,
                 item_names.MARINE_PROGRESSIVE_STIMPACK: 1,
                 item_names.MARAUDER_PROGRESSIVE_STIMPACK: 2,
-                item_names.MARINE: 0,
-                item_names.MARAUDER: 0,
+                item_names.MARINE: -1,
+                item_names.MARAUDER: -1,
                 item_names.REAPER: 1,
-                item_names.DIAMONDBACK: 0,
+                item_names.DIAMONDBACK: -1,
                 item_names.HELLION: 1,
                 # Additional excludes to increase the likelihood that unexcluded items actually appear
-                item_groups.ItemGroupNames.STARPORT_UNITS: 0,
-                item_names.WARHOUND: 0,
-                item_names.VULTURE: 0,
-                item_names.WIDOW_MINE: 0,
-                item_names.THOR: 0,
-                item_names.GHOST: 0,
-                item_names.SPECTRE: 0,
-                item_groups.ItemGroupNames.MENGSK_UNITS: 0,
-                item_groups.ItemGroupNames.TERRAN_VETERANCY_UNITS: 0,
+                item_groups.ItemGroupNames.STARPORT_UNITS: -1,
+                item_names.WARHOUND: -1,
+                item_names.VULTURE: -1,
+                item_names.WIDOW_MINE: -1,
+                item_names.THOR: -1,
+                item_names.GHOST: -1,
+                item_names.SPECTRE: -1,
+                item_groups.ItemGroupNames.MENGSK_UNITS: -1,
+                item_groups.ItemGroupNames.TERRAN_VETERANCY_UNITS: -1,
             },
             'unexcluded_items': {
-                item_names.NOVA_PLASMA_RIFLE: 1,      # Necessary to pass logic
-                item_names.NOVA_PULSE_GRENADES: 0,    # Necessary to pass logic
-                item_names.NOVA_JUMP_SUIT_MODULE: 0,  # Necessary to pass logic
-                item_groups.ItemGroupNames.BARRACKS_UNITS: 0,
+                item_names.NOVA_PLASMA_RIFLE: 1,       # Necessary to pass logic
+                item_names.NOVA_PULSE_GRENADES: -1,    # Necessary to pass logic
+                item_names.NOVA_JUMP_SUIT_MODULE: -1,  # Necessary to pass logic
+                item_groups.ItemGroupNames.BARRACKS_UNITS: -1,
                 item_names.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE: 1,
                 item_names.HELLION: 1,
                 item_names.MARINE_PROGRESSIVE_STIMPACK: 1,
-                item_names.MARAUDER_PROGRESSIVE_STIMPACK: 0,
+                item_names.MARAUDER_PROGRESSIVE_STIMPACK: -1,
                 # Additional unexcludes for logic
-                item_names.MEDIVAC: 0,
-                item_names.BATTLECRUISER: 0,
-                item_names.SCIENCE_VESSEL: 0,
+                item_names.MEDIVAC: -1,
+                item_names.BATTLECRUISER: -1,
+                item_names.SCIENCE_VESSEL: -1,
             },
             # Terran-only
             'enabled_campaigns': {
@@ -103,11 +103,29 @@ class TestItemFiltering(Sc2SetupTestBase):
         self.assertNotIn(item_names.NOVA_BLAZEFIRE_GUNBLADE, itempool)
         self.assertNotIn(item_names.NOVA_ENERGY_SUIT_MODULE, itempool)
 
+    def test_exclude_2_beats_unexclude_1(self) -> None:
+        world_options = {
+            options.OPTION_NAME[options.ExcludedItems]: {
+                item_names.MARINE: 2,
+            },
+            options.OPTION_NAME[options.UnexcludedItems]: {
+                item_names.MARINE: 1,
+            },
+            # Ensure enough locations that marine doesn't get culled
+            options.OPTION_NAME[options.SelectedRaces]: {
+                SC2Race.TERRAN.get_title(),
+            },
+            options.OPTION_NAME[options.VictoryCache]: 9,
+        }
+        self.generate_world(world_options)
+        itempool = [item.name for item in self.multiworld.itempool]
+        self.assertNotIn(item_names.MARINE, itempool)
+
     def test_excluding_groups_excludes_all_items_in_group(self):
         world_options = {
-            'excluded_items': [
-                item_groups.ItemGroupNames.BARRACKS_UNITS.lower(),
-            ]
+            'excluded_items': {
+                item_groups.ItemGroupNames.BARRACKS_UNITS.lower(): -1,
+            },
         }
         self.generate_world(world_options)
         itempool = [item.name for item in self.multiworld.itempool]
@@ -325,6 +343,53 @@ class TestItemFiltering(Sc2SetupTestBase):
             if item_data.quantity == 0:
                 continue
             self.assertIn(item_name, item_groups.vanilla_items + item_groups.nova_equipment)
+    
+    def test_vanilla_items_only_can_unexclude_items(self) -> None:
+        world_options = {
+            # Ensuring an excess of locations so expected items don't get culled
+            **self.ALL_CAMPAIGNS,
+            'mission_order': options.MissionOrder.option_grid,
+            'maximum_campaign_size': options.MaximumCampaignSize.range_end,
+            'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
+            'selected_races': {SC2Race.TERRAN.get_title()},
+            # Options under test
+            'vanilla_items_only': True,
+            'unexcluded_items': {
+                item_names.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM: -1,
+                item_names.WARHOUND: 1,
+                item_groups.ItemGroupNames.TERRAN_STIMPACKS: -1,
+            },
+            # Avoid options that lock non-vanilla items for logic
+            'required_tactics': options.RequiredTactics.option_any_units,
+            'mastery_locations': options.MasteryLocations.option_disabled,
+            # Move the unit nerf items from the start inventory to the pool,
+            # else this option could push non-vanilla items past this test
+            'war_council_nerfs': True,
+        }
+        self.generate_world(world_options)
+        world_items = [item.name for item in self.multiworld.itempool]
+        self.assertTrue(world_items)
+        self.assertNotIn(item_names.MARAUDER_MAGRAIL_MUNITIONS, world_items)
+        self.assertEqual(world_items.count(item_names.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM), 2)
+        self.assertIn(item_names.WARHOUND, world_items)
+        self.assertIn(item_names.MARAUDER_PROGRESSIVE_STIMPACK, world_items)
+        self.assertIn(item_names.REAPER_PROGRESSIVE_STIMPACK, world_items)
+    
+    def test_vanilla_items_only_and_exclude_op_items_together_allow_one_level_of_regen_biosteel(self) -> None:
+        world_options = {
+            # Ensuring an excess of locations so expected items don't get culled
+            **self.ALL_CAMPAIGNS,
+            'mission_order': options.MissionOrder.option_grid,
+            'maximum_campaign_size': options.MaximumCampaignSize.range_end,
+            'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
+            'selected_races': {SC2Race.TERRAN.get_title()},
+            # Options under test
+            'vanilla_items_only': True,
+            'exclude_overpowered_items': True,
+        }
+        self.generate_world(world_options)
+        world_items = [item.name for item in self.multiworld.itempool]
+        self.assertEqual(world_items.count(item_names.PROGRESSIVE_REGENERATIVE_BIO_STEEL), 1)
 
     def test_evil_awoken_with_vanilla_items_only_generates(self) -> None:
         world_options = {
@@ -416,12 +481,12 @@ class TestItemFiltering(Sc2SetupTestBase):
             },
             'required_tactics': options.RequiredTactics.option_no_logic,
             'enable_morphling': options.EnableMorphling.option_true,
-            'excluded_items': [
-                item_groups.ItemGroupNames.ZERG_UNITS.lower()
-            ],
-            'unexcluded_items': [
-                item_groups.ItemGroupNames.ZERG_MORPHS.lower()
-            ]
+            'excluded_items': {
+                item_groups.ItemGroupNames.ZERG_UNITS.lower(): -1,
+            },
+            'unexcluded_items': {
+                item_groups.ItemGroupNames.ZERG_MORPHS.lower(): -1,
+            },
         }
         self.generate_world(world_options)
         itempool = [item.name for item in self.multiworld.itempool]
@@ -439,12 +504,12 @@ class TestItemFiltering(Sc2SetupTestBase):
             },
             'required_tactics': options.RequiredTactics.option_no_logic,
             'enable_morphling': options.EnableMorphling.option_false,
-            'excluded_items': [
-                item_groups.ItemGroupNames.ZERG_UNITS.lower()
-            ],
-            'unexcluded_items': [
-                item_groups.ItemGroupNames.ZERG_MORPHS.lower()
-            ]
+            'excluded_items': {
+                item_groups.ItemGroupNames.ZERG_UNITS.lower(): -1,
+            },
+            'unexcluded_items': {
+                item_groups.ItemGroupNames.ZERG_MORPHS.lower(): -1,
+            },
         }
         self.generate_world(world_options)
         itempool = [item.name for item in self.multiworld.itempool]
@@ -473,14 +538,14 @@ class TestItemFiltering(Sc2SetupTestBase):
 
     def test_planetary_orbital_module_not_present_without_cc_spells(self) -> None:
         world_options = {
-            "excluded_items": [
-                item_names.COMMAND_CENTER_MULE,
-                item_names.COMMAND_CENTER_SCANNER_SWEEP,
-                item_names.COMMAND_CENTER_EXTRA_SUPPLIES
-            ],
-            "locked_items": [
-                item_names.PLANETARY_FORTRESS
-            ]
+            "excluded_items": {
+                item_names.COMMAND_CENTER_MULE: -1,
+                item_names.COMMAND_CENTER_SCANNER_SWEEP: -1,
+                item_names.COMMAND_CENTER_EXTRA_SUPPLIES: -1,
+            },
+            "locked_items": {
+                item_names.PLANETARY_FORTRESS: -1,
+            }
         }
 
         self.generate_world(world_options)
@@ -884,10 +949,10 @@ class TestItemFiltering(Sc2SetupTestBase):
                 }
             },
             'grant_story_levels': options.GrantStoryLevels.option_additive,
-            'excluded_items': [
-                item_names.KERRIGAN_LEAPING_STRIKE,
-                item_names.KERRIGAN_MEND,
-            ]
+            'excluded_items': {
+                item_names.KERRIGAN_LEAPING_STRIKE: -1,
+                item_names.KERRIGAN_MEND: -1,
+            }
         }
         self.generate_world(world_options)
         itempool = [item.name for item in self.multiworld.itempool]
@@ -1161,7 +1226,7 @@ class TestItemFiltering(Sc2SetupTestBase):
             'mission_order': MissionOrder.option_grid,
             'maximum_campaign_size': MaximumCampaignSize.range_end,
             'exclude_overpowered_items': ExcludeOverpoweredItems.option_true,
-            'locked_items': [locked_item],
+            'locked_items': {locked_item: -1},
             'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
             'selected_races': [SC2Race.TERRAN.get_title()],
         }
@@ -1202,7 +1267,7 @@ class TestItemFiltering(Sc2SetupTestBase):
             'maximum_campaign_size': MaximumCampaignSize.range_end,
             'exclude_overpowered_items': ExcludeOverpoweredItems.option_false,
             'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
-            'locked_items': {item_name: 0 for item_name in unreleased_items},
+            'locked_items': {item_name: -1 for item_name in unreleased_items},
         }
 
         self.generate_world(world_options)
@@ -1217,7 +1282,7 @@ class TestItemFiltering(Sc2SetupTestBase):
             **self.ALL_CAMPAIGNS,
             'mission_order': MissionOrder.option_grid,
             'maximum_campaign_size': MaximumCampaignSize.range_end,
-            'excluded_items': [item_name for item_name in item_groups.terran_mercenaries],
+            'excluded_items': {item_name: -1 for item_name in item_groups.terran_mercenaries},
             'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
             'selected_races': [SC2Race.TERRAN.get_title()],
         }
@@ -1233,7 +1298,7 @@ class TestItemFiltering(Sc2SetupTestBase):
             'mission_order': MissionOrder.option_grid,
             'maximum_campaign_size': MaximumCampaignSize.range_end,
             'exclude_overpowered_items': ExcludeOverpoweredItems.option_true,
-            'unexcluded_items': [item_names.SOA_TIME_STOP],
+            'unexcluded_items': {item_names.SOA_TIME_STOP: -1},
             'enable_race_swap': options.EnableRaceSwapVariants.option_shuffle_all,
         }
 
@@ -1275,7 +1340,7 @@ class TestItemFiltering(Sc2SetupTestBase):
             'enabled_campaigns': {
                 SC2Campaign.WOL.campaign_name
             },
-            'excluded_items': [item_names.MARINE, item_names.MEDIC],
+            'excluded_items': {item_names.MARINE: -1, item_names.MEDIC: -1},
             'shuffle_no_build': False,
             'required_tactics': RequiredTactics.option_standard
         }
diff --git a/worlds/sc2/test/test_item_filtering.py b/worlds/sc2/test/test_item_filtering.py
index 7f8251c52a..bebd29cf6a 100644
--- a/worlds/sc2/test/test_item_filtering.py
+++ b/worlds/sc2/test/test_item_filtering.py
@@ -11,7 +11,7 @@ class ItemFilterTests(Sc2SetupTestBase):
     def test_excluding_all_barracks_units_excludes_infantry_upgrades(self) -> None:
         world_options = {
             'excluded_items': {
-                item_groups.ItemGroupNames.BARRACKS_UNITS: 0
+                item_groups.ItemGroupNames.BARRACKS_UNITS: -1,
             },
             'required_tactics': 'standard',
             'min_number_of_upgrades': 1,
diff --git a/worlds/sc2/test/test_usecases.py b/worlds/sc2/test/test_usecases.py
index bf79dbea01..a18d6280a4 100644
--- a/worlds/sc2/test/test_usecases.py
+++ b/worlds/sc2/test/test_usecases.py
@@ -35,10 +35,10 @@ class TestSupportedUseCases(Sc2SetupTestBase):
                 SC2Campaign.NCO.campaign_name
             },
             'excluded_items': {
-                item_groups.ItemGroupNames.TERRAN_UNITS: 0,
+                item_groups.ItemGroupNames.TERRAN_UNITS: -1,
             },
             'unexcluded_items': {
-                item_groups.ItemGroupNames.NCO_UNITS: 0,
+                item_groups.ItemGroupNames.NCO_UNITS: -1,
             },
             'max_number_of_upgrades': 2,
         }
@@ -81,10 +81,10 @@ class TestSupportedUseCases(Sc2SetupTestBase):
             },
             'mission_order': options.MissionOrder.option_vanilla_shuffled,
             'excluded_items': {
-                item_groups.ItemGroupNames.TERRAN_ITEMS: 0,
+                item_groups.ItemGroupNames.TERRAN_ITEMS: -1,
             },
             'unexcluded_items': {
-                item_groups.ItemGroupNames.NCO_MAX_PROGRESSIVE_ITEMS: 0,
+                item_groups.ItemGroupNames.NCO_MAX_PROGRESSIVE_ITEMS: -1,
                 item_groups.ItemGroupNames.NCO_MIN_PROGRESSIVE_ITEMS: 1,
             },
             'excluded_missions': [
@@ -271,9 +271,19 @@ class TestSupportedUseCases(Sc2SetupTestBase):
         world_regions.remove('Menu')
 
         for region in world_regions:
-            self.assertNotIn(mission_tables.lookup_name_to_mission[region].campaign,
-                             ([mission_tables.SC2Campaign.EPILOGUE]),
-                             f"{region} is an epilogue mission!")
+            self.assertNotIn(
+                mission_tables.lookup_name_to_mission[region].campaign,
+                ([mission_tables.SC2Campaign.EPILOGUE]),
+                f"{region} is an epilogue mission!"
+            )
+
+    def test_excluding_all_factions_and_campaigns_still_generates(self) -> None:
+        world_options = {
+            'selected_races': set(),
+            'enabled_campaigns': set(),
+        }
+        # asserting no exception is thrown
+        self.generate_world(world_options)
 
     def test_race_swap_pick_one_has_correct_length_and_includes_swaps(self) -> None:
         world_options = {
@@ -398,7 +408,7 @@ class TestSupportedUseCases(Sc2SetupTestBase):
 
         self.generate_world(world_options)
         world_item_names = [item.name for item in self.multiworld.itempool]
-        spear_of_adun_actives = [item_name for item_name in world_item_names if item_name in item_tables.spear_of_adun_calldowns]
+        spear_of_adun_actives = [item_name for item_name in world_item_names if item_name in item_groups.spear_of_adun_actives]
 
         self.assertLessEqual(len(spear_of_adun_actives), target_number)
 
@@ -418,7 +428,9 @@ class TestSupportedUseCases(Sc2SetupTestBase):
 
         self.generate_world(world_options)
         world_item_names = [item.name for item in self.multiworld.itempool]
-        spear_of_adun_autocasts = [item_name for item_name in world_item_names if item_name in item_tables.spear_of_adun_castable_passives]
+        spear_of_adun_autocasts = [
+            item_name for item_name in world_item_names if item_name in item_groups.spear_of_adun_passives
+        ]
 
         self.assertLessEqual(len(spear_of_adun_autocasts), target_number)
 
@@ -471,12 +483,12 @@ class TestSupportedUseCases(Sc2SetupTestBase):
             ],
             'required_tactics': options.RequiredTactics.option_any_units,
             'excluded_items': {
-                item_groups.ItemGroupNames.TERRAN_UNITS: 0,
-                item_groups.ItemGroupNames.ZERG_UNITS: 0,
+                item_groups.ItemGroupNames.TERRAN_UNITS: -1,
+                item_groups.ItemGroupNames.ZERG_UNITS: -1,
             },
             'unexcluded_items': {
-                item_groups.ItemGroupNames.TERRAN_MERCENARIES: 0,
-                item_groups.ItemGroupNames.ZERG_MERCENARIES: 0,
+                item_groups.ItemGroupNames.TERRAN_MERCENARIES: -1,
+                item_groups.ItemGroupNames.ZERG_MERCENARIES: -1,
             },
             'start_inventory': {
                 item_names.PROGRESSIVE_FAST_DELIVERY: 1,
diff --git a/worlds/shapez/__init__.py b/worlds/shapez/__init__.py
index 5557e2a96a..67d6c22cf3 100644
--- a/worlds/shapez/__init__.py
+++ b/worlds/shapez/__init__.py
@@ -306,8 +306,8 @@ class ShapezWorld(World):
         self.location_count = len(self.included_locations)
 
         # Create regions and entrances based on included locations and player options
-        self.multiworld.regions.extend(create_shapez_regions(self.player, self.multiworld,
-                                                             bool(self.options.allow_floating_layers.value),
+        has_floating = self.options.allow_floating_layers.value or not (self.options.randomize_level_requirements and self.options.randomize_upgrade_requirements)
+        self.multiworld.regions.extend(create_shapez_regions(self.player, self.multiworld, has_floating,
                                                              self.included_locations, self.location_name_to_id,
                                                              self.level_logic, self.upgrade_logic,
                                                              self.options.early_balancer_tunnel_and_trash.current_key,
diff --git a/worlds/shapez/docs/de_shapez.md b/worlds/shapez/docs/de_shapez.md
index 494edca210..a3357a369d 100644
--- a/worlds/shapez/docs/de_shapez.md
+++ b/worlds/shapez/docs/de_shapez.md
@@ -59,7 +59,7 @@ Ein Pop-Up erscheint, das das/die erhaltene(n) Item(s) und eventuell weitere Inf
 
 Hier ist ein Spicker für die Englischarbeit (bloß nicht dem Lehrer zeigen):
 
-![image](/static/generated/docs/shapez/shapesanity_full.png)
+![image](shapesanity_full.png)
 
 ## Kann ich auch weitere Mods neben dem AP Client installieren?
 
diff --git a/worlds/shapez/docs/en_shapez.md b/worlds/shapez/docs/en_shapez.md
index 56c0387258..c9b088199b 100644
--- a/worlds/shapez/docs/en_shapez.md
+++ b/worlds/shapez/docs/en_shapez.md
@@ -57,7 +57,7 @@ A pop-up will show, which item(s) were received, with additional information on
 
 Here's a cheat sheet:
 
-![image](/static/generated/docs/shapez/shapesanity_full.png)
+![image](shapesanity_full.png)
 
 ## Can I use other mods alongside the AP client?
 
diff --git a/worlds/shivers/archipelago.json b/worlds/shivers/archipelago.json
new file mode 100644
index 0000000000..d9838d3841
--- /dev/null
+++ b/worlds/shivers/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Shivers",
+	"minimum_ap_version": "0.6.0",
+    "world_version": "2.7.5",
+    "authors": ["GodlFire", "Cynbel_Terreus"]
+}
\ No newline at end of file
diff --git a/worlds/sm64ex/Items.py b/worlds/sm64ex/Items.py
index 28fcd74484..6cd9b5eb46 100644
--- a/worlds/sm64ex/Items.py
+++ b/worlds/sm64ex/Items.py
@@ -49,10 +49,25 @@ cannon_item_data_table: dict[str, SM64ItemData] = {
     "Cannon Unlock RR": SM64ItemData(sm64ex_base_id + 214),
 }
 
+painting_unlock_item_data_table: dict[str, SM64ItemData] = {
+    "Painting Unlock WF": SM64ItemData(sm64ex_base_id + 231),
+    "Painting Unlock JRB": SM64ItemData(sm64ex_base_id + 232),
+    "Painting Unlock CCM": SM64ItemData(sm64ex_base_id + 233),
+    "Painting Unlock LLL": SM64ItemData(sm64ex_base_id + 236),
+    "Painting Unlock SSL": SM64ItemData(sm64ex_base_id + 237),
+    "Painting Unlock DDD": SM64ItemData(sm64ex_base_id + 238),
+    "Painting Unlock SL": SM64ItemData(sm64ex_base_id + 239),
+    "Painting Unlock WDW": SM64ItemData(sm64ex_base_id + 240),
+    "Painting Unlock TTM": SM64ItemData(sm64ex_base_id + 241),
+    "Painting Unlock THI": SM64ItemData(sm64ex_base_id + 242),
+    "Painting Unlock TTC": SM64ItemData(sm64ex_base_id + 243),
+}
+
 item_data_table = {
     **generic_item_data_table,
     **action_item_data_table,
-    **cannon_item_data_table
+    **cannon_item_data_table,
+    **painting_unlock_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/sm64ex/Options.py b/worlds/sm64ex/Options.py
index 47cda7507d..8bbd647f06 100644
--- a/worlds/sm64ex/Options.py
+++ b/worlds/sm64ex/Options.py
@@ -19,6 +19,19 @@ class EnableCoinStars(Choice):
     option_on = 1
     option_vanilla = 2
 
+class EnableLockedPaintings(Toggle):
+    """
+    Determine how paintings are treated.
+
+    Off - Paintings are not locked, as long as you can access them you can enter them (Vanilla behavior).
+
+    On - Paintings (other than BoB) start off locked and 11 stars are replaced in the pool with items to allow access to them.
+    Attempting to enter a locked painting will simply kick Mario out.
+    Does not affect secrets and levels that don't have a painting (BBH, HMC, RR).
+    This only affects the ability for Mario to enter a painting, the destination of the painting may change due to Entrance Randomization, if it is enabled.
+    """
+    display_name = "Enable Locked Paintings"
+
 
 class StrictCapRequirements(DefaultOnToggle):
     """If disabled, Stars that expect special caps may have to be acquired without the caps"""
@@ -145,6 +158,7 @@ sm64_options_groups = [
         ExclamationBoxes,
         ProgressiveKeys,
         EnableCoinStars,
+        EnableLockedPaintings,
         StrictCapRequirements,
         StrictCannonRequirements,
     ]),
@@ -171,6 +185,7 @@ class SM64Options(PerGameCommonOptions):
     exclamation_boxes: ExclamationBoxes
     progressive_keys: ProgressiveKeys
     enable_coin_stars: EnableCoinStars
+    enable_locked_paintings: EnableLockedPaintings
     enable_move_rando: EnableMoveRandomizer
     move_rando_actions: MoveRandomizerActions
     strict_cap_requirements: StrictCapRequirements
diff --git a/worlds/sm64ex/Regions.py b/worlds/sm64ex/Regions.py
index 52126bcf9f..44a0636f1b 100644
--- a/worlds/sm64ex/Regions.py
+++ b/worlds/sm64ex/Regions.py
@@ -100,6 +100,7 @@ def create_regions(world: MultiWorld, options: SM64Options, player: int):
     if options.enable_coin_stars:
         create_locs(regWhomp, "WF: 100 Coins")
 
+    regJRBDoor = create_region("Jolly Roger Bay Door", player, world)
     regJRB = create_region("Jolly Roger Bay", player, world)
     create_locs(regJRB, "JRB: Plunder in the Sunken Ship", "JRB: Can the Eel Come Out to Play?", "JRB: Treasure of the Ocean Cave",
                         "JRB: Blast to the Stone Pillar", "JRB: Through the Jet Stream", "JRB: Bob-omb Buddy")
diff --git a/worlds/sm64ex/Rules.py b/worlds/sm64ex/Rules.py
index f5305dab6c..a6cc8dad6d 100644
--- a/worlds/sm64ex/Rules.py
+++ b/worlds/sm64ex/Rules.py
@@ -71,12 +71,17 @@ def set_rules(world, options: SM64Options, player: int, area_connections: dict,
     rf = RuleFactory(world, options, player, move_rando_bitvec)
 
     connect_regions(world, player, "Menu", randomized_entrances_s["Bob-omb Battlefield"])
-    connect_regions(world, player, "Menu", randomized_entrances_s["Whomp's Fortress"], lambda state: state.has("Power Star", player, 1))
-    connect_regions(world, player, "Menu", randomized_entrances_s["Jolly Roger Bay"], lambda state: state.has("Power Star", player, 3))
-    connect_regions(world, player, "Menu", randomized_entrances_s["Cool, Cool Mountain"], lambda state: state.has("Power Star", player, 3))
+    connect_regions(world, player, "Menu", randomized_entrances_s["Whomp's Fortress"],
+            rf.build_rule("", painting_lvl_name="WF", star_num_req=1))
+    # JRB door is separated from JRB itself because the secret aquarium can be accessed without entering the painting
+    connect_regions(world, player, "Menu", "Jolly Roger Bay Door", rf.build_rule("", star_num_req=3))
+    connect_regions(world, player, "Jolly Roger Bay Door", randomized_entrances_s["Jolly Roger Bay"],
+                    rf.build_rule("", painting_lvl_name="JRB"))
+    connect_regions(world, player, "Menu", randomized_entrances_s["Cool, Cool Mountain"],
+                    rf.build_rule("", painting_lvl_name="CCM", star_num_req=3))
     connect_regions(world, player, "Menu", randomized_entrances_s["Big Boo's Haunt"], lambda state: state.has("Power Star", player, 12))
     connect_regions(world, player, "Menu", randomized_entrances_s["The Princess's Secret Slide"], lambda state: state.has("Power Star", player, 1))
-    connect_regions(world, player, randomized_entrances_s["Jolly Roger Bay"], randomized_entrances_s["The Secret Aquarium"],
+    connect_regions(world, player, "Jolly Roger Bay Door", randomized_entrances_s["The Secret Aquarium"],
                     rf.build_rule("SF/BF | TJ & LG | MOVELESS & TJ"))
     connect_regions(world, player, "Menu", randomized_entrances_s["Tower of the Wing Cap"], lambda state: state.has("Power Star", player, 10))
     connect_regions(world, player, "Menu", randomized_entrances_s["Bowser in the Dark World"],
@@ -85,10 +90,12 @@ def set_rules(world, options: SM64Options, player: int, area_connections: dict,
     connect_regions(world, player, "Menu", "Basement", lambda state: state.has("Basement Key", player) or state.has("Progressive Key", player, 1))
 
     connect_regions(world, player, "Basement", randomized_entrances_s["Hazy Maze Cave"])
-    connect_regions(world, player, "Basement", randomized_entrances_s["Lethal Lava Land"])
-    connect_regions(world, player, "Basement", randomized_entrances_s["Shifting Sand Land"])
+    connect_regions(world, player, "Basement", randomized_entrances_s["Lethal Lava Land"],
+                    rf.build_rule("", painting_lvl_name="LLL"))
+    connect_regions(world, player, "Basement", randomized_entrances_s["Shifting Sand Land"],
+                    rf.build_rule("", painting_lvl_name="SSL"))
     connect_regions(world, player, "Basement", randomized_entrances_s["Dire, Dire Docks"],
-                    lambda state: state.has("Power Star", player, star_costs["BasementDoorCost"]))
+                    rf.build_rule("", painting_lvl_name="DDD", star_num_req=star_costs["BasementDoorCost"]))
     connect_regions(world, player, "Hazy Maze Cave", randomized_entrances_s["Cavern of the Metal Cap"])
     connect_regions(world, player, "Basement", randomized_entrances_s["Vanish Cap under the Moat"],
                     rf.build_rule("GP"))
@@ -101,17 +108,23 @@ def set_rules(world, options: SM64Options, player: int, area_connections: dict,
 
     connect_regions(world, player, "Menu", "Second Floor", lambda state: state.has("Second Floor Key", player) or state.has("Progressive Key", player, 2))
 
-    connect_regions(world, player, "Second Floor", randomized_entrances_s["Snowman's Land"])
-    connect_regions(world, player, "Second Floor", randomized_entrances_s["Wet-Dry World"])
-    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tall, Tall Mountain"])
-    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tiny-Huge Island (Tiny)"])
-    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tiny-Huge Island (Huge)"])
+    connect_regions(world, player, "Second Floor", randomized_entrances_s["Snowman's Land"],
+                    rf.build_rule("", painting_lvl_name="SL"))
+    connect_regions(world, player, "Second Floor", randomized_entrances_s["Wet-Dry World"],
+                    rf.build_rule("", painting_lvl_name="WDW"))
+    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tall, Tall Mountain"],
+                    rf.build_rule("", painting_lvl_name="TTM"))
+    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tiny-Huge Island (Tiny)"],
+                    rf.build_rule("", painting_lvl_name="THI"))
+    connect_regions(world, player, "Second Floor", randomized_entrances_s["Tiny-Huge Island (Huge)"],
+                    rf.build_rule("", painting_lvl_name="THI"))
     connect_regions(world, player, "Tiny-Huge Island (Tiny)", "Tiny-Huge Island")
     connect_regions(world, player, "Tiny-Huge Island (Huge)", "Tiny-Huge Island")
 
     connect_regions(world, player, "Second Floor", "Third Floor", lambda state: state.has("Power Star", player, star_costs["SecondFloorDoorCost"]))
 
-    connect_regions(world, player, "Third Floor", randomized_entrances_s["Tick Tock Clock"], rf.build_rule("LG/TJ/SF/BF/WK"))
+    connect_regions(world, player, "Third Floor", randomized_entrances_s["Tick Tock Clock"],
+                    rf.build_rule("LG/TJ/SF/BF/WK", painting_lvl_name="TTC"))
     connect_regions(world, player, "Third Floor", randomized_entrances_s["Rainbow Ride"], rf.build_rule("TJ/SF/BF"))
     connect_regions(world, player, "Third Floor", randomized_entrances_s["Wing Mario over the Rainbow"], rf.build_rule("TJ/SF/BF"))
     connect_regions(world, player, "Third Floor", "Bowser in the Sky", lambda state: state.has("Power Star", player, star_costs["StarsToFinish"]))
@@ -272,6 +285,7 @@ class RuleFactory:
         self.player = player
         self.move_rando_bitvec = move_rando_bitvec
         self.area_randomizer = options.area_rando > 0
+        self.painting_randomizer = options.enable_locked_paintings
         self.capless = not options.strict_cap_requirements
         self.cannonless = not options.strict_cannon_requirements
         self.moveless = not options.strict_move_requirements
@@ -287,22 +301,35 @@ class RuleFactory:
         if rule:
             set_rule(target, rule)
 
-    def build_rule(self, rule_expr: str, cannon_name: str = '') -> Callable:
-        expressions = rule_expr.split(" | ")
+    def build_rule(self, rule_expr: str, cannon_name: str = '', painting_lvl_name: str = None, star_num_req: int = None) -> Callable:
+        # Star/painting requirements are outer and'd requirements, logically (painting? star? and (rule_expr))
+        base_rule = self.build_star_painting_entry_requirements(painting_lvl_name, star_num_req)
+        expressions = rule_expr.split(" | ") if len(rule_expr) > 0 else []
         rules = []
         for expression in expressions:
             or_clause = self.combine_and_clauses(expression, cannon_name)
             if or_clause is True:
-                return None
+                return base_rule
             if or_clause is not False:
                 rules.append(or_clause)
         if rules:
             if len(rules) == 1:
-                return rules[0]
+                return lambda state: base_rule(state) and rules[0](state)
             else:
-                return lambda state: any(rule(state) for rule in rules)
+                return lambda state: base_rule(state) and any(rule(state) for rule in rules)
         else:
-            return None
+            return base_rule
+
+    def build_star_painting_entry_requirements(self, painting_lvl_name: str = None, star_num_req: int = None) -> Callable:
+        nop_condition = lambda state: True
+        star_rule = nop_condition
+        painting_rule = nop_condition
+        if painting_lvl_name is not None and self.painting_randomizer:
+            painting_item_name = f"Painting Unlock {painting_lvl_name}"
+            painting_rule = lambda state: state.has(painting_item_name, self.player)
+        if star_num_req is not None:
+            star_rule = lambda state: state.has("Power Star", self.player, star_num_req)
+        return lambda state: star_rule(state) and painting_rule(state)
 
     def combine_and_clauses(self, rule_expr: str, cannon_name: str) -> Union[Callable, bool]:
         expressions = rule_expr.split(" & ")
diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index 33aaa003ad..f1208d2059 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -1,7 +1,7 @@
 import typing
 import os
 import json
-from .Items import item_data_table, action_item_data_table, cannon_item_data_table, item_table, SM64Item
+from .Items import item_data_table, action_item_data_table, cannon_item_data_table, painting_unlock_item_data_table, item_table, SM64Item
 from .Locations import location_table, SM64Location
 from .Options import sm64_options_groups, SM64Options
 from .Rules import set_rules
@@ -71,6 +71,8 @@ class SM64World(World):
                 self.move_rando_bitvec |= (1 << (action_item_data_table[action].code - double_jump_bitvec_offset))
         if self.options.exclamation_boxes:
             max_stars += 29
+        if self.options.enable_locked_paintings:
+            max_stars -= len(painting_unlock_item_data_table) # free up space for the required paintings
         self.number_of_stars = min(self.options.amount_of_stars, max_stars)
         self.filler_count = max_stars - self.number_of_stars
         self.star_costs = {
@@ -127,6 +129,9 @@ class SM64World(World):
         # Cannons
         if (self.options.buddy_checks):
             self.multiworld.itempool += [self.create_item(cannon_name) for cannon_name in cannon_item_data_table.keys()]
+        # Paintings
+        if (self.options.enable_locked_paintings):
+            self.multiworld.itempool += [self.create_item(painting_name) for painting_name in painting_unlock_item_data_table.keys()]
         # Moves
         double_jump_bitvec_offset = action_item_data_table['Double Jump'].code
         self.multiworld.itempool += [self.create_item(action)
@@ -201,6 +206,7 @@ class SM64World(World):
         return {
             "AreaRando": self.area_connections,
             "MoveRandoVec": self.move_rando_bitvec,
+            "PaintingRando": self.options.enable_locked_paintings.value,
             "DeathLink": self.options.death_link.value,
             "CompletionType": self.options.completion_type.value,
             **self.star_costs
diff --git a/worlds/sm64ex/docs/setup_en.md b/worlds/sm64ex/docs/setup_en.md
index 9963d3945a..62669a65eb 100644
--- a/worlds/sm64ex/docs/setup_en.md
+++ b/worlds/sm64ex/docs/setup_en.md
@@ -161,12 +161,6 @@ with its name.
 When using a US Rom, the In-Game messages are missing some letters: `J Q V X Z` and `?`.
 The Japanese Version should have no problem displaying these.
 
-### Toad does not have an item for me.
-
-This happens on older builds when you load an existing file that had already received an item from that toad.
-To resolve this, exit and start from a `NEW` file. The server will automatically restore your progress.
-Alternatively, updating your build will prevent this issue in the future.
-
 ### What happens if I lose connection?
 
 SM64EX tries to reconnect a few times, so be patient.
diff --git a/worlds/soe/__init__.py b/worlds/soe/__init__.py
index 161c749fd6..8de83da7ea 100644
--- a/worlds/soe/__init__.py
+++ b/worlds/soe/__init__.py
@@ -20,7 +20,8 @@ if typing.TYPE_CHECKING:
     from BaseClasses import MultiWorld, CollectionState
 
 __all__ = ["pyevermizer", "SoEWorld"]
-
+__version__ = "0.50.1"
+__author__ = "black-sliver"
 
 """
 In evermizer:
@@ -461,7 +462,7 @@ class SoEWorld(World):
             except FileNotFoundError:
                 pass
 
-    def modify_multidata(self, multidata: typing.Dict[str, typing.Any]) -> None:
+    def modify_multidata(self, multidata: typing.Mapping[str, typing.Any]) -> None:
         # wait for self.connect_name to be available.
         self.connect_name_available_event.wait()
         # we skip in case of error, so that the original error in the output thread is the one that gets raised
diff --git a/worlds/soe/archipelago.json b/worlds/soe/archipelago.json
new file mode 100644
index 0000000000..5a3ca8353e
--- /dev/null
+++ b/worlds/soe/archipelago.json
@@ -0,0 +1,8 @@
+{
+    "game": "Secret of Evermore",
+    "authors": [
+        "black-sliver"
+    ],
+    "world_version": "0.50.1",
+    "minimum_ap_version": "0.4.2"
+}
\ No newline at end of file
diff --git a/worlds/soe/logic.py b/worlds/soe/logic.py
index 92ffb14b3f..30633d2fcc 100644
--- a/worlds/soe/logic.py
+++ b/worlds/soe/logic.py
@@ -16,9 +16,14 @@ rules = pyevermizer.get_logic()
 # Logic.items are all items and extra items excluding non-progression items and duplicates
 # NOTE: we are skipping sniff items here because none of them is supposed to provide progression
 item_names: Set[str] = set()
-items = [item for item in filter(lambda item: item.progression,  # type: ignore[arg-type]
-                                 chain(pyevermizer.get_items(), pyevermizer.get_extra_items()))
-         if item.name not in item_names and not item_names.add(item.name)]  # type: ignore[func-returns-value]
+items = [
+    item
+    for item in filter(
+        lambda item: item.progression,
+        chain(pyevermizer.get_items(), pyevermizer.get_extra_items()),
+    )
+    if item.name not in item_names and not item_names.add(item.name)  # type: ignore[func-returns-value]
+]
 
 
 class SoEPlayerLogic:
diff --git a/worlds/soe/test/test_manifest.py b/worlds/soe/test/test_manifest.py
new file mode 100644
index 0000000000..64dfbdf8c8
--- /dev/null
+++ b/worlds/soe/test/test_manifest.py
@@ -0,0 +1,14 @@
+import json
+from pathlib import Path
+from unittest import TestCase, skipUnless
+
+
+@skipUnless((Path(__file__).parent.parent / "tools" / "make_manifest.py").exists(), "Packaged without tools")
+class ManifestTest(TestCase):
+    def test_manifest_is_up_to_date(self) -> None:
+        from ..tools.make_manifest import make_manifest
+
+        expected_manifest = make_manifest()
+        with (Path(__file__).parent.parent / "archipelago.json").open("r", encoding="utf-8") as f:
+            actual_manifest = json.load(f)
+        self.assertEqual(actual_manifest, expected_manifest, "Manifest is not up to date")
diff --git a/worlds/soe/tools/__init__.py b/worlds/soe/tools/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/soe/tools/make_manifest.py b/worlds/soe/tools/make_manifest.py
new file mode 100644
index 0000000000..34e9c42b05
--- /dev/null
+++ b/worlds/soe/tools/make_manifest.py
@@ -0,0 +1,42 @@
+"""Create archipelago.json manifest file. Run as `python -m worlds.soe.tools.make_manifest`."""
+
+import json
+from importlib.metadata import metadata
+from pathlib import Path
+from typing import Any
+
+from .. import SoEWorld, __version__ as world_version, __author__ as world_author
+
+
+__all__ = ["make_manifest"]
+
+
+def make_manifest() -> dict[str, Any]:
+    """
+    Generate and return manifest dict for the Secret of Evermore APWorld.
+
+    The world version is supposed to be equal to the pyevermizer version, but we may have to break that in the future
+    if we ever do a breaking change to the world after we are >= 1.0.0, or we release multiple versions of the APWorld
+    for a single pyevermizer version.
+    """
+    meta = metadata("pyevermizer")
+    version = meta["Version"]
+    authors = list(dict.fromkeys(map(str.rstrip, (world_author + "," + meta["Author"]).split(","))))
+    assert world_version == version, f"Expected world version ({world_version}) == pyevermizer version ({version})."
+
+    return {
+        "game": SoEWorld.game,
+        "authors": authors,
+        "world_version": world_version,
+        "minimum_ap_version": "0.4.2",  # introduction of settings API
+    }
+
+
+if __name__ == "__main__":
+    assert SoEWorld.__file__, "Could not determine world source."
+    module_dir = Path(SoEWorld.__file__).parent
+    assert module_dir.is_dir(), f"{module_dir} is not a directory"
+    manifest_path = module_dir / "archipelago.json"
+
+    with manifest_path.open("w", encoding="utf-8") as f:
+        json.dump(make_manifest(), f, indent=4)
diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index ec96a9949e..558df4feb1 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -1,30 +1,41 @@
 import logging
+import math
 import typing
+from collections import Counter
+from functools import wraps
 from random import Random
-from typing import Dict, Any, Optional, List, TextIO
+from typing import Dict, List, Any, ClassVar, TextIO, Optional
 
 import entrance_rando
 from BaseClasses import Region, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from Options import PerGameCommonOptions
 from worlds.AutoWorld import World, WebWorld
+from worlds.LauncherComponents import components, Component, icon_paths, Type
 from .bundles.bundle_room import BundleRoom
-from .bundles.bundles import get_all_bundles
+from .bundles.bundles import get_all_bundles, get_trash_bear_requests
 from .content import StardewContent, create_content
-from .early_items import setup_early_items
-from .items import item_table, ItemData, Group, items_by_group
-from .items.item_creation import create_items, get_all_filler_items, remove_limited_amount_packs, \
-    generate_filler_choice_pool
+from .content.feature.special_order_locations import get_qi_gem_amount
+from .content.feature.walnutsanity import get_walnut_amount
+from .items import item_table, ItemData, Group, items_by_group, create_items, generate_filler_choice_pool, \
+    setup_early_items
+from .items.item_data import FILLER_GROUPS
 from .locations import location_table, create_locations, LocationData, locations_by_tag
+from .logic.combat_logic import valid_weapons
 from .logic.logic import StardewLogic
 from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, EnabledFillerBuffs, \
-    NumberOfMovementBuffs, BuildingProgression, EntranceRandomization, FarmType
-from .options.forced_options import force_change_options_if_incompatible
+    NumberOfMovementBuffs, BuildingProgression, EntranceRandomization, ToolProgression, BackpackProgression, TrapDistribution, BundlePrice, \
+    BundleWhitelist, BundleBlacklist, BundlePerRoom, FarmType
+from .options.forced_options import force_change_options_if_incompatible, force_change_options_if_banned
+from .options.jojapocalypse_options import JojaAreYouSure
 from .options.option_groups import sv_option_groups
 from .options.presets import sv_options_presets
+from .options.settings import StardewSettings
 from .options.worlds_group import apply_most_restrictive_options
 from .regions import create_regions, prepare_mod_data
 from .rules import set_rules
 from .stardew_rule import True_, StardewRule, HasProgressionPercent
+from .strings.ap_names.ap_option_names import StartWithoutOptionName
+from .strings.ap_names.ap_weapon_names import APWeapon
 from .strings.ap_names.event_names import Event
 from .strings.goal_names import Goal as GoalName
 
@@ -34,6 +45,7 @@ STARDEW_VALLEY = "Stardew Valley"
 UNIVERSAL_TRACKER_SEED_PROPERTY = "ut_seed"
 
 client_version = 0
+TRACKER_ENABLED = True
 
 
 class StardewLocation(Location):
@@ -42,6 +54,12 @@ class StardewLocation(Location):
 
 class StardewItem(Item):
     game: str = STARDEW_VALLEY
+    events_to_collect: Counter[str]
+
+    @wraps(Item.__init__)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.events_to_collect = Counter()
 
 
 class StardewWebWorld(WebWorld):
@@ -56,7 +74,7 @@ class StardewWebWorld(WebWorld):
         "English",
         "setup_en.md",
         "setup/en",
-        ["KaitoKid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"]
+        ["Kaito Kid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"]
     )
 
     setup_fr = Tutorial(
@@ -71,13 +89,35 @@ class StardewWebWorld(WebWorld):
     tutorials = [setup_en, setup_fr]
 
 
+if TRACKER_ENABLED:
+    from .. import user_folder
+    import os
+
+    # Best effort to detect if universal tracker is installed
+    if any("tracker.apworld" in f.name for f in os.scandir(user_folder)):
+        def launch_client(*args):
+            from worlds.LauncherComponents import launch
+            from .client import launch as client_main
+            launch(client_main, name="Stardew Valley Tracker", args=args)
+
+
+        components.append(Component(
+            "Stardew Valley Tracker",
+            func=launch_client,
+            component_type=Type.CLIENT,
+            icon='stardew'
+        ))
+
+        icon_paths['stardew'] = f"ap:{__name__}/stardew.png"
+
+
 class StardewValleyWorld(World):
     """
     Stardew Valley is an open-ended country-life RPG. You can farm, fish, mine, fight, complete quests,
     befriend villagers, and uncover dark secrets.
     """
     game = STARDEW_VALLEY
-    topology_present = False
+    topology_present = True
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {name: data.code for name, data in location_table.items()}
@@ -95,14 +135,17 @@ class StardewValleyWorld(World):
 
     options_dataclass = StardewValleyOptions
     options: StardewValleyOptions
+    settings: ClassVar[StardewSettings]
     content: StardewContent
     logic: StardewLogic
 
     web = StardewWebWorld()
     modified_bundles: List[BundleRoom]
     randomized_entrances: Dict[str, str]
+    trash_bear_requests: Dict[str, List[str]]
 
     total_progression_items: int
+    classifications_to_override_post_fill: list[tuple[StardewItem, ItemClassification]]
 
     @classmethod
     def create_group(cls, multiworld: MultiWorld, new_player_id: int, players: set[int]) -> World:
@@ -111,13 +154,15 @@ class StardewValleyWorld(World):
         group_options = typing.cast(StardewValleyOptions, world_group.options)
         worlds_options = [typing.cast(StardewValleyOptions, multiworld.worlds[player].options) for player in players]
         apply_most_restrictive_options(group_options, worlds_options)
+        world_group.content = create_content(group_options)
 
         return world_group
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super().__init__(multiworld, player)
-        self.filler_item_pool_names = []
+        self.filler_item_pool_names = None
         self.total_progression_items = 0
+        self.classifications_to_override_post_fill = []
 
         # Taking the seed specified in slot data for UT, otherwise just generating the seed.
         self.seed = getattr(multiworld, "re_gen_passthrough", {}).get(STARDEW_VALLEY, self.random.getrandbits(64))
@@ -128,9 +173,25 @@ class StardewValleyWorld(World):
         seed = slot_data.get(UNIVERSAL_TRACKER_SEED_PROPERTY)
         if seed is None:
             logger.warning(f"World was generated before Universal Tracker support. Tracker might not be accurate.")
+        for option_name in slot_data:
+            if option_name in self.options_dataclass.type_hints:
+                option_value = slot_data[option_name]
+                option_type = self.options_dataclass.type_hints[option_name]
+                if isinstance(option_value, option_type):
+                    self.options.__setattr__(option_name, option_value)
+                    continue
+                parsed_option_value = option_type.from_any(option_value)
+                if isinstance(parsed_option_value, option_type):
+                    self.options.__setattr__(option_name, parsed_option_value)
+                    continue
+                logger.warning(f"Option {option_name} was found in slot data, but could not be automatically parsed to be used in generation.\n"
+                               f"Slot Data Value: {option_value}"
+                               f"Parsed Value: {parsed_option_value}"
+                               f"Yaml Value: {self.options.__getattribute__(option_name)}")
         return seed
 
     def generate_early(self):
+        force_change_options_if_banned(self.options, self.settings, self.player, self.player_name)
         force_change_options_if_incompatible(self.options, self.player, self.player_name)
         self.content = create_content(self.options)
 
@@ -141,23 +202,31 @@ class StardewValleyWorld(World):
         world_regions = create_regions(create_region, self.options, self.content)
 
         self.logic = StardewLogic(self.player, self.options, self.content, world_regions.keys())
-        self.modified_bundles = get_all_bundles(self.random, self.logic, self.content, self.options)
+        self.modified_bundles = get_all_bundles(self.random, self.logic, self.content, self.options, self.player_name)
+        self.trash_bear_requests = get_trash_bear_requests(self.random, self.content, self.options)
+
+        for bundle_room in self.modified_bundles:
+            bundle_room.special_behavior(self)
 
         def add_location(name: str, code: Optional[int], region: str):
+            assert region in world_regions, f"Location {name} cannot be created in region {region}, because the region does not exist in this slot"
             region: Region = world_regions[region]
             location = StardewLocation(self.player, name, code, region)
             region.locations.append(location)
 
-        create_locations(add_location, self.modified_bundles, self.options, self.content, self.random)
+        create_locations(add_location, self.modified_bundles, self.trash_bear_requests, self.options, self.content, self.random)
         self.multiworld.regions.extend(world_regions.values())
 
     def create_items(self):
+        self.precollect_start_inventory_items_if_needed()
+        self.precollect_start_without_items()
         self.precollect_starting_season()
         self.precollect_building_items()
+        self.precollect_starting_backpacks()
         items_to_exclude = [excluded_items
                             for excluded_items in self.multiworld.precollected_items[self.player]
                             if item_table[excluded_items.name].has_any_group(Group.MAXIMUM_ONE)
-                            or not item_table[excluded_items.name].has_any_group(Group.RESOURCE_PACK, Group.FRIENDSHIP_PACK)]
+                            or not item_table[excluded_items.name].has_any_group(*FILLER_GROUPS, Group.FRIENDSHIP_PACK)]
 
         if self.options.season_randomization == SeasonRandomization.option_disabled:
             items_to_exclude = [item for item in items_to_exclude
@@ -172,6 +241,7 @@ class StardewValleyWorld(World):
         self.multiworld.itempool += created_items
 
         setup_early_items(self.multiworld, self.options, self.content, self.player, self.random)
+
         self.setup_logic_events()
         self.setup_victory()
 
@@ -187,6 +257,31 @@ class StardewValleyWorld(World):
         self.total_progression_items += sum(1 for i in created_items if i.advancement)
         self.total_progression_items -= 1  # -1 for the victory event
 
+        player_state = self.multiworld.state.prog_items[self.player]
+        self.update_received_progression_percent(player_state)
+
+    def precollect_start_inventory_items_if_needed(self):
+        # The only reason this is necessary, is because in an UT context, precollected items was not filled up, and this messes with the seeded random later
+        for item_name in self.options.start_inventory:
+            item_count = self.options.start_inventory[item_name]
+            precollected_count = len([precollected_item for precollected_item in self.multiworld.precollected_items[self.player]
+                                      if precollected_item.name == item_name])
+            while precollected_count < item_count:
+                self.multiworld.push_precollected(self.create_item(item_name))
+                precollected_count += 1
+
+
+    def precollect_start_without_items(self):
+        if StartWithoutOptionName.landslide not in self.options.start_without:
+            self.multiworld.push_precollected(self.create_item("Landslide Removed"))
+        if StartWithoutOptionName.community_center not in self.options.start_without:
+            self.multiworld.push_precollected(self.create_item("Community Center Key"))
+            self.multiworld.push_precollected(self.create_item("Forest Magic"))
+            self.multiworld.push_precollected(self.create_item("Wizard Invitation"))
+        if StartWithoutOptionName.buildings not in self.options.start_without:
+            self.multiworld.push_precollected(self.create_item("Shipping Bin"))
+            self.multiworld.push_precollected(self.create_item("Pet Bowl"))
+
     def precollect_starting_season(self):
         if self.options.season_randomization == SeasonRandomization.option_progressive:
             return
@@ -220,9 +315,23 @@ class StardewValleyWorld(World):
             for _ in range(quantity):
                 self.multiworld.push_precollected(self.create_item(item))
 
+    def precollect_starting_backpacks(self):
+        if self.options.backpack_progression != BackpackProgression.option_vanilla and StartWithoutOptionName.backpack in self.options.start_without:
+            minimum_start_slots = 4 if StartWithoutOptionName.tools in self.options.start_without else 6
+            num_starting_slots = max(minimum_start_slots, self.options.backpack_size.value)
+            num_starting_backpacks = math.ceil(num_starting_slots / self.options.backpack_size.value)
+            num_already_starting_backpacks = 0
+            for precollected_item in self.multiworld.precollected_items[self.player]:
+                if precollected_item.name == "Progressive Backpack":
+                    num_already_starting_backpacks += 1
+            for i in range(num_starting_backpacks - num_already_starting_backpacks):
+                self.multiworld.push_precollected(self.create_item("Progressive Backpack"))
+
     def setup_logic_events(self):
-        def register_event(name: str, region: str, rule: StardewRule):
-            event_location = LocationData(None, region, name)
+        def register_event(name: str, region: str, rule: StardewRule, location_name: str | None = None) -> None:
+            if location_name is None:
+                location_name = name
+            event_location = LocationData(None, region, location_name)
             self.create_event_location(event_location, rule, name)
 
         self.logic.setup_events(register_event)
@@ -284,6 +393,14 @@ class StardewValleyWorld(World):
             self.create_event_location(location_table[GoalName.mystery_of_the_stardrops],
                                        self.logic.goal.can_complete_mystery_of_the_stardrop(),
                                        Event.victory)
+        elif self.options.goal == Goal.option_mad_hatter:
+            self.create_event_location(location_table[GoalName.mad_hatter],
+                                       self.logic.goal.can_complete_mad_hatter(self.get_all_location_names()),
+                                       Event.victory)
+        elif self.options.goal == Goal.option_ultimate_foodie:
+            self.create_event_location(location_table[GoalName.ultimate_foodie],
+                                       self.logic.goal.can_complete_ultimate_foodie(self.get_all_location_names()),
+                                       Event.victory)
         elif self.options.goal == Goal.option_allsanity:
             self.create_event_location(location_table[GoalName.allsanity],
                                        self.logic.goal.can_complete_allsanity(),
@@ -298,18 +415,36 @@ class StardewValleyWorld(World):
     def get_all_location_names(self) -> List[str]:
         return list(location.name for location in self.multiworld.get_locations(self.player))
 
-    def create_item(self, item: str | ItemData, override_classification: ItemClassification = None) -> StardewItem:
+    def create_item(self, item: str | ItemData,
+                    classification_pre_fill: ItemClassification = None,
+                    classification_post_fill: ItemClassification = None) -> StardewItem:
         if isinstance(item, str):
             item = item_table[item]
 
-        if override_classification is None:
-            override_classification = item.classification
+        if classification_pre_fill is None:
+            classification_pre_fill = item.classification
 
-        return StardewItem(item.name, override_classification, item.code, self.player)
+        stardew_item = StardewItem(item.name, classification_pre_fill, item.code, self.player)
+
+        if stardew_item.advancement:
+            # Progress is only counted for pre-fill progression items, so we don't count filler items later converted to progression post-fill.
+            stardew_item.events_to_collect[Event.received_progression_item] = 1
+
+        if (walnut_amount := get_walnut_amount(stardew_item.name)) > 0:
+            stardew_item.events_to_collect[Event.received_walnuts] = walnut_amount
+
+        if (qi_gem_amount := get_qi_gem_amount(stardew_item.name)) > 0:
+            stardew_item.events_to_collect[Event.received_qi_gems] = qi_gem_amount
+
+        if classification_post_fill is not None:
+            self.classifications_to_override_post_fill.append((stardew_item, classification_post_fill))
+
+        return stardew_item
 
     def create_event_location(self, location_data: LocationData, rule: StardewRule, item: str):
         region = self.multiworld.get_region(location_data.region, self.player)
-        region.add_event(location_data.name, item, rule, StardewLocation, StardewItem)
+        item = typing.cast(StardewItem, region.add_event(location_data.name, item, rule, StardewLocation, StardewItem))
+        item.events_to_collect[Event.received_progression_item] = 1
 
     def set_rules(self):
         set_rules(self)
@@ -322,9 +457,14 @@ class StardewValleyWorld(World):
     def generate_basic(self):
         pass
 
+    def post_fill(self) -> None:
+        # Not updating the prog item count, as any change could make some locations inaccessible, which is pretty much illegal in post fill.
+        for item, classification in self.classifications_to_override_post_fill:
+            item.classification = classification
+
     def get_filler_item_name(self) -> str:
         if not self.filler_item_pool_names:
-            self.filler_item_pool_names = generate_filler_choice_pool(self.options)
+            self.filler_item_pool_names = generate_filler_choice_pool(self.options, self.content)
         return self.random.choice(self.filler_item_pool_names)
 
     def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
@@ -365,9 +505,10 @@ class StardewValleyWorld(World):
             for bundle in room.bundles:
                 bundles[room.name][bundle.name] = {"number_required": bundle.number_required}
                 for i, item in enumerate(bundle.items):
-                    bundles[room.name][bundle.name][i] = f"{item.get_item()}|{item.amount}|{item.quality}"
+                    bundles[room.name][bundle.name][str(i)] = f"{item.get_item()}|{item.amount}|{item.quality}"
 
-        excluded_options = [BundleRandomization, NumberOfMovementBuffs, EnabledFillerBuffs]
+        excluded_options = [BundleRandomization, BundlePerRoom, NumberOfMovementBuffs,
+                            EnabledFillerBuffs, TrapDistribution, BundleWhitelist, BundleBlacklist, JojaAreYouSure]
         excluded_option_names = [option.internal_name for option in excluded_options]
         generic_option_names = [option_name for option_name in PerGameCommonOptions.type_hints]
         excluded_option_names.extend(generic_option_names)
@@ -377,8 +518,9 @@ class StardewValleyWorld(World):
             UNIVERSAL_TRACKER_SEED_PROPERTY: self.seed,
             "seed": self.random.randrange(1000000000),  # Seed should be max 9 digits
             "randomized_entrances": self.randomized_entrances,
+            "trash_bear_requests": self.trash_bear_requests,
             "modified_bundles": bundles,
-            "client_version": "6.0.0",
+            "client_version": self.world_version.as_simple_string(),
         })
 
         return slot_data
@@ -389,18 +531,12 @@ class StardewValleyWorld(World):
             return False
 
         player_state = state.prog_items[self.player]
+        player_state.update(item.events_to_collect)
 
-        received_progression_count = player_state[Event.received_progression_item]
-        received_progression_count += 1
-        if self.total_progression_items:
-            # Total progression items is not set until all items are created, but collect will be called during the item creation when an item is precollected.
-            # We can't update the percentage if we don't know the total progression items, can't divide by 0.
-            player_state[Event.received_progression_percent] = received_progression_count * 100 // self.total_progression_items
-        player_state[Event.received_progression_item] = received_progression_count
+        self.update_received_progression_percent(player_state)
 
-        walnut_amount = self.get_walnut_amount(item.name)
-        if walnut_amount:
-            player_state[Event.received_walnuts] += walnut_amount
+        if item.name in APWeapon.all_weapons:
+            player_state[Event.received_progressive_weapon] = max(player_state[Event.received_progressive_weapon], player_state[item.name])
 
         return True
 
@@ -410,26 +546,18 @@ class StardewValleyWorld(World):
             return False
 
         player_state = state.prog_items[self.player]
+        player_state.subtract(item.events_to_collect)
 
-        received_progression_count = player_state[Event.received_progression_item]
-        received_progression_count -= 1
-        if self.total_progression_items:
-            # We can't update the percentage if we don't know the total progression items, can't divide by 0.
-            player_state[Event.received_progression_percent] = received_progression_count * 100 // self.total_progression_items
-        player_state[Event.received_progression_item] = received_progression_count
+        self.update_received_progression_percent(player_state)
 
-        walnut_amount = self.get_walnut_amount(item.name)
-        if walnut_amount:
-            player_state[Event.received_walnuts] -= walnut_amount
+        if item.name in APWeapon.all_weapons:
+            player_state[Event.received_progressive_weapon] = max(player_state[weapon] for weapon in APWeapon.all_weapons)
 
         return True
 
-    @staticmethod
-    def get_walnut_amount(item_name: str) -> int:
-        if item_name == "Golden Walnut":
-            return 1
-        if item_name == "3 Golden Walnuts":
-            return 3
-        if item_name == "5 Golden Walnuts":
-            return 5
-        return 0
+    def update_received_progression_percent(self, player_state: Counter[str]) -> None:
+        if self.total_progression_items:
+            received_progression_count = player_state[Event.received_progression_item]
+            # Total progression items is not set until all items are created, but collect will be called during the item creation when an item is precollected.
+            # We can't update the percentage if we don't know the total progression items, can't divide by 0.
+            player_state[Event.received_progression_percent] = received_progression_count * 100 // self.total_progression_items
diff --git a/worlds/stardew_valley/archipelago.json b/worlds/stardew_valley/archipelago.json
index e47d483248..7f7e3a8608 100644
--- a/worlds/stardew_valley/archipelago.json
+++ b/worlds/stardew_valley/archipelago.json
@@ -1,6 +1,6 @@
 {
   "game": "Stardew Valley",
-  "authors": ["KaitoKid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"],
+  "authors": ["Kaito Kid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"],
   "minimum_ap_version": "0.6.4",
-  "world_version": "6.0.0"
+  "world_version": "7.4.0"
 }
diff --git a/worlds/stardew_valley/bundles/bundle.py b/worlds/stardew_valley/bundles/bundle.py
index 43afc750b8..4e6165712c 100644
--- a/worlds/stardew_valley/bundles/bundle.py
+++ b/worlds/stardew_valley/bundles/bundle.py
@@ -3,10 +3,13 @@ from dataclasses import dataclass
 from random import Random
 from typing import List, Tuple
 
+from Options import DeathLink
 from .bundle_item import BundleItem
 from ..content import StardewContent
-from ..options import BundlePrice, StardewValleyOptions, ExcludeGingerIsland, FestivalLocations
-from ..strings.currency_names import Currency
+from ..options import BundlePrice, StardewValleyOptions, ExcludeGingerIsland, FestivalLocations, TrapDifficulty, \
+    MultipleDaySleepEnabled, Gifting, EntranceRandomization
+from ..strings.bundle_names import MemeBundleName
+from ..strings.currency_names import Currency, MemeCurrency
 
 
 @dataclass
@@ -19,6 +22,10 @@ class Bundle:
     def __repr__(self):
         return f"{self.name} -> {self.number_required} from {repr(self.items)}"
 
+    def special_behavior(self, world):
+        if self.name == MemeBundleName.clickbait:
+            world.options.exclude_locations.value.add(MemeBundleName.clickbait)
+
 
 @dataclass
 class BundleTemplate:
@@ -42,7 +49,42 @@ class BundleTemplate:
                               template.number_required_items)
 
     def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
-        number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+        try:
+            number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+            filtered_items = [item for item in self.items if item.can_appear(content, options)]
+            number_items = len(filtered_items)
+            number_chosen_items = self.number_possible_items
+            if number_chosen_items < number_required:
+                number_chosen_items = number_required
+
+            if number_chosen_items > number_items:
+                chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+            else:
+                chosen_items = random.sample(filtered_items, number_chosen_items)
+            chosen_items = [item.as_amount(min(999, max(1, math.floor(item.amount * price_multiplier)))) for item in chosen_items]
+            return Bundle(self.room, self.name, chosen_items, number_required)
+        except Exception as e:
+            raise Exception(f"Failed at creating bundle '{self.name}'. Error: {e}")
+
+
+    def can_appear(self, options: StardewValleyOptions) -> bool:
+        if self.name == MemeBundleName.trap and options.trap_items.value == TrapDifficulty.option_no_traps:
+            return False
+        if self.name == MemeBundleName.hibernation and options.multiple_day_sleep_enabled == MultipleDaySleepEnabled.option_false:
+            return False
+        if self.name == MemeBundleName.cooperation and options.gifting == Gifting.option_false:
+            return False
+        return True
+
+
+class FixedMultiplierBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = get_number_required_items(options.bundle_price, self.number_required_items)
         filtered_items = [item for item in self.items if item.can_appear(content, options)]
         number_items = len(filtered_items)
         number_chosen_items = self.number_possible_items
@@ -53,11 +95,53 @@ class BundleTemplate:
             chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
         else:
             chosen_items = random.sample(filtered_items, number_chosen_items)
-        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        chosen_items = [item.as_amount(min(999, max(1, item.amount))) for item in chosen_items]
         return Bundle(self.room, self.name, chosen_items, number_required)
 
-    def can_appear(self, options: StardewValleyOptions) -> bool:
-        return True
+
+class FixedPriceBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < self.number_required_items:
+            number_chosen_items = self.number_required_items
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, self.number_required_items)
+
+
+# This type of bundle will always match the number of slots and the number of items
+class FixedSlotsBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        try:
+            number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+            filtered_items = [item for item in self.items if item.can_appear(content, options)]
+            number_items = len(filtered_items)
+            number_chosen_items = number_required
+            if number_chosen_items > number_items:
+                chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+            else:
+                chosen_items = random.sample(filtered_items, number_chosen_items)
+            chosen_items = [item.as_amount(min(999, max(1, math.floor(item.amount * price_multiplier)))) for item in chosen_items]
+            return Bundle(self.room, self.name, chosen_items, number_required)
+        except Exception as e:
+            raise Exception(f"Failed at creating bundle '{self.name}'. Error: {e}")
+
 
 
 class CurrencyBundleTemplate(BundleTemplate):
@@ -77,15 +161,33 @@ class CurrencyBundleTemplate(BundleTemplate):
         return currency_amount
 
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
             if self.item.item_name == Currency.qi_gem or self.item.item_name == Currency.golden_walnut or self.item.item_name == Currency.cinder_shard:
                 return False
         if options.festival_locations == FestivalLocations.option_disabled:
             if self.item.item_name == Currency.star_token:
                 return False
+        if options.entrance_randomization != EntranceRandomization.option_disabled:
+            if self.item.item_name == MemeCurrency.time_elapsed:
+                return False
+        if options.death_link != DeathLink.option_true:
+            if self.item.item_name == MemeCurrency.deathlinks:
+                return False
         return True
 
 
+class FixedPriceCurrencyBundleTemplate(CurrencyBundleTemplate):
+
+    def __init__(self, room: str, name: str, item: BundleItem):
+        super().__init__(room, name, item)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        currency_amount = self.item.amount
+        return Bundle(self.room, self.name, [BundleItem(self.item.item_name, currency_amount)], 1)
+
+
 class MoneyBundleTemplate(CurrencyBundleTemplate):
 
     def __init__(self, room: str, default_name: str, item: BundleItem):
@@ -111,11 +213,15 @@ class MoneyBundleTemplate(CurrencyBundleTemplate):
 
 class IslandBundleTemplate(BundleTemplate):
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         return options.exclude_ginger_island == ExcludeGingerIsland.option_false
 
 
 class FestivalBundleTemplate(BundleTemplate):
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         return options.festival_locations != FestivalLocations.option_disabled
 
 
@@ -149,6 +255,96 @@ class DeepBundleTemplate(BundleTemplate):
         return Bundle(self.room, self.name, chosen_items, number_required)
 
 
+class FixedPriceDeepBundleTemplate(DeepBundleTemplate):
+
+    def __init__(self, room: str, name: str, categories: List[List[BundleItem]], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, categories, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items
+        number_categories = len(self.categories)
+        number_chosen_categories = self.number_possible_items
+        if number_chosen_categories < number_required:
+            number_chosen_categories = number_required
+
+        if number_chosen_categories > number_categories:
+            chosen_categories = self.categories + random.choices(self.categories,
+                                                                 k=number_chosen_categories - number_categories)
+        else:
+            chosen_categories = random.sample(self.categories, number_chosen_categories)
+
+        chosen_items = []
+        for category in chosen_categories:
+            filtered_items = [item for item in category if item.can_appear(content, options)]
+            chosen_items.append(random.choice(filtered_items))
+
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
+@dataclass
+class BureaucracyBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super(BureaucracyBundleTemplate, self).__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items + options.bundle_price.value
+        number_required = min(12, max(4, number_required))
+        if options.bundle_price == BundlePrice.option_minimum:
+            number_required = 4
+        if options.bundle_price == BundlePrice.option_maximum:
+            number_required = 12
+        price_multiplier = 1
+
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < number_required:
+            number_chosen_items = number_required
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
+@dataclass
+class RecursiveBundleTemplate(BundleTemplate):
+    number_sub_bundles: int
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int, number_sub_bundles: int):
+        super(RecursiveBundleTemplate, self).__init__(room, name, items, number_possible_items, number_required_items)
+        self.number_sub_bundles = number_sub_bundles
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items + (options.bundle_price.value * self.number_sub_bundles)
+        if options.bundle_price == BundlePrice.option_minimum:
+            number_required = self.number_sub_bundles
+        if options.bundle_price == BundlePrice.option_maximum:
+            number_required = self.number_sub_bundles * 8
+        number_required = min(self.number_sub_bundles * 8, max(self.number_sub_bundles, number_required))
+        price_multiplier = get_price_multiplier(options.bundle_price, False)
+
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < number_required:
+            number_chosen_items = number_required
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
 def get_bundle_final_prices(bundle_price_option: BundlePrice, default_required_items: int, is_currency: bool) -> Tuple[int, float]:
     number_required_items = get_number_required_items(bundle_price_option, default_required_items)
     price_multiplier = get_price_multiplier(bundle_price_option, is_currency)
diff --git a/worlds/stardew_valley/bundles/bundle_item.py b/worlds/stardew_valley/bundles/bundle_item.py
index 91e279d2a6..398de22a4f 100644
--- a/worlds/stardew_valley/bundles/bundle_item.py
+++ b/worlds/stardew_valley/bundles/bundle_item.py
@@ -37,6 +37,11 @@ class MasteryItemSource(BundleItemSource):
         return content.features.skill_progression.are_masteries_shuffled
 
 
+class QiBoardItemSource(BundleItemSource):
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
+        return content_packs.qi_board_content_pack.name in content.registered_packs
+
+
 class ContentItemSource(BundleItemSource):
     """This is meant to be used for items that are managed by the content packs."""
 
@@ -51,6 +56,7 @@ class BundleItem:
         island = IslandItemSource()
         festival = FestivalItemSource()
         masteries = MasteryItemSource()
+        qi_board = QiBoardItemSource()
         content = ContentItemSource()
 
     item_name: str
diff --git a/worlds/stardew_valley/bundles/bundle_room.py b/worlds/stardew_valley/bundles/bundle_room.py
index 225fb4feab..40edc0425a 100644
--- a/worlds/stardew_valley/bundles/bundle_room.py
+++ b/worlds/stardew_valley/bundles/bundle_room.py
@@ -5,6 +5,7 @@ from typing import List
 from .bundle import Bundle, BundleTemplate
 from ..content import StardewContent
 from ..options import StardewValleyOptions
+from ..strings.bundle_names import CCRoom
 
 
 @dataclass
@@ -12,6 +13,24 @@ class BundleRoom:
     name: str
     bundles: List[Bundle]
 
+    def special_behavior(self, world):
+        for bundle in self.bundles:
+            bundle.special_behavior(world)
+
+
+def simplify_name(name: str) -> str:
+    return name.lower().replace(" ", "").replace("-", "").replace("_", "").replace(".", "")
+
+
+# In the context of meme bundles, some of the bundles are directly references to specific people, mostly content creators.
+# This ensures that they roll their own bundle as part of their community center.
+def is_bundle_related_to_player(bundle: BundleTemplate, player_name: str) -> bool:
+    if player_name == "":
+        return False
+    simple_bundle = simplify_name(bundle.name)
+    simple_player = simplify_name(player_name)
+    return simple_player in simple_bundle or simple_bundle in simple_player
+
 
 @dataclass
 class BundleRoomTemplate:
@@ -19,25 +38,40 @@ class BundleRoomTemplate:
     bundles: List[BundleTemplate]
     number_bundles: int
 
-    def create_bundle_room(self, random: Random, content: StardewContent, options: StardewValleyOptions):
+    def create_bundle_room(self, random: Random, content: StardewContent, options: StardewValleyOptions, player_name: str = "", is_entire_cc: bool = False):
         filtered_bundles = [bundle for bundle in self.bundles if bundle.can_appear(options)]
 
-        priority_bundles = []
+        whitelist_bundles = []
         unpriority_bundles = []
+        blacklist_bundles = []
         for bundle in filtered_bundles:
-            if bundle.name in options.bundle_plando:
-                priority_bundles.append(bundle)
-            else:
+            if options.bundle_whitelist.prioritizes(bundle.name) or is_bundle_related_to_player(bundle, player_name):
+                whitelist_bundles.append(bundle)
+            elif options.bundle_blacklist.allows(bundle.name):
                 unpriority_bundles.append(bundle)
-
-        if self.number_bundles <= len(priority_bundles):
-            chosen_bundles = random.sample(priority_bundles, self.number_bundles)
-        else:
-            chosen_bundles = priority_bundles
-            num_remaining_bundles = self.number_bundles - len(priority_bundles)
-            if num_remaining_bundles > len(unpriority_bundles):
-                chosen_bundles.extend(random.choices(unpriority_bundles, k=num_remaining_bundles))
             else:
+                blacklist_bundles.append(bundle)
+
+        modifier = options.bundle_per_room.value
+        if is_entire_cc:
+            modifier *= 6
+        number_bundles = self.number_bundles + modifier
+        bundles_cap = max(len(filtered_bundles), self.number_bundles)
+        number_bundles = max(1, min(bundles_cap, number_bundles))
+        if number_bundles < len(whitelist_bundles):
+            chosen_bundles = random.sample(whitelist_bundles, number_bundles)
+        else:
+            chosen_bundles = whitelist_bundles
+            num_remaining_bundles = number_bundles - len(whitelist_bundles)
+            if num_remaining_bundles < len(unpriority_bundles):
                 chosen_bundles.extend(random.sample(unpriority_bundles, num_remaining_bundles))
+            else:
+                chosen_bundles.extend(unpriority_bundles)
+                num_remaining_bundles = num_remaining_bundles - len(unpriority_bundles)
+                if num_remaining_bundles > 0:
+                    if self.name == CCRoom.raccoon_requests:
+                        chosen_bundles.extend(random.choices(unpriority_bundles, k=num_remaining_bundles))
+                    else:
+                        chosen_bundles.extend(random.sample(blacklist_bundles, num_remaining_bundles))
 
         return BundleRoom(self.name, [bundle.create_bundle(random, content, options) for bundle in chosen_bundles])
diff --git a/worlds/stardew_valley/bundles/bundles.py b/worlds/stardew_valley/bundles/bundles.py
index 99619e09aa..1c3d8dd014 100644
--- a/worlds/stardew_valley/bundles/bundles.py
+++ b/worlds/stardew_valley/bundles/bundles.py
@@ -1,19 +1,26 @@
 from random import Random
-from typing import List, Tuple
+from typing import List, Tuple, Dict
 
 from .bundle import Bundle
 from .bundle_room import BundleRoom, BundleRoomTemplate
 from ..content import StardewContent
-from ..data.bundle_data import pantry_vanilla, crafts_room_vanilla, fish_tank_vanilla, boiler_room_vanilla, bulletin_board_vanilla, vault_vanilla, \
-    pantry_thematic, crafts_room_thematic, fish_tank_thematic, boiler_room_thematic, bulletin_board_thematic, vault_thematic, pantry_remixed, \
-    crafts_room_remixed, fish_tank_remixed, boiler_room_remixed, bulletin_board_remixed, vault_remixed, all_bundle_items_except_money, \
-    abandoned_joja_mart_thematic, abandoned_joja_mart_vanilla, abandoned_joja_mart_remixed, raccoon_vanilla, raccoon_thematic, raccoon_remixed, \
-    community_center_remixed_anywhere
+from ..data.bundles_data.bundle_data import pantry_remixed, \
+    crafts_room_remixed, fish_tank_remixed, boiler_room_remixed, bulletin_board_remixed, vault_remixed, \
+    all_bundle_items_except_money, \
+    abandoned_joja_mart_remixed, giant_stump_remixed
+from ..data.bundles_data.bundle_set import vanilla_bundles, remixed_bundles, thematic_bundles
+from ..data.bundles_data.meme_bundles import community_center_meme_bundles, pantry_meme, crafts_room_meme, \
+    fish_tank_meme, bulletin_board_meme, \
+    boiler_room_meme, vault_meme
+from ..data.bundles_data.remixed_anywhere_bundles import community_center_remixed_anywhere
+from ..data.game_item import ItemTag
+from ..data.recipe_data import all_cooking_recipes
 from ..logic.logic import StardewLogic
 from ..options import BundleRandomization, StardewValleyOptions
+from ..strings.bundle_names import CCRoom
 
 
-def get_all_bundles(random: Random, logic: StardewLogic, content: StardewContent, options: StardewValleyOptions) -> List[BundleRoom]:
+def get_all_bundles(random: Random, logic: StardewLogic, content: StardewContent, options: StardewValleyOptions, player_name: str) -> List[BundleRoom]:
     if options.bundle_randomization == BundleRandomization.option_vanilla:
         return get_vanilla_bundles(random, content, options)
     elif options.bundle_randomization == BundleRandomization.option_thematic:
@@ -24,72 +31,76 @@ def get_all_bundles(random: Random, logic: StardewLogic, content: StardewContent
         return get_remixed_bundles_anywhere(random, content, options)
     elif options.bundle_randomization == BundleRandomization.option_shuffled:
         return get_shuffled_bundles(random, logic, content, options)
+    elif options.bundle_randomization == BundleRandomization.option_meme:
+        return get_meme_bundles(random, content, options, player_name)
 
     raise NotImplementedError
 
 
 def get_vanilla_bundles(random: Random, content: StardewContent, options: StardewValleyOptions) -> List[BundleRoom]:
-    pantry = pantry_vanilla.create_bundle_room(random, content, options)
-    crafts_room = crafts_room_vanilla.create_bundle_room(random, content, options)
-    fish_tank = fish_tank_vanilla.create_bundle_room(random, content, options)
-    boiler_room = boiler_room_vanilla.create_bundle_room(random, content, options)
-    bulletin_board = bulletin_board_vanilla.create_bundle_room(random, content, options)
-    vault = vault_vanilla.create_bundle_room(random, content, options)
-    abandoned_joja_mart = abandoned_joja_mart_vanilla.create_bundle_room(random, content, options)
-    raccoon = raccoon_vanilla.create_bundle_room(random, content, options)
-    fix_raccoon_bundle_names(raccoon)
-    return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart, raccoon]
+    generated_bundle_rooms = {room_name: vanilla_bundles.bundles_by_room[room_name].create_bundle_room(random, content, options) for room_name in
+                              vanilla_bundles.bundles_by_room}
+    fix_raccoon_bundle_names(generated_bundle_rooms[CCRoom.raccoon_requests])
+    return list(generated_bundle_rooms.values())
 
 
 def get_thematic_bundles(random: Random, content: StardewContent, options: StardewValleyOptions) -> List[BundleRoom]:
-    pantry = pantry_thematic.create_bundle_room(random, content, options)
-    crafts_room = crafts_room_thematic.create_bundle_room(random, content, options)
-    fish_tank = fish_tank_thematic.create_bundle_room(random, content, options)
-    boiler_room = boiler_room_thematic.create_bundle_room(random, content, options)
-    bulletin_board = bulletin_board_thematic.create_bundle_room(random, content, options)
-    vault = vault_thematic.create_bundle_room(random, content, options)
-    abandoned_joja_mart = abandoned_joja_mart_thematic.create_bundle_room(random, content, options)
-    raccoon = raccoon_thematic.create_bundle_room(random, content, options)
-    fix_raccoon_bundle_names(raccoon)
-    return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart, raccoon]
+    generated_bundle_rooms = {room_name: thematic_bundles.bundles_by_room[room_name].create_bundle_room(random, content, options) for room_name in
+                              thematic_bundles.bundles_by_room}
+    fix_raccoon_bundle_names(generated_bundle_rooms[CCRoom.raccoon_requests])
+    return list(generated_bundle_rooms.values())
 
 
 def get_remixed_bundles(random: Random, content: StardewContent, options: StardewValleyOptions) -> List[BundleRoom]:
-    pantry = pantry_remixed.create_bundle_room(random, content, options)
-    crafts_room = crafts_room_remixed.create_bundle_room(random, content, options)
-    fish_tank = fish_tank_remixed.create_bundle_room(random, content, options)
-    boiler_room = boiler_room_remixed.create_bundle_room(random, content, options)
-    bulletin_board = bulletin_board_remixed.create_bundle_room(random, content, options)
-    vault = vault_remixed.create_bundle_room(random, content, options)
-    abandoned_joja_mart = abandoned_joja_mart_remixed.create_bundle_room(random, content, options)
-    raccoon = raccoon_remixed.create_bundle_room(random, content, options)
-    fix_raccoon_bundle_names(raccoon)
-    return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart, raccoon]
+    generated_bundle_rooms = {room_name: remixed_bundles.bundles_by_room[room_name].create_bundle_room(random, content, options) for room_name in
+                              remixed_bundles.bundles_by_room}
+    fix_raccoon_bundle_names(generated_bundle_rooms[CCRoom.raccoon_requests])
+    return list(generated_bundle_rooms.values())
 
 
 def get_remixed_bundles_anywhere(random: Random, content: StardewContent, options: StardewValleyOptions) -> List[BundleRoom]:
-    big_room = community_center_remixed_anywhere.create_bundle_room(random, content, options)
+    big_room = community_center_remixed_anywhere.create_bundle_room(random, content, options, is_entire_cc=True)
     all_chosen_bundles = big_room.bundles
     random.shuffle(all_chosen_bundles)
 
     end_index = 0
 
-    pantry, end_index = create_room_from_bundles(pantry_remixed, all_chosen_bundles, end_index)
-    crafts_room, end_index = create_room_from_bundles(crafts_room_remixed, all_chosen_bundles, end_index)
-    fish_tank, end_index = create_room_from_bundles(fish_tank_remixed, all_chosen_bundles, end_index)
-    boiler_room, end_index = create_room_from_bundles(boiler_room_remixed, all_chosen_bundles, end_index)
-    bulletin_board, end_index = create_room_from_bundles(bulletin_board_remixed, all_chosen_bundles, end_index)
+    pantry, end_index = create_room_from_bundles(pantry_remixed, all_chosen_bundles, options, end_index)
+    crafts_room, end_index = create_room_from_bundles(crafts_room_remixed, all_chosen_bundles, options, end_index)
+    fish_tank, end_index = create_room_from_bundles(fish_tank_remixed, all_chosen_bundles, options, end_index)
+    boiler_room, end_index = create_room_from_bundles(boiler_room_remixed, all_chosen_bundles, options, end_index)
+    bulletin_board, end_index = create_room_from_bundles(bulletin_board_remixed, all_chosen_bundles, options, end_index)
+    vault, end_index = create_room_from_bundles(vault_remixed, all_chosen_bundles, options, end_index)
 
-    vault = vault_remixed.create_bundle_room(random, content, options)
     abandoned_joja_mart = abandoned_joja_mart_remixed.create_bundle_room(random, content, options)
-    raccoon = raccoon_remixed.create_bundle_room(random, content, options)
+    raccoon = giant_stump_remixed.create_bundle_room(random, content, options)
     fix_raccoon_bundle_names(raccoon)
     return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart, raccoon]
 
 
-def create_room_from_bundles(template: BundleRoomTemplate, all_bundles: List[Bundle], end_index: int) -> Tuple[BundleRoom, int]:
+def get_meme_bundles(random: Random, content: StardewContent, options: StardewValleyOptions, player_name: str) -> List[BundleRoom]:
+    big_room = community_center_meme_bundles.create_bundle_room(random, content, options, player_name, is_entire_cc=True)
+    all_chosen_bundles = big_room.bundles
+    random.shuffle(all_chosen_bundles)
+
+    end_index = 0
+
+    pantry, end_index = create_room_from_bundles(pantry_meme, all_chosen_bundles, options, end_index)
+    crafts_room, end_index = create_room_from_bundles(crafts_room_meme, all_chosen_bundles, options, end_index)
+    fish_tank, end_index = create_room_from_bundles(fish_tank_meme, all_chosen_bundles, options, end_index)
+    boiler_room, end_index = create_room_from_bundles(boiler_room_meme, all_chosen_bundles, options, end_index)
+    bulletin_board, end_index = create_room_from_bundles(bulletin_board_meme, all_chosen_bundles, options, end_index)
+    vault, end_index = create_room_from_bundles(vault_meme, all_chosen_bundles, options, end_index)
+
+    abandoned_joja_mart = abandoned_joja_mart_remixed.create_bundle_room(random, content, options)
+    raccoon = giant_stump_remixed.create_bundle_room(random, content, options)
+    fix_raccoon_bundle_names(raccoon)
+    return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart, raccoon]
+
+
+def create_room_from_bundles(template: BundleRoomTemplate, all_bundles: List[Bundle], options: StardewValleyOptions, end_index: int) -> Tuple[BundleRoom, int]:
     start_index = end_index
-    end_index += template.number_bundles
+    end_index += template.number_bundles + options.bundle_per_room.value
     return BundleRoom(template.name, all_bundles[start_index:end_index]), end_index
 
 
@@ -122,3 +133,31 @@ def fix_raccoon_bundle_names(raccoon):
     for i in range(len(raccoon.bundles)):
         raccoon_bundle = raccoon.bundles[i]
         raccoon_bundle.name = f"Raccoon Request {i + 1}"
+
+
+def get_trash_bear_requests(random: Random, content: StardewContent, options: StardewValleyOptions) -> Dict[str, List[str]]:
+    trash_bear_requests = dict()
+    num_per_type = 2
+    if options.bundle_price < 0:
+        num_per_type = 1
+    elif options.bundle_price > 0:
+        num_per_type = min(4, num_per_type + options.bundle_price)
+
+    trash_bear_requests["Foraging"] = pick_trash_bear_items(ItemTag.FORAGE, content, num_per_type, random)
+    if options.bundle_per_room >= 0:
+        # Cooking items are not in content packs yet. This can be simplified once they are
+        # trash_bear_requests["Cooking"] = pick_trash_bear_items(ItemTag.COOKING, content, num_per_type, random)
+        trash_bear_requests["Cooking"] = random.sample(
+            [recipe.meal for recipe in all_cooking_recipes if not recipe.content_pack or content.is_enabled(recipe.content_pack)], num_per_type)
+    if options.bundle_per_room >= 1:
+        trash_bear_requests["Farming"] = pick_trash_bear_items(ItemTag.CROPSANITY, content, num_per_type, random)
+    if options.bundle_per_room >= 2:
+        # Fish items are not tagged properly in content packs yet. This can be simplified once they are
+        # trash_bear_requests["Fishing"] = pick_trash_bear_items(ItemTag.FISH, content, num_per_type, random)
+        trash_bear_requests["Fishing"] = random.sample([fish for fish in content.fishes], num_per_type)
+    return trash_bear_requests
+
+
+def pick_trash_bear_items(item_tag: ItemTag, content: StardewContent, number_items: int, random: Random):
+    forage_items = [item.name for item in content.find_tagged_items(item_tag)]
+    return random.sample(forage_items, number_items)
diff --git a/worlds/stardew_valley/client.py b/worlds/stardew_valley/client.py
new file mode 100644
index 0000000000..f4a581fd4d
--- /dev/null
+++ b/worlds/stardew_valley/client.py
@@ -0,0 +1,284 @@
+from __future__ import annotations
+
+import asyncio
+import re
+# webserver imports
+import urllib.parse
+from collections.abc import Iterable
+
+import Utils
+from BaseClasses import CollectionState, Location
+from CommonClient import logger, get_base_parser, gui_enabled, server_loop
+from MultiServer import mark_raw
+from NetUtils import JSONMessagePart
+from kvui import CommandPromptTextInput
+from . import StardewValleyWorld
+from .logic.logic import StardewLogic
+from .stardew_rule.rule_explain import explain, ExplainMode, RuleExplanation
+
+try:
+    from worlds.tracker.TrackerClient import TrackerGameContext, TrackerCommandProcessor as ClientCommandProcessor, UT_VERSION  # noqa
+    from worlds.tracker.TrackerCore import TrackerCore
+
+    tracker_loaded = True
+except ImportError as e:
+    logger.error(e)
+    from CommonClient import CommonContext, ClientCommandProcessor
+
+    TrackerCore = object
+
+
+    class TrackerGameContextMixin:
+        """Expecting the TrackerGameContext to have these methods."""
+        tracker_core: TrackerCore
+
+        def make_gui(self, manager):
+            ...
+
+        def run_generator(self):
+            ...
+
+
+    class TrackerGameContext(CommonContext, TrackerGameContextMixin):
+        pass
+
+
+    tracker_loaded = False
+    UT_VERSION = "Not found"
+
+
+class StardewCommandProcessor(ClientCommandProcessor):
+    ctx: StardewClientContext
+
+    @mark_raw
+    def _cmd_explain(self, location: str = ""):
+        """Explain the logic behind a location."""
+        logic = self.ctx.logic
+        if logic is None:
+            return
+
+        try:
+            rule = logic.region.can_reach_location(location)
+            expl = explain(rule, self.ctx.current_state, expected=None, mode=ExplainMode.CLIENT)
+        except KeyError:
+
+            result, usable, response = Utils.get_intended_text(location, [loc.name for loc in self.ctx.all_locations])
+            if usable:
+                rule = logic.region.can_reach_location(result)
+                expl = explain(rule, self.ctx.current_state, expected=None, mode=ExplainMode.CLIENT)
+            else:
+                self.ctx.ui.last_autofillable_command = "/explain"
+                self.output(response)
+                return
+
+        self.ctx.previous_explanation = expl
+        self.ctx.ui.print_json(parse_explanation(expl))
+
+    @mark_raw
+    def _cmd_explain_item(self, item: str = ""):
+        """Explain the logic behind a game item."""
+        logic = self.ctx.logic
+        if logic is None:
+            return
+
+        result, usable, response = Utils.get_intended_text(item, logic.registry.item_rules.keys())
+        if usable:
+            rule = logic.has(result)
+            expl = explain(rule, self.ctx.current_state, expected=None, mode=ExplainMode.CLIENT)
+        else:
+            self.ctx.ui.last_autofillable_command = "/explain_item"
+            self.output(response)
+            return
+
+        self.ctx.previous_explanation = expl
+        self.ctx.ui.print_json(parse_explanation(expl))
+
+    @mark_raw
+    def _cmd_explain_missing(self, location: str = ""):
+        """Explain what is missing for a location to be in logic. It explains the logic behind a location, while skipping the rules that are already satisfied."""
+        self.__explain("/explain_missing", location, expected=True)
+
+    @mark_raw
+    def _cmd_explain_how(self, location: str = ""):
+        """Explain how a location is in logic. It explains the logic behind the location, while skipping the rules that are not satisfied."""
+        self.__explain("/explain_how", location, expected=False)
+
+    def __explain(self, command: str, location: str, expected: bool | None = None):
+        logic = self.ctx.logic
+        if logic is None:
+            return
+
+        try:
+            rule = logic.region.can_reach_location(location)
+            expl = explain(rule, self.ctx.current_state, expected=expected, mode=ExplainMode.CLIENT)
+        except KeyError:
+
+            result, usable, response = Utils.get_intended_text(location, [loc.name for loc in self.ctx.all_locations])
+            if usable:
+                rule = logic.region.can_reach_location(result)
+                expl = explain(rule, self.ctx.current_state, expected=expected, mode=ExplainMode.CLIENT)
+            else:
+                self.ctx.ui.last_autofillable_command = command
+                self.output(response)
+                return
+
+        self.ctx.previous_explanation = expl
+        self.ctx.ui.print_json(parse_explanation(expl))
+
+    @mark_raw
+    def _cmd_more(self, index: str = ""):
+        """Will tell you what's missing to consider a location in logic."""
+        if self.ctx.previous_explanation is None:
+            self.output("No previous explanation found.")
+            return
+
+        try:
+            expl = self.ctx.previous_explanation.more(int(index))
+        except (ValueError, IndexError):
+            self.output("Which previous rule do you want to explained?")
+            self.ctx.ui.last_autofillable_command = "/more"
+            for i, rule in enumerate(self.ctx.previous_explanation.more_explanations):
+                # TODO handle autofillable commands
+                self.output(f"/more {i} -> {str(rule)})")
+            return
+
+        self.ctx.previous_explanation = expl
+        self.ctx.ui.print_json(parse_explanation(expl))
+
+    if not tracker_loaded:
+        del _cmd_explain
+        del _cmd_explain_missing
+
+
+class StardewClientContext(TrackerGameContext):
+    game = "Stardew Valley"
+    command_processor = StardewCommandProcessor
+    previous_explanation: RuleExplanation | None = None
+
+    def make_gui(self):
+        ui = super().make_gui()  # before the kivy imports so kvui gets loaded first
+
+        class StardewManager(ui):
+            base_title = f"Stardew Valley Tracker with UT {UT_VERSION} for AP version"  # core appends ap version so this works
+            ctx: StardewClientContext
+
+            def build(self):
+                container = super().build()
+                if not tracker_loaded:
+                    logger.info("To enable the tracker page, install Universal Tracker.")
+
+                # Until self.ctx.ui.last_autofillable_command allows for / commands, this is needed to remove the "!" before the /commands when using intended text autofill.
+                def on_text_remove_hardcoded_exclamation_mark_garbage(textinput: CommandPromptTextInput, text: str) -> None:
+                    if text.startswith("!/"):
+                        textinput.text = text[1:]
+
+                self.textinput.bind(text=on_text_remove_hardcoded_exclamation_mark_garbage)
+
+                return container
+
+        return StardewManager
+
+    @property
+    def logic(self) -> StardewLogic | None:
+        if self.tracker_core.get_current_world() is None:
+            logger.warning("Internal logic was not able to load, check your yamls and relaunch.")
+            return None
+
+        if self.game != "Stardew Valley":
+            logger.warning(f"Please connect to a slot with explainable logic (not {self.game}).")
+            return None
+
+        return self.tracker_core.get_current_world().logic
+
+    @property
+    def current_state(self) -> CollectionState:
+        return self.tracker_core.updateTracker().state
+
+    @property
+    def world(self) -> StardewValleyWorld:
+        return self.tracker_core.get_current_world()
+
+    @property
+    def all_locations(self) -> Iterable[Location]:
+        return self.tracker_core.multiworld.get_locations(self.tracker_core.player_id)
+
+
+def parse_explanation(explanation: RuleExplanation) -> list[JSONMessagePart]:
+    # Split the explanation in parts, by isolating all the delimiters, being \(, \), & , -> , | , \d+x , \[ , \] , \(\w+\), \n\s*
+    result_regex = r"(\(|\)| & | -> | \| |\d+x | \[|\](?: ->)?\s*| \(\w+\)|\n\s*)"
+    splits = re.split(result_regex, str(explanation).strip())
+
+    messages = []
+    for s in splits:
+        if len(s) == 0:
+            continue
+
+        if s == "True":
+            messages.append({"type": "color", "color": "green", "text": s})
+        elif s == "False":
+            messages.append({"type": "color", "color": "salmon", "text": s})
+        elif s.startswith("Reach Location "):
+            messages.append({"type": "text", "text": "Reach Location "})
+            messages.append({"type": "location_name", "text": s[15:]})
+        elif s.startswith("Reach Entrance "):
+            messages.append({"type": "text", "text": "Reach Entrance "})
+            messages.append({"type": "entrance_name", "text": s[15:]})
+        elif s.startswith("Reach Region "):
+            messages.append({"type": "text", "text": "Reach Region "})
+            messages.append({"type": "color", "color": "yellow", "text": s[13:]})
+        elif s.startswith("Received event "):
+            messages.append({"type": "text", "text": "Received event "})
+            messages.append({"type": "item_name", "text": s[15:]})
+        elif s.startswith("Received "):
+            messages.append({"type": "text", "text": "Received "})
+            messages.append({"type": "item_name", "flags": 0b001, "text": s[9:]})
+        elif s.startswith("Has "):
+            if s[4].isdigit():
+                messages.append({"type": "text", "text": "Has "})
+                digit_end = re.search(r"\D", s[4:])
+                digit = s[4:4 + digit_end.start()]
+                messages.append({"type": "color", "color": "cyan", "text": digit})
+                messages.append({"type": "text", "text": s[4 + digit_end.start():]})
+
+            else:
+                messages.append({"text": s, "type": "text"})
+        else:
+            messages.append({"text": s, "type": "text"})
+
+    return messages
+
+
+async def main(args):
+    ctx = StardewClientContext(args.connect, args.password)
+
+    ctx.auth = args.name
+    ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+
+    if tracker_loaded:
+        ctx.run_generator()
+    else:
+        logger.warning("Could not find Universal Tracker.")
+
+    if gui_enabled:
+        ctx.run_gui()
+    ctx.run_cli()
+
+    await ctx.exit_event.wait()
+    await ctx.shutdown()
+
+
+def launch(*args):
+    parser = get_base_parser(description="Gameless Archipelago Client, for text interfacing.")
+    parser.add_argument('--name', default=None, help="Slot Name to connect as.")
+    parser.add_argument("url", nargs="?", help="Archipelago connection url")
+    args = parser.parse_args(args)
+
+    if args.url:
+        url = urllib.parse.urlparse(args.url)
+        args.connect = url.netloc
+        if url.username:
+            args.name = urllib.parse.unquote(url.username)
+        if url.password:
+            args.password = urllib.parse.unquote(url.password)
+
+    asyncio.run(main(args))
diff --git a/worlds/stardew_valley/content/__init__.py b/worlds/stardew_valley/content/__init__.py
index 5f7d4a5fc5..de4c2c075a 100644
--- a/worlds/stardew_valley/content/__init__.py
+++ b/worlds/stardew_valley/content/__init__.py
@@ -1,8 +1,9 @@
 from . import content_packs
-from .feature import cropsanity, friendsanity, fishsanity, booksanity, building_progression, skill_progression, tool_progression
+from .feature import cropsanity, friendsanity, fishsanity, booksanity, building_progression, skill_progression, tool_progression, hatsanity, museumsanity
 from .game_content import ContentPack, StardewContent, StardewFeatures
 from .unpacking import unpack_content
 from .. import options
+from ..strings.ap_names.ap_option_names import StartWithoutOptionName
 from ..strings.building_names import Building
 
 
@@ -34,8 +35,10 @@ def choose_features(player_options: options.StardewValleyOptions) -> StardewFeat
         choose_cropsanity(player_options.cropsanity),
         choose_fishsanity(player_options.fishsanity),
         choose_friendsanity(player_options.friendsanity, player_options.friendsanity_heart_size),
+        choose_hatsanity(player_options.hatsanity),
+        choose_museumsanity(player_options.museumsanity),
         choose_skill_progression(player_options.skill_progression),
-        choose_tool_progression(player_options.tool_progression, player_options.skill_progression),
+        choose_tool_progression(player_options.tool_progression, player_options.skill_progression, player_options.start_without),
     )
 
 
@@ -56,6 +59,33 @@ def choose_booksanity(booksanity_option: options.Booksanity) -> booksanity.Books
     return booksanity_feature
 
 
+def choose_building_progression(building_option: options.BuildingProgression,
+                                farm_type_option: options.FarmType) -> building_progression.BuildingProgressionFeature:
+    starting_buildings = {Building.farm_house, Building.pet_bowl, Building.shipping_bin}
+
+    if farm_type_option == options.FarmType.option_meadowlands:
+        starting_buildings.add(Building.coop)
+
+    if (building_option == options.BuildingProgression.option_vanilla
+            or building_option == options.BuildingProgression.option_vanilla_cheap
+            or building_option == options.BuildingProgression.option_vanilla_very_cheap):
+        return building_progression.BuildingProgressionVanilla(
+            starting_buildings=starting_buildings,
+        )
+
+    starting_buildings.remove(Building.shipping_bin)
+    starting_buildings.remove(Building.pet_bowl)
+
+    if (building_option == options.BuildingProgression.option_progressive
+            or building_option == options.BuildingProgression.option_progressive_cheap
+            or building_option == options.BuildingProgression.option_progressive_very_cheap):
+        return building_progression.BuildingProgressionProgressive(
+            starting_buildings=starting_buildings,
+        )
+
+    raise ValueError(f"No building progression feature mapped to {str(building_option.value)}")
+
+
 cropsanity_by_option = {
     options.Cropsanity.option_disabled: cropsanity.CropsanityDisabled(),
     options.Cropsanity.option_enabled: cropsanity.CropsanityEnabled(),
@@ -111,30 +141,27 @@ def choose_friendsanity(friendsanity_option: options.Friendsanity, heart_size: o
     raise ValueError(f"No friendsanity feature mapped to {str(friendsanity_option.value)}")
 
 
-def choose_building_progression(building_option: options.BuildingProgression,
-                                farm_type_option: options.FarmType) -> building_progression.BuildingProgressionFeature:
-    starting_buildings = {Building.farm_house, Building.pet_bowl, Building.shipping_bin}
+def choose_hatsanity(hat_option: options.Hatsanity) -> hatsanity.HatsanityFeature:
+    if hat_option == options.Hatsanity.preset_none:
+        return hatsanity.HatsanityNone()
 
-    if farm_type_option == options.FarmType.option_meadowlands:
-        starting_buildings.add(Building.coop)
+    return hatsanity.HatsanityHats(enabled_hats=frozenset(hat_option.value))
 
-    if (building_option == options.BuildingProgression.option_vanilla
-            or building_option == options.BuildingProgression.option_vanilla_cheap
-            or building_option == options.BuildingProgression.option_vanilla_very_cheap):
-        return building_progression.BuildingProgressionVanilla(
-            starting_buildings=starting_buildings,
-        )
 
-    starting_buildings.remove(Building.shipping_bin)
+def choose_museumsanity(museumsanity_option: options.Museumsanity) -> museumsanity.MuseumsanityFeature:
+    if museumsanity_option == options.Museumsanity.option_none:
+        return museumsanity.MuseumsanityNone()
 
-    if (building_option == options.BuildingProgression.option_progressive
-            or building_option == options.BuildingProgression.option_progressive_cheap
-            or building_option == options.BuildingProgression.option_progressive_very_cheap):
-        return building_progression.BuildingProgressionProgressive(
-            starting_buildings=starting_buildings,
-        )
+    if museumsanity_option == options.Museumsanity.option_milestones:
+        return museumsanity.MuseumsanityMilestones()
 
-    raise ValueError(f"No building progression feature mapped to {str(building_option.value)}")
+    if museumsanity_option == options.Museumsanity.option_randomized:
+        return museumsanity.MuseumsanityRandomized()
+
+    if museumsanity_option == options.Museumsanity.option_all:
+        return museumsanity.MuseumsanityAll()
+
+    raise ValueError(f"No museumsanity feature mapped to {str(museumsanity_option.value)}")
 
 
 skill_progression_by_option = {
@@ -153,16 +180,17 @@ def choose_skill_progression(skill_progression_option: options.SkillProgression)
     return skill_progression_feature
 
 
-def choose_tool_progression(tool_option: options.ToolProgression, skill_option: options.SkillProgression) -> tool_progression.ToolProgressionFeature:
+def choose_tool_progression(tool_option: options.ToolProgression, skill_option: options.SkillProgression, start_without_option: options.StartWithout) -> tool_progression.ToolProgressionFeature:
     if tool_option.is_vanilla:
         return tool_progression.ToolProgressionVanilla()
 
-    tools_distribution = tool_progression.get_tools_distribution(
-        progressive_tools_enabled=True,
-        skill_masteries_enabled=skill_option == options.SkillProgression.option_progressive_with_masteries,
-    )
-
     if tool_option.is_progressive:
-        return tool_progression.ToolProgressionProgressive(tools_distribution)
+        starting_tools, tools_distribution = tool_progression.get_tools_distribution(
+            progressive_tools_enabled=True,
+            skill_masteries_enabled=skill_option == options.SkillProgression.option_progressive_with_masteries,
+            no_starting_tools_enabled=bool(StartWithoutOptionName.tools in start_without_option),
+        )
+
+        return tool_progression.ToolProgressionProgressive(starting_tools, tools_distribution)
 
     raise ValueError(f"No tool progression feature mapped to {str(tool_option.value)}")
diff --git a/worlds/stardew_valley/content/content_packs.py b/worlds/stardew_valley/content/content_packs.py
index fb8df8c70c..8358f1b7cf 100644
--- a/worlds/stardew_valley/content/content_packs.py
+++ b/worlds/stardew_valley/content/content_packs.py
@@ -11,14 +11,6 @@ from .vanilla.the_desert import the_desert
 from .vanilla.the_farm import the_farm
 from .vanilla.the_mines import the_mines
 
-assert base_game
-assert ginger_island_content_pack
-assert pelican_town
-assert qi_board_content_pack
-assert the_desert
-assert the_farm
-assert the_mines
-
 # Dynamically register everything currently in the mods folder. This would ideally be done through a metaclass, but I have not looked into that yet.
 mod_modules = pkgutil.iter_modules(mods.__path__)
 
@@ -28,4 +20,13 @@ for mod_module in mod_modules:
     module = importlib.import_module("." + module_name, mods.__name__)
     loaded_modules[module_name] = module
 
-assert by_mod
+vanilla_content_pack_names = frozenset({
+    base_game.name,
+    ginger_island_content_pack.name,
+    pelican_town.name,
+    qi_board_content_pack.name,
+    the_desert.name,
+    the_farm.name,
+    the_mines.name
+})
+all_content_pack_names = vanilla_content_pack_names | frozenset(by_mod.keys())
diff --git a/worlds/stardew_valley/content/feature/__init__.py b/worlds/stardew_valley/content/feature/__init__.py
index b2a88286c6..d9e09171ed 100644
--- a/worlds/stardew_valley/content/feature/__init__.py
+++ b/worlds/stardew_valley/content/feature/__init__.py
@@ -1,7 +1,31 @@
-from . import booksanity
-from . import building_progression
-from . import cropsanity
-from . import fishsanity
-from . import friendsanity
-from . import skill_progression
-from . import tool_progression
+from . import booksanity, building_progression, cropsanity, fishsanity, friendsanity, hatsanity, museumsanity, skill_progression, tool_progression
+from .booksanity import BooksanityFeature
+from .building_progression import BuildingProgressionFeature
+from .cropsanity import CropsanityFeature
+from .fishsanity import FishsanityFeature
+from .friendsanity import FriendsanityFeature
+from .hatsanity import HatsanityFeature
+from .museumsanity import MuseumsanityFeature
+from .skill_progression import SkillProgressionFeature
+from .tool_progression import ToolProgressionFeature
+
+__exports__ = [
+    "booksanity",
+    "BooksanityFeature",
+    "building_progression",
+    "BuildingProgressionFeature",
+    "cropsanity",
+    "CropsanityFeature",
+    "fishsanity",
+    "FishsanityFeature",
+    "friendsanity",
+    "FriendsanityFeature",
+    "hatsanity",
+    "HatsanityFeature",
+    "museumsanity",
+    "MuseumsanityFeature",
+    "skill_progression",
+    "SkillProgressionFeature",
+    "tool_progression"
+    "ToolProgressionFeature",
+]
diff --git a/worlds/stardew_valley/content/feature/base.py b/worlds/stardew_valley/content/feature/base.py
new file mode 100644
index 0000000000..4adc944c04
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/base.py
@@ -0,0 +1,71 @@
+import inspect
+from abc import ABC
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Protocol
+
+from ...data.game_item import Source, Requirement
+
+if TYPE_CHECKING:
+    from ... import StardewContent
+
+
+class DisableSourceHook(Protocol):
+    def __call__(self, source: Source, /, *, content: "StardewContent") -> bool:
+        """Return True if the source should be disabled by this feature."""
+        ...
+
+
+class DisableRequirementHook(Protocol):
+    def __call__(self, requirement: Requirement, /, *, content: "StardewContent") -> bool:
+        """Return True if the requirement should be disabled by this feature."""
+        ...
+
+
+def wrap_optional_content_arg(hook):
+    """Wraps a hook to ensure it has the correct signature."""
+    if "content" in hook.__annotations__:
+        return hook
+
+    def wrapper(*args, content: "StardewContent", **kwargs):
+        return hook(*args, **kwargs)
+
+    return wrapper
+
+
+class FeatureBase(ABC):
+
+    @property
+    def disable_source_hooks(self) -> Mapping[type[Source], DisableSourceHook]:
+        """All hooks to call when a source is created to check if it has to be disabled by this feature."""
+        disable_source_hooks = {}
+        for attribute_name in dir(self):
+            if not attribute_name.startswith("_disable_") or not callable((attribute := getattr(self, attribute_name))):
+                continue
+
+            sig = inspect.signature(attribute)
+
+            source_param = sig.parameters.get("source")
+            if source_param is not None:
+                source_type = source_param.annotation
+                disable_source_hooks[source_type] = wrap_optional_content_arg(attribute)
+                continue
+
+        return disable_source_hooks
+
+    @property
+    def disable_requirement_hooks(self) -> Mapping[type[Requirement], DisableRequirementHook]:
+        """All hooks to call when a requirement is created to check if it has to be disabled by this feature."""
+        disable_requirement_hooks = {}
+        for attribute_name in dir(self):
+            if not attribute_name.startswith("_disable_") or not callable((attribute := getattr(self, attribute_name))):
+                continue
+
+            sig = inspect.signature(attribute)
+
+            requirement_param = sig.parameters.get("requirement")
+            if requirement_param is not None:
+                requirement_type = requirement_param.annotation
+                disable_requirement_hooks[requirement_type] = wrap_optional_content_arg(attribute)
+                continue
+
+        return disable_requirement_hooks
diff --git a/worlds/stardew_valley/content/feature/booksanity.py b/worlds/stardew_valley/content/feature/booksanity.py
index 5eade59325..b5e7319432 100644
--- a/worlds/stardew_valley/content/feature/booksanity.py
+++ b/worlds/stardew_valley/content/feature/booksanity.py
@@ -1,6 +1,8 @@
 from abc import ABC, abstractmethod
-from typing import ClassVar, Optional, Iterable
+from collections.abc import Iterable
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...data.game_item import GameItem, ItemTag
 from ...strings.book_names import ordered_lost_books
 
@@ -16,14 +18,14 @@ def to_location_name(book: str) -> str:
     return location_prefix + book
 
 
-def extract_book_from_location_name(location_name: str) -> Optional[str]:
+def extract_book_from_location_name(location_name: str) -> str | None:
     if not location_name.startswith(location_prefix):
         return None
 
     return location_name[len(location_prefix):]
 
 
-class BooksanityFeature(ABC):
+class BooksanityFeature(FeatureBase, ABC):
     is_enabled: ClassVar[bool]
 
     to_item_name = staticmethod(to_item_name)
diff --git a/worlds/stardew_valley/content/feature/building_progression.py b/worlds/stardew_valley/content/feature/building_progression.py
index 0d317aa018..43202cd6df 100644
--- a/worlds/stardew_valley/content/feature/building_progression.py
+++ b/worlds/stardew_valley/content/feature/building_progression.py
@@ -1,7 +1,8 @@
 from abc import ABC
 from dataclasses import dataclass
-from typing import ClassVar, Set, Tuple
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...strings.building_names import Building
 
 progressive_house = "Progressive House"
@@ -15,7 +16,7 @@ progressive_house_by_upgrade_name = {
 }
 
 
-def to_progressive_item(building: str) -> Tuple[str, int]:
+def to_progressive_item(building: str) -> tuple[str, int]:
     """Return the name of the progressive item and its quantity required to unlock the building.
     """
     if building in [Building.coop, Building.barn, Building.shed]:
@@ -35,9 +36,9 @@ def to_location_name(building: str) -> str:
 
 
 @dataclass(frozen=True)
-class BuildingProgressionFeature(ABC):
+class BuildingProgressionFeature(FeatureBase, ABC):
     is_progressive: ClassVar[bool]
-    starting_buildings: Set[str]
+    starting_buildings: set[str]
 
     to_progressive_item = staticmethod(to_progressive_item)
     progressive_house = progressive_house
diff --git a/worlds/stardew_valley/content/feature/cropsanity.py b/worlds/stardew_valley/content/feature/cropsanity.py
index 18ef370815..7ca8c7370c 100644
--- a/worlds/stardew_valley/content/feature/cropsanity.py
+++ b/worlds/stardew_valley/content/feature/cropsanity.py
@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import ClassVar, Optional
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...data.game_item import GameItem, ItemTag
 
 location_prefix = "Harvest "
@@ -10,14 +11,14 @@ def to_location_name(crop: str) -> str:
     return location_prefix + crop
 
 
-def extract_crop_from_location_name(location_name: str) -> Optional[str]:
+def extract_crop_from_location_name(location_name: str) -> str | None:
     if not location_name.startswith(location_prefix):
         return None
 
     return location_name[len(location_prefix):]
 
 
-class CropsanityFeature(ABC):
+class CropsanityFeature(FeatureBase, ABC):
     is_enabled: ClassVar[bool]
 
     to_location_name = staticmethod(to_location_name)
diff --git a/worlds/stardew_valley/content/feature/fishsanity.py b/worlds/stardew_valley/content/feature/fishsanity.py
index 02f9a632a8..6f8da513aa 100644
--- a/worlds/stardew_valley/content/feature/fishsanity.py
+++ b/worlds/stardew_valley/content/feature/fishsanity.py
@@ -1,7 +1,8 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import ClassVar, Optional
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...data.fish_data import FishItem
 from ...strings.fish_names import Fish
 
@@ -12,7 +13,7 @@ def to_location_name(fish: str) -> str:
     return location_prefix + fish
 
 
-def extract_fish_from_location_name(location_name: str) -> Optional[str]:
+def extract_fish_from_location_name(location_name: str) -> str | None:
     if not location_name.startswith(location_prefix):
         return None
 
@@ -20,7 +21,7 @@ def extract_fish_from_location_name(location_name: str) -> Optional[str]:
 
 
 @dataclass(frozen=True)
-class FishsanityFeature(ABC):
+class FishsanityFeature(FeatureBase, ABC):
     is_enabled: ClassVar[bool]
 
     randomization_ratio: float = 1
diff --git a/worlds/stardew_valley/content/feature/friendsanity.py b/worlds/stardew_valley/content/feature/friendsanity.py
index 3e1581b4e2..117c474c8a 100644
--- a/worlds/stardew_valley/content/feature/friendsanity.py
+++ b/worlds/stardew_valley/content/feature/friendsanity.py
@@ -1,8 +1,9 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from functools import lru_cache
-from typing import Optional, Tuple, ClassVar
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...data.villagers_data import Villager
 from ...strings.villager_names import NPC
 
@@ -21,14 +22,14 @@ def to_location_name(npc_name: str, heart: int) -> str:
 pet_heart_item_name = to_item_name(NPC.pet)
 
 
-def extract_npc_from_item_name(item_name: str) -> Optional[str]:
+def extract_npc_from_item_name(item_name: str) -> str | None:
     if not item_name.endswith(suffix):
         return None
 
     return item_name[:-len(suffix)]
 
 
-def extract_npc_from_location_name(location_name: str) -> Tuple[Optional[str], int]:
+def extract_npc_from_location_name(location_name: str) -> tuple[str | None, int]:
     if not location_name.endswith(suffix):
         return None, 0
 
@@ -38,12 +39,12 @@ def extract_npc_from_location_name(location_name: str) -> Tuple[Optional[str], i
 
 
 @lru_cache(maxsize=32)  # Should not go pass 32 values if every friendsanity options are in the multi world
-def get_heart_steps(max_heart: int, heart_size: int) -> Tuple[int, ...]:
+def get_heart_steps(max_heart: int, heart_size: int) -> tuple[int, ...]:
     return tuple(range(heart_size, max_heart + 1, heart_size)) + ((max_heart,) if max_heart % heart_size else ())
 
 
 @dataclass(frozen=True)
-class FriendsanityFeature(ABC):
+class FriendsanityFeature(FeatureBase, ABC):
     is_enabled: ClassVar[bool]
 
     heart_size: int
@@ -55,7 +56,7 @@ class FriendsanityFeature(ABC):
     extract_npc_from_location_name = staticmethod(extract_npc_from_location_name)
 
     @abstractmethod
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         ...
 
     @property
@@ -63,7 +64,7 @@ class FriendsanityFeature(ABC):
         return bool(self.get_pet_randomized_hearts())
 
     @abstractmethod
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         ...
 
 
@@ -73,10 +74,10 @@ class FriendsanityNone(FriendsanityFeature):
     def __init__(self):
         super().__init__(1)
 
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         return ()
 
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         return ()
 
 
@@ -84,13 +85,13 @@ class FriendsanityNone(FriendsanityFeature):
 class FriendsanityBachelors(FriendsanityFeature):
     is_enabled = True
 
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         if not villager.bachelor:
             return ()
 
         return get_heart_steps(8, self.heart_size)
 
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         return ()
 
 
@@ -98,7 +99,7 @@ class FriendsanityBachelors(FriendsanityFeature):
 class FriendsanityStartingNpc(FriendsanityFeature):
     is_enabled = True
 
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         if not villager.available:
             return ()
 
@@ -107,7 +108,7 @@ class FriendsanityStartingNpc(FriendsanityFeature):
 
         return get_heart_steps(10, self.heart_size)
 
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         return get_heart_steps(5, self.heart_size)
 
 
@@ -115,13 +116,13 @@ class FriendsanityStartingNpc(FriendsanityFeature):
 class FriendsanityAll(FriendsanityFeature):
     is_enabled = True
 
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         if villager.bachelor:
             return get_heart_steps(8, self.heart_size)
 
         return get_heart_steps(10, self.heart_size)
 
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         return get_heart_steps(5, self.heart_size)
 
 
@@ -129,11 +130,11 @@ class FriendsanityAll(FriendsanityFeature):
 class FriendsanityAllWithMarriage(FriendsanityFeature):
     is_enabled = True
 
-    def get_randomized_hearts(self, villager: Villager) -> Tuple[int, ...]:
+    def get_randomized_hearts(self, villager: Villager) -> tuple[int, ...]:
         if villager.bachelor:
             return get_heart_steps(14, self.heart_size)
 
         return get_heart_steps(10, self.heart_size)
 
-    def get_pet_randomized_hearts(self) -> Tuple[int, ...]:
+    def get_pet_randomized_hearts(self) -> tuple[int, ...]:
         return get_heart_steps(5, self.heart_size)
diff --git a/worlds/stardew_valley/content/feature/hatsanity.py b/worlds/stardew_valley/content/feature/hatsanity.py
new file mode 100644
index 0000000000..13dd41a9bb
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/hatsanity.py
@@ -0,0 +1,52 @@
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from typing import ClassVar
+
+from .base import FeatureBase
+from ...data.hats_data import HatItem
+
+wear_prefix = "Wear "
+
+
+def to_location_name(hat: str | HatItem) -> str:
+    if isinstance(hat, HatItem):
+        hat = hat.name
+    return f"{wear_prefix}{hat}"
+
+
+def extract_hat_from_location_name(location_name: str) -> str | None:
+    if not location_name.startswith(wear_prefix):
+        return None
+
+    return location_name[len(wear_prefix):]
+
+
+@dataclass(frozen=True)
+class HatsanityFeature(FeatureBase, ABC):
+    is_enabled: ClassVar[bool]
+
+    to_location_name = staticmethod(to_location_name)
+    extract_hat_from_location_name = staticmethod(extract_hat_from_location_name)
+
+    @abstractmethod
+    def is_included(self, hat: HatItem) -> bool:
+        ...
+
+
+class HatsanityNone(HatsanityFeature):
+    is_enabled = False
+
+    def is_included(self, hat: HatItem) -> bool:
+        return False
+
+
+@dataclass(frozen=True)
+class HatsanityHats(HatsanityFeature):
+    is_enabled = True
+    enabled_hats: frozenset[str]
+
+    def is_included(self, hat: HatItem) -> bool:
+        for difficulty in hat.difficulty:
+            if difficulty not in self.enabled_hats:
+                return False
+        return True
diff --git a/worlds/stardew_valley/content/feature/museumsanity.py b/worlds/stardew_valley/content/feature/museumsanity.py
new file mode 100644
index 0000000000..6cde0c6f36
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/museumsanity.py
@@ -0,0 +1,38 @@
+from abc import ABC
+from dataclasses import dataclass
+from typing import ClassVar
+
+from .base import FeatureBase
+from ...data.requirement import MuseumCompletionRequirement
+
+
+@dataclass(frozen=True)
+class MuseumsanityFeature(FeatureBase, ABC):
+    is_enabled: ClassVar[bool]
+
+
+class MuseumsanityNone(MuseumsanityFeature):
+    is_enabled = False
+
+    @staticmethod
+    def _disable_museum_completion_requirement(requirement: MuseumCompletionRequirement) -> bool:
+        return True
+
+
+@dataclass(frozen=True)
+class MuseumsanityMilestones(MuseumsanityFeature):
+    is_enabled = True
+
+
+@dataclass(frozen=True)
+class MuseumsanityRandomized(MuseumsanityFeature):
+    is_enabled = True
+    amount_of_randomized_donations: int = 40
+
+    def _disable_museum_completion_requirement(self, requirement: MuseumCompletionRequirement) -> bool:
+        return requirement.number_donated > self.amount_of_randomized_donations
+
+
+@dataclass(frozen=True)
+class MuseumsanityAll(MuseumsanityFeature):
+    is_enabled = True
diff --git a/worlds/stardew_valley/content/feature/skill_progression.py b/worlds/stardew_valley/content/feature/skill_progression.py
index 1325d4b35f..805728259f 100644
--- a/worlds/stardew_valley/content/feature/skill_progression.py
+++ b/worlds/stardew_valley/content/feature/skill_progression.py
@@ -1,15 +1,17 @@
 from abc import ABC, abstractmethod
-from typing import ClassVar, Iterable, Tuple
+from collections.abc import Iterable
+from typing import ClassVar
 
+from .base import FeatureBase
 from ...data.skill import Skill
 
 
-class SkillProgressionFeature(ABC):
+class SkillProgressionFeature(FeatureBase, ABC):
     is_progressive: ClassVar[bool]
     are_masteries_shuffled: ClassVar[bool]
 
     @abstractmethod
-    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[tuple[int, str]]:
         ...
 
     @abstractmethod
@@ -21,7 +23,7 @@ class SkillProgressionVanilla(SkillProgressionFeature):
     is_progressive = False
     are_masteries_shuffled = False
 
-    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[tuple[int, str]]:
         return ()
 
     def is_mastery_randomized(self, skill: Skill) -> bool:
@@ -32,7 +34,7 @@ class SkillProgressionProgressive(SkillProgressionFeature):
     is_progressive = True
     are_masteries_shuffled = False
 
-    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[tuple[int, str]]:
         return skill.level_names_by_level
 
     def is_mastery_randomized(self, skill: Skill) -> bool:
diff --git a/worlds/stardew_valley/content/feature/special_order_locations.py b/worlds/stardew_valley/content/feature/special_order_locations.py
new file mode 100644
index 0000000000..8dfe143fe2
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/special_order_locations.py
@@ -0,0 +1,5 @@
+def get_qi_gem_amount(item_name: str) -> int:
+    amount = item_name.replace(" Qi Gems", "")
+    if amount.isdigit():
+        return int(amount)
+    return 0
diff --git a/worlds/stardew_valley/content/feature/tool_progression.py b/worlds/stardew_valley/content/feature/tool_progression.py
index d5fe5cef99..fb15064a6e 100644
--- a/worlds/stardew_valley/content/feature/tool_progression.py
+++ b/worlds/stardew_valley/content/feature/tool_progression.py
@@ -6,14 +6,19 @@ from functools import cache
 from types import MappingProxyType
 from typing import ClassVar
 
+from .base import FeatureBase
 from ...strings.tool_names import Tool
 
 
-def to_progressive_item(tool: str) -> str:
+def to_progressive_item_name(tool: str) -> str:
     """Return the name of the progressive item."""
     return f"Progressive {tool}"
 
 
+def to_upgrade_location_name(tool: str, material: str) -> str:
+    return f"{material} {tool} Upgrade"
+
+
 # The golden scythe is always randomized
 VANILLA_TOOL_DISTRIBUTION = MappingProxyType({
     Tool.scythe: 1,
@@ -29,6 +34,17 @@ PROGRESSIVE_TOOL_DISTRIBUTION = MappingProxyType({
     Tool.fishing_rod: 4,
 })
 
+VANILLA_STARTING_TOOLS_DISTRIBUTION = MappingProxyType({
+    Tool.scythe: 1,
+    Tool.axe: 1,
+    Tool.hoe: 1,
+    Tool.pickaxe: 1,
+    Tool.pan: 0,
+    Tool.trash_can: 1,
+    Tool.watering_can: 1,
+    Tool.fishing_rod: 0,
+})
+
 # Masteries add another tier to the scythe and the fishing rod
 SKILL_MASTERIES_TOOL_DISTRIBUTION = MappingProxyType({
     Tool.scythe: 1,
@@ -37,8 +53,10 @@ SKILL_MASTERIES_TOOL_DISTRIBUTION = MappingProxyType({
 
 
 @cache
-def get_tools_distribution(progressive_tools_enabled: bool, skill_masteries_enabled: bool) -> Mapping[str, int]:
+def get_tools_distribution(progressive_tools_enabled: bool, skill_masteries_enabled: bool, no_starting_tools_enabled: bool) \
+        -> tuple[Mapping[str, int], Mapping[str, int]]:
     distribution = Counter(VANILLA_TOOL_DISTRIBUTION)
+    starting = Counter(VANILLA_STARTING_TOOLS_DISTRIBUTION)
 
     if progressive_tools_enabled:
         distribution += PROGRESSIVE_TOOL_DISTRIBUTION
@@ -46,21 +64,31 @@ def get_tools_distribution(progressive_tools_enabled: bool, skill_masteries_enab
     if skill_masteries_enabled:
         distribution += SKILL_MASTERIES_TOOL_DISTRIBUTION
 
-    return MappingProxyType(distribution)
+    if no_starting_tools_enabled:
+        distribution += VANILLA_STARTING_TOOLS_DISTRIBUTION
+        starting.clear()
+
+    return MappingProxyType(starting), MappingProxyType(distribution)
 
 
 @dataclass(frozen=True)
-class ToolProgressionFeature(ABC):
+class ToolProgressionFeature(FeatureBase, ABC):
     is_progressive: ClassVar[bool]
+    starting_tools: Mapping[str, int]
     tool_distribution: Mapping[str, int]
 
-    to_progressive_item = staticmethod(to_progressive_item)
+    to_progressive_item_name = staticmethod(to_progressive_item_name)
+    to_upgrade_location_name = staticmethod(to_upgrade_location_name)
+
+    def get_tools_distribution(self) -> tuple[Mapping[str, int], Mapping[str, int]]:
+        return self.starting_tools, self.tool_distribution
 
 
 @dataclass(frozen=True)
 class ToolProgressionVanilla(ToolProgressionFeature):
     is_progressive = False
     # FIXME change the default_factory to a simple default when python 3.11 is no longer supported
+    starting_tools: Mapping[str, int] = field(default_factory=lambda: VANILLA_STARTING_TOOLS_DISTRIBUTION)
     tool_distribution: Mapping[str, int] = field(default_factory=lambda: VANILLA_TOOL_DISTRIBUTION)
 
 
diff --git a/worlds/stardew_valley/content/feature/walnutsanity.py b/worlds/stardew_valley/content/feature/walnutsanity.py
new file mode 100644
index 0000000000..279d0a38bb
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/walnutsanity.py
@@ -0,0 +1,8 @@
+def get_walnut_amount(item_name: str) -> int:
+    if item_name == "Golden Walnut":
+        return 1
+    if item_name == "3 Golden Walnuts":
+        return 3
+    if item_name == "5 Golden Walnuts":
+        return 5
+    return 0
diff --git a/worlds/stardew_valley/content/game_content.py b/worlds/stardew_valley/content/game_content.py
index c3f8e9f8e9..11e26976be 100644
--- a/worlds/stardew_valley/content/game_content.py
+++ b/worlds/stardew_valley/content/game_content.py
@@ -1,13 +1,18 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Iterable, Set, Any, Mapping, Type, Tuple, Union
+from functools import cached_property
+from types import MappingProxyType
+from typing import Iterable, Set, Any, Mapping, Generator
 
-from .feature import booksanity, cropsanity, fishsanity, friendsanity, skill_progression, building_progression, tool_progression
+from .feature import BooksanityFeature, BuildingProgressionFeature, CropsanityFeature, FishsanityFeature, FriendsanityFeature, HatsanityFeature, \
+    MuseumsanityFeature, SkillProgressionFeature, ToolProgressionFeature
+from .feature.base import DisableSourceHook, DisableRequirementHook, FeatureBase
 from ..data.animal import Animal
 from ..data.building import Building
 from ..data.fish_data import FishItem
-from ..data.game_item import GameItem, Source, ItemTag
+from ..data.game_item import GameItem, Source, ItemTag, Requirement
+from ..data.hats_data import HatItem
 from ..data.skill import Skill
 from ..data.villagers_data import Villager
 
@@ -26,16 +31,25 @@ class StardewContent:
     animals: dict[str, Animal] = field(default_factory=dict)
     skills: dict[str, Skill] = field(default_factory=dict)
     quests: dict[str, Any] = field(default_factory=dict)
+    hats: dict[str, HatItem] = field(default_factory=dict)
 
-    def find_sources_of_type(self, types: Union[Type[Source], Tuple[Type[Source]]]) -> Iterable[Source]:
+    def find_sources_of_type(self, *types: type[Source]) -> Iterable[Source]:
         for item in self.game_items.values():
             for source in item.sources:
                 if isinstance(source, types):
                     yield source
 
-    def source_item(self, item_name: str, *sources: Source):
+    def source_item(self, item_name: str, *sources: Source) -> GameItem:
+        filtered_sources = list(self._filter_sources(sources))
+
         item = self.game_items.setdefault(item_name, GameItem(item_name))
-        item.add_sources(sources)
+        item.add_sources(filtered_sources)
+
+        for source in filtered_sources:
+            for requirement_name, tags in source.requirement_tags.items():
+                self.tag_item(requirement_name, *tags)
+
+        return item
 
     def tag_item(self, item_name: str, *tags: ItemTag):
         item = self.game_items.setdefault(item_name, GameItem(item_name))
@@ -44,22 +58,79 @@ class StardewContent:
     def untag_item(self, item_name: str, tag: ItemTag):
         self.game_items[item_name].tags.remove(tag)
 
-    def find_tagged_items(self, tag: ItemTag) -> Iterable[GameItem]:
+    def find_tagged_items(self, tag: ItemTag) -> Generator[GameItem]:
         # TODO might be worth caching this, but it need to only be cached once the content is finalized...
         for item in self.game_items.values():
             if tag in item.tags:
                 yield item
 
+    def are_all_enabled(self, content_packs: frozenset[str]) -> bool:
+        return content_packs.issubset(self.registered_packs)
+
+    def is_enabled(self, content_pack: str | ContentPack) -> bool:
+        if isinstance(content_pack, ContentPack):
+            content_pack = content_pack.name
+
+        return content_pack in self.registered_packs
+
+    def _filter_sources(self, sources: Iterable[Source]) -> Generator[Source]:
+        """Filters out sources that are disabled by features."""
+        for source in sources:
+            if not self._is_disabled(source):
+                yield source
+
+    def _is_disabled(self, source: Source) -> bool:
+        """Checks if a source is disabled by any feature."""
+        try:
+            hook = self.features.disable_source_hooks[type(source)]
+            if hook(source, content=self):
+                return True
+        except KeyError:
+            pass
+
+        for requirement in source.all_requirements:
+            try:
+                hook = self.features.disable_requirement_hooks[type(requirement)]
+                if hook(requirement, content=self):
+                    return True
+            except KeyError:
+                pass
+
+        return False
+
 
 @dataclass(frozen=True)
 class StardewFeatures:
-    booksanity: booksanity.BooksanityFeature
-    building_progression: building_progression.BuildingProgressionFeature
-    cropsanity: cropsanity.CropsanityFeature
-    fishsanity: fishsanity.FishsanityFeature
-    friendsanity: friendsanity.FriendsanityFeature
-    skill_progression: skill_progression.SkillProgressionFeature
-    tool_progression: tool_progression.ToolProgressionFeature
+    booksanity: BooksanityFeature
+    building_progression: BuildingProgressionFeature
+    cropsanity: CropsanityFeature
+    fishsanity: FishsanityFeature
+    friendsanity: FriendsanityFeature
+    hatsanity: HatsanityFeature
+    museumsanity: MuseumsanityFeature
+    skill_progression: SkillProgressionFeature
+    tool_progression: ToolProgressionFeature
+
+    @cached_property
+    def all_features(self) -> Iterable[FeatureBase]:
+        return (self.booksanity, self.building_progression, self.cropsanity, self.fishsanity, self.friendsanity, self.hatsanity, self.museumsanity,
+                self.skill_progression, self.tool_progression)
+
+    @cached_property
+    def disable_source_hooks(self) -> Mapping[type[Source], DisableSourceHook]:
+        """Returns a set of source types that are disabled by features. Need to be exact types, subclasses are not considered."""
+        hooks = {}
+        for feature in self.all_features:
+            hooks.update(feature.disable_source_hooks)
+        return MappingProxyType(hooks)
+
+    @cached_property
+    def disable_requirement_hooks(self) -> Mapping[type[Requirement], DisableRequirementHook]:
+        """Returns a set of requirement types that are disabled by features. Need to be exact types, subclasses are not considered."""
+        hooks = {}
+        for feature in self.all_features:
+            hooks.update(feature.disable_requirement_hooks)
+        return MappingProxyType(hooks)
 
 
 @dataclass(frozen=True)
@@ -125,6 +196,12 @@ class ContentPack:
 
     def quest_hook(self, content: StardewContent):
         ...
+        ...
+
+    hat_sources: Mapping[HatItem, Iterable[Source]] = field(default_factory=dict)
+
+    def hat_source_hook(self, content: StardewContent):
+        ...
 
     def finalize_hook(self, content: StardewContent):
         """Last hook called on the pack, once all other content packs have been registered.
diff --git a/worlds/stardew_valley/content/mods/archeology.py b/worlds/stardew_valley/content/mods/archeology.py
index 5eb8af4cfc..fbde3ae21d 100644
--- a/worlds/stardew_valley/content/mods/archeology.py
+++ b/worlds/stardew_valley/content/mods/archeology.py
@@ -1,34 +1,46 @@
 from ..game_content import ContentPack, StardewContent
 from ..mod_registry import register_mod_content_pack
 from ...data.artisan import MachineSource
+from ...data.game_item import ItemTag, Tag
+from ...data.harvest import ArtifactSpotSource
+from ...data.requirement import SkillRequirement
 from ...data.skill import Skill
 from ...mods.mod_data import ModNames
+from ...strings.ap_names.mods.mod_items import ModBooks
 from ...strings.craftable_names import ModMachine
 from ...strings.fish_names import ModTrash
-from ...strings.metal_names import all_artifacts, all_fossils
+from ...strings.metal_names import all_artifacts, all_fossils, Fossil
 from ...strings.skill_names import ModSkill
 
 
+def source_display_items(item: str, content: StardewContent):
+    wood_display = f"Wooden Display: {item}"
+    hardwood_display = f"Hardwood Display: {item}"
+    if item == Fossil.trilobite:
+        wood_display = f"Wooden Display: Trilobite Fossil"
+        hardwood_display = f"Hardwood Display: Trilobite Fossil"
+    content.source_item(wood_display, MachineSource(item=str(item), machine=ModMachine.preservation_chamber))
+    content.source_item(hardwood_display, MachineSource(item=str(item), machine=ModMachine.hardwood_preservation_chamber))
+
+
 class ArchaeologyContentPack(ContentPack):
     def artisan_good_hook(self, content: StardewContent):
         # Done as honestly there are too many display items to put into the initial registration traditionally.
         display_items = all_artifacts + all_fossils
         for item in display_items:
-            self.source_display_items(item, content)
+            source_display_items(item, content)
         content.source_item(ModTrash.rusty_scrap, *(MachineSource(item=artifact, machine=ModMachine.grinder) for artifact in all_artifacts))
 
-    def source_display_items(self, item: str, content: StardewContent):
-        wood_display = f"Wooden Display: {item}"
-        hardwood_display = f"Hardwood Display: {item}"
-        if item == "Trilobite":
-            wood_display = f"Wooden Display: Trilobite Fossil"
-            hardwood_display = f"Hardwood Display: Trilobite Fossil"
-        content.source_item(wood_display, MachineSource(item=str(item), machine=ModMachine.preservation_chamber))
-        content.source_item(hardwood_display, MachineSource(item=str(item), machine=ModMachine.hardwood_preservation_chamber))
-
 
 register_mod_content_pack(ArchaeologyContentPack(
     ModNames.archaeology,
     skills=(Skill(name=ModSkill.archaeology, has_mastery=False),),
+    harvest_sources={
+        ModBooks.digging_like_worms: (
+            Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
+            ArtifactSpotSource(amount=22,  # I'm just copying Jack Be Nimble's chances for now -reptar
+                               other_requirements=(SkillRequirement(ModSkill.archaeology, 2),)),
+        )
+    }
 
 ))
diff --git a/worlds/stardew_valley/content/mods/distant_lands.py b/worlds/stardew_valley/content/mods/distant_lands.py
index c5614d1302..d9e5044d25 100644
--- a/worlds/stardew_valley/content/mods/distant_lands.py
+++ b/worlds/stardew_valley/content/mods/distant_lands.py
@@ -39,4 +39,4 @@ register_mod_content_pack(DistantLandsContentPack(
         DistantLandsSeed.vile_ancient_fruit: (ForagingSource(regions=(Region.witch_swamp,), other_requirements=(QuestRequirement(ModQuest.CorruptedCropsTask),)),),
         DistantLandsCrop.vile_ancient_fruit: (Tag(ItemTag.FRUIT), HarvestCropSource(seed=DistantLandsSeed.vile_ancient_fruit, seasons=(Season.spring, Season.summer, Season.fall)),)
     }
-))
+))
\ No newline at end of file
diff --git a/worlds/stardew_valley/content/mods/sve.py b/worlds/stardew_valley/content/mods/sve.py
index 3784723737..dbbd9dc0eb 100644
--- a/worlds/stardew_valley/content/mods/sve.py
+++ b/worlds/stardew_valley/content/mods/sve.py
@@ -5,7 +5,7 @@ from ..vanilla.ginger_island import ginger_island_content_pack as ginger_island_
 from ...data import villagers_data, fish_data
 from ...data.game_item import ItemTag, Tag
 from ...data.harvest import ForagingSource, HarvestCropSource
-from ...data.requirement import YearRequirement, CombatRequirement, RelationshipRequirement, ToolRequirement, SkillRequirement, FishingRequirement
+from ...data.requirement import YearRequirement, CombatRequirement, SpecificFriendRequirement, ToolRequirement, SkillRequirement, FishingRequirement
 from ...data.shop import ShopSource
 from ...mods.mod_data import ModNames
 from ...strings.craftable_names import ModEdible
@@ -82,18 +82,18 @@ register_mod_content_pack(SVEContentPack(
         ModNames.jasper,  # To override Marlon and Gunther
     ),
     shop_sources={
-        SVEGift.aged_blue_moon_wine: (ShopSource(money_price=28000, shop_region=SVERegion.blue_moon_vineyard),),
-        SVEGift.blue_moon_wine: (ShopSource(money_price=3000, shop_region=SVERegion.blue_moon_vineyard),),
-        ModEdible.lightning_elixir: (ShopSource(money_price=12000, shop_region=SVERegion.galmoran_outpost),),
-        ModEdible.barbarian_elixir: (ShopSource(money_price=22000, shop_region=SVERegion.galmoran_outpost),),
-        ModEdible.gravity_elixir: (ShopSource(money_price=4000, shop_region=SVERegion.galmoran_outpost),),
-        SVEMeal.grampleton_orange_chicken: (ShopSource(money_price=650,
+        SVEGift.aged_blue_moon_wine: (ShopSource(price=28000, shop_region=SVERegion.blue_moon_vineyard),),
+        SVEGift.blue_moon_wine: (ShopSource(price=3000, shop_region=SVERegion.blue_moon_vineyard),),
+        ModEdible.lightning_elixir: (ShopSource(price=12000, shop_region=SVERegion.galmoran_outpost),),
+        ModEdible.barbarian_elixir: (ShopSource(price=22000, shop_region=SVERegion.galmoran_outpost),),
+        ModEdible.gravity_elixir: (ShopSource(price=4000, shop_region=SVERegion.galmoran_outpost),),
+        SVEMeal.grampleton_orange_chicken: (ShopSource(price=650,
                                                        shop_region=Region.saloon,
-                                                       other_requirements=(RelationshipRequirement(ModNPC.sophia, 6),)),),
-        ModEdible.hero_elixir: (ShopSource(money_price=8000, shop_region=SVERegion.isaac_shop),),
-        ModEdible.aegis_elixir: (ShopSource(money_price=28000, shop_region=SVERegion.galmoran_outpost),),
-        SVEBeverage.sports_drink: (ShopSource(money_price=750, shop_region=Region.hospital),),
-        SVEMeal.stamina_capsule: (ShopSource(money_price=4000, shop_region=Region.hospital),),
+                                                       other_requirements=(SpecificFriendRequirement(ModNPC.sophia, 6),)),),
+        ModEdible.hero_elixir: (ShopSource(price=8000, shop_region=SVERegion.isaac_shop),),
+        ModEdible.aegis_elixir: (ShopSource(price=28000, shop_region=SVERegion.galmoran_outpost),),
+        SVEBeverage.sports_drink: (ShopSource(price=750, shop_region=Region.hospital),),
+        SVEMeal.stamina_capsule: (ShopSource(price=4000, shop_region=Region.hospital),),
     },
     harvest_sources={
         Mushroom.red: (
diff --git a/worlds/stardew_valley/content/mods/tractor.py b/worlds/stardew_valley/content/mods/tractor.py
index a672bc2bf9..d16e69f784 100644
--- a/worlds/stardew_valley/content/mods/tractor.py
+++ b/worlds/stardew_valley/content/mods/tractor.py
@@ -16,7 +16,7 @@ register_mod_content_pack(ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=150_000,
+                    price=150_000,
                     items_price=((20, MetalBar.iron), (5, MetalBar.iridium), (1, ArtisanGood.battery_pack)),
                 ),
             ),
diff --git a/worlds/stardew_valley/content/unpacking.py b/worlds/stardew_valley/content/unpacking.py
index faa7cb5399..7615f2113f 100644
--- a/worlds/stardew_valley/content/unpacking.py
+++ b/worlds/stardew_valley/content/unpacking.py
@@ -5,7 +5,7 @@ from typing import Iterable, Mapping, Callable
 
 from .game_content import StardewContent, ContentPack, StardewFeatures
 from .vanilla.base import base_game as base_game_content_pack
-from ..data.game_item import GameItem, Source
+from ..data.game_item import Source
 
 
 def unpack_content(features: StardewFeatures, packs: Iterable[ContentPack]) -> StardewContent:
@@ -73,6 +73,13 @@ def register_pack(content: StardewContent, pack: ContentPack):
         content.skills[skill.name] = skill
     pack.skill_hook(content)
 
+    for hat, sources in pack.hat_sources.items():
+        item = content.source_item(hat.clarified_name, *sources)
+        # Some sources may be filtered out. We don't want to register a hat without source.
+        if item.sources:
+            content.hats[hat.name] = hat
+    pack.hat_source_hook(content)
+
     # register_quests
 
     # ...
@@ -84,14 +91,7 @@ def register_sources_and_call_hook(content: StardewContent,
                                    sources_by_item_name: Mapping[str, Iterable[Source]],
                                    hook: Callable[[StardewContent], None]):
     for item_name, sources in sources_by_item_name.items():
-        item = content.game_items.setdefault(item_name, GameItem(item_name))
-        item.add_sources(sources)
-
-        for source in sources:
-            for requirement_name, tags in source.requirement_tags.items():
-                requirement_item = content.game_items.setdefault(requirement_name, GameItem(requirement_name))
-                requirement_item.add_tags(tags)
-
+        content.source_item(item_name, *sources)
     hook(content)
 
 
diff --git a/worlds/stardew_valley/content/vanilla/base.py b/worlds/stardew_valley/content/vanilla/base.py
index 2215215c39..1297f3c9ce 100644
--- a/worlds/stardew_valley/content/vanilla/base.py
+++ b/worlds/stardew_valley/content/vanilla/base.py
@@ -1,20 +1,30 @@
 from ..game_content import ContentPack, StardewContent
 from ...data.artisan import MachineSource
-from ...data.game_item import ItemTag, CustomRuleSource, GameItem
+from ...data.game_item import ItemTag, CustomRuleSource, GameItem, Tag
 from ...data.harvest import HarvestFruitTreeSource, HarvestCropSource
+from ...data.hats_data import Hats
+from ...data.requirement import ToolRequirement, TotalEarningsRequirement, ShipOneCropRequirement, CraftedItemsRequirement, CookedRecipesRequirement, \
+    CaughtFishRequirement
+from ...data.shop import HatMouseSource
 from ...data.skill import Skill
+from ...logic.tailoring_logic import TailoringSource
+from ...strings.animal_product_names import AnimalProduct
 from ...strings.artisan_good_names import ArtisanGood
-from ...strings.craftable_names import WildSeeds
+from ...strings.craftable_names import WildSeeds, Edible, Consumable, Lighting
 from ...strings.crop_names import Fruit, Vegetable
+from ...strings.fish_names import Fish, WaterChest
 from ...strings.flower_names import Flower
-from ...strings.food_names import Beverage
+from ...strings.food_names import Beverage, Meal
 from ...strings.forageable_names import all_edible_mushrooms, Mushroom, Forageable
 from ...strings.fruit_tree_names import Sapling
+from ...strings.gift_names import Gift
 from ...strings.machine_names import Machine
+from ...strings.metal_names import Fossil, Artifact
 from ...strings.monster_names import Monster
 from ...strings.season_names import Season
-from ...strings.seed_names import Seed
+from ...strings.seed_names import Seed, TreeSeed
 from ...strings.skill_names import Skill as SkillName
+from ...strings.tool_names import Tool, ToolMaterial
 
 all_fruits = (
     Fruit.ancient_fruit, Fruit.apple, Fruit.apricot, Fruit.banana, Forageable.blackberry, Fruit.blueberry, Forageable.cactus_fruit, Fruit.cherry,
@@ -110,16 +120,19 @@ base_game = BaseGameContentPack(
         Vegetable.cauliflower: (HarvestCropSource(seed=Seed.cauliflower, seasons=(Season.spring,)),),
         Vegetable.potato: (HarvestCropSource(seed=Seed.potato, seasons=(Season.spring,)),),
         Flower.tulip: (HarvestCropSource(seed=Seed.tulip, seasons=(Season.spring,)),),
-        Vegetable.kale: (HarvestCropSource(seed=Seed.kale, seasons=(Season.spring,)),),
+        Vegetable.kale: (HarvestCropSource(seed=Seed.kale, seasons=(Season.spring,),
+                                           other_requirements=(ToolRequirement(Tool.scythe),)),),
         Flower.blue_jazz: (HarvestCropSource(seed=Seed.jazz, seasons=(Season.spring,)),),
         Vegetable.garlic: (HarvestCropSource(seed=Seed.garlic, seasons=(Season.spring,)),),
-        Vegetable.unmilled_rice: (HarvestCropSource(seed=Seed.rice, seasons=(Season.spring,)),),
+        Vegetable.unmilled_rice: (HarvestCropSource(seed=Seed.rice, seasons=(Season.spring,),
+                                                    other_requirements=(ToolRequirement(Tool.scythe),)),),
 
         Fruit.melon: (HarvestCropSource(seed=Seed.melon, seasons=(Season.summer,)),),
         Vegetable.tomato: (HarvestCropSource(seed=Seed.tomato, seasons=(Season.summer,)),),
         Fruit.blueberry: (HarvestCropSource(seed=Seed.blueberry, seasons=(Season.summer,)),),
         Fruit.hot_pepper: (HarvestCropSource(seed=Seed.pepper, seasons=(Season.summer,)),),
-        Vegetable.wheat: (HarvestCropSource(seed=Seed.wheat, seasons=(Season.summer, Season.fall)),),
+        Vegetable.wheat: (HarvestCropSource(seed=Seed.wheat, seasons=(Season.summer, Season.fall),
+                                            other_requirements=(ToolRequirement(Tool.scythe),)),),
         Vegetable.radish: (HarvestCropSource(seed=Seed.radish, seasons=(Season.summer,)),),
         Flower.poppy: (HarvestCropSource(seed=Seed.poppy, seasons=(Season.summer,)),),
         Flower.summer_spangle: (HarvestCropSource(seed=Seed.spangle, seasons=(Season.summer,)),),
@@ -134,7 +147,8 @@ base_game = BaseGameContentPack(
         Vegetable.yam: (HarvestCropSource(seed=Seed.yam, seasons=(Season.fall,)),),
         Fruit.cranberries: (HarvestCropSource(seed=Seed.cranberry, seasons=(Season.fall,)),),
         Flower.fairy_rose: (HarvestCropSource(seed=Seed.fairy, seasons=(Season.fall,)),),
-        Vegetable.amaranth: (HarvestCropSource(seed=Seed.amaranth, seasons=(Season.fall,)),),
+        Vegetable.amaranth: (HarvestCropSource(seed=Seed.amaranth, seasons=(Season.fall,),
+                                               other_requirements=(ToolRequirement(Tool.scythe),)),),
         Fruit.grape: (HarvestCropSource(seed=Seed.grape, seasons=(Season.fall,)),),
         Vegetable.artichoke: (HarvestCropSource(seed=Seed.artichoke, seasons=(Season.fall,)),),
 
@@ -147,18 +161,18 @@ base_game = BaseGameContentPack(
         Fruit.sweet_gem_berry: (HarvestCropSource(seed=Seed.rare_seed, seasons=(Season.fall,)),),
         Fruit.ancient_fruit: (HarvestCropSource(seed=WildSeeds.ancient, seasons=(Season.spring, Season.summer, Season.fall,)),),
 
-        Seed.coffee_starter: (CustomRuleSource(lambda logic: logic.traveling_merchant.has_days(3) & logic.monster.can_kill_many(Monster.dust_sprite)),),
+        Seed.coffee_starter: (CustomRuleSource(create_rule=lambda logic: logic.traveling_merchant.has_days(3) & logic.monster.can_kill_many(Monster.dust_sprite)),),
         Seed.coffee: (HarvestCropSource(seed=Seed.coffee_starter, seasons=(Season.spring, Season.summer,)),),
 
         Vegetable.tea_leaves: (
-        CustomRuleSource(lambda logic: logic.has(WildSeeds.tea_sapling) & logic.time.has_lived_months(2) & logic.season.has_any_not_winter()),),
+            CustomRuleSource(create_rule=lambda logic: logic.has(WildSeeds.tea_sapling) & logic.time.has_lived_months(2) & logic.season.has_any_not_winter()),),
     },
     artisan_good_sources={
         Beverage.beer: (MachineSource(item=Vegetable.wheat, machine=Machine.keg),),
         # Ingredient.vinegar: (MachineSource(item=Ingredient.rice, machine=Machine.keg),),
         Beverage.coffee: (MachineSource(item=Seed.coffee, machine=Machine.keg),
-                          CustomRuleSource(lambda logic: logic.has(Machine.coffee_maker)),
-                          CustomRuleSource(lambda logic: logic.has("Hot Java Ring"))),
+                          CustomRuleSource(create_rule=lambda logic: logic.has(Machine.coffee_maker)),
+                          CustomRuleSource(create_rule=lambda logic: logic.has("Hot Java Ring"))),
         ArtisanGood.green_tea: (MachineSource(item=Vegetable.tea_leaves, machine=Machine.keg),),
         ArtisanGood.mead: (MachineSource(item=ArtisanGood.honey, machine=Machine.keg),),
         ArtisanGood.pale_ale: (MachineSource(item=Vegetable.hops, machine=Machine.keg),),
@@ -169,5 +183,48 @@ base_game = BaseGameContentPack(
         Skill(SkillName.fishing, has_mastery=True),
         Skill(SkillName.mining, has_mastery=True),
         Skill(SkillName.combat, has_mastery=True),
-    )
+    ),
+    hat_sources={
+        Hats.good_ol_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(TotalEarningsRequirement(15000),)),),
+        Hats.lucky_bow: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(TotalEarningsRequirement(50000),)),),
+        Hats.cool_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(TotalEarningsRequirement(250000),)),),
+        Hats.bowler: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(TotalEarningsRequirement(1000000),)),),
+        Hats.sombrero: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(TotalEarningsRequirement(10000000),)),),
+        Hats.delicate_bow: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CookedRecipesRequirement(10),)),),
+        Hats.plum_chapeau: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CookedRecipesRequirement(25),)),),
+        Hats.daisy: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CraftedItemsRequirement(15),)),),
+        Hats.trucker_hat: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CraftedItemsRequirement(30),)),),
+        Hats.souwester: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CaughtFishRequirement(10, unique=True),)),),
+        Hats.official_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CaughtFishRequirement(24, unique=True),)),),
+        Hats.watermelon_band: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CaughtFishRequirement(100, unique=False),)),),
+        Hats.cowgal_hat: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(ShipOneCropRequirement(300),)),),
+        Hats.living_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.grind.can_grind_weeds(100000)),),
+        Hats.spotted_headscarf: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Mushroom.red,)),),
+        Hats.beanie: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(TreeSeed.acorn, TreeSeed.mahogany, TreeSeed.maple, TreeSeed.pine,)),),
+        Hats.blobfish_mask: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fish.blobfish,)),),
+        Hats.bridal_veil: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Gift.pearl,)),),
+        Hats.dinosaur_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(AnimalProduct.dinosaur_egg,)),),
+        Hats.fashion_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(ArtisanGood.caviar,)),),
+        Hats.flat_topped_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Meal.cranberry_sauce, Meal.stuffing,)),),
+        Hats.floppy_beanie: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(ArtisanGood.maple_syrup, ArtisanGood.oak_resin, ArtisanGood.pine_tar,)),),
+        Hats.goggles: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Edible.bug_steak,)),),
+        Hats.hair_bone: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fossil.prehistoric_tibia,)),),
+        Hats.party_hat_blue: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Meal.chocolate_cake, Consumable.fireworks_purple,)),),
+        Hats.party_hat_green: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Consumable.fireworks_green, Meal.fish_taco,)),),
+        Hats.party_hat_red: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Consumable.fireworks_red, Meal.pizza,)),),
+        Hats.pirate_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(WaterChest.treasure,)),),
+        Hats.propeller_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Meal.miners_treat,)),),
+        Hats.pumpkin_mask: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Lighting.jack_o_lantern,)),),
+        Hats.wearable_dwarf_helm: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Artifact.dwarf_gadget, Artifact.dwarvish_helm,)),),
+        Hats.white_turban: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fruit.sweet_gem_berry,)),),
+        Hats.witch_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Gift.golden_pumpkin,)),),
+        Hats.totem_mask: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Consumable.rain_totem, Consumable.warp_totem_farm,
+                                                                                  Consumable.warp_totem_mountains, Consumable.warp_totem_beach,
+                                                                                  Consumable.warp_totem_desert, Consumable.treasure_totem)),),
+
+        Hats.copper_pan_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.tool.has_pan(ToolMaterial.copper)),),
+        Hats.steel_pan_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.tool.has_pan(ToolMaterial.iron)),),
+        Hats.gold_pan_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.tool.has_pan(ToolMaterial.gold)),),
+        Hats.iridium_pan_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.tool.has_pan(ToolMaterial.iridium)),),
+    },
 )
diff --git a/worlds/stardew_valley/content/vanilla/ginger_island.py b/worlds/stardew_valley/content/vanilla/ginger_island.py
index edb135ea30..82c6788ad3 100644
--- a/worlds/stardew_valley/content/vanilla/ginger_island.py
+++ b/worlds/stardew_valley/content/vanilla/ginger_island.py
@@ -2,22 +2,34 @@ from .pelican_town import pelican_town as pelican_town_content_pack
 from ..game_content import ContentPack, StardewContent
 from ...data import villagers_data, fish_data
 from ...data.animal import Animal, AnimalName, OstrichIncubatorSource
+from ...data.fish_data import FishingSource
 from ...data.game_item import ItemTag, Tag, CustomRuleSource
 from ...data.harvest import ForagingSource, HarvestFruitTreeSource, HarvestCropSource
-from ...data.requirement import WalnutRequirement
-from ...data.shop import ShopSource
+from ...data.hats_data import Hats
+from ...data.monster_data import MonsterSource
+from ...data.requirement import WalnutRequirement, ForgeInfinityWeaponRequirement, CookedRecipesRequirement, \
+    CaughtFishRequirement, FullShipmentRequirement, RegionRequirement, \
+    AllAchievementsRequirement, PerfectionPercentRequirement, ReadAllBooksRequirement, HasItemRequirement, ToolRequirement
+from ...data.shop import ShopSource, HatMouseSource
+from ...logic.tailoring_logic import TailoringSource
+from ...logic.time_logic import MAX_MONTHS
 from ...strings.animal_product_names import AnimalProduct
 from ...strings.book_names import Book
 from ...strings.building_names import Building
 from ...strings.crop_names import Fruit, Vegetable
+from ...strings.currency_names import Currency
 from ...strings.fish_names import Fish
 from ...strings.forageable_names import Forageable, Mushroom
 from ...strings.fruit_tree_names import Sapling
 from ...strings.generic_names import Generic
+from ...strings.geode_names import Geode
+from ...strings.material_names import Material
 from ...strings.metal_names import Fossil, Mineral
+from ...strings.monster_names import Monster
 from ...strings.region_names import Region, LogicRegion
 from ...strings.season_names import Season
-from ...strings.seed_names import Seed
+from ...strings.seed_names import Seed, TreeSeed
+from ...strings.tool_names import Tool
 
 
 class GingerIslandContentPack(ContentPack):
@@ -38,12 +50,16 @@ ginger_island_content_pack = GingerIslandContentPack(
     harvest_sources={
         # Foraging
         Forageable.dragon_tooth: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.volcano_floor_10,)),
         ),
         Forageable.ginger: (
-            ForagingSource(regions=(Region.island_west,)),
+            Tag(ItemTag.FORAGE),
+            ForagingSource(regions=(Region.island_west,),
+                           other_requirements=(ToolRequirement(Tool.hoe),)),
         ),
         Mushroom.magma_cap: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.volcano_floor_5,)),
         ),
 
@@ -76,8 +92,7 @@ ginger_island_content_pack = GingerIslandContentPack(
         ),
         Book.queen_of_sauce_cookbook: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=50000, shop_region=LogicRegion.bookseller_2, other_requirements=(WalnutRequirement(100),)),),  # Worst book ever
-
+            ShopSource(price=50000, shop_region=LogicRegion.bookseller_permanent, other_requirements=(WalnutRequirement(100),)),),  # Worst book ever
     },
     fishes=(
         # TODO override region so no need to add inaccessible regions in logic
@@ -99,5 +114,40 @@ ginger_island_content_pack = GingerIslandContentPack(
                sources=(
                    OstrichIncubatorSource(AnimalProduct.ostrich_egg_starter),
                )),
-    )
+    ),
+    hat_sources={
+        Hats.infinity_crown: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(ForgeInfinityWeaponRequirement(),)),),
+        Hats.archers_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CookedRecipesRequirement(9999),)),),
+        Hats.chef_hat: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CookedRecipesRequirement(9999),)),),
+        Hats.eye_patch: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CaughtFishRequirement(9999, unique=True),)),),
+        Hats.cowpoke_hat: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(FullShipmentRequirement(),)),),
+        Hats.goblin_mask: (Tag(ItemTag.HAT), HatMouseSource(price=10000, unlock_requirements=(FullShipmentRequirement(),)),),
+        Hats.elegant_turban: (Tag(ItemTag.HAT), HatMouseSource(price=50000, unlock_requirements=(AllAchievementsRequirement(),)),),
+        Hats.junimo_hat: (Tag(ItemTag.HAT), HatMouseSource(price=25000, unlock_requirements=(PerfectionPercentRequirement(100),)),),
+        Hats.paper_hat: (Tag(ItemTag.HAT), HatMouseSource(price=10000, unlock_requirements=(RegionRequirement(Region.island_south),)),),
+        Hats.pageboy_cap: (Tag(ItemTag.HAT), HatMouseSource(price=5000, unlock_requirements=(ReadAllBooksRequirement(),)),),
+
+        Hats.concerned_ape_mask: (Tag(ItemTag.HAT), ShopSource(price=10000, shop_region=LogicRegion.lost_items_shop,
+                                                                    other_requirements=(PerfectionPercentRequirement(100), RegionRequirement(Region.volcano_floor_10))),),
+        Hats.golden_helmet: (Tag(ItemTag.HAT), ShopSource(price=10000, shop_region=LogicRegion.lost_items_shop,
+                                                               other_requirements=(RegionRequirement(Region.blacksmith), HasItemRequirement(Geode.golden_coconut),)),),
+        Hats.bluebird_mask: (Tag(ItemTag.HAT), ShopSource(price=30, currency=Vegetable.taro_root, shop_region=Region.island_trader),),
+        Hats.deluxe_cowboy_hat: (Tag(ItemTag.HAT), ShopSource(price=30, currency=Vegetable.taro_root, shop_region=Region.island_trader),),
+        Hats.small_cap: (Tag(ItemTag.HAT), ShopSource(price=30, currency=Vegetable.taro_root, shop_region=Region.island_trader),),
+        Hats.mr_qis_hat: (Tag(ItemTag.HAT), ShopSource(price=5, currency=Currency.qi_gem, shop_region=Region.qi_walnut_room),),
+        Hats.pink_bow: (Tag(ItemTag.HAT), ShopSource(price=10000, shop_region=Region.volcano_dwarf_shop),),
+
+        Hats.tiger_hat: (Tag(ItemTag.HAT), MonsterSource(monsters=(Monster.tiger_slime,), amount_tier=MAX_MONTHS,
+                                                              other_requirements=(RegionRequirement(region=Region.adventurer_guild),)),),
+        Hats.deluxe_pirate_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.volcano, Region.volcano_floor_5, Region.volcano_floor_10,),
+                                                                       require_all_regions=True),),
+
+        Hats.foragers_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Forageable.ginger,)),),
+        Hats.sunglasses: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Material.cinder_shard,)),),
+        Hats.swashbuckler_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Forageable.dragon_tooth,)),),
+        Hats.warrior_helmet: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(AnimalProduct.ostrich_egg,)),),
+        Hats.star_helmet: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(TreeSeed.mushroom,)),),
+
+        Hats.frog_hat: (Tag(ItemTag.HAT), FishingSource(region=Region.gourmand_frog_cave,),),
+    },
 )
diff --git a/worlds/stardew_valley/content/vanilla/pelican_town.py b/worlds/stardew_valley/content/vanilla/pelican_town.py
index d1d024b54c..72aa113543 100644
--- a/worlds/stardew_valley/content/vanilla/pelican_town.py
+++ b/worlds/stardew_valley/content/vanilla/pelican_town.py
@@ -1,99 +1,131 @@
 from ..game_content import ContentPack
 from ...data import villagers_data, fish_data
 from ...data.building import Building
-from ...data.game_item import GenericSource, ItemTag, Tag, CustomRuleSource
+from ...data.game_item import GenericSource, ItemTag, Tag, CustomRuleSource, AllRegionsSource
 from ...data.harvest import ForagingSource, SeasonalForagingSource, ArtifactSpotSource
-from ...data.requirement import ToolRequirement, BookRequirement, SkillRequirement, YearRequirement
-from ...data.shop import ShopSource, MysteryBoxSource, ArtifactTroveSource, PrizeMachineSource, FishingTreasureChestSource
+from ...data.hats_data import Hats
+from ...data.monster_data import MonsterSource
+from ...data.requirement import ToolRequirement, BookRequirement, SkillRequirement, YearRequirement, \
+    GrangeDisplayRequirement, EggHuntRequirement, MuseumCompletionRequirement, BuildingRequirement, \
+    NumberOfFriendsRequirement, HelpWantedRequirement, FishingCompetitionRequirement, MovieRequirement, LuauDelightRequirementRequirement, \
+    ReceivedRaccoonsRequirement, \
+    PrizeMachineRequirement, SpecificFriendRequirement, RegionRequirement, CatalogueRequirement
+from ...data.shop import ShopSource, MysteryBoxSource, ArtifactTroveSource, PrizeMachineSource, \
+    FishingTreasureChestSource, HatMouseSource
+from ...logic.tailoring_logic import TailoringSource
+from ...logic.time_logic import MAX_MONTHS
 from ...strings.artisan_good_names import ArtisanGood
 from ...strings.book_names import Book
 from ...strings.building_names import Building as BuildingNames
+from ...strings.catalogue_names import Catalogue
+from ...strings.craftable_names import Furniture
 from ...strings.crop_names import Fruit
-from ...strings.fish_names import WaterItem
+from ...strings.currency_names import Currency
+from ...strings.fish_names import WaterItem, Fish
 from ...strings.food_names import Beverage, Meal
 from ...strings.forageable_names import Forageable, Mushroom
 from ...strings.fruit_tree_names import Sapling
 from ...strings.generic_names import Generic
 from ...strings.material_names import Material
 from ...strings.metal_names import MetalBar
+from ...strings.monster_names import Monster
 from ...strings.region_names import Region, LogicRegion
 from ...strings.season_names import Season
 from ...strings.seed_names import Seed, TreeSeed
 from ...strings.skill_names import Skill
 from ...strings.tool_names import Tool, ToolMaterial
+from ...strings.villager_names import NPC
 
 pelican_town = ContentPack(
     "Pelican Town (Vanilla)",
     harvest_sources={
         # Spring
         Forageable.daffodil: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.bus_stop, Region.town, Region.railroad)),
         ),
         Forageable.dandelion: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.bus_stop, Region.forest, Region.railroad)),
         ),
         Forageable.leek: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.railroad)),
         ),
         Forageable.wild_horseradish: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.backwoods, Region.mountain, Region.forest, Region.secret_woods)),
         ),
         Forageable.salmonberry: (
+            Tag(ItemTag.FORAGE),
             SeasonalForagingSource(season=Season.spring, days=(15, 16, 17, 18),
                                    regions=(Region.backwoods, Region.mountain, Region.town, Region.forest, Region.tunnel_entrance, Region.railroad)),
         ),
         Forageable.spring_onion: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.forest,)),
         ),
 
         # Summer
         Fruit.grape: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer,), regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.railroad)),
         ),
         Forageable.spice_berry: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer,), regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.forest, Region.railroad)),
         ),
         Forageable.sweet_pea: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer,), regions=(Region.bus_stop, Region.town, Region.forest, Region.railroad)),
         ),
         Forageable.fiddlehead_fern: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer,), regions=(Region.secret_woods,)),
         ),
 
         # Fall
         Forageable.blackberry: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.fall,), regions=(Region.backwoods, Region.town, Region.forest, Region.railroad)),
             SeasonalForagingSource(season=Season.fall, days=(8, 9, 10, 11),
                                    regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.tunnel_entrance,
                                             Region.railroad)),
         ),
         Forageable.hazelnut: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.fall,), regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.railroad)),
         ),
         Forageable.wild_plum: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.fall,), regions=(Region.mountain, Region.bus_stop, Region.railroad)),
         ),
 
         # Winter
         Forageable.crocus: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,),
                            regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.secret_woods)),
         ),
         Forageable.crystal_fruit: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,),
                            regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.railroad)),
         ),
         Forageable.holly: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,),
                            regions=(Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.railroad)),
         ),
         Forageable.snow_yam: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,),
                            regions=(Region.farm, Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.railroad,
                                     Region.secret_woods, Region.beach),
                            other_requirements=(ToolRequirement(Tool.hoe),)),
         ),
         Forageable.winter_root: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,),
                            regions=(Region.farm, Region.backwoods, Region.mountain, Region.bus_stop, Region.town, Region.forest, Region.railroad,
                                     Region.secret_woods, Region.beach),
@@ -102,31 +134,39 @@ pelican_town = ContentPack(
 
         # Mushrooms
         Mushroom.common: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.spring,), regions=(Region.secret_woods,)),
             ForagingSource(seasons=(Season.fall,), regions=(Region.backwoods, Region.mountain, Region.forest)),
         ),
         Mushroom.chanterelle: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.fall,), regions=(Region.secret_woods,)),
         ),
         Mushroom.morel: (
-            ForagingSource(seasons=(Season.spring, Season.fall), regions=(Region.secret_woods,)),
+            Tag(ItemTag.FORAGE),
+            ForagingSource(seasons=(Season.spring,), regions=(Region.secret_woods,)),
         ),
         Mushroom.red: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer, Season.fall), regions=(Region.secret_woods,)),
         ),
 
         # Beach
         WaterItem.coral: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.tide_pools,)),
             SeasonalForagingSource(season=Season.summer, days=(12, 13, 14), regions=(Region.beach,)),
         ),
         WaterItem.nautilus_shell: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.winter,), regions=(Region.beach,)),
         ),
         Forageable.rainbow_shell: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(seasons=(Season.summer,), regions=(Region.beach,)),
         ),
         WaterItem.sea_urchin: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.tide_pools,)),
         ),
 
@@ -149,150 +189,159 @@ pelican_town = ContentPack(
     },
     shop_sources={
         # Saplings
-        Sapling.apple: (ShopSource(money_price=4000, shop_region=Region.pierre_store),),
-        Sapling.apricot: (ShopSource(money_price=2000, shop_region=Region.pierre_store),),
-        Sapling.cherry: (ShopSource(money_price=3400, shop_region=Region.pierre_store),),
-        Sapling.orange: (ShopSource(money_price=4000, shop_region=Region.pierre_store),),
-        Sapling.peach: (ShopSource(money_price=6000, shop_region=Region.pierre_store),),
-        Sapling.pomegranate: (ShopSource(money_price=6000, shop_region=Region.pierre_store),),
+        Sapling.apple: (ShopSource(price=4000, shop_region=Region.pierre_store),),
+        Sapling.apricot: (ShopSource(price=2000, shop_region=Region.pierre_store),),
+        Sapling.cherry: (ShopSource(price=3400, shop_region=Region.pierre_store),),
+        Sapling.orange: (ShopSource(price=4000, shop_region=Region.pierre_store),),
+        Sapling.peach: (ShopSource(price=6000, shop_region=Region.pierre_store),),
+        Sapling.pomegranate: (ShopSource(price=6000, shop_region=Region.pierre_store),),
 
         # Crop seeds, assuming they are bought in season, otherwise price is different with missing stock list.
-        Seed.parsnip: (ShopSource(money_price=20, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.bean: (ShopSource(money_price=60, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.cauliflower: (ShopSource(money_price=80, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.potato: (ShopSource(money_price=50, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.tulip: (ShopSource(money_price=20, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.kale: (ShopSource(money_price=70, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.jazz: (ShopSource(money_price=30, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.garlic: (ShopSource(money_price=40, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
-        Seed.rice: (ShopSource(money_price=40, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.parsnip: (ShopSource(price=20, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.bean: (ShopSource(price=60, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.cauliflower: (ShopSource(price=80, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.potato: (ShopSource(price=50, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.tulip: (ShopSource(price=20, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.kale: (ShopSource(price=70, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.jazz: (ShopSource(price=30, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.garlic: (ShopSource(price=40, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
+        Seed.rice: (ShopSource(price=40, shop_region=Region.pierre_store, seasons=(Season.spring,)),),
 
-        Seed.melon: (ShopSource(money_price=80, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.tomato: (ShopSource(money_price=50, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.blueberry: (ShopSource(money_price=80, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.pepper: (ShopSource(money_price=40, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.wheat: (ShopSource(money_price=10, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
-        Seed.radish: (ShopSource(money_price=40, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.poppy: (ShopSource(money_price=100, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.spangle: (ShopSource(money_price=50, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.hops: (ShopSource(money_price=60, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
-        Seed.corn: (ShopSource(money_price=150, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
-        Seed.sunflower: (ShopSource(money_price=200, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
-        Seed.red_cabbage: (ShopSource(money_price=100, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.melon: (ShopSource(price=80, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.tomato: (ShopSource(price=50, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.blueberry: (ShopSource(price=80, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.pepper: (ShopSource(price=40, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.wheat: (ShopSource(price=10, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
+        Seed.radish: (ShopSource(price=40, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.poppy: (ShopSource(price=100, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.spangle: (ShopSource(price=50, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.hops: (ShopSource(price=60, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
+        Seed.corn: (ShopSource(price=150, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
+        Seed.sunflower: (ShopSource(price=200, shop_region=Region.pierre_store, seasons=(Season.summer, Season.fall)),),
+        Seed.red_cabbage: (ShopSource(price=100, shop_region=Region.pierre_store, seasons=(Season.summer,)),),
 
-        Seed.eggplant: (ShopSource(money_price=20, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.pumpkin: (ShopSource(money_price=100, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.bok_choy: (ShopSource(money_price=50, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.yam: (ShopSource(money_price=60, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.cranberry: (ShopSource(money_price=240, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.fairy: (ShopSource(money_price=200, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.amaranth: (ShopSource(money_price=70, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.grape: (ShopSource(money_price=60, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
-        Seed.artichoke: (ShopSource(money_price=30, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.eggplant: (ShopSource(price=20, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.pumpkin: (ShopSource(price=100, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.bok_choy: (ShopSource(price=50, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.yam: (ShopSource(price=60, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.cranberry: (ShopSource(price=240, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.fairy: (ShopSource(price=200, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.amaranth: (ShopSource(price=70, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.grape: (ShopSource(price=60, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
+        Seed.artichoke: (ShopSource(price=30, shop_region=Region.pierre_store, seasons=(Season.fall,)),),
 
-        Seed.broccoli: (ShopSource(items_price=((5, Material.moss),), shop_region=LogicRegion.raccoon_shop),),
-        Seed.carrot: (ShopSource(items_price=((1, TreeSeed.maple),), shop_region=LogicRegion.raccoon_shop),),
-        Seed.powdermelon: (ShopSource(items_price=((2, TreeSeed.acorn),), shop_region=LogicRegion.raccoon_shop),),
-        Seed.summer_squash: (ShopSource(items_price=((15, Material.sap),), shop_region=LogicRegion.raccoon_shop),),
+        Seed.broccoli: (ShopSource(items_price=((5, Material.moss),), shop_region=LogicRegion.raccoon_shop_1),),
+        Seed.carrot: (ShopSource(items_price=((1, TreeSeed.maple),), shop_region=LogicRegion.raccoon_shop_1),),
+        Seed.powdermelon: (ShopSource(items_price=((2, TreeSeed.acorn),), shop_region=LogicRegion.raccoon_shop_1),),
+        Seed.summer_squash: (ShopSource(items_price=((15, Material.sap),), shop_region=LogicRegion.raccoon_shop_1),),
 
-        Seed.strawberry: (ShopSource(money_price=100, shop_region=LogicRegion.egg_festival, seasons=(Season.spring,)),),
-        Seed.rare_seed: (ShopSource(money_price=1000, shop_region=LogicRegion.traveling_cart, seasons=(Season.spring, Season.summer)),),
+        Seed.strawberry: (ShopSource(price=100, shop_region=LogicRegion.egg_festival, seasons=(Season.spring,)),),
+        Seed.rare_seed: (ShopSource(price=1000, shop_region=LogicRegion.traveling_cart, seasons=(Season.spring, Season.summer)),),
 
         # Saloon
-        Beverage.beer: (ShopSource(money_price=400, shop_region=Region.saloon),),
-        Meal.salad: (ShopSource(money_price=220, shop_region=Region.saloon),),
-        Meal.bread: (ShopSource(money_price=100, shop_region=Region.saloon),),
-        Meal.spaghetti: (ShopSource(money_price=240, shop_region=Region.saloon),),
-        Meal.pizza: (ShopSource(money_price=600, shop_region=Region.saloon),),
-        Beverage.coffee: (ShopSource(money_price=300, shop_region=Region.saloon),),
+        Beverage.beer: (ShopSource(price=400, shop_region=Region.saloon),),
+        Meal.salad: (ShopSource(price=220, shop_region=Region.saloon),),
+        Meal.bread: (ShopSource(price=100, shop_region=Region.saloon),),
+        Meal.spaghetti: (ShopSource(price=240, shop_region=Region.saloon),),
+        Meal.pizza: (ShopSource(price=600, shop_region=Region.saloon),),
+        Beverage.coffee: (ShopSource(price=300, shop_region=Region.saloon),),
 
         # Books
         Book.animal_catalogue: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=5000, shop_region=Region.ranch, other_requirements=(YearRequirement(2),)),),
+            ShopSource(price=5000, shop_region=Region.ranch, other_requirements=(YearRequirement(2),)),),
         Book.book_of_mysteries: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            MysteryBoxSource(amount=38),),  # After 38 boxes, there are 49.99% chances player received the book.
+            MysteryBoxSource(amount=50),),  # After 38 boxes, there are 49.99% chances player received the book.
         Book.dwarvish_safety_manual: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=4000, shop_region=LogicRegion.mines_dwarf_shop),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=4000, shop_region=LogicRegion.mines_dwarf_shop),),
+        #   ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),  # Repeatable, so no need for bookseller
         Book.friendship_101: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
             PrizeMachineSource(amount=9),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.horse_the_book: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=25000, shop_region=LogicRegion.bookseller_2),),
+            ShopSource(price=25000, shop_region=LogicRegion.bookseller_permanent),),
         Book.jack_be_nimble_jack_be_thick: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.jewels_of_the_sea: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            FishingTreasureChestSource(amount=21),  # After 21 chests, there are 49.44% chances player received the book.
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            FishingTreasureChestSource(amount=25),  # After 21 chests, there are 49.44% chances player received the book.
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.mapping_cave_systems: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            GenericSource(regions=(Region.adventurer_guild_bedroom,)),
+            AllRegionsSource(regions=(Region.adventurer_guild_bedroom, LogicRegion.bookseller_rare,)),
             # Disabling the shop source for better game design.
-            # ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),
+            # ShopSource(price=20000, shop_region=LogicRegion.bookseller_3),
         ),
         Book.monster_compendium: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
             CustomRuleSource(create_rule=lambda logic: logic.monster.can_kill_many(Generic.any)),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.ol_slitherlegs: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=25000, shop_region=LogicRegion.bookseller_2),),
+            ShopSource(price=25000, shop_region=LogicRegion.bookseller_permanent),),
         Book.price_catalogue: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=3000, shop_region=LogicRegion.bookseller_2),),
+            ShopSource(price=3000, shop_region=LogicRegion.bookseller_permanent),),
         Book.the_alleyway_buffet: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
             GenericSource(regions=(Region.town,),
                           other_requirements=(ToolRequirement(Tool.axe, ToolMaterial.iron), ToolRequirement(Tool.pickaxe, ToolMaterial.iron))),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.the_art_o_crabbing: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
             CustomRuleSource(create_rule=lambda logic: logic.festival.has_squidfest_day_1_iridium_reward()),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.treasure_appraisal_guide: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ArtifactTroveSource(amount=18),  # After 18 troves, there is 49,88% chances player received the book.
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ArtifactTroveSource(amount=20),  # After 18 troves, there is 49,88% chances player received the book.
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
         Book.raccoon_journal: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),
-            ShopSource(items_price=((999, Material.fiber),), shop_region=LogicRegion.raccoon_shop),),
+            #  ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),  # Repeatable, so no need for bookseller
+            ShopSource(items_price=((999, Material.fiber),), shop_region=LogicRegion.raccoon_shop_2),),
         Book.way_of_the_wind_pt_1: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=15000, shop_region=LogicRegion.bookseller_2),),
+            ShopSource(price=15000, shop_region=LogicRegion.bookseller_permanent),),
         Book.way_of_the_wind_pt_2: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=35000, shop_region=LogicRegion.bookseller_2, other_requirements=(BookRequirement(Book.way_of_the_wind_pt_1),)),),
+            ShopSource(price=35000, shop_region=LogicRegion.bookseller_permanent, other_requirements=(BookRequirement(Book.way_of_the_wind_pt_1),)),),
         Book.woodys_secret: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            ShopSource(price=20000, shop_region=LogicRegion.bookseller_rare),),
 
         # Experience Books
         Book.book_of_stars: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_permanent),),
         Book.bait_and_bobber: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_experience),),
         Book.combat_quarterly: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_experience),),
         Book.mining_monthly: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_experience),),
         Book.stardew_valley_almanac: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_experience),),
         Book.woodcutters_weekly: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=5000, shop_region=LogicRegion.bookseller_1),),
+            ShopSource(price=5000, shop_region=LogicRegion.bookseller_experience),),
+
+        # Catalogues
+        Catalogue.wizard: (ShopSource(price=150000, shop_region=Region.sewer, other_requirements=(CatalogueRequirement(Catalogue.wizard),)),),
+        Catalogue.furniture: (ShopSource(price=200000, shop_region=Region.carpenter, other_requirements=(CatalogueRequirement(Catalogue.furniture),BuildingRequirement(BuildingNames.kitchen),)),),
+
+        # Furniture
+        Furniture.single_bed: (ShopSource(price=500, shop_region=Region.carpenter),),
+        Furniture.crane_game_house_plant: (ShopSource(price=500, shop_region=Region.movie_theater),),
+        Furniture.cursed_mannequin: (MonsterSource(monsters=(Monster.haunted_skull,), amount_tier=MAX_MONTHS),),
     },
     fishes=(
         fish_data.albacore,
@@ -396,7 +445,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=6000,
+                    price=6000,
                     items_price=((350, Material.wood), (150, Material.stone))
                 ),
             ),
@@ -406,7 +455,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=12_000,
+                    price=12_000,
                     items_price=((450, Material.wood), (200, Material.stone))
                 ),
             ),
@@ -417,7 +466,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=25_000,
+                    price=25_000,
                     items_price=((550, Material.wood), (300, Material.stone))
                 ),
             ),
@@ -428,7 +477,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=4000,
+                    price=4000,
                     items_price=((300, Material.wood), (100, Material.stone))
                 ),
             ),
@@ -438,7 +487,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=10_000,
+                    price=10_000,
                     items_price=((400, Material.wood), (150, Material.stone))
                 ),
             ),
@@ -449,7 +498,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=20_000,
+                    price=20_000,
                     items_price=((500, Material.wood), (200, Material.stone))
                 ),
             ),
@@ -460,7 +509,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=5000,
+                    price=5000,
                     items_price=((200, Material.stone), (5, WaterItem.seaweed), (5, WaterItem.green_algae))
                 ),
             ),
@@ -470,7 +519,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=2500,
+                    price=2500,
                     items_price=((50, Material.stone), (150, Material.wood), (4, ArtisanGood.cloth))
                 ),
             ),
@@ -480,7 +529,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=15_000,
+                    price=15_000,
                     items_price=((300, Material.wood),)
                 ),
             ),
@@ -490,7 +539,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=20_000,
+                    price=20_000,
                     items_price=((550, Material.wood), (300, Material.stone))
                 ),
             ),
@@ -501,7 +550,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=100,
+                    price=100,
                     items_price=((100, Material.stone), (10, Material.clay), (5, MetalBar.copper))
                 ),
             ),
@@ -511,7 +560,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=10_000,
+                    price=10_000,
                     items_price=((500, Material.stone), (10, MetalBar.quartz), (1, MetalBar.iridium))
                 ),
             ),
@@ -521,7 +570,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=10_000,
+                    price=10_000,
                     items_price=((100, Material.hardwood), (5, MetalBar.iron))
                 ),
             ),
@@ -531,7 +580,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=1000,
+                    price=1000,
                     items_price=((75, Material.stone),)
                 ),
             ),
@@ -541,7 +590,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=250,
+                    price=250,
                     items_price=((150, Material.wood),)
                 ),
             ),
@@ -551,7 +600,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=5000,
+                    price=5000,
                     items_price=((25, Material.hardwood),)
                 ),
             ),
@@ -561,7 +610,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=10_000,
+                    price=10_000,
                     items_price=((450, Material.wood),)
                 ),
             ),
@@ -572,7 +621,7 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=65_000,
+                    price=65_000,
                     items_price=((100, Material.hardwood),)
                 ),
             ),
@@ -583,10 +632,115 @@ pelican_town = ContentPack(
             sources=(
                 ShopSource(
                     shop_region=Region.carpenter,
-                    money_price=100_000,
+                    price=100_000,
                 ),
             ),
             upgrade_from=BuildingNames.kids_room,
         ),
-    )
+        # Building(
+        #     WizardBuilding.earth_obelisk,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=500_000,
+        #             items_price=((10, MetalBar.iridium), (10, Mineral.earth_crystal),)
+        #         ),
+        #     ),
+        # ),
+        # Building(
+        #     WizardBuilding.water_obelisk,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=500_000,
+        #             items_price=((5, MetalBar.iridium), (10, Fish.clam), (10, WaterItem.coral),)
+        #         ),
+        #     ),
+        # ),
+        # Building(
+        #     WizardBuilding.desert_obelisk,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=1_000_000,
+        #             items_price=((20, MetalBar.iridium), (10, Forageable.coconut), (10, Forageable.cactus_fruit),)
+        #         ),
+        #     ),
+        # ),
+        # Building(
+        #     WizardBuilding.island_obelisk,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=1_000_000,
+        #             items_price=((10, MetalBar.iridium), (10, Forageable.dragon_tooth), (10, Fruit.banana),)
+        #         ),
+        #     ),
+        # ),
+        # Building(
+        #     WizardBuilding.junimo_hut,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=20_000,
+        #             items_price=((200, Material.stone), (9, Fruit.starfruit), (100, Material.fiber),)
+        #         ),
+        #     ),
+        # ),
+        # Building(
+        #     WizardBuilding.gold_clock,
+        #     sources=(
+        #         ShopSource(
+        #             shop_region=Region.wizard_tower,
+        #             price=10_000_000,
+        #         ),
+        #     ),
+        # ),
+    ),
+    hat_sources={
+        # Hats from the Hat Mouse
+        Hats.blue_ribbon: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(GrangeDisplayRequirement(),)),),
+        Hats.blue_bonnet: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(MuseumCompletionRequirement(40),)),),
+        Hats.cowboy: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(MuseumCompletionRequirement(),)),),
+        Hats.butterfly_bow: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(1, 5),)),),
+        Hats.mouse_ears: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(1, 10),)),),
+        Hats.cat_ears: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(8, 10),)),),
+        Hats.tiara: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(4, 5),)),),
+        Hats.santa_hat: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(10, 5),)),),
+        Hats.earmuffs: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(NumberOfFriendsRequirement(20, 5),)),),
+        Hats.tropiclip: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(BuildingRequirement(BuildingNames.kitchen),)),),
+        Hats.hunters_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(BuildingRequirement(BuildingNames.cellar),)),),
+        Hats.polka_bow: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(HelpWantedRequirement(10),)),),
+        Hats.chicken_mask: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(HelpWantedRequirement(40),)),),
+        Hats.straw: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(EggHuntRequirement(),)),),
+        Hats.sailors_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(FishingCompetitionRequirement(),)),),
+        Hats.jester_hat: (Tag(ItemTag.HAT), HatMouseSource(price=25000, unlock_requirements=(MovieRequirement(),)),),
+        Hats.governors_hat: (Tag(ItemTag.HAT), HatMouseSource(price=5000, unlock_requirements=(LuauDelightRequirementRequirement(),)),),
+        Hats.white_bow: (Tag(ItemTag.HAT), HatMouseSource(price=5000, unlock_requirements=(ReceivedRaccoonsRequirement(8),)),),
+        Hats.sports_cap: (Tag(ItemTag.HAT), HatMouseSource(price=5000, unlock_requirements=(PrizeMachineRequirement(11),)),),
+
+        Hats.emilys_magic_hat: (Tag(ItemTag.HAT), ShopSource(price=10000, shop_region=LogicRegion.lost_items_shop,
+                                                             other_requirements=(
+                                                                 SpecificFriendRequirement(NPC.emily, 14), RegionRequirement(Region.farm))),),
+        Hats.fedora: (Tag(ItemTag.HAT), ShopSource(price=500, currency=Currency.star_token, shop_region=LogicRegion.fair),),
+        Hats.cone_hat: (Tag(ItemTag.HAT), ShopSource(price=5000, shop_region=LogicRegion.night_market),),
+        Hats.red_fez: (Tag(ItemTag.HAT), ShopSource(price=8000, shop_region=LogicRegion.traveling_cart),),
+
+        Hats.garbage_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.town,), grind_months=12),),
+        Hats.mystery_hat: (Tag(ItemTag.HAT), MysteryBoxSource(amount=100),),
+
+        Hats.fishing_hat: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fish.stonefish, Fish.ice_pip, Fish.scorpion_carp, Fish.spook_fish,
+                                                                              Fish.midnight_squid, Fish.void_salmon, Fish.slimejack,)),),
+        Hats.bucket_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.hat.has_bucket_hat),),
+
+        Hats.leprechaun_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.forest,), seasons=(Season.spring,), ),),
+        Hats.mushroom_cap: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.farm,), seasons=(Season.fall,),
+                                                             other_requirements=(ToolRequirement(Tool.axe),),),),
+
+        Hats.raccoon_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.quest.has_raccoon_shop(3) &
+                                                                                        logic.region.can_reach(LogicRegion.raccoon_shop_3)),),
+
+        Hats.squid_hat: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.festival.can_squidfest_iridium_reward()),),
+
+    }
 )
diff --git a/worlds/stardew_valley/content/vanilla/qi_board.py b/worlds/stardew_valley/content/vanilla/qi_board.py
index e5f67c4319..88133bd207 100644
--- a/worlds/stardew_valley/content/vanilla/qi_board.py
+++ b/worlds/stardew_valley/content/vanilla/qi_board.py
@@ -2,9 +2,14 @@ from .ginger_island import ginger_island_content_pack as ginger_island_content_p
 from .pelican_town import pelican_town as pelican_town_content_pack
 from ..game_content import ContentPack, StardewContent
 from ...data import fish_data
-from ...data.game_item import GenericSource, ItemTag
+from ...data.game_item import GenericSource, ItemTag, Tag
 from ...data.harvest import HarvestCropSource
+from ...data.hats_data import Hats
+from ...data.requirement import DangerousMinesRequirement, CraftedItemsRequirement
+from ...data.shop import HatMouseSource
+from ...logic.tailoring_logic import TailoringSource
 from ...strings.crop_names import Fruit
+from ...strings.metal_names import MetalBar
 from ...strings.region_names import Region
 from ...strings.seed_names import Seed
 
@@ -31,5 +36,11 @@ qi_board_content_pack = QiBoardContentPack(
         fish_data.glacierfish_jr,
         fish_data.legend_ii,
         fish_data.radioactive_carp,
-    )
+    ),
+    hat_sources={
+        Hats.space_helmet: (HatMouseSource(price=20000, unlock_requirements=(DangerousMinesRequirement(120),)),),
+        Hats.qi_mask: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fruit.qi_fruit,)),),
+        Hats.radioactive_goggles: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(MetalBar.radioactive,)),),
+        Hats.gnomes_cap: (Tag(ItemTag.HAT), HatMouseSource(price=1000, unlock_requirements=(CraftedItemsRequirement(9999),)),),
+    },
 )
diff --git a/worlds/stardew_valley/content/vanilla/the_desert.py b/worlds/stardew_valley/content/vanilla/the_desert.py
index a207e169ca..0cd34bcfe0 100644
--- a/worlds/stardew_valley/content/vanilla/the_desert.py
+++ b/worlds/stardew_valley/content/vanilla/the_desert.py
@@ -1,13 +1,24 @@
 from .pelican_town import pelican_town as pelican_town_content_pack
 from ..game_content import ContentPack
 from ...data import fish_data, villagers_data
+from ...data.game_item import CustomRuleSource, ItemTag, Tag
 from ...data.harvest import ForagingSource, HarvestCropSource
+from ...data.hats_data import Hats
+from ...data.monster_data import MonsterSource
+from ...data.requirement import RegionRequirement, MeetRequirement, MonsterKillRequirement
 from ...data.shop import ShopSource
+from ...logic.tailoring_logic import TailoringSource
+from ...logic.time_logic import MAX_MONTHS
 from ...strings.crop_names import Fruit, Vegetable
+from ...strings.currency_names import Currency
 from ...strings.forageable_names import Forageable, Mushroom
-from ...strings.region_names import Region
+from ...strings.geode_names import Geode
+from ...strings.metal_names import Artifact
+from ...strings.monster_names import Monster
+from ...strings.region_names import Region, LogicRegion
 from ...strings.season_names import Season
 from ...strings.seed_names import Seed
+from ...strings.villager_names import NPC
 
 the_desert = ContentPack(
     "The Desert (Vanilla)",
@@ -16,13 +27,16 @@ the_desert = ContentPack(
     ),
     harvest_sources={
         Forageable.cactus_fruit: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.desert,)),
             HarvestCropSource(seed=Seed.cactus, seasons=())
         ),
         Forageable.coconut: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.desert,)),
         ),
         Mushroom.purple: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.skull_cavern_25,)),
         ),
 
@@ -31,10 +45,10 @@ the_desert = ContentPack(
         Vegetable.beet: (HarvestCropSource(seed=Seed.beet, seasons=(Season.fall,)),),
     },
     shop_sources={
-        Seed.cactus: (ShopSource(money_price=150, shop_region=Region.oasis),),
-        Seed.rhubarb: (ShopSource(money_price=100, shop_region=Region.oasis, seasons=(Season.spring,)),),
-        Seed.starfruit: (ShopSource(money_price=400, shop_region=Region.oasis, seasons=(Season.summer,)),),
-        Seed.beet: (ShopSource(money_price=20, shop_region=Region.oasis, seasons=(Season.fall,)),),
+        Seed.cactus: (ShopSource(price=150, shop_region=Region.oasis),),
+        Seed.rhubarb: (ShopSource(price=100, shop_region=Region.oasis, seasons=(Season.spring,)),),
+        Seed.starfruit: (ShopSource(price=400, shop_region=Region.oasis, seasons=(Season.summer,)),),
+        Seed.beet: (ShopSource(price=20, shop_region=Region.oasis, seasons=(Season.fall,)),),
     },
     fishes=(
         fish_data.sandfish,
@@ -43,4 +57,33 @@ the_desert = ContentPack(
     villagers=(
         villagers_data.sandy,
     ),
+    hat_sources={
+        Hats.top_hat: (Tag(ItemTag.HAT), ShopSource(price=8000, shop_region=Region.casino, currency=Currency.qi_coin),),
+        Hats.gils_hat: (Tag(ItemTag.HAT), ShopSource(price=10000, shop_region=LogicRegion.lost_items_shop,
+                                                          other_requirements=(
+                                                              RegionRequirement(Region.skull_cavern_100), RegionRequirement(LogicRegion.desert_festival),)),),
+        Hats.abigails_bow: (Tag(ItemTag.HAT), ShopSource(price=60, currency=Currency.calico_egg, shop_region=LogicRegion.desert_festival,
+                                                              other_requirements=(MeetRequirement(NPC.abigail),)),),
+        Hats.tricorn: (Tag(ItemTag.HAT), ShopSource(price=100, currency=Currency.calico_egg, shop_region=LogicRegion.desert_festival,
+                                                              other_requirements=(MeetRequirement(NPC.elliott),)),),
+        Hats.blue_bow: (Tag(ItemTag.HAT), ShopSource(price=60, currency=Currency.calico_egg, shop_region=LogicRegion.desert_festival),),
+        Hats.dark_velvet_bow: (Tag(ItemTag.HAT), ShopSource(price=75, currency=Currency.calico_egg, shop_region=LogicRegion.desert_festival),),
+        Hats.mummy_mask: (Tag(ItemTag.HAT), ShopSource(price=120, currency=Currency.calico_egg, shop_region=LogicRegion.desert_festival),),
+        Hats.arcane_hat: (Tag(ItemTag.HAT), ShopSource(price=20000, shop_region=Region.adventurer_guild,
+                                                            other_requirements=(MonsterKillRequirement((Monster.mummy,), 100),)),),
+        Hats.green_turban: (Tag(ItemTag.HAT), ShopSource(price=50, currency=Geode.omni, shop_region=Region.desert,),),
+        Hats.magic_cowboy_hat: (Tag(ItemTag.HAT), ShopSource(price=333, currency=Geode.omni, shop_region=Region.desert,),),
+        Hats.magic_turban: (Tag(ItemTag.HAT), ShopSource(price=333, currency=Geode.omni, shop_region=Region.desert,),),
+
+        Hats.laurel_wreath_crown: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.hat.can_get_unlikely_hat_at_outfit_services),),
+        Hats.joja_cap: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.hat.can_get_unlikely_hat_at_outfit_services),),
+        Hats.dark_ballcap: (Tag(ItemTag.HAT), CustomRuleSource(create_rule=lambda logic: logic.hat.can_get_unlikely_hat_at_outfit_services),),
+        Hats.dark_cowboy_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.skull_cavern_100,)),),
+        Hats.blue_cowboy_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.skull_cavern_100,))),
+        Hats.red_cowboy_hat: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.skull_cavern_100,))),
+        Hats.golden_mask: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Artifact.golden_mask,)),),
+        Hats.white_turban: (Tag(ItemTag.HAT), ForagingSource(regions=(Region.skull_cavern_100,))),
+        Hats.knights_helmet: (Tag(ItemTag.HAT), MonsterSource(monsters=(Monster.pepper_rex,), amount_tier=MAX_MONTHS,
+                                                                   other_requirements=(RegionRequirement(region=Region.adventurer_guild),)),),
+    }
 )
diff --git a/worlds/stardew_valley/content/vanilla/the_farm.py b/worlds/stardew_valley/content/vanilla/the_farm.py
index 183025e43f..70265a8d6c 100644
--- a/worlds/stardew_valley/content/vanilla/the_farm.py
+++ b/worlds/stardew_valley/content/vanilla/the_farm.py
@@ -1,6 +1,7 @@
 from .pelican_town import pelican_town as pelican_town_content_pack
 from ..game_content import ContentPack
 from ...data.animal import IncubatorSource, Animal, AnimalName
+from ...data.game_item import Tag, ItemTag
 from ...data.harvest import FruitBatsSource, MushroomCaveSource
 from ...data.shop import ShopSource
 from ...strings.animal_product_names import AnimalProduct
@@ -16,32 +17,41 @@ the_farm = ContentPack(
     harvest_sources={
         # Fruit cave
         Forageable.blackberry: (
+            Tag(ItemTag.FORAGE),
             FruitBatsSource(),
         ),
         Forageable.salmonberry: (
+            Tag(ItemTag.FORAGE),
             FruitBatsSource(),
         ),
         Forageable.spice_berry: (
+            Tag(ItemTag.FORAGE),
             FruitBatsSource(),
         ),
         Forageable.wild_plum: (
+            Tag(ItemTag.FORAGE),
             FruitBatsSource(),
         ),
 
         # Mushrooms
         Mushroom.common: (
+            Tag(ItemTag.FORAGE),
             MushroomCaveSource(),
         ),
         Mushroom.chanterelle: (
+            Tag(ItemTag.FORAGE),
             MushroomCaveSource(),
         ),
         Mushroom.morel: (
+            Tag(ItemTag.FORAGE),
             MushroomCaveSource(),
         ),
         Mushroom.purple: (
+            Tag(ItemTag.FORAGE),
             MushroomCaveSource(),
         ),
         Mushroom.red: (
+            Tag(ItemTag.FORAGE),
             MushroomCaveSource(),
         ),
     },
@@ -49,41 +59,41 @@ the_farm = ContentPack(
         Animal(AnimalName.chicken,
                required_building=Building.coop,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=800),
+                   ShopSource(shop_region=Region.ranch, price=800),
                    # For now there is no way to obtain the starter item, so this adds additional rules in the system for nothing.
                    # IncubatorSource(AnimalProduct.egg_starter)
                )),
         Animal(AnimalName.cow,
                required_building=Building.barn,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=1500),
+                   ShopSource(shop_region=Region.ranch, price=1500),
                )),
         Animal(AnimalName.goat,
                required_building=Building.big_barn,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=4000),
+                   ShopSource(shop_region=Region.ranch, price=4000),
                )),
         Animal(AnimalName.duck,
                required_building=Building.big_coop,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=1200),
+                   ShopSource(shop_region=Region.ranch, price=1200),
                    # For now there is no way to obtain the starter item, so this adds additional rules in the system for nothing.
                    # IncubatorSource(AnimalProduct.duck_egg_starter)
                )),
         Animal(AnimalName.sheep,
                required_building=Building.deluxe_barn,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=8000),
+                   ShopSource(shop_region=Region.ranch, price=8000),
                )),
         Animal(AnimalName.rabbit,
                required_building=Building.deluxe_coop,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=8000),
+                   ShopSource(shop_region=Region.ranch, price=8000),
                )),
         Animal(AnimalName.pig,
                required_building=Building.deluxe_barn,
                sources=(
-                   ShopSource(shop_region=Region.ranch, money_price=16000),
+                   ShopSource(shop_region=Region.ranch, price=16000),
                )),
         Animal(AnimalName.void_chicken,
                required_building=Building.big_coop,
diff --git a/worlds/stardew_valley/content/vanilla/the_mines.py b/worlds/stardew_valley/content/vanilla/the_mines.py
index 729b195f7b..193ea1e29e 100644
--- a/worlds/stardew_valley/content/vanilla/the_mines.py
+++ b/worlds/stardew_valley/content/vanilla/the_mines.py
@@ -1,9 +1,16 @@
 from .pelican_town import pelican_town as pelican_town_content_pack
 from ..game_content import ContentPack
 from ...data import fish_data, villagers_data
+from ...data.game_item import Tag, ItemTag
 from ...data.harvest import ForagingSource
-from ...data.requirement import ToolRequirement
+from ...data.hats_data import Hats
+from ...data.monster_data import MonsterSource
+from ...data.requirement import ToolRequirement, RegionRequirement
+from ...logic.tailoring_logic import TailoringSource
+from ...logic.time_logic import MAX_MONTHS
+from ...strings.fish_names import Fish
 from ...strings.forageable_names import Forageable, Mushroom
+from ...strings.monster_names import Monster
 from ...strings.region_names import Region
 from ...strings.tool_names import Tool
 
@@ -14,12 +21,15 @@ the_mines = ContentPack(
     ),
     harvest_sources={
         Forageable.cave_carrot: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.mines_floor_10,), other_requirements=(ToolRequirement(Tool.hoe),)),
         ),
         Mushroom.red: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.mines_floor_95,)),
         ),
         Mushroom.purple: (
+            Tag(ItemTag.FORAGE),
             ForagingSource(regions=(Region.mines_floor_95,)),
         )
     },
@@ -32,4 +42,15 @@ the_mines = ContentPack(
     villagers=(
         villagers_data.dwarf,
     ),
+    hat_sources={
+        Hats.logo_cap: (Tag(ItemTag.HAT), TailoringSource(tailoring_items=(Fish.lava_eel,)),),
+        Hats.hard_hat: (Tag(ItemTag.HAT), MonsterSource(monsters=(Monster.duggy, Monster.duggy_dangerous, Monster.magma_duggy,),
+                                                             amount_tier=3,
+                                                             other_requirements=(RegionRequirement(region=Region.adventurer_guild),)),),
+        Hats.skeleton_mask: (Tag(ItemTag.HAT), MonsterSource(monsters=(Monster.skeleton, Monster.skeleton_mage, Monster.skeleton_dangerous,),
+                                                                  amount_tier=MAX_MONTHS,
+                                                                  other_requirements=(RegionRequirement(region=Region.adventurer_guild),)),),
+        Hats.squires_helmet: (Tag(ItemTag.HAT), MonsterSource(monsters=(Monster.metal_head,),
+                                                                   amount_tier=MAX_MONTHS),),
+    },
 )
diff --git a/worlds/stardew_valley/data/bundle_data.py b/worlds/stardew_valley/data/bundle_data.py
deleted file mode 100644
index 3f289d33cd..0000000000
--- a/worlds/stardew_valley/data/bundle_data.py
+++ /dev/null
@@ -1,906 +0,0 @@
-from ..bundles.bundle import BundleTemplate, IslandBundleTemplate, DeepBundleTemplate, CurrencyBundleTemplate, MoneyBundleTemplate, FestivalBundleTemplate
-from ..bundles.bundle_item import BundleItem
-from ..bundles.bundle_room import BundleRoomTemplate
-from ..content import content_packs
-from ..content.vanilla.base import all_fruits, all_vegetables, all_edible_mushrooms
-from ..strings.animal_product_names import AnimalProduct
-from ..strings.artisan_good_names import ArtisanGood
-from ..strings.bundle_names import CCRoom, BundleName
-from ..strings.craftable_names import Fishing, Craftable, Bomb, Consumable, Lighting
-from ..strings.crop_names import Fruit, Vegetable
-from ..strings.currency_names import Currency
-from ..strings.fertilizer_names import Fertilizer, RetainingSoil, SpeedGro
-from ..strings.fish_names import Fish, WaterItem, Trash
-from ..strings.flower_names import Flower
-from ..strings.food_names import Beverage, Meal
-from ..strings.forageable_names import Forageable, Mushroom
-from ..strings.geode_names import Geode
-from ..strings.gift_names import Gift
-from ..strings.ingredient_names import Ingredient
-from ..strings.material_names import Material
-from ..strings.metal_names import MetalBar, Artifact, Fossil, Ore, Mineral
-from ..strings.monster_drop_names import Loot
-from ..strings.quality_names import ForageQuality, ArtisanQuality, FishQuality
-from ..strings.seed_names import Seed, TreeSeed
-
-wild_horseradish = BundleItem(Forageable.wild_horseradish)
-daffodil = BundleItem(Forageable.daffodil)
-leek = BundleItem(Forageable.leek)
-dandelion = BundleItem(Forageable.dandelion)
-morel = BundleItem(Mushroom.morel)
-common_mushroom = BundleItem(Mushroom.common)
-salmonberry = BundleItem(Forageable.salmonberry)
-spring_onion = BundleItem(Forageable.spring_onion)
-
-grape = BundleItem(Fruit.grape)
-spice_berry = BundleItem(Forageable.spice_berry)
-sweet_pea = BundleItem(Forageable.sweet_pea)
-red_mushroom = BundleItem(Mushroom.red)
-fiddlehead_fern = BundleItem(Forageable.fiddlehead_fern)
-
-wild_plum = BundleItem(Forageable.wild_plum)
-hazelnut = BundleItem(Forageable.hazelnut)
-blackberry = BundleItem(Forageable.blackberry)
-chanterelle = BundleItem(Mushroom.chanterelle)
-
-winter_root = BundleItem(Forageable.winter_root)
-crystal_fruit = BundleItem(Forageable.crystal_fruit)
-snow_yam = BundleItem(Forageable.snow_yam)
-crocus = BundleItem(Forageable.crocus)
-holly = BundleItem(Forageable.holly)
-
-coconut = BundleItem(Forageable.coconut)
-cactus_fruit = BundleItem(Forageable.cactus_fruit)
-cave_carrot = BundleItem(Forageable.cave_carrot)
-purple_mushroom = BundleItem(Mushroom.purple)
-maple_syrup = BundleItem(ArtisanGood.maple_syrup)
-oak_resin = BundleItem(ArtisanGood.oak_resin)
-pine_tar = BundleItem(ArtisanGood.pine_tar)
-nautilus_shell = BundleItem(WaterItem.nautilus_shell)
-coral = BundleItem(WaterItem.coral)
-sea_urchin = BundleItem(WaterItem.sea_urchin)
-rainbow_shell = BundleItem(Forageable.rainbow_shell)
-clam = BundleItem(Fish.clam)
-cockle = BundleItem(Fish.cockle)
-mussel = BundleItem(Fish.mussel)
-oyster = BundleItem(Fish.oyster)
-seaweed = BundleItem(WaterItem.seaweed, can_have_quality=False)
-
-wood = BundleItem(Material.wood, 99)
-stone = BundleItem(Material.stone, 99)
-hardwood = BundleItem(Material.hardwood, 10)
-clay = BundleItem(Material.clay, 10)
-fiber = BundleItem(Material.fiber, 99)
-moss = BundleItem(Material.moss, 10)
-
-mixed_seeds = BundleItem(Seed.mixed)
-acorn = BundleItem(TreeSeed.acorn)
-maple_seed = BundleItem(TreeSeed.maple)
-pine_cone = BundleItem(TreeSeed.pine)
-mahogany_seed = BundleItem(TreeSeed.mahogany)
-mushroom_tree_seed = BundleItem(TreeSeed.mushroom, source=BundleItem.Sources.island)
-mystic_tree_seed = BundleItem(TreeSeed.mystic, source=BundleItem.Sources.masteries)
-mossy_seed = BundleItem(TreeSeed.mossy)
-
-strawberry_seeds = BundleItem(Seed.strawberry)
-
-blue_jazz = BundleItem(Flower.blue_jazz)
-cauliflower = BundleItem(Vegetable.cauliflower)
-green_bean = BundleItem(Vegetable.green_bean)
-kale = BundleItem(Vegetable.kale)
-parsnip = BundleItem(Vegetable.parsnip)
-potato = BundleItem(Vegetable.potato)
-strawberry = BundleItem(Fruit.strawberry, source=BundleItem.Sources.festival)
-tulip = BundleItem(Flower.tulip)
-unmilled_rice = BundleItem(Vegetable.unmilled_rice)
-coffee_bean = BundleItem(Seed.coffee)
-garlic = BundleItem(Vegetable.garlic)
-blueberry = BundleItem(Fruit.blueberry)
-corn = BundleItem(Vegetable.corn)
-hops = BundleItem(Vegetable.hops)
-hot_pepper = BundleItem(Fruit.hot_pepper)
-melon = BundleItem(Fruit.melon)
-poppy = BundleItem(Flower.poppy)
-radish = BundleItem(Vegetable.radish)
-summer_spangle = BundleItem(Flower.summer_spangle)
-sunflower = BundleItem(Flower.sunflower)
-tomato = BundleItem(Vegetable.tomato)
-wheat = BundleItem(Vegetable.wheat)
-hay = BundleItem(Forageable.hay)
-amaranth = BundleItem(Vegetable.amaranth)
-bok_choy = BundleItem(Vegetable.bok_choy)
-cranberries = BundleItem(Fruit.cranberries)
-eggplant = BundleItem(Vegetable.eggplant)
-fairy_rose = BundleItem(Flower.fairy_rose)
-pumpkin = BundleItem(Vegetable.pumpkin)
-yam = BundleItem(Vegetable.yam)
-sweet_gem_berry = BundleItem(Fruit.sweet_gem_berry)
-rhubarb = BundleItem(Fruit.rhubarb)
-beet = BundleItem(Vegetable.beet)
-red_cabbage = BundleItem(Vegetable.red_cabbage)
-starfruit = BundleItem(Fruit.starfruit)
-artichoke = BundleItem(Vegetable.artichoke)
-pineapple = BundleItem(Fruit.pineapple, source=BundleItem.Sources.content)
-taro_root = BundleItem(Vegetable.taro_root, source=BundleItem.Sources.content)
-
-carrot = BundleItem(Vegetable.carrot)
-summer_squash = BundleItem(Vegetable.summer_squash)
-broccoli = BundleItem(Vegetable.broccoli)
-powdermelon = BundleItem(Fruit.powdermelon)
-
-egg = BundleItem(AnimalProduct.egg)
-large_egg = BundleItem(AnimalProduct.large_egg)
-brown_egg = BundleItem(AnimalProduct.brown_egg)
-large_brown_egg = BundleItem(AnimalProduct.large_brown_egg)
-wool = BundleItem(AnimalProduct.wool)
-milk = BundleItem(AnimalProduct.milk)
-large_milk = BundleItem(AnimalProduct.large_milk)
-goat_milk = BundleItem(AnimalProduct.goat_milk)
-large_goat_milk = BundleItem(AnimalProduct.large_goat_milk)
-truffle = BundleItem(AnimalProduct.truffle)
-duck_feather = BundleItem(AnimalProduct.duck_feather)
-duck_egg = BundleItem(AnimalProduct.duck_egg)
-rabbit_foot = BundleItem(AnimalProduct.rabbit_foot)
-dinosaur_egg = BundleItem(AnimalProduct.dinosaur_egg)
-void_egg = BundleItem(AnimalProduct.void_egg)
-ostrich_egg = BundleItem(AnimalProduct.ostrich_egg, source=BundleItem.Sources.content)
-golden_egg = BundleItem(AnimalProduct.golden_egg)
-
-truffle_oil = BundleItem(ArtisanGood.truffle_oil)
-cloth = BundleItem(ArtisanGood.cloth)
-goat_cheese = BundleItem(ArtisanGood.goat_cheese)
-cheese = BundleItem(ArtisanGood.cheese)
-honey = BundleItem(ArtisanGood.honey)
-beer = BundleItem(Beverage.beer)
-juice = BundleItem(ArtisanGood.juice)
-mead = BundleItem(ArtisanGood.mead)
-pale_ale = BundleItem(ArtisanGood.pale_ale)
-wine = BundleItem(ArtisanGood.wine)
-jelly = BundleItem(ArtisanGood.jelly)
-pickles = BundleItem(ArtisanGood.pickles)
-caviar = BundleItem(ArtisanGood.caviar)
-aged_roe = BundleItem(ArtisanGood.aged_roe)
-roe = BundleItem(AnimalProduct.roe)
-squid_ink = BundleItem(AnimalProduct.squid_ink)
-coffee = BundleItem(Beverage.coffee)
-green_tea = BundleItem(ArtisanGood.green_tea)
-apple = BundleItem(Fruit.apple)
-apricot = BundleItem(Fruit.apricot)
-orange = BundleItem(Fruit.orange)
-peach = BundleItem(Fruit.peach)
-pomegranate = BundleItem(Fruit.pomegranate)
-cherry = BundleItem(Fruit.cherry)
-banana = BundleItem(Fruit.banana, source=BundleItem.Sources.content)
-mango = BundleItem(Fruit.mango, source=BundleItem.Sources.content)
-
-basic_fertilizer = BundleItem(Fertilizer.basic, 100)
-quality_fertilizer = BundleItem(Fertilizer.quality, 20)
-deluxe_fertilizer = BundleItem(Fertilizer.deluxe, 5, source=BundleItem.Sources.island)
-basic_retaining_soil = BundleItem(RetainingSoil.basic, 80)
-quality_retaining_soil = BundleItem(RetainingSoil.quality, 50)
-deluxe_retaining_soil = BundleItem(RetainingSoil.deluxe, 20, source=BundleItem.Sources.island)
-speed_gro = BundleItem(SpeedGro.basic, 40)
-deluxe_speed_gro = BundleItem(SpeedGro.deluxe, 20)
-hyper_speed_gro = BundleItem(SpeedGro.hyper, 5, source=BundleItem.Sources.island)
-tree_fertilizer = BundleItem(Fertilizer.tree, 20)
-
-lobster = BundleItem(Fish.lobster)
-crab = BundleItem(Fish.crab)
-shrimp = BundleItem(Fish.shrimp)
-crayfish = BundleItem(Fish.crayfish)
-snail = BundleItem(Fish.snail)
-periwinkle = BundleItem(Fish.periwinkle)
-trash = BundleItem(Trash.trash)
-driftwood = BundleItem(Trash.driftwood)
-soggy_newspaper = BundleItem(Trash.soggy_newspaper)
-broken_cd = BundleItem(Trash.broken_cd)
-broken_glasses = BundleItem(Trash.broken_glasses)
-
-chub = BundleItem(Fish.chub)
-catfish = BundleItem(Fish.catfish)
-rainbow_trout = BundleItem(Fish.rainbow_trout)
-lingcod = BundleItem(Fish.lingcod)
-walleye = BundleItem(Fish.walleye)
-perch = BundleItem(Fish.perch)
-pike = BundleItem(Fish.pike)
-bream = BundleItem(Fish.bream)
-salmon = BundleItem(Fish.salmon)
-sunfish = BundleItem(Fish.sunfish)
-tiger_trout = BundleItem(Fish.tiger_trout)
-shad = BundleItem(Fish.shad)
-smallmouth_bass = BundleItem(Fish.smallmouth_bass)
-dorado = BundleItem(Fish.dorado)
-carp = BundleItem(Fish.carp)
-midnight_carp = BundleItem(Fish.midnight_carp)
-largemouth_bass = BundleItem(Fish.largemouth_bass)
-sturgeon = BundleItem(Fish.sturgeon)
-bullhead = BundleItem(Fish.bullhead)
-tilapia = BundleItem(Fish.tilapia)
-pufferfish = BundleItem(Fish.pufferfish)
-tuna = BundleItem(Fish.tuna)
-super_cucumber = BundleItem(Fish.super_cucumber)
-flounder = BundleItem(Fish.flounder)
-anchovy = BundleItem(Fish.anchovy)
-sardine = BundleItem(Fish.sardine)
-red_mullet = BundleItem(Fish.red_mullet)
-herring = BundleItem(Fish.herring)
-eel = BundleItem(Fish.eel)
-octopus = BundleItem(Fish.octopus)
-red_snapper = BundleItem(Fish.red_snapper)
-squid = BundleItem(Fish.squid)
-sea_cucumber = BundleItem(Fish.sea_cucumber)
-albacore = BundleItem(Fish.albacore)
-halibut = BundleItem(Fish.halibut)
-scorpion_carp = BundleItem(Fish.scorpion_carp)
-sandfish = BundleItem(Fish.sandfish)
-woodskip = BundleItem(Fish.woodskip)
-lava_eel = BundleItem(Fish.lava_eel)
-ice_pip = BundleItem(Fish.ice_pip)
-stonefish = BundleItem(Fish.stonefish)
-ghostfish = BundleItem(Fish.ghostfish)
-
-bouquet = BundleItem(Gift.bouquet)
-wilted_bouquet = BundleItem(Gift.wilted_bouquet)
-copper_bar = BundleItem(MetalBar.copper)
-iron_Bar = BundleItem(MetalBar.iron)
-gold_bar = BundleItem(MetalBar.gold)
-iridium_bar = BundleItem(MetalBar.iridium)
-refined_quartz = BundleItem(MetalBar.quartz)
-coal = BundleItem(Material.coal, 5)
-iridium_ore = BundleItem(Ore.iridium)
-gold_ore = BundleItem(Ore.gold)
-iron_ore = BundleItem(Ore.iron)
-copper_ore = BundleItem(Ore.copper)
-battery_pack = BundleItem(ArtisanGood.battery_pack)
-
-quartz = BundleItem(Mineral.quartz)
-fire_quartz = BundleItem(Mineral.fire_quartz)
-frozen_tear = BundleItem(Mineral.frozen_tear)
-earth_crystal = BundleItem(Mineral.earth_crystal)
-emerald = BundleItem(Mineral.emerald)
-aquamarine = BundleItem(Mineral.aquamarine)
-ruby = BundleItem(Mineral.ruby)
-amethyst = BundleItem(Mineral.amethyst)
-topaz = BundleItem(Mineral.topaz)
-jade = BundleItem(Mineral.jade)
-
-slime = BundleItem(Loot.slime, 99)
-bug_meat = BundleItem(Loot.bug_meat, 10)
-bat_wing = BundleItem(Loot.bat_wing, 10)
-solar_essence = BundleItem(Loot.solar_essence)
-void_essence = BundleItem(Loot.void_essence)
-
-petrified_slime = BundleItem(Mineral.petrified_slime)
-blue_slime_egg = BundleItem(AnimalProduct.slime_egg_blue)
-red_slime_egg = BundleItem(AnimalProduct.slime_egg_red)
-purple_slime_egg = BundleItem(AnimalProduct.slime_egg_purple)
-green_slime_egg = BundleItem(AnimalProduct.slime_egg_green)
-tiger_slime_egg = BundleItem(AnimalProduct.slime_egg_tiger, source=BundleItem.Sources.island)
-
-cherry_bomb = BundleItem(Bomb.cherry_bomb, 5)
-bomb = BundleItem(Bomb.bomb, 2)
-mega_bomb = BundleItem(Bomb.mega_bomb)
-explosive_ammo = BundleItem(Craftable.explosive_ammo, 5)
-
-maki_roll = BundleItem(Meal.maki_roll)
-fried_egg = BundleItem(Meal.fried_egg)
-omelet = BundleItem(Meal.omelet)
-pizza = BundleItem(Meal.pizza)
-hashbrowns = BundleItem(Meal.hashbrowns)
-pancakes = BundleItem(Meal.pancakes)
-bread = BundleItem(Meal.bread)
-tortilla = BundleItem(Meal.tortilla)
-triple_shot_espresso = BundleItem(Beverage.triple_shot_espresso)
-farmer_s_lunch = BundleItem(Meal.farmer_lunch)
-survival_burger = BundleItem(Meal.survival_burger)
-dish_o_the_sea = BundleItem(Meal.dish_o_the_sea)
-miner_s_treat = BundleItem(Meal.miners_treat)
-roots_platter = BundleItem(Meal.roots_platter)
-salad = BundleItem(Meal.salad)
-cheese_cauliflower = BundleItem(Meal.cheese_cauliflower)
-parsnip_soup = BundleItem(Meal.parsnip_soup)
-fried_mushroom = BundleItem(Meal.fried_mushroom)
-salmon_dinner = BundleItem(Meal.salmon_dinner)
-pepper_poppers = BundleItem(Meal.pepper_poppers)
-spaghetti = BundleItem(Meal.spaghetti)
-sashimi = BundleItem(Meal.sashimi)
-blueberry_tart = BundleItem(Meal.blueberry_tart)
-algae_soup = BundleItem(Meal.algae_soup)
-pale_broth = BundleItem(Meal.pale_broth)
-chowder = BundleItem(Meal.chowder)
-cookie = BundleItem(Meal.cookie)
-ancient_doll = BundleItem(Artifact.ancient_doll)
-ice_cream = BundleItem(Meal.ice_cream)
-cranberry_candy = BundleItem(Meal.cranberry_candy)
-ginger_ale = BundleItem(Beverage.ginger_ale, source=BundleItem.Sources.island)
-pink_cake = BundleItem(Meal.pink_cake)
-plum_pudding = BundleItem(Meal.plum_pudding)
-chocolate_cake = BundleItem(Meal.chocolate_cake)
-rhubarb_pie = BundleItem(Meal.rhubarb_pie)
-shrimp_cocktail = BundleItem(Meal.shrimp_cocktail)
-pina_colada = BundleItem(Beverage.pina_colada, source=BundleItem.Sources.island)
-stuffing = BundleItem(Meal.stuffing)
-magic_rock_candy = BundleItem(Meal.magic_rock_candy)
-spicy_eel = BundleItem(Meal.spicy_eel)
-crab_cakes = BundleItem(Meal.crab_cakes)
-eggplant_parmesan = BundleItem(Meal.eggplant_parmesan)
-pumpkin_soup = BundleItem(Meal.pumpkin_soup)
-lucky_lunch = BundleItem(Meal.lucky_lunch)
-
-green_algae = BundleItem(WaterItem.green_algae)
-white_algae = BundleItem(WaterItem.white_algae)
-geode = BundleItem(Geode.geode)
-frozen_geode = BundleItem(Geode.frozen)
-magma_geode = BundleItem(Geode.magma)
-omni_geode = BundleItem(Geode.omni)
-sap = BundleItem(Material.sap)
-
-dwarf_scroll_1 = BundleItem(Artifact.dwarf_scroll_i)
-dwarf_scroll_2 = BundleItem(Artifact.dwarf_scroll_ii)
-dwarf_scroll_3 = BundleItem(Artifact.dwarf_scroll_iii)
-dwarf_scroll_4 = BundleItem(Artifact.dwarf_scroll_iv)
-elvish_jewelry = BundleItem(Artifact.elvish_jewelry)
-ancient_drum = BundleItem(Artifact.ancient_drum)
-dried_starfish = BundleItem(Fossil.dried_starfish)
-bone_fragment = BundleItem(Fossil.bone_fragment)
-
-golden_mask = BundleItem(Artifact.golden_mask)
-golden_relic = BundleItem(Artifact.golden_relic)
-dwarf_gadget = BundleItem(Artifact.dwarf_gadget)
-dwarvish_helm = BundleItem(Artifact.dwarvish_helm)
-prehistoric_handaxe = BundleItem(Artifact.prehistoric_handaxe)
-bone_flute = BundleItem(Artifact.bone_flute)
-anchor = BundleItem(Artifact.anchor)
-prehistoric_tool = BundleItem(Artifact.prehistoric_tool)
-chicken_statue = BundleItem(Artifact.chicken_statue)
-rusty_cog = BundleItem(Artifact.rusty_cog)
-rusty_spur = BundleItem(Artifact.rusty_spur)
-rusty_spoon = BundleItem(Artifact.rusty_spoon)
-ancient_sword = BundleItem(Artifact.ancient_sword)
-ornamental_fan = BundleItem(Artifact.ornamental_fan)
-chipped_amphora = BundleItem(Artifact.chipped_amphora)
-
-prehistoric_scapula = BundleItem(Fossil.prehistoric_scapula)
-prehistoric_tibia = BundleItem(Fossil.prehistoric_tibia)
-prehistoric_skull = BundleItem(Fossil.prehistoric_skull)
-skeletal_hand = BundleItem(Fossil.skeletal_hand)
-prehistoric_rib = BundleItem(Fossil.prehistoric_rib)
-prehistoric_vertebra = BundleItem(Fossil.prehistoric_vertebra)
-skeletal_tail = BundleItem(Fossil.skeletal_tail)
-nautilus_fossil = BundleItem(Fossil.nautilus_fossil)
-amphibian_fossil = BundleItem(Fossil.amphibian_fossil)
-palm_fossil = BundleItem(Fossil.palm_fossil)
-trilobite = BundleItem(Fossil.trilobite)
-
-dinosaur_mayo = BundleItem(ArtisanGood.dinosaur_mayonnaise)
-void_mayo = BundleItem(ArtisanGood.void_mayonnaise)
-prismatic_shard = BundleItem(Mineral.prismatic_shard)
-diamond = BundleItem(Mineral.diamond)
-ancient_fruit = BundleItem(Fruit.ancient_fruit)
-void_salmon = BundleItem(Fish.void_salmon)
-tea_leaves = BundleItem(Vegetable.tea_leaves)
-blobfish = BundleItem(Fish.blobfish)
-spook_fish = BundleItem(Fish.spook_fish)
-lionfish = BundleItem(Fish.lionfish, source=BundleItem.Sources.island)
-blue_discus = BundleItem(Fish.blue_discus, source=BundleItem.Sources.island)
-stingray = BundleItem(Fish.stingray, source=BundleItem.Sources.island)
-spookfish = BundleItem(Fish.spookfish)
-midnight_squid = BundleItem(Fish.midnight_squid)
-
-angler = BundleItem(Fish.angler)
-crimsonfish = BundleItem(Fish.crimsonfish)
-mutant_carp = BundleItem(Fish.mutant_carp)
-glacierfish = BundleItem(Fish.glacierfish)
-legend = BundleItem(Fish.legend)
-
-spinner = BundleItem(Fishing.spinner)
-dressed_spinner = BundleItem(Fishing.dressed_spinner)
-trap_bobber = BundleItem(Fishing.trap_bobber)
-sonar_bobber = BundleItem(Fishing.sonar_bobber)
-cork_bobber = BundleItem(Fishing.cork_bobber)
-lead_bobber = BundleItem(Fishing.lead_bobber)
-treasure_hunter = BundleItem(Fishing.treasure_hunter)
-barbed_hook = BundleItem(Fishing.barbed_hook)
-curiosity_lure = BundleItem(Fishing.curiosity_lure)
-quality_bobber = BundleItem(Fishing.quality_bobber)
-bait = BundleItem(Fishing.bait, 100)
-deluxe_bait = BundleItem(Fishing.deluxe_bait, 50)
-magnet = BundleItem(Fishing.magnet)
-wild_bait = BundleItem(Fishing.wild_bait, 20)
-magic_bait = BundleItem(Fishing.magic_bait, 10, source=BundleItem.Sources.island)
-pearl = BundleItem(Gift.pearl)
-challenge_bait = BundleItem(Fishing.challenge_bait, 25, source=BundleItem.Sources.masteries)
-targeted_bait = BundleItem(ArtisanGood.targeted_bait, 25, source=BundleItem.Sources.content)
-
-ginger = BundleItem(Forageable.ginger, source=BundleItem.Sources.content)
-magma_cap = BundleItem(Mushroom.magma_cap, source=BundleItem.Sources.content)
-
-wheat_flour = BundleItem(Ingredient.wheat_flour)
-sugar = BundleItem(Ingredient.sugar)
-vinegar = BundleItem(Ingredient.vinegar)
-
-jack_o_lantern = BundleItem(Lighting.jack_o_lantern)
-prize_ticket = BundleItem(Currency.prize_ticket)
-mystery_box = BundleItem(Consumable.mystery_box)
-gold_mystery_box = BundleItem(Consumable.gold_mystery_box, source=BundleItem.Sources.masteries)
-calico_egg = BundleItem(Currency.calico_egg)
-
-raccoon_crab_pot_fish_items = [periwinkle.as_amount(5), snail.as_amount(5), crayfish.as_amount(5), mussel.as_amount(5),
-                               oyster.as_amount(5), cockle.as_amount(5), clam.as_amount(5)]
-raccoon_smoked_fish_items = [BundleItem(ArtisanGood.smoked_fish, flavor=fish) for fish in
-                             [Fish.largemouth_bass, Fish.bream, Fish.bullhead, Fish.chub, Fish.ghostfish, Fish.flounder, Fish.shad,
-                              Fish.rainbow_trout, Fish.tilapia, Fish.red_mullet, Fish.tuna, Fish.midnight_carp, Fish.salmon, Fish.perch]]
-raccoon_fish_items_flat = [*raccoon_crab_pot_fish_items, *raccoon_smoked_fish_items]
-raccoon_fish_items_deep = [raccoon_crab_pot_fish_items, raccoon_smoked_fish_items]
-raccoon_fish_bundle_vanilla = DeepBundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_fish, raccoon_fish_items_deep, 2, 2)
-raccoon_fish_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_fish, raccoon_fish_items_flat, 3, 2)
-
-all_specific_jellies = [BundleItem(ArtisanGood.jelly, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits]
-all_specific_pickles = [BundleItem(ArtisanGood.pickles, flavor=vegetable, source=BundleItem.Sources.content) for vegetable in all_vegetables]
-all_specific_dried_fruits = [*[BundleItem(ArtisanGood.dried_fruit, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits],
-                             BundleItem(ArtisanGood.raisins, source=BundleItem.Sources.content)]
-all_specific_juices = [BundleItem(ArtisanGood.juice, flavor=vegetable, source=BundleItem.Sources.content) for vegetable in all_vegetables]
-raccoon_artisan_items = [*all_specific_jellies, *all_specific_pickles, *all_specific_dried_fruits, *all_specific_juices]
-raccoon_artisan_bundle_vanilla = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_artisan, raccoon_artisan_items, 2, 2)
-raccoon_artisan_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_artisan, raccoon_artisan_items, 3, 2)
-
-all_specific_dried_mushrooms = [BundleItem(ArtisanGood.dried_mushroom, flavor=mushroom, source=BundleItem.Sources.content) for mushroom in all_edible_mushrooms]
-raccoon_food_items = [egg.as_amount(5), cave_carrot.as_amount(5), white_algae.as_amount(5)]
-raccoon_food_items_vanilla = [all_specific_dried_mushrooms, raccoon_food_items]
-raccoon_food_items_thematic = [*all_specific_dried_mushrooms, *raccoon_food_items, brown_egg.as_amount(5), large_egg.as_amount(2), large_brown_egg.as_amount(2),
-                               green_algae.as_amount(10)]
-raccoon_food_bundle_vanilla = DeepBundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_food, raccoon_food_items_vanilla, 2, 2)
-raccoon_food_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_food, raccoon_food_items_thematic, 3, 2)
-
-raccoon_foraging_items = [moss, rusty_spoon, trash.as_amount(5), slime.as_amount(99), bat_wing.as_amount(10), geode.as_amount(8),
-                          frozen_geode.as_amount(5), magma_geode.as_amount(3), coral.as_amount(4), sea_urchin.as_amount(2), bug_meat.as_amount(10),
-                          diamond, topaz.as_amount(3), ghostfish.as_amount(3)]
-raccoon_foraging_bundle_vanilla = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_foraging, raccoon_foraging_items, 2, 2)
-raccoon_foraging_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_foraging, raccoon_foraging_items, 3, 2)
-
-raccoon_bundles_vanilla = [raccoon_fish_bundle_vanilla, raccoon_artisan_bundle_vanilla, raccoon_food_bundle_vanilla, raccoon_foraging_bundle_vanilla]
-raccoon_bundles_thematic = [raccoon_fish_bundle_thematic, raccoon_artisan_bundle_thematic, raccoon_food_bundle_thematic, raccoon_foraging_bundle_thematic]
-raccoon_bundles_remixed = raccoon_bundles_thematic
-raccoon_vanilla = BundleRoomTemplate(CCRoom.raccoon_requests, raccoon_bundles_vanilla, 8)
-raccoon_thematic = BundleRoomTemplate(CCRoom.raccoon_requests, raccoon_bundles_thematic, 8)
-raccoon_remixed = BundleRoomTemplate(CCRoom.raccoon_requests, raccoon_bundles_remixed, 8)
-
-# Crafts Room
-spring_foraging_items_vanilla = [wild_horseradish, daffodil, leek, dandelion]
-spring_foraging_items_thematic = [*spring_foraging_items_vanilla, spring_onion, salmonberry, morel]
-spring_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.spring_foraging, spring_foraging_items_vanilla, 4, 4)
-spring_foraging_bundle_thematic = BundleTemplate.extend_from(spring_foraging_bundle_vanilla, spring_foraging_items_thematic)
-
-summer_foraging_items_vanilla = [grape, spice_berry, sweet_pea]
-summer_foraging_items_thematic = [*summer_foraging_items_vanilla, fiddlehead_fern, red_mushroom, rainbow_shell]
-summer_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.summer_foraging, summer_foraging_items_vanilla, 3, 3)
-summer_foraging_bundle_thematic = BundleTemplate.extend_from(summer_foraging_bundle_vanilla, summer_foraging_items_thematic)
-
-fall_foraging_items_vanilla = [common_mushroom, wild_plum, hazelnut, blackberry]
-fall_foraging_items_thematic = [*fall_foraging_items_vanilla, chanterelle]
-fall_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.fall_foraging, fall_foraging_items_vanilla, 4, 4)
-fall_foraging_bundle_thematic = BundleTemplate.extend_from(fall_foraging_bundle_vanilla, fall_foraging_items_thematic)
-
-winter_foraging_items_vanilla = [winter_root, crystal_fruit, snow_yam, crocus]
-winter_foraging_items_thematic = [*winter_foraging_items_vanilla, holly, nautilus_shell]
-winter_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.winter_foraging, winter_foraging_items_vanilla, 4, 4)
-winter_foraging_bundle_thematic = BundleTemplate.extend_from(winter_foraging_bundle_vanilla, winter_foraging_items_thematic)
-
-construction_items_vanilla = [wood, stone, hardwood]
-construction_items_thematic = [*construction_items_vanilla, clay, fiber, sap.as_amount(50)]
-construction_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.construction, construction_items_vanilla, 4, 4)
-construction_bundle_thematic = BundleTemplate.extend_from(construction_bundle_vanilla, construction_items_thematic)
-
-exotic_foraging_items_vanilla = [coconut, cactus_fruit, cave_carrot, red_mushroom, purple_mushroom, maple_syrup, oak_resin, pine_tar, morel]
-exotic_foraging_items_thematic = [*exotic_foraging_items_vanilla, coral, sea_urchin, clam, cockle, mussel, oyster, seaweed]
-exotic_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.exotic_foraging, exotic_foraging_items_vanilla, 9, 5)
-exotic_foraging_bundle_thematic = BundleTemplate.extend_from(exotic_foraging_bundle_vanilla, exotic_foraging_items_thematic)
-
-beach_foraging_items = [nautilus_shell, coral, sea_urchin, rainbow_shell, clam, cockle, mussel, oyster, seaweed]
-beach_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.beach_foraging, beach_foraging_items, 4, 4)
-
-mines_foraging_items = [quartz, earth_crystal, frozen_tear, fire_quartz, red_mushroom, purple_mushroom, cave_carrot]
-mines_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.mines_foraging, mines_foraging_items, 4, 4)
-
-desert_foraging_items = [cactus_fruit.as_quality(ForageQuality.gold), cactus_fruit.as_amount(5), coconut.as_quality(ForageQuality.gold), coconut.as_amount(5)]
-desert_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.desert_foraging, desert_foraging_items, 2, 2)
-
-island_foraging_items = [ginger.as_amount(5), magma_cap.as_quality(ForageQuality.gold), magma_cap.as_amount(5),
-                         fiddlehead_fern.as_quality(ForageQuality.gold), fiddlehead_fern.as_amount(5)]
-island_foraging_bundle = IslandBundleTemplate(CCRoom.crafts_room, BundleName.island_foraging, island_foraging_items, 2, 2)
-
-sticky_items = [sap.as_amount(500), sap.as_amount(500)]
-sticky_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.sticky, sticky_items, 1, 1)
-
-forest_items = [moss, fiber.as_amount(200), acorn.as_amount(10), maple_seed.as_amount(10), pine_cone.as_amount(10), mahogany_seed,
-                mushroom_tree_seed, mossy_seed.as_amount(5), mystic_tree_seed]
-forest_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.forest, forest_items, 4, 2)
-
-wild_medicine_items = [item.as_amount(5) for item in [purple_mushroom, fiddlehead_fern, white_algae, hops, blackberry, dandelion]]
-wild_medicine_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.wild_medicine, wild_medicine_items, 4, 3)
-
-quality_foraging_items = sorted({item.as_quality(ForageQuality.gold).as_amount(3)
-                                 for item in
-                                 [*spring_foraging_items_thematic, *summer_foraging_items_thematic, *fall_foraging_items_thematic,
-                                  *winter_foraging_items_thematic, *beach_foraging_items, *desert_foraging_items, magma_cap] if item.can_have_quality})
-quality_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.quality_foraging, quality_foraging_items, 4, 3)
-
-green_rain_items = [moss.as_amount(200), fiber.as_amount(200), mossy_seed.as_amount(20), fiddlehead_fern.as_amount(10)]
-green_rain_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.green_rain, green_rain_items, 4, 3)
-
-crafts_room_bundles_vanilla = [spring_foraging_bundle_vanilla, summer_foraging_bundle_vanilla, fall_foraging_bundle_vanilla,
-                               winter_foraging_bundle_vanilla, construction_bundle_vanilla, exotic_foraging_bundle_vanilla]
-crafts_room_bundles_thematic = [spring_foraging_bundle_thematic, summer_foraging_bundle_thematic, fall_foraging_bundle_thematic,
-                                winter_foraging_bundle_thematic, construction_bundle_thematic, exotic_foraging_bundle_thematic]
-crafts_room_bundles_remixed = [*crafts_room_bundles_thematic, beach_foraging_bundle, mines_foraging_bundle, desert_foraging_bundle,
-                               island_foraging_bundle, sticky_bundle, forest_bundle, wild_medicine_bundle, quality_foraging_bundle, green_rain_bundle]
-crafts_room_vanilla = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_vanilla, 6)
-crafts_room_thematic = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_thematic, 6)
-crafts_room_remixed = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_remixed, 6)
-
-# Pantry
-spring_crops_items_vanilla = [parsnip, green_bean, cauliflower, potato]
-spring_crops_items_thematic = [*spring_crops_items_vanilla, blue_jazz, coffee_bean, garlic, kale, rhubarb, strawberry, tulip, unmilled_rice, carrot]
-spring_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.spring_crops, spring_crops_items_vanilla, 4, 4)
-spring_crops_bundle_thematic = BundleTemplate.extend_from(spring_crops_bundle_vanilla, spring_crops_items_thematic)
-
-summer_crops_items_vanilla = [tomato, hot_pepper, blueberry, melon]
-summer_crops_items_thematic = [*summer_crops_items_vanilla, corn, hops, poppy, radish, red_cabbage, starfruit, summer_spangle, sunflower, wheat, summer_squash]
-summer_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.summer_crops, summer_crops_items_vanilla, 4, 4)
-summer_crops_bundle_thematic = BundleTemplate.extend_from(summer_crops_bundle_vanilla, summer_crops_items_thematic)
-
-fall_crops_items_vanilla = [corn, eggplant, pumpkin, yam]
-fall_crops_items_thematic = [*fall_crops_items_vanilla, amaranth, artichoke, beet, bok_choy, cranberries, fairy_rose, grape,
-                             sunflower, wheat, sweet_gem_berry, broccoli]
-fall_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.fall_crops, fall_crops_items_vanilla, 4, 4)
-fall_crops_bundle_thematic = BundleTemplate.extend_from(fall_crops_bundle_vanilla, fall_crops_items_thematic)
-
-all_crops_items = sorted({*spring_crops_items_thematic, *summer_crops_items_thematic, *fall_crops_items_thematic, powdermelon})
-
-quality_crops_items_vanilla = [item.as_quality_crop() for item in [parsnip, melon, pumpkin, corn]]
-quality_crops_items_thematic = [item.as_quality_crop() for item in all_crops_items]
-quality_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.quality_crops, quality_crops_items_vanilla, 4, 3)
-quality_crops_bundle_thematic = BundleTemplate.extend_from(quality_crops_bundle_vanilla, quality_crops_items_thematic)
-
-animal_items_vanilla = [large_milk, large_brown_egg, large_egg, large_goat_milk, wool, duck_egg]
-animal_items_thematic = [*animal_items_vanilla, egg, brown_egg, milk, goat_milk, truffle,
-                         duck_feather, rabbit_foot, dinosaur_egg, void_egg, golden_egg, ostrich_egg]
-animal_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.animal, animal_items_vanilla, 6, 5)
-animal_bundle_thematic = BundleTemplate.extend_from(animal_bundle_vanilla, animal_items_thematic)
-
-artisan_items_vanilla = [truffle_oil, cloth, goat_cheese, cheese, honey, jelly, apple, apricot, orange, peach, pomegranate, cherry]
-artisan_items_thematic = [*artisan_items_vanilla, beer, juice, mead, pale_ale, wine, pickles, caviar, aged_roe, coffee, green_tea, banana, mango]
-artisan_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.artisan, artisan_items_vanilla, 12, 6)
-artisan_bundle_thematic = BundleTemplate.extend_from(artisan_bundle_vanilla, artisan_items_thematic)
-
-rare_crops_items = [ancient_fruit, sweet_gem_berry]
-rare_crops_bundle = BundleTemplate(CCRoom.pantry, BundleName.rare_crops, rare_crops_items, 2, 2)
-
-# all_specific_roes = [BundleItem(AnimalProduct.roe, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fish]
-fish_farmer_items = [roe.as_amount(15), aged_roe.as_amount(5), squid_ink, caviar.as_amount(5)]
-fish_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.fish_farmer, fish_farmer_items, 3, 2)
-
-garden_items = [tulip, blue_jazz, summer_spangle, sunflower, fairy_rose, poppy, bouquet]
-garden_bundle = BundleTemplate(CCRoom.pantry, BundleName.garden, garden_items, 5, 4)
-
-brewer_items = [mead, pale_ale, wine, juice, green_tea, beer]
-brewer_bundle = BundleTemplate(CCRoom.pantry, BundleName.brewer, brewer_items, 5, 4)
-
-orchard_items = [apple, apricot, orange, peach, pomegranate, cherry, banana, mango]
-orchard_bundle = BundleTemplate(CCRoom.pantry, BundleName.orchard, orchard_items, 6, 4)
-
-island_crops_items = [pineapple, taro_root, banana, mango]
-island_crops_bundle = IslandBundleTemplate(CCRoom.pantry, BundleName.island_crops, island_crops_items, 3, 3)
-
-agronomist_items = [basic_fertilizer, quality_fertilizer, deluxe_fertilizer,
-                    basic_retaining_soil, quality_retaining_soil, deluxe_retaining_soil,
-                    speed_gro, deluxe_speed_gro, hyper_speed_gro, tree_fertilizer]
-agronomist_bundle = BundleTemplate(CCRoom.pantry, BundleName.agronomist, agronomist_items, 4, 3)
-
-slime_farmer_items = [slime.as_amount(99), petrified_slime.as_amount(10), blue_slime_egg, red_slime_egg,
-                      purple_slime_egg, green_slime_egg, tiger_slime_egg]
-slime_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.slime_farmer, slime_farmer_items, 4, 3)
-
-sommelier_items = [BundleItem(ArtisanGood.wine, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits]
-sommelier_bundle = BundleTemplate(CCRoom.pantry, BundleName.sommelier, sommelier_items, 6, 3)
-
-dry_items = [*[BundleItem(ArtisanGood.dried_fruit, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits],
-             *[BundleItem(ArtisanGood.dried_mushroom, flavor=mushroom, source=BundleItem.Sources.content) for mushroom in all_edible_mushrooms],
-             BundleItem(ArtisanGood.raisins, source=BundleItem.Sources.content)]
-dry_bundle = BundleTemplate(CCRoom.pantry, BundleName.dry, dry_items, 6, 3)
-
-pantry_bundles_vanilla = [spring_crops_bundle_vanilla, summer_crops_bundle_vanilla, fall_crops_bundle_vanilla,
-                          quality_crops_bundle_vanilla, animal_bundle_vanilla, artisan_bundle_vanilla]
-pantry_bundles_thematic = [spring_crops_bundle_thematic, summer_crops_bundle_thematic, fall_crops_bundle_thematic,
-                           quality_crops_bundle_thematic, animal_bundle_thematic, artisan_bundle_thematic]
-pantry_bundles_remixed = [*pantry_bundles_thematic, rare_crops_bundle, fish_farmer_bundle, garden_bundle,
-                          brewer_bundle, orchard_bundle, island_crops_bundle, agronomist_bundle, slime_farmer_bundle, sommelier_bundle, dry_bundle]
-pantry_vanilla = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_vanilla, 6)
-pantry_thematic = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_thematic, 6)
-pantry_remixed = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_remixed, 6)
-
-# Fish Tank
-river_fish_items_vanilla = [sunfish, catfish, shad, tiger_trout]
-river_fish_items_thematic = [*river_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, pike, bream, salmon, smallmouth_bass, dorado]
-river_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.river_fish, river_fish_items_vanilla, 4, 4)
-river_fish_bundle_thematic = BundleTemplate.extend_from(river_fish_bundle_vanilla, river_fish_items_thematic)
-
-lake_fish_items_vanilla = [largemouth_bass, carp, bullhead, sturgeon]
-lake_fish_items_thematic = [*lake_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, midnight_carp]
-lake_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.lake_fish, lake_fish_items_vanilla, 4, 4)
-lake_fish_bundle_thematic = BundleTemplate.extend_from(lake_fish_bundle_vanilla, lake_fish_items_thematic)
-
-ocean_fish_items_vanilla = [sardine, tuna, red_snapper, tilapia]
-ocean_fish_items_thematic = [*ocean_fish_items_vanilla, pufferfish, super_cucumber, flounder, anchovy, red_mullet,
-                             herring, eel, octopus, squid, sea_cucumber, albacore, halibut]
-ocean_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.ocean_fish, ocean_fish_items_vanilla, 4, 4)
-ocean_fish_bundle_thematic = BundleTemplate.extend_from(ocean_fish_bundle_vanilla, ocean_fish_items_thematic)
-
-night_fish_items_vanilla = [walleye, bream, eel]
-night_fish_items_thematic = [*night_fish_items_vanilla, super_cucumber, squid, midnight_carp, midnight_squid]
-night_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.night_fish, night_fish_items_vanilla, 3, 3)
-night_fish_bundle_thematic = BundleTemplate.extend_from(night_fish_bundle_vanilla, night_fish_items_thematic)
-
-crab_pot_items_vanilla = [lobster, crayfish, crab, cockle, mussel, shrimp, snail, periwinkle, oyster, clam]
-crab_pot_trash_items = [trash, driftwood, soggy_newspaper, broken_cd, broken_glasses]
-crab_pot_items_thematic = [*crab_pot_items_vanilla, *crab_pot_trash_items]
-crab_pot_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.crab_pot, crab_pot_items_vanilla, 10, 5)
-crab_pot_bundle_thematic = BundleTemplate.extend_from(crab_pot_bundle_vanilla, crab_pot_items_thematic)
-trash_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.trash, crab_pot_trash_items, 4, 4)
-
-specialty_fish_items_vanilla = [pufferfish, ghostfish, sandfish, woodskip]
-specialty_fish_items_thematic = [*specialty_fish_items_vanilla, scorpion_carp, eel, octopus, lava_eel, ice_pip,
-                                 stonefish, void_salmon, stingray, spookfish, midnight_squid]
-specialty_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.specialty_fish, specialty_fish_items_vanilla, 4, 4)
-specialty_fish_bundle_thematic = BundleTemplate.extend_from(specialty_fish_bundle_vanilla, specialty_fish_items_thematic)
-
-spring_fish_items = [herring, halibut, shad, flounder, sunfish, sardine, catfish, anchovy, smallmouth_bass, eel, legend]
-spring_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.spring_fish, spring_fish_items, 4, 4)
-
-summer_fish_items = [tuna, pike, red_mullet, sturgeon, red_snapper, super_cucumber, tilapia, pufferfish, rainbow_trout,
-                     octopus, dorado, halibut, shad, flounder, sunfish, crimsonfish]
-summer_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.summer_fish, summer_fish_items, 4, 4)
-
-fall_fish_items = [red_snapper, super_cucumber, tilapia, shad, sardine, catfish, anchovy, smallmouth_bass, eel, midnight_carp,
-                   walleye, sea_cucumber, tiger_trout, albacore, salmon, angler]
-fall_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.fall_fish, fall_fish_items, 4, 4)
-
-winter_fish_items = [perch, squid, lingcod, tuna, pike, red_mullet, sturgeon, red_snapper, herring, halibut, sardine,
-                     midnight_carp, sea_cucumber, tiger_trout, albacore, glacierfish]
-winter_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.winter_fish, winter_fish_items, 4, 4)
-
-rain_fish_items = [red_snapper, shad, catfish, eel, walleye]
-rain_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.rain_fish, rain_fish_items, 3, 3)
-
-quality_fish_items = sorted({
-    item.as_quality(FishQuality.gold).as_amount(2)
-    for item in [*river_fish_items_thematic, *lake_fish_items_thematic, *ocean_fish_items_thematic]
-})
-quality_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.quality_fish, quality_fish_items, 4, 3)
-
-master_fisher_items = [lava_eel, scorpion_carp, octopus, blobfish, lingcod, ice_pip, super_cucumber, stingray, void_salmon, pufferfish]
-master_fisher_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.master_fisher, master_fisher_items, 4, 2)
-
-legendary_fish_items = [angler, legend, mutant_carp, crimsonfish, glacierfish]
-legendary_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.legendary_fish, legendary_fish_items, 4, 2)
-
-island_fish_items = [lionfish, blue_discus, stingray]
-island_fish_bundle = IslandBundleTemplate(CCRoom.fish_tank, BundleName.island_fish, island_fish_items, 3, 3)
-
-tackle_items = [spinner, dressed_spinner, trap_bobber, sonar_bobber, cork_bobber, lead_bobber, treasure_hunter, barbed_hook, curiosity_lure, quality_bobber]
-tackle_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.tackle, tackle_items, 3, 2)
-
-bait_items = [bait, magnet, wild_bait, magic_bait, challenge_bait, deluxe_bait, targeted_bait]
-bait_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.bait, bait_items, 3, 2)
-
-# This bundle could change based on content packs, once the fish are properly in it. Until then, I'm not sure how, so pelican town only
-specific_bait_items = [BundleItem(ArtisanGood.targeted_bait, flavor=fish.name).as_amount(10) for fish in content_packs.pelican_town.fishes]
-specific_bait_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.specific_bait, specific_bait_items, 6, 3)
-
-deep_fishing_items = [blobfish, spook_fish, midnight_squid, sea_cucumber, super_cucumber, octopus, pearl, seaweed]
-deep_fishing_bundle = FestivalBundleTemplate(CCRoom.fish_tank, BundleName.deep_fishing, deep_fishing_items, 4, 3)
-
-smokeable_fish = [Fish.largemouth_bass, Fish.bream, Fish.bullhead, Fish.chub, Fish.ghostfish, Fish.flounder, Fish.shad, Fish.rainbow_trout, Fish.tilapia,
-                  Fish.red_mullet, Fish.tuna, Fish.midnight_carp, Fish.salmon, Fish.perch]
-fish_smoker_items = [BundleItem(ArtisanGood.smoked_fish, flavor=fish) for fish in smokeable_fish]
-fish_smoker_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.fish_smoker, fish_smoker_items, 6, 3)
-
-fish_tank_bundles_vanilla = [river_fish_bundle_vanilla, lake_fish_bundle_vanilla, ocean_fish_bundle_vanilla,
-                             night_fish_bundle_vanilla, crab_pot_bundle_vanilla, specialty_fish_bundle_vanilla]
-fish_tank_bundles_thematic = [river_fish_bundle_thematic, lake_fish_bundle_thematic, ocean_fish_bundle_thematic,
-                              night_fish_bundle_thematic, crab_pot_bundle_thematic, specialty_fish_bundle_thematic]
-fish_tank_bundles_remixed = [*fish_tank_bundles_thematic, spring_fish_bundle, summer_fish_bundle, fall_fish_bundle, winter_fish_bundle, trash_bundle,
-                             rain_fish_bundle, quality_fish_bundle, master_fisher_bundle, legendary_fish_bundle, tackle_bundle, bait_bundle,
-                             specific_bait_bundle, deep_fishing_bundle, fish_smoker_bundle]
-
-# In Remixed, the trash items are in the recycling bundle, so we don't use the thematic version of the crab pot bundle that added trash items to it
-fish_tank_bundles_remixed.remove(crab_pot_bundle_thematic)
-fish_tank_bundles_remixed.append(crab_pot_bundle_vanilla)
-fish_tank_vanilla = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_vanilla, 6)
-fish_tank_thematic = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_thematic, 6)
-fish_tank_remixed = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_remixed, 6)
-
-# Boiler Room
-blacksmith_items_vanilla = [copper_bar, iron_Bar, gold_bar]
-blacksmith_items_thematic = [*blacksmith_items_vanilla, iridium_bar, refined_quartz.as_amount(3), wilted_bouquet]
-blacksmith_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.blacksmith, blacksmith_items_vanilla, 3, 3)
-blacksmith_bundle_thematic = BundleTemplate.extend_from(blacksmith_bundle_vanilla, blacksmith_items_thematic)
-
-geologist_items_vanilla = [quartz, earth_crystal, frozen_tear, fire_quartz]
-geologist_items_thematic = [*geologist_items_vanilla, emerald, aquamarine, ruby, amethyst, topaz, jade, diamond]
-geologist_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.geologist, geologist_items_vanilla, 4, 4)
-geologist_bundle_thematic = BundleTemplate.extend_from(geologist_bundle_vanilla, geologist_items_thematic)
-
-adventurer_items_vanilla = [slime, bat_wing, solar_essence, void_essence]
-adventurer_items_thematic = [*adventurer_items_vanilla, bug_meat, coal, bone_fragment.as_amount(10)]
-adventurer_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.adventurer, adventurer_items_vanilla, 4, 2)
-adventurer_bundle_thematic = BundleTemplate.extend_from(adventurer_bundle_vanilla, adventurer_items_thematic)
-
-# Where to put radioactive bar?
-treasure_hunter_items = [emerald, aquamarine, ruby, amethyst, topaz, jade, diamond]
-treasure_hunter_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.treasure_hunter, treasure_hunter_items, 6, 5)
-
-engineer_items = [iridium_ore.as_amount(5), battery_pack, refined_quartz.as_amount(5), diamond]
-engineer_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.engineer, engineer_items, 3, 3)
-
-demolition_items = [cherry_bomb, bomb, mega_bomb, explosive_ammo]
-demolition_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.demolition, demolition_items, 3, 3)
-
-recycling_items = [stone, coal, iron_ore, wood, cloth, refined_quartz]
-recycling_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.recycling, recycling_items, 4, 4)
-
-archaeologist_items = [golden_mask, golden_relic, ancient_drum, dwarf_gadget, dwarvish_helm, prehistoric_handaxe, bone_flute, anchor, prehistoric_tool,
-                       chicken_statue, rusty_cog, rusty_spur, rusty_spoon, ancient_sword, ornamental_fan, elvish_jewelry, ancient_doll, chipped_amphora]
-archaeologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.archaeologist, archaeologist_items, 6, 3)
-
-paleontologist_items = [prehistoric_scapula, prehistoric_tibia, prehistoric_skull, skeletal_hand, prehistoric_rib, prehistoric_vertebra, skeletal_tail,
-                        nautilus_fossil, amphibian_fossil, palm_fossil, trilobite]
-paleontologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.paleontologist, paleontologist_items, 6, 3)
-
-boiler_room_bundles_vanilla = [blacksmith_bundle_vanilla, geologist_bundle_vanilla, adventurer_bundle_vanilla]
-boiler_room_bundles_thematic = [blacksmith_bundle_thematic, geologist_bundle_thematic, adventurer_bundle_thematic]
-boiler_room_bundles_remixed = [*boiler_room_bundles_thematic, treasure_hunter_bundle, engineer_bundle,
-                               demolition_bundle, recycling_bundle, archaeologist_bundle, paleontologist_bundle]
-boiler_room_vanilla = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_vanilla, 3)
-boiler_room_thematic = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_thematic, 3)
-boiler_room_remixed = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_remixed, 3)
-
-# Bulletin Board
-chef_items_vanilla = [maple_syrup, fiddlehead_fern, truffle, poppy, maki_roll, fried_egg]
-# More recipes?
-chef_items_thematic = [maki_roll, fried_egg, omelet, pizza, hashbrowns, pancakes, bread, tortilla,
-                       farmer_s_lunch, survival_burger, dish_o_the_sea, miner_s_treat, roots_platter, salad,
-                       cheese_cauliflower, parsnip_soup, fried_mushroom, salmon_dinner, pepper_poppers, spaghetti,
-                       sashimi, blueberry_tart, algae_soup, pale_broth, chowder]
-chef_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.chef, chef_items_vanilla, 6, 6)
-chef_bundle_thematic = BundleTemplate.extend_from(chef_bundle_vanilla, chef_items_thematic)
-
-dye_items_vanilla = [red_mushroom, sea_urchin, sunflower, duck_feather, aquamarine, red_cabbage]
-dye_red_items = [cranberries, hot_pepper, radish, rhubarb, spaghetti, strawberry, tomato, tulip, red_mushroom]
-dye_orange_items = [poppy, pumpkin, apricot, orange, spice_berry, winter_root]
-dye_yellow_items = [corn, parsnip, summer_spangle, sunflower, starfruit]
-dye_green_items = [fiddlehead_fern, kale, artichoke, bok_choy, green_bean, cactus_fruit, duck_feather, dinosaur_egg]
-dye_blue_items = [blueberry, blue_jazz, blackberry, crystal_fruit, aquamarine]
-dye_purple_items = [beet, crocus, eggplant, red_cabbage, sweet_pea, iridium_bar, sea_urchin, amaranth]
-dye_items_thematic = [dye_red_items, dye_orange_items, dye_yellow_items, dye_green_items, dye_blue_items, dye_purple_items]
-dye_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_vanilla, 6, 6)
-dye_bundle_thematic = DeepBundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_thematic, 6, 6)
-
-field_research_items_vanilla = [purple_mushroom, nautilus_shell, chub, frozen_geode]
-field_research_items_thematic = [*field_research_items_vanilla, geode, magma_geode, omni_geode,
-                                 rainbow_shell, amethyst, bream, carp]
-field_research_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.field_research, field_research_items_vanilla, 4, 4)
-field_research_bundle_thematic = BundleTemplate.extend_from(field_research_bundle_vanilla, field_research_items_thematic)
-
-fodder_items_vanilla = [wheat.as_amount(10), hay.as_amount(10), apple.as_amount(3)]
-fodder_items_thematic = [*fodder_items_vanilla, kale.as_amount(3), corn.as_amount(3), green_bean.as_amount(3),
-                         potato.as_amount(3), green_algae.as_amount(5), white_algae.as_amount(3)]
-fodder_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.fodder, fodder_items_vanilla, 3, 3)
-fodder_bundle_thematic = BundleTemplate.extend_from(fodder_bundle_vanilla, fodder_items_thematic)
-
-enchanter_items_vanilla = [oak_resin, wine, rabbit_foot, pomegranate]
-enchanter_items_thematic = [*enchanter_items_vanilla, purple_mushroom, solar_essence,
-                            super_cucumber, void_essence, fire_quartz, frozen_tear, jade]
-enchanter_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.enchanter, enchanter_items_vanilla, 4, 4)
-enchanter_bundle_thematic = BundleTemplate.extend_from(enchanter_bundle_vanilla, enchanter_items_thematic)
-
-children_items = [salmonberry.as_amount(10), cookie, ancient_doll, ice_cream, cranberry_candy, ginger_ale,
-                  grape.as_amount(10), pink_cake, snail, fairy_rose, plum_pudding]
-children_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.children, children_items, 4, 3)
-
-forager_items = [salmonberry.as_amount(50), blackberry.as_amount(50), wild_plum.as_amount(20), snow_yam.as_amount(20),
-                 common_mushroom.as_amount(20), grape.as_amount(20), spring_onion.as_amount(20)]
-forager_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.forager, forager_items, 3, 2)
-
-home_cook_items = [egg.as_amount(10), milk.as_amount(10), wheat_flour.as_amount(100), sugar.as_amount(100), vinegar.as_amount(100),
-                   chocolate_cake, pancakes, rhubarb_pie]
-home_cook_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.home_cook, home_cook_items, 3, 3)
-
-helper_items = [prize_ticket, mystery_box.as_amount(5), gold_mystery_box]
-helper_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.helper, helper_items, 2, 2)
-
-spirit_eve_items = [jack_o_lantern, corn.as_amount(10), bat_wing.as_amount(10)]
-spirit_eve_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.spirit_eve, spirit_eve_items, 3, 3)
-
-winter_star_items = [holly.as_amount(5), plum_pudding, stuffing, powdermelon.as_amount(5)]
-winter_star_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.winter_star, winter_star_items, 2, 2)
-
-bartender_items = [shrimp_cocktail, triple_shot_espresso, ginger_ale, cranberry_candy, beer, pale_ale, pina_colada]
-bartender_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.bartender, bartender_items, 3, 3)
-
-calico_items = [calico_egg.as_amount(200), calico_egg.as_amount(200), calico_egg.as_amount(200), calico_egg.as_amount(200),
-                magic_rock_candy, mega_bomb.as_amount(10), mystery_box.as_amount(10), mixed_seeds.as_amount(50),
-                strawberry_seeds.as_amount(20),
-                spicy_eel.as_amount(5), crab_cakes.as_amount(5), eggplant_parmesan.as_amount(5),
-                pumpkin_soup.as_amount(5), lucky_lunch.as_amount(5) ]
-calico_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.calico, calico_items, 2, 2)
-
-raccoon_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.raccoon, raccoon_foraging_items, 4, 4)
-
-bulletin_board_bundles_vanilla = [chef_bundle_vanilla, dye_bundle_vanilla, field_research_bundle_vanilla, fodder_bundle_vanilla, enchanter_bundle_vanilla]
-bulletin_board_bundles_thematic = [chef_bundle_thematic, dye_bundle_thematic, field_research_bundle_thematic, fodder_bundle_thematic, enchanter_bundle_thematic]
-bulletin_board_bundles_remixed = [*bulletin_board_bundles_thematic, children_bundle, forager_bundle, home_cook_bundle,
-                                  helper_bundle, spirit_eve_bundle, winter_star_bundle, bartender_bundle, calico_bundle, raccoon_bundle]
-bulletin_board_vanilla = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_vanilla, 5)
-bulletin_board_thematic = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_thematic, 5)
-bulletin_board_remixed = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_remixed, 5)
-
-missing_bundle_items_vanilla = [wine.as_quality(ArtisanQuality.silver), dinosaur_mayo, prismatic_shard, caviar,
-                                ancient_fruit.as_quality_crop(), void_salmon.as_quality(FishQuality.gold)]
-missing_bundle_items_thematic = [*missing_bundle_items_vanilla, pale_ale.as_quality(ArtisanQuality.silver), beer.as_quality(ArtisanQuality.silver),
-                                 mead.as_quality(ArtisanQuality.silver),
-                                 cheese.as_quality(ArtisanQuality.silver), goat_cheese.as_quality(ArtisanQuality.silver), void_mayo, cloth, green_tea,
-                                 truffle_oil, diamond,
-                                 sweet_gem_berry.as_quality_crop(), starfruit.as_quality_crop(),
-                                 tea_leaves.as_amount(5), lava_eel.as_quality(FishQuality.gold), scorpion_carp.as_quality(FishQuality.gold),
-                                 blobfish.as_quality(FishQuality.gold)]
-missing_bundle_vanilla = BundleTemplate(CCRoom.abandoned_joja_mart, BundleName.missing_bundle, missing_bundle_items_vanilla, 6, 5)
-missing_bundle_thematic = BundleTemplate.extend_from(missing_bundle_vanilla, missing_bundle_items_thematic)
-
-abandoned_joja_mart_bundles_vanilla = [missing_bundle_vanilla]
-abandoned_joja_mart_bundles_thematic = [missing_bundle_thematic]
-abandoned_joja_mart_vanilla = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_vanilla, 1)
-abandoned_joja_mart_thematic = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_thematic, 1)
-abandoned_joja_mart_remixed = abandoned_joja_mart_thematic
-
-vault_2500_gold = BundleItem.money_bundle(2500)
-vault_5000_gold = BundleItem.money_bundle(5000)
-vault_10000_gold = BundleItem.money_bundle(10000)
-vault_25000_gold = BundleItem.money_bundle(25000)
-
-vault_2500_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_2500, vault_2500_gold)
-vault_5000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_5000, vault_5000_gold)
-vault_10000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_10000, vault_10000_gold)
-vault_25000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_25000, vault_25000_gold)
-
-vault_gambler_items = BundleItem(Currency.qi_coin, 10000)
-vault_gambler_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.gambler, vault_gambler_items)
-
-vault_carnival_items = BundleItem(Currency.star_token, 2500, source=BundleItem.Sources.festival)
-vault_carnival_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.carnival, vault_carnival_items)
-
-vault_walnut_hunter_items = BundleItem(Currency.golden_walnut, 25)
-vault_walnut_hunter_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.walnut_hunter, vault_walnut_hunter_items)
-
-vault_qi_helper_items = BundleItem(Currency.qi_gem, 25, source=BundleItem.Sources.island)
-vault_qi_helper_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.qi_helper, vault_qi_helper_items)
-
-vault_bundles_vanilla = [vault_2500_bundle, vault_5000_bundle, vault_10000_bundle, vault_25000_bundle]
-vault_bundles_thematic = vault_bundles_vanilla
-vault_bundles_remixed = [*vault_bundles_vanilla, vault_gambler_bundle, vault_qi_helper_bundle, vault_carnival_bundle]  # , vault_walnut_hunter_bundle
-vault_vanilla = BundleRoomTemplate(CCRoom.vault, vault_bundles_vanilla, 4)
-vault_thematic = BundleRoomTemplate(CCRoom.vault, vault_bundles_thematic, 4)
-vault_remixed = BundleRoomTemplate(CCRoom.vault, vault_bundles_remixed, 4)
-
-all_cc_remixed_bundles = [*crafts_room_bundles_remixed, *pantry_bundles_remixed, *fish_tank_bundles_remixed,
-                          *boiler_room_bundles_remixed, *bulletin_board_bundles_remixed]
-community_center_remixed_anywhere = BundleRoomTemplate("Community Center", all_cc_remixed_bundles, 26)
-
-all_bundle_items_except_money = []
-all_remixed_bundles = [*crafts_room_bundles_remixed, *pantry_bundles_remixed, *fish_tank_bundles_remixed,
-                       *boiler_room_bundles_remixed, *bulletin_board_bundles_remixed, missing_bundle_thematic,
-                       *raccoon_bundles_remixed]
-for bundle in all_remixed_bundles:
-    all_bundle_items_except_money.extend(bundle.items)
-
-all_bundle_items_by_name = {item.item_name: item for item in all_bundle_items_except_money}
diff --git a/worlds/stardew_valley/data/bundles_data/__init__.py b/worlds/stardew_valley/data/bundles_data/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/stardew_valley/data/bundles_data/bundle_data.py b/worlds/stardew_valley/data/bundles_data/bundle_data.py
new file mode 100644
index 0000000000..11c0446073
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/bundle_data.py
@@ -0,0 +1,10 @@
+from .remixed_bundles import *
+
+all_bundle_items_except_money = []
+all_remixed_bundles = [*crafts_room_bundles_remixed, *pantry_bundles_remixed, *fish_tank_bundles_remixed,
+                       *boiler_room_bundles_remixed, *bulletin_board_bundles_remixed, missing_bundle_thematic,
+                       *giant_stump_bundles_remixed]
+for bundle in all_remixed_bundles:
+    all_bundle_items_except_money.extend(bundle.items)
+
+all_bundle_items_by_name = {item.item_name: item for item in all_bundle_items_except_money}
diff --git a/worlds/stardew_valley/data/bundles_data/bundle_items_data.py b/worlds/stardew_valley/data/bundles_data/bundle_items_data.py
new file mode 100644
index 0000000000..8093ab8927
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/bundle_items_data.py
@@ -0,0 +1,599 @@
+from ..hats_data import Hats
+from ..shirt_data import Shirts
+from ...bundles.bundle_item import BundleItem
+from ...strings.animal_product_names import AnimalProduct
+from ...strings.artisan_good_names import ArtisanGood
+from ...strings.book_names import Book
+from ...strings.boot_names import Boots
+from ...strings.catalogue_names import CatalogueItem
+from ...strings.craftable_names import Consumable, Lighting, Fishing, Craftable, Bomb, Furniture, Floor, Edible, Statue
+from ...strings.crop_names import Vegetable, Fruit
+from ...strings.currency_names import Currency
+from ...strings.decoration_names import Decoration
+from ...strings.fertilizer_names import Fertilizer, SpeedGro, RetainingSoil
+from ...strings.fish_names import Fish, WaterItem, Trash
+from ...strings.flower_names import Flower
+from ...strings.food_names import Meal, Beverage
+from ...strings.forageable_names import Forageable, Mushroom
+from ...strings.fruit_tree_names import Sapling
+from ...strings.geode_names import Geode
+from ...strings.gift_names import Gift
+from ...strings.ingredient_names import Ingredient
+from ...strings.machine_names import Machine
+from ...strings.material_names import Material
+from ...strings.meme_item_names import MemeItem
+from ...strings.metal_names import Fossil, Ore, MetalBar, Mineral, Artifact
+from ...strings.monster_drop_names import Loot
+from ...strings.seed_names import TreeSeed, Seed
+from ...strings.special_item_names import SpecialItem, NotReallyAnItem
+
+wild_horseradish = BundleItem(Forageable.wild_horseradish)
+daffodil = BundleItem(Forageable.daffodil)
+leek = BundleItem(Forageable.leek)
+dandelion = BundleItem(Forageable.dandelion)
+morel = BundleItem(Mushroom.morel)
+common_mushroom = BundleItem(Mushroom.common)
+salmonberry = BundleItem(Forageable.salmonberry, can_have_quality=False)
+spring_onion = BundleItem(Forageable.spring_onion)
+
+grape = BundleItem(Fruit.grape)
+spice_berry = BundleItem(Forageable.spice_berry)
+sweet_pea = BundleItem(Forageable.sweet_pea)
+red_mushroom = BundleItem(Mushroom.red)
+fiddlehead_fern = BundleItem(Forageable.fiddlehead_fern)
+
+wild_plum = BundleItem(Forageable.wild_plum)
+hazelnut = BundleItem(Forageable.hazelnut)
+blackberry = BundleItem(Forageable.blackberry)
+chanterelle = BundleItem(Mushroom.chanterelle)
+
+winter_root = BundleItem(Forageable.winter_root)
+crystal_fruit = BundleItem(Forageable.crystal_fruit)
+snow_yam = BundleItem(Forageable.snow_yam)
+crocus = BundleItem(Forageable.crocus)
+holly = BundleItem(Forageable.holly)
+
+coconut = BundleItem(Forageable.coconut)
+golden_coconut = BundleItem(Geode.golden_coconut, source=BundleItem.Sources.island)
+cactus_fruit = BundleItem(Forageable.cactus_fruit)
+cave_carrot = BundleItem(Forageable.cave_carrot)
+purple_mushroom = BundleItem(Mushroom.purple)
+maple_syrup = BundleItem(ArtisanGood.maple_syrup)
+oak_resin = BundleItem(ArtisanGood.oak_resin)
+pine_tar = BundleItem(ArtisanGood.pine_tar)
+nautilus_shell = BundleItem(WaterItem.nautilus_shell)
+coral = BundleItem(WaterItem.coral)
+sea_urchin = BundleItem(WaterItem.sea_urchin)
+rainbow_shell = BundleItem(Forageable.rainbow_shell)
+clam = BundleItem(Fish.clam)
+cockle = BundleItem(Fish.cockle)
+mussel = BundleItem(Fish.mussel)
+oyster = BundleItem(Fish.oyster)
+seaweed = BundleItem(WaterItem.seaweed, can_have_quality=False)
+
+wood = BundleItem(Material.wood, 99)
+stone = BundleItem(Material.stone, 99)
+hardwood = BundleItem(Material.hardwood, 10)
+clay = BundleItem(Material.clay)
+fiber = BundleItem(Material.fiber)
+moss = BundleItem(Material.moss)
+
+mixed_seeds = BundleItem(Seed.mixed)
+acorn = BundleItem(TreeSeed.acorn)
+maple_seed = BundleItem(TreeSeed.maple)
+pine_cone = BundleItem(TreeSeed.pine)
+mahogany_seed = BundleItem(TreeSeed.mahogany)
+mushroom_tree_seed = BundleItem(TreeSeed.mushroom, source=BundleItem.Sources.island)
+mystic_tree_seed = BundleItem(TreeSeed.mystic, source=BundleItem.Sources.masteries)
+mossy_seed = BundleItem(TreeSeed.mossy)
+
+strawberry_seeds = BundleItem(Seed.strawberry)
+sunflower_seeds = BundleItem(Seed.sunflower)
+
+blue_jazz = BundleItem(Flower.blue_jazz)
+cauliflower = BundleItem(Vegetable.cauliflower)
+green_bean = BundleItem(Vegetable.green_bean)
+kale = BundleItem(Vegetable.kale)
+parsnip = BundleItem(Vegetable.parsnip)
+potato = BundleItem(Vegetable.potato)
+strawberry = BundleItem(Fruit.strawberry, source=BundleItem.Sources.festival)
+tulip = BundleItem(Flower.tulip)
+unmilled_rice = BundleItem(Vegetable.unmilled_rice)
+coffee_bean = BundleItem(Seed.coffee)
+garlic = BundleItem(Vegetable.garlic)
+blueberry = BundleItem(Fruit.blueberry)
+corn = BundleItem(Vegetable.corn)
+hops = BundleItem(Vegetable.hops)
+hot_pepper = BundleItem(Fruit.hot_pepper)
+melon = BundleItem(Fruit.melon)
+poppy = BundleItem(Flower.poppy)
+radish = BundleItem(Vegetable.radish)
+summer_spangle = BundleItem(Flower.summer_spangle)
+sunflower = BundleItem(Flower.sunflower)
+tomato = BundleItem(Vegetable.tomato)
+wheat = BundleItem(Vegetable.wheat)
+hay = BundleItem(Forageable.hay)
+amaranth = BundleItem(Vegetable.amaranth)
+bok_choy = BundleItem(Vegetable.bok_choy)
+cranberries = BundleItem(Fruit.cranberries)
+eggplant = BundleItem(Vegetable.eggplant)
+fairy_rose = BundleItem(Flower.fairy_rose)
+pumpkin = BundleItem(Vegetable.pumpkin)
+yam = BundleItem(Vegetable.yam)
+sweet_gem_berry = BundleItem(Fruit.sweet_gem_berry)
+rhubarb = BundleItem(Fruit.rhubarb)
+beet = BundleItem(Vegetable.beet)
+red_cabbage = BundleItem(Vegetable.red_cabbage)
+starfruit = BundleItem(Fruit.starfruit)
+artichoke = BundleItem(Vegetable.artichoke)
+pineapple = BundleItem(Fruit.pineapple, source=BundleItem.Sources.content)
+taro_root = BundleItem(Vegetable.taro_root, source=BundleItem.Sources.content)
+dragon_tooth = BundleItem(Forageable.dragon_tooth, source=BundleItem.Sources.content)
+
+carrot = BundleItem(Vegetable.carrot)
+summer_squash = BundleItem(Vegetable.summer_squash)
+broccoli = BundleItem(Vegetable.broccoli)
+powdermelon = BundleItem(Fruit.powdermelon)
+
+egg = BundleItem(AnimalProduct.egg)
+large_egg = BundleItem(AnimalProduct.large_egg)
+brown_egg = BundleItem(AnimalProduct.brown_egg)
+large_brown_egg = BundleItem(AnimalProduct.large_brown_egg)
+wool = BundleItem(AnimalProduct.wool)
+milk = BundleItem(AnimalProduct.milk)
+large_milk = BundleItem(AnimalProduct.large_milk)
+goat_milk = BundleItem(AnimalProduct.goat_milk)
+large_goat_milk = BundleItem(AnimalProduct.large_goat_milk)
+truffle = BundleItem(AnimalProduct.truffle)
+duck_feather = BundleItem(AnimalProduct.duck_feather)
+duck_egg = BundleItem(AnimalProduct.duck_egg)
+rabbit_foot = BundleItem(AnimalProduct.rabbit_foot)
+dinosaur_egg = BundleItem(AnimalProduct.dinosaur_egg)
+void_egg = BundleItem(AnimalProduct.void_egg)
+ostrich_egg = BundleItem(AnimalProduct.ostrich_egg, source=BundleItem.Sources.content)
+golden_egg = BundleItem(AnimalProduct.golden_egg)
+
+truffle_oil = BundleItem(ArtisanGood.truffle_oil)
+cloth = BundleItem(ArtisanGood.cloth)
+goat_cheese = BundleItem(ArtisanGood.goat_cheese)
+cheese = BundleItem(ArtisanGood.cheese)
+honey = BundleItem(ArtisanGood.honey)
+beer = BundleItem(Beverage.beer)
+mayonnaise = BundleItem(ArtisanGood.mayonnaise)
+juice = BundleItem(ArtisanGood.juice)
+mead = BundleItem(ArtisanGood.mead)
+pale_ale = BundleItem(ArtisanGood.pale_ale)
+wine = BundleItem(ArtisanGood.wine)
+jelly = BundleItem(ArtisanGood.jelly)
+pickles = BundleItem(ArtisanGood.pickles)
+caviar = BundleItem(ArtisanGood.caviar)
+aged_roe = BundleItem(ArtisanGood.aged_roe)
+roe = BundleItem(AnimalProduct.roe)
+squid_ink = BundleItem(AnimalProduct.squid_ink)
+coffee = BundleItem(Beverage.coffee)
+green_tea = BundleItem(ArtisanGood.green_tea)
+apple = BundleItem(Fruit.apple)
+apricot = BundleItem(Fruit.apricot)
+orange = BundleItem(Fruit.orange)
+peach = BundleItem(Fruit.peach)
+pomegranate = BundleItem(Fruit.pomegranate)
+cherry = BundleItem(Fruit.cherry)
+banana = BundleItem(Fruit.banana, source=BundleItem.Sources.content)
+mango = BundleItem(Fruit.mango, source=BundleItem.Sources.content)
+
+basic_fertilizer = BundleItem(Fertilizer.basic, 100)
+quality_fertilizer = BundleItem(Fertilizer.quality, 20)
+deluxe_fertilizer = BundleItem(Fertilizer.deluxe, 5, source=BundleItem.Sources.island)
+basic_retaining_soil = BundleItem(RetainingSoil.basic, 80)
+quality_retaining_soil = BundleItem(RetainingSoil.quality, 50)
+deluxe_retaining_soil = BundleItem(RetainingSoil.deluxe, 20, source=BundleItem.Sources.island)
+speed_gro = BundleItem(SpeedGro.basic, 40)
+deluxe_speed_gro = BundleItem(SpeedGro.deluxe, 20)
+hyper_speed_gro = BundleItem(SpeedGro.hyper, 5, source=BundleItem.Sources.qi_board)
+tree_fertilizer = BundleItem(Fertilizer.tree, 20)
+
+lobster = BundleItem(Fish.lobster)
+crab = BundleItem(Fish.crab)
+shrimp = BundleItem(Fish.shrimp)
+crayfish = BundleItem(Fish.crayfish)
+snail = BundleItem(Fish.snail)
+periwinkle = BundleItem(Fish.periwinkle)
+trash = BundleItem(Trash.trash)
+driftwood = BundleItem(Trash.driftwood)
+soggy_newspaper = BundleItem(Trash.soggy_newspaper)
+broken_cd = BundleItem(Trash.broken_cd)
+broken_glasses = BundleItem(Trash.broken_glasses)
+
+chub = BundleItem(Fish.chub)
+catfish = BundleItem(Fish.catfish)
+rainbow_trout = BundleItem(Fish.rainbow_trout)
+lingcod = BundleItem(Fish.lingcod)
+walleye = BundleItem(Fish.walleye)
+perch = BundleItem(Fish.perch)
+pike = BundleItem(Fish.pike)
+bream = BundleItem(Fish.bream)
+salmon = BundleItem(Fish.salmon)
+sunfish = BundleItem(Fish.sunfish)
+tiger_trout = BundleItem(Fish.tiger_trout)
+shad = BundleItem(Fish.shad)
+smallmouth_bass = BundleItem(Fish.smallmouth_bass)
+dorado = BundleItem(Fish.dorado)
+carp = BundleItem(Fish.carp)
+midnight_carp = BundleItem(Fish.midnight_carp)
+largemouth_bass = BundleItem(Fish.largemouth_bass)
+sturgeon = BundleItem(Fish.sturgeon)
+bullhead = BundleItem(Fish.bullhead)
+tilapia = BundleItem(Fish.tilapia)
+pufferfish = BundleItem(Fish.pufferfish)
+tuna = BundleItem(Fish.tuna)
+super_cucumber = BundleItem(Fish.super_cucumber)
+flounder = BundleItem(Fish.flounder)
+anchovy = BundleItem(Fish.anchovy)
+sardine = BundleItem(Fish.sardine)
+red_mullet = BundleItem(Fish.red_mullet)
+herring = BundleItem(Fish.herring)
+eel = BundleItem(Fish.eel)
+octopus = BundleItem(Fish.octopus)
+red_snapper = BundleItem(Fish.red_snapper)
+squid = BundleItem(Fish.squid)
+sea_cucumber = BundleItem(Fish.sea_cucumber)
+albacore = BundleItem(Fish.albacore)
+halibut = BundleItem(Fish.halibut)
+scorpion_carp = BundleItem(Fish.scorpion_carp)
+sandfish = BundleItem(Fish.sandfish)
+woodskip = BundleItem(Fish.woodskip)
+lava_eel = BundleItem(Fish.lava_eel)
+ice_pip = BundleItem(Fish.ice_pip)
+stonefish = BundleItem(Fish.stonefish)
+ghostfish = BundleItem(Fish.ghostfish)
+
+bouquet = BundleItem(Gift.bouquet)
+wilted_bouquet = BundleItem(Gift.wilted_bouquet)
+copper_bar = BundleItem(MetalBar.copper)
+iron_bar = BundleItem(MetalBar.iron)
+gold_bar = BundleItem(MetalBar.gold)
+iridium_bar = BundleItem(MetalBar.iridium)
+radioactive_bar = BundleItem(MetalBar.radioactive, source=BundleItem.Sources.island)
+refined_quartz = BundleItem(MetalBar.quartz)
+coal = BundleItem(Material.coal)
+iridium_ore = BundleItem(Ore.iridium)
+gold_ore = BundleItem(Ore.gold)
+iron_ore = BundleItem(Ore.iron)
+copper_ore = BundleItem(Ore.copper)
+radioactive_ore = BundleItem(Ore.radioactive, source=BundleItem.Sources.qi_board)
+battery_pack = BundleItem(ArtisanGood.battery_pack)
+
+quartz = BundleItem(Mineral.quartz)
+fire_quartz = BundleItem(Mineral.fire_quartz)
+frozen_tear = BundleItem(Mineral.frozen_tear)
+earth_crystal = BundleItem(Mineral.earth_crystal)
+emerald = BundleItem(Mineral.emerald)
+aquamarine = BundleItem(Mineral.aquamarine)
+ruby = BundleItem(Mineral.ruby)
+amethyst = BundleItem(Mineral.amethyst)
+topaz = BundleItem(Mineral.topaz)
+jade = BundleItem(Mineral.jade)
+obsidian = BundleItem(Mineral.obsidian)
+jamborite = BundleItem(Mineral.jamborite)
+tigerseye = BundleItem(Mineral.tigerseye)
+opal = BundleItem(Mineral.opal)
+thunder_egg = BundleItem(Mineral.thunder_egg)
+ghost_crystal = BundleItem(Mineral.ghost_crystal)
+kyanite = BundleItem(Mineral.kyanite)
+lemon_stone = BundleItem(Mineral.lemon_stone)
+mudstone = BundleItem(Mineral.mudstone)
+limestone = BundleItem(Mineral.limestone)
+
+slime = BundleItem(Loot.slime, 99)
+bug_meat = BundleItem(Loot.bug_meat, 10)
+bat_wing = BundleItem(Loot.bat_wing, 10)
+solar_essence = BundleItem(Loot.solar_essence)
+void_essence = BundleItem(Loot.void_essence)
+
+petrified_slime = BundleItem(Mineral.petrified_slime)
+blue_slime_egg = BundleItem(AnimalProduct.slime_egg_blue)
+red_slime_egg = BundleItem(AnimalProduct.slime_egg_red)
+purple_slime_egg = BundleItem(AnimalProduct.slime_egg_purple)
+green_slime_egg = BundleItem(AnimalProduct.slime_egg_green)
+tiger_slime_egg = BundleItem(AnimalProduct.slime_egg_tiger, source=BundleItem.Sources.island)
+
+cherry_bomb = BundleItem(Bomb.cherry_bomb, 5)
+bomb = BundleItem(Bomb.bomb, 2)
+mega_bomb = BundleItem(Bomb.mega_bomb)
+explosive_ammo = BundleItem(Craftable.explosive_ammo, 5)
+
+maki_roll = BundleItem(Meal.maki_roll)
+fried_egg = BundleItem(Meal.fried_egg)
+omelet = BundleItem(Meal.omelet)
+pizza = BundleItem(Meal.pizza)
+hashbrowns = BundleItem(Meal.hashbrowns)
+pancakes = BundleItem(Meal.pancakes)
+bread = BundleItem(Meal.bread)
+tortilla = BundleItem(Meal.tortilla)
+triple_shot_espresso = BundleItem(Beverage.triple_shot_espresso)
+farmer_s_lunch = BundleItem(Meal.farmer_lunch)
+survival_burger = BundleItem(Meal.survival_burger)
+dish_o_the_sea = BundleItem(Meal.dish_o_the_sea)
+miner_s_treat = BundleItem(Meal.miners_treat)
+roots_platter = BundleItem(Meal.roots_platter)
+salad = BundleItem(Meal.salad)
+cheese_cauliflower = BundleItem(Meal.cheese_cauliflower)
+parsnip_soup = BundleItem(Meal.parsnip_soup)
+fried_mushroom = BundleItem(Meal.fried_mushroom)
+salmon_dinner = BundleItem(Meal.salmon_dinner)
+pepper_poppers = BundleItem(Meal.pepper_poppers)
+spaghetti = BundleItem(Meal.spaghetti)
+sashimi = BundleItem(Meal.sashimi)
+blueberry_tart = BundleItem(Meal.blueberry_tart)
+algae_soup = BundleItem(Meal.algae_soup)
+pale_broth = BundleItem(Meal.pale_broth)
+chowder = BundleItem(Meal.chowder)
+cookie = BundleItem(Meal.cookie)
+ancient_doll = BundleItem(Artifact.ancient_doll)
+ice_cream = BundleItem(Meal.ice_cream)
+cranberry_candy = BundleItem(Meal.cranberry_candy)
+ginger_ale = BundleItem(Beverage.ginger_ale, source=BundleItem.Sources.island)
+pink_cake = BundleItem(Meal.pink_cake)
+plum_pudding = BundleItem(Meal.plum_pudding)
+chocolate_cake = BundleItem(Meal.chocolate_cake)
+rhubarb_pie = BundleItem(Meal.rhubarb_pie)
+shrimp_cocktail = BundleItem(Meal.shrimp_cocktail)
+pina_colada = BundleItem(Beverage.pina_colada, source=BundleItem.Sources.island)
+stuffing = BundleItem(Meal.stuffing)
+magic_rock_candy = BundleItem(Meal.magic_rock_candy)
+spicy_eel = BundleItem(Meal.spicy_eel)
+crab_cakes = BundleItem(Meal.crab_cakes)
+eggplant_parmesan = BundleItem(Meal.eggplant_parmesan)
+pumpkin_soup = BundleItem(Meal.pumpkin_soup)
+lucky_lunch = BundleItem(Meal.lucky_lunch)
+joja_cola = BundleItem(Trash.joja_cola)
+strange_bun = BundleItem(Meal.strange_bun)
+moss_soup = BundleItem(Meal.moss_soup)
+roasted_hazelnuts = BundleItem(Meal.roasted_hazelnuts)
+maple_bar = BundleItem(Meal.maple_bar)
+
+green_algae = BundleItem(WaterItem.green_algae)
+white_algae = BundleItem(WaterItem.white_algae)
+geode = BundleItem(Geode.geode)
+frozen_geode = BundleItem(Geode.frozen)
+magma_geode = BundleItem(Geode.magma)
+omni_geode = BundleItem(Geode.omni)
+sap = BundleItem(Material.sap)
+
+dwarf_scroll_1 = BundleItem(Artifact.dwarf_scroll_i)
+dwarf_scroll_2 = BundleItem(Artifact.dwarf_scroll_ii)
+dwarf_scroll_3 = BundleItem(Artifact.dwarf_scroll_iii)
+dwarf_scroll_4 = BundleItem(Artifact.dwarf_scroll_iv)
+elvish_jewelry = BundleItem(Artifact.elvish_jewelry)
+ancient_drum = BundleItem(Artifact.ancient_drum)
+dried_starfish = BundleItem(Fossil.dried_starfish)
+bone_fragment = BundleItem(Fossil.bone_fragment)
+
+golden_mask = BundleItem(Artifact.golden_mask)
+golden_relic = BundleItem(Artifact.golden_relic)
+dwarf_gadget = BundleItem(Artifact.dwarf_gadget)
+dwarvish_helm = BundleItem(Artifact.dwarvish_helm)
+prehistoric_handaxe = BundleItem(Artifact.prehistoric_handaxe)
+bone_flute = BundleItem(Artifact.bone_flute)
+anchor = BundleItem(Artifact.anchor)
+prehistoric_tool = BundleItem(Artifact.prehistoric_tool)
+chicken_statue = BundleItem(Artifact.chicken_statue)
+rusty_cog = BundleItem(Artifact.rusty_cog)
+rusty_spur = BundleItem(Artifact.rusty_spur)
+rusty_spoon = BundleItem(Artifact.rusty_spoon)
+ancient_sword = BundleItem(Artifact.ancient_sword)
+ornamental_fan = BundleItem(Artifact.ornamental_fan)
+chipped_amphora = BundleItem(Artifact.chipped_amphora)
+strange_doll = BundleItem(Artifact.strange_doll)
+strange_doll_green = BundleItem(Artifact.strange_doll_green)
+ancient_seed = BundleItem(Artifact.ancient_seed)
+rare_disc = BundleItem(Artifact.rare_disc)
+
+prehistoric_scapula = BundleItem(Fossil.prehistoric_scapula)
+prehistoric_tibia = BundleItem(Fossil.prehistoric_tibia)
+prehistoric_skull = BundleItem(Fossil.prehistoric_skull)
+skeletal_hand = BundleItem(Fossil.skeletal_hand)
+prehistoric_rib = BundleItem(Fossil.prehistoric_rib)
+prehistoric_vertebra = BundleItem(Fossil.prehistoric_vertebra)
+skeletal_tail = BundleItem(Fossil.skeletal_tail)
+nautilus_fossil = BundleItem(Fossil.nautilus_fossil)
+amphibian_fossil = BundleItem(Fossil.amphibian_fossil)
+palm_fossil = BundleItem(Fossil.palm_fossil)
+trilobite = BundleItem(Fossil.trilobite)
+snake_vertebrae = BundleItem(Fossil.snake_vertebrae, source=BundleItem.Sources.island)
+mummified_bat = BundleItem(Fossil.mummified_bat, source=BundleItem.Sources.island)
+fossilized_tail = BundleItem(Fossil.fossilized_tail, source=BundleItem.Sources.island)
+
+dinosaur_mayo = BundleItem(ArtisanGood.dinosaur_mayonnaise)
+void_mayo = BundleItem(ArtisanGood.void_mayonnaise)
+prismatic_shard = BundleItem(Mineral.prismatic_shard)
+diamond = BundleItem(Mineral.diamond)
+ancient_fruit = BundleItem(Fruit.ancient_fruit)
+void_salmon = BundleItem(Fish.void_salmon)
+tea_leaves = BundleItem(Vegetable.tea_leaves)
+blobfish = BundleItem(Fish.blobfish)
+spook_fish = BundleItem(Fish.spook_fish)
+lionfish = BundleItem(Fish.lionfish, source=BundleItem.Sources.island)
+blue_discus = BundleItem(Fish.blue_discus, source=BundleItem.Sources.island)
+stingray = BundleItem(Fish.stingray, source=BundleItem.Sources.island)
+spookfish = BundleItem(Fish.spookfish)
+midnight_squid = BundleItem(Fish.midnight_squid)
+slimejack = BundleItem(Fish.slimejack)
+goby = BundleItem(Fish.goby)
+
+angler = BundleItem(Fish.angler)
+crimsonfish = BundleItem(Fish.crimsonfish)
+mutant_carp = BundleItem(Fish.mutant_carp)
+glacierfish = BundleItem(Fish.glacierfish)
+legend = BundleItem(Fish.legend)
+
+spinner = BundleItem(Fishing.spinner)
+dressed_spinner = BundleItem(Fishing.dressed_spinner)
+trap_bobber = BundleItem(Fishing.trap_bobber)
+sonar_bobber = BundleItem(Fishing.sonar_bobber)
+cork_bobber = BundleItem(Fishing.cork_bobber)
+lead_bobber = BundleItem(Fishing.lead_bobber)
+treasure_hunter = BundleItem(Fishing.treasure_hunter)
+barbed_hook = BundleItem(Fishing.barbed_hook)
+curiosity_lure = BundleItem(Fishing.curiosity_lure)
+quality_bobber = BundleItem(Fishing.quality_bobber)
+bait = BundleItem(Fishing.bait, 100)
+deluxe_bait = BundleItem(Fishing.deluxe_bait, 50)
+magnet = BundleItem(Fishing.magnet)
+wild_bait = BundleItem(Fishing.wild_bait, 20)
+magic_bait = BundleItem(Fishing.magic_bait, 10, source=BundleItem.Sources.qi_board)
+pearl = BundleItem(Gift.pearl)
+challenge_bait = BundleItem(Fishing.challenge_bait, 25, source=BundleItem.Sources.masteries)
+targeted_bait = BundleItem(ArtisanGood.targeted_bait, 25, source=BundleItem.Sources.content)
+golden_bobber = BundleItem(Fishing.golden_bobber)
+
+ginger = BundleItem(Forageable.ginger, source=BundleItem.Sources.content)
+magma_cap = BundleItem(Mushroom.magma_cap, source=BundleItem.Sources.content)
+
+wheat_flour = BundleItem(Ingredient.wheat_flour)
+sugar = BundleItem(Ingredient.sugar)
+vinegar = BundleItem(Ingredient.vinegar)
+
+jack_o_lantern = BundleItem(Lighting.jack_o_lantern)
+prize_ticket = BundleItem(Currency.prize_ticket)
+mystery_box = BundleItem(Consumable.mystery_box)
+gold_mystery_box = BundleItem(Consumable.gold_mystery_box, source=BundleItem.Sources.masteries)
+calico_egg = BundleItem(Currency.calico_egg)
+golden_tag = BundleItem(Currency.golden_tag)
+stardrop_tea = BundleItem(ArtisanGood.stardrop_tea)
+rotten_plant = BundleItem(Decoration.rotten_plant)
+
+apple_slices = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.apple))
+
+infinity_crown = BundleItem(Hats.infinity_crown.name, source=BundleItem.Sources.content)
+bowler_hat = BundleItem(Hats.bowler.name, source=BundleItem.Sources.content)
+sombrero = BundleItem(Hats.sombrero.name, source=BundleItem.Sources.content)
+good_ol_cap = BundleItem(Hats.good_ol_cap.name, source=BundleItem.Sources.content)
+living_hat = BundleItem(Hats.living_hat.name, source=BundleItem.Sources.content)
+garbage_hat = BundleItem(Hats.garbage_hat.name, source=BundleItem.Sources.content)
+golden_helmet = BundleItem(Hats.golden_helmet.name, source=BundleItem.Sources.content)
+laurel_wreath_crown = BundleItem(Hats.laurel_wreath_crown.name, source=BundleItem.Sources.content)
+joja_cap = BundleItem(Hats.joja_cap.name, source=BundleItem.Sources.content)
+deluxe_pirate_hat = BundleItem(Hats.deluxe_pirate_hat.name, source=BundleItem.Sources.content)
+dark_cowboy_hat = BundleItem(Hats.dark_cowboy_hat.name, source=BundleItem.Sources.content)
+tiger_hat = BundleItem(Hats.tiger_hat.name, source=BundleItem.Sources.content)
+mystery_hat = BundleItem(Hats.mystery_hat.name, source=BundleItem.Sources.content)
+dark_ballcap = BundleItem(Hats.dark_ballcap.name, source=BundleItem.Sources.content)
+goblin_mask = BundleItem(Hats.goblin_mask.name, source=BundleItem.Sources.island)
+
+vacation_shirt = BundleItem(Shirts.vacation.name)
+green_jacket_shirt = BundleItem(Shirts.green_jacket.name)
+
+mermaid_boots = BundleItem(Boots.mermaid_boots)
+
+lucky_purple_shorts = BundleItem(SpecialItem.lucky_purple_shorts)
+trimmed_purple_shorts = BundleItem(SpecialItem.trimmed_purple_shorts)
+
+ancient_fruit_wine = BundleItem(ArtisanGood.specific_wine(Fruit.ancient_fruit))
+dried_ancient_fruit = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.ancient_fruit))
+ancient_fruit_jelly = BundleItem(ArtisanGood.specific_jelly(Fruit.ancient_fruit))
+starfruit_wine = BundleItem(ArtisanGood.specific_wine(Fruit.starfruit))
+dried_starfruit = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.starfruit))
+starfruit_jelly = BundleItem(ArtisanGood.specific_jelly(Fruit.starfruit))
+rhubarb_wine = BundleItem(ArtisanGood.specific_wine(Fruit.rhubarb))
+dried_rhubarb = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.rhubarb))
+melon_wine = BundleItem(ArtisanGood.specific_wine(Fruit.melon))
+dried_melon = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.melon))
+pineapple_wine = BundleItem(ArtisanGood.specific_wine(Fruit.pineapple), source=BundleItem.Sources.content)
+dried_pineapple = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.pineapple), source=BundleItem.Sources.content)
+dried_banana = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.banana), source=BundleItem.Sources.content)
+strawberry_wine = BundleItem(ArtisanGood.specific_wine(Fruit.strawberry))
+dried_strawberry = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.strawberry))
+pumpkin_juice = BundleItem(ArtisanGood.specific_juice(Vegetable.pumpkin))
+raisins = BundleItem(ArtisanGood.raisins)
+dried_qi_fruit = BundleItem(ArtisanGood.specific_dried_fruit(Fruit.qi_fruit), source=BundleItem.Sources.content)
+
+aged_lava_eel_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.lava_eel))
+aged_crimsonfish_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.crimsonfish))
+aged_angler_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.angler))
+legend_roe = BundleItem(AnimalProduct.specific_roe(Fish.legend))
+aged_legend_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.legend))
+aged_glacierfish_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.glacierfish))
+aged_mutant_carp_roe = BundleItem(ArtisanGood.specific_aged_roe(Fish.mutant_carp))
+midnight_squid_roe = BundleItem(AnimalProduct.specific_roe(Fish.midnight_squid))
+
+legend_bait = BundleItem(ArtisanGood.specific_bait(Fish.legend))
+
+smoked_legend = BundleItem(ArtisanGood.specific_smoked_fish(Fish.legend))
+
+mystic_syrup = BundleItem(ArtisanGood.mystic_syrup)
+apple_sapling = BundleItem(Sapling.apple)
+apricot_sapling = BundleItem(Sapling.apricot)
+banana_sapling = BundleItem(Sapling.banana, source=BundleItem.Sources.content)
+cherry_sapling = BundleItem(Sapling.cherry)
+mango_sapling = BundleItem(Sapling.mango, source=BundleItem.Sources.content)
+orange_sapling = BundleItem(Sapling.orange)
+peach_sapling = BundleItem(Sapling.peach)
+pomegranate_sapling = BundleItem(Sapling.pomegranate)
+
+cookout_kit = BundleItem(Craftable.cookout_kit)
+tent_kit = BundleItem(Craftable.tent_kit)
+bug_steak = BundleItem(Edible.bug_steak)
+
+tea_set = BundleItem(Gift.tea_set)
+golden_pumpkin = BundleItem(Gift.golden_pumpkin)
+mermaid_pendant = BundleItem(Gift.mermaid_pendant)
+void_ghost_pendant = BundleItem(Gift.void_ghost_pendant)
+advanced_tv_remote = BundleItem(SpecialItem.advanced_tv_remote)
+
+crystal_ball = BundleItem(CatalogueItem.crystal_ball)
+amethyst_crystal_ball = BundleItem(CatalogueItem.amethyst_crystal_ball)
+aquamarine_crystal_ball = BundleItem(CatalogueItem.aquamarine_crystal_ball)
+emerald_crystal_ball = BundleItem(CatalogueItem.emerald_crystal_ball)
+ruby_crystal_ball = BundleItem(CatalogueItem.ruby_crystal_ball)
+topaz_crystal_ball = BundleItem(CatalogueItem.topaz_crystal_ball)
+flute_block = BundleItem(Furniture.flute_block)
+candle_lamp = BundleItem(Furniture.candle_lamp)
+modern_lamp = BundleItem(Furniture.modern_lamp)
+single_bed = BundleItem(Furniture.single_bed)
+exotic_double_bed = BundleItem(Furniture.exotic_double_bed, source=BundleItem.Sources.qi_board)
+statue_of_endless_fortune = BundleItem(Machine.statue_endless_fortune)
+cursed_mannequin = BundleItem(Furniture.cursed_mannequin)
+statue_of_blessings = BundleItem(Statue.blessings)
+crane_house_plant = BundleItem(Furniture.crane_game_house_plant)
+
+wood_floor = BundleItem(Floor.wood)
+rustic_plank_floor = BundleItem(Floor.rustic)
+straw_floor = BundleItem(Floor.straw)
+weathered_floor = BundleItem(Floor.weathered)
+crystal_floor = BundleItem(Floor.crystal)
+stone_floor = BundleItem(Floor.stone)
+stone_walkway_floor = BundleItem(Floor.stone_walkway)
+brick_floor = BundleItem(Floor.brick)
+wood_path = BundleItem(Floor.wood_path)
+gravel_path = BundleItem(Floor.gravel_path)
+cobblestone_path = BundleItem(Floor.cobblestone_path)
+stepping_stone_path = BundleItem(Floor.stepping_stone_path)
+crystal_path = BundleItem(Floor.crystal_path)
+
+warp_totem_beach = BundleItem(Consumable.warp_totem_beach)
+warp_totem_mountains = BundleItem(Consumable.warp_totem_mountains)
+warp_totem_farm = BundleItem(Consumable.warp_totem_farm)
+warp_totem_desert = BundleItem(Consumable.warp_totem_desert, source=BundleItem.Sources.content)
+warp_totem_island = BundleItem(Consumable.warp_totem_island, source=BundleItem.Sources.island)
+rain_totem = BundleItem(Consumable.rain_totem)
+treasure_totem = BundleItem(Consumable.treasure_totem, source=BundleItem.Sources.masteries)
+
+book_of_mysteries = BundleItem(Book.book_of_mysteries)
+
+far_away_stone = BundleItem(SpecialItem.far_away_stone)
+
+death = BundleItem(NotReallyAnItem.death)
+
+camping_stove = BundleItem(MemeItem.camping_stove)
+decorative_pot = BundleItem(MemeItem.decorative_pot)
+slime_crate = BundleItem(MemeItem.slime_crate)
+supply_crate = BundleItem(MemeItem.supply_crate)
+warp_totem_qis_arena = BundleItem(MemeItem.warp_totem_qis_arena)
+artifact_spot = BundleItem(MemeItem.artifact_spot)
+twig = BundleItem(MemeItem.twig)
+weeds = BundleItem(MemeItem.weeds)
+lumber = BundleItem(MemeItem.lumber)
+green_rain_weeds_0 = BundleItem(MemeItem.green_rain_weeds_0)
+seed_spot = BundleItem(MemeItem.seed_spot)
+pot_of_gold = BundleItem(MemeItem.pot_of_gold)
diff --git a/worlds/stardew_valley/data/bundles_data/bundle_set.py b/worlds/stardew_valley/data/bundles_data/bundle_set.py
new file mode 100644
index 0000000000..ac2f3c5ecf
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/bundle_set.py
@@ -0,0 +1,28 @@
+from typing import Dict, List
+
+from .remixed_anywhere_bundles import community_center_remixed_anywhere
+from .remixed_bundles import pantry_remixed, crafts_room_remixed, fish_tank_remixed, boiler_room_remixed, bulletin_board_remixed, vault_remixed, \
+    abandoned_joja_mart_remixed, giant_stump_remixed
+from .thematic_bundles import pantry_thematic, crafts_room_thematic, fish_tank_thematic, boiler_room_thematic, bulletin_board_thematic, vault_thematic, \
+    abandoned_joja_mart_thematic, giant_stump_thematic
+from .vanilla_bundles import crafts_room_vanilla, pantry_vanilla, fish_tank_vanilla, boiler_room_vanilla, \
+    bulletin_board_vanilla, vault_vanilla, abandoned_joja_mart_vanilla, giant_stump_vanilla
+from ...bundles.bundle_room import BundleRoomTemplate
+
+
+class BundleSet:
+    bundles_by_room: Dict[str, BundleRoomTemplate]
+
+    def __init__(self, bundle_rooms: List[BundleRoomTemplate]):
+        self.bundles_by_room = {bundle_room.name: bundle_room for bundle_room in bundle_rooms}
+
+
+vanilla_bundles = BundleSet([pantry_vanilla, crafts_room_vanilla, fish_tank_vanilla, boiler_room_vanilla, bulletin_board_vanilla,
+                             vault_vanilla, abandoned_joja_mart_vanilla, giant_stump_vanilla])
+thematic_bundles = BundleSet([pantry_thematic, crafts_room_thematic, fish_tank_thematic, boiler_room_thematic, bulletin_board_thematic,
+                              vault_thematic, abandoned_joja_mart_thematic, giant_stump_thematic])
+remixed_bundles = BundleSet([pantry_remixed, crafts_room_remixed, fish_tank_remixed, boiler_room_remixed, bulletin_board_remixed,
+                              vault_remixed, abandoned_joja_mart_remixed, giant_stump_remixed])
+remixed_anywhere_bundles = BundleSet([community_center_remixed_anywhere, abandoned_joja_mart_remixed, giant_stump_remixed])
+
+# shuffled_bundles = BundleSet()
diff --git a/worlds/stardew_valley/data/bundles_data/meme_bundles.py b/worlds/stardew_valley/data/bundles_data/meme_bundles.py
new file mode 100644
index 0000000000..c3abdca129
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/meme_bundles.py
@@ -0,0 +1,378 @@
+from .bundle_data import all_bundle_items_by_name
+from .meme_bundles_data.capitalist_bundle import capitalist_items
+from .remixed_bundles import *
+from ...bundles.bundle import BureaucracyBundleTemplate, RecursiveBundleTemplate, FixedPriceCurrencyBundleTemplate, \
+    FixedPriceBundleTemplate, FixedPriceDeepBundleTemplate, FixedMultiplierBundleTemplate, FixedSlotsBundleTemplate
+from ...strings.bundle_names import MemeBundleName
+from ...strings.currency_names import MemeCurrency
+from ...strings.flower_names import all_flowers
+from ...strings.machine_names import Machine
+from ...strings.meme_item_names import MemeItem
+from ...strings.quality_names import AnimalProductQuality, CropQuality
+
+burger_king_items = [survival_burger, joja_cola, apple_slices, ice_cream, strange_doll, strange_doll_green, hashbrowns, infinity_crown]
+burger_king_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.burger_king, burger_king_items, 6, 3)
+
+capitalist_bundle = FixedMultiplierBundleTemplate(CCRoom.vault, MemeBundleName.capitalist, capitalist_items, 12, 2)
+
+romance_items = [lucky_purple_shorts, truffle_oil, super_cucumber, good_ol_cap]
+romance_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.romance, romance_items, 4, 4)
+
+hurricane_tortilla_items = [tortilla.as_amount(4)]
+hurricane_tortilla_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.hurricane_tortilla, hurricane_tortilla_items, 6, 6)
+
+AAAA_items = [battery_pack.as_amount(12), battery_pack.as_amount(8), battery_pack.as_amount(6)]
+AAAA_bundle = BundleTemplate(CCRoom.crafts_room, MemeBundleName.AAAA, AAAA_items, 3, 3)
+
+anything_for_beyonce_items = [beet]
+anything_for_beyonce_bundle = BundleTemplate(CCRoom.crafts_room, MemeBundleName.anything_for_beyonce, anything_for_beyonce_items, 1, 1)
+
+crab_rave_items = [crab.as_amount(8)]
+crab_rave_bundle = BundleTemplate(CCRoom.fish_tank, MemeBundleName.crab_rave, crab_rave_items, 12, 8)
+
+potato_items = [potato.as_amount(8)]
+potato_bundle = BundleTemplate(CCRoom.crafts_room, MemeBundleName.potato, potato_items, 12, 8)
+
+look_at_chickens_items = [duck_egg.as_amount(2)]
+look_at_chickens_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.look_at_chickens, look_at_chickens_items, 10, 4)
+
+lemonade_stand_items = [grape]
+lemonade_stand_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.lemonade_stand, lemonade_stand_items, 3, 1)
+
+what_the_rock_is_cooking_items = [stone.as_amount(1), cookout_kit, strange_bun]
+what_the_rock_is_cooking_bundle = FixedPriceBundleTemplate(CCRoom.pantry, MemeBundleName.what_the_rock_is_cooking, what_the_rock_is_cooking_items, 3, 3)
+
+amons_fall_items = [stone.as_amount(1)]
+amons_fall_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.amons_fall, amons_fall_items, 7, 7)
+
+screw_you_items = [tea_set, ostrich_egg.as_quality(AnimalProductQuality.iridium), snake_vertebrae.as_amount(5), mummified_bat.as_amount(5)]
+screw_you_bundle = BundleTemplate(CCRoom.boiler_room, MemeBundleName.screw_you, screw_you_items, 4, 4)
+
+sunmaid_items = [raisins.as_amount(28)]
+sunmaid_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.sunmaid, sunmaid_items, 1, 1)
+
+rick_items = [pickles]
+rick_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.rick, rick_items, 1, 1)
+
+minecraft_items = [coal, copper_ore, iron_ore, quartz, amethyst, emerald, gold_ore, diamond, obsidian]
+minecraft_bundle = BundleTemplate(CCRoom.boiler_room, MemeBundleName.minecraft, minecraft_items, 9, 8)
+
+balls_items = [blue_jazz, cauliflower, blueberry, melon, red_cabbage, tomato, powdermelon, cranberries, fairy_rose, grape, pumpkin, ancient_fruit,
+               solar_essence, cherry_bomb, bomb, mega_bomb, coal, iridium_ore, aquamarine, jamborite, geode, magma_geode, ancient_seed, crystal_ball,
+               amethyst_crystal_ball, aquamarine_crystal_ball, emerald_crystal_ball, ruby_crystal_ball, topaz_crystal_ball, apple, pizza, explosive_ammo, peach,
+               orange, apricot, tigerseye, coconut, gold_ore, golden_coconut, pufferfish, lucky_lunch, salad, cactus_fruit, radioactive_ore, opal, broken_cd,
+               void_essence, wild_plum, pomegranate]
+balls_items = [item.as_amount(1) for item in balls_items]
+balls_bundle = BundleTemplate(CCRoom.boiler_room, MemeBundleName.balls, balls_items, 12, 6)
+
+tilesanity_items = [wood_floor.as_amount(100), rustic_plank_floor.as_amount(100), straw_floor.as_amount(100), weathered_floor.as_amount(100),
+                    crystal_floor.as_amount(100), stone_floor.as_amount(100), stone_walkway_floor.as_amount(100), brick_floor.as_amount(100),
+                    wood_path.as_amount(100), gravel_path.as_amount(100), cobblestone_path.as_amount(100), stepping_stone_path.as_amount(100),
+                    crystal_path.as_amount(100)]
+tilesanity_bundle = BundleTemplate(CCRoom.boiler_room, MemeBundleName.tilesanity, tilesanity_items, 4, 4)
+
+cap_items = [vacation_shirt, wood.as_amount(999), sap.as_amount(999), pine_cone.as_amount(100), acorn.as_amount(100),
+             maple_seed.as_amount(100), moss.as_amount(500), exotic_double_bed.as_amount(1)]
+cap_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.cap, cap_items, 8, 4)
+
+big_grapes_items = [coconut]
+big_grapes_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.big_grapes, big_grapes_items, 4, 4)
+
+obelisks_items = [earth_crystal.as_amount(10), clam.as_amount(10), coral.as_amount(10), coconut.as_amount(10), cactus_fruit.as_amount(10),
+                  banana.as_amount(10), dragon_tooth.as_amount(10), iridium_bar.as_amount(45)]
+obelisks_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.obelisks, obelisks_items, 8, 8)
+
+burger_king_revenge_items = [fossilized_tail, void_salmon, ostrich_egg.as_amount(3), tea_leaves.as_amount(10), purple_slime_egg,
+                             moss_soup.as_amount(3), radioactive_ore.as_amount(5), mystic_syrup.as_amount(10), truffle, aged_crimsonfish_roe]
+burger_king_revenge_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.burger_king_revenge, burger_king_revenge_items, 8, 8)
+
+trout_items = [golden_tag.as_amount(10), golden_tag.as_amount(20), golden_tag.as_amount(30)]
+trout_bundle = BundleTemplate(CCRoom.fish_tank, MemeBundleName.trout, trout_items, 1, 1)
+
+eg_items = [egg, brown_egg, large_egg, large_brown_egg, duck_egg, void_egg, golden_egg, dinosaur_egg, fried_egg, ostrich_egg,
+            thunder_egg, calico_egg, green_slime_egg, blue_slime_egg, purple_slime_egg, tiger_slime_egg, roe, aged_roe]
+eg_items = [item.as_amount(57) for item in eg_items]
+eg_bundle = FixedPriceBundleTemplate(CCRoom.pantry, MemeBundleName.eg, eg_items, 8, 2)
+
+doctor_angler_items = [fish.as_quality(FishQuality.iridium) for fish in legendary_fish_items]
+doctor_angler_bundle = BundleTemplate(CCRoom.fish_tank, MemeBundleName.doctor_angler, doctor_angler_items, 5, 5)
+
+smapi_items = [camping_stove, decorative_pot, slime_crate, supply_crate, warp_totem_qis_arena,
+               artifact_spot, twig, weeds, lumber, green_rain_weeds_0, seed_spot, pot_of_gold]
+smapi_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.smapi, smapi_items, 4, 4)
+
+chaos_emerald_items = [diamond, emerald, ruby, limestone, obsidian, kyanite, lemon_stone]
+chaos_emerald_bundle = FixedPriceBundleTemplate(CCRoom.crafts_room, MemeBundleName.chaos_emerald, chaos_emerald_items, 7, 7)
+
+not_the_bees_items = [BundleItem(ArtisanGood.specific_honey(flower)) for flower in all_flowers]
+not_the_bees_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.not_the_bees, not_the_bees_items, 4, 4)
+
+sappy_items = [golden_pumpkin, magic_rock_candy, pearl, prismatic_shard, rabbit_foot, stardrop_tea]
+sappy_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.sappy, sappy_items, 4, 4)
+
+honorable_items = [stone.as_amount(1), prismatic_shard.as_amount(1)]
+honorable_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.honorable, honorable_items, 2, 1)
+
+caffeinated_items = [coffee_bean.as_amount(500)]
+caffeinated_bundle = BundleTemplate(CCRoom.crafts_room, MemeBundleName.caffeinated, caffeinated_items, 1, 1)
+
+hats_off_to_you_items = [living_hat, garbage_hat, golden_helmet, laurel_wreath_crown, joja_cap,
+                         deluxe_pirate_hat, dark_cowboy_hat, tiger_hat, mystery_hat, dark_ballcap]
+hats_off_to_you_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.hats_off_to_you, hats_off_to_you_items, 8, 2)
+
+speedrunners_items = [parsnip, wine, cheese, sea_urchin, lucky_purple_shorts, mayonnaise]
+speedrunners_bundle = FixedPriceBundleTemplate(CCRoom.pantry, MemeBundleName.speedrunners, speedrunners_items, 6, 6)
+
+snitch_items = [lucky_purple_shorts]
+snitch_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.snitch, snitch_items, 1, 1)
+
+mermaid_items = [pearl, clam.as_amount(2), mermaid_pendant, mermaid_boots, flute_block.as_amount(5)]
+mermaid_bundle = FixedPriceBundleTemplate(CCRoom.fish_tank, MemeBundleName.mermaid, mermaid_items, 5, 5)
+
+commitment_items = [bouquet, mermaid_pendant, wilted_bouquet, ancient_doll.as_amount(2)]
+commitment_bundle_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.commitment, commitment_items, 4, 4)
+
+all_simple_items = [all_bundle_items_by_name[bundle_item_name] for bundle_item_name in all_bundle_items_by_name if
+                    all_bundle_items_by_name[bundle_item_name].amount == 1 and
+                    all_bundle_items_by_name[bundle_item_name].quality.startswith("Basic") and
+                    all_bundle_items_by_name[bundle_item_name].flavor is None and
+                    bundle_item_name != "Honey"]
+
+permit_a38_items = [*all_simple_items]
+permit_a38_bundle = BureaucracyBundleTemplate(CCRoom.vault, MemeBundleName.permit_a38, permit_a38_items, 1, 8)
+
+journalist_items = [*all_simple_items]
+journalist_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.journalist, journalist_items, 1, 1)
+
+trap_items = [BundleItem(MemeItem.trap)]
+trap_bundle = FixedSlotsBundleTemplate(CCRoom.bulletin_board, MemeBundleName.trap, trap_items, 4, 4)
+
+off_your_back_items = [BundleItem(MemeItem.worn_hat), BundleItem(MemeItem.worn_shirt), BundleItem(MemeItem.worn_pants),
+                       BundleItem(MemeItem.worn_boots), BundleItem(MemeItem.worn_left_ring), BundleItem(MemeItem.worn_right_ring)]
+off_your_back_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.off_your_back, off_your_back_items, 6, 6)
+
+sisyphus_items = [stone.as_amount(1)]
+sisyphus_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.sisyphus, sisyphus_items, 12, 12)
+
+vocaloid_items = [spring_onion, orange, banana, tuna, wine, ice_cream, carrot, bread, eggplant]
+vocaloid_items = [item.as_amount(10) for item in vocaloid_items]
+vocaloid_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.vocaloid, vocaloid_items, 6, 6)
+
+legendairy_items = [legend, legend_roe, legend_bait, smoked_legend, aged_legend_roe,
+                    milk.as_amount(10), cheese.as_amount(10), goat_milk.as_amount(10), goat_cheese.as_amount(10)]
+legendairy_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.legendairy, legendairy_items, 6, 4)
+
+kent_c_items = [broken_glasses.as_amount(5), refined_quartz.as_amount(10)]
+kent_c_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.kent_c, kent_c_items, 2, 2)
+
+fruit_items = [tomato, pumpkin, summer_squash, eggplant, hot_pepper]
+fruit_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.fruit, fruit_items, 5, 5)
+
+reverse_items = [*all_simple_items]
+reverse_bundle = FixedSlotsBundleTemplate(CCRoom.crafts_room, MemeBundleName.reverse, reverse_items, 4, 4)
+
+bundle_items = [*all_simple_items]
+bundle_bundle = RecursiveBundleTemplate(CCRoom.fish_tank, MemeBundleName.bundle, bundle_items, 16, 16, 4)
+
+bun_dle_items = [strange_bun, bread, tortilla, rabbit_foot]
+bun_dle_bundle = BundleTemplate(CCRoom.pantry, MemeBundleName.bun_dle, bun_dle_items, 4, 4)
+
+celeste_items = [strawberry.as_amount(175), strawberry_seeds.as_amount(4), strawberry.as_quality(CropQuality.gold).as_amount(26)]
+celeste_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.celeste, celeste_items, 3, 3)
+
+automation_items = [copper_bar.as_amount(15), iron_bar.as_amount(36), iron_bar.as_amount(20), copper_bar.as_amount(10)]
+automation_bundle = FixedPriceBundleTemplate(CCRoom.boiler_room, MemeBundleName.automation, automation_items, 4, 4)
+
+animal_well_items = [rare_disc, bone_flute, ruby_crystal_ball, cherry_bomb.as_amount(1), candle_lamp, modern_lamp, advanced_tv_remote]
+animal_well_bundle = FixedPriceBundleTemplate(CCRoom.pantry, MemeBundleName.animal_well, animal_well_items, 7, 7)
+
+schrodinger_items = [*all_simple_items]
+schrodinger_bundle = FixedPriceBundleTemplate(CCRoom.fish_tank, MemeBundleName.schrodinger, schrodinger_items, 2, 1)
+
+ikea_craftables = [Machine.mayonnaise_machine, Machine.bee_house, Machine.preserves_jar, Machine.cheese_press, Machine.keg, Machine.fish_smoker,
+                   Machine.crystalarium, Machine.worm_bin, Furniture.tub_o_flowers]
+ikea_items = [BundleItem(craftable) for craftable in ikea_craftables]
+ikea_bundle = FixedPriceBundleTemplate(CCRoom.crafts_room, MemeBundleName.ikea, ikea_items, 1, 1)
+
+this_is_fine_items = [coffee, fire_quartz, fire_quartz, fire_quartz, fire_quartz, fire_quartz, fire_quartz, fire_quartz]
+this_is_fine_bundle = FixedPriceBundleTemplate(CCRoom.crafts_room, MemeBundleName.this_is_fine, this_is_fine_items, 8, 8)
+
+crap_pot_items = [clay, mudstone, truffle, sunflower_seeds, roasted_hazelnuts, plum_pudding, rotten_plant, taro_root]
+crap_pot_bundle = BundleTemplate(CCRoom.boiler_room, MemeBundleName.crap_pot, crap_pot_items, 4, 4)
+
+emmalution_items = [garlic, bread, trash, goblin_mask, rain_totem]
+emmalution_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.emmalution, emmalution_items, 5, 5)
+
+unused_balls = [fairy_rose, melon, grape, geode, ancient_seed, crystal_ball, peach]
+yellow_pool_balls = [item.as_amount(1) for item in [solar_essence, topaz_crystal_ball, pizza, apricot, gold_ore, golden_coconut, pufferfish, lucky_lunch]]
+blue_pool_balls = [item.as_amount(2) for item in [blue_jazz, blueberry, powdermelon, ancient_fruit, iridium_ore, aquamarine, opal, broken_cd]]
+red_pool_balls = [item.as_amount(3) for item in [tomato, mega_bomb, magma_geode, apple, explosive_ammo, cranberries, cherry_bomb]]
+purple_pool_balls = [item.as_amount(4) for item in [red_cabbage, pomegranate, void_essence, wild_plum]]
+orange_pool_balls = [item.as_amount(5) for item in [pumpkin, orange, tigerseye]]
+green_pool_balls = [item.as_amount(6) for item in [cauliflower, jamborite, salad, cactus_fruit, radioactive_ore]]
+brown_pool_balls = [item.as_amount(7) for item in [acorn, coconut, hazelnut, maple_bar, maple_syrup, potato, truffle, yam]]
+black_pool_balls = [item.as_amount(8) for item in [bomb, coal, void_egg]]
+pool_items = [yellow_pool_balls, blue_pool_balls, red_pool_balls, purple_pool_balls, orange_pool_balls, green_pool_balls, brown_pool_balls, black_pool_balls]
+pool_bundle = FixedPriceDeepBundleTemplate(CCRoom.boiler_room, MemeBundleName.pool, pool_items, 8, 8)
+
+argonmatrix_items = [radish.as_amount(32), radish.as_amount(87), melon.as_amount(127), chocolate_cake.as_amount(3), cactus_fruit.as_amount(1)]
+argonmatrix_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.argonmatrix, argonmatrix_items, 5, 5)
+
+frazzleduck_items = [duck_egg, duck_feather, eggplant, green_jacket_shirt]
+frazzleduck_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.frazzleduck, frazzleduck_items, 4, 4)
+
+loser_club_items = [tuna]
+loser_club_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.loser_club, loser_club_items, 1, 1)
+
+ministry_items = [item.as_amount(999) for item in [trash, joja_cola, broken_glasses, broken_cd, soggy_newspaper]]
+ministry_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.ministry_of_madness, ministry_items, 4, 1)
+
+pomnut_items = [pomegranate, hazelnut, carrot]
+pomnut_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.pomnut, pomnut_items, 3, 3)
+
+blossom_garden_items = [banana.as_amount(18), pizza.as_amount(32), spaghetti, single_bed, pink_cake, wood_floor, triple_shot_espresso, maple_bar, bug_steak, void_essence.as_amount(10), crystal_ball, solar_essence.as_amount(10)]
+blossom_garden_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.blossom_garden, blossom_garden_items, 12, 6)
+
+cooperation_items = [*all_simple_items]
+cooperation_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.cooperation, cooperation_items, 4, 4)
+
+doctor_items = [apple.as_amount(365)]
+doctor_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.doctor, doctor_items, 1, 1)
+
+very_sticky_items = [sap.as_amount(125), sap.as_amount(125), sap.as_amount(125), sap.as_amount(125)]
+very_sticky_bundle = FixedPriceBundleTemplate(CCRoom.crafts_room, MemeBundleName.very_sticky, very_sticky_items, 4, 4)
+
+square_hole_items = [*all_simple_items]
+square_hole_bundle = FixedPriceBundleTemplate(CCRoom.bulletin_board, MemeBundleName.square_hole, square_hole_items, 6, 6)
+
+distracted_items = [*all_simple_items] # (If you bring more than one item for it, the rest get sent home)
+distracted_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.distracted, distracted_items, 4, 4)
+
+algorerhythm_items =[item.as_amount(2) for item in
+                     [midnight_squid_roe, tea_set, statue_of_endless_fortune, golden_bobber, dried_qi_fruit, cursed_mannequin,
+                      statue_of_blessings, crane_house_plant, book_of_mysteries, far_away_stone, void_ghost_pendant, trimmed_purple_shorts]]
+algorerhythm_bundle = BundleTemplate(CCRoom.bulletin_board, MemeBundleName.algorerhythm, algorerhythm_items, 12, 4)
+
+
+red_fish_items = [red_mullet, red_snapper, lava_eel, crimsonfish]
+blue_fish_items = [anchovy, tuna, sardine, bream, squid, ice_pip, albacore, blue_discus, midnight_squid, spook_fish, glacierfish]
+other_fish = [pufferfish, largemouth_bass, smallmouth_bass, rainbow_trout, walleye, perch, carp, catfish, pike, sunfish, herring, eel, octopus, sea_cucumber,
+              super_cucumber, ghostfish, stonefish, sandfish, scorpion_carp, flounder, midnight_carp, tigerseye, bullhead, tilapia, chub, dorado, shad,
+              lingcod, halibut, slimejack, stingray, goby, blobfish, angler, legend, mutant_carp]
+dr_seuss_items = [other_fish, [fish.as_amount(2) for fish in other_fish], red_fish_items, blue_fish_items]
+dr_seuss_bundle = FixedPriceDeepBundleTemplate(CCRoom.crafts_room, MemeBundleName.dr_seuss, dr_seuss_items, 4, 4)
+
+pollution_items = [trash, broken_cd, broken_glasses, joja_cola, soggy_newspaper, battery_pack]
+pollution_bundle = BundleTemplate(CCRoom.fish_tank, MemeBundleName.pollution, pollution_items, 4, 4)
+
+all_fish_item_names = sorted(list(set([item.item_name for item in [*spring_fish_items, *summer_fish_items, *fall_fish_items, *winter_fish_items]])))
+all_fish_items = [BundleItem(item).as_amount(1).as_quality(FishQuality.basic) for item in all_fish_item_names]
+catch_and_release_items = [*all_fish_items]
+catch_and_release_bundle = BundleTemplate(CCRoom.fish_tank, MemeBundleName.catch_and_release, catch_and_release_items, 4, 4)
+
+vampire_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.vampire, BundleItem(MemeCurrency.blood, 200))
+exhaustion_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.exhaustion, BundleItem(MemeCurrency.energy, 400))
+tick_tock_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.tick_tock, BundleItem(MemeCurrency.time, 1440))
+archipela_go_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.archipela_go, BundleItem(MemeCurrency.steps, 20000))
+clique_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.clique, BundleItem(MemeCurrency.clic, 1))
+cookie_clicker_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.cookie_clicker, BundleItem(MemeCurrency.cookies, 200000))
+communism_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.communism, BundleItem.money_bundle(1))
+death_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.death, death)
+flashbang_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.flashbang, BundleItem.money_bundle(0))
+connection_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.connection, BundleItem.money_bundle(0))
+reconnection_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.reconnection, BundleItem.money_bundle(0))
+nft_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.nft, BundleItem.money_bundle(0))
+firstborn_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.firstborn, BundleItem(MemeCurrency.child, 1))
+restraint_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.restraint, BundleItem.money_bundle(0))
+fast_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.fast, BundleItem(MemeCurrency.time_elapsed, 1000))
+floor_is_lava_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.floor_is_lava, BundleItem.money_bundle(0))
+joetg_bundle = CurrencyBundleTemplate(CCRoom.bulletin_board, MemeBundleName.joetg, BundleItem(MemeCurrency.dead_pumpkins, 750))
+bad_farmer_bundle = CurrencyBundleTemplate(CCRoom.pantry, MemeBundleName.bad_farmer, BundleItem(MemeCurrency.dead_crops, 400))
+bad_fisherman_bundle = CurrencyBundleTemplate(CCRoom.fish_tank, MemeBundleName.bad_fisherman, BundleItem(MemeCurrency.missed_fish, 20))
+honeywell_bundle = CurrencyBundleTemplate(CCRoom.bulletin_board, MemeBundleName.honeywell, BundleItem(MemeCurrency.honeywell, 1))
+gacha_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.gacha, BundleItem.money_bundle(10000))
+hibernation_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.hibernation, BundleItem(MemeCurrency.sleep_days, 60))
+crowdfunding_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.crowdfunding, BundleItem(MemeCurrency.bank_money, 10000))
+clickbait_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.clickbait, BundleItem.money_bundle(100))
+puzzle_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.puzzle, BundleItem.money_bundle(10))
+asmr_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.asmr, BundleItem.money_bundle(0))
+humble_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.humble, BundleItem.money_bundle(5000))
+deathlink_bundle = CurrencyBundleTemplate(CCRoom.boiler_room, MemeBundleName.deathlink, BundleItem(MemeCurrency.deathlinks, 10))
+investment_bundle = CurrencyBundleTemplate(CCRoom.vault, MemeBundleName.scam, BundleItem.money_bundle(10000))
+stanley_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.stanley, BundleItem.money_bundle(9999999))
+hairy_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.vault, MemeBundleName.hairy, BundleItem.money_bundle(0))
+# colored_crystals_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.boiler_room, MemeBundleName.colored_crystals, BundleItem.money_bundle(10))
+hint_bundle = FixedPriceCurrencyBundleTemplate(CCRoom.bulletin_board, MemeBundleName.hint, BundleItem.money_bundle(10))
+sacrifice_bundle = CurrencyBundleTemplate(CCRoom.boiler_room, MemeBundleName.sacrifice, BundleItem(MemeCurrency.goat, 1))
+
+# Stopped at 49 responses on the form
+
+# Todo Bundles
+#   Acrostic Bundle     (Asks for a specific word, you need to donate an item for each letter)
+#   Bubbles Bundle
+#   Cipher Bundle       (Some sort of code?)
+#   DLC Bundle
+#   Doom Bundle
+#   Dragonball Bundle
+#   Empty Bundle (donate empty inventory spot)
+#   Friendship Bundle   (Show some NPCs, gotta donate a loved gift for each of them)
+#   GeoGessr Bundle
+#   Ghost Bundle (it ghosts you)
+#   Joja/Morris Bundle
+#   Leaf Blower Bundle  (Leaf Blower Minigame, similar to the cookie clicker one)
+#   Lingo Bundle
+#   Lost Axe Bundle (Donate your axe then talk to Robin)
+#   Maguffin Bundle (Ap items)
+#   Millibelle Bundle (money, run away, find at spa)
+#   Minesweeper bundle (donate bombs on correct spots)
+#   Pico-8 Bundle
+#   Pollution Bundle
+#   QA Bundle           (Some sort of bug, not sure yet)
+#   Relay Bundle        (Relay Stick passed around the multiworld)
+#   Robin's Lost Axe Bundle (Give your axe, then Robin brings it back to you)
+#   Scavenger Bundle    (The bundle moves around the map and you need to keep finding it)
+#   Side Quest Bundle   (Sends you on side quests to talk to random NPCs several times)
+#   Therapy Bundle
+#   Torrent Bundle (someone must seed it for you)
+#   Witness Bundle
+#   Change Cap Bundle to forgetting something at home
+
+
+
+# Bundles that need special Mod Handling:
+#     None
+
+pantry_bundles_meme = [hurricane_tortilla_bundle, look_at_chickens_bundle, lemonade_stand_bundle, what_the_rock_is_cooking_bundle, sunmaid_bundle,
+                       big_grapes_bundle, eg_bundle, not_the_bees_bundle, speedrunners_bundle, bun_dle_bundle, animal_well_bundle, bad_farmer_bundle]
+pantry_meme = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_meme, 6)
+
+crafts_room_bundles_meme = [AAAA_bundle, anything_for_beyonce_bundle, potato_bundle, chaos_emerald_bundle, caffeinated_bundle, reverse_bundle,
+                            ikea_bundle, this_is_fine_bundle, very_sticky_bundle, dr_seuss_bundle]
+crafts_room_meme = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_meme, 6)
+
+fish_tank_bundles_meme = [crab_rave_bundle, trout_bundle, doctor_angler_bundle, mermaid_bundle, legendairy_bundle, kent_c_bundle, bundle_bundle,
+                          schrodinger_bundle, bad_fisherman_bundle, pollution_bundle, catch_and_release_bundle]
+fish_tank_meme = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_meme, 6)
+
+boiler_room_bundles_meme = [amons_fall_bundle, screw_you_bundle, rick_bundle, minecraft_bundle, balls_bundle, tilesanity_bundle, obelisks_bundle,
+                            honorable_bundle, sisyphus_bundle, automation_bundle, crap_pot_bundle, deathlink_bundle, pool_bundle, # colored_crystals_bundle,
+                            sacrifice_bundle]
+boiler_room_meme = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_meme, 3)
+
+bulletin_board_bundles_meme = [burger_king_bundle, romance_bundle, burger_king_revenge_bundle, smapi_bundle, sappy_bundle, hats_off_to_you_bundle,
+                               snitch_bundle, commitment_bundle_bundle, journalist_bundle, trap_bundle, off_your_back_bundle, vocaloid_bundle, fruit_bundle,
+                               celeste_bundle, cap_bundle, emmalution_bundle, joetg_bundle, honeywell_bundle, cooperation_bundle, square_hole_bundle,
+                               ministry_bundle, loser_club_bundle, frazzleduck_bundle, argonmatrix_bundle, pomnut_bundle, blossom_garden_bundle, doctor_bundle,
+                               hint_bundle, algorerhythm_bundle, distracted_bundle]
+bulletin_board_meme = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_meme, 5)
+
+vault_bundles_meme = [capitalist_bundle, death_bundle, permit_a38_bundle, vampire_bundle, exhaustion_bundle,
+                      tick_tock_bundle, archipela_go_bundle, clique_bundle, cookie_clicker_bundle, communism_bundle,
+                      flashbang_bundle, connection_bundle, reconnection_bundle, nft_bundle, firstborn_bundle, restraint_bundle, fast_bundle,
+                      floor_is_lava_bundle, gacha_bundle, hibernation_bundle, crowdfunding_bundle, clickbait_bundle,
+                      humble_bundle, puzzle_bundle, asmr_bundle, investment_bundle, stanley_bundle, hairy_bundle]
+vault_meme = BundleRoomTemplate(CCRoom.vault, vault_bundles_meme, 4)
+
+all_cc_meme_bundles = [*pantry_bundles_meme, *crafts_room_bundles_meme, *fish_tank_bundles_meme,
+                       *boiler_room_bundles_meme, *bulletin_board_bundles_meme, *vault_bundles_meme]
+community_center_meme_bundles = BundleRoomTemplate("Community Center", all_cc_meme_bundles, 30)
diff --git a/worlds/stardew_valley/data/bundles_data/meme_bundles_data/__init__.py b/worlds/stardew_valley/data/bundles_data/meme_bundles_data/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/stardew_valley/data/bundles_data/meme_bundles_data/capitalist_bundle.py b/worlds/stardew_valley/data/bundles_data/meme_bundles_data/capitalist_bundle.py
new file mode 100644
index 0000000000..3c37eebcd2
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/meme_bundles_data/capitalist_bundle.py
@@ -0,0 +1,92 @@
+import math
+from typing import Dict, List
+
+from ..bundle_items_data import *
+from ....bundles.bundle_item import BundleItem
+from ....strings.quality_names import ArtisanQuality
+
+capitalist_value = 1000000
+ancient_fruit_wines = {ArtisanQuality.basic: 2310, ArtisanQuality.silver: 2886, ArtisanQuality.gold: 3465, ArtisanQuality.iridium: 4620}
+starfruit_wines = {ArtisanQuality.basic: 3150, ArtisanQuality.silver: 3936, ArtisanQuality.gold: 4725, ArtisanQuality.iridium: 6300}
+rhubarb_wines = {ArtisanQuality.silver: 1155, ArtisanQuality.gold: 1386, ArtisanQuality.iridium: 1848}
+melon_wines = {ArtisanQuality.basic: 1050, ArtisanQuality.silver: 1311, ArtisanQuality.gold: 1575, ArtisanQuality.iridium: 2100}
+pineapple_wines = {ArtisanQuality.basic: 1260, ArtisanQuality.silver: 1575, ArtisanQuality.gold: 1890, ArtisanQuality.iridium: 2520}
+starfruits = {ArtisanQuality.silver: 1030, ArtisanQuality.gold: 1237, ArtisanQuality.iridium: 1650}
+sweet_gem_berries = {ArtisanQuality.basic: 3000, ArtisanQuality.silver: 3750, ArtisanQuality.gold: 4500, ArtisanQuality.iridium: 6000}
+
+# These are just too rude I think
+# cherry_saplings = {ArtisanQuality.silver: 1062, ArtisanQuality.gold: 1275, ArtisanQuality.iridium: 1700}
+# banana_saplings = {ArtisanQuality.silver: 1062, ArtisanQuality.gold: 1275, ArtisanQuality.iridium: 1700}
+# mango_saplings = {ArtisanQuality.silver: 1062, ArtisanQuality.gold: 1275, ArtisanQuality.iridium: 1700}
+# orange_saplings = {ArtisanQuality.silver: 1250, ArtisanQuality.gold: 1500, ArtisanQuality.iridium: 2000}
+# peach_saplings = {ArtisanQuality.basic: 1500, ArtisanQuality.silver: 1875, ArtisanQuality.gold: 2250, ArtisanQuality.iridium: 3000}
+# apple_saplings = {ArtisanQuality.silver: 1250, ArtisanQuality.gold: 1500, ArtisanQuality.iridium: 2000}
+# pomegranate_saplings = {ArtisanQuality.basic: 1500, ArtisanQuality.silver: 1875, ArtisanQuality.gold: 2250, ArtisanQuality.iridium: 3000}
+
+
+def get_capitalist_item(item: BundleItem, quality: str, value: int) -> BundleItem:
+    amount = math.ceil(capitalist_value / value)
+    assert amount < 1000
+    return item.as_quality(quality).as_amount(amount)
+
+
+def get_capitalist_items(item: BundleItem, values_by_quality: Dict[str, int]) -> List[BundleItem]:
+    return [get_capitalist_item(item, quality, values_by_quality[quality]) for quality in values_by_quality]
+
+
+capitalist_items = [
+    *get_capitalist_items(ancient_fruit_wine, ancient_fruit_wines),
+    get_capitalist_item(dried_ancient_fruit, ArtisanQuality.basic, 5810),
+    get_capitalist_item(ancient_fruit_jelly, ArtisanQuality.basic, 1610),
+    get_capitalist_item(ancient_fruit, ArtisanQuality.iridium, 1210),
+
+    *get_capitalist_items(starfruit_wine, starfruit_wines),
+    get_capitalist_item(dried_starfruit, ArtisanQuality.basic, 7910),
+    get_capitalist_item(starfruit_jelly, ArtisanQuality.basic, 2170),
+    *get_capitalist_items(starfruit, starfruits),
+
+    *get_capitalist_items(rhubarb_wine, rhubarb_wines),
+    get_capitalist_item(dried_rhubarb, ArtisanQuality.basic, 2345),
+    *get_capitalist_items(melon_wine, melon_wines),
+    get_capitalist_item(dried_melon, ArtisanQuality.basic, 2660),
+    *get_capitalist_items(pineapple_wine, pineapple_wines),
+
+    get_capitalist_item(dried_pineapple, ArtisanQuality.basic, 3185),
+    get_capitalist_item(dried_banana, ArtisanQuality.basic, 1610),
+    get_capitalist_item(strawberry_wine, ArtisanQuality.iridium, 1008),
+    get_capitalist_item(dried_strawberry, ArtisanQuality.basic, 1295),
+
+    *get_capitalist_items(sweet_gem_berry, sweet_gem_berries),
+    get_capitalist_item(pumpkin_juice, ArtisanQuality.basic, 1008),
+
+    get_capitalist_item(goat_cheese, ArtisanQuality.iridium, 1120),
+    get_capitalist_item(golden_egg, ArtisanQuality.iridium, 1200),
+    get_capitalist_item(dinosaur_mayo, ArtisanQuality.basic, 1120),
+    get_capitalist_item(truffle_oil, ArtisanQuality.basic, 1491),
+    get_capitalist_item(truffle, ArtisanQuality.iridium, 1250),
+
+    get_capitalist_item(aged_lava_eel_roe, ArtisanQuality.basic, 1064),
+    get_capitalist_item(aged_crimsonfish_roe, ArtisanQuality.basic, 2184),
+    get_capitalist_item(aged_angler_roe, ArtisanQuality.basic, 1344),
+    get_capitalist_item(legend_roe, ArtisanQuality.basic, 2530),
+    get_capitalist_item(aged_legend_roe, ArtisanQuality.basic, 7084),
+    get_capitalist_item(aged_glacierfish_roe, ArtisanQuality.basic, 1484),
+    get_capitalist_item(aged_mutant_carp_roe, ArtisanQuality.basic, 1484),
+
+    get_capitalist_item(iridium_bar, ArtisanQuality.basic, 1500),
+    get_capitalist_item(radioactive_bar, ArtisanQuality.basic, 4500),
+    get_capitalist_item(prismatic_shard, ArtisanQuality.basic, 2600),
+
+    get_capitalist_item(mystic_syrup, ArtisanQuality.basic, 1250),
+
+    # *get_capitalist_items(cherry_sapling, cherry_saplings),
+    # *get_capitalist_items(banana_sapling, banana_saplings),
+    # *get_capitalist_items(mango_sapling, mango_saplings),
+    # *get_capitalist_items(orange_sapling, orange_saplings),
+    # *get_capitalist_items(peach_sapling, peach_saplings),
+    # *get_capitalist_items(apple_sapling, apple_saplings),
+    # *get_capitalist_items(pomegranate_sapling, pomegranate_saplings),
+
+    bowler_hat,
+    sombrero,
+]
\ No newline at end of file
diff --git a/worlds/stardew_valley/data/bundles_data/remixed_anywhere_bundles.py b/worlds/stardew_valley/data/bundles_data/remixed_anywhere_bundles.py
new file mode 100644
index 0000000000..56504f146e
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/remixed_anywhere_bundles.py
@@ -0,0 +1,5 @@
+from .remixed_bundles import *
+
+all_cc_remixed_bundles = [*crafts_room_bundles_remixed, *pantry_bundles_remixed, *fish_tank_bundles_remixed,
+                          *boiler_room_bundles_remixed, *bulletin_board_bundles_remixed, *vault_bundles_remixed]
+community_center_remixed_anywhere = BundleRoomTemplate("Community Center", all_cc_remixed_bundles, 30)
diff --git a/worlds/stardew_valley/data/bundles_data/remixed_bundles.py b/worlds/stardew_valley/data/bundles_data/remixed_bundles.py
new file mode 100644
index 0000000000..a4098be4c5
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/remixed_bundles.py
@@ -0,0 +1,245 @@
+from .thematic_bundles import *
+from ...bundles.bundle import IslandBundleTemplate, FestivalBundleTemplate, CurrencyBundleTemplate
+from ...bundles.bundle_room import BundleRoomTemplate
+from ...content import content_packs
+from ...strings.bundle_names import CCRoom
+
+# Giant Stump
+from ...strings.quality_names import ForageQuality, FishQuality
+
+giant_stump_bundles_remixed = giant_stump_bundles_thematic
+giant_stump_remixed = BundleRoomTemplate(CCRoom.raccoon_requests, giant_stump_bundles_remixed, 8)
+
+# Crafts Room
+
+beach_foraging_items = [nautilus_shell, coral, sea_urchin, rainbow_shell, clam, cockle, mussel, oyster, seaweed]
+beach_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.beach_foraging, beach_foraging_items, 4, 4)
+
+mines_foraging_items = [quartz, earth_crystal, frozen_tear, fire_quartz, red_mushroom, purple_mushroom, cave_carrot]
+mines_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.mines_foraging, mines_foraging_items, 4, 4)
+
+desert_foraging_items = [cactus_fruit.as_quality(ForageQuality.gold), cactus_fruit.as_amount(5), coconut.as_quality(ForageQuality.gold), coconut.as_amount(5)]
+desert_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.desert_foraging, desert_foraging_items, 2, 2)
+
+island_foraging_items = [ginger.as_amount(5), magma_cap.as_quality(ForageQuality.gold), magma_cap.as_amount(5),
+                         fiddlehead_fern.as_quality(ForageQuality.gold), fiddlehead_fern.as_amount(5)]
+island_foraging_bundle = IslandBundleTemplate(CCRoom.crafts_room, BundleName.island_foraging, island_foraging_items, 2, 2)
+
+sticky_items = [sap.as_amount(500), sap.as_amount(500)]
+sticky_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.sticky, sticky_items, 1, 1)
+
+forest_items = [moss.as_amount(10), fiber.as_amount(200), acorn.as_amount(10), maple_seed.as_amount(10), pine_cone.as_amount(10), mahogany_seed,
+                mushroom_tree_seed, mossy_seed.as_amount(5), mystic_tree_seed]
+forest_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.forest, forest_items, 4, 2)
+
+wild_medicine_items = [item.as_amount(5) for item in [purple_mushroom, fiddlehead_fern, white_algae, hops, blackberry, dandelion]]
+wild_medicine_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.wild_medicine, wild_medicine_items, 4, 3)
+
+quality_foraging_items = sorted({item.as_quality(ForageQuality.gold).as_amount(3)
+                                 for item in
+                                 [*spring_foraging_items_thematic, *summer_foraging_items_thematic, *fall_foraging_items_thematic,
+                                  *winter_foraging_items_thematic, *beach_foraging_items, *desert_foraging_items, magma_cap] if item.can_have_quality})
+quality_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.quality_foraging, quality_foraging_items, 4, 3)
+
+green_rain_items = [moss.as_amount(200), fiber.as_amount(200), mossy_seed.as_amount(20), fiddlehead_fern.as_amount(10)]
+green_rain_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.green_rain, green_rain_items, 4, 3)
+
+totems_items = [warp_totem_beach.as_amount(5), warp_totem_mountains.as_amount(5), warp_totem_farm.as_amount(5), warp_totem_desert.as_amount(5),
+                warp_totem_island.as_amount(5), rain_totem.as_amount(5), treasure_totem.as_amount(5)]
+totems_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.totems, totems_items, 4, 3)
+
+crafts_room_bundles_remixed = [*crafts_room_bundles_thematic, beach_foraging_bundle, mines_foraging_bundle, desert_foraging_bundle,
+                               island_foraging_bundle, sticky_bundle, forest_bundle, wild_medicine_bundle, quality_foraging_bundle, green_rain_bundle]
+crafts_room_remixed = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_remixed, 6)
+
+# Pantry
+
+rare_crops_items = [ancient_fruit, sweet_gem_berry]
+rare_crops_bundle = BundleTemplate(CCRoom.pantry, BundleName.rare_crops, rare_crops_items, 2, 2)
+
+# all_specific_roes = [BundleItem(AnimalProduct.roe, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fish]
+fish_farmer_items = [roe.as_amount(15), aged_roe.as_amount(5), squid_ink, caviar.as_amount(5)]
+fish_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.fish_farmer, fish_farmer_items, 3, 2)
+
+garden_items = [tulip, blue_jazz, summer_spangle, sunflower, fairy_rose, poppy, bouquet]
+garden_bundle = BundleTemplate(CCRoom.pantry, BundleName.garden, garden_items, 5, 4)
+
+brewer_items = [mead, pale_ale, wine, juice, green_tea, beer]
+brewer_bundle = BundleTemplate(CCRoom.pantry, BundleName.brewer, brewer_items, 5, 4)
+
+orchard_items = [apple, apricot, orange, peach, pomegranate, cherry, banana, mango]
+orchard_bundle = BundleTemplate(CCRoom.pantry, BundleName.orchard, orchard_items, 6, 4)
+
+island_crops_items = [pineapple, taro_root, banana, mango]
+island_crops_bundle = IslandBundleTemplate(CCRoom.pantry, BundleName.island_crops, island_crops_items, 3, 3)
+
+agronomist_items = [basic_fertilizer, quality_fertilizer, deluxe_fertilizer,
+                    basic_retaining_soil, quality_retaining_soil, deluxe_retaining_soil,
+                    speed_gro, deluxe_speed_gro, hyper_speed_gro, tree_fertilizer]
+agronomist_bundle = BundleTemplate(CCRoom.pantry, BundleName.agronomist, agronomist_items, 4, 3)
+
+slime_farmer_items = [slime.as_amount(99), petrified_slime.as_amount(10), blue_slime_egg, red_slime_egg,
+                      purple_slime_egg, green_slime_egg, tiger_slime_egg]
+slime_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.slime_farmer, slime_farmer_items, 4, 3)
+
+sommelier_items = [BundleItem(ArtisanGood.wine, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits]
+sommelier_bundle = BundleTemplate(CCRoom.pantry, BundleName.sommelier, sommelier_items, 6, 3)
+
+dry_items = [*[BundleItem(ArtisanGood.dried_fruit, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits],
+             *[BundleItem(ArtisanGood.dried_mushroom, flavor=mushroom, source=BundleItem.Sources.content) for mushroom in all_edible_mushrooms],
+             BundleItem(ArtisanGood.raisins, source=BundleItem.Sources.content)]
+dry_bundle = BundleTemplate(CCRoom.pantry, BundleName.dry, dry_items, 6, 3)
+
+pantry_bundles_remixed = [*pantry_bundles_thematic, rare_crops_bundle, fish_farmer_bundle, garden_bundle,
+                          brewer_bundle, orchard_bundle, island_crops_bundle, agronomist_bundle, slime_farmer_bundle, sommelier_bundle, dry_bundle]
+pantry_remixed = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_remixed, 6)
+
+# Fish Tank
+trash_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.trash, crab_pot_trash_items, 4, 4)
+
+spring_fish_items = [herring, halibut, shad, flounder, sunfish, sardine, catfish, anchovy, smallmouth_bass, eel, legend]
+spring_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.spring_fish, spring_fish_items, 4, 4)
+
+summer_fish_items = [tuna, pike, red_mullet, sturgeon, red_snapper, super_cucumber, tilapia, pufferfish, rainbow_trout,
+                     octopus, dorado, halibut, shad, flounder, sunfish, crimsonfish]
+summer_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.summer_fish, summer_fish_items, 4, 4)
+
+fall_fish_items = [red_snapper, super_cucumber, tilapia, shad, sardine, catfish, anchovy, smallmouth_bass, eel, midnight_carp,
+                   walleye, sea_cucumber, tiger_trout, albacore, salmon, angler]
+fall_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.fall_fish, fall_fish_items, 4, 4)
+
+winter_fish_items = [perch, squid, lingcod, tuna, pike, red_mullet, sturgeon, red_snapper, herring, halibut, sardine,
+                     midnight_carp, sea_cucumber, tiger_trout, albacore, glacierfish]
+winter_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.winter_fish, winter_fish_items, 4, 4)
+
+rain_fish_items = [red_snapper, shad, catfish, eel, walleye]
+rain_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.rain_fish, rain_fish_items, 3, 3)
+
+quality_fish_items = sorted({
+    item.as_quality(FishQuality.gold).as_amount(2)
+    for item in [*river_fish_items_thematic, *lake_fish_items_thematic, *ocean_fish_items_thematic]
+})
+quality_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.quality_fish, quality_fish_items, 4, 3)
+
+master_fisher_items = [lava_eel, scorpion_carp, octopus, blobfish, lingcod, ice_pip, super_cucumber, stingray, void_salmon, pufferfish]
+master_fisher_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.master_fisher, master_fisher_items, 4, 2)
+
+legendary_fish_items = [angler, legend, mutant_carp, crimsonfish, glacierfish]
+legendary_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.legendary_fish, legendary_fish_items, 4, 2)
+
+island_fish_items = [lionfish, blue_discus, stingray]
+island_fish_bundle = IslandBundleTemplate(CCRoom.fish_tank, BundleName.island_fish, island_fish_items, 3, 3)
+
+tackle_items = [spinner, dressed_spinner, trap_bobber, sonar_bobber, cork_bobber, lead_bobber, treasure_hunter, barbed_hook, curiosity_lure, quality_bobber]
+tackle_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.tackle, tackle_items, 3, 2)
+
+bait_items = [bait, magnet, wild_bait, magic_bait, challenge_bait, deluxe_bait, targeted_bait]
+bait_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.bait, bait_items, 3, 2)
+
+# This bundle could change based on content packs, once the fish are properly in it. Until then, I'm not sure how, so pelican town only
+specific_bait_items = [BundleItem(ArtisanGood.targeted_bait, flavor=fish.name).as_amount(10) for fish in content_packs.pelican_town.fishes]
+specific_bait_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.specific_bait, specific_bait_items, 6, 3)
+
+deep_fishing_items = [blobfish, spook_fish, midnight_squid, sea_cucumber, super_cucumber, octopus, pearl, seaweed]
+deep_fishing_bundle = FestivalBundleTemplate(CCRoom.fish_tank, BundleName.deep_fishing, deep_fishing_items, 4, 3)
+
+smokeable_fish = [Fish.largemouth_bass, Fish.bream, Fish.bullhead, Fish.chub, Fish.ghostfish, Fish.flounder, Fish.shad, Fish.rainbow_trout, Fish.tilapia,
+                  Fish.red_mullet, Fish.tuna, Fish.midnight_carp, Fish.salmon, Fish.perch]
+fish_smoker_items = [BundleItem(ArtisanGood.smoked_fish, flavor=fish) for fish in smokeable_fish]
+fish_smoker_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.fish_smoker, fish_smoker_items, 6, 3)
+
+fish_tank_bundles_remixed = [*fish_tank_bundles_thematic, spring_fish_bundle, summer_fish_bundle,
+                             fall_fish_bundle, winter_fish_bundle, trash_bundle, rain_fish_bundle,
+                             quality_fish_bundle, master_fisher_bundle, legendary_fish_bundle,
+                             tackle_bundle, bait_bundle, specific_bait_bundle, deep_fishing_bundle,
+                             fish_smoker_bundle]
+
+# In Remixed, the trash items are in the recycling bundle, so we don't use the thematic version of the crab pot bundle that added trash items to it
+fish_tank_bundles_remixed.remove(crab_pot_bundle_thematic)
+fish_tank_bundles_remixed.append(crab_pot_bundle_vanilla)
+
+fish_tank_remixed = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_remixed, 6)
+
+# Boiler Room
+
+# Where to put radioactive bar?
+treasure_hunter_items = [emerald, aquamarine, ruby, amethyst, topaz, jade, diamond]
+treasure_hunter_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.treasure_hunter, treasure_hunter_items, 6, 5)
+
+engineer_items = [iridium_ore.as_amount(5), battery_pack, refined_quartz.as_amount(5), diamond]
+engineer_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.engineer, engineer_items, 3, 3)
+
+demolition_items = [cherry_bomb, bomb, mega_bomb, explosive_ammo]
+demolition_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.demolition, demolition_items, 3, 3)
+
+recycling_items = [stone, coal, iron_ore, wood, cloth, refined_quartz]
+recycling_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.recycling, recycling_items, 4, 4)
+
+archaeologist_items = [golden_mask, golden_relic, ancient_drum, dwarf_gadget, dwarvish_helm, prehistoric_handaxe, bone_flute, anchor, prehistoric_tool,
+                       chicken_statue, rusty_cog, rusty_spur, rusty_spoon, ancient_sword, ornamental_fan, elvish_jewelry, ancient_doll, chipped_amphora]
+archaeologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.archaeologist, archaeologist_items, 6, 3)
+
+paleontologist_items = [prehistoric_scapula, prehistoric_tibia, prehistoric_skull, skeletal_hand, prehistoric_rib, prehistoric_vertebra, skeletal_tail,
+                        nautilus_fossil, amphibian_fossil, palm_fossil, trilobite]
+paleontologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.paleontologist, paleontologist_items, 6, 3)
+
+boiler_room_bundles_remixed = [*boiler_room_bundles_thematic, treasure_hunter_bundle, engineer_bundle,
+                               demolition_bundle, recycling_bundle, archaeologist_bundle, paleontologist_bundle]
+boiler_room_remixed = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_remixed, 3)
+
+# Bulletin Board
+children_items = [salmonberry.as_amount(10), cookie, ancient_doll, ice_cream, cranberry_candy, ginger_ale,
+                  grape.as_amount(10), pink_cake, snail, fairy_rose, plum_pudding]
+children_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.children, children_items, 4, 3)
+
+forager_items = [salmonberry.as_amount(50), blackberry.as_amount(50), wild_plum.as_amount(20), snow_yam.as_amount(20),
+                 common_mushroom.as_amount(20), grape.as_amount(20), spring_onion.as_amount(20)]
+forager_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.forager, forager_items, 3, 2)
+
+home_cook_items = [egg.as_amount(10), milk.as_amount(10), wheat_flour.as_amount(100), sugar.as_amount(100), vinegar.as_amount(100),
+                   chocolate_cake, pancakes, rhubarb_pie]
+home_cook_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.home_cook, home_cook_items, 3, 3)
+
+helper_items = [prize_ticket, mystery_box.as_amount(5), gold_mystery_box]
+helper_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.helper, helper_items, 2, 2)
+
+spirit_eve_items = [jack_o_lantern, corn.as_amount(10), bat_wing.as_amount(10)]
+spirit_eve_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.spirit_eve, spirit_eve_items, 3, 3)
+
+winter_star_items = [holly.as_amount(5), plum_pudding, stuffing, powdermelon.as_amount(5)]
+winter_star_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.winter_star, winter_star_items, 2, 2)
+
+bartender_items = [shrimp_cocktail, triple_shot_espresso, ginger_ale, cranberry_candy, beer, pale_ale, pina_colada]
+bartender_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.bartender, bartender_items, 3, 3)
+
+calico_items = [calico_egg.as_amount(200), calico_egg.as_amount(200), calico_egg.as_amount(200), calico_egg.as_amount(200),
+                magic_rock_candy, mega_bomb.as_amount(10), mystery_box.as_amount(10), mixed_seeds.as_amount(50),
+                strawberry_seeds.as_amount(20),
+                spicy_eel.as_amount(5), crab_cakes.as_amount(5), eggplant_parmesan.as_amount(5),
+                pumpkin_soup.as_amount(5), lucky_lunch.as_amount(5) ]
+calico_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.calico, calico_items, 2, 2)
+
+raccoon_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.raccoon, raccoon_foraging_items, 4, 4)
+
+bulletin_board_bundles_remixed = [*bulletin_board_bundles_thematic, children_bundle, forager_bundle, home_cook_bundle,
+                                  helper_bundle, spirit_eve_bundle, winter_star_bundle, bartender_bundle, calico_bundle, raccoon_bundle]
+bulletin_board_remixed = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_remixed, 5)
+
+# Abandoned Joja Mart
+abandoned_joja_mart_remixed = abandoned_joja_mart_thematic
+
+# Vault
+vault_gambler_items = BundleItem(Currency.qi_coin, 10000)
+vault_gambler_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.gambler, vault_gambler_items)
+
+vault_carnival_items = BundleItem(Currency.star_token, 2500, source=BundleItem.Sources.festival)
+vault_carnival_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.carnival, vault_carnival_items)
+
+vault_walnut_hunter_items = BundleItem(Currency.golden_walnut, 25)
+vault_walnut_hunter_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.walnut_hunter, vault_walnut_hunter_items)
+
+vault_qi_helper_items = BundleItem(Currency.qi_gem, 25, source=BundleItem.Sources.island)
+vault_qi_helper_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.qi_helper, vault_qi_helper_items)
+
+vault_bundles_remixed = [*vault_bundles_vanilla, vault_gambler_bundle, vault_qi_helper_bundle, vault_carnival_bundle]  # , vault_walnut_hunter_bundle
+vault_remixed = BundleRoomTemplate(CCRoom.vault, vault_bundles_remixed, 4)
diff --git a/worlds/stardew_valley/data/bundles_data/thematic_bundles.py b/worlds/stardew_valley/data/bundles_data/thematic_bundles.py
new file mode 100644
index 0000000000..1498883533
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/thematic_bundles.py
@@ -0,0 +1,158 @@
+from .vanilla_bundles import *
+from ...bundles.bundle import BundleTemplate
+from ...bundles.bundle_room import BundleRoomTemplate
+from ...strings.bundle_names import CCRoom, BundleName
+
+# Giant Stump
+from ...strings.quality_names import ArtisanQuality, FishQuality
+
+raccoon_fish_items_flat = [*raccoon_crab_pot_fish_items, *raccoon_smoked_fish_items]
+raccoon_fish_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_fish, raccoon_fish_items_flat, 3, 2)
+raccoon_artisan_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_artisan, raccoon_artisan_items, 3, 2)
+
+raccoon_food_items_thematic = [*all_specific_dried_mushrooms, *raccoon_food_items, brown_egg.as_amount(5), large_egg.as_amount(2), large_brown_egg.as_amount(2),
+                               green_algae.as_amount(10)]
+raccoon_food_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_food, raccoon_food_items_thematic, 3, 2)
+
+raccoon_foraging_bundle_thematic = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_foraging, raccoon_foraging_items, 3, 2)
+
+giant_stump_bundles_thematic = [raccoon_fish_bundle_thematic, raccoon_artisan_bundle_thematic, raccoon_food_bundle_thematic, raccoon_foraging_bundle_thematic]
+giant_stump_thematic = BundleRoomTemplate(CCRoom.raccoon_requests, giant_stump_bundles_thematic, 8)
+
+
+# Crafts Room
+spring_foraging_items_thematic = [*spring_foraging_items_vanilla, spring_onion, salmonberry, morel]
+spring_foraging_bundle_thematic = BundleTemplate.extend_from(spring_foraging_bundle_vanilla, spring_foraging_items_thematic)
+
+summer_foraging_items_thematic = [*summer_foraging_items_vanilla, fiddlehead_fern, red_mushroom, rainbow_shell]
+summer_foraging_bundle_thematic = BundleTemplate.extend_from(summer_foraging_bundle_vanilla, summer_foraging_items_thematic)
+
+fall_foraging_items_thematic = [*fall_foraging_items_vanilla, chanterelle]
+fall_foraging_bundle_thematic = BundleTemplate.extend_from(fall_foraging_bundle_vanilla, fall_foraging_items_thematic)
+
+winter_foraging_items_thematic = [*winter_foraging_items_vanilla, holly, nautilus_shell]
+winter_foraging_bundle_thematic = BundleTemplate.extend_from(winter_foraging_bundle_vanilla, winter_foraging_items_thematic)
+
+construction_items_thematic = [*construction_items_vanilla, clay.as_amount(10), fiber.as_amount(99), sap.as_amount(50)]
+construction_bundle_thematic = BundleTemplate.extend_from(construction_bundle_vanilla, construction_items_thematic)
+
+exotic_foraging_items_thematic = [*exotic_foraging_items_vanilla, coral, sea_urchin, clam, cockle, mussel, oyster, seaweed]
+exotic_foraging_bundle_thematic = BundleTemplate.extend_from(exotic_foraging_bundle_vanilla, exotic_foraging_items_thematic)
+
+crafts_room_bundles_thematic = [spring_foraging_bundle_thematic, summer_foraging_bundle_thematic, fall_foraging_bundle_thematic,
+                                winter_foraging_bundle_thematic, construction_bundle_thematic, exotic_foraging_bundle_thematic]
+crafts_room_thematic = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_thematic, 6)
+
+# Pantry
+spring_crops_items_thematic = [*spring_crops_items_vanilla, blue_jazz, coffee_bean, garlic, kale, rhubarb, strawberry, tulip, unmilled_rice, carrot]
+spring_crops_bundle_thematic = BundleTemplate.extend_from(spring_crops_bundle_vanilla, spring_crops_items_thematic)
+
+summer_crops_items_thematic = [*summer_crops_items_vanilla, corn, hops, poppy, radish, red_cabbage, starfruit, summer_spangle, sunflower, wheat, summer_squash]
+summer_crops_bundle_thematic = BundleTemplate.extend_from(summer_crops_bundle_vanilla, summer_crops_items_thematic)
+
+fall_crops_items_thematic = [*fall_crops_items_vanilla, amaranth, artichoke, beet, bok_choy, cranberries, fairy_rose, grape,
+                             sunflower, wheat, sweet_gem_berry, broccoli]
+fall_crops_bundle_thematic = BundleTemplate.extend_from(fall_crops_bundle_vanilla, fall_crops_items_thematic)
+
+all_crops_items = sorted({*spring_crops_items_thematic, *summer_crops_items_thematic, *fall_crops_items_thematic, powdermelon})
+
+quality_crops_items_thematic = [item.as_quality_crop() for item in all_crops_items]
+quality_crops_bundle_thematic = BundleTemplate.extend_from(quality_crops_bundle_vanilla, quality_crops_items_thematic)
+
+animal_items_thematic = [*animal_items_vanilla, egg, brown_egg, milk, goat_milk, truffle,
+                         duck_feather, rabbit_foot, dinosaur_egg, void_egg, golden_egg, ostrich_egg]
+animal_bundle_thematic = BundleTemplate.extend_from(animal_bundle_vanilla, animal_items_thematic)
+
+artisan_items_thematic = [*artisan_items_vanilla, beer, juice, mead, pale_ale, wine, pickles, caviar, aged_roe, coffee, green_tea, banana, mango]
+artisan_bundle_thematic = BundleTemplate.extend_from(artisan_bundle_vanilla, artisan_items_thematic)
+
+pantry_bundles_thematic = [spring_crops_bundle_thematic, summer_crops_bundle_thematic, fall_crops_bundle_thematic,
+                           quality_crops_bundle_thematic, animal_bundle_thematic, artisan_bundle_thematic]
+pantry_thematic = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_thematic, 6)
+
+# Fish Tank
+river_fish_items_thematic = [*river_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, pike, bream, salmon, smallmouth_bass, dorado]
+river_fish_bundle_thematic = BundleTemplate.extend_from(river_fish_bundle_vanilla, river_fish_items_thematic)
+
+lake_fish_items_thematic = [*lake_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, midnight_carp]
+lake_fish_bundle_thematic = BundleTemplate.extend_from(lake_fish_bundle_vanilla, lake_fish_items_thematic)
+
+ocean_fish_items_thematic = [*ocean_fish_items_vanilla, pufferfish, super_cucumber, flounder, anchovy, red_mullet,
+                             herring, eel, octopus, squid, sea_cucumber, albacore, halibut]
+ocean_fish_bundle_thematic = BundleTemplate.extend_from(ocean_fish_bundle_vanilla, ocean_fish_items_thematic)
+
+night_fish_items_thematic = [*night_fish_items_vanilla, super_cucumber, squid, midnight_carp, midnight_squid]
+night_fish_bundle_thematic = BundleTemplate.extend_from(night_fish_bundle_vanilla, night_fish_items_thematic)
+
+crab_pot_items_thematic = [*crab_pot_items_vanilla, *crab_pot_trash_items]
+crab_pot_bundle_thematic = BundleTemplate.extend_from(crab_pot_bundle_vanilla, crab_pot_items_thematic)
+
+specialty_fish_items_thematic = [*specialty_fish_items_vanilla, scorpion_carp, eel, octopus, lava_eel, ice_pip,
+                                 stonefish, void_salmon, stingray, spookfish, midnight_squid, slimejack, goby]
+specialty_fish_bundle_thematic = BundleTemplate.extend_from(specialty_fish_bundle_vanilla, specialty_fish_items_thematic)
+
+fish_tank_bundles_thematic = [river_fish_bundle_thematic, lake_fish_bundle_thematic, ocean_fish_bundle_thematic,
+                              night_fish_bundle_thematic, crab_pot_bundle_thematic, specialty_fish_bundle_thematic]
+fish_tank_thematic = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_thematic, 6)
+
+# Boiler Room
+blacksmith_items_thematic = [*blacksmith_items_vanilla, iridium_bar, refined_quartz.as_amount(3), wilted_bouquet]
+blacksmith_bundle_thematic = BundleTemplate.extend_from(blacksmith_bundle_vanilla, blacksmith_items_thematic)
+
+geologist_items_thematic = [*geologist_items_vanilla, emerald, aquamarine, ruby, amethyst, topaz, jade, diamond]
+geologist_bundle_thematic = BundleTemplate.extend_from(geologist_bundle_vanilla, geologist_items_thematic)
+
+adventurer_items_thematic = [*adventurer_items_vanilla, bug_meat, coal.as_amount(5), bone_fragment.as_amount(10)]
+adventurer_bundle_thematic = BundleTemplate.extend_from(adventurer_bundle_vanilla, adventurer_items_thematic)
+
+boiler_room_bundles_thematic = [blacksmith_bundle_thematic, geologist_bundle_thematic, adventurer_bundle_thematic]
+boiler_room_thematic = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_thematic, 3)
+
+# Bulletin Board
+
+# More recipes?
+chef_items_thematic = [maki_roll, fried_egg, omelet, pizza, hashbrowns, pancakes, bread, tortilla,
+                       farmer_s_lunch, survival_burger, dish_o_the_sea, miner_s_treat, roots_platter, salad,
+                       cheese_cauliflower, parsnip_soup, fried_mushroom, salmon_dinner, pepper_poppers, spaghetti,
+                       sashimi, blueberry_tart, algae_soup, pale_broth, chowder]
+chef_bundle_thematic = BundleTemplate.extend_from(chef_bundle_vanilla, chef_items_thematic)
+
+dye_red_items = [cranberries, hot_pepper, radish, rhubarb, spaghetti, strawberry, tomato, tulip, red_mushroom]
+dye_orange_items = [poppy, pumpkin, apricot, orange, spice_berry, winter_root]
+dye_yellow_items = [corn, parsnip, summer_spangle, sunflower, starfruit]
+dye_green_items = [fiddlehead_fern, kale, artichoke, bok_choy, green_bean, cactus_fruit, duck_feather, dinosaur_egg]
+dye_blue_items = [blueberry, blue_jazz, blackberry, crystal_fruit, aquamarine]
+dye_purple_items = [beet, crocus, eggplant, red_cabbage, sweet_pea, iridium_bar, sea_urchin, amaranth]
+dye_items_thematic = [dye_red_items, dye_orange_items, dye_yellow_items, dye_green_items, dye_blue_items, dye_purple_items]
+dye_bundle_thematic = DeepBundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_thematic, 6, 6)
+
+field_research_items_thematic = [*field_research_items_vanilla, geode, magma_geode, omni_geode,
+                                 rainbow_shell, amethyst, bream, carp]
+field_research_bundle_thematic = BundleTemplate.extend_from(field_research_bundle_vanilla, field_research_items_thematic)
+
+fodder_items_thematic = [*fodder_items_vanilla, kale.as_amount(3), corn.as_amount(3), green_bean.as_amount(3),
+                         potato.as_amount(3), green_algae.as_amount(5), white_algae.as_amount(3)]
+fodder_bundle_thematic = BundleTemplate.extend_from(fodder_bundle_vanilla, fodder_items_thematic)
+
+enchanter_items_thematic = [*enchanter_items_vanilla, purple_mushroom, solar_essence,
+                            super_cucumber, void_essence, fire_quartz, frozen_tear, jade]
+enchanter_bundle_thematic = BundleTemplate.extend_from(enchanter_bundle_vanilla, enchanter_items_thematic)
+
+bulletin_board_bundles_thematic = [chef_bundle_thematic, dye_bundle_thematic, field_research_bundle_thematic, fodder_bundle_thematic, enchanter_bundle_thematic]
+bulletin_board_thematic = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_thematic, 5)
+
+# Abandoned Joja Mart
+missing_bundle_items_thematic = [*missing_bundle_items_vanilla, pale_ale.as_quality(ArtisanQuality.silver), beer.as_quality(ArtisanQuality.silver),
+                                 mead.as_quality(ArtisanQuality.silver),
+                                 cheese.as_quality(ArtisanQuality.silver), goat_cheese.as_quality(ArtisanQuality.silver), void_mayo, cloth, green_tea,
+                                 truffle_oil, diamond,
+                                 sweet_gem_berry.as_quality_crop(), starfruit.as_quality_crop(),
+                                 tea_leaves.as_amount(5), lava_eel.as_quality(FishQuality.gold), scorpion_carp.as_quality(FishQuality.gold),
+                                 blobfish.as_quality(FishQuality.gold)]
+missing_bundle_thematic = BundleTemplate.extend_from(missing_bundle_vanilla, missing_bundle_items_thematic)
+abandoned_joja_mart_bundles_thematic = [missing_bundle_thematic]
+abandoned_joja_mart_thematic = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_thematic, 1)
+
+# Vault
+vault_bundles_thematic = vault_bundles_vanilla
+vault_thematic = BundleRoomTemplate(CCRoom.vault, vault_bundles_thematic, 4)
diff --git a/worlds/stardew_valley/data/bundles_data/vanilla_bundles.py b/worlds/stardew_valley/data/bundles_data/vanilla_bundles.py
new file mode 100644
index 0000000000..a30d980764
--- /dev/null
+++ b/worlds/stardew_valley/data/bundles_data/vanilla_bundles.py
@@ -0,0 +1,167 @@
+from .bundle_items_data import *
+from ...bundles.bundle import DeepBundleTemplate, BundleTemplate, MoneyBundleTemplate
+from ...bundles.bundle_item import BundleItem
+from ...bundles.bundle_room import BundleRoomTemplate
+from ...content.vanilla.base import all_fruits, all_vegetables
+from ...strings.artisan_good_names import ArtisanGood
+from ...strings.bundle_names import CCRoom, BundleName
+from ...strings.fish_names import Fish
+from ...strings.forageable_names import all_edible_mushrooms
+
+# Giant Stump
+from ...strings.quality_names import ArtisanQuality, FishQuality
+
+all_specific_jellies = [BundleItem(ArtisanGood.jelly, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits]
+all_specific_pickles = [BundleItem(ArtisanGood.pickles, flavor=vegetable, source=BundleItem.Sources.content) for vegetable in all_vegetables]
+all_specific_dried_fruits = [*[BundleItem(ArtisanGood.dried_fruit, flavor=fruit, source=BundleItem.Sources.content) for fruit in all_fruits],
+                             BundleItem(ArtisanGood.raisins, source=BundleItem.Sources.content)]
+all_specific_juices = [BundleItem(ArtisanGood.juice, flavor=vegetable, source=BundleItem.Sources.content) for vegetable in all_vegetables]
+
+raccoon_crab_pot_fish_items = [periwinkle.as_amount(5), snail.as_amount(5), crayfish.as_amount(5), mussel.as_amount(5),
+                               oyster.as_amount(5), cockle.as_amount(5), clam.as_amount(5)]
+raccoon_smoked_fish_items = [BundleItem(ArtisanGood.smoked_fish, flavor=fish) for fish in
+                             [Fish.largemouth_bass, Fish.bream, Fish.bullhead, Fish.chub, Fish.ghostfish, Fish.flounder, Fish.shad,
+                              Fish.rainbow_trout, Fish.tilapia, Fish.red_mullet, Fish.tuna, Fish.midnight_carp, Fish.salmon, Fish.perch]]
+
+raccoon_artisan_items = [*all_specific_jellies, *all_specific_pickles, *all_specific_dried_fruits, *all_specific_juices]
+raccoon_fish_items_deep = [raccoon_crab_pot_fish_items, raccoon_smoked_fish_items]
+
+all_specific_dried_mushrooms = [BundleItem(ArtisanGood.dried_mushroom, flavor=mushroom, source=BundleItem.Sources.content) for mushroom in all_edible_mushrooms]
+raccoon_food_items = [egg.as_amount(5), cave_carrot.as_amount(5), white_algae.as_amount(5)]
+
+raccoon_foraging_items = [moss.as_amount(10), rusty_spoon, trash.as_amount(5), slime.as_amount(99), bat_wing.as_amount(10), geode.as_amount(8),
+                          frozen_geode.as_amount(5), magma_geode.as_amount(3), coral.as_amount(4), sea_urchin.as_amount(2), bug_meat.as_amount(10),
+                          diamond, topaz.as_amount(3), ghostfish.as_amount(3)]
+
+raccoon_fish_bundle_vanilla = DeepBundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_fish, raccoon_fish_items_deep, 2, 2)
+raccoon_artisan_bundle_vanilla = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_artisan, raccoon_artisan_items, 2, 2)
+raccoon_food_items_vanilla = [all_specific_dried_mushrooms, raccoon_food_items]
+raccoon_food_bundle_vanilla = DeepBundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_food, raccoon_food_items_vanilla, 2, 2)
+raccoon_foraging_bundle_vanilla = BundleTemplate(CCRoom.raccoon_requests, BundleName.raccoon_foraging, raccoon_foraging_items, 2, 2)
+giant_stump_bundles_vanilla = [raccoon_fish_bundle_vanilla, raccoon_artisan_bundle_vanilla, raccoon_food_bundle_vanilla, raccoon_foraging_bundle_vanilla]
+giant_stump_vanilla = BundleRoomTemplate(CCRoom.raccoon_requests, giant_stump_bundles_vanilla, 8)
+
+# Crafts Room
+spring_foraging_items_vanilla = [wild_horseradish, daffodil, leek, dandelion]
+spring_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.spring_foraging, spring_foraging_items_vanilla, 4, 4)
+
+summer_foraging_items_vanilla = [grape, spice_berry, sweet_pea]
+summer_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.summer_foraging, summer_foraging_items_vanilla, 3, 3)
+
+fall_foraging_items_vanilla = [common_mushroom, wild_plum, hazelnut, blackberry]
+fall_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.fall_foraging, fall_foraging_items_vanilla, 4, 4)
+
+winter_foraging_items_vanilla = [winter_root, crystal_fruit, snow_yam, crocus]
+winter_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.winter_foraging, winter_foraging_items_vanilla, 4, 4)
+
+construction_items_vanilla = [wood, stone, hardwood]
+construction_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.construction, construction_items_vanilla, 4, 4)
+
+exotic_foraging_items_vanilla = [coconut, cactus_fruit, cave_carrot, red_mushroom, purple_mushroom, maple_syrup, oak_resin, pine_tar, morel]
+exotic_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.exotic_foraging, exotic_foraging_items_vanilla, 9, 5)
+
+crafts_room_bundles_vanilla = [spring_foraging_bundle_vanilla, summer_foraging_bundle_vanilla, fall_foraging_bundle_vanilla,
+                               winter_foraging_bundle_vanilla, construction_bundle_vanilla, exotic_foraging_bundle_vanilla]
+crafts_room_vanilla = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_vanilla, 6)
+
+# Pantry
+spring_crops_items_vanilla = [parsnip, green_bean, cauliflower, potato]
+spring_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.spring_crops, spring_crops_items_vanilla, 4, 4)
+
+summer_crops_items_vanilla = [tomato, hot_pepper, blueberry, melon]
+summer_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.summer_crops, summer_crops_items_vanilla, 4, 4)
+
+fall_crops_items_vanilla = [corn, eggplant, pumpkin, yam]
+fall_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.fall_crops, fall_crops_items_vanilla, 4, 4)
+
+quality_crops_items_vanilla = [item.as_quality_crop() for item in [parsnip, melon, pumpkin, corn]]
+quality_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.quality_crops, quality_crops_items_vanilla, 4, 3)
+
+animal_items_vanilla = [large_milk, large_brown_egg, large_egg, large_goat_milk, wool, duck_egg]
+animal_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.animal, animal_items_vanilla, 6, 5)
+
+artisan_items_vanilla = [truffle_oil, cloth, goat_cheese, cheese, honey, jelly, apple, apricot, orange, peach, pomegranate, cherry]
+artisan_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.artisan, artisan_items_vanilla, 12, 6)
+
+pantry_bundles_vanilla = [spring_crops_bundle_vanilla, summer_crops_bundle_vanilla, fall_crops_bundle_vanilla,
+                          quality_crops_bundle_vanilla, animal_bundle_vanilla, artisan_bundle_vanilla]
+pantry_vanilla = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_vanilla, 6)
+
+# Fish Tank
+river_fish_items_vanilla = [sunfish, catfish, shad, tiger_trout]
+river_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.river_fish, river_fish_items_vanilla, 4, 4)
+
+lake_fish_items_vanilla = [largemouth_bass, carp, bullhead, sturgeon]
+lake_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.lake_fish, lake_fish_items_vanilla, 4, 4)
+
+ocean_fish_items_vanilla = [sardine, tuna, red_snapper, tilapia]
+ocean_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.ocean_fish, ocean_fish_items_vanilla, 4, 4)
+
+night_fish_items_vanilla = [walleye, bream, eel]
+night_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.night_fish, night_fish_items_vanilla, 3, 3)
+
+crab_pot_items_vanilla = [lobster, crayfish, crab, cockle, mussel, shrimp, snail, periwinkle, oyster, clam]
+crab_pot_trash_items = [trash, driftwood, soggy_newspaper, broken_cd, broken_glasses]
+crab_pot_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.crab_pot, crab_pot_items_vanilla, 10, 5)
+
+specialty_fish_items_vanilla = [pufferfish, ghostfish, sandfish, woodskip]
+specialty_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.specialty_fish, specialty_fish_items_vanilla, 4, 4)
+
+fish_tank_bundles_vanilla = [river_fish_bundle_vanilla, lake_fish_bundle_vanilla, ocean_fish_bundle_vanilla,
+                             night_fish_bundle_vanilla, crab_pot_bundle_vanilla, specialty_fish_bundle_vanilla]
+fish_tank_vanilla = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_vanilla, 6)
+
+# Boiler Room
+blacksmith_items_vanilla = [copper_bar, iron_bar, gold_bar]
+blacksmith_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.blacksmith, blacksmith_items_vanilla, 3, 3)
+
+geologist_items_vanilla = [quartz, earth_crystal, frozen_tear, fire_quartz]
+geologist_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.geologist, geologist_items_vanilla, 4, 4)
+
+adventurer_items_vanilla = [slime, bat_wing, solar_essence, void_essence]
+adventurer_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.adventurer, adventurer_items_vanilla, 4, 2)
+
+boiler_room_bundles_vanilla = [blacksmith_bundle_vanilla, geologist_bundle_vanilla, adventurer_bundle_vanilla]
+boiler_room_vanilla = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_vanilla, 3)
+
+# Bulletin Board
+chef_items_vanilla = [maple_syrup, fiddlehead_fern, truffle, poppy, maki_roll, fried_egg]
+chef_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.chef, chef_items_vanilla, 6, 6)
+
+dye_items_vanilla = [red_mushroom, sea_urchin, sunflower, duck_feather, aquamarine, red_cabbage]
+dye_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_vanilla, 6, 6)
+
+field_research_items_vanilla = [purple_mushroom, nautilus_shell, chub, frozen_geode]
+field_research_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.field_research, field_research_items_vanilla, 4, 4)
+
+fodder_items_vanilla = [wheat.as_amount(10), hay.as_amount(10), apple.as_amount(3)]
+fodder_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.fodder, fodder_items_vanilla, 3, 3)
+
+enchanter_items_vanilla = [oak_resin, wine, rabbit_foot, pomegranate]
+enchanter_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.enchanter, enchanter_items_vanilla, 4, 4)
+
+bulletin_board_bundles_vanilla = [chef_bundle_vanilla, dye_bundle_vanilla, field_research_bundle_vanilla, fodder_bundle_vanilla, enchanter_bundle_vanilla]
+bulletin_board_vanilla = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_vanilla, 5)
+
+# Abandoned Joja Mart
+missing_bundle_items_vanilla = [wine.as_quality(ArtisanQuality.silver), dinosaur_mayo, prismatic_shard, caviar,
+                                ancient_fruit.as_quality_crop(), void_salmon.as_quality(FishQuality.gold)]
+missing_bundle_vanilla = BundleTemplate(CCRoom.abandoned_joja_mart, BundleName.missing_bundle, missing_bundle_items_vanilla, 6, 5)
+
+abandoned_joja_mart_bundles_vanilla = [missing_bundle_vanilla]
+abandoned_joja_mart_vanilla = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_vanilla, 1)
+
+
+# Vault
+vault_2500_gold = BundleItem.money_bundle(2500)
+vault_5000_gold = BundleItem.money_bundle(5000)
+vault_10000_gold = BundleItem.money_bundle(10000)
+vault_25000_gold = BundleItem.money_bundle(25000)
+
+vault_2500_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_2500, vault_2500_gold)
+vault_5000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_5000, vault_5000_gold)
+vault_10000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_10000, vault_10000_gold)
+vault_25000_bundle = MoneyBundleTemplate(CCRoom.vault, BundleName.money_25000, vault_25000_gold)
+
+vault_bundles_vanilla = [vault_2500_bundle, vault_5000_bundle, vault_10000_bundle, vault_25000_bundle]
+vault_vanilla = BundleRoomTemplate(CCRoom.vault, vault_bundles_vanilla, 4)
diff --git a/worlds/stardew_valley/data/craftable_data.py b/worlds/stardew_valley/data/craftable_data.py
index 3dae67c260..ce883be3b1 100644
--- a/worlds/stardew_valley/data/craftable_data.py
+++ b/worlds/stardew_valley/data/craftable_data.py
@@ -1,7 +1,8 @@
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 from .recipe_source import RecipeSource, StarterSource, QueenOfSauceSource, ShopSource, SkillSource, FriendshipSource, ShopTradeSource, CutsceneSource, \
-    ArchipelagoSource, LogicSource, SpecialOrderSource, FestivalShopSource, QuestSource, MasterySource, SkillCraftsanitySource
+    ArchipelagoSource, LogicSource, SpecialOrderSource, FestivalShopSource, QuestSource, MasterySource, SkillCraftsanitySource, ShopWithKnownRecipeSource
+from ..content.content_packs import ginger_island_content_pack
 from ..mods.mod_data import ModNames
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.artisan_good_names import ArtisanGood
@@ -33,13 +34,13 @@ class CraftingRecipe:
     item: str
     ingredients: Dict[str, int]
     source: RecipeSource
-    mod_name: Optional[str]
+    content_pack: frozenset[str] | None
 
-    def __init__(self, item: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None):
+    def __init__(self, item: str, ingredients: Dict[str, int], source: RecipeSource, content_pack: frozenset[str] | None = None):
         self.item = item
         self.ingredients = ingredients
         self.source = source
-        self.mod_name = mod_name
+        self.content_pack = content_pack
 
     def __repr__(self):
         return f"{self.item} (Source: {self.source} |" \
@@ -49,9 +50,9 @@ class CraftingRecipe:
 all_crafting_recipes: List[CraftingRecipe] = []
 
 
-def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe:
+def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = FriendshipSource(friend, hearts)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
 def cutscene_recipe(name: str, region: str, friend: str, hearts: int, ingredients: Dict[str, int]) -> CraftingRecipe:
@@ -59,24 +60,29 @@ def cutscene_recipe(name: str, region: str, friend: str, hearts: int, ingredient
     return create_recipe(name, ingredients, source)
 
 
-def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe:
+def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = SkillSource(skill, level)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def skill_craftsanity_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe:
+def skill_craftsanity_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = SkillCraftsanitySource(skill, level)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def mastery_recipe(name: str, skill: str, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe:
+def mastery_recipe(name: str, skill: str, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = MasterySource(skill)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe:
+def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = ShopSource(region, price)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
+
+
+def shop_with_known_recipe_recipe(name: str, region: str, price: int, recipe_requirement: str, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
+    source = ShopWithKnownRecipeSource(region, price, recipe_requirement)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
 def festival_shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int]) -> CraftingRecipe:
@@ -84,9 +90,9 @@ def festival_shop_recipe(name: str, region: str, price: int, ingredients: Dict[s
     return create_recipe(name, ingredients, source)
 
 
-def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: Dict[str, int]) -> CraftingRecipe:
+def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = ShopTradeSource(region, currency, price)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
 def queen_of_sauce_recipe(name: str, year: int, season: str, day: int, ingredients: Dict[str, int]) -> CraftingRecipe:
@@ -94,14 +100,14 @@ def queen_of_sauce_recipe(name: str, year: int, season: str, day: int, ingredien
     return create_recipe(name, ingredients, source)
 
 
-def quest_recipe(name: str, quest: str, ingredients: Dict[str, int]) -> CraftingRecipe:
+def quest_recipe(name: str, quest: str, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = QuestSource(quest)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def special_order_recipe(name: str, special_order: str, ingredients: Dict[str, int]) -> CraftingRecipe:
+def special_order_recipe(name: str, special_order: str, ingredients: Dict[str, int], content_pack: List[str] | str | None = None) -> CraftingRecipe:
     source = SpecialOrderSource(special_order)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
 def starter_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe:
@@ -109,11 +115,11 @@ def starter_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe:
     return create_recipe(name, ingredients, source)
 
 
-def ap_recipe(name: str, ingredients: Dict[str, int], ap_item: str = None) -> CraftingRecipe:
+def ap_recipe(name: str, ingredients: Dict[str, int], ap_item: str = None, content_pack: List[str] | str | None = None) -> CraftingRecipe:
     if ap_item is None:
         ap_item = f"{name} Recipe"
     source = ArchipelagoSource(ap_item)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
 def cellar_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe:
@@ -121,8 +127,12 @@ def cellar_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe:
     return create_recipe(name, ingredients, source)
 
 
-def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None) -> CraftingRecipe:
-    recipe = CraftingRecipe(name, ingredients, source, mod_name)
+def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource, content_pack: List[str] | str | None = None) -> CraftingRecipe:
+    if content_pack is None:
+        content_pack = []
+    if isinstance(content_pack, str):
+        content_pack = [content_pack]
+    recipe = CraftingRecipe(name, ingredients, source, frozenset(content_pack))
     all_crafting_recipes.append(recipe)
     return recipe
 
@@ -161,11 +171,11 @@ deluxe_fertilizer = ap_recipe(Fertilizer.deluxe, {MetalBar.iridium: 1, Material.
 
 basic_speed_gro = skill_recipe(SpeedGro.basic, Skill.farming, 3, {ArtisanGood.pine_tar: 1, Material.moss: 5})
 deluxe_speed_gro = skill_recipe(SpeedGro.deluxe, Skill.farming, 8, {ArtisanGood.oak_resin: 1, Fossil.bone_fragment: 5})
-hyper_speed_gro = ap_recipe(SpeedGro.hyper, {Ore.radioactive: 1, Fossil.bone_fragment: 3, Loot.solar_essence: 1})
+hyper_speed_gro = ap_recipe(SpeedGro.hyper, {Ore.radioactive: 1, Fossil.bone_fragment: 3, Loot.solar_essence: 1}, content_pack=ginger_island_content_pack.name)
 basic_retaining_soil = skill_recipe(RetainingSoil.basic, Skill.farming, 4, {Material.stone: 2})
 quality_retaining_soil = skill_recipe(RetainingSoil.quality, Skill.farming, 7, {Material.stone: 3, Material.clay: 1})
 deluxe_retaining_soil = shop_trade_recipe(RetainingSoil.deluxe, Region.island_trader, Currency.cinder_shard, 50,
-                                          {Material.stone: 5, Material.fiber: 3, Material.clay: 1})
+                                          {Material.stone: 5, Material.fiber: 3, Material.clay: 1}, content_pack=ginger_island_content_pack.name)
 tree_fertilizer = skill_recipe(Fertilizer.tree, Skill.foraging, 7, {Material.fiber: 5, Material.stone: 5})
 
 spring_seeds = skill_recipe(WildSeeds.spring, Skill.foraging, 1,
@@ -176,7 +186,7 @@ winter_seeds = skill_recipe(WildSeeds.winter, Skill.foraging, 7,
                             {Forageable.winter_root: 1, Forageable.crystal_fruit: 1, Forageable.snow_yam: 1, Forageable.crocus: 1})
 ancient_seeds = ap_recipe(WildSeeds.ancient, {Artifact.ancient_seed: 1})
 grass_starter = shop_recipe(WildSeeds.grass_starter, Region.pierre_store, 1000, {Material.fiber: 10})
-blue_grass_starter = ap_recipe(WildSeeds.blue_grass_starter, {Material.fiber: 25, Material.moss: 10, ArtisanGood.mystic_syrup: 1})
+blue_grass_starter = ap_recipe(WildSeeds.blue_grass_starter, {Material.fiber: 25, Material.moss: 10, ArtisanGood.mystic_syrup: 1}, content_pack=ginger_island_content_pack.name)
 for wild_seeds in [WildSeeds.spring, WildSeeds.summer, WildSeeds.fall, WildSeeds.winter]:
     tea_sapling = cutscene_recipe(WildSeeds.tea_sapling, Region.sunroom, NPC.caroline, 2, {wild_seeds: 2, Material.fiber: 5, Material.wood: 5})
 fiber_seeds = special_order_recipe(WildSeeds.fiber, SpecialOrder.community_cleanup, {Seed.mixed: 1, Material.sap: 5, Material.clay: 1})
@@ -207,13 +217,13 @@ magnet = skill_recipe(Fishing.magnet, Skill.fishing, 9, {MetalBar.iron: 1})
 bait = skill_recipe(Fishing.bait, Skill.fishing, 2, {Loot.bug_meat: 1})
 deluxe_bait = skill_recipe(Fishing.deluxe_bait, Skill.fishing, 4, {Fishing.bait: 5, Material.moss: 2})
 wild_bait = cutscene_recipe(Fishing.wild_bait, Region.tent, NPC.linus, 4, {Material.fiber: 10, Loot.bug_meat: 5, Loot.slime: 5})
-magic_bait = ap_recipe(Fishing.magic_bait, {Ore.radioactive: 1, Loot.bug_meat: 3})
+magic_bait = ap_recipe(Fishing.magic_bait, {Ore.radioactive: 1, Loot.bug_meat: 3}, content_pack=ginger_island_content_pack.name)
 crab_pot = skill_recipe(Machine.crab_pot, Skill.fishing, 3, {Material.wood: 40, MetalBar.iron: 3})
 
 sturdy_ring = skill_recipe(Ring.sturdy_ring, Skill.combat, 1, {MetalBar.copper: 2, Loot.bug_meat: 25, Loot.slime: 25})
 warrior_ring = skill_recipe(Ring.warrior_ring, Skill.combat, 4, {MetalBar.iron: 10, Material.coal: 25, Mineral.frozen_tear: 10})
 ring_of_yoba = skill_recipe(Ring.ring_of_yoba, Skill.combat, 7, {MetalBar.gold: 5, MetalBar.iron: 5, Mineral.diamond: 1})
-thorns_ring = skill_recipe(Ring.thorns_ring, Skill.combat, 7, {Fossil.bone_fragment: 50, Material.stone: 50, MetalBar.gold: 1})
+thorns_ring = skill_recipe(Ring.thorns_ring, Skill.combat, 7, {Fossil.bone_fragment: 50, Material.stone: 50, MetalBar.gold: 1}, content_pack=ginger_island_content_pack.name)
 glowstone_ring = skill_recipe(Ring.glowstone_ring, Skill.mining, 4, {Loot.solar_essence: 5, MetalBar.iron: 5})
 iridium_band = skill_recipe(Ring.iridium_band, Skill.combat, 9, {MetalBar.iridium: 5, Loot.solar_essence: 50, Loot.void_essence: 50})
 wedding_ring = shop_recipe(Ring.wedding_ring, LogicRegion.traveling_cart, 500, {MetalBar.iridium: 5, Mineral.prismatic_shard: 1})
@@ -224,14 +234,14 @@ life_elixir = skill_recipe(Edible.life_elixir, Skill.combat, 2, {Mushroom.red: 1
 oil_of_garlic = skill_recipe(Edible.oil_of_garlic, Skill.combat, 6, {Vegetable.garlic: 10, Ingredient.oil: 1})
 
 monster_musk = special_order_recipe(Consumable.monster_musk, SpecialOrder.prismatic_jelly, {Loot.bat_wing: 30, Loot.slime: 30})
-fairy_dust = quest_recipe(Consumable.fairy_dust, Quest.the_pirates_wife, {Mineral.diamond: 1, Flower.fairy_rose: 1})
+fairy_dust = quest_recipe(Consumable.fairy_dust, Quest.the_pirates_wife, {Mineral.diamond: 1, Flower.fairy_rose: 1}, content_pack=ginger_island_content_pack.name)
 warp_totem_beach = skill_recipe(Consumable.warp_totem_beach, Skill.foraging, 6, {Material.hardwood: 1, WaterItem.coral: 2, Material.fiber: 10})
 warp_totem_mountains = skill_recipe(Consumable.warp_totem_mountains, Skill.foraging, 7, {Material.hardwood: 1, MetalBar.iron: 1, Material.stone: 25})
 warp_totem_farm = skill_recipe(Consumable.warp_totem_farm, Skill.foraging, 8, {Material.hardwood: 1, ArtisanGood.honey: 1, Material.fiber: 20})
 warp_totem_desert = shop_trade_recipe(Consumable.warp_totem_desert, Region.desert, MetalBar.iridium, 10,
                                       {Material.hardwood: 2, Forageable.coconut: 1, Ore.iridium: 4})
 warp_totem_island = shop_recipe(Consumable.warp_totem_island, Region.volcano_dwarf_shop, 10000,
-                                {Material.hardwood: 5, Forageable.dragon_tooth: 1, Forageable.ginger: 1})
+                                {Material.hardwood: 5, Forageable.dragon_tooth: 1, Forageable.ginger: 1}, content_pack=ginger_island_content_pack.name)
 rain_totem = skill_recipe(Consumable.rain_totem, Skill.foraging, 9, {Material.hardwood: 1, ArtisanGood.truffle_oil: 1, ArtisanGood.pine_tar: 5})
 
 torch = starter_recipe(Lighting.torch, {Material.wood: 1, Material.sap: 2})
@@ -259,14 +269,14 @@ crystalarium = skill_recipe(Machine.crystalarium, Skill.mining, 9, {Material.sto
 furnace = skill_craftsanity_recipe(Machine.furnace, Skill.mining, 1, {Ore.copper: 20, Material.stone: 25})
 geode_crusher = special_order_recipe(Machine.geode_crusher, SpecialOrder.cave_patrol, {MetalBar.gold: 2, Material.stone: 50, Mineral.diamond: 1})
 mushroom_log = skill_recipe(Machine.mushroom_log, Skill.foraging, 4, {Material.hardwood: 10, Material.moss: 10})
-heavy_tapper = ap_recipe(Machine.heavy_tapper, {Material.hardwood: 30, MetalBar.radioactive: 1})
+heavy_tapper = ap_recipe(Machine.heavy_tapper, {Material.hardwood: 30, MetalBar.radioactive: 1}, content_pack=ginger_island_content_pack.name)
 lightning_rod = skill_recipe(Machine.lightning_rod, Skill.foraging, 6, {MetalBar.iron: 1, MetalBar.quartz: 1, Loot.bat_wing: 5})
-ostrich_incubator = ap_recipe(Machine.ostrich_incubator, {Fossil.bone_fragment: 50, Material.hardwood: 50, Currency.cinder_shard: 20})
+ostrich_incubator = ap_recipe(Machine.ostrich_incubator, {Fossil.bone_fragment: 50, Material.hardwood: 50, Currency.cinder_shard: 20}, content_pack=ginger_island_content_pack.name)
 recycling_machine = skill_recipe(Machine.recycling_machine, Skill.fishing, 4, {Material.wood: 25, Material.stone: 25, MetalBar.iron: 1})
 seed_maker = skill_recipe(Machine.seed_maker, Skill.farming, 9, {Material.wood: 25, Material.coal: 10, MetalBar.gold: 1})
 slime_egg_press = skill_recipe(Machine.slime_egg_press, Skill.combat, 6, {Material.coal: 25, Mineral.fire_quartz: 1, ArtisanGood.battery_pack: 1})
 slime_incubator = skill_recipe(Machine.slime_incubator, Skill.combat, 8, {MetalBar.iridium: 2, Loot.slime: 100})
-solar_panel = special_order_recipe(Machine.solar_panel, SpecialOrder.island_ingredients, {MetalBar.quartz: 10, MetalBar.iron: 5, MetalBar.gold: 5})
+solar_panel = special_order_recipe(Machine.solar_panel, SpecialOrder.island_ingredients, {MetalBar.quartz: 10, MetalBar.iron: 5, MetalBar.gold: 5})#, content_pack=ginger_island_content_pack.name) # If set this as a ginger island only recipe, the rule for battery packs will fail. It does OR on lightning rod and solar panel, even when GI is off
 
 tapper = skill_recipe(Machine.tapper, Skill.foraging, 4, {Material.wood: 40, MetalBar.copper: 2})
 
@@ -282,7 +292,7 @@ drum_block = cutscene_recipe(Furniture.drum_block, Region.carpenter, NPC.robin,
 chest = starter_recipe(Storage.chest, {Material.wood: 50})
 stone_chest = special_order_recipe(Storage.stone_chest, SpecialOrder.robins_resource_rush, {Material.stone: 50})
 big_chest = shop_recipe(Storage.big_chest, Region.carpenter, 5000, {Material.wood: 120, MetalBar.copper: 2})
-big_stone_chest = shop_recipe(Storage.big_stone_chest, LogicRegion.mines_dwarf_shop, 5000, {Material.stone: 250})
+big_stone_chest = shop_with_known_recipe_recipe(Storage.big_stone_chest, LogicRegion.mines_dwarf_shop, 5000, Storage.stone_chest, {Material.stone: 250})
 
 wood_sign = starter_recipe(Sign.wood, {Material.wood: 25})
 stone_sign = starter_recipe(Sign.stone, {Material.stone: 25})
@@ -300,7 +310,7 @@ mini_jukebox = cutscene_recipe(Craftable.mini_jukebox, Region.saloon, NPC.gus, 5
 mini_obelisk = special_order_recipe(Craftable.mini_obelisk, SpecialOrder.a_curious_substance, {Material.hardwood: 30, Loot.solar_essence: 20, MetalBar.gold: 3})
 farm_computer = special_order_recipe(Craftable.farm_computer, SpecialOrder.aquatic_overpopulation,
                                      {Artifact.dwarf_gadget: 1, ArtisanGood.battery_pack: 1, MetalBar.quartz: 10})
-hopper = ap_recipe(Craftable.hopper, {Material.hardwood: 10, MetalBar.iridium: 1, MetalBar.radioactive: 1})
+hopper = ap_recipe(Craftable.hopper, {Material.hardwood: 10, MetalBar.iridium: 1, MetalBar.radioactive: 1}, content_pack=ginger_island_content_pack.name)
 
 cookout_kit = skill_recipe(Craftable.cookout_kit, Skill.foraging, 3, {Material.wood: 15, Material.fiber: 10, Material.coal: 3})
 tent_kit = skill_recipe(Craftable.tent_kit, Skill.foraging, 8, {Material.hardwood: 10, Material.fiber: 25, ArtisanGood.cloth: 1})
@@ -312,81 +322,81 @@ mystic_tree_seed = mastery_recipe(TreeSeed.mystic, Skill.foraging, {TreeSeed.aco
 treasure_totem = mastery_recipe(Consumable.treasure_totem, Skill.foraging, {Material.hardwood: 5, ArtisanGood.mystic_syrup: 1, Material.moss: 10})
 challenge_bait = mastery_recipe(Fishing.challenge_bait, Skill.fishing, {Fossil.bone_fragment: 5, Material.moss: 2})
 anvil = mastery_recipe(Machine.anvil, Skill.combat, {MetalBar.iron: 50})
-mini_forge = mastery_recipe(Machine.mini_forge, Skill.combat, {Forageable.dragon_tooth: 5, MetalBar.iron: 10, MetalBar.gold: 10, MetalBar.iridium: 5})
+mini_forge = mastery_recipe(Machine.mini_forge, Skill.combat, {Forageable.dragon_tooth: 5, MetalBar.iron: 10, MetalBar.gold: 10, MetalBar.iridium: 5}, content_pack=ginger_island_content_pack.name)
 
-travel_charm = shop_recipe(ModCraftable.travel_core, Region.adventurer_guild, 250, {Loot.solar_essence: 1, Loot.void_essence: 1}, ModNames.magic)
+travel_charm = shop_recipe(ModCraftable.travel_core, Region.adventurer_guild, 250, {Loot.solar_essence: 1, Loot.void_essence: 1}, content_pack=ModNames.magic)
 preservation_chamber = skill_recipe(ModMachine.preservation_chamber, ModSkill.archaeology, 1,
-                                    {MetalBar.copper: 1, Material.wood: 15, ArtisanGood.oak_resin: 30},
+                                    {MetalBar.copper: 1, Material.wood: 15, ArtisanGood.oak_resin: 10},
                                     ModNames.archaeology)
-restoration_table = skill_recipe(ModMachine.restoration_table, ModSkill.archaeology, 1, {Material.wood: 15, MetalBar.copper: 1, MetalBar.iron: 1},
+restoration_table = skill_recipe(ModMachine.restoration_table, ModSkill.archaeology, 1, {Material.wood: 25, MetalBar.quartz: 1, MetalBar.iron: 1},
                                  ModNames.archaeology)
 preservation_chamber_h = skill_recipe(ModMachine.hardwood_preservation_chamber, ModSkill.archaeology, 6, {MetalBar.copper: 1, Material.hardwood: 15,
-                                                                                                          ArtisanGood.oak_resin: 30}, ModNames.archaeology)
-grinder = skill_recipe(ModMachine.grinder, ModSkill.archaeology, 2, {Artifact.rusty_cog: 10, MetalBar.iron: 5, ArtisanGood.battery_pack: 1},
+                                                                                                          ArtisanGood.oak_resin: 10}, content_pack=ModNames.archaeology)
+grinder = skill_recipe(ModMachine.grinder, ModSkill.archaeology, 2, {Artifact.rusty_cog: 4, MetalBar.iron: 5, ArtisanGood.battery_pack: 1},
                        ModNames.archaeology)
-ancient_battery = skill_recipe(ModMachine.ancient_battery, ModSkill.archaeology, 7, {Material.stone: 40, MetalBar.copper: 10, MetalBar.iron: 5},
+ancient_battery = skill_recipe(ModMachine.ancient_battery, ModSkill.archaeology, 7, {Material.stone: 40, Material.clay: 10, MetalBar.iron: 5},
                                ModNames.archaeology)
-glass_bazier = skill_recipe(ModCraftable.glass_brazier, ModSkill.archaeology, 4, {Artifact.glass_shards: 10}, ModNames.archaeology)
-glass_path = skill_recipe(ModFloor.glass_path, ModSkill.archaeology, 3, {Artifact.glass_shards: 1}, ModNames.archaeology)
-glass_fence = skill_recipe(ModCraftable.glass_fence, ModSkill.archaeology, 7, {Artifact.glass_shards: 5}, ModNames.archaeology)
-bone_path = skill_recipe(ModFloor.bone_path, ModSkill.archaeology, 4, {Fossil.bone_fragment: 1}, ModNames.archaeology)
-rust_path = skill_recipe(ModFloor.rusty_path, ModSkill.archaeology, 2, {ModTrash.rusty_scrap: 2}, ModNames.archaeology)
+glass_brazier = skill_recipe(ModCraftable.glass_brazier, ModSkill.archaeology, 4, {Artifact.glass_shards: 10, Material.coal: 1, Material.fiber: 1}, content_pack=ModNames.archaeology)
+glass_path = skill_recipe(ModFloor.glass_path, ModSkill.archaeology, 3, {Artifact.glass_shards: 2}, content_pack=ModNames.archaeology)
+glass_fence = skill_recipe(ModCraftable.glass_fence, ModSkill.archaeology, 7, {Artifact.glass_shards: 2}, content_pack=ModNames.archaeology)
+bone_path = skill_recipe(ModFloor.bone_path, ModSkill.archaeology, 4, {Fossil.bone_fragment: 2}, content_pack=ModNames.archaeology)
+rust_path = skill_recipe(ModFloor.rusty_path, ModSkill.archaeology, 2, {ModTrash.rusty_scrap: 2}, content_pack=ModNames.archaeology)
 rusty_brazier = skill_recipe(ModCraftable.rusty_brazier, ModSkill.archaeology, 3, {ModTrash.rusty_scrap: 10, Material.coal: 1, Material.fiber: 1},
                              ModNames.archaeology)
-bone_fence = skill_recipe(ModCraftable.bone_fence, ModSkill.archaeology, 8, {Fossil.bone_fragment: 2}, ModNames.archaeology)
-water_shifter = skill_recipe(ModCraftable.water_shifter, ModSkill.archaeology, 4, {Material.wood: 40, MetalBar.copper: 4}, ModNames.archaeology)
-wooden_display = skill_recipe(ModCraftable.wooden_display, ModSkill.archaeology, 1, {Material.wood: 25}, ModNames.archaeology)
-hardwood_display = skill_recipe(ModCraftable.hardwood_display, ModSkill.archaeology, 7, {Material.hardwood: 10}, ModNames.archaeology)
+bone_fence = skill_recipe(ModCraftable.bone_fence, ModSkill.archaeology, 8, {Fossil.bone_fragment: 2}, content_pack=ModNames.archaeology)
+water_sifter = skill_recipe(ModCraftable.water_sifter, ModSkill.archaeology, 8, {MetalBar.copper: 4, Material.fiber: 8}, content_pack=ModNames.archaeology)
+wooden_display = skill_recipe(ModCraftable.wooden_display, ModSkill.archaeology, 1, {Material.wood: 25}, content_pack=ModNames.archaeology)
+hardwood_display = skill_recipe(ModCraftable.hardwood_display, ModSkill.archaeology, 6, {Material.hardwood: 10}, content_pack=ModNames.archaeology)
 lucky_ring = skill_recipe(Ring.lucky_ring, ModSkill.archaeology, 8, {Artifact.elvish_jewelry: 1, AnimalProduct.rabbit_foot: 5, Mineral.tigerseye: 1},
                           ModNames.archaeology)
 volcano_totem = skill_recipe(ModConsumable.volcano_totem, ModSkill.archaeology, 9, {Material.cinder_shard: 5, Artifact.rare_disc: 1, Artifact.dwarf_gadget: 1},
                              ModNames.archaeology)
 haste_elixir = shop_recipe(ModEdible.haste_elixir, SVERegion.alesia_shop, 35000, {Loot.void_essence: 35, ModLoot.void_soul: 5, Ingredient.sugar: 1,
-                                                                                  Meal.spicy_eel: 1}, ModNames.sve)
+                                                                                  Meal.spicy_eel: 1}, content_pack=ModNames.sve)
 hero_elixir = shop_recipe(ModEdible.hero_elixir, SVERegion.isaac_shop, 65000, {ModLoot.void_pebble: 3, ModLoot.void_soul: 5, Ingredient.oil: 1,
-                                                                               Loot.slime: 10}, ModNames.sve)
+                                                                               Loot.slime: 10}, content_pack=ModNames.sve)
 armor_elixir = shop_recipe(ModEdible.armor_elixir, SVERegion.alesia_shop, 50000, {Loot.solar_essence: 30, ModLoot.void_soul: 5, Ingredient.vinegar: 5,
-                                                                                  Fossil.bone_fragment: 5}, ModNames.sve)
+                                                                                  Fossil.bone_fragment: 5}, content_pack=ModNames.sve)
 ginger_tincture = friendship_recipe(ModConsumable.ginger_tincture, ModNPC.goblin, 4, {DistantLandsForageable.brown_amanita: 1, Forageable.ginger: 5,
                                                                                       Material.cinder_shard: 1, DistantLandsForageable.swamp_herb: 1},
-                                    ModNames.distant_lands)
+                                    content_pack=[ModNames.distant_lands, ginger_island_content_pack.name])
 
 neanderthal_skeleton = shop_recipe(ModCraftable.neanderthal_skeleton, LogicRegion.mines_dwarf_shop, 5000,
                                    {ModFossil.neanderthal_skull: 1, ModFossil.neanderthal_ribs: 1, ModFossil.neanderthal_pelvis: 1,
                                     ModFossil.neanderthal_limb_bones: 1,
-                                    MetalBar.iron: 5, Material.hardwood: 10}, ModNames.boarding_house)
+                                    MetalBar.iron: 5, Material.hardwood: 10}, content_pack=ModNames.boarding_house)
 pterodactyl_skeleton_l = shop_recipe(ModCraftable.pterodactyl_skeleton_l, LogicRegion.mines_dwarf_shop, 5000,
                                      {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_skull: 1, ModFossil.pterodactyl_l_wing_bone: 1,
-                                      MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                                      MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 pterodactyl_skeleton_m = shop_recipe(ModCraftable.pterodactyl_skeleton_m, LogicRegion.mines_dwarf_shop, 5000,
                                      {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_vertebra: 1, ModFossil.pterodactyl_ribs: 1,
-                                      MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                                      MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 pterodactyl_skeleton_r = shop_recipe(ModCraftable.pterodactyl_skeleton_r, LogicRegion.mines_dwarf_shop, 5000,
                                      {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_claw: 1, ModFossil.pterodactyl_r_wing_bone: 1,
-                                      MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                                      MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 trex_skeleton_l = shop_recipe(ModCraftable.trex_skeleton_l, LogicRegion.mines_dwarf_shop, 5000,
                               {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_tooth: 1, ModFossil.dinosaur_skull: 1,
-                               MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                               MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 trex_skeleton_m = shop_recipe(ModCraftable.trex_skeleton_m, LogicRegion.mines_dwarf_shop, 5000,
                               {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_ribs: 1, ModFossil.dinosaur_claw: 1,
-                               MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                               MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 trex_skeleton_r = shop_recipe(ModCraftable.trex_skeleton_r, LogicRegion.mines_dwarf_shop, 5000,
                               {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_femur: 1, ModFossil.dinosaur_pelvis: 1,
-                               MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house)
+                               MetalBar.iron: 10, Material.hardwood: 15}, content_pack=ModNames.boarding_house)
 
-bouquet = skill_recipe(Gift.bouquet, ModSkill.socializing, 3, {Flower.tulip: 3}, ModNames.socializing_skill)
-trash_bin = skill_recipe(ModMachine.trash_bin, ModSkill.binning, 2, {Material.stone: 30, MetalBar.iron: 2}, ModNames.binning_skill)
-composter = skill_recipe(ModMachine.composter, ModSkill.binning, 4, {Material.wood: 70, Material.sap: 20, Material.fiber: 30}, ModNames.binning_skill)
-recycling_bin = skill_recipe(ModMachine.recycling_bin, ModSkill.binning, 7, {MetalBar.iron: 3, Material.fiber: 10, MetalBar.gold: 2}, ModNames.binning_skill)
+bouquet = skill_recipe(Gift.bouquet, ModSkill.socializing, 3, {Flower.tulip: 3}, content_pack=ModNames.socializing_skill)
+trash_bin = skill_recipe(ModMachine.trash_bin, ModSkill.binning, 2, {Material.stone: 30, MetalBar.iron: 2}, content_pack=ModNames.binning_skill)
+composter = skill_recipe(ModMachine.composter, ModSkill.binning, 4, {Material.wood: 70, Material.sap: 20, Material.fiber: 30}, content_pack=ModNames.binning_skill)
+recycling_bin = skill_recipe(ModMachine.recycling_bin, ModSkill.binning, 7, {MetalBar.iron: 3, Material.fiber: 10, MetalBar.gold: 2}, content_pack=ModNames.binning_skill)
 advanced_recycling_machine = skill_recipe(ModMachine.advanced_recycling_machine, ModSkill.binning, 9,
-                                          {MetalBar.iridium: 5, ArtisanGood.battery_pack: 2, MetalBar.quartz: 10}, ModNames.binning_skill)
+                                          {MetalBar.iridium: 5, ArtisanGood.battery_pack: 2, MetalBar.quartz: 10}, content_pack=ModNames.binning_skill)
 
 coppper_slot_machine = skill_recipe(ModMachine.copper_slot_machine, ModSkill.luck, 2, {MetalBar.copper: 15, Material.stone: 1, Material.wood: 1,
                                                                                        Material.fiber: 1, Material.sap: 1, Loot.slime: 1,
-                                                                                       Forageable.salmonberry: 1, Material.clay: 1, Trash.joja_cola: 1}, ModNames.luck_skill)
+                                                                                       Forageable.salmonberry: 1, Material.clay: 1, Trash.joja_cola: 1}, content_pack=ModNames.luck_skill)
 
-gold_slot_machine = skill_recipe(ModMachine.gold_slot_machine, ModSkill.luck, 4, {MetalBar.gold: 15, ModMachine.copper_slot_machine: 1}, ModNames.luck_skill)
-iridium_slot_machine = skill_recipe(ModMachine.iridium_slot_machine, ModSkill.luck, 6, {MetalBar.iridium: 15, ModMachine.gold_slot_machine: 1}, ModNames.luck_skill)
-radioactive_slot_machine = skill_recipe(ModMachine.radioactive_slot_machine, ModSkill.luck, 8, {MetalBar.radioactive: 15, ModMachine.iridium_slot_machine: 1}, ModNames.luck_skill)
+gold_slot_machine = skill_recipe(ModMachine.gold_slot_machine, ModSkill.luck, 4, {MetalBar.gold: 15, ModMachine.copper_slot_machine: 1}, content_pack=ModNames.luck_skill)
+iridium_slot_machine = skill_recipe(ModMachine.iridium_slot_machine, ModSkill.luck, 6, {MetalBar.iridium: 15, ModMachine.gold_slot_machine: 1}, content_pack=ModNames.luck_skill)
+radioactive_slot_machine = skill_recipe(ModMachine.radioactive_slot_machine, ModSkill.luck, 8, {MetalBar.radioactive: 15, ModMachine.iridium_slot_machine: 1}, content_pack=ModNames.luck_skill)
 
 all_crafting_recipes_by_name = {recipe.item: recipe for recipe in all_crafting_recipes}
diff --git a/worlds/stardew_valley/data/fish_data.py b/worlds/stardew_valley/data/fish_data.py
index dfa8891077..d263837b43 100644
--- a/worlds/stardew_valley/data/fish_data.py
+++ b/worlds/stardew_valley/data/fish_data.py
@@ -2,9 +2,18 @@ from dataclasses import dataclass
 from typing import Tuple, Union, Optional
 
 from . import season_data as season
+from .game_item import Source
 from ..mods.mod_data import ModNames
 from ..strings.fish_names import Fish, SVEFish, DistantLandsFish
 from ..strings.region_names import Region, SVERegion, LogicRegion
+from ..strings.tool_names import FishingRod
+
+
+@dataclass(frozen=True, kw_only=True)
+class FishingSource(Source):
+    region: str
+    minimum_rod: str = FishingRod.training
+    fishing_level: int = 0
 
 
 @dataclass(frozen=True)
@@ -15,6 +24,7 @@ class FishItem:
     difficulty: int
     legendary: bool
     extended_family: bool
+    minimum_level: int
     mod_name: Optional[str] = None
 
     def __repr__(self):
@@ -55,11 +65,11 @@ vineyard = (SVERegion.blue_moon_vineyard,)
 
 
 def create_fish(name: str, locations: Tuple[str, ...], seasons: Union[str, Tuple[str, ...]],
-                difficulty: int, legendary: bool = False, extended_family: bool = False, mod_name: Optional[str] = None) -> FishItem:
+                difficulty: int, legendary: bool = False, extended_family: bool = False, minimum_level: int = 0, mod_name: Optional[str] = None) -> FishItem:
     if isinstance(seasons, str):
         seasons = (seasons,)
 
-    fish_item = FishItem(name, locations, seasons, difficulty, legendary, extended_family, mod_name)
+    fish_item = FishItem(name, locations, seasons, difficulty, legendary, extended_family, minimum_level, mod_name)
     return fish_item
 
 
@@ -118,16 +128,16 @@ blobfish = create_fish(Fish.blobfish, night_market, season.winter, 75)
 midnight_squid = create_fish(Fish.midnight_squid, night_market, season.winter, 55)
 spook_fish = create_fish(Fish.spook_fish, night_market, season.winter, 60)
 
-angler = create_fish(Fish.angler, town_river, season.fall, 85, True, False)
-crimsonfish = create_fish(Fish.crimsonfish, tide_pools, season.summer, 95, True, False)
-glacierfish = create_fish(Fish.glacierfish, forest_river, season.winter, 100, True, False)
-legend = create_fish(Fish.legend, mountain_lake, season.spring, 110, True, False)
+angler = create_fish(Fish.angler, town_river, season.fall, 85, True, False, minimum_level=3)
+crimsonfish = create_fish(Fish.crimsonfish, tide_pools, season.summer, 95, True, False, minimum_level=5)
+glacierfish = create_fish(Fish.glacierfish, forest_river, season.winter, 100, True, False, minimum_level=6)
+legend = create_fish(Fish.legend, mountain_lake, season.spring, 110, True, False, minimum_level=10)
 mutant_carp = create_fish(Fish.mutant_carp, sewers, season.all_seasons, 80, True, False)
 
-ms_angler = create_fish(Fish.ms_angler, town_river, season.fall, 85, True, True)
-son_of_crimsonfish = create_fish(Fish.son_of_crimsonfish, tide_pools, season.summer, 95, True, True)
-glacierfish_jr = create_fish(Fish.glacierfish_jr, forest_river, season.winter, 100, True, True)
-legend_ii = create_fish(Fish.legend_ii, mountain_lake, season.spring, 110, True, True)
+ms_angler = create_fish(Fish.ms_angler, town_river, season.fall, 85, True, True, minimum_level=3)
+son_of_crimsonfish = create_fish(Fish.son_of_crimsonfish, tide_pools, season.summer, 95, True, True, minimum_level=5)
+glacierfish_jr = create_fish(Fish.glacierfish_jr, forest_river, season.winter, 100, True, True, minimum_level=6)
+legend_ii = create_fish(Fish.legend_ii, mountain_lake, season.spring, 110, True, True, minimum_level=10)
 radioactive_carp = create_fish(Fish.radioactive_carp, sewers, season.all_seasons, 80, True, True)
 
 baby_lunaloo = create_fish(SVEFish.baby_lunaloo, ginger_island_ocean, season.all_seasons, 15, mod_name=ModNames.sve)
diff --git a/worlds/stardew_valley/data/fish_pond_data.py b/worlds/stardew_valley/data/fish_pond_data.py
new file mode 100644
index 0000000000..0afaac5ce7
--- /dev/null
+++ b/worlds/stardew_valley/data/fish_pond_data.py
@@ -0,0 +1,50 @@
+from typing import Dict
+
+from ..strings.animal_product_names import AnimalProduct
+from ..strings.artisan_good_names import ArtisanGood
+from ..strings.crop_names import Fruit
+from ..strings.fish_names import Fish, WaterItem
+from ..strings.food_names import Meal
+from ..strings.forageable_names import Forageable
+from ..strings.metal_names import Mineral, Ore
+from ..strings.monster_drop_names import Loot
+from ..strings.seed_names import Seed
+
+# Some of these are commented out, because they shouldn't be used, because they cause a loop on themselves, even if the loop is one of many ways to complete the quest
+# I don't know the correct architectural way to fix this. So in the meantime, obtaining these items from fish ponds is not in logic
+
+# Dictionary of fish pond requests, in the format of Dict[fish_name, Dict[population, Dict[item_name, item_amount]]]
+fish_pond_quests: Dict[str, Dict[int, Dict[str, int]]] = {
+    Fish.blobfish: {
+        1: {WaterItem.coral: 3, Mineral.frozen_tear: 2, WaterItem.sea_urchin: 2, },
+        3: {Seed.coffee: 5, ArtisanGood.mayonnaise: 1, Meal.pizza: 1, },
+        5: {Meal.cookie: 1, ArtisanGood.green_tea: 1, ArtisanGood.wine: 1, },
+        7: {Forageable.rainbow_shell: 1, Meal.rice_pudding: 1, },
+    },
+    # Fish.lava_eel: {
+    #     1: {Mineral.fire_quartz: 3, },
+    #     3: {"Basalt": 1, Mineral.diamond: 2, Artifact.dwarf_scroll_iii: 1, },
+    #     5: {Bomb.mega_bomb: 2, },
+    #     7: {MetalBar.iridium: 1, },
+    # },
+    Fish.lionfish: {
+        3: {Forageable.ginger: 3, Fruit.pineapple: 1, },
+        5: {Fruit.mango: 1, },
+    },
+    # Fish.octopus: {
+    #     3: {WaterItem.coral: 3, ArtisanGood.honey: 1, Fish.oyster: 1, MetalBar.quartz: 3, },
+    #     5: {Fossil.dried_starfish: 1, Mineral.emerald: 2, Geode.omni: 2, Mushroom.purple: 2, },
+    #     7: {ArtisanGood.green_tea: 1, },
+    # },
+    # Fish.super_cucumber: {
+    #     3: {WaterItem.coral: 3, ArtisanGood.honey: 1, Fish.oyster: 1, Trash.driftwood: 3, MetalBar.quartz: 3, },
+    #     5: {Fossil.dried_starfish: 1, Mineral.emerald: 2, Geode.omni: 2, Mushroom.purple: 2 },
+    #     7: {Mineral.diamond: 1, MetalBar.gold: 3, Ore.iridium: 1, ArtisanGood.jelly: 1, ArtisanGood.pickles: 1, WaterItem.sea_urchin: 2 },
+    # },
+    Fish.void_salmon: {
+        1: {Loot.void_essence: 5, },
+        3: {Loot.bat_wing: 10, },
+        5: {Mineral.diamond: 1, AnimalProduct.void_egg: 1, },
+        7: {Ore.iridium: 1, },
+    },
+}
diff --git a/worlds/stardew_valley/data/game_item.py b/worlds/stardew_valley/data/game_item.py
index 6c23f59f2b..a6fc6077b4 100644
--- a/worlds/stardew_valley/data/game_item.py
+++ b/worlds/stardew_valley/data/game_item.py
@@ -2,10 +2,13 @@ import enum
 from abc import ABC
 from dataclasses import dataclass, field
 from types import MappingProxyType
-from typing import List, Iterable, Set, ClassVar, Tuple, Mapping, Callable, Any
+from typing import Iterable, ClassVar, Mapping, Callable, TYPE_CHECKING
 
 from ..stardew_rule.protocol import StardewRule
 
+if TYPE_CHECKING:
+    from ..logic.logic import StardewLogic
+
 DEFAULT_REQUIREMENT_TAGS = MappingProxyType({})
 
 
@@ -24,34 +27,47 @@ class ItemTag(enum.Enum):
     BOOK = enum.auto()
     BOOK_POWER = enum.auto()
     BOOK_SKILL = enum.auto()
+    HAT = enum.auto()
+    FORAGE = enum.auto()
+    COOKING = enum.auto()
 
 
 @dataclass(frozen=True)
 class Source(ABC):
-    add_tags: ClassVar[Tuple[ItemTag]] = ()
+    add_tags: ClassVar[tuple[ItemTag]] = ()
 
-    other_requirements: Tuple[Requirement, ...] = field(kw_only=True, default_factory=tuple)
+    other_requirements: tuple[Requirement, ...] = field(kw_only=True, default=())
 
     @property
-    def requirement_tags(self) -> Mapping[str, Tuple[ItemTag, ...]]:
+    def requirement_tags(self) -> Mapping[str, tuple[ItemTag, ...]]:
         return DEFAULT_REQUIREMENT_TAGS
 
+    @property
+    def all_requirements(self) -> Iterable[Requirement]:
+        """Returns all requirements that are not directly part of the source."""
+        return self.other_requirements
+
 
 @dataclass(frozen=True, kw_only=True)
 class GenericSource(Source):
-    regions: Tuple[str, ...] = ()
+    regions: tuple[str, ...] = ()
     """No region means it's available everywhere."""
 
 
+@dataclass(frozen=True, kw_only=True)
+class AllRegionsSource(Source):
+    regions: tuple[str, ...] = ()
+
+
 @dataclass(frozen=True)
 class CustomRuleSource(Source):
     """Hopefully once everything is migrated to sources, we won't need these custom logic anymore."""
-    create_rule: Callable[[Any], StardewRule]
+    create_rule: "Callable[[StardewLogic], StardewRule]"
 
 
 class Tag(Source):
     """Not a real source, just a way to add tags to an item. Will be removed from the item sources during unpacking."""
-    tag: Tuple[ItemTag, ...]
+    tag: tuple[ItemTag, ...]
 
     def __init__(self, *tag: ItemTag):
         self.tag = tag  # noqa
@@ -64,8 +80,8 @@ class Tag(Source):
 @dataclass(frozen=True)
 class GameItem:
     name: str
-    sources: List[Source] = field(default_factory=list)
-    tags: Set[ItemTag] = field(default_factory=set)
+    sources: list[Source] = field(default_factory=list)
+    tags: set[ItemTag] = field(default_factory=set)
 
     def add_sources(self, sources: Iterable[Source]):
         self.sources.extend(source for source in sources if type(source) is not Tag)
diff --git a/worlds/stardew_valley/data/harvest.py b/worlds/stardew_valley/data/harvest.py
index 621288ec4b..f19039b9f0 100644
--- a/worlds/stardew_valley/data/harvest.py
+++ b/worlds/stardew_valley/data/harvest.py
@@ -9,6 +9,8 @@ from ..strings.season_names import Season
 class ForagingSource(Source):
     regions: Tuple[str, ...]
     seasons: Tuple[str, ...] = Season.all
+    require_all_regions: bool = False
+    grind_months: int = 0
 
 
 @dataclass(frozen=True, kw_only=True)
diff --git a/worlds/stardew_valley/data/hats_data.py b/worlds/stardew_valley/data/hats_data.py
new file mode 100644
index 0000000000..4149121b40
--- /dev/null
+++ b/worlds/stardew_valley/data/hats_data.py
@@ -0,0 +1,160 @@
+from dataclasses import dataclass
+from functools import cached_property
+from typing import List
+
+from worlds.stardew_valley.strings.ap_names.ap_option_names import HatsanityOptionName
+
+hat_clarifier = " (Hat)"
+
+
+@dataclass(frozen=True)
+class HatItem:
+    name: str
+    difficulty: frozenset[str]
+    need_clarifier: bool = False
+
+    def __post_init__(self):
+        all_hats.append(self)
+
+    @cached_property
+    def clarified_name(self) -> str:
+        if self.need_clarifier:
+            return self.name + hat_clarifier
+        return self.name
+
+    def __repr__(self) -> str:
+        return f"{self.name} (Difficulty: {self.difficulty})"
+
+
+def create_hat(name: str, difficulty: List[str] | str, need_clarifier: bool = False) -> HatItem:
+    if isinstance(difficulty, str):
+        difficulty = [difficulty]
+    return HatItem(name, frozenset(difficulty), need_clarifier)
+
+
+all_hats: list[HatItem] = []
+
+
+class Hats:
+    abigails_bow = create_hat("Abigail's Bow", HatsanityOptionName.rng)
+    arcane_hat = create_hat("Arcane Hat", HatsanityOptionName.near_perfection)
+    archers_cap = create_hat("Archer's Cap", HatsanityOptionName.near_perfection)
+    beanie = create_hat("Beanie", HatsanityOptionName.tailoring)
+    blobfish_mask = create_hat("Blobfish Mask", HatsanityOptionName.tailoring)
+    blue_bonnet = create_hat("Blue Bonnet", HatsanityOptionName.medium)
+    blue_bow = create_hat("Blue Bow", HatsanityOptionName.easy)
+    blue_cowboy_hat = create_hat("Blue Cowboy Hat", HatsanityOptionName.rng)
+    blue_ribbon = create_hat("Blue Ribbon", HatsanityOptionName.medium)
+    bluebird_mask = create_hat("Bluebird Mask", HatsanityOptionName.medium)
+    bowler = create_hat("Bowler Hat", HatsanityOptionName.difficult)
+    bridal_veil = create_hat("Bridal Veil", HatsanityOptionName.tailoring)
+    bucket_hat = create_hat("Bucket Hat", HatsanityOptionName.medium)
+    butterfly_bow = create_hat("Butterfly Bow", HatsanityOptionName.easy)
+    cat_ears = create_hat("Cat Ears", HatsanityOptionName.medium)
+    chef_hat = create_hat("Chef Hat", HatsanityOptionName.near_perfection)
+    chicken_mask = create_hat("Chicken Mask", HatsanityOptionName.near_perfection)
+    concerned_ape_mask = create_hat("???", HatsanityOptionName.post_perfection)
+    cone_hat = create_hat("Cone Hat", HatsanityOptionName.easy)
+    cool_cap = create_hat("Cool Cap", HatsanityOptionName.medium)
+    copper_pan_hat = create_hat("Copper Pan", HatsanityOptionName.easy, need_clarifier=True)
+    cowboy = create_hat("Cowboy Hat", HatsanityOptionName.near_perfection)
+    cowgal_hat = create_hat("Cowgal Hat", HatsanityOptionName.difficult)
+    cowpoke_hat = create_hat("Cowpoke Hat", HatsanityOptionName.difficult)
+    daisy = create_hat("Daisy", HatsanityOptionName.easy)
+    dark_ballcap = create_hat("Dark Ballcap", HatsanityOptionName.rng)
+    dark_cowboy_hat = create_hat("Dark Cowboy Hat", HatsanityOptionName.rng)
+    dark_velvet_bow = create_hat("Dark Velvet Bow", HatsanityOptionName.easy)
+    delicate_bow = create_hat("Delicate Bow", HatsanityOptionName.easy)
+    deluxe_cowboy_hat = create_hat("Deluxe Cowboy Hat", HatsanityOptionName.medium)
+    deluxe_pirate_hat = create_hat("Deluxe Pirate Hat", HatsanityOptionName.rng)
+    dinosaur_hat = create_hat("Dinosaur Hat", HatsanityOptionName.tailoring)
+    earmuffs = create_hat("Earmuffs", HatsanityOptionName.medium)
+    elegant_turban = create_hat("Elegant Turban", HatsanityOptionName.post_perfection)
+    emilys_magic_hat = create_hat("Emily's Magic Hat", HatsanityOptionName.medium)
+    eye_patch = create_hat("Eye Patch", HatsanityOptionName.near_perfection)
+    fashion_hat = create_hat("Fashion Hat", HatsanityOptionName.tailoring)
+    fedora = create_hat("Fedora", HatsanityOptionName.easy)
+    fishing_hat = create_hat("Fishing Hat", HatsanityOptionName.tailoring)
+    flat_topped_hat = create_hat("Flat Topped Hat", HatsanityOptionName.tailoring)
+    floppy_beanie = create_hat("Floppy Beanie", HatsanityOptionName.tailoring)
+    foragers_hat = create_hat("Forager's Hat", HatsanityOptionName.tailoring)
+    frog_hat = create_hat("Frog Hat", HatsanityOptionName.medium)
+    garbage_hat = create_hat("Garbage Hat", HatsanityOptionName.rng)
+    gils_hat = create_hat("Gil's Hat", HatsanityOptionName.difficult)
+    gnomes_cap = create_hat("Gnome's Cap", HatsanityOptionName.near_perfection)
+    goblin_mask = create_hat("Goblin Mask", HatsanityOptionName.near_perfection)
+    goggles = create_hat("Goggles", HatsanityOptionName.tailoring)
+    gold_pan_hat = create_hat("Gold Pan", HatsanityOptionName.easy, need_clarifier=True)
+    golden_helmet = create_hat("Golden Helmet", HatsanityOptionName.rng)
+    golden_mask = create_hat("Golden Mask", HatsanityOptionName.tailoring, need_clarifier=True)
+    good_ol_cap = create_hat("Good Ol' Cap", HatsanityOptionName.easy)
+    governors_hat = create_hat("Governor's Hat", HatsanityOptionName.medium)
+    green_turban = create_hat("Green Turban", HatsanityOptionName.medium)
+    hair_bone = create_hat("Hair Bone", HatsanityOptionName.tailoring)
+    hard_hat = create_hat("Hard Hat", HatsanityOptionName.difficult)
+    hunters_cap = create_hat("Hunter's Cap", HatsanityOptionName.medium)
+    infinity_crown = create_hat("Infinity Crown", HatsanityOptionName.difficult)
+    iridium_pan_hat = create_hat("Iridium Pan", HatsanityOptionName.easy, need_clarifier=True)
+    jester_hat = create_hat("Jester Hat", HatsanityOptionName.easy)
+    joja_cap = create_hat("Joja Cap", HatsanityOptionName.rng)
+    junimo_hat = create_hat("Junimo Hat", HatsanityOptionName.post_perfection)
+    knights_helmet = create_hat("Knight's Helmet", HatsanityOptionName.near_perfection)
+    laurel_wreath_crown = create_hat("Laurel Wreath Crown", HatsanityOptionName.rng)
+    leprechaun_hat = create_hat("Leprechaun Hat", HatsanityOptionName.easy)
+    living_hat = create_hat("Living Hat", HatsanityOptionName.rng)
+    logo_cap = create_hat("Logo Cap", HatsanityOptionName.tailoring)
+    lucky_bow = create_hat("Lucky Bow", HatsanityOptionName.medium)
+    magic_cowboy_hat = create_hat("Magic Cowboy Hat", HatsanityOptionName.difficult)
+    magic_turban = create_hat("Magic Turban", HatsanityOptionName.difficult)
+    mouse_ears = create_hat("Mouse Ears", HatsanityOptionName.easy)
+    mr_qis_hat = create_hat("Mr. Qi's Hat", HatsanityOptionName.medium)
+    mummy_mask = create_hat("Mummy Mask", HatsanityOptionName.easy)
+    mushroom_cap = create_hat("Mushroom Cap", HatsanityOptionName.rng)
+    mystery_hat = create_hat("Mystery Hat", HatsanityOptionName.rng)
+    official_cap = create_hat("Official Cap", HatsanityOptionName.medium)
+    pageboy_cap = create_hat("Pageboy Cap", HatsanityOptionName.near_perfection)
+    panda_hat = create_hat("Panda Hat", "Impossible")
+    paper_hat = create_hat("Paper Hat", HatsanityOptionName.easy)
+    party_hat_blue = create_hat("Party Hat (Blue)", HatsanityOptionName.tailoring)
+    party_hat_green = create_hat("Party Hat (Green)", HatsanityOptionName.tailoring)
+    party_hat_red = create_hat("Party Hat (Red)", HatsanityOptionName.tailoring)
+    pink_bow = create_hat("Pink Bow", HatsanityOptionName.easy)
+    pirate_hat = create_hat("Pirate Hat", HatsanityOptionName.tailoring)
+    plum_chapeau = create_hat("Plum Chapeau", HatsanityOptionName.difficult)
+    polka_bow = create_hat("Polka Bow", HatsanityOptionName.medium)
+    propeller_hat = create_hat("Propeller Hat", HatsanityOptionName.tailoring)
+    pumpkin_mask = create_hat("Pumpkin Mask", HatsanityOptionName.tailoring)
+    qi_mask = create_hat("Qi Mask", HatsanityOptionName.tailoring)
+    raccoon_hat = create_hat("Raccoon Hat", HatsanityOptionName.medium)
+    radioactive_goggles = create_hat("Radioactive Goggles", HatsanityOptionName.tailoring)
+    red_cowboy_hat = create_hat("Red Cowboy Hat", HatsanityOptionName.rng)
+    red_fez = create_hat("Red Fez", HatsanityOptionName.medium)
+    sailors_cap = create_hat("Sailor's Cap", HatsanityOptionName.easy)
+    santa_hat = create_hat("Santa Hat", HatsanityOptionName.medium)
+    skeleton_mask = create_hat("Skeleton Mask", HatsanityOptionName.medium)
+    small_cap = create_hat("Small Cap", HatsanityOptionName.medium)
+    sombrero = create_hat("Sombrero", HatsanityOptionName.near_perfection)
+    souwester = create_hat("Sou'wester", HatsanityOptionName.easy)
+    space_helmet = create_hat("Space Helmet", HatsanityOptionName.difficult)
+    sports_cap = create_hat("Sports Cap", HatsanityOptionName.medium)
+    spotted_headscarf = create_hat("Spotted Headscarf", HatsanityOptionName.tailoring)
+    squid_hat = create_hat("Squid Hat", HatsanityOptionName.medium)
+    squires_helmet = create_hat("Squire's Helmet", HatsanityOptionName.rng)
+    star_helmet = create_hat("Star Helmet", HatsanityOptionName.tailoring)
+    steel_pan_hat = create_hat("Steel Pan", HatsanityOptionName.easy, need_clarifier=True)
+    straw = create_hat("Straw Hat", HatsanityOptionName.medium)
+    sunglasses = create_hat("Sunglasses", HatsanityOptionName.tailoring)
+    swashbuckler_hat = create_hat("Swashbuckler Hat", HatsanityOptionName.tailoring)
+    tiara = create_hat("Tiara", HatsanityOptionName.easy)
+    tiger_hat = create_hat("Tiger Hat", HatsanityOptionName.rng)
+    top_hat = create_hat("Top Hat", HatsanityOptionName.easy)
+    totem_mask = create_hat("Totem Mask", HatsanityOptionName.tailoring)
+    tricorn = create_hat("Tricorn Hat", HatsanityOptionName.rng)
+    tropiclip = create_hat("Tropiclip", HatsanityOptionName.easy)
+    trucker_hat = create_hat("Trucker Hat", HatsanityOptionName.medium)
+    warrior_helmet = create_hat("Warrior Helmet", HatsanityOptionName.tailoring)
+    watermelon_band = create_hat("Watermelon Band", HatsanityOptionName.difficult)
+    wearable_dwarf_helm = create_hat("Wearable Dwarf Helm", HatsanityOptionName.tailoring)
+    white_bow = create_hat("White Bow", HatsanityOptionName.difficult)
+    white_turban = create_hat("White Turban", HatsanityOptionName.tailoring)
+    witch_hat = create_hat("Witch Hat", HatsanityOptionName.tailoring)
diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv
index f7dac9c579..42c22d872d 100644
--- a/worlds/stardew_valley/data/items.csv
+++ b/worlds/stardew_valley/data/items.csv
@@ -1,11 +1,11 @@
-id,name,classification,groups,mod_name
+id,name,classification,groups,content_packs
 0,Joja Cola,filler,TRASH,
 15,Rusty Key,progression,,
 16,Dwarvish Translation Guide,progression,,
 17,Bridge Repair,progression,COMMUNITY_REWARD,
 18,Greenhouse,progression,COMMUNITY_REWARD,
 19,Glittering Boulder Removed,progression,COMMUNITY_REWARD,
-20,Minecarts Repair,useful,COMMUNITY_REWARD,
+20,Minecarts Repair,progression,COMMUNITY_REWARD,
 21,Bus Repair,progression,"COMMUNITY_REWARD,DESERT_TRANSPORTATION",
 22,Progressive Movie Theater,"progression,trap",COMMUNITY_REWARD,
 23,Stardrop,progression,,
@@ -65,16 +65,16 @@ id,name,classification,groups,mod_name
 79,Water Obelisk,progression,WIZARD_BUILDING,
 80,Desert Obelisk,progression,"WIZARD_BUILDING,DESERT_TRANSPORTATION",
 81,Island Obelisk,progression,"WIZARD_BUILDING,GINGER_ISLAND,ISLAND_TRANSPORTATION",
-82,Junimo Hut,useful,WIZARD_BUILDING,
+82,Junimo Hut,progression,WIZARD_BUILDING,
 83,Gold Clock,progression,WIZARD_BUILDING,
 84,Progressive Coop,progression,BUILDING,
 85,Progressive Barn,progression,BUILDING,
-86,Well,useful,BUILDING,
+86,Well,progression,BUILDING,
 87,Silo,progression,BUILDING,
 88,Mill,progression,BUILDING,
 89,Progressive Shed,progression,BUILDING,
 90,Fish Pond,progression,BUILDING,
-91,Stable,useful,BUILDING,
+91,Stable,progression,BUILDING,
 92,Slime Hutch,progression,BUILDING,
 93,Shipping Bin,progression,BUILDING,
 94,Beach Bridge,progression,,
@@ -82,7 +82,7 @@ id,name,classification,groups,mod_name
 96,Club Card,progression,,
 97,Magnifying Glass,progression,,
 98,Bear's Knowledge,progression,,
-99,Iridium Snake Milk,useful,,
+99,Iridium Snake Milk,progression,,
 100,JotPK: Progressive Boots,progression,ARCADE_MACHINE_BUFFS,
 101,JotPK: Progressive Gun,progression,ARCADE_MACHINE_BUFFS,
 102,JotPK: Progressive Ammo,progression,ARCADE_MACHINE_BUFFS,
@@ -146,9 +146,9 @@ id,name,classification,groups,mod_name
 160,Wheat Seeds,progression,CROPSANITY,
 161,Yam Seeds,progression,CROPSANITY,
 162,Cactus Seeds,progression,CROPSANITY,
-163,Magic Rock Candy,useful,"MUSEUM,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
+163,Magic Rock Candy,useful,"MUSEUM,FILLER_BUFF_FOOD",
 164,Ancient Seeds Recipe,progression,MUSEUM,
-165,Ancient Seeds,progression,"MUSEUM,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
+165,Ancient Seeds,progression,"MUSEUM,FILLER_FARMING",
 166,Traveling Merchant Metal Detector,progression,MUSEUM,
 167,Alex <3,progression,FRIENDSANITY,
 168,Elliott <3,progression,FRIENDSANITY,
@@ -193,24 +193,24 @@ id,name,classification,groups,mod_name
 207,Rarecrow #6,progression,"FESTIVAL,RARECROW",
 208,Rarecrow #7,progression,"FESTIVAL,RARECROW",
 209,Rarecrow #8,progression,"FESTIVAL,RARECROW",
-210,Straw Hat,filler,FESTIVAL,
-211,Golden Pumpkin,useful,FESTIVAL,
+210,Straw Hat,filler,"FILLER_HAT",
+211,Golden Pumpkin,progression,FESTIVAL,
 212,Barbed Hook,useful,FESTIVAL,
 213,Dressed Spinner,useful,FESTIVAL,
 214,Magnet,useful,FESTIVAL,
-215,Sailor's Cap,filler,FESTIVAL,
+215,Sailor's Cap,filler,"FILLER_HAT",
 216,Pearl,useful,FESTIVAL,
-217,Cone Hat,filler,FESTIVAL,
-218,Iridium Fireplace,filler,FESTIVAL,
-219,Lupini: Red Eagle,filler,FESTIVAL,
-220,Lupini: Portrait Of A Mermaid,filler,FESTIVAL,
-221,Lupini: Solar Kingdom,filler,FESTIVAL,
-222,Lupini: Clouds,filler,FESTIVAL,
-223,Lupini: 1000 Years From Now,filler,FESTIVAL,
-224,Lupini: Three Trees,filler,FESTIVAL,
-225,Lupini: The Serpent,filler,FESTIVAL,
-226,Lupini: 'Tropical Fish #173',filler,FESTIVAL,
-227,Lupini: Land Of Clay,filler,FESTIVAL,
+217,Cone Hat,filler,"FILLER_HAT",
+218,Iridium Fireplace,filler,FILLER_DECORATION,
+219,Lupini: Red Eagle,filler,FILLER_DECORATION,
+220,Lupini: Portrait Of A Mermaid,filler,FILLER_DECORATION,
+221,Lupini: Solar Kingdom,filler,FILLER_DECORATION,
+222,Lupini: Clouds,filler,FILLER_DECORATION,
+223,Lupini: 1000 Years From Now,filler,FILLER_DECORATION,
+224,Lupini: Three Trees,filler,FILLER_DECORATION,
+225,Lupini: The Serpent,filler,FILLER_DECORATION,
+226,Lupini: 'Tropical Fish #173',filler,FILLER_DECORATION,
+227,Lupini: Land Of Clay,filler,FILLER_DECORATION,
 228,Special Order Board,progression,SPECIAL_ORDER_BOARD,
 229,Solar Panel Recipe,progression,SPECIAL_ORDER_BOARD,
 230,Geode Crusher Recipe,progression,SPECIAL_ORDER_BOARD,
@@ -221,11 +221,11 @@ id,name,classification,groups,mod_name
 235,Quality Bobber Recipe,progression,SPECIAL_ORDER_BOARD,
 236,Mini-Obelisk Recipe,progression,SPECIAL_ORDER_BOARD,
 237,Monster Musk Recipe,progression,SPECIAL_ORDER_BOARD,
-239,Sewing Machine,useful,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD",
-240,Coffee Maker,progression,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD",
-241,Mini-Fridge,useful,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD",
-242,Mini-Shipping Bin,progression,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD",
-243,Deluxe Fish Tank,useful,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD",
+239,Sewing Machine,progression,"SPECIAL_ORDER_BOARD",
+240,Coffee Maker,progression,"SPECIAL_ORDER_BOARD,FILLER_MACHINE",
+241,Mini-Fridge,useful,"SPECIAL_ORDER_BOARD,FILLER_STORAGE",
+242,Mini-Shipping Bin,useful,"SPECIAL_ORDER_BOARD,FILLER_MACHINE",
+243,Deluxe Fish Tank,useful,"SPECIAL_ORDER_BOARD,FILLER_DECORATION",
 244,10 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
 245,20 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
 246,25 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
@@ -233,15 +233,15 @@ id,name,classification,groups,mod_name
 248,40 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
 249,50 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
 250,100 Qi Gems,progression,"GINGER_ISLAND,SPECIAL_ORDER_QI",
-251,Rare Seed,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-252,Apple Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-253,Apricot Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-254,Cherry Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-255,Orange Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-256,Pomegranate Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-257,Peach Sapling,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-258,Banana Sapling,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
-259,Mango Sapling,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY",
+251,Rare Seed,progression,"CROPSANITY,FILLER_FARMING",
+252,Apple Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+253,Apricot Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+254,Cherry Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+255,Orange Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+256,Pomegranate Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+257,Peach Sapling,progression,"CROPSANITY,FILLER_FRUIT_TREES",
+258,Banana Sapling,progression,"GINGER_ISLAND,CROPSANITY,FILLER_FRUIT_TREES",
+259,Mango Sapling,progression,"GINGER_ISLAND,CROPSANITY,FILLER_FRUIT_TREES",
 260,Boat Repair,progression,"GINGER_ISLAND,ISLAND_TRANSPORTATION",
 261,Open Professor Snail Cave,progression,GINGER_ISLAND,
 262,Island North Turtle,progression,"GINGER_ISLAND,WALNUT_PURCHASE",
@@ -263,7 +263,7 @@ id,name,classification,groups,mod_name
 278,Livin' Off The Land,useful,TV_CHANNEL,
 279,The Queen of Sauce,progression,TV_CHANNEL,
 280,Fishing Information Broadcasting Service,useful,TV_CHANNEL,
-281,Sinister Signal,filler,TV_CHANNEL,
+281,Sinister Signal,progression,TV_CHANNEL,
 282,Dark Talisman,progression,,
 283,Ostrich Incubator Recipe,progression,GINGER_ISLAND,
 284,Cute Baby,progression,BABY,
@@ -276,37 +276,37 @@ id,name,classification,groups,mod_name
 291,Progressive Club,progression,"WEAPON,WEAPON_CLUB",
 292,Progressive Dagger,progression,"WEAPON,WEAPON_DAGGER",
 293,Progressive Slingshot,progression,"WEAPON,WEAPON_SLINGSHOT",
-294,Progressive Footwear,useful,FOOTWEAR,
-295,Small Glow Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-296,Glow Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-297,Small Magnet Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-298,Magnet Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-299,Slime Charmer Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-300,Warrior Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-301,Vampire Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-302,Savage Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-303,Ring of Yoba,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-304,Sturdy Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-305,Burglar's Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-306,Iridium Band,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-307,Jukebox Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-308,Amethyst Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-309,Topaz Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-310,Aquamarine Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-311,Jade Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-312,Emerald Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-313,Ruby Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-314,Wedding Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-315,Crabshell Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-316,Napalm Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-317,Thorns Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-318,Lucky Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-319,Hot Java Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-320,Protection Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-321,Soul Sapper Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-322,Phoenix Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-323,Immunity Band,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-324,Glowstone Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
+294,Progressive Footwear,progression,FOOTWEAR,
+295,Small Glow Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+296,Glow Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+297,Small Magnet Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+298,Magnet Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+299,Slime Charmer Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+300,Warrior Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+301,Vampire Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+302,Savage Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+303,Ring of Yoba,progression,"MAXIMUM_ONE,FILLER_RING",
+304,Sturdy Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+305,Burglar's Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+306,Iridium Band,progression,"MAXIMUM_ONE,FILLER_RING",
+307,Jukebox Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+308,Amethyst Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+309,Topaz Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+310,Aquamarine Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+311,Jade Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+312,Emerald Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+313,Ruby Ring,filler,"MAXIMUM_ONE,FILLER_RING",
+314,Wedding Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+315,Crabshell Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+316,Napalm Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+317,Thorns Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+318,Lucky Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+319,Hot Java Ring,progression,"MAXIMUM_ONE,FILLER_RING",
+320,Protection Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+321,Soul Sapper Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+322,Phoenix Ring,useful,"MAXIMUM_ONE,FILLER_RING",
+323,Immunity Band,useful,"MAXIMUM_ONE,FILLER_RING",
+324,Glowstone Ring,useful,"MAXIMUM_ONE,FILLER_RING",
 325,Fairy Dust Recipe,progression,"GINGER_ISLAND",
 326,Heavy Tapper Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND",
 327,Hyper Speed-Gro Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND",
@@ -317,7 +317,7 @@ id,name,classification,groups,mod_name
 333,Tub o' Flowers Recipe,progression,FESTIVAL,
 335,Moonlight Jellies Banner,filler,FESTIVAL,
 336,Starport Decal,filler,FESTIVAL,
-337,Golden Egg,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
+337,Golden Egg,progression,"FILLER_FOOD",
 340,Algae Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",
 341,Artichoke Dip Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS",
 342,Autumn's Bounty Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",
@@ -457,16 +457,16 @@ id,name,classification,groups,mod_name
 490,Text Sign Recipe,progression,CRAFTSANITY,
 491,Blue Grass Starter Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND",
 492,Mastery Of The Five Ways,progression,SKILL_MASTERY,
-493,Progressive Scythe,useful,,
+493,Progressive Scythe,progression,,
 494,Progressive Pan,progression,PROGRESSIVE_TOOLS,
 495,Calico Statue,filler,FESTIVAL,
-496,Mummy Mask,filler,FESTIVAL,
+496,Mummy Mask,filler,"FILLER_HAT",
 497,Free Cactis,filler,FESTIVAL,
-498,Gil's Hat,filler,FESTIVAL,
-499,Bucket Hat,filler,FESTIVAL,
+498,Gil's Hat,filler,"FILLER_HAT",
+499,Bucket Hat,filler,"FILLER_HAT",
 500,Mounted Trout,filler,FESTIVAL,
-501,'Squid Kid',filler,FESTIVAL,
-502,Squid Hat,filler,FESTIVAL,
+501,'Squid Kid',filler,FILLER_DECORATION,
+502,Squid Hat,filler,"FILLER_HAT",
 503,Resource Pack: 200 Calico Egg,useful,"FESTIVAL",
 504,Resource Pack: 120 Calico Egg,useful,"FESTIVAL",
 505,Resource Pack: 100 Calico Egg,useful,"FESTIVAL",
@@ -476,27 +476,27 @@ id,name,classification,groups,mod_name
 509,Resource Pack: 30 Calico Egg,useful,"FESTIVAL",
 510,Book: The Art O' Crabbing,progression,"FESTIVAL",
 511,Mr Qi's Plane Ride,progression,,
-521,Power: Price Catalogue,useful,"BOOK_POWER",
-522,Power: Mapping Cave Systems,useful,"BOOK_POWER",
+521,Power: Price Catalogue,progression,"BOOK_POWER",
+522,Power: Mapping Cave Systems,progression,"BOOK_POWER",
 523,Power: Way Of The Wind pt. 1,progression,"BOOK_POWER",
-524,Power: Way Of The Wind pt. 2,useful,"BOOK_POWER",
-525,Power: Monster Compendium,useful,"BOOK_POWER",
-526,Power: Friendship 101,useful,"BOOK_POWER",
-527,"Power: Jack Be Nimble, Jack Be Thick",useful,"BOOK_POWER",
-528,Power: Woody's Secret,useful,"BOOK_POWER",
-529,Power: Raccoon Journal,useful,"BOOK_POWER",
-530,Power: Jewels Of The Sea,useful,"BOOK_POWER",
-531,Power: Dwarvish Safety Manual,useful,"BOOK_POWER",
-532,Power: The Art O' Crabbing,useful,"BOOK_POWER",
-533,Power: The Alleyway Buffet,useful,"BOOK_POWER",
-534,Power: The Diamond Hunter,useful,"BOOK_POWER",
+524,Power: Way Of The Wind pt. 2,progression,"BOOK_POWER",
+525,Power: Monster Compendium,progression,"BOOK_POWER",
+526,Power: Friendship 101,progression,"BOOK_POWER",
+527,"Power: Jack Be Nimble, Jack Be Thick",progression,"BOOK_POWER",
+528,Power: Woody's Secret,progression,"BOOK_POWER",
+529,Power: Raccoon Journal,progression,"BOOK_POWER",
+530,Power: Jewels Of The Sea,progression,"BOOK_POWER",
+531,Power: Dwarvish Safety Manual,progression,"BOOK_POWER",
+532,Power: The Art O' Crabbing,progression,"BOOK_POWER",
+533,Power: The Alleyway Buffet,progression,"BOOK_POWER",
+534,Power: The Diamond Hunter,progression,"BOOK_POWER,GINGER_ISLAND",
 535,Power: Book of Mysteries,progression,"BOOK_POWER",
-536,Power: Horse: The Book,useful,"BOOK_POWER",
-537,Power: Treasure Appraisal Guide,useful,"BOOK_POWER",
-538,Power: Ol' Slitherlegs,useful,"BOOK_POWER",
-539,Power: Animal Catalogue,useful,"BOOK_POWER",
+536,Power: Horse: The Book,progression,"BOOK_POWER",
+537,Power: Treasure Appraisal Guide,progression,"BOOK_POWER",
+538,Power: Ol' Slitherlegs,progression,"BOOK_POWER",
+539,Power: Animal Catalogue,progression,"BOOK_POWER",
 541,Progressive Lost Book,progression,"LOST_BOOK",
-551,Golden Walnut,progression,"RESOURCE_PACK,GINGER_ISLAND",
+551,Golden Walnut,progression,"FILLER_CURRENCY,GINGER_ISLAND",
 552,3 Golden Walnuts,progression,"GINGER_ISLAND",
 553,5 Golden Walnuts,progression,"GINGER_ISLAND",
 554,Damage Bonus,filler,PLAYER_BUFF,
@@ -510,6 +510,95 @@ id,name,classification,groups,mod_name
 562,Quality Bonus,filler,PLAYER_BUFF,
 563,Glow Bonus,filler,PLAYER_BUFF,
 564,Pet Bowl,progression,BUILDING,
+565,??HMTGF??,filler,"EASY_SECRET",
+566,??Pinky Lemon??,filler,"EASY_SECRET",
+567,??Foroguemon??,filler,"EASY_SECRET",
+568,Junimo Plush,filler,"EASY_SECRET",
+569,'Boat',filler,"FILLER_DECORATION",
+570,Decorative Trash Can,filler,"FILLER_DECORATION",
+571,Foliage Print,filler,"FILLER_DECORATION",
+572,Frog Hat,filler,"FILLER_HAT",
+573,Gourmand Statue,filler,"FILLER_DECORATION",
+574,Iridium Krobus,filler,"FILLER_DECORATION",
+575,Lifesaver,filler,"FILLER_DECORATION",
+576,'Physics 101',filler,"FILLER_DECORATION",
+577,Pyramid Decal,filler,"FILLER_DECORATION",
+578,Squirrel Figurine,filler,"FILLER_DECORATION",
+579,'Vista',filler,"FILLER_DECORATION",
+580,Wall Basket,filler,"FILLER_DECORATION",
+581,Far Away Stone,progression,"EASY_SECRET",
+582,Strange Doll,filler,"SECRET_NOTES_SECRET",
+583,Strange Doll (Green),filler,"SECRET_NOTES_SECRET",
+584,Solid Gold Lewis,progression,"SECRET_NOTES_SECRET",
+585,Special Charm,useful,"SECRET_NOTES_SECRET",
+586,Stone Junimo,filler,"SECRET_NOTES_SECRET",
+587,Movie Salty Snacks,progression,"MOVIESANITY",
+588,Movie Sweet Snacks,progression,"MOVIESANITY",
+589,Movie Drinks,progression,"MOVIESANITY",
+590,Movie Meals,progression,"MOVIESANITY",
+601,Basilisk Paw,filler,"TRINKET",
+602,Fairy Box,filler,"TRINKET",
+603,Frog Egg,filler,"TRINKET",
+604,Golden Spur,filler,"TRINKET",
+605,Ice Rod,filler,"TRINKET",
+606,Magic Hair Gel,filler,"TRINKET",
+607,Magic Quiver,filler,"TRINKET",
+608,Parrot Egg,filler,"TRINKET",
+621,Stamina Enzyme,useful,"EATSANITY_ENZYME",
+622,Health Enzyme,useful,"EATSANITY_ENZYME",
+623,Speed Enzyme,useful,"EATSANITY_ENZYME",
+624,Luck Enzyme,useful,"EATSANITY_ENZYME",
+625,Farming Enzyme,useful,"EATSANITY_ENZYME",
+626,Foraging Enzyme,useful,"EATSANITY_ENZYME",
+627,Fishing Enzyme,progression,"EATSANITY_ENZYME",
+628,Mining Enzyme,useful,"EATSANITY_ENZYME",
+629,Magnetism Enzyme,useful,"EATSANITY_ENZYME",
+630,Defense Enzyme,useful,"EATSANITY_ENZYME",
+631,Max Stamina Enzyme,useful,"EATSANITY_ENZYME",
+632,Squid Ink Enzyme,useful,"EATSANITY_ENZYME",
+633,Monster Musk Enzyme,useful,"EATSANITY_ENZYME",
+634,Oil Of Garlic Enzyme,useful,"EATSANITY_ENZYME",
+635,Tipsy Enzyme,trap,"EATSANITY_ENZYME",
+636,Attack Enzyme,useful,"EATSANITY_ENZYME",
+640,Forest Magic,progression,"COMMUNITY_REWARD",
+641,Landslide Removed,progression,"COMMUNITY_REWARD",
+642,Magic Ink,progression,,
+643,Community Center Key,progression,"COMMUNITY_REWARD",
+644,Wizard Invitation,progression,"COMMUNITY_REWARD",
+645,Pam House,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+646,Forest To Beach Shortcut,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+647,Mountain Shortcuts,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+648,Town To Tide Pools Shortcut,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+649,Tunnel To Backwoods Shortcut,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+650,Statue Of Endless Fortune,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_MACHINE",
+651,Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+652,Furniture Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+653,Joja Furniture Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+654,Junimo Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+655,Retro Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+656,Trash Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+657,Wizard Catalogue,progression,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION",
+658,Abigail Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+659,Alex Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+660,Elliott Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+661,Emily Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+662,Haley Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+663,Harvey Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+664,Krobus Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+665,Leah Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+666,Maru Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+667,Penny Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+668,Sam Portrait,filler,"ENDGAME_LOCATION_ITEMS,MAXIMUM_ONE,FILLER_DECORATION,REQUIRES_FRIENDSANITY_MARRIAGE",
+669,Sebastian Portrait,filler,"FILLER_DECORATION",
+670,Shane Portrait,filler,"FILLER_DECORATION",
+671,Trash Bear Arrival,progression,"TRASH_BEAR,COMMUNITY_REWARD",
+672,Trash Bear Cleanup,filler,"TRASH_BEAR,COMMUNITY_REWARD",
+673,Progressive Bookseller Days,progression,"BOOKSELLER",
+674,Bookseller Stock: Progressive Experience Books,progression,"BOOKSELLER",
+675,Bookseller Stock: Progressive Rare Books,progression,"BOOKSELLER",
+676,Bookseller Stock: Permanent Books,progression,"BOOKSELLER",
+677,Men's Locker Key,progression,,
+678,Women's Locker Key,progression,,
 4001,Burnt Trap,trap,TRAP,
 4002,Darkness Trap,trap,TRAP,
 4003,Frozen Trap,trap,TRAP,
@@ -537,290 +626,296 @@ id,name,classification,groups,mod_name
 4025,Bomb Trap,trap,TRAP,
 4026,Nudge Trap,trap,TRAP,
 4501,Deflation Bonus,filler,,
-5000,Resource Pack: 500 Money,useful,"BASE_RESOURCE,RESOURCE_PACK",
-5001,Resource Pack: 1000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK",
-5002,Resource Pack: 1500 Money,useful,"BASE_RESOURCE,RESOURCE_PACK",
-5003,Resource Pack: 2000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK",
-5004,Resource Pack: 25 Stone,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5005,Resource Pack: 50 Stone,filler,"BASE_RESOURCE,RESOURCE_PACK",
-5006,Resource Pack: 75 Stone,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5007,Resource Pack: 100 Stone,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5008,Resource Pack: 25 Wood,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5009,Resource Pack: 50 Wood,filler,"BASE_RESOURCE,RESOURCE_PACK",
-5010,Resource Pack: 75 Wood,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5011,Resource Pack: 100 Wood,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5012,Resource Pack: 5 Hardwood,useful,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5013,Resource Pack: 10 Hardwood,useful,"BASE_RESOURCE,RESOURCE_PACK",
-5014,Resource Pack: 15 Hardwood,useful,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5015,Resource Pack: 20 Hardwood,useful,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5016,Resource Pack: 15 Fiber,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5017,Resource Pack: 30 Fiber,filler,"BASE_RESOURCE,RESOURCE_PACK",
-5018,Resource Pack: 45 Fiber,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5019,Resource Pack: 60 Fiber,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5020,Resource Pack: 5 Coal,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5021,Resource Pack: 10 Coal,filler,"BASE_RESOURCE,RESOURCE_PACK",
-5022,Resource Pack: 15 Coal,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5023,Resource Pack: 20 Coal,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5024,Resource Pack: 5 Clay,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5025,Resource Pack: 10 Clay,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5026,Resource Pack: 15 Clay,filler,"DEPRECATED,BASE_RESOURCE,RESOURCE_PACK",
-5027,Resource Pack: 20 Clay,filler,"BASE_RESOURCE,RESOURCE_PACK",
-5028,Resource Pack: 1 Warp Totem: Beach,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5029,Resource Pack: 3 Warp Totem: Beach,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5030,Resource Pack: 5 Warp Totem: Beach,filler,"RESOURCE_PACK,WARP_TOTEM",
-5031,Resource Pack: 7 Warp Totem: Beach,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5032,Resource Pack: 9 Warp Totem: Beach,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5033,Resource Pack: 10 Warp Totem: Beach,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5034,Resource Pack: 1 Warp Totem: Desert,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5035,Resource Pack: 3 Warp Totem: Desert,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5036,Resource Pack: 5 Warp Totem: Desert,filler,"RESOURCE_PACK,WARP_TOTEM",
-5037,Resource Pack: 7 Warp Totem: Desert,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5038,Resource Pack: 9 Warp Totem: Desert,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5039,Resource Pack: 10 Warp Totem: Desert,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5040,Resource Pack: 1 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5041,Resource Pack: 3 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5042,Resource Pack: 5 Warp Totem: Farm,filler,"RESOURCE_PACK,WARP_TOTEM",
-5043,Resource Pack: 7 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5044,Resource Pack: 9 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5045,Resource Pack: 10 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5046,Resource Pack: 1 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5047,Resource Pack: 3 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5048,Resource Pack: 5 Warp Totem: Island,filler,"RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5049,Resource Pack: 7 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5050,Resource Pack: 9 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5051,Resource Pack: 10 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND",
-5052,Resource Pack: 1 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5053,Resource Pack: 3 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5054,Resource Pack: 5 Warp Totem: Mountains,filler,"RESOURCE_PACK,WARP_TOTEM",
-5055,Resource Pack: 7 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5056,Resource Pack: 9 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5057,Resource Pack: 10 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM",
-5058,Resource Pack: 6 Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5059,Resource Pack: 12 Geode,filler,"GEODE,RESOURCE_PACK",
-5060,Resource Pack: 18 Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5061,Resource Pack: 24 Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5062,Resource Pack: 4 Frozen Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5063,Resource Pack: 8 Frozen Geode,filler,"GEODE,RESOURCE_PACK",
-5064,Resource Pack: 12 Frozen Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5065,Resource Pack: 16 Frozen Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5066,Resource Pack: 3 Magma Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5067,Resource Pack: 6 Magma Geode,filler,"GEODE,RESOURCE_PACK",
-5068,Resource Pack: 9 Magma Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5069,Resource Pack: 12 Magma Geode,filler,"DEPRECATED,GEODE,RESOURCE_PACK",
-5070,Resource Pack: 2 Omni Geode,useful,"DEPRECATED,GEODE,RESOURCE_PACK",
-5071,Resource Pack: 4 Omni Geode,useful,"GEODE,RESOURCE_PACK",
-5072,Resource Pack: 6 Omni Geode,useful,"DEPRECATED,GEODE,RESOURCE_PACK",
-5073,Resource Pack: 8 Omni Geode,useful,"DEPRECATED,GEODE,RESOURCE_PACK",
-5074,Resource Pack: 25 Copper Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5075,Resource Pack: 50 Copper Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5076,Resource Pack: 75 Copper Ore,filler,"ORE,RESOURCE_PACK",
-5077,Resource Pack: 100 Copper Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5078,Resource Pack: 125 Copper Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5079,Resource Pack: 150 Copper Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5080,Resource Pack: 25 Iron Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5081,Resource Pack: 50 Iron Ore,filler,"ORE,RESOURCE_PACK",
-5082,Resource Pack: 75 Iron Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5083,Resource Pack: 100 Iron Ore,filler,"DEPRECATED,ORE,RESOURCE_PACK",
-5084,Resource Pack: 12 Gold Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5085,Resource Pack: 25 Gold Ore,useful,"ORE,RESOURCE_PACK",
-5086,Resource Pack: 38 Gold Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5087,Resource Pack: 50 Gold Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5088,Resource Pack: 5 Iridium Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5089,Resource Pack: 10 Iridium Ore,useful,"ORE,RESOURCE_PACK",
-5090,Resource Pack: 15 Iridium Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5091,Resource Pack: 20 Iridium Ore,useful,"DEPRECATED,ORE,RESOURCE_PACK",
-5092,Resource Pack: 5 Quartz,filler,"ORE,RESOURCE_PACK",
-5093,Resource Pack: 10 Quartz,filler,"ORE,DEPRECATED,RESOURCE_PACK",
-5094,Resource Pack: 15 Quartz,filler,"ORE,DEPRECATED,RESOURCE_PACK",
-5095,Resource Pack: 20 Quartz,filler,"ORE,DEPRECATED,RESOURCE_PACK",
-5096,Resource Pack: 10 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5097,Resource Pack: 20 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5098,Resource Pack: 30 Basic Fertilizer,filler,"FERTILIZER,RESOURCE_PACK",
-5099,Resource Pack: 40 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5100,Resource Pack: 50 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5101,Resource Pack: 60 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5102,Resource Pack: 10 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5103,Resource Pack: 20 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5104,Resource Pack: 30 Basic Retaining Soil,filler,"FERTILIZER,RESOURCE_PACK",
-5105,Resource Pack: 40 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5106,Resource Pack: 50 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5107,Resource Pack: 60 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5108,Resource Pack: 10 Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5109,Resource Pack: 20 Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5110,Resource Pack: 30 Speed-Gro,filler,"FERTILIZER,RESOURCE_PACK",
-5111,Resource Pack: 40 Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5112,Resource Pack: 50 Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5113,Resource Pack: 60 Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5114,Resource Pack: 4 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5115,Resource Pack: 12 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5116,Resource Pack: 20 Quality Fertilizer,filler,"FERTILIZER,RESOURCE_PACK",
-5117,Resource Pack: 28 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5118,Resource Pack: 36 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5119,Resource Pack: 40 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5120,Resource Pack: 4 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5121,Resource Pack: 12 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5122,Resource Pack: 20 Quality Retaining Soil,filler,"FERTILIZER,RESOURCE_PACK",
-5123,Resource Pack: 28 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5124,Resource Pack: 36 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5125,Resource Pack: 40 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5126,Resource Pack: 4 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5127,Resource Pack: 12 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5128,Resource Pack: 20 Deluxe Speed-Gro,filler,"FERTILIZER,RESOURCE_PACK",
-5129,Resource Pack: 28 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5130,Resource Pack: 36 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5131,Resource Pack: 40 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5132,Resource Pack: 2 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5133,Resource Pack: 6 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5134,Resource Pack: 10 Deluxe Fertilizer,useful,"FERTILIZER,RESOURCE_PACK",
-5135,Resource Pack: 14 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5136,Resource Pack: 18 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5137,Resource Pack: 20 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5138,Resource Pack: 2 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5139,Resource Pack: 6 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5140,Resource Pack: 10 Deluxe Retaining Soil,useful,"FERTILIZER,RESOURCE_PACK",
-5141,Resource Pack: 14 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5142,Resource Pack: 18 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5143,Resource Pack: 20 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5144,Resource Pack: 2 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5145,Resource Pack: 6 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5146,Resource Pack: 10 Hyper Speed-Gro,useful,"FERTILIZER,RESOURCE_PACK",
-5147,Resource Pack: 14 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5148,Resource Pack: 18 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5149,Resource Pack: 20 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5150,Resource Pack: 2 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5151,Resource Pack: 6 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5152,Resource Pack: 10 Tree Fertilizer,filler,"FERTILIZER,RESOURCE_PACK",
-5153,Resource Pack: 14 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5154,Resource Pack: 18 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5155,Resource Pack: 20 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,RESOURCE_PACK",
-5156,Resource Pack: 10 Spring Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5157,Resource Pack: 20 Spring Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5158,Resource Pack: 30 Spring Seeds,filler,"RESOURCE_PACK,SEED",
-5159,Resource Pack: 40 Spring Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5160,Resource Pack: 50 Spring Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5161,Resource Pack: 60 Spring Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5162,Resource Pack: 10 Summer Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5163,Resource Pack: 20 Summer Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5164,Resource Pack: 30 Summer Seeds,filler,"RESOURCE_PACK,SEED",
-5165,Resource Pack: 40 Summer Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5166,Resource Pack: 50 Summer Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5167,Resource Pack: 60 Summer Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5168,Resource Pack: 10 Fall Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5169,Resource Pack: 20 Fall Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5170,Resource Pack: 30 Fall Seeds,filler,"RESOURCE_PACK,SEED",
-5171,Resource Pack: 40 Fall Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5172,Resource Pack: 50 Fall Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5173,Resource Pack: 60 Fall Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5174,Resource Pack: 10 Winter Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5175,Resource Pack: 20 Winter Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5176,Resource Pack: 30 Winter Seeds,filler,"RESOURCE_PACK,SEED",
-5177,Resource Pack: 40 Winter Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5178,Resource Pack: 50 Winter Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5179,Resource Pack: 60 Winter Seeds,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5180,Resource Pack: 1 Mahogany Seed,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5181,Resource Pack: 3 Mahogany Seed,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5182,Resource Pack: 5 Mahogany Seed,filler,"RESOURCE_PACK,SEED",
-5183,Resource Pack: 7 Mahogany Seed,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5184,Resource Pack: 9 Mahogany Seed,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5185,Resource Pack: 10 Mahogany Seed,filler,"DEPRECATED,RESOURCE_PACK,SEED",
-5186,Resource Pack: 10 Bait,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5187,Resource Pack: 20 Bait,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5188,Resource Pack: 30 Bait,filler,"FISHING_RESOURCE,RESOURCE_PACK",
-5189,Resource Pack: 40 Bait,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5190,Resource Pack: 50 Bait,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5191,Resource Pack: 60 Bait,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5192,Resource Pack: 1 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5193,Resource Pack: 2 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5194,Resource Pack: 3 Crab Pot,filler,"FISHING_RESOURCE,RESOURCE_PACK",
-5195,Resource Pack: 4 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5196,Resource Pack: 5 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5197,Resource Pack: 6 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,RESOURCE_PACK",
-5198,Friendship Bonus (1 <3),useful,"DEPRECATED,FRIENDSHIP_PACK,RESOURCE_PACK",
-5199,Friendship Bonus (2 <3),useful,"FRIENDSHIP_PACK,COMMUNITY_REWARD",
-5200,Friendship Bonus (3 <3),useful,"DEPRECATED,FRIENDSHIP_PACK,RESOURCE_PACK",
-5201,Friendship Bonus (4 <3),useful,"DEPRECATED,FRIENDSHIP_PACK,RESOURCE_PACK",
-5202,15 Qi Gems,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5203,Solar Panel,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5204,Geode Crusher,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5205,Farm Computer,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5206,Bone Mill,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5207,Fiber Seeds,filler,RESOURCE_PACK,
-5208,Chest,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5209,Stone Chest,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5210,Quality Bobber,filler,RESOURCE_PACK,
-5211,Mini-Obelisk,filler,"AT_LEAST_TWO,RESOURCE_PACK",
-5212,Monster Musk,filler,RESOURCE_PACK,
-5213,Sprinkler,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5214,Quality Sprinkler,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5215,Iridium Sprinkler,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5216,Scarecrow,filler,RESOURCE_PACK,
-5217,Deluxe Scarecrow,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5218,Furnace,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5219,Charcoal Kiln,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5220,Lightning Rod,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5221,Resource Pack: 5000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5222,Resource Pack: 10000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5223,Junimo Chest,filler,"AT_LEAST_TWO,RESOURCE_PACK",
-5224,Horse Flute,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5225,Pierre's Missing Stocklist,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5226,Hopper,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5227,Enricher,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5228,Pressure Nozzle,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5229,Deconstructor,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5230,Key To The Town,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5231,Galaxy Soul,filler,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5232,Mushroom Tree Seed,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5233,Resource Pack: 20 Magic Bait,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5234,Resource Pack: 10 Qi Seasoning,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5235,Mr. Qi's Hat,filler,"MAXIMUM_ONE,RESOURCE_PACK",
-5236,Aquatic Sanctuary,filler,RESOURCE_PACK,
-5237,Leprechaun Hat,filler,"MAXIMUM_ONE,RESOURCE_PACK",
-5242,Exotic Double Bed,filler,RESOURCE_PACK,
-5243,Resource Pack: 2 Qi Gem,filler,"GINGER_ISLAND,RESOURCE_PACK,DEPRECATED",
-5247,Fairy Dust,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5248,Seed Maker,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5249,Keg,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5250,Cask,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5251,Preserves Jar,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5252,Bee House,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5253,Garden Pot,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5254,Cheese Press,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5255,Mayonnaise Machine,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5256,Loom,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5257,Oil Maker,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5258,Recycling Machine,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5259,Worm Bin,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5260,Tapper,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5261,Heavy Tapper,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5262,Slime Incubator,useful,RESOURCE_PACK,
-5263,Slime Egg-Press,useful,RESOURCE_PACK,
-5264,Crystalarium,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5265,Ostrich Incubator,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5266,Resource Pack: 5 Staircase,filler,"RESOURCE_PACK",
-5267,Auto-Petter,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5268,Auto-Grabber,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5269,Resource Pack: 10 Calico Egg,filler,"RESOURCE_PACK",
-5270,Resource Pack: 20 Calico Egg,filler,"RESOURCE_PACK",
-5272,Tent Kit,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5273,Resource Pack: 4 Mystery Box,filler,"RESOURCE_PACK",
-5274,Prize Ticket,filler,"RESOURCE_PACK",
-5275,Resource Pack: 20 Deluxe Bait,filler,"RESOURCE_PACK",
-5276,Resource Pack: 2 Triple Shot Espresso,filler,"RESOURCE_PACK",
-5277,Dish O' The Sea,filler,"RESOURCE_PACK",
-5278,Seafoam Pudding,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5279,Trap Bobber,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",
-5280,Treasure Chest,filler,"RESOURCE_PACK",
-5281,Resource Pack: 15 Mixed Seeds,filler,"RESOURCE_PACK",
-5282,Resource Pack: 15 Mixed Flower Seeds,filler,"RESOURCE_PACK",
-5283,Resource Pack: 5 Cherry Bomb,filler,"RESOURCE_PACK",
-5284,Resource Pack: 3 Bomb,filler,"RESOURCE_PACK",
-5285,Resource Pack: 2 Mega Bomb,filler,"RESOURCE_PACK",
-5286,Resource Pack: 2 Life Elixir,filler,"RESOURCE_PACK",
-5287,Resource Pack: 5 Coffee,filler,"RESOURCE_PACK",
-5289,Prismatic Shard,filler,"RESOURCE_PACK",
-5290,Stardrop Tea,filler,"RESOURCE_PACK",
-5291,Resource Pack: 2 Artifact Trove,filler,"RESOURCE_PACK",
-5292,Resource Pack: 20 Cinder Shard,filler,"GINGER_ISLAND,RESOURCE_PACK",
+5000,Resource Pack: 500 Money,useful,"FILLER_MONEY",
+5001,Resource Pack: 1000 Money,useful,"FILLER_MONEY",
+5002,Resource Pack: 1500 Money,useful,"FILLER_MONEY",
+5003,Resource Pack: 2000 Money,useful,"FILLER_MONEY",
+5004,Resource Pack: 25 Stone,filler,"DEPRECATED,FILLER_MATERIALS",
+5005,Resource Pack: 50 Stone,filler,"FILLER_MATERIALS",
+5006,Resource Pack: 75 Stone,filler,"DEPRECATED,FILLER_MATERIALS",
+5007,Resource Pack: 100 Stone,filler,"DEPRECATED,FILLER_MATERIALS",
+5008,Resource Pack: 25 Wood,filler,"DEPRECATED,FILLER_MATERIALS",
+5009,Resource Pack: 50 Wood,filler,"FILLER_MATERIALS",
+5010,Resource Pack: 75 Wood,filler,"DEPRECATED,FILLER_MATERIALS",
+5011,Resource Pack: 100 Wood,filler,"DEPRECATED,FILLER_MATERIALS",
+5012,Resource Pack: 5 Hardwood,useful,"DEPRECATED,FILLER_MATERIALS",
+5013,Resource Pack: 10 Hardwood,useful,"FILLER_MATERIALS",
+5014,Resource Pack: 15 Hardwood,useful,"DEPRECATED,FILLER_MATERIALS",
+5015,Resource Pack: 20 Hardwood,useful,"DEPRECATED,FILLER_MATERIALS",
+5016,Resource Pack: 15 Fiber,filler,"DEPRECATED,FILLER_MATERIALS",
+5017,Resource Pack: 30 Fiber,filler,"FILLER_MATERIALS",
+5018,Resource Pack: 45 Fiber,filler,"DEPRECATED,FILLER_MATERIALS",
+5019,Resource Pack: 60 Fiber,filler,"DEPRECATED,FILLER_MATERIALS",
+5020,Resource Pack: 5 Coal,filler,"DEPRECATED,FILLER_MATERIALS",
+5021,Resource Pack: 10 Coal,filler,"FILLER_MATERIALS",
+5022,Resource Pack: 15 Coal,filler,"DEPRECATED,FILLER_MATERIALS",
+5023,Resource Pack: 20 Coal,filler,"DEPRECATED,FILLER_MATERIALS",
+5024,Resource Pack: 5 Clay,filler,"DEPRECATED,FILLER_MATERIALS",
+5025,Resource Pack: 10 Clay,filler,"FILLER_MATERIALS",
+5026,Resource Pack: 15 Clay,filler,"DEPRECATED,FILLER_MATERIALS",
+5027,Resource Pack: 20 Clay,filler,"DEPRECATED,FILLER_MATERIALS",
+5028,Resource Pack: 1 Warp Totem: Beach,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5029,Resource Pack: 3 Warp Totem: Beach,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5030,Resource Pack: 5 Warp Totem: Beach,filler,"FILLER_CONSUMABLE,WARP_TOTEM",
+5031,Resource Pack: 7 Warp Totem: Beach,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5032,Resource Pack: 9 Warp Totem: Beach,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5033,Resource Pack: 10 Warp Totem: Beach,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5034,Resource Pack: 1 Warp Totem: Desert,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5035,Resource Pack: 3 Warp Totem: Desert,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5036,Resource Pack: 5 Warp Totem: Desert,filler,"FILLER_CONSUMABLE,WARP_TOTEM",
+5037,Resource Pack: 7 Warp Totem: Desert,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5038,Resource Pack: 9 Warp Totem: Desert,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5039,Resource Pack: 10 Warp Totem: Desert,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5040,Resource Pack: 1 Warp Totem: Farm,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5041,Resource Pack: 3 Warp Totem: Farm,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5042,Resource Pack: 5 Warp Totem: Farm,filler,"FILLER_CONSUMABLE,WARP_TOTEM",
+5043,Resource Pack: 7 Warp Totem: Farm,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5044,Resource Pack: 9 Warp Totem: Farm,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5045,Resource Pack: 10 Warp Totem: Farm,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5046,Resource Pack: 1 Warp Totem: Island,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5047,Resource Pack: 3 Warp Totem: Island,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5048,Resource Pack: 5 Warp Totem: Island,filler,"FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5049,Resource Pack: 7 Warp Totem: Island,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5050,Resource Pack: 9 Warp Totem: Island,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5051,Resource Pack: 10 Warp Totem: Island,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM,GINGER_ISLAND",
+5052,Resource Pack: 1 Warp Totem: Mountains,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5053,Resource Pack: 3 Warp Totem: Mountains,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5054,Resource Pack: 5 Warp Totem: Mountains,filler,"FILLER_CONSUMABLE,WARP_TOTEM",
+5055,Resource Pack: 7 Warp Totem: Mountains,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5056,Resource Pack: 9 Warp Totem: Mountains,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5057,Resource Pack: 10 Warp Totem: Mountains,filler,"DEPRECATED,FILLER_CONSUMABLE,WARP_TOTEM",
+5058,Resource Pack: 6 Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5059,Resource Pack: 12 Geode,filler,"GEODE,FILLER_MATERIALS",
+5060,Resource Pack: 18 Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5061,Resource Pack: 24 Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5062,Resource Pack: 4 Frozen Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5063,Resource Pack: 8 Frozen Geode,filler,"GEODE,FILLER_MATERIALS",
+5064,Resource Pack: 12 Frozen Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5065,Resource Pack: 16 Frozen Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5066,Resource Pack: 3 Magma Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5067,Resource Pack: 6 Magma Geode,filler,"GEODE,FILLER_MATERIALS",
+5068,Resource Pack: 9 Magma Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5069,Resource Pack: 12 Magma Geode,filler,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5070,Resource Pack: 2 Omni Geode,useful,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5071,Resource Pack: 4 Omni Geode,useful,"GEODE,FILLER_MATERIALS",
+5072,Resource Pack: 6 Omni Geode,useful,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5073,Resource Pack: 8 Omni Geode,useful,"DEPRECATED,GEODE,FILLER_MATERIALS",
+5074,Resource Pack: 25 Copper Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5075,Resource Pack: 50 Copper Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5076,Resource Pack: 75 Copper Ore,filler,"ORE,FILLER_MATERIALS",
+5077,Resource Pack: 100 Copper Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5078,Resource Pack: 125 Copper Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5079,Resource Pack: 150 Copper Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5080,Resource Pack: 25 Iron Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5081,Resource Pack: 50 Iron Ore,filler,"ORE,FILLER_MATERIALS",
+5082,Resource Pack: 75 Iron Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5083,Resource Pack: 100 Iron Ore,filler,"DEPRECATED,ORE,FILLER_MATERIALS",
+5084,Resource Pack: 12 Gold Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5085,Resource Pack: 25 Gold Ore,useful,"ORE,FILLER_MATERIALS",
+5086,Resource Pack: 38 Gold Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5087,Resource Pack: 50 Gold Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5088,Resource Pack: 5 Iridium Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5089,Resource Pack: 10 Iridium Ore,useful,"ORE,FILLER_MATERIALS",
+5090,Resource Pack: 15 Iridium Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5091,Resource Pack: 20 Iridium Ore,useful,"DEPRECATED,ORE,FILLER_MATERIALS",
+5092,Resource Pack: 5 Quartz,filler,"ORE,FILLER_MATERIALS",
+5093,Resource Pack: 10 Quartz,filler,"ORE,DEPRECATED,FILLER_MATERIALS",
+5094,Resource Pack: 15 Quartz,filler,"ORE,DEPRECATED,FILLER_MATERIALS",
+5095,Resource Pack: 20 Quartz,filler,"ORE,DEPRECATED,FILLER_MATERIALS",
+5096,Resource Pack: 10 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5097,Resource Pack: 20 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5098,Resource Pack: 30 Basic Fertilizer,filler,"FERTILIZER,FILLER_FARMING",
+5099,Resource Pack: 40 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5100,Resource Pack: 50 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5101,Resource Pack: 60 Basic Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5102,Resource Pack: 10 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5103,Resource Pack: 20 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5104,Resource Pack: 30 Basic Retaining Soil,filler,"FERTILIZER,FILLER_FARMING",
+5105,Resource Pack: 40 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5106,Resource Pack: 50 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5107,Resource Pack: 60 Basic Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5108,Resource Pack: 10 Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5109,Resource Pack: 20 Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5110,Resource Pack: 30 Speed-Gro,filler,"FERTILIZER,FILLER_FARMING",
+5111,Resource Pack: 40 Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5112,Resource Pack: 50 Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5113,Resource Pack: 60 Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5114,Resource Pack: 4 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5115,Resource Pack: 12 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5116,Resource Pack: 20 Quality Fertilizer,filler,"FERTILIZER,FILLER_FARMING",
+5117,Resource Pack: 28 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5118,Resource Pack: 36 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5119,Resource Pack: 40 Quality Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5120,Resource Pack: 4 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5121,Resource Pack: 12 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5122,Resource Pack: 20 Quality Retaining Soil,filler,"FERTILIZER,FILLER_FARMING",
+5123,Resource Pack: 28 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5124,Resource Pack: 36 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5125,Resource Pack: 40 Quality Retaining Soil,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5126,Resource Pack: 4 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5127,Resource Pack: 12 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5128,Resource Pack: 20 Deluxe Speed-Gro,filler,"FERTILIZER,FILLER_FARMING",
+5129,Resource Pack: 28 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5130,Resource Pack: 36 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5131,Resource Pack: 40 Deluxe Speed-Gro,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5132,Resource Pack: 2 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5133,Resource Pack: 6 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5134,Resource Pack: 10 Deluxe Fertilizer,useful,"FERTILIZER,FILLER_FARMING",
+5135,Resource Pack: 14 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5136,Resource Pack: 18 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5137,Resource Pack: 20 Deluxe Fertilizer,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5138,Resource Pack: 2 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5139,Resource Pack: 6 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5140,Resource Pack: 10 Deluxe Retaining Soil,useful,"FERTILIZER,FILLER_FARMING",
+5141,Resource Pack: 14 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5142,Resource Pack: 18 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5143,Resource Pack: 20 Deluxe Retaining Soil,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5144,Resource Pack: 2 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5145,Resource Pack: 6 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5146,Resource Pack: 10 Hyper Speed-Gro,useful,"FERTILIZER,FILLER_FARMING",
+5147,Resource Pack: 14 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5148,Resource Pack: 18 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5149,Resource Pack: 20 Hyper Speed-Gro,useful,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5150,Resource Pack: 2 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5151,Resource Pack: 6 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5152,Resource Pack: 10 Tree Fertilizer,filler,"FERTILIZER,FILLER_FARMING",
+5153,Resource Pack: 14 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5154,Resource Pack: 18 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5155,Resource Pack: 20 Tree Fertilizer,filler,"DEPRECATED,FERTILIZER,FILLER_FARMING",
+5156,Resource Pack: 10 Spring Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5157,Resource Pack: 20 Spring Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5158,Resource Pack: 30 Spring Seeds,filler,"FILLER_FARMING",
+5159,Resource Pack: 40 Spring Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5160,Resource Pack: 50 Spring Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5161,Resource Pack: 60 Spring Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5162,Resource Pack: 10 Summer Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5163,Resource Pack: 20 Summer Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5164,Resource Pack: 30 Summer Seeds,filler,"FILLER_FARMING",
+5165,Resource Pack: 40 Summer Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5166,Resource Pack: 50 Summer Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5167,Resource Pack: 60 Summer Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5168,Resource Pack: 10 Fall Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5169,Resource Pack: 20 Fall Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5170,Resource Pack: 30 Fall Seeds,filler,"FILLER_FARMING",
+5171,Resource Pack: 40 Fall Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5172,Resource Pack: 50 Fall Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5173,Resource Pack: 60 Fall Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5174,Resource Pack: 10 Winter Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5175,Resource Pack: 20 Winter Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5176,Resource Pack: 30 Winter Seeds,filler,"FILLER_FARMING",
+5177,Resource Pack: 40 Winter Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5178,Resource Pack: 50 Winter Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5179,Resource Pack: 60 Winter Seeds,filler,"DEPRECATED,FILLER_FARMING",
+5180,Resource Pack: 1 Mahogany Seed,filler,"DEPRECATED,FILLER_FARMING",
+5181,Resource Pack: 3 Mahogany Seed,filler,"DEPRECATED,FILLER_FARMING",
+5182,Resource Pack: 5 Mahogany Seed,filler,"FILLER_FARMING",
+5183,Resource Pack: 7 Mahogany Seed,filler,"DEPRECATED,FILLER_FARMING",
+5184,Resource Pack: 9 Mahogany Seed,filler,"DEPRECATED,FILLER_FARMING",
+5185,Resource Pack: 10 Mahogany Seed,filler,"DEPRECATED,FILLER_FARMING",
+5186,Resource Pack: 10 Bait,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5187,Resource Pack: 20 Bait,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5188,Resource Pack: 30 Bait,filler,"FISHING_RESOURCE,FILLER_FISHING",
+5189,Resource Pack: 40 Bait,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5190,Resource Pack: 50 Bait,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5191,Resource Pack: 60 Bait,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5192,Resource Pack: 1 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5193,Resource Pack: 2 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5194,Resource Pack: 3 Crab Pot,filler,"FISHING_RESOURCE,FILLER_FISHING",
+5195,Resource Pack: 4 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5196,Resource Pack: 5 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5197,Resource Pack: 6 Crab Pot,filler,"DEPRECATED,FISHING_RESOURCE,FILLER_FISHING",
+5198,Friendship Bonus (1 <3),useful,"DEPRECATED,FRIENDSHIP_PACK",
+5199,Friendship Bonus (2 <3),progression,"FRIENDSHIP_PACK,COMMUNITY_REWARD",
+5200,Friendship Bonus (3 <3),useful,"DEPRECATED,FRIENDSHIP_PACK",
+5201,Friendship Bonus (4 <3),useful,"DEPRECATED,FRIENDSHIP_PACK",
+5202,15 Qi Gems,progression,"GINGER_ISLAND,FILLER_CURRENCY",
+5203,Solar Panel,filler,"FILLER_MACHINE",
+5204,Geode Crusher,filler,"FILLER_MACHINE",
+5205,Farm Computer,filler,"FILLER_MACHINE",
+5206,Bone Mill,filler,"FILLER_MACHINE",
+5207,Fiber Seeds,filler,FILLER_FARMING,
+5208,Chest,filler,"FILLER_STORAGE",
+5209,Stone Chest,filler,"FILLER_STORAGE",
+5210,Quality Bobber,filler,FILLER_FISHING,
+5211,Mini-Obelisk,filler,"AT_LEAST_TWO,FILLER_QUALITY_OF_LIFE",
+5212,Monster Musk,filler,FILLER_CONSUMABLE,
+5213,Sprinkler,filler,"FILLER_FARMING",
+5214,Quality Sprinkler,filler,"FILLER_FARMING",
+5215,Iridium Sprinkler,filler,"FILLER_FARMING",
+5216,Scarecrow,filler,FILLER_FARMING,
+5217,Deluxe Scarecrow,useful,"FILLER_FARMING",
+5218,Furnace,filler,"FILLER_MACHINE",
+5219,Charcoal Kiln,filler,"FILLER_MACHINE",
+5220,Lightning Rod,filler,"FILLER_MACHINE",
+5221,Resource Pack: 5000 Money,useful,"FILLER_MONEY",
+5222,Resource Pack: 10000 Money,useful,"FILLER_MONEY",
+5223,Junimo Chest,filler,"AT_LEAST_TWO,FILLER_STORAGE",
+5224,Horse Flute,useful,"MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+5225,Pierre's Missing Stocklist,useful,"MAXIMUM_ONE,FILLER_FARMING",
+5226,Hopper,filler,"FILLER_MACHINE",
+5227,Enricher,filler,"FILLER_FARMING",
+5228,Pressure Nozzle,filler,"FILLER_FARMING",
+5229,Deconstructor,filler,"FILLER_MACHINE",
+5230,Key To The Town,useful,"MAXIMUM_ONE,FILLER_QUALITY_OF_LIFE",
+5231,Galaxy Soul,filler,"GINGER_ISLAND,FILLER_MATERIALS",
+5232,Mushroom Tree Seed,filler,"FILLER_FARMING",
+5233,Resource Pack: 20 Magic Bait,filler,"FILLER_FISHING",
+5234,Resource Pack: 10 Qi Seasoning,filler,"FILLER_CONSUMABLE",
+5235,Mr. Qi's Hat,filler,"FILLER_HAT",
+5236,Aquatic Sanctuary,filler,FILLER_DECORATION,
+5237,Leprechaun Hat,filler,"FILLER_HAT",
+5242,Exotic Double Bed,filler,FILLER_DECORATION,
+5243,Resource Pack: 2 Qi Gem,filler,"GINGER_ISLAND,FILLER_CURRENCY,DEPRECATED",
+5247,Fairy Dust,useful,"FILLER_CONSUMABLE",
+5248,Seed Maker,useful,"FILLER_MACHINE",
+5249,Keg,useful,"FILLER_MACHINE",
+5250,Cask,useful,"FILLER_MACHINE",
+5251,Preserves Jar,useful,"FILLER_MACHINE",
+5252,Bee House,useful,"FILLER_MACHINE",
+5253,Garden Pot,useful,"FILLER_FARMING",
+5254,Cheese Press,useful,"FILLER_MACHINE",
+5255,Mayonnaise Machine,useful,"FILLER_MACHINE",
+5256,Loom,useful,"FILLER_MACHINE",
+5257,Oil Maker,useful,"FILLER_MACHINE",
+5258,Recycling Machine,useful,"FILLER_MACHINE",
+5259,Worm Bin,useful,"FILLER_MACHINE",
+5260,Tapper,useful,"FILLER_MACHINE",
+5261,Heavy Tapper,useful,"FILLER_MACHINE",
+5262,Slime Incubator,useful,FILLER_MACHINE,
+5263,Slime Egg-Press,useful,FILLER_MACHINE,
+5264,Crystalarium,useful,"FILLER_MACHINE",
+5265,Ostrich Incubator,useful,"FILLER_MACHINE",
+5266,Resource Pack: 5 Staircase,filler,"FILLER_CONSUMABLE",
+5267,Auto-Petter,useful,"FILLER_QUALITY_OF_LIFE",
+5268,Auto-Grabber,useful,"FILLER_QUALITY_OF_LIFE",
+5269,Resource Pack: 10 Calico Egg,filler,"FILLER_CURRENCY",
+5270,Resource Pack: 20 Calico Egg,filler,"FILLER_CURRENCY",
+5272,Tent Kit,useful,"FILLER_QUALITY_OF_LIFE",
+5273,Resource Pack: 4 Mystery Box,filler,"FILLER_CONSUMABLE",
+5274,Prize Ticket,filler,"FILLER_CONSUMABLE",
+5275,Resource Pack: 20 Deluxe Bait,filler,"FILLER_FISHING",
+5276,Resource Pack: 2 Triple Shot Espresso,filler,"FILLER_BUFF_FOOD",
+5277,Dish O' The Sea,filler,"FILLER_BUFF_FOOD",
+5278,Seafoam Pudding,useful,"FILLER_BUFF_FOOD",
+5279,Trap Bobber,useful,"FILLER_FISHING",
+5280,Treasure Chest,filler,"FILLER_CURRENCY",
+5281,Resource Pack: 15 Mixed Seeds,filler,"FILLER_FARMING",
+5282,Resource Pack: 15 Mixed Flower Seeds,filler,"FILLER_FARMING",
+5283,Resource Pack: 5 Cherry Bomb,filler,"FILLER_CONSUMABLE",
+5284,Resource Pack: 3 Bomb,filler,"FILLER_CONSUMABLE",
+5285,Resource Pack: 2 Mega Bomb,filler,"FILLER_CONSUMABLE",
+5286,Resource Pack: 2 Life Elixir,filler,"FILLER_CONSUMABLE",
+5287,Resource Pack: 5 Coffee,filler,"FILLER_BUFF_FOOD",
+5289,Prismatic Shard,filler,"FILLER_MATERIALS",
+5290,Stardrop Tea,filler,"FILLER_CONSUMABLE",
+5291,Resource Pack: 2 Artifact Trove,filler,"FILLER_MATERIALS",
+5292,Resource Pack: 20 Cinder Shard,filler,"GINGER_ISLAND,FILLER_CURRENCY",
+5293,Workbench,useful,"FILLER_MACHINE",
+5294,Big Chest,filler,"FILLER_STORAGE",
+5295,Big Stone Chest,filler,"FILLER_STORAGE",
+5296,Dehydrator,filler,"FILLER_MACHINE",
+5297,Fish Smoker,filler,"FILLER_MACHINE",
+5298,Heavy Furnace,filler,"FILLER_MACHINE",
 10001,Luck Level,progression,SKILL_LEVEL_UP,Luck Skill
 10002,Magic Level,progression,SKILL_LEVEL_UP,Magic
 10003,Socializing Level,progression,SKILL_LEVEL_UP,Socializing Skill
@@ -942,24 +1037,25 @@ id,name,classification,groups,mod_name
 10610,T-Rex Skeleton L Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension
 10611,T-Rex Skeleton M Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension
 10612,T-Rex Skeleton R Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension
-10701,Resource Pack: 3 Magic Elixir,filler,RESOURCE_PACK,Magic
-10702,Resource Pack: 3 Travel Core,filler,RESOURCE_PACK,Magic
-10703,Preservation Chamber,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology
-10704,Hardwood Preservation Chamber,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology
-10705,Resource Pack: 3 Water Shifter,filler,RESOURCE_PACK,Archaeology
-10706,Resource Pack: 5 Hardwood Display,filler,RESOURCE_PACK,Archaeology
-10707,Resource Pack: 5 Wooden Display,filler,RESOURCE_PACK,Archaeology
-10708,Grinder,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology
-10709,Ancient Battery Production Station,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology
-10710,Hero Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10711,Aegis Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10712,Haste Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10713,Lightning Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10714,Armor Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10715,Gravity Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10716,Barbarian Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded
-10717,Restoration Table,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology
-10718,Trash Bin,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Binning Skill
-10719,Composter,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Binning Skill
-10720,Recycling Bin,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Binning Skill
-10721,Advanced Recycling Machine,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Binning Skill
+10701,Resource Pack: 3 Magic Elixir,filler,FILLER_CONSUMABLE,Magic
+10702,Resource Pack: 3 Travel Core,filler,FILLER_CONSUMABLE,Magic
+10703,Preservation Chamber,filler,"FILLER_MACHINE",Archaeology
+10704,Hardwood Preservation Chamber,filler,"FILLER_MACHINE",Archaeology
+10705,Resource Pack: 3 Water Sifter,filler,FILLER_MACHINE,Archaeology
+10706,Resource Pack: 5 Hardwood Display,filler,FILLER_MACHINE,Archaeology
+10707,Resource Pack: 5 Wooden Display,filler,FILLER_MACHINE,Archaeology
+10708,Grinder,filler,"FILLER_MACHINE",Archaeology
+10709,Ancient Battery Production Station,filler,"FILLER_MACHINE",Archaeology
+10710,Hero Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10711,Aegis Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10712,Haste Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10713,Lightning Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10714,Armor Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10715,Gravity Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10716,Barbarian Elixir,filler,FILLER_CONSUMABLE,Stardew Valley Expanded
+10717,Restoration Table,filler,"FILLER_MACHINE",Archaeology
+10718,Trash Bin,filler,"FILLER_MACHINE",Binning Skill
+10719,Composter,filler,"FILLER_MACHINE",Binning Skill
+10720,Recycling Bin,filler,"FILLER_MACHINE",Binning Skill
+10721,Advanced Recycling Machine,filler,"FILLER_MACHINE",Binning Skill
+10722,Digging Like Worms,filler,"FILLER_CONSUMABLE",Archaeology
diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv
index 14554a3bcd..9c6cffad51 100644
--- a/worlds/stardew_valley/data/locations.csv
+++ b/worlds/stardew_valley/data/locations.csv
@@ -1,4 +1,4 @@
-id,region,name,tags,mod_name
+id,region,name,tags,content_packs
 1,Crafts Room,Spring Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE",
 2,Crafts Room,Summer Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE",
 3,Crafts Room,Fall Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE",
@@ -98,8 +98,8 @@ id,region,name,tags,mod_name
 98,Vault,Carnival Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE",
 99,Vault,Walnut Hunter Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE",
 100,Vault,Qi's Helper Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE",
-101,Pierre's General Store,Large Pack,BACKPACK,
-102,Pierre's General Store,Deluxe Pack,BACKPACK,
+101,Pierre's General Store,Large Pack,"BACKPACK,BACKPACK_TIER",
+102,Pierre's General Store,Deluxe Pack,"BACKPACK,BACKPACK_TIER",
 103,Blacksmith Copper Upgrades,Copper Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE",
 104,Blacksmith Iron Upgrades,Iron Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE",
 105,Blacksmith Gold Upgrades,Gold Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE",
@@ -138,6 +138,43 @@ id,region,name,tags,mod_name
 158,Bulletin Board,Raccoon Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE",
 159,Crafts Room,Green Rain Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE",
 160,Fish Tank,Specific Fishing Bundle,"FISH_TANK_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE",
+161,Pierre's General Store,Small Pack,"BACKPACK,BACKPACK_TIER,STARTING_TOOLS",
+162,Pierre's General Store,Small Pack 1,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+163,Pierre's General Store,Small Pack 2,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+164,Pierre's General Store,Small Pack 3,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+165,Pierre's General Store,Small Pack 4,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+166,Pierre's General Store,Small Pack 5,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+167,Pierre's General Store,Small Pack 6,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+168,Pierre's General Store,Small Pack 7,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+169,Pierre's General Store,Small Pack 8,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+170,Pierre's General Store,Small Pack 9,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+171,Pierre's General Store,Small Pack 10,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+172,Pierre's General Store,Small Pack 11,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+174,Pierre's General Store,Small Pack 12,"BACKPACK,SPLIT_BACKPACK,STARTING_TOOLS",
+175,Pierre's General Store,Large Pack 1,"BACKPACK,SPLIT_BACKPACK",
+176,Pierre's General Store,Large Pack 2,"BACKPACK,SPLIT_BACKPACK",
+177,Pierre's General Store,Large Pack 3,"BACKPACK,SPLIT_BACKPACK",
+178,Pierre's General Store,Large Pack 4,"BACKPACK,SPLIT_BACKPACK",
+179,Pierre's General Store,Large Pack 5,"BACKPACK,SPLIT_BACKPACK",
+180,Pierre's General Store,Large Pack 6,"BACKPACK,SPLIT_BACKPACK",
+181,Pierre's General Store,Large Pack 7,"BACKPACK,SPLIT_BACKPACK",
+182,Pierre's General Store,Large Pack 8,"BACKPACK,SPLIT_BACKPACK",
+183,Pierre's General Store,Large Pack 9,"BACKPACK,SPLIT_BACKPACK",
+184,Pierre's General Store,Large Pack 10,"BACKPACK,SPLIT_BACKPACK",
+185,Pierre's General Store,Large Pack 11,"BACKPACK,SPLIT_BACKPACK",
+187,Pierre's General Store,Large Pack 12,"BACKPACK,SPLIT_BACKPACK",
+188,Pierre's General Store,Deluxe Pack 1,"BACKPACK,SPLIT_BACKPACK",
+189,Pierre's General Store,Deluxe Pack 2,"BACKPACK,SPLIT_BACKPACK",
+190,Pierre's General Store,Deluxe Pack 3,"BACKPACK,SPLIT_BACKPACK",
+191,Pierre's General Store,Deluxe Pack 4,"BACKPACK,SPLIT_BACKPACK",
+192,Pierre's General Store,Deluxe Pack 5,"BACKPACK,SPLIT_BACKPACK",
+193,Pierre's General Store,Deluxe Pack 6,"BACKPACK,SPLIT_BACKPACK",
+194,Pierre's General Store,Deluxe Pack 7,"BACKPACK,SPLIT_BACKPACK",
+195,Pierre's General Store,Deluxe Pack 8,"BACKPACK,SPLIT_BACKPACK",
+196,Pierre's General Store,Deluxe Pack 9,"BACKPACK,SPLIT_BACKPACK",
+197,Pierre's General Store,Deluxe Pack 10,"BACKPACK,SPLIT_BACKPACK",
+198,Pierre's General Store,Deluxe Pack 11,"BACKPACK,SPLIT_BACKPACK",
+199,Pierre's General Store,Deluxe Pack 12,"BACKPACK,SPLIT_BACKPACK",
 201,The Mines - Floor 10,The Mines Floor 10 Treasure,"MANDATORY,THE_MINES_TREASURE",
 202,The Mines - Floor 20,The Mines Floor 20 Treasure,"MANDATORY,THE_MINES_TREASURE",
 203,The Mines - Floor 40,The Mines Floor 40 Treasure,"MANDATORY,THE_MINES_TREASURE",
@@ -149,7 +186,7 @@ id,region,name,tags,mod_name
 209,The Mines - Floor 100,The Mines Floor 100 Treasure,"MANDATORY,THE_MINES_TREASURE",
 210,The Mines - Floor 110,The Mines Floor 110 Treasure,"MANDATORY,THE_MINES_TREASURE",
 211,The Mines - Floor 120,The Mines Floor 120 Treasure,"MANDATORY,THE_MINES_TREASURE",
-212,Quarry Mine,Grim Reaper statue,MANDATORY,
+212,Quarry Mine,Grim Reaper Statue,MANDATORY,
 213,The Mines,The Mines Entrance Cutscene,MANDATORY,
 214,The Mines - Floor 5,Floor 5 Elevator,ELEVATOR,
 215,The Mines - Floor 10,Floor 10 Elevator,ELEVATOR,
@@ -177,6 +214,12 @@ id,region,name,tags,mod_name
 237,The Mines - Floor 120,Floor 120 Elevator,ELEVATOR,
 250,Shipping,Demetrius's Breakthrough,MANDATORY,
 251,Volcano - Floor 10,Volcano Caldera Treasure,"GINGER_ISLAND,MANDATORY",
+252,Town,Rat Problem Cutscene,MANDATORY,
+253,Trash Bear,Trash Bear Foraging,TRASH_BEAR,
+254,Trash Bear,Trash Bear Cooking,TRASH_BEAR,
+255,Trash Bear,Trash Bear Farming,TRASH_BEAR,
+256,Trash Bear,Trash Bear Fishing,TRASH_BEAR,
+261,Crafts Room,Totems Bundle,"CRAFTS_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE",
 301,Farm,Level 1 Farming,"FARMING_LEVEL,SKILL_LEVEL",
 302,Farm,Level 2 Farming,"FARMING_LEVEL,SKILL_LEVEL",
 303,Farm,Level 3 Farming,"FARMING_LEVEL,SKILL_LEVEL",
@@ -250,56 +293,58 @@ id,region,name,tags,mod_name
 416,Carpenter Shop,Kitchen Blueprint,BUILDING_BLUEPRINT,
 417,Carpenter Shop,Kids Room Blueprint,BUILDING_BLUEPRINT,
 418,Carpenter Shop,Cellar Blueprint,BUILDING_BLUEPRINT,
-501,Town,Introductions,"STORY_QUEST",
-502,Town,How To Win Friends,"STORY_QUEST",
-503,Farm,Getting Started,"STORY_QUEST",
-504,Farm,Raising Animals,"STORY_QUEST",
-505,Farm,Advancement,"STORY_QUEST",
-506,Museum,Archaeology,"STORY_QUEST",
-507,Wizard Tower,Meet The Wizard,"STORY_QUEST",
-508,The Mines - Floor 5,Forging Ahead,"STORY_QUEST",
-509,The Mines - Floor 10,Smelting,"STORY_QUEST",
-510,The Mines - Floor 15,Initiation,"STORY_QUEST",
-511,Mountain,Robin's Lost Axe,"STORY_QUEST",
-512,Town,Jodi's Request,"STORY_QUEST",
-513,Town,"Mayor's ""Shorts""","STORY_QUEST",
-514,Mountain,Blackberry Basket,"STORY_QUEST",
-515,Marnie's Ranch,Marnie's Request,"STORY_QUEST",
-516,Town,Pam Is Thirsty,"STORY_QUEST",
-517,Wizard Tower,A Dark Reagent,"STORY_QUEST",
-518,Forest,Cow's Delight,"STORY_QUEST",
-519,Skull Cavern Entrance,The Skull Key,"STORY_QUEST",
-520,Mountain,Crop Research,"STORY_QUEST",
-521,Alex's House,Knee Therapy,"STORY_QUEST",
-522,Mountain,Robin's Request,"STORY_QUEST",
-523,Skull Cavern Floor 25,Qi's Challenge,"STORY_QUEST",
-524,Desert,The Mysterious Qi,"STORY_QUEST",
-525,Town,Carving Pumpkins,"STORY_QUEST",
-526,Town,A Winter Mystery,"STORY_QUEST",
-527,Secret Woods,Strange Note,"STORY_QUEST",
-528,Skull Cavern Floor 100,Cryptic Note,"STORY_QUEST",
-529,Town,Fresh Fruit,"STORY_QUEST",
-530,Mountain,Aquatic Research,"STORY_QUEST",
-531,Town,A Soldier's Star,"STORY_QUEST",
-532,Town,Mayor's Need,"STORY_QUEST",
-533,Saloon,Wanted: Lobster,"STORY_QUEST",
-534,Town,Pam Needs Juice,"STORY_QUEST",
-535,Sam's House,Fish Casserole,"STORY_QUEST",
-536,Beach,Catch A Squid,"STORY_QUEST",
-537,Saloon,Fish Stew,"STORY_QUEST",
-538,Pierre's General Store,Pierre's Notice,"STORY_QUEST",
-539,Clint's Blacksmith,Clint's Attempt,"STORY_QUEST",
-540,Town,A Favor For Clint,"STORY_QUEST",
-541,Wizard Tower,Staff Of Power,"STORY_QUEST",
-542,Town,Granny's Gift,"STORY_QUEST",
-543,Desert,Exotic Spirits,"STORY_QUEST",
-544,Fishing,Catch a Lingcod,"STORY_QUEST",
-545,Island West,The Pirate's Wife,"GINGER_ISLAND,STORY_QUEST",
-546,Mutant Bug Lair,Dark Talisman,"STORY_QUEST",
-547,Witch's Swamp,Goblin Problem,"STORY_QUEST",
-548,Witch's Hut,Magic Ink,"STORY_QUEST",
-549,Forest,The Giant Stump,"STORY_QUEST",
-550,Farm,Feeding Animals,"STORY_QUEST",
+419,Carpenter Shop,Pet Bowl Blueprint,BUILDING_BLUEPRINT,
+501,Town,Quest: Introductions,"STORY_QUEST",
+502,Town,Quest: How To Win Friends,"STORY_QUEST",
+503,Farm,Quest: Getting Started,"STORY_QUEST",
+504,Farm,Quest: Raising Animals,"STORY_QUEST",
+505,Farm,Quest: Advancement,"STORY_QUEST",
+506,Museum,Quest: Archaeology,"STORY_QUEST",
+507,Wizard Tower,Quest: Meet The Wizard,"STORY_QUEST",
+508,The Mines - Floor 5,Quest: Forging Ahead,"STORY_QUEST",
+509,The Mines - Floor 10,Quest: Smelting,"STORY_QUEST",
+510,The Mines - Floor 15,Quest: Initiation,"STORY_QUEST",
+511,Mountain,Quest: Robin's Lost Axe,"STORY_QUEST",
+512,Town,Quest: Jodi's Request,"STORY_QUEST",
+513,Town,"Quest: Mayor's ""Shorts""","STORY_QUEST",
+514,Mountain,Quest: Blackberry Basket,"STORY_QUEST",
+515,Marnie's Ranch,Quest: Marnie's Request,"STORY_QUEST",
+516,Town,Quest: Pam Is Thirsty,"STORY_QUEST",
+517,Wizard Tower,Quest: A Dark Reagent,"STORY_QUEST",
+518,Forest,Quest: Cow's Delight,"STORY_QUEST",
+519,Skull Cavern Entrance,Quest: The Skull Key,"STORY_QUEST",
+520,Mountain,Quest: Crop Research,"STORY_QUEST",
+521,Alex's House,Quest: Knee Therapy,"STORY_QUEST",
+522,Mountain,Quest: Robin's Request,"STORY_QUEST",
+523,Skull Cavern Floor 25,Quest: Qi's Challenge,"STORY_QUEST",
+524,Desert,Quest: The Mysterious Qi,"STORY_QUEST",
+525,Town,Quest: Carving Pumpkins,"STORY_QUEST",
+526,Town,Quest: A Winter Mystery,"STORY_QUEST",
+527,Secret Woods,Quest: Strange Note,"STORY_QUEST",
+528,Skull Cavern Floor 100,Quest: Cryptic Note,"STORY_QUEST",
+529,Town,Quest: Fresh Fruit,"STORY_QUEST",
+530,Mountain,Quest: Aquatic Research,"STORY_QUEST",
+531,Town,Quest: A Soldier's Star,"STORY_QUEST",
+532,Town,Quest: Mayor's Need,"STORY_QUEST",
+533,Saloon,Quest: Wanted: Lobster,"STORY_QUEST",
+534,Town,Quest: Pam Needs Juice,"STORY_QUEST",
+535,Sam's House,Quest: Fish Casserole,"STORY_QUEST",
+536,Beach,Quest: Catch A Squid,"STORY_QUEST",
+537,Saloon,Quest: Fish Stew,"STORY_QUEST",
+538,Pierre's General Store,Quest: Pierre's Notice,"STORY_QUEST",
+539,Clint's Blacksmith,Quest: Clint's Attempt,"STORY_QUEST",
+540,Town,Quest: A Favor For Clint,"STORY_QUEST",
+541,Wizard Tower,Quest: Staff Of Power,"STORY_QUEST",
+542,Town,Quest: Granny's Gift,"STORY_QUEST",
+543,Desert,Quest: Exotic Spirits,"STORY_QUEST",
+544,Fishing,Quest: Catch a Lingcod,"STORY_QUEST",
+545,Island West,Quest: The Pirate's Wife,"GINGER_ISLAND,STORY_QUEST",
+546,Mutant Bug Lair,Quest: Dark Talisman,"STORY_QUEST",
+547,Witch's Swamp,Quest: Goblin Problem,"STORY_QUEST",
+548,Witch's Hut,Quest: Magic Ink,"STORY_QUEST",
+549,Forest,Quest: The Giant Stump,"STORY_QUEST",
+550,Farm,Quest: Feeding Animals,"STORY_QUEST",
+551,Community Center,Quest: Rat Problem,"STORY_QUEST",
 601,JotPK World 1,JotPK: Boots 1,"ARCADE_MACHINE,JOTPK",
 602,JotPK World 1,JotPK: Boots 2,"ARCADE_MACHINE,JOTPK",
 603,JotPK World 1,JotPK: Gun 1,"ARCADE_MACHINE,JOTPK",
@@ -321,14 +366,14 @@ id,region,name,tags,mod_name
 619,Junimo Kart 3,Junimo Kart: Red Hot Rollercoaster,"ARCADE_MACHINE,JUNIMO_KART",
 620,JotPK World 3,Journey of the Prairie King Victory,"ARCADE_MACHINE_VICTORY,JOTPK",
 621,Junimo Kart 4,Junimo Kart: Sunset Speedway (Victory),"ARCADE_MACHINE_VICTORY,JUNIMO_KART",
-701,Secret Woods,Old Master Cannoli,MANDATORY,
+701,Secret Woods,Secret: Old Master Cannoli,"SECRETSANITY,EASY_SECRET",
 702,Beach,Beach Bridge Repair,MANDATORY,
 703,Desert,Galaxy Sword Shrine,MANDATORY,
 704,Farmhouse,Have a Baby,BABY,
 705,Farmhouse,Have Another Baby,BABY,
 706,Farmhouse,Spouse Stardrop,,
 707,Sewer,Krobus Stardrop,MANDATORY,
-708,Forest,Pot Of Gold,MANDATORY,
+708,Forest,Secret: Pot Of Gold,"SECRETSANITY,EASY_SECRET",
 801,Forest,Help Wanted: Gathering 1,HELP_WANTED,
 802,Forest,Help Wanted: Gathering 2,HELP_WANTED,
 803,Forest,Help Wanted: Gathering 3,HELP_WANTED,
@@ -386,26 +431,61 @@ id,region,name,tags,mod_name
 871,Town,Help Wanted: Item Delivery 31,HELP_WANTED,
 872,Town,Help Wanted: Item Delivery 32,HELP_WANTED,
 901,Traveling Cart Sunday,Traveling Merchant Sunday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-902,Traveling Cart Sunday,Traveling Merchant Sunday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-903,Traveling Cart Sunday,Traveling Merchant Sunday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+902,Traveling Cart Sunday,Traveling Merchant Sunday Item 2,"TRAVELING_MERCHANT",
+903,Traveling Cart Sunday,Traveling Merchant Sunday Item 3,"TRAVELING_MERCHANT",
+904,Traveling Cart Sunday,Traveling Merchant Sunday Item 4,"TRAVELING_MERCHANT",
+905,Traveling Cart Sunday,Traveling Merchant Sunday Item 5,"TRAVELING_MERCHANT",
+906,Traveling Cart Sunday,Traveling Merchant Sunday Item 6,"TRAVELING_MERCHANT",
+907,Traveling Cart Sunday,Traveling Merchant Sunday Item 7,"TRAVELING_MERCHANT",
+908,Traveling Cart Sunday,Traveling Merchant Sunday Item 8,"TRAVELING_MERCHANT",
 911,Traveling Cart Monday,Traveling Merchant Monday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-912,Traveling Cart Monday,Traveling Merchant Monday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-913,Traveling Cart Monday,Traveling Merchant Monday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+912,Traveling Cart Monday,Traveling Merchant Monday Item 2,"TRAVELING_MERCHANT",
+913,Traveling Cart Monday,Traveling Merchant Monday Item 3,"TRAVELING_MERCHANT",
+914,Traveling Cart Monday,Traveling Merchant Monday Item 4,"TRAVELING_MERCHANT",
+915,Traveling Cart Monday,Traveling Merchant Monday Item 5,"TRAVELING_MERCHANT",
+916,Traveling Cart Monday,Traveling Merchant Monday Item 6,"TRAVELING_MERCHANT",
+917,Traveling Cart Monday,Traveling Merchant Monday Item 7,"TRAVELING_MERCHANT",
+918,Traveling Cart Monday,Traveling Merchant Monday Item 8,"TRAVELING_MERCHANT",
 921,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-922,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-923,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+922,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 2,"TRAVELING_MERCHANT",
+923,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 3,"TRAVELING_MERCHANT",
+924,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 4,"TRAVELING_MERCHANT",
+925,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 5,"TRAVELING_MERCHANT",
+926,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 6,"TRAVELING_MERCHANT",
+927,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 7,"TRAVELING_MERCHANT",
+928,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 8,"TRAVELING_MERCHANT",
 931,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-932,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-933,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+932,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 2,"TRAVELING_MERCHANT",
+933,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 3,"TRAVELING_MERCHANT",
+934,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 4,"TRAVELING_MERCHANT",
+935,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 5,"TRAVELING_MERCHANT",
+936,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 6,"TRAVELING_MERCHANT",
+937,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 7,"TRAVELING_MERCHANT",
+938,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 8,"TRAVELING_MERCHANT",
 941,Traveling Cart Thursday,Traveling Merchant Thursday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-942,Traveling Cart Thursday,Traveling Merchant Thursday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-943,Traveling Cart Thursday,Traveling Merchant Thursday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+942,Traveling Cart Thursday,Traveling Merchant Thursday Item 2,"TRAVELING_MERCHANT",
+943,Traveling Cart Thursday,Traveling Merchant Thursday Item 3,"TRAVELING_MERCHANT",
+944,Traveling Cart Thursday,Traveling Merchant Thursday Item 4,"TRAVELING_MERCHANT",
+945,Traveling Cart Thursday,Traveling Merchant Thursday Item 5,"TRAVELING_MERCHANT",
+946,Traveling Cart Thursday,Traveling Merchant Thursday Item 6,"TRAVELING_MERCHANT",
+947,Traveling Cart Thursday,Traveling Merchant Thursday Item 7,"TRAVELING_MERCHANT",
+948,Traveling Cart Thursday,Traveling Merchant Thursday Item 8,"TRAVELING_MERCHANT",
 951,Traveling Cart Friday,Traveling Merchant Friday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-952,Traveling Cart Friday,Traveling Merchant Friday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-953,Traveling Cart Friday,Traveling Merchant Friday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+952,Traveling Cart Friday,Traveling Merchant Friday Item 2,"TRAVELING_MERCHANT",
+953,Traveling Cart Friday,Traveling Merchant Friday Item 3,"TRAVELING_MERCHANT",
+954,Traveling Cart Friday,Traveling Merchant Friday Item 4,"TRAVELING_MERCHANT",
+955,Traveling Cart Friday,Traveling Merchant Friday Item 5,"TRAVELING_MERCHANT",
+956,Traveling Cart Friday,Traveling Merchant Friday Item 6,"TRAVELING_MERCHANT",
+957,Traveling Cart Friday,Traveling Merchant Friday Item 7,"TRAVELING_MERCHANT",
+958,Traveling Cart Friday,Traveling Merchant Friday Item 8,"TRAVELING_MERCHANT",
 961,Traveling Cart Saturday,Traveling Merchant Saturday Item 1,"MANDATORY,TRAVELING_MERCHANT",
-962,Traveling Cart Saturday,Traveling Merchant Saturday Item 2,"MANDATORY,TRAVELING_MERCHANT",
-963,Traveling Cart Saturday,Traveling Merchant Saturday Item 3,"MANDATORY,TRAVELING_MERCHANT",
+962,Traveling Cart Saturday,Traveling Merchant Saturday Item 2,"TRAVELING_MERCHANT",
+963,Traveling Cart Saturday,Traveling Merchant Saturday Item 3,"TRAVELING_MERCHANT",
+964,Traveling Cart Saturday,Traveling Merchant Saturday Item 4,"TRAVELING_MERCHANT",
+965,Traveling Cart Saturday,Traveling Merchant Saturday Item 5,"TRAVELING_MERCHANT",
+966,Traveling Cart Saturday,Traveling Merchant Saturday Item 6,"TRAVELING_MERCHANT",
+967,Traveling Cart Saturday,Traveling Merchant Saturday Item 7,"TRAVELING_MERCHANT",
+968,Traveling Cart Saturday,Traveling Merchant Saturday Item 8,"TRAVELING_MERCHANT",
 1001,Fishing,Fishsanity: Carp,FISHSANITY,
 1002,Fishing,Fishsanity: Herring,FISHSANITY,
 1003,Fishing,Fishsanity: Smallmouth Bass,FISHSANITY,
@@ -1022,7 +1102,7 @@ id,region,name,tags,mod_name
 2012,Spirit's Eve,Rarecrow #2 (Witch),FESTIVAL,
 2013,Festival of Ice,Win Fishing Competition,FESTIVAL,
 2014,Festival of Ice,Rarecrow #4 (Snowman),FESTIVAL,
-2015,Night Market,Mermaid Pearl,FESTIVAL,
+2015,Night Market,Mermaid Show,FESTIVAL,
 2016,Night Market,Cone Hat,FESTIVAL_HARD,
 2017,Night Market,Iridium Fireplace,FESTIVAL_HARD,
 2018,Night Market,Rarecrow #7 (Tanuki),FESTIVAL,
@@ -1048,27 +1128,27 @@ id,region,name,tags,mod_name
 2042,Desert Festival,Mummy Mask,FESTIVAL_HARD,
 2043,Desert Festival,Calico Statue,FESTIVAL,
 2044,Desert Festival,Emily's Outfit Services,FESTIVAL,
-2045,Desert Festival,Earthy Mousse,DESERT_FESTIVAL_CHEF,
-2046,Desert Festival,Sweet Bean Cake,DESERT_FESTIVAL_CHEF,
-2047,Desert Festival,Skull Cave Casserole,DESERT_FESTIVAL_CHEF,
-2048,Desert Festival,Spicy Tacos,DESERT_FESTIVAL_CHEF,
-2049,Desert Festival,Mountain Chili,DESERT_FESTIVAL_CHEF,
-2050,Desert Festival,Crystal Cake,DESERT_FESTIVAL_CHEF,
-2051,Desert Festival,Cave Kebab,DESERT_FESTIVAL_CHEF,
-2052,Desert Festival,Hot Log,DESERT_FESTIVAL_CHEF,
-2053,Desert Festival,Sour Salad,DESERT_FESTIVAL_CHEF,
-2054,Desert Festival,Superfood Cake,DESERT_FESTIVAL_CHEF,
-2055,Desert Festival,Warrior Smoothie,DESERT_FESTIVAL_CHEF,
-2056,Desert Festival,Rumpled Fruit Skin,DESERT_FESTIVAL_CHEF,
-2057,Desert Festival,Calico Pizza,DESERT_FESTIVAL_CHEF,
-2058,Desert Festival,Stuffed Mushrooms,DESERT_FESTIVAL_CHEF,
-2059,Desert Festival,Elf Quesadilla,DESERT_FESTIVAL_CHEF,
-2060,Desert Festival,Nachos Of The Desert,DESERT_FESTIVAL_CHEF,
-2061,Desert Festival,Cioppino,DESERT_FESTIVAL_CHEF,
-2062,Desert Festival,Rainforest Shrimp,DESERT_FESTIVAL_CHEF,
-2063,Desert Festival,Shrimp Donut,DESERT_FESTIVAL_CHEF,
-2064,Desert Festival,Smell Of The Sea,DESERT_FESTIVAL_CHEF,
-2065,Desert Festival,Desert Gumbo,DESERT_FESTIVAL_CHEF,
+2045,Desert Festival,Desert Chef: Earthy Mousse,DESERT_FESTIVAL_CHEF_MEAL,
+2046,Desert Festival,Desert Chef: Sweet Bean Cake,DESERT_FESTIVAL_CHEF_MEAL,
+2047,Desert Festival,Desert Chef: Skull Cave Casserole,DESERT_FESTIVAL_CHEF_MEAL,
+2048,Desert Festival,Desert Chef: Spicy Tacos,DESERT_FESTIVAL_CHEF_MEAL,
+2049,Desert Festival,Desert Chef: Mountain Chili,DESERT_FESTIVAL_CHEF_MEAL,
+2050,Desert Festival,Desert Chef: Crystal Cake,DESERT_FESTIVAL_CHEF_MEAL,
+2051,Desert Festival,Desert Chef: Cave Kebab,DESERT_FESTIVAL_CHEF_MEAL,
+2052,Desert Festival,Desert Chef: Hot Log,DESERT_FESTIVAL_CHEF_MEAL,
+2053,Desert Festival,Desert Chef: Sour Salad,DESERT_FESTIVAL_CHEF_MEAL,
+2054,Desert Festival,Desert Chef: Superfood Cake,DESERT_FESTIVAL_CHEF_MEAL,
+2055,Desert Festival,Desert Chef: Warrior Smoothie,DESERT_FESTIVAL_CHEF_MEAL,
+2056,Desert Festival,Desert Chef: Rumpled Fruit Skin,DESERT_FESTIVAL_CHEF_MEAL,
+2057,Desert Festival,Desert Chef: Calico Pizza,DESERT_FESTIVAL_CHEF_MEAL,
+2058,Desert Festival,Desert Chef: Stuffed Mushrooms,DESERT_FESTIVAL_CHEF_MEAL,
+2059,Desert Festival,Desert Chef: Elf Quesadilla,DESERT_FESTIVAL_CHEF_MEAL,
+2060,Desert Festival,Desert Chef: Nachos Of The Desert,DESERT_FESTIVAL_CHEF_MEAL,
+2061,Desert Festival,Desert Chef: Cioppino,DESERT_FESTIVAL_CHEF_MEAL,
+2062,Desert Festival,Desert Chef: Rainforest Shrimp,DESERT_FESTIVAL_CHEF_MEAL,
+2063,Desert Festival,Desert Chef: Shrimp Donut,DESERT_FESTIVAL_CHEF_MEAL,
+2064,Desert Festival,Desert Chef: Smell Of The Sea,DESERT_FESTIVAL_CHEF_MEAL,
+2065,Desert Festival,Desert Chef: Desert Gumbo,DESERT_FESTIVAL_CHEF_MEAL,
 2066,Desert Festival,Free Cactis,FESTIVAL,
 2067,Desert Festival,Monster Hunt,FESTIVAL_HARD,
 2068,Desert Festival,Deep Dive,FESTIVAL_HARD,
@@ -1095,6 +1175,7 @@ id,region,name,tags,mod_name
 2089,SquidFest,SquidFest Day 2 Iron,FESTIVAL,
 2090,SquidFest,SquidFest Day 2 Gold,FESTIVAL_HARD,
 2091,SquidFest,SquidFest Day 2 Iridium,FESTIVAL_HARD,
+2092,Desert Festival,Desert Chef,"DESERT_FESTIVAL_CHEF",
 2101,Town,Island Ingredients,"GINGER_ISLAND,SPECIAL_ORDER_BOARD",
 2102,The Mines - Floor 75,Cave Patrol,SPECIAL_ORDER_BOARD,
 2103,Fishing,Aquatic Overpopulation,SPECIAL_ORDER_BOARD,
@@ -1731,8 +1812,8 @@ id,region,name,tags,mod_name
 2937,Shipping,Shipsanity: Deluxe Fertilizer,"GINGER_ISLAND,SHIPSANITY",
 2938,Shipping,Shipsanity: Deluxe Retaining Soil,"GINGER_ISLAND,SHIPSANITY",
 2939,Shipping,Shipsanity: Fairy Dust,"GINGER_ISLAND,SHIPSANITY",
-2940,Shipping,Shipsanity: Hyper Speed-Gro,"GINGER_ISLAND,SHIPSANITY",
-2941,Shipping,Shipsanity: Magic Bait,"GINGER_ISLAND,SHIPSANITY",
+2940,Shipping,Shipsanity: Hyper Speed-Gro,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS",
+2941,Shipping,Shipsanity: Magic Bait,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS",
 2942,Shipping,Shipsanity: Banana,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",
 2943,Shipping,Shipsanity: Mango,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",
 2944,Shipping,Shipsanity: Pineapple,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",
@@ -1793,10 +1874,10 @@ id,region,name,tags,mod_name
 3033,Adventurer's Guild,Monster Eradication: 20 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
 3034,Adventurer's Guild,Monster Eradication: 30 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
 3035,Adventurer's Guild,Monster Eradication: 40 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
-3036,Adventurer's Guild,Monster Eradication: 25 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
-3037,Adventurer's Guild,Monster Eradication: 50 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
-3038,Adventurer's Guild,Monster Eradication: 75 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
-3039,Adventurer's Guild,Monster Eradication: 100 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
+3036,Adventurer's Guild,Monster Eradication: 16 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
+3037,Adventurer's Guild,Monster Eradication: 32 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
+3038,Adventurer's Guild,Monster Eradication: 48 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
+3039,Adventurer's Guild,Monster Eradication: 64 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
 3040,Adventurer's Guild,Monster Eradication: 6 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
 3041,Adventurer's Guild,Monster Eradication: 12 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
 3042,Adventurer's Guild,Monster Eradication: 18 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS",
@@ -2014,194 +2095,194 @@ id,region,name,tags,mod_name
 3379,The Queen of Sauce,Trout Soup Recipe,"CHEFSANITY,CHEFSANITY_QOS",
 3380,Farm,Vegetable Medley Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",
 3381,Farm,Moss Soup Recipe,"CHEFSANITY,CHEFSANITY_SKILL",
-3401,Farm,Craft Cherry Bomb,CRAFTSANITY,
-3402,Farm,Craft Bomb,CRAFTSANITY,
-3403,Farm,Craft Mega Bomb,CRAFTSANITY,
-3404,Farm,Craft Gate,CRAFTSANITY,
-3405,Farm,Craft Wood Fence,CRAFTSANITY,
-3406,Farm,Craft Stone Fence,CRAFTSANITY,
-3407,Farm,Craft Iron Fence,CRAFTSANITY,
-3408,Farm,Craft Hardwood Fence,CRAFTSANITY,
-3409,Farm,Craft Sprinkler,CRAFTSANITY,
-3410,Farm,Craft Quality Sprinkler,CRAFTSANITY,
-3411,Farm,Craft Iridium Sprinkler,CRAFTSANITY,
-3412,Farm,Craft Bee House,CRAFTSANITY,
-3413,Farm,Craft Cask,CRAFTSANITY,
-3414,Farm,Craft Cheese Press,CRAFTSANITY,
-3415,Farm,Craft Keg,CRAFTSANITY,
-3416,Farm,Craft Loom,CRAFTSANITY,
-3417,Farm,Craft Mayonnaise Machine,CRAFTSANITY,
-3418,Farm,Craft Oil Maker,CRAFTSANITY,
-3419,Farm,Craft Preserves Jar,CRAFTSANITY,
-3420,Farm,Craft Basic Fertilizer,CRAFTSANITY,
-3421,Farm,Craft Quality Fertilizer,CRAFTSANITY,
-3422,Farm,Craft Deluxe Fertilizer,CRAFTSANITY,
-3423,Farm,Craft Speed-Gro,CRAFTSANITY,
-3424,Farm,Craft Deluxe Speed-Gro,CRAFTSANITY,
-3425,Farm,Craft Hyper Speed-Gro,"CRAFTSANITY,GINGER_ISLAND",
-3426,Farm,Craft Basic Retaining Soil,CRAFTSANITY,
-3427,Farm,Craft Quality Retaining Soil,CRAFTSANITY,
-3428,Farm,Craft Deluxe Retaining Soil,"CRAFTSANITY,GINGER_ISLAND",
-3429,Farm,Craft Tree Fertilizer,CRAFTSANITY,
-3430,Farm,Craft Spring Seeds,CRAFTSANITY,
-3431,Farm,Craft Summer Seeds,CRAFTSANITY,
-3432,Farm,Craft Fall Seeds,CRAFTSANITY,
-3433,Farm,Craft Winter Seeds,CRAFTSANITY,
-3434,Farm,Craft Ancient Seeds,CRAFTSANITY,
-3435,Farm,Craft Grass Starter,CRAFTSANITY,
-3436,Farm,Craft Tea Sapling,CRAFTSANITY,
-3437,Farm,Craft Fiber Seeds,CRAFTSANITY,
-3438,Farm,Craft Wood Floor,CRAFTSANITY,
-3439,Farm,Craft Rustic Plank Floor,CRAFTSANITY,
-3440,Farm,Craft Straw Floor,CRAFTSANITY,
-3441,Farm,Craft Weathered Floor,CRAFTSANITY,
-3442,Farm,Craft Crystal Floor,CRAFTSANITY,
-3443,Farm,Craft Stone Floor,CRAFTSANITY,
-3444,Farm,Craft Stone Walkway Floor,CRAFTSANITY,
-3445,Farm,Craft Brick Floor,CRAFTSANITY,
-3446,Farm,Craft Wood Path,CRAFTSANITY,
-3447,Farm,Craft Gravel Path,CRAFTSANITY,
-3448,Farm,Craft Cobblestone Path,CRAFTSANITY,
-3449,Farm,Craft Stepping Stone Path,CRAFTSANITY,
-3450,Farm,Craft Crystal Path,CRAFTSANITY,
-3451,Farm,Craft Spinner,CRAFTSANITY,
-3452,Farm,Craft Trap Bobber,CRAFTSANITY,
-3453,Farm,Craft Cork Bobber,CRAFTSANITY,
-3454,Farm,Craft Quality Bobber,CRAFTSANITY,
-3455,Farm,Craft Treasure Hunter,CRAFTSANITY,
-3456,Farm,Craft Dressed Spinner,CRAFTSANITY,
-3457,Farm,Craft Barbed Hook,CRAFTSANITY,
-3458,Farm,Craft Magnet,CRAFTSANITY,
-3459,Farm,Craft Bait,CRAFTSANITY,
-3460,Farm,Craft Wild Bait,CRAFTSANITY,
-3461,Farm,Craft Magic Bait,"CRAFTSANITY,GINGER_ISLAND",
-3462,Farm,Craft Crab Pot,CRAFTSANITY,
-3463,Farm,Craft Sturdy Ring,CRAFTSANITY,
-3464,Farm,Craft Warrior Ring,CRAFTSANITY,
-3465,Farm,Craft Ring of Yoba,CRAFTSANITY,
-3466,Farm,Craft Thorns Ring,"CRAFTSANITY,GINGER_ISLAND",
-3467,Farm,Craft Glowstone Ring,CRAFTSANITY,
-3468,Farm,Craft Iridium Band,CRAFTSANITY,
-3469,Farm,Craft Wedding Ring,CRAFTSANITY,
-3470,Farm,Craft Field Snack,CRAFTSANITY,
-3471,Farm,Craft Bug Steak,CRAFTSANITY,
-3472,Farm,Craft Life Elixir,CRAFTSANITY,
-3473,Farm,Craft Oil of Garlic,CRAFTSANITY,
-3474,Farm,Craft Monster Musk,CRAFTSANITY,
-3475,Farm,Craft Fairy Dust,"CRAFTSANITY,GINGER_ISLAND",
-3476,Farm,Craft Warp Totem: Beach,CRAFTSANITY,
-3477,Farm,Craft Warp Totem: Mountains,CRAFTSANITY,
-3478,Farm,Craft Warp Totem: Farm,CRAFTSANITY,
-3479,Farm,Craft Warp Totem: Desert,CRAFTSANITY,
-3480,Farm,Craft Warp Totem: Island,"CRAFTSANITY,GINGER_ISLAND",
-3481,Farm,Craft Rain Totem,CRAFTSANITY,
-3482,Farm,Craft Torch,CRAFTSANITY,
-3483,Farm,Craft Campfire,CRAFTSANITY,
-3484,Farm,Craft Wooden Brazier,CRAFTSANITY,
-3485,Farm,Craft Stone Brazier,CRAFTSANITY,
-3486,Farm,Craft Gold Brazier,CRAFTSANITY,
-3487,Farm,Craft Carved Brazier,CRAFTSANITY,
-3488,Farm,Craft Stump Brazier,CRAFTSANITY,
-3489,Farm,Craft Barrel Brazier,CRAFTSANITY,
-3490,Farm,Craft Skull Brazier,CRAFTSANITY,
-3491,Farm,Craft Marble Brazier,CRAFTSANITY,
-3492,Farm,Craft Wood Lamp-post,CRAFTSANITY,
-3493,Farm,Craft Iron Lamp-post,CRAFTSANITY,
-3494,Farm,Craft Jack-O-Lantern,CRAFTSANITY,
-3495,Farm,Craft Bone Mill,CRAFTSANITY,
-3496,Farm,Craft Charcoal Kiln,CRAFTSANITY,
-3497,Farm,Craft Crystalarium,CRAFTSANITY,
-3498,Farm,Craft Furnace,CRAFTSANITY,
-3499,Farm,Craft Geode Crusher,CRAFTSANITY,
-3500,Farm,Craft Heavy Tapper,"CRAFTSANITY,GINGER_ISLAND",
-3501,Farm,Craft Lightning Rod,CRAFTSANITY,
-3502,Farm,Craft Ostrich Incubator,"CRAFTSANITY,GINGER_ISLAND",
-3503,Farm,Craft Recycling Machine,CRAFTSANITY,
-3504,Farm,Craft Seed Maker,CRAFTSANITY,
-3505,Farm,Craft Slime Egg-Press,CRAFTSANITY,
-3506,Farm,Craft Slime Incubator,CRAFTSANITY,
-3507,Farm,Craft Solar Panel,"CRAFTSANITY,GINGER_ISLAND",
-3508,Farm,Craft Tapper,CRAFTSANITY,
-3509,Farm,Craft Worm Bin,CRAFTSANITY,
-3510,Farm,Craft Tub o' Flowers,CRAFTSANITY,
-3511,Farm,Craft Wicked Statue,CRAFTSANITY,
-3512,Farm,Craft Flute Block,CRAFTSANITY,
-3513,Farm,Craft Drum Block,CRAFTSANITY,
-3514,Farm,Craft Chest,CRAFTSANITY,
-3515,Farm,Craft Stone Chest,CRAFTSANITY,
-3516,Farm,Craft Wood Sign,CRAFTSANITY,
-3517,Farm,Craft Stone Sign,CRAFTSANITY,
-3518,Farm,Craft Dark Sign,CRAFTSANITY,
-3519,Farm,Craft Garden Pot,CRAFTSANITY,
-3520,Farm,Craft Scarecrow,CRAFTSANITY,
-3521,Farm,Craft Deluxe Scarecrow,CRAFTSANITY,
-3522,Farm,Craft Staircase,CRAFTSANITY,
-3523,Farm,Craft Explosive Ammo,CRAFTSANITY,
-3524,Farm,Craft Transmute (Fe),CRAFTSANITY,
-3525,Farm,Craft Transmute (Au),CRAFTSANITY,
-3526,Farm,Craft Mini-Jukebox,CRAFTSANITY,
-3527,Farm,Craft Mini-Obelisk,CRAFTSANITY,
-3528,Farm,Craft Farm Computer,CRAFTSANITY,
-3529,Farm,Craft Hopper,"CRAFTSANITY,GINGER_ISLAND",
-3530,Farm,Craft Cookout Kit,CRAFTSANITY,
-3531,Farm,Craft Fish Smoker,"CRAFTSANITY",
-3532,Farm,Craft Dehydrator,"CRAFTSANITY",
-3533,Farm,Craft Blue Grass Starter,"CRAFTSANITY,GINGER_ISLAND",
-3534,Farm,Craft Mystic Tree Seed,"CRAFTSANITY,REQUIRES_MASTERIES",
-3535,Farm,Craft Sonar Bobber,"CRAFTSANITY",
-3536,Farm,Craft Challenge Bait,"CRAFTSANITY,REQUIRES_MASTERIES",
-3537,Farm,Craft Treasure Totem,"CRAFTSANITY,REQUIRES_MASTERIES",
-3538,Farm,Craft Heavy Furnace,"CRAFTSANITY,REQUIRES_MASTERIES",
-3539,Farm,Craft Deluxe Worm Bin,"CRAFTSANITY",
-3540,Farm,Craft Mushroom Log,"CRAFTSANITY",
-3541,Farm,Craft Big Chest,"CRAFTSANITY",
-3542,Farm,Craft Big Stone Chest,"CRAFTSANITY",
-3543,Farm,Craft Text Sign,"CRAFTSANITY",
-3544,Farm,Craft Tent Kit,"CRAFTSANITY",
-3545,Farm,Craft Statue Of The Dwarf King,"CRAFTSANITY,REQUIRES_MASTERIES",
-3546,Farm,Craft Statue Of Blessings,"CRAFTSANITY,REQUIRES_MASTERIES",
-3547,Farm,Craft Anvil,"CRAFTSANITY,REQUIRES_MASTERIES",
-3548,Farm,Craft Mini-Forge,"CRAFTSANITY,GINGER_ISLAND,REQUIRES_MASTERIES",
-3549,Farm,Craft Deluxe Bait,"CRAFTSANITY",
-3550,Farm,Craft Bait Maker,"CRAFTSANITY",
-3551,Pierre's General Store,Grass Starter Recipe,CRAFTSANITY,
-3552,Carpenter Shop,Wood Floor Recipe,CRAFTSANITY,
-3553,Carpenter Shop,Rustic Plank Floor Recipe,CRAFTSANITY,
-3554,Carpenter Shop,Straw Floor Recipe,CRAFTSANITY,
-3555,Mines Dwarf Shop,Weathered Floor Recipe,CRAFTSANITY,
-3556,Sewer,Crystal Floor Recipe,CRAFTSANITY,
-3557,Carpenter Shop,Stone Floor Recipe,CRAFTSANITY,
-3558,Carpenter Shop,Stone Walkway Floor Recipe,CRAFTSANITY,
-3559,Carpenter Shop,Brick Floor Recipe,CRAFTSANITY,
-3560,Carpenter Shop,Stepping Stone Path Recipe,CRAFTSANITY,
-3561,Carpenter Shop,Crystal Path Recipe,CRAFTSANITY,
-3562,Traveling Cart,Wedding Ring Recipe,CRAFTSANITY,
-3563,Volcano Dwarf Shop,Warp Totem: Island Recipe,"CRAFTSANITY,GINGER_ISLAND",
-3564,Carpenter Shop,Wooden Brazier Recipe,CRAFTSANITY,
-3565,Carpenter Shop,Stone Brazier Recipe,CRAFTSANITY,
-3566,Carpenter Shop,Gold Brazier Recipe,CRAFTSANITY,
-3567,Carpenter Shop,Carved Brazier Recipe,CRAFTSANITY,
-3568,Carpenter Shop,Stump Brazier Recipe,CRAFTSANITY,
-3569,Carpenter Shop,Barrel Brazier Recipe,CRAFTSANITY,
-3570,Carpenter Shop,Skull Brazier Recipe,CRAFTSANITY,
-3571,Carpenter Shop,Marble Brazier Recipe,CRAFTSANITY,
-3572,Carpenter Shop,Wood Lamp-post Recipe,CRAFTSANITY,
-3573,Carpenter Shop,Iron Lamp-post Recipe,CRAFTSANITY,
-3574,Sewer,Wicked Statue Recipe,CRAFTSANITY,
-3575,Desert,Warp Totem: Desert Recipe,"CRAFTSANITY",
-3576,Island Trader,Deluxe Retaining Soil Recipe,"CRAFTSANITY,GINGER_ISLAND",
-3577,Willy's Fish Shop,Fish Smoker Recipe,CRAFTSANITY,
-3578,Pierre's General Store,Dehydrator Recipe,CRAFTSANITY,
-3579,Carpenter Shop,Big Chest Recipe,CRAFTSANITY,
-3580,Mines Dwarf Shop,Big Stone Chest Recipe,CRAFTSANITY,
-3701,Raccoon Bundles,Raccoon Request 1,"BUNDLE,RACCOON_BUNDLES",
-3702,Raccoon Bundles,Raccoon Request 2,"BUNDLE,RACCOON_BUNDLES",
-3703,Raccoon Bundles,Raccoon Request 3,"BUNDLE,RACCOON_BUNDLES",
-3704,Raccoon Bundles,Raccoon Request 4,"BUNDLE,RACCOON_BUNDLES",
-3705,Raccoon Bundles,Raccoon Request 5,"BUNDLE,RACCOON_BUNDLES",
-3706,Raccoon Bundles,Raccoon Request 6,"BUNDLE,RACCOON_BUNDLES",
-3707,Raccoon Bundles,Raccoon Request 7,"BUNDLE,RACCOON_BUNDLES",
-3708,Raccoon Bundles,Raccoon Request 8,"BUNDLE,RACCOON_BUNDLES",
+3401,Farm,Craft Cherry Bomb,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3402,Farm,Craft Bomb,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3403,Farm,Craft Mega Bomb,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3404,Farm,Craft Gate,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3405,Farm,Craft Wood Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3406,Farm,Craft Stone Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3407,Farm,Craft Iron Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3408,Farm,Craft Hardwood Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3409,Farm,Craft Sprinkler,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3410,Farm,Craft Quality Sprinkler,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3411,Farm,Craft Iridium Sprinkler,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3412,Farm,Craft Bee House,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3413,Farm,Craft Cask,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3414,Farm,Craft Cheese Press,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3415,Farm,Craft Keg,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3416,Farm,Craft Loom,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3417,Farm,Craft Mayonnaise Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3418,Farm,Craft Oil Maker,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3419,Farm,Craft Preserves Jar,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3420,Farm,Craft Basic Fertilizer,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3421,Farm,Craft Quality Fertilizer,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3422,Farm,Craft Deluxe Fertilizer,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3423,Farm,Craft Speed-Gro,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3424,Farm,Craft Deluxe Speed-Gro,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3425,Farm,Craft Hyper Speed-Gro,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+3426,Farm,Craft Basic Retaining Soil,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3427,Farm,Craft Quality Retaining Soil,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3428,Farm,Craft Deluxe Retaining Soil,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3429,Farm,Craft Tree Fertilizer,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3430,Farm,Craft Spring Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3431,Farm,Craft Summer Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3432,Farm,Craft Fall Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3433,Farm,Craft Winter Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3434,Farm,Craft Ancient Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3435,Farm,Craft Grass Starter,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3436,Farm,Craft Tea Sapling,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3437,Farm,Craft Fiber Seeds,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3438,Farm,Craft Wood Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3439,Farm,Craft Rustic Plank Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3440,Farm,Craft Straw Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3441,Farm,Craft Weathered Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3442,Farm,Craft Crystal Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3443,Farm,Craft Stone Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3444,Farm,Craft Stone Walkway Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3445,Farm,Craft Brick Floor,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3446,Farm,Craft Wood Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3447,Farm,Craft Gravel Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3448,Farm,Craft Cobblestone Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3449,Farm,Craft Stepping Stone Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3450,Farm,Craft Crystal Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3451,Farm,Craft Spinner,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3452,Farm,Craft Trap Bobber,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3453,Farm,Craft Cork Bobber,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3454,Farm,Craft Quality Bobber,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3455,Farm,Craft Treasure Hunter,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3456,Farm,Craft Dressed Spinner,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3457,Farm,Craft Barbed Hook,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3458,Farm,Craft Magnet,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3459,Farm,Craft Bait,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3460,Farm,Craft Wild Bait,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3461,Farm,Craft Magic Bait,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+3462,Farm,Craft Crab Pot,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3463,Farm,Craft Sturdy Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3464,Farm,Craft Warrior Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3465,Farm,Craft Ring of Yoba,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3466,Farm,Craft Thorns Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3467,Farm,Craft Glowstone Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3468,Farm,Craft Iridium Band,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3469,Farm,Craft Wedding Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3470,Farm,Craft Field Snack,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3471,Farm,Craft Bug Steak,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3472,Farm,Craft Life Elixir,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3473,Farm,Craft Oil of Garlic,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3474,Farm,Craft Monster Musk,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3475,Farm,Craft Fairy Dust,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3476,Farm,Craft Warp Totem: Beach,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3477,Farm,Craft Warp Totem: Mountains,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3478,Farm,Craft Warp Totem: Farm,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3479,Farm,Craft Warp Totem: Desert,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3480,Farm,Craft Warp Totem: Island,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3481,Farm,Craft Rain Totem,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3482,Farm,Craft Torch,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3483,Farm,Craft Campfire,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3484,Farm,Craft Wooden Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3485,Farm,Craft Stone Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3486,Farm,Craft Gold Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3487,Farm,Craft Carved Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3488,Farm,Craft Stump Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3489,Farm,Craft Barrel Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3490,Farm,Craft Skull Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3491,Farm,Craft Marble Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3492,Farm,Craft Wood Lamp-post,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3493,Farm,Craft Iron Lamp-post,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3494,Farm,Craft Jack-O-Lantern,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3495,Farm,Craft Bone Mill,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3496,Farm,Craft Charcoal Kiln,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3497,Farm,Craft Crystalarium,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3498,Farm,Craft Furnace,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3499,Farm,Craft Geode Crusher,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3500,Farm,Craft Heavy Tapper,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+3501,Farm,Craft Lightning Rod,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3502,Farm,Craft Ostrich Incubator,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3503,Farm,Craft Recycling Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3504,Farm,Craft Seed Maker,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3505,Farm,Craft Slime Egg-Press,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3506,Farm,Craft Slime Incubator,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3507,Farm,Craft Solar Panel,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3508,Farm,Craft Tapper,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3509,Farm,Craft Worm Bin,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3510,Farm,Craft Tub o' Flowers,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3511,Farm,Craft Wicked Statue,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3512,Farm,Craft Flute Block,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3513,Farm,Craft Drum Block,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3514,Farm,Craft Chest,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3515,Farm,Craft Stone Chest,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3516,Farm,Craft Wood Sign,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3517,Farm,Craft Stone Sign,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3518,Farm,Craft Dark Sign,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3519,Farm,Craft Garden Pot,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3520,Farm,Craft Scarecrow,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3521,Farm,Craft Deluxe Scarecrow,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3522,Farm,Craft Staircase,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3523,Farm,Craft Explosive Ammo,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3524,Farm,Craft Transmute (Fe),"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3525,Farm,Craft Transmute (Au),"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3526,Farm,Craft Mini-Jukebox,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3527,Farm,Craft Mini-Obelisk,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3528,Farm,Craft Farm Computer,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3529,Farm,Craft Hopper,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+3530,Farm,Craft Cookout Kit,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3531,Farm,Craft Fish Smoker,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3532,Farm,Craft Dehydrator,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3533,Farm,Craft Blue Grass Starter,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",
+3534,Farm,Craft Mystic Tree Seed,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3535,Farm,Craft Sonar Bobber,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3536,Farm,Craft Challenge Bait,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3537,Farm,Craft Treasure Totem,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3538,Farm,Craft Heavy Furnace,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3539,Farm,Craft Deluxe Worm Bin,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3540,Farm,Craft Mushroom Log,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3541,Farm,Craft Big Chest,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3542,Farm,Craft Big Stone Chest,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3543,Farm,Craft Text Sign,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3544,Farm,Craft Tent Kit,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3545,Farm,Craft Statue Of The Dwarf King,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3546,Farm,Craft Statue Of Blessings,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3547,Farm,Craft Anvil,"CRAFTSANITY,CRAFTSANITY_CRAFT,REQUIRES_MASTERIES",
+3548,Farm,Craft Mini-Forge,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_MASTERIES",
+3549,Farm,Craft Deluxe Bait,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3550,Farm,Craft Bait Maker,"CRAFTSANITY,CRAFTSANITY_CRAFT",
+3551,Pierre's General Store,Grass Starter Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3552,Carpenter Shop,Wood Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3553,Carpenter Shop,Rustic Plank Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3554,Carpenter Shop,Straw Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3555,Mines Dwarf Shop,Weathered Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3556,Sewer,Crystal Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3557,Carpenter Shop,Stone Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3558,Carpenter Shop,Stone Walkway Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3559,Carpenter Shop,Brick Floor Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3560,Carpenter Shop,Stepping Stone Path Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3561,Carpenter Shop,Crystal Path Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3562,Traveling Cart,Wedding Ring Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3563,Volcano Dwarf Shop,Warp Totem: Island Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE,GINGER_ISLAND",
+3564,Carpenter Shop,Wooden Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3565,Carpenter Shop,Stone Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3566,Carpenter Shop,Gold Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3567,Carpenter Shop,Carved Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3568,Carpenter Shop,Stump Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3569,Carpenter Shop,Barrel Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3570,Carpenter Shop,Skull Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3571,Carpenter Shop,Marble Brazier Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3572,Carpenter Shop,Wood Lamp-post Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3573,Carpenter Shop,Iron Lamp-post Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3574,Sewer,Wicked Statue Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3575,Desert,Warp Totem: Desert Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3576,Island Trader,Deluxe Retaining Soil Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE,GINGER_ISLAND",
+3577,Willy's Fish Shop,Fish Smoker Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3578,Pierre's General Store,Dehydrator Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3579,Carpenter Shop,Big Chest Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3580,Mines Dwarf Shop,Big Stone Chest Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",
+3701,Raccoon Request 1,Raccoon Request 1,"BUNDLE,RACCOON_BUNDLES",
+3702,Raccoon Request 2,Raccoon Request 2,"BUNDLE,RACCOON_BUNDLES",
+3703,Raccoon Request 3,Raccoon Request 3,"BUNDLE,RACCOON_BUNDLES",
+3704,Raccoon Request 4,Raccoon Request 4,"BUNDLE,RACCOON_BUNDLES",
+3705,Raccoon Request 5,Raccoon Request 5,"BUNDLE,RACCOON_BUNDLES",
+3706,Raccoon Request 6,Raccoon Request 6,"BUNDLE,RACCOON_BUNDLES",
+3707,Raccoon Request 7,Raccoon Request 7,"BUNDLE,RACCOON_BUNDLES",
+3708,Raccoon Request 8,Raccoon Request 8,"BUNDLE,RACCOON_BUNDLES",
 3801,Shipping,Shipsanity: Goby,"SHIPSANITY,SHIPSANITY_FISH",
 3802,Shipping,Shipsanity: Fireworks (Red),"SHIPSANITY",
 3803,Shipping,Shipsanity: Fireworks (Purple),"SHIPSANITY",
@@ -2298,7 +2379,7 @@ id,region,name,tags,mod_name
 4051,Museum,Read Tips on Farming,"BOOKSANITY,BOOKSANITY_LOST",
 4052,Museum,Read This is a book by Marnie,"BOOKSANITY,BOOKSANITY_LOST",
 4053,Museum,Read On Foraging,"BOOKSANITY,BOOKSANITY_LOST",
-4054,Museum,"Read The Fisherman, Act 1","BOOKSANITY,BOOKSANITY_LOST",
+4054,Museum,"Read The Fisherman, Act I","BOOKSANITY,BOOKSANITY_LOST",
 4055,Museum,Read How Deep do the mines go?,"BOOKSANITY,BOOKSANITY_LOST",
 4056,Museum,Read An Old Farmer's Journal,"BOOKSANITY,BOOKSANITY_LOST",
 4057,Museum,Read Scarecrows,"BOOKSANITY,BOOKSANITY_LOST",
@@ -2410,883 +2491,1548 @@ id,region,name,tags,mod_name
 4192,Pirate Cove,Walnutsanity: Pirate Darts 2,"WALNUTSANITY,WALNUTSANITY_PUZZLE",
 4193,Pirate Cove,Walnutsanity: Pirate Darts 3,"WALNUTSANITY,WALNUTSANITY_PUZZLE",
 4194,Pirate Cove,Walnutsanity: Pirate Cove Patch Of Sand,"WALNUTSANITY,WALNUTSANITY_DIG",
-5001,Stardew Valley,Level 1 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5002,Stardew Valley,Level 2 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5003,Stardew Valley,Level 3 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5004,Stardew Valley,Level 4 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5005,Stardew Valley,Level 5 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5006,Stardew Valley,Level 6 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5007,Stardew Valley,Level 7 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5008,Stardew Valley,Level 8 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5009,Stardew Valley,Level 9 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5010,Stardew Valley,Level 10 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
-5011,Stardew Valley,Level 1 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5012,Stardew Valley,Level 2 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5013,Stardew Valley,Level 3 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5014,Stardew Valley,Level 4 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5015,Stardew Valley,Level 5 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5016,Stardew Valley,Level 6 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5017,Stardew Valley,Level 7 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5018,Stardew Valley,Level 8 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5019,Stardew Valley,Level 9 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5020,Stardew Valley,Level 10 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
-5021,Magic Altar,Level 1 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5022,Magic Altar,Level 2 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5023,Magic Altar,Level 3 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5024,Magic Altar,Level 4 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5025,Magic Altar,Level 5 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5026,Magic Altar,Level 6 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5027,Magic Altar,Level 7 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5028,Magic Altar,Level 8 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5029,Magic Altar,Level 9 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5030,Magic Altar,Level 10 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
-5031,Town,Level 1 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5032,Town,Level 2 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5033,Town,Level 3 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5034,Town,Level 4 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5035,Town,Level 5 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5036,Town,Level 6 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5037,Town,Level 7 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5038,Town,Level 8 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5039,Town,Level 9 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5040,Town,Level 10 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
-5041,Stardew Valley,Level 1 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5042,Stardew Valley,Level 2 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5043,Stardew Valley,Level 3 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5044,Stardew Valley,Level 4 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5045,Stardew Valley,Level 5 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5046,Stardew Valley,Level 6 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5047,Stardew Valley,Level 7 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5048,Stardew Valley,Level 8 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5049,Stardew Valley,Level 9 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5050,Stardew Valley,Level 10 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
-5051,Stardew Valley,Level 1 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5052,Stardew Valley,Level 2 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5053,Stardew Valley,Level 3 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5054,Stardew Valley,Level 4 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5055,Stardew Valley,Level 5 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5056,Stardew Valley,Level 6 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5057,Stardew Valley,Level 7 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5058,Stardew Valley,Level 8 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5059,Stardew Valley,Level 9 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5060,Stardew Valley,Level 10 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
-5501,Magic Altar,Analyze: Clear Debris,MANDATORY,Magic
-5502,Magic Altar,Analyze: Till,MANDATORY,Magic
-5503,Magic Altar,Analyze: Water,MANDATORY,Magic
-5504,Magic Altar,Analyze All Toil School Locations,MANDATORY,Magic
-5505,Magic Altar,Analyze: Evac,MANDATORY,Magic
-5506,Magic Altar,Analyze: Haste,MANDATORY,Magic
-5507,Magic Altar,Analyze: Heal,MANDATORY,Magic
-5508,Magic Altar,Analyze All Life School Locations,MANDATORY,Magic
-5509,Magic Altar,Analyze: Descend,MANDATORY,Magic
-5510,Magic Altar,Analyze: Fireball,MANDATORY,Magic
-5511,Magic Altar,Analyze: Frostbolt,MANDATORY,Magic
-5512,Magic Altar,Analyze All Elemental School Locations,MANDATORY,Magic
-5513,Magic Altar,Analyze: Lantern,MANDATORY,Magic
-5514,Magic Altar,Analyze: Tendrils,MANDATORY,Magic
-5515,Magic Altar,Analyze: Shockwave,MANDATORY,Magic
-5516,Magic Altar,Analyze All Nature School Locations,MANDATORY,Magic
-5517,Magic Altar,Analyze: Meteor,MANDATORY,Magic
-5518,Magic Altar,Analyze: Lucksteal,MANDATORY,Magic
-5519,Magic Altar,Analyze: Bloodmana,MANDATORY,Magic
-5520,Magic Altar,Analyze All Eldritch School Locations,MANDATORY,Magic
-5521,Magic Altar,Analyze Every Magic School Location,MANDATORY,Magic
-6001,Museum,Friendsanity: Jasper 1 <3,FRIENDSANITY,Professor Jasper Thomas
-6002,Museum,Friendsanity: Jasper 2 <3,FRIENDSANITY,Professor Jasper Thomas
-6003,Museum,Friendsanity: Jasper 3 <3,FRIENDSANITY,Professor Jasper Thomas
-6004,Museum,Friendsanity: Jasper 4 <3,FRIENDSANITY,Professor Jasper Thomas
-6005,Museum,Friendsanity: Jasper 5 <3,FRIENDSANITY,Professor Jasper Thomas
-6006,Museum,Friendsanity: Jasper 6 <3,FRIENDSANITY,Professor Jasper Thomas
-6007,Museum,Friendsanity: Jasper 7 <3,FRIENDSANITY,Professor Jasper Thomas
-6008,Museum,Friendsanity: Jasper 8 <3,FRIENDSANITY,Professor Jasper Thomas
-6009,Museum,Friendsanity: Jasper 9 <3,FRIENDSANITY,Professor Jasper Thomas
-6010,Museum,Friendsanity: Jasper 10 <3,FRIENDSANITY,Professor Jasper Thomas
-6011,Museum,Friendsanity: Jasper 11 <3,FRIENDSANITY,Professor Jasper Thomas
-6012,Museum,Friendsanity: Jasper 12 <3,FRIENDSANITY,Professor Jasper Thomas
-6013,Museum,Friendsanity: Jasper 13 <3,FRIENDSANITY,Professor Jasper Thomas
-6014,Museum,Friendsanity: Jasper 14 <3,FRIENDSANITY,Professor Jasper Thomas
-6015,Yoba's Clearing,Friendsanity: Yoba 1 <3,FRIENDSANITY,Custom NPC - Yoba
-6016,Yoba's Clearing,Friendsanity: Yoba 2 <3,FRIENDSANITY,Custom NPC - Yoba
-6017,Yoba's Clearing,Friendsanity: Yoba 3 <3,FRIENDSANITY,Custom NPC - Yoba
-6018,Yoba's Clearing,Friendsanity: Yoba 4 <3,FRIENDSANITY,Custom NPC - Yoba
-6019,Yoba's Clearing,Friendsanity: Yoba 5 <3,FRIENDSANITY,Custom NPC - Yoba
-6020,Yoba's Clearing,Friendsanity: Yoba 6 <3,FRIENDSANITY,Custom NPC - Yoba
-6021,Yoba's Clearing,Friendsanity: Yoba 7 <3,FRIENDSANITY,Custom NPC - Yoba
-6022,Yoba's Clearing,Friendsanity: Yoba 8 <3,FRIENDSANITY,Custom NPC - Yoba
-6023,Yoba's Clearing,Friendsanity: Yoba 9 <3,FRIENDSANITY,Custom NPC - Yoba
-6024,Yoba's Clearing,Friendsanity: Yoba 10 <3,FRIENDSANITY,Custom NPC - Yoba
-6025,Marnie's Ranch,Friendsanity: Mr. Ginger 1 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6026,Marnie's Ranch,Friendsanity: Mr. Ginger 2 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6027,Marnie's Ranch,Friendsanity: Mr. Ginger 3 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6028,Marnie's Ranch,Friendsanity: Mr. Ginger 4 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6029,Marnie's Ranch,Friendsanity: Mr. Ginger 5 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6030,Marnie's Ranch,Friendsanity: Mr. Ginger 6 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6031,Marnie's Ranch,Friendsanity: Mr. Ginger 7 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6032,Marnie's Ranch,Friendsanity: Mr. Ginger 8 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6033,Marnie's Ranch,Friendsanity: Mr. Ginger 9 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6034,Marnie's Ranch,Friendsanity: Mr. Ginger 10 <3,FRIENDSANITY,Mister Ginger (cat npc)
-6035,Town,Friendsanity: Ayeisha 1 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6036,Town,Friendsanity: Ayeisha 2 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6037,Town,Friendsanity: Ayeisha 3 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6038,Town,Friendsanity: Ayeisha 4 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6039,Town,Friendsanity: Ayeisha 5 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6040,Town,Friendsanity: Ayeisha 6 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6041,Town,Friendsanity: Ayeisha 7 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6042,Town,Friendsanity: Ayeisha 8 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6043,Town,Friendsanity: Ayeisha 9 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6044,Town,Friendsanity: Ayeisha 10 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
-6045,Saloon,Friendsanity: Shiko 1 <3,FRIENDSANITY,Shiko - New Custom NPC
-6046,Saloon,Friendsanity: Shiko 2 <3,FRIENDSANITY,Shiko - New Custom NPC
-6047,Saloon,Friendsanity: Shiko 3 <3,FRIENDSANITY,Shiko - New Custom NPC
-6048,Saloon,Friendsanity: Shiko 4 <3,FRIENDSANITY,Shiko - New Custom NPC
-6049,Saloon,Friendsanity: Shiko 5 <3,FRIENDSANITY,Shiko - New Custom NPC
-6050,Saloon,Friendsanity: Shiko 6 <3,FRIENDSANITY,Shiko - New Custom NPC
-6051,Saloon,Friendsanity: Shiko 7 <3,FRIENDSANITY,Shiko - New Custom NPC
-6052,Saloon,Friendsanity: Shiko 8 <3,FRIENDSANITY,Shiko - New Custom NPC
-6053,Saloon,Friendsanity: Shiko 9 <3,FRIENDSANITY,Shiko - New Custom NPC
-6054,Saloon,Friendsanity: Shiko 10 <3,FRIENDSANITY,Shiko - New Custom NPC
-6055,Saloon,Friendsanity: Shiko 11 <3,FRIENDSANITY,Shiko - New Custom NPC
-6056,Saloon,Friendsanity: Shiko 12 <3,FRIENDSANITY,Shiko - New Custom NPC
-6057,Saloon,Friendsanity: Shiko 13 <3,FRIENDSANITY,Shiko - New Custom NPC
-6058,Saloon,Friendsanity: Shiko 14 <3,FRIENDSANITY,Shiko - New Custom NPC
-6059,Wizard Tower,Friendsanity: Wellwick 1 <3,FRIENDSANITY,'Prophet' Wellwick
-6060,Wizard Tower,Friendsanity: Wellwick 2 <3,FRIENDSANITY,'Prophet' Wellwick
-6061,Wizard Tower,Friendsanity: Wellwick 3 <3,FRIENDSANITY,'Prophet' Wellwick
-6062,Wizard Tower,Friendsanity: Wellwick 4 <3,FRIENDSANITY,'Prophet' Wellwick
-6063,Wizard Tower,Friendsanity: Wellwick 5 <3,FRIENDSANITY,'Prophet' Wellwick
-6064,Wizard Tower,Friendsanity: Wellwick 6 <3,FRIENDSANITY,'Prophet' Wellwick
-6065,Wizard Tower,Friendsanity: Wellwick 7 <3,FRIENDSANITY,'Prophet' Wellwick
-6066,Wizard Tower,Friendsanity: Wellwick 8 <3,FRIENDSANITY,'Prophet' Wellwick
-6067,Wizard Tower,Friendsanity: Wellwick 9 <3,FRIENDSANITY,'Prophet' Wellwick
-6068,Wizard Tower,Friendsanity: Wellwick 10 <3,FRIENDSANITY,'Prophet' Wellwick
-6069,Wizard Tower,Friendsanity: Wellwick 11 <3,FRIENDSANITY,'Prophet' Wellwick
-6070,Wizard Tower,Friendsanity: Wellwick 12 <3,FRIENDSANITY,'Prophet' Wellwick
-6071,Wizard Tower,Friendsanity: Wellwick 13 <3,FRIENDSANITY,'Prophet' Wellwick
-6072,Wizard Tower,Friendsanity: Wellwick 14 <3,FRIENDSANITY,'Prophet' Wellwick
-6073,Forest,Friendsanity: Delores 1 <3,FRIENDSANITY,Delores - Custom NPC
-6074,Forest,Friendsanity: Delores 2 <3,FRIENDSANITY,Delores - Custom NPC
-6075,Forest,Friendsanity: Delores 3 <3,FRIENDSANITY,Delores - Custom NPC
-6076,Forest,Friendsanity: Delores 4 <3,FRIENDSANITY,Delores - Custom NPC
-6077,Forest,Friendsanity: Delores 5 <3,FRIENDSANITY,Delores - Custom NPC
-6078,Forest,Friendsanity: Delores 6 <3,FRIENDSANITY,Delores - Custom NPC
-6079,Forest,Friendsanity: Delores 7 <3,FRIENDSANITY,Delores - Custom NPC
-6080,Forest,Friendsanity: Delores 8 <3,FRIENDSANITY,Delores - Custom NPC
-6081,Forest,Friendsanity: Delores 9 <3,FRIENDSANITY,Delores - Custom NPC
-6082,Forest,Friendsanity: Delores 10 <3,FRIENDSANITY,Delores - Custom NPC
-6083,Forest,Friendsanity: Delores 11 <3,FRIENDSANITY,Delores - Custom NPC
-6084,Forest,Friendsanity: Delores 12 <3,FRIENDSANITY,Delores - Custom NPC
-6085,Forest,Friendsanity: Delores 13 <3,FRIENDSANITY,Delores - Custom NPC
-6086,Forest,Friendsanity: Delores 14 <3,FRIENDSANITY,Delores - Custom NPC
-6087,Alec's Pet Shop,Friendsanity: Alec 1 <3,FRIENDSANITY,Alec Revisited
-6088,Alec's Pet Shop,Friendsanity: Alec 2 <3,FRIENDSANITY,Alec Revisited
-6089,Alec's Pet Shop,Friendsanity: Alec 3 <3,FRIENDSANITY,Alec Revisited
-6090,Alec's Pet Shop,Friendsanity: Alec 4 <3,FRIENDSANITY,Alec Revisited
-6091,Alec's Pet Shop,Friendsanity: Alec 5 <3,FRIENDSANITY,Alec Revisited
-6092,Alec's Pet Shop,Friendsanity: Alec 6 <3,FRIENDSANITY,Alec Revisited
-6093,Alec's Pet Shop,Friendsanity: Alec 7 <3,FRIENDSANITY,Alec Revisited
-6094,Alec's Pet Shop,Friendsanity: Alec 8 <3,FRIENDSANITY,Alec Revisited
-6095,Alec's Pet Shop,Friendsanity: Alec 9 <3,FRIENDSANITY,Alec Revisited
-6096,Alec's Pet Shop,Friendsanity: Alec 10 <3,FRIENDSANITY,Alec Revisited
-6097,Alec's Pet Shop,Friendsanity: Alec 11 <3,FRIENDSANITY,Alec Revisited
-6098,Alec's Pet Shop,Friendsanity: Alec 12 <3,FRIENDSANITY,Alec Revisited
-6099,Alec's Pet Shop,Friendsanity: Alec 13 <3,FRIENDSANITY,Alec Revisited
-6100,Alec's Pet Shop,Friendsanity: Alec 14 <3,FRIENDSANITY,Alec Revisited
-6101,Eugene's Garden,Friendsanity: Eugene 1 <3,FRIENDSANITY,Custom NPC Eugene
-6102,Eugene's Garden,Friendsanity: Eugene 2 <3,FRIENDSANITY,Custom NPC Eugene
-6103,Eugene's Garden,Friendsanity: Eugene 3 <3,FRIENDSANITY,Custom NPC Eugene
-6104,Eugene's Garden,Friendsanity: Eugene 4 <3,FRIENDSANITY,Custom NPC Eugene
-6105,Eugene's Garden,Friendsanity: Eugene 5 <3,FRIENDSANITY,Custom NPC Eugene
-6106,Eugene's Garden,Friendsanity: Eugene 6 <3,FRIENDSANITY,Custom NPC Eugene
-6107,Eugene's Garden,Friendsanity: Eugene 7 <3,FRIENDSANITY,Custom NPC Eugene
-6108,Eugene's Garden,Friendsanity: Eugene 8 <3,FRIENDSANITY,Custom NPC Eugene
-6109,Eugene's Garden,Friendsanity: Eugene 9 <3,FRIENDSANITY,Custom NPC Eugene
-6110,Eugene's Garden,Friendsanity: Eugene 10 <3,FRIENDSANITY,Custom NPC Eugene
-6111,Eugene's Garden,Friendsanity: Eugene 11 <3,FRIENDSANITY,Custom NPC Eugene
-6112,Eugene's Garden,Friendsanity: Eugene 12 <3,FRIENDSANITY,Custom NPC Eugene
-6113,Eugene's Garden,Friendsanity: Eugene 13 <3,FRIENDSANITY,Custom NPC Eugene
-6114,Eugene's Garden,Friendsanity: Eugene 14 <3,FRIENDSANITY,Custom NPC Eugene
-6115,Forest,Friendsanity: Juna 1 <3,FRIENDSANITY,Juna - Roommate NPC
-6116,Forest,Friendsanity: Juna 2 <3,FRIENDSANITY,Juna - Roommate NPC
-6117,Forest,Friendsanity: Juna 3 <3,FRIENDSANITY,Juna - Roommate NPC
-6118,Forest,Friendsanity: Juna 4 <3,FRIENDSANITY,Juna - Roommate NPC
-6119,Forest,Friendsanity: Juna 5 <3,FRIENDSANITY,Juna - Roommate NPC
-6120,Forest,Friendsanity: Juna 6 <3,FRIENDSANITY,Juna - Roommate NPC
-6121,Forest,Friendsanity: Juna 7 <3,FRIENDSANITY,Juna - Roommate NPC
-6122,Forest,Friendsanity: Juna 8 <3,FRIENDSANITY,Juna - Roommate NPC
-6123,Forest,Friendsanity: Juna 9 <3,FRIENDSANITY,Juna - Roommate NPC
-6124,Forest,Friendsanity: Juna 10 <3,FRIENDSANITY,Juna - Roommate NPC
-6125,Riley's House,Friendsanity: Riley 1 <3,FRIENDSANITY,Custom NPC - Riley
-6126,Riley's House,Friendsanity: Riley 2 <3,FRIENDSANITY,Custom NPC - Riley
-6127,Riley's House,Friendsanity: Riley 3 <3,FRIENDSANITY,Custom NPC - Riley
-6128,Riley's House,Friendsanity: Riley 4 <3,FRIENDSANITY,Custom NPC - Riley
-6129,Riley's House,Friendsanity: Riley 5 <3,FRIENDSANITY,Custom NPC - Riley
-6130,Riley's House,Friendsanity: Riley 6 <3,FRIENDSANITY,Custom NPC - Riley
-6131,Riley's House,Friendsanity: Riley 7 <3,FRIENDSANITY,Custom NPC - Riley
-6132,Riley's House,Friendsanity: Riley 8 <3,FRIENDSANITY,Custom NPC - Riley
-6133,Riley's House,Friendsanity: Riley 9 <3,FRIENDSANITY,Custom NPC - Riley
-6134,Riley's House,Friendsanity: Riley 10 <3,FRIENDSANITY,Custom NPC - Riley
-6135,Riley's House,Friendsanity: Riley 11 <3,FRIENDSANITY,Custom NPC - Riley
-6136,Riley's House,Friendsanity: Riley 12 <3,FRIENDSANITY,Custom NPC - Riley
-6137,Riley's House,Friendsanity: Riley 13 <3,FRIENDSANITY,Custom NPC - Riley
-6138,Riley's House,Friendsanity: Riley 14 <3,FRIENDSANITY,Custom NPC - Riley
-6139,JojaMart,Friendsanity: Claire 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6140,JojaMart,Friendsanity: Claire 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6141,JojaMart,Friendsanity: Claire 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6142,JojaMart,Friendsanity: Claire 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6143,JojaMart,Friendsanity: Claire 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6144,JojaMart,Friendsanity: Claire 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6145,JojaMart,Friendsanity: Claire 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6146,JojaMart,Friendsanity: Claire 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6147,JojaMart,Friendsanity: Claire 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6148,JojaMart,Friendsanity: Claire 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6149,JojaMart,Friendsanity: Claire 11 <3,FRIENDSANITY,Stardew Valley Expanded
-6150,JojaMart,Friendsanity: Claire 12 <3,FRIENDSANITY,Stardew Valley Expanded
-6151,JojaMart,Friendsanity: Claire 13 <3,FRIENDSANITY,Stardew Valley Expanded
-6152,JojaMart,Friendsanity: Claire 14 <3,FRIENDSANITY,Stardew Valley Expanded
-6153,Galmoran Outpost,Friendsanity: Lance 1 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6154,Galmoran Outpost,Friendsanity: Lance 2 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6155,Galmoran Outpost,Friendsanity: Lance 3 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6156,Galmoran Outpost,Friendsanity: Lance 4 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6157,Galmoran Outpost,Friendsanity: Lance 5 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6158,Galmoran Outpost,Friendsanity: Lance 6 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6159,Galmoran Outpost,Friendsanity: Lance 7 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6160,Galmoran Outpost,Friendsanity: Lance 8 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6161,Galmoran Outpost,Friendsanity: Lance 9 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6162,Galmoran Outpost,Friendsanity: Lance 10 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6163,Galmoran Outpost,Friendsanity: Lance 11 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6164,Galmoran Outpost,Friendsanity: Lance 12 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6165,Galmoran Outpost,Friendsanity: Lance 13 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6166,Galmoran Outpost,Friendsanity: Lance 14 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
-6167,Jenkins' Residence,Friendsanity: Olivia 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6168,Jenkins' Residence,Friendsanity: Olivia 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6169,Jenkins' Residence,Friendsanity: Olivia 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6170,Jenkins' Residence,Friendsanity: Olivia 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6171,Jenkins' Residence,Friendsanity: Olivia 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6172,Jenkins' Residence,Friendsanity: Olivia 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6173,Jenkins' Residence,Friendsanity: Olivia 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6174,Jenkins' Residence,Friendsanity: Olivia 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6175,Jenkins' Residence,Friendsanity: Olivia 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6176,Jenkins' Residence,Friendsanity: Olivia 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6177,Jenkins' Residence,Friendsanity: Olivia 11 <3,FRIENDSANITY,Stardew Valley Expanded
-6178,Jenkins' Residence,Friendsanity: Olivia 12 <3,FRIENDSANITY,Stardew Valley Expanded
-6179,Jenkins' Residence,Friendsanity: Olivia 13 <3,FRIENDSANITY,Stardew Valley Expanded
-6180,Jenkins' Residence,Friendsanity: Olivia 14 <3,FRIENDSANITY,Stardew Valley Expanded
-6181,Wizard Tower,Friendsanity: Wizard 11 <3,FRIENDSANITY,Stardew Valley Expanded
-6182,Wizard Tower,Friendsanity: Wizard 12 <3,FRIENDSANITY,Stardew Valley Expanded
-6183,Wizard Tower,Friendsanity: Wizard 13 <3,FRIENDSANITY,Stardew Valley Expanded
-6184,Wizard Tower,Friendsanity: Wizard 14 <3,FRIENDSANITY,Stardew Valley Expanded
-6185,Blue Moon Vineyard,Friendsanity: Sophia 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6186,Blue Moon Vineyard,Friendsanity: Sophia 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6187,Blue Moon Vineyard,Friendsanity: Sophia 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6188,Blue Moon Vineyard,Friendsanity: Sophia 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6189,Blue Moon Vineyard,Friendsanity: Sophia 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6190,Blue Moon Vineyard,Friendsanity: Sophia 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6191,Blue Moon Vineyard,Friendsanity: Sophia 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6192,Blue Moon Vineyard,Friendsanity: Sophia 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6193,Blue Moon Vineyard,Friendsanity: Sophia 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6194,Blue Moon Vineyard,Friendsanity: Sophia 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6195,Blue Moon Vineyard,Friendsanity: Sophia 11 <3,FRIENDSANITY,Stardew Valley Expanded
-6196,Blue Moon Vineyard,Friendsanity: Sophia 12 <3,FRIENDSANITY,Stardew Valley Expanded
-6197,Blue Moon Vineyard,Friendsanity: Sophia 13 <3,FRIENDSANITY,Stardew Valley Expanded
-6198,Blue Moon Vineyard,Friendsanity: Sophia 14 <3,FRIENDSANITY,Stardew Valley Expanded
-6199,Jenkins' Residence,Friendsanity: Victor 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6200,Jenkins' Residence,Friendsanity: Victor 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6201,Jenkins' Residence,Friendsanity: Victor 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6202,Jenkins' Residence,Friendsanity: Victor 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6203,Jenkins' Residence,Friendsanity: Victor 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6204,Jenkins' Residence,Friendsanity: Victor 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6205,Jenkins' Residence,Friendsanity: Victor 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6206,Jenkins' Residence,Friendsanity: Victor 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6207,Jenkins' Residence,Friendsanity: Victor 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6208,Jenkins' Residence,Friendsanity: Victor 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6209,Jenkins' Residence,Friendsanity: Victor 11 <3,FRIENDSANITY,Stardew Valley Expanded
-6210,Jenkins' Residence,Friendsanity: Victor 12 <3,FRIENDSANITY,Stardew Valley Expanded
-6211,Jenkins' Residence,Friendsanity: Victor 13 <3,FRIENDSANITY,Stardew Valley Expanded
-6212,Jenkins' Residence,Friendsanity: Victor 14 <3,FRIENDSANITY,Stardew Valley Expanded
-6213,Fairhaven Farm,Friendsanity: Andy 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6214,Fairhaven Farm,Friendsanity: Andy 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6215,Fairhaven Farm,Friendsanity: Andy 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6216,Fairhaven Farm,Friendsanity: Andy 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6217,Fairhaven Farm,Friendsanity: Andy 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6218,Fairhaven Farm,Friendsanity: Andy 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6219,Fairhaven Farm,Friendsanity: Andy 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6220,Fairhaven Farm,Friendsanity: Andy 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6221,Fairhaven Farm,Friendsanity: Andy 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6222,Fairhaven Farm,Friendsanity: Andy 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6223,Aurora Vineyard,Friendsanity: Apples 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6224,Aurora Vineyard,Friendsanity: Apples 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6225,Aurora Vineyard,Friendsanity: Apples 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6226,Aurora Vineyard,Friendsanity: Apples 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6227,Aurora Vineyard,Friendsanity: Apples 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6228,Aurora Vineyard,Friendsanity: Apples 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6229,Aurora Vineyard,Friendsanity: Apples 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6230,Aurora Vineyard,Friendsanity: Apples 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6231,Aurora Vineyard,Friendsanity: Apples 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6232,Aurora Vineyard,Friendsanity: Apples 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6233,Museum,Friendsanity: Gunther 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6234,Museum,Friendsanity: Gunther 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6235,Museum,Friendsanity: Gunther 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6236,Museum,Friendsanity: Gunther 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6237,Museum,Friendsanity: Gunther 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6238,Museum,Friendsanity: Gunther 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6239,Museum,Friendsanity: Gunther 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6240,Museum,Friendsanity: Gunther 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6241,Museum,Friendsanity: Gunther 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6242,Museum,Friendsanity: Gunther 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6243,JojaMart,Friendsanity: Martin 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6244,JojaMart,Friendsanity: Martin 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6245,JojaMart,Friendsanity: Martin 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6246,JojaMart,Friendsanity: Martin 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6247,JojaMart,Friendsanity: Martin 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6248,JojaMart,Friendsanity: Martin 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6249,JojaMart,Friendsanity: Martin 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6250,JojaMart,Friendsanity: Martin 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6251,JojaMart,Friendsanity: Martin 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6252,JojaMart,Friendsanity: Martin 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6253,Adventurer's Guild,Friendsanity: Marlon 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6254,Adventurer's Guild,Friendsanity: Marlon 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6255,Adventurer's Guild,Friendsanity: Marlon 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6256,Adventurer's Guild,Friendsanity: Marlon 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6257,Adventurer's Guild,Friendsanity: Marlon 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6258,Adventurer's Guild,Friendsanity: Marlon 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6259,Adventurer's Guild,Friendsanity: Marlon 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6260,Adventurer's Guild,Friendsanity: Marlon 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6261,Adventurer's Guild,Friendsanity: Marlon 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6262,Adventurer's Guild,Friendsanity: Marlon 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6263,Wizard Tower,Friendsanity: Morgan 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6264,Wizard Tower,Friendsanity: Morgan 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6265,Wizard Tower,Friendsanity: Morgan 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6266,Wizard Tower,Friendsanity: Morgan 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6267,Wizard Tower,Friendsanity: Morgan 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6268,Wizard Tower,Friendsanity: Morgan 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6269,Wizard Tower,Friendsanity: Morgan 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6270,Wizard Tower,Friendsanity: Morgan 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6271,Wizard Tower,Friendsanity: Morgan 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6272,Wizard Tower,Friendsanity: Morgan 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6273,Scarlett's House,Friendsanity: Scarlett 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6274,Scarlett's House,Friendsanity: Scarlett 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6275,Scarlett's House,Friendsanity: Scarlett 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6276,Scarlett's House,Friendsanity: Scarlett 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6277,Scarlett's House,Friendsanity: Scarlett 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6278,Scarlett's House,Friendsanity: Scarlett 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6279,Scarlett's House,Friendsanity: Scarlett 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6280,Scarlett's House,Friendsanity: Scarlett 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6281,Scarlett's House,Friendsanity: Scarlett 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6282,Scarlett's House,Friendsanity: Scarlett 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6283,Susan's House,Friendsanity: Susan 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6284,Susan's House,Friendsanity: Susan 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6285,Susan's House,Friendsanity: Susan 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6286,Susan's House,Friendsanity: Susan 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6287,Susan's House,Friendsanity: Susan 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6288,Susan's House,Friendsanity: Susan 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6289,Susan's House,Friendsanity: Susan 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6290,Susan's House,Friendsanity: Susan 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6291,Susan's House,Friendsanity: Susan 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6292,Susan's House,Friendsanity: Susan 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6293,JojaMart,Friendsanity: Morris 1 <3,FRIENDSANITY,Stardew Valley Expanded
-6294,JojaMart,Friendsanity: Morris 2 <3,FRIENDSANITY,Stardew Valley Expanded
-6295,JojaMart,Friendsanity: Morris 3 <3,FRIENDSANITY,Stardew Valley Expanded
-6296,JojaMart,Friendsanity: Morris 4 <3,FRIENDSANITY,Stardew Valley Expanded
-6297,JojaMart,Friendsanity: Morris 5 <3,FRIENDSANITY,Stardew Valley Expanded
-6298,JojaMart,Friendsanity: Morris 6 <3,FRIENDSANITY,Stardew Valley Expanded
-6299,JojaMart,Friendsanity: Morris 7 <3,FRIENDSANITY,Stardew Valley Expanded
-6300,JojaMart,Friendsanity: Morris 8 <3,FRIENDSANITY,Stardew Valley Expanded
-6301,JojaMart,Friendsanity: Morris 9 <3,FRIENDSANITY,Stardew Valley Expanded
-6302,JojaMart,Friendsanity: Morris 10 <3,FRIENDSANITY,Stardew Valley Expanded
-6303,Witch's Swamp,Friendsanity: Zic 1 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6304,Witch's Swamp,Friendsanity: Zic 2 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6305,Witch's Swamp,Friendsanity: Zic 3 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6306,Witch's Swamp,Friendsanity: Zic 4 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6307,Witch's Swamp,Friendsanity: Zic 5 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6308,Witch's Swamp,Friendsanity: Zic 6 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6309,Witch's Swamp,Friendsanity: Zic 7 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6310,Witch's Swamp,Friendsanity: Zic 8 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6311,Witch's Swamp,Friendsanity: Zic 9 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6312,Witch's Swamp,Friendsanity: Zic 10 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
-6313,Witch's Attic,Friendsanity: Alecto 1 <3,FRIENDSANITY,Alecto the Witch
-6314,Witch's Attic,Friendsanity: Alecto 2 <3,FRIENDSANITY,Alecto the Witch
-6315,Witch's Attic,Friendsanity: Alecto 3 <3,FRIENDSANITY,Alecto the Witch
-6316,Witch's Attic,Friendsanity: Alecto 4 <3,FRIENDSANITY,Alecto the Witch
-6317,Witch's Attic,Friendsanity: Alecto 5 <3,FRIENDSANITY,Alecto the Witch
-6318,Witch's Attic,Friendsanity: Alecto 6 <3,FRIENDSANITY,Alecto the Witch
-6319,Witch's Attic,Friendsanity: Alecto 7 <3,FRIENDSANITY,Alecto the Witch
-6320,Witch's Attic,Friendsanity: Alecto 8 <3,FRIENDSANITY,Alecto the Witch
-6321,Witch's Attic,Friendsanity: Alecto 9 <3,FRIENDSANITY,Alecto the Witch
-6322,Witch's Attic,Friendsanity: Alecto 10 <3,FRIENDSANITY,Alecto the Witch
-6323,Mouse House,Friendsanity: Lacey 1 <3,FRIENDSANITY,Hat Mouse Lacey
-6324,Mouse House,Friendsanity: Lacey 2 <3,FRIENDSANITY,Hat Mouse Lacey
-6325,Mouse House,Friendsanity: Lacey 3 <3,FRIENDSANITY,Hat Mouse Lacey
-6326,Mouse House,Friendsanity: Lacey 4 <3,FRIENDSANITY,Hat Mouse Lacey
-6327,Mouse House,Friendsanity: Lacey 5 <3,FRIENDSANITY,Hat Mouse Lacey
-6328,Mouse House,Friendsanity: Lacey 6 <3,FRIENDSANITY,Hat Mouse Lacey
-6329,Mouse House,Friendsanity: Lacey 7 <3,FRIENDSANITY,Hat Mouse Lacey
-6330,Mouse House,Friendsanity: Lacey 8 <3,FRIENDSANITY,Hat Mouse Lacey
-6331,Mouse House,Friendsanity: Lacey 9 <3,FRIENDSANITY,Hat Mouse Lacey
-6332,Mouse House,Friendsanity: Lacey 10 <3,FRIENDSANITY,Hat Mouse Lacey
-6333,Mouse House,Friendsanity: Lacey 11 <3,FRIENDSANITY,Hat Mouse Lacey
-6334,Mouse House,Friendsanity: Lacey 12 <3,FRIENDSANITY,Hat Mouse Lacey
-6335,Mouse House,Friendsanity: Lacey 13 <3,FRIENDSANITY,Hat Mouse Lacey
-6336,Mouse House,Friendsanity: Lacey 14 <3,FRIENDSANITY,Hat Mouse Lacey
-6337,Boarding House - First Floor,Friendsanity: Joel 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6338,Boarding House - First Floor,Friendsanity: Joel 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6339,Boarding House - First Floor,Friendsanity: Joel 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6340,Boarding House - First Floor,Friendsanity: Joel 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6341,Boarding House - First Floor,Friendsanity: Joel 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6342,Boarding House - First Floor,Friendsanity: Joel 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6343,Boarding House - First Floor,Friendsanity: Joel 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6344,Boarding House - First Floor,Friendsanity: Joel 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6345,Boarding House - First Floor,Friendsanity: Joel 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6346,Boarding House - First Floor,Friendsanity: Joel 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6347,Boarding House - First Floor,Friendsanity: Sheila 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6348,Boarding House - First Floor,Friendsanity: Sheila 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6349,Boarding House - First Floor,Friendsanity: Sheila 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6350,Boarding House - First Floor,Friendsanity: Sheila 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6351,Boarding House - First Floor,Friendsanity: Sheila 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6352,Boarding House - First Floor,Friendsanity: Sheila 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6353,Boarding House - First Floor,Friendsanity: Sheila 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6354,Boarding House - First Floor,Friendsanity: Sheila 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6355,Boarding House - First Floor,Friendsanity: Sheila 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6356,Boarding House - First Floor,Friendsanity: Sheila 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6357,Boarding House - First Floor,Friendsanity: Sheila 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6358,Boarding House - First Floor,Friendsanity: Sheila 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6359,Boarding House - First Floor,Friendsanity: Sheila 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6360,Boarding House - First Floor,Friendsanity: Sheila 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6361,The Lost Valley,Friendsanity: Gregory 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6362,The Lost Valley,Friendsanity: Gregory 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6363,The Lost Valley,Friendsanity: Gregory 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6364,The Lost Valley,Friendsanity: Gregory 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6365,The Lost Valley,Friendsanity: Gregory 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6366,The Lost Valley,Friendsanity: Gregory 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6367,The Lost Valley,Friendsanity: Gregory 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6368,The Lost Valley,Friendsanity: Gregory 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6369,The Lost Valley,Friendsanity: Gregory 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6370,The Lost Valley,Friendsanity: Gregory 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6371,The Lost Valley,Friendsanity: Gregory 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6372,The Lost Valley,Friendsanity: Gregory 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6373,The Lost Valley,Friendsanity: Gregory 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-6374,The Lost Valley,Friendsanity: Gregory 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
-7001,Pierre's General Store,Premium Pack,BACKPACK,Bigger Backpack
-7002,Carpenter Shop,Tractor Garage Blueprint,BUILDING_BLUEPRINT,Tractor Mod
-7003,The Deep Woods Depth 100,Pet the Deep Woods Unicorn,MANDATORY,DeepWoods
-7004,The Deep Woods Depth 50,Breaking Up Deep Woods Gingerbread House,MANDATORY,DeepWoods
-7005,The Deep Woods Depth 50,Drinking From Deep Woods Fountain,MANDATORY,DeepWoods
-7006,The Deep Woods Depth 100,Deep Woods Treasure Chest,MANDATORY,DeepWoods
-7007,The Deep Woods Depth 100,Deep Woods Trash Bin,MANDATORY,DeepWoods
-7008,The Deep Woods Depth 50,Chop Down a Deep Woods Iridium Tree,MANDATORY,DeepWoods
-7009,The Deep Woods Depth 10,The Deep Woods: Depth 10,ELEVATOR,DeepWoods
-7010,The Deep Woods Depth 20,The Deep Woods: Depth 20,ELEVATOR,DeepWoods
-7011,The Deep Woods Depth 30,The Deep Woods: Depth 30,ELEVATOR,DeepWoods
-7012,The Deep Woods Depth 40,The Deep Woods: Depth 40,ELEVATOR,DeepWoods
-7013,The Deep Woods Depth 50,The Deep Woods: Depth 50,ELEVATOR,DeepWoods
-7014,The Deep Woods Depth 60,The Deep Woods: Depth 60,ELEVATOR,DeepWoods
-7015,The Deep Woods Depth 70,The Deep Woods: Depth 70,ELEVATOR,DeepWoods
-7016,The Deep Woods Depth 80,The Deep Woods: Depth 80,ELEVATOR,DeepWoods
-7017,The Deep Woods Depth 90,The Deep Woods: Depth 90,ELEVATOR,DeepWoods
-7018,The Deep Woods Depth 100,The Deep Woods: Depth 100,ELEVATOR,DeepWoods
-7019,The Deep Woods Depth 50,Purify an Infested Lichtung,MANDATORY,DeepWoods
-7020,Skull Cavern Floor 25,Skull Cavern: Floor 25,ELEVATOR,Skull Cavern Elevator
-7021,Skull Cavern Floor 50,Skull Cavern: Floor 50,ELEVATOR,Skull Cavern Elevator
-7022,Skull Cavern Floor 75,Skull Cavern: Floor 75,ELEVATOR,Skull Cavern Elevator
-7023,Skull Cavern Floor 100,Skull Cavern: Floor 100,ELEVATOR,Skull Cavern Elevator
-7024,Skull Cavern Floor 125,Skull Cavern: Floor 125,ELEVATOR,Skull Cavern Elevator
-7025,Skull Cavern Floor 150,Skull Cavern: Floor 150,ELEVATOR,Skull Cavern Elevator
-7026,Skull Cavern Floor 175,Skull Cavern: Floor 175,ELEVATOR,Skull Cavern Elevator
-7027,Skull Cavern Floor 200,Skull Cavern: Floor 200,ELEVATOR,Skull Cavern Elevator
-7028,The Deep Woods Depth 100,The Sword in the Stone,MANDATORY,DeepWoods
-7051,Abandoned Mines - 1A,Abandoned Treasure - Floor 1A,MANDATORY,Boarding House and Bus Stop Extension
-7052,Abandoned Mines - 1B,Abandoned Treasure - Floor 1B,MANDATORY,Boarding House and Bus Stop Extension
-7053,Abandoned Mines - 2A,Abandoned Treasure - Floor 2A,MANDATORY,Boarding House and Bus Stop Extension
-7054,Abandoned Mines - 2B,Abandoned Treasure - Floor 2B,MANDATORY,Boarding House and Bus Stop Extension
-7055,Abandoned Mines - 3,Abandoned Treasure - Floor 3,MANDATORY,Boarding House and Bus Stop Extension
-7056,Abandoned Mines - 4,Abandoned Treasure - Floor 4,MANDATORY,Boarding House and Bus Stop Extension
-7057,Abandoned Mines - 5,Abandoned Treasure - Floor 5,MANDATORY,Boarding House and Bus Stop Extension
-7401,Farm,Cook Magic Elixir,COOKSANITY,Magic
-7402,Farm,Craft Travel Core,CRAFTSANITY,Magic
-7403,Farm,Craft Haste Elixir,CRAFTSANITY,Stardew Valley Expanded
-7404,Farm,Craft Hero Elixir,CRAFTSANITY,Stardew Valley Expanded
-7405,Farm,Craft Armor Elixir,CRAFTSANITY,Stardew Valley Expanded
-7406,Witch's Swamp,Craft Ginger Tincture,"CRAFTSANITY,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul
-7407,Farm,Craft Glass Path,CRAFTSANITY,Archaeology
-7408,Farm,Craft Glass Brazier,CRAFTSANITY,Archaeology
-7409,Farm,Craft Glass Fence,CRAFTSANITY,Archaeology
-7410,Farm,Craft Bone Path,CRAFTSANITY,Archaeology
-7411,Farm,Craft Water Shifter,CRAFTSANITY,Archaeology
-7412,Farm,Craft Wooden Display,CRAFTSANITY,Archaeology
-7413,Farm,Craft Hardwood Display,CRAFTSANITY,Archaeology
-7414,Farm,Craft Dwarf Gadget: Infinite Volcano Simulation,"CRAFTSANITY,GINGER_ISLAND",Archaeology
-7415,Farm,Craft Grinder,CRAFTSANITY,Archaeology
-7416,Farm,Craft Preservation Chamber,CRAFTSANITY,Archaeology
-7417,Farm,Craft Hardwood Preservation Chamber,CRAFTSANITY,Archaeology
-7418,Farm,Craft Ancient Battery Production Station,CRAFTSANITY,Archaeology
-7419,Farm,Craft Neanderthal Skeleton,CRAFTSANITY,Boarding House and Bus Stop Extension
-7420,Farm,Craft Pterodactyl Skeleton L,CRAFTSANITY,Boarding House and Bus Stop Extension
-7421,Farm,Craft Pterodactyl Skeleton M,CRAFTSANITY,Boarding House and Bus Stop Extension
-7422,Farm,Craft Pterodactyl Skeleton R,CRAFTSANITY,Boarding House and Bus Stop Extension
-7423,Farm,Craft T-Rex Skeleton L,CRAFTSANITY,Boarding House and Bus Stop Extension
-7424,Farm,Craft T-Rex Skeleton M,CRAFTSANITY,Boarding House and Bus Stop Extension
-7425,Farm,Craft T-Rex Skeleton R,CRAFTSANITY,Boarding House and Bus Stop Extension
-7426,Farm,Craft Restoration Table,CRAFTSANITY,Archaeology
-7427,Farm,Craft Rusty Path,CRAFTSANITY,Archaeology
-7428,Farm,Craft Rusty Brazier,CRAFTSANITY,Archaeology
-7429,Farm,Craft Lucky Ring,CRAFTSANITY,Archaeology
-7430,Farm,Craft Bone Fence,CRAFTSANITY,Archaeology
-7431,Farm,Craft Bouquet,CRAFTSANITY,Socializing Skill
-7432,Farm,Craft Trash Bin,CRAFTSANITY,Binning Skill
-7433,Farm,Craft Composter,CRAFTSANITY,Binning Skill
-7434,Farm,Craft Recycling Bin,CRAFTSANITY,Binning Skill
-7435,Farm,Craft Advanced Recycling Machine,CRAFTSANITY,Binning Skill
-7440,Farm,Craft Copper Slot Machine,"CRAFTSANITY",Luck Skill
-7441,Farm,Craft Gold Slot Machine,"CRAFTSANITY",Luck Skill
-7442,Farm,Craft Iridium Slot Machine,"CRAFTSANITY",Luck Skill
-7443,Farm,Craft Radioactive Slot Machine,"CRAFTSANITY,GINGER_ISLAND",Luck Skill
-7451,Adventurer's Guild,Magic Elixir Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic
-7452,Adventurer's Guild,Travel Core Recipe,CRAFTSANITY,Magic
-7453,Alesia Shop,Haste Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded
-7454,Isaac Shop,Hero Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded
-7455,Alesia Shop,Armor Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded
-7501,Mountain,Missing Envelope,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC)
-7502,Forest,Ayeisha's Lost Ring,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC)
-7503,Forest,Mr.Ginger's request,"STORY_QUEST",Mister Ginger (cat npc)
-7504,Forest,Juna's Drink Request,"STORY_QUEST",Juna - Roommate NPC
-7505,Forest,Juna's BFF Request,"STORY_QUEST",Juna - Roommate NPC
-7506,Forest,Juna's Monster Mash,SPECIAL_ORDER_BOARD,Juna - Roommate NPC
-7507,Adventurer's Guild,Marlon's Boat,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
-7508,Railroad,The Railroad Boulder,"STORY_QUEST",Stardew Valley Expanded
-7509,Grandpa's Shed Interior,Grandpa's Shed,"STORY_QUEST",Stardew Valley Expanded
-7510,Aurora Vineyard,Aurora Vineyard,"STORY_QUEST",Stardew Valley Expanded
-7511,Lance's House Main,Monster Crops,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
-7512,Sewer,Void Soul Retrieval,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
-7513,Fairhaven Farm,Andy's Cellar,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
-7514,Adventurer's Guild,A Mysterious Venture,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
-7515,Jenkins' Residence,An Elegant Reception,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
-7516,Sophia's House,Fairy Garden,"SPECIAL_ORDER_BOARD,GINGER_ISLAND",Stardew Valley Expanded
-7517,Susan's House,Homemade Fertilizer,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
-7519,Witch's Swamp,Corrupted Crops Task,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul
-7520,Witch's Swamp,A New Pot,STORY_QUEST,Distant Lands - Witch Swamp Overhaul
-7521,Witch's Swamp,Fancy Blanket Task,STORY_QUEST,Distant Lands - Witch Swamp Overhaul
-7522,Witch's Swamp,Witch's order,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul
-7523,Boarding House - First Floor,Pumpkin Soup,STORY_QUEST,Boarding House and Bus Stop Extension
-7524,Museum,Geode Order,SPECIAL_ORDER_BOARD,Professor Jasper Thomas
-7525,Museum,Dwarven Scrolls,SPECIAL_ORDER_BOARD,Professor Jasper Thomas
-7526,Mouse House,Hats for the Hat Mouse,STORY_QUEST,Hat Mouse Lacey
-7551,Kitchen,Cook Baked Berry Oatmeal,COOKSANITY,Stardew Valley Expanded
-7552,Kitchen,Cook Flower Cookie,COOKSANITY,Stardew Valley Expanded
-7553,Kitchen,Cook Big Bark Burger,COOKSANITY,Stardew Valley Expanded
-7554,Kitchen,Cook Frog Legs,COOKSANITY,Stardew Valley Expanded
-7555,Kitchen,Cook Glazed Butterfish,COOKSANITY,Stardew Valley Expanded
-7556,Kitchen,Cook Mixed Berry Pie,COOKSANITY,Stardew Valley Expanded
-7557,Kitchen,Cook Mushroom Berry Rice,COOKSANITY,Stardew Valley Expanded
-7558,Kitchen,Cook Seaweed Salad,COOKSANITY,Stardew Valley Expanded
-7559,Kitchen,Cook Void Delight,COOKSANITY,Stardew Valley Expanded
-7560,Kitchen,Cook Void Salmon Sushi,COOKSANITY,Stardew Valley Expanded
-7561,Kitchen,Cook Mushroom Kebab,COOKSANITY,Distant Lands - Witch Swamp Overhaul
-7562,Kitchen,Cook Crayfish Soup,COOKSANITY,Distant Lands - Witch Swamp Overhaul
-7563,Kitchen,Cook Pemmican,COOKSANITY,Distant Lands - Witch Swamp Overhaul
-7564,Kitchen,Cook Void Mint Tea,COOKSANITY,Distant Lands - Witch Swamp Overhaul
-7565,Kitchen,Cook Special Pumpkin Soup,COOKSANITY,Boarding House and Bus Stop Extension
-7566,Kitchen,Cook Digger's Delight,COOKSANITY,Archaeology
-7567,Kitchen,Cook Rocky Root Coffee,COOKSANITY,Archaeology
-7568,Kitchen,Cook Ancient Jello,COOKSANITY,Archaeology
-7569,Kitchen,Cook Grilled Cheese,COOKSANITY,Binning Skill
-7570,Kitchen,Cook Fish Casserole,COOKSANITY,Binning Skill
-7601,Bear Shop,Baked Berry Oatmeal Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7602,Bear Shop,Flower Cookie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7603,Saloon,Big Bark Burger Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
-7604,Adventurer's Guild,Frog Legs Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7605,Saloon,Glazed Butterfish Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
-7606,Saloon,Mixed Berry Pie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7607,Adventurer's Guild,Mushroom Berry Rice Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
-7608,Adventurer's Guild,Seaweed Salad Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7609,Sewer,Void Delight Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
-7610,Sewer,Void Salmon Sushi Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
-7611,Witch's Swamp,Mushroom Kebab Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
-7613,Witch's Swamp,Pemmican Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
-7614,Witch's Swamp,Void Mint Tea Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
-7616,Mines Dwarf Shop,Neanderthal Skeleton Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7617,Mines Dwarf Shop,Pterodactyl Skeleton L Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7618,Mines Dwarf Shop,Pterodactyl Skeleton M Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7619,Mines Dwarf Shop,Pterodactyl Skeleton R Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7620,Mines Dwarf Shop,T-Rex Skeleton L Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7621,Mines Dwarf Shop,T-Rex Skeleton M Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7622,Mines Dwarf Shop,T-Rex Skeleton R Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension
-7623,Farm,Digger's Delight Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
-7624,Farm,Rocky Root Coffee Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
-7625,Farm,Ancient Jello Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
-7627,Farm,Grilled Cheese Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Binning Skill
-7628,Farm,Fish Casserole Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Binning Skill
-7651,Alesia Shop,Tempered Galaxy Dagger,MANDATORY,Stardew Valley Expanded
-7652,Isaac Shop,Tempered Galaxy Sword,MANDATORY,Stardew Valley Expanded
-7653,Isaac Shop,Tempered Galaxy Hammer,MANDATORY,Stardew Valley Expanded
-7701,Island South,Fishsanity: Baby Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7702,Crimson Badlands,Fishsanity: Bonefish,FISHSANITY,Stardew Valley Expanded
-7703,Forest,Fishsanity: Bull Trout,FISHSANITY,Stardew Valley Expanded
-7704,Forest West,Fishsanity: Butterfish,FISHSANITY,Stardew Valley Expanded
-7705,Island South,Fishsanity: Clownfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7706,Highlands Outside,Fishsanity: Daggerfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7707,Mountain,Fishsanity: Frog,FISHSANITY,Stardew Valley Expanded
-7708,Highlands Outside,Fishsanity: Gemfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7709,Sprite Spring,Fishsanity: Goldenfish,FISHSANITY,Stardew Valley Expanded
-7710,Secret Woods,Fishsanity: Grass Carp,FISHSANITY,Stardew Valley Expanded
-7711,Forest West,Fishsanity: King Salmon,FISHSANITY,Stardew Valley Expanded
-7712,Island West,Fishsanity: Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7713,Sprite Spring,Fishsanity: Meteor Carp,FISHSANITY,Stardew Valley Expanded
-7714,Town,Fishsanity: Minnow,FISHSANITY,Stardew Valley Expanded
-7715,Forest West,Fishsanity: Puppyfish,FISHSANITY,Stardew Valley Expanded
-7716,Sewer,Fishsanity: Radioactive Bass,FISHSANITY,Stardew Valley Expanded
-7717,Island West,Fishsanity: Seahorse,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7718,Island West,Fishsanity: Sea Sponge,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7719,Island South,Fishsanity: Shiny Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7720,Mutant Bug Lair,Fishsanity: Snatcher Worm,FISHSANITY,Stardew Valley Expanded
-7721,Beach,Fishsanity: Starfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7722,Fable Reef,Fishsanity: Torpedo Trout,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7723,Witch's Swamp,Fishsanity: Void Eel,FISHSANITY,Stardew Valley Expanded
-7724,Mutant Bug Lair,Fishsanity: Water Grub,FISHSANITY,Stardew Valley Expanded
-7725,Crimson Badlands,Fishsanity: Undeadfish,FISHSANITY,Stardew Valley Expanded
-7726,Shearwater Bridge,Fishsanity: Kittyfish,FISHSANITY,Stardew Valley Expanded
-7728,Witch's Swamp,Fishsanity: Void Minnow,FISHSANITY,Distant Lands - Witch Swamp Overhaul
-7729,Witch's Swamp,Fishsanity: Swamp Leech,FISHSANITY,Distant Lands - Witch Swamp Overhaul
-7730,Witch's Swamp,Fishsanity: Giant Horsehoe Crab,FISHSANITY,Distant Lands - Witch Swamp Overhaul
-7731,Witch's Swamp,Fishsanity: Purple Algae,FISHSANITY,Distant Lands - Witch Swamp Overhaul
-7901,Farm,Harvest Monster Fruit,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7902,Farm,Harvest Salal Berry,CROPSANITY,Stardew Valley Expanded
-7903,Farm,Harvest Slime Berry,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7904,Farm,Harvest Ancient Fiber,CROPSANITY,Stardew Valley Expanded
-7905,Farm,Harvest Monster Mushroom,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7906,Farm,Harvest Void Root,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-7907,Farm,Harvest Void Mint Leaves,CROPSANITY,Distant Lands - Witch Swamp Overhaul
-7908,Farm,Harvest Vile Ancient Fruit,CROPSANITY,Distant Lands - Witch Swamp Overhaul
-8001,Shipping,Shipsanity: Magic Elixir,SHIPSANITY,Magic
-8002,Shipping,Shipsanity: Travel Core,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Magic
-8003,Shipping,Shipsanity: Aegis Elixir,SHIPSANITY,Stardew Valley Expanded
-8004,Shipping,Shipsanity: Aged Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded
-8005,Shipping,Shipsanity: Ancient Fern Seed,SHIPSANITY,Stardew Valley Expanded
-8006,Shipping,Shipsanity: Ancient Fiber,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8007,Shipping,Shipsanity: Armor Elixir,SHIPSANITY,Stardew Valley Expanded
-8008,Shipping,Shipsanity: Baby Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8009,Shipping,Shipsanity: Baked Berry Oatmeal,SHIPSANITY,Stardew Valley Expanded
-8010,Shipping,Shipsanity: Barbarian Elixir,SHIPSANITY,Stardew Valley Expanded
-8011,Shipping,Shipsanity: Bearberry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8012,Shipping,Shipsanity: Big Bark Burger,SHIPSANITY,Stardew Valley Expanded
-8013,Shipping,Shipsanity: Conch,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8014,Shipping,Shipsanity: Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded
-8015,Shipping,Shipsanity: Bonefish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8016,Shipping,Shipsanity: Bull Trout,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8017,Shipping,Shipsanity: Butterfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8018,Shipping,Shipsanity: Clownfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8019,Shipping,Shipsanity: Daggerfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8020,Shipping,Shipsanity: Dewdrop Berry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8021,Shipping,Shipsanity: Sand Dollar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8023,Shipping,Shipsanity: Ferngill Primrose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8024,Shipping,Shipsanity: Flower Cookie,SHIPSANITY,Stardew Valley Expanded
-8025,Shipping,Shipsanity: Frog,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8026,Shipping,Shipsanity: Frog Legs,SHIPSANITY,Stardew Valley Expanded
-8027,Shipping,Shipsanity: Fungus Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8029,Shipping,Shipsanity: Gemfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8030,Shipping,Shipsanity: Glazed Butterfish,"SHIPSANITY",Stardew Valley Expanded
-8031,Shipping,Shipsanity: Golden Ocean Flower,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8032,Shipping,Shipsanity: Goldenfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8033,Shipping,Shipsanity: Goldenrod,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8034,Shipping,Shipsanity: Grampleton Orange Chicken,SHIPSANITY,Stardew Valley Expanded
-8035,Shipping,Shipsanity: Grass Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8036,Shipping,Shipsanity: Gravity Elixir,SHIPSANITY,Stardew Valley Expanded
-8037,Shipping,Shipsanity: Green Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8038,Shipping,Shipsanity: Haste Elixir,SHIPSANITY,Stardew Valley Expanded
-8039,Shipping,Shipsanity: Hero Elixir,SHIPSANITY,Stardew Valley Expanded
-8040,Shipping,Shipsanity: King Salmon,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8050,Shipping,Shipsanity: Kittyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8051,Shipping,Shipsanity: Lightning Elixir,SHIPSANITY,Stardew Valley Expanded
-8052,Shipping,Shipsanity: Four Leaf Clover,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8053,Shipping,Shipsanity: Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8054,Shipping,Shipsanity: Meteor Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8055,Shipping,Shipsanity: Minnow,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8056,Shipping,Shipsanity: Mixed Berry Pie,SHIPSANITY,Stardew Valley Expanded
-8057,Shipping,Shipsanity: Monster Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8058,Shipping,Shipsanity: Monster Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8059,Shipping,Shipsanity: Mushroom Berry Rice,SHIPSANITY,Stardew Valley Expanded
-8060,Shipping,Shipsanity: Mushroom Colony,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8061,Shipping,Shipsanity: Ornate Treasure Chest,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8062,Shipping,Shipsanity: Poison Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8063,Shipping,Shipsanity: Puppyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8064,Shipping,Shipsanity: Radioactive Bass,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8065,Shipping,Shipsanity: Red Baneberry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8066,Shipping,Shipsanity: Rusty Blade,SHIPSANITY,Stardew Valley Expanded
-8067,Shipping,Shipsanity: Salal Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8068,Shipping,Shipsanity: Sea Sponge,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8069,Shipping,Shipsanity: Seahorse,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8070,Shipping,Shipsanity: Seaweed Salad,SHIPSANITY,Stardew Valley Expanded
-8071,Shipping,Shipsanity: Shiny Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8072,Shipping,Shipsanity: Shrub Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8073,Shipping,Shipsanity: Slime Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8074,Shipping,Shipsanity: Slime Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8075,Shipping,Shipsanity: Rafflesia,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8076,Shipping,Shipsanity: Sports Drink,SHIPSANITY,Stardew Valley Expanded
-8077,Shipping,Shipsanity: Stalk Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8078,Shipping,Shipsanity: Stamina Capsule,SHIPSANITY,Stardew Valley Expanded
-8079,Shipping,Shipsanity: Starfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8080,Shipping,Shipsanity: Swirl Stone,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8081,Shipping,Shipsanity: Thistle,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8082,Shipping,Shipsanity: Torpedo Trout,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
-8083,Shipping,Shipsanity: Undeadfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8084,Shipping,Shipsanity: Void Delight,SHIPSANITY,Stardew Valley Expanded
-8085,Shipping,Shipsanity: Void Eel,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8086,Shipping,Shipsanity: Void Pebble,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8087,Shipping,Shipsanity: Void Root,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
-8088,Shipping,Shipsanity: Void Salmon Sushi,SHIPSANITY,Stardew Valley Expanded
-8089,Shipping,Shipsanity: Void Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
-8090,Shipping,Shipsanity: Void Shard,SHIPSANITY,Stardew Valley Expanded
-8091,Shipping,Shipsanity: Void Soul,SHIPSANITY,Stardew Valley Expanded
-8092,Shipping,Shipsanity: Water Grub,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
-8093,Shipping,Shipsanity: Winter Star Rose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
-8094,Shipping,Shipsanity: Wooden Display: Amphibian Fossil,SHIPSANITY,Archaeology
-8095,Shipping,Shipsanity: Hardwood Display: Amphibian Fossil,SHIPSANITY,Archaeology
-8096,Shipping,Shipsanity: Wooden Display: Anchor,SHIPSANITY,Archaeology
-8097,Shipping,Shipsanity: Hardwood Display: Anchor,SHIPSANITY,Archaeology
-8098,Shipping,Shipsanity: Wooden Display: Ancient Doll,SHIPSANITY,Archaeology
-8099,Shipping,Shipsanity: Hardwood Display: Ancient Doll,SHIPSANITY,Archaeology
-8100,Shipping,Shipsanity: Wooden Display: Ancient Drum,SHIPSANITY,Archaeology
-8101,Shipping,Shipsanity: Hardwood Display: Ancient Drum,SHIPSANITY,Archaeology
-8102,Shipping,Shipsanity: Wooden Display: Ancient Seed,SHIPSANITY,Archaeology
-8103,Shipping,Shipsanity: Hardwood Display: Ancient Seed,SHIPSANITY,Archaeology
-8104,Shipping,Shipsanity: Wooden Display: Ancient Sword,SHIPSANITY,Archaeology
-8105,Shipping,Shipsanity: Hardwood Display: Ancient Sword,SHIPSANITY,Archaeology
-8106,Shipping,Shipsanity: Wooden Display: Arrowhead,SHIPSANITY,Archaeology
-8107,Shipping,Shipsanity: Hardwood Display: Arrowhead,SHIPSANITY,Archaeology
-8108,Shipping,Shipsanity: Wooden Display: Bone Flute,SHIPSANITY,Archaeology
-8109,Shipping,Shipsanity: Hardwood Display: Bone Flute,SHIPSANITY,Archaeology
-8110,Shipping,Shipsanity: Wooden Display: Chewing Stick,SHIPSANITY,Archaeology
-8111,Shipping,Shipsanity: Hardwood Display: Chewing Stick,SHIPSANITY,Archaeology
-8112,Shipping,Shipsanity: Wooden Display: Chicken Statue,SHIPSANITY,Archaeology
-8113,Shipping,Shipsanity: Hardwood Display: Chicken Statue,SHIPSANITY,Archaeology
-8114,Shipping,Shipsanity: Wooden Display: Chipped Amphora,SHIPSANITY,Archaeology
-8115,Shipping,Shipsanity: Hardwood Display: Chipped Amphora,SHIPSANITY,Archaeology
-8116,Shipping,Shipsanity: Wooden Display: Dinosaur Egg,SHIPSANITY,Archaeology
-8117,Shipping,Shipsanity: Hardwood Display: Dinosaur Egg,SHIPSANITY,Archaeology
-8118,Shipping,Shipsanity: Wooden Display: Dried Starfish,SHIPSANITY,Archaeology
-8119,Shipping,Shipsanity: Hardwood Display: Dried Starfish,SHIPSANITY,Archaeology
-8120,Shipping,Shipsanity: Wooden Display: Dwarf Gadget,SHIPSANITY,Archaeology
-8121,Shipping,Shipsanity: Hardwood Display: Dwarf Gadget,SHIPSANITY,Archaeology
-8122,Shipping,Shipsanity: Wooden Display: Dwarf Scroll I,SHIPSANITY,Archaeology
-8123,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll I,SHIPSANITY,Archaeology
-8124,Shipping,Shipsanity: Wooden Display: Dwarf Scroll II,SHIPSANITY,Archaeology
-8125,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll II,SHIPSANITY,Archaeology
-8126,Shipping,Shipsanity: Wooden Display: Dwarf Scroll III,SHIPSANITY,Archaeology
-8127,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll III,SHIPSANITY,Archaeology
-8128,Shipping,Shipsanity: Wooden Display: Dwarf Scroll IV,SHIPSANITY,Archaeology
-8129,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll IV,SHIPSANITY,Archaeology
-8130,Shipping,Shipsanity: Wooden Display: Dwarvish Helm,SHIPSANITY,Archaeology
-8131,Shipping,Shipsanity: Hardwood Display: Dwarvish Helm,SHIPSANITY,Archaeology
-8132,Shipping,Shipsanity: Wooden Display: Elvish Jewelry,SHIPSANITY,Archaeology
-8133,Shipping,Shipsanity: Hardwood Display: Elvish Jewelry,SHIPSANITY,Archaeology
-8134,Shipping,Shipsanity: Wooden Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8135,Shipping,Shipsanity: Hardwood Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8136,Shipping,Shipsanity: Wooden Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8137,Shipping,Shipsanity: Hardwood Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8138,Shipping,Shipsanity: Wooden Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8139,Shipping,Shipsanity: Hardwood Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8140,Shipping,Shipsanity: Wooden Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8141,Shipping,Shipsanity: Hardwood Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8142,Shipping,Shipsanity: Wooden Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8143,Shipping,Shipsanity: Hardwood Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8144,Shipping,Shipsanity: Wooden Display: Glass Shards,SHIPSANITY,Archaeology
-8145,Shipping,Shipsanity: Hardwood Display: Glass Shards,SHIPSANITY,Archaeology
-8146,Shipping,Shipsanity: Wooden Display: Golden Mask,SHIPSANITY,Archaeology
-8147,Shipping,Shipsanity: Hardwood Display: Golden Mask,SHIPSANITY,Archaeology
-8148,Shipping,Shipsanity: Wooden Display: Golden Relic,SHIPSANITY,Archaeology
-8149,Shipping,Shipsanity: Hardwood Display: Golden Relic,SHIPSANITY,Archaeology
-8150,Shipping,Shipsanity: Wooden Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8151,Shipping,Shipsanity: Hardwood Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8152,Shipping,Shipsanity: Wooden Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8153,Shipping,Shipsanity: Hardwood Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8154,Shipping,Shipsanity: Wooden Display: Nautilus Fossil,SHIPSANITY,Archaeology
-8155,Shipping,Shipsanity: Hardwood Display: Nautilus Fossil,SHIPSANITY,Archaeology
-8156,Shipping,Shipsanity: Wooden Display: Ornamental Fan,SHIPSANITY,Archaeology
-8157,Shipping,Shipsanity: Hardwood Display: Ornamental Fan,SHIPSANITY,Archaeology
-8158,Shipping,Shipsanity: Wooden Display: Palm Fossil,SHIPSANITY,Archaeology
-8159,Shipping,Shipsanity: Hardwood Display: Palm Fossil,SHIPSANITY,Archaeology
-8160,Shipping,Shipsanity: Wooden Display: Prehistoric Handaxe,SHIPSANITY,Archaeology
-8161,Shipping,Shipsanity: Hardwood Display: Prehistoric Handaxe,SHIPSANITY,Archaeology
-8162,Shipping,Shipsanity: Wooden Display: Prehistoric Rib,SHIPSANITY,Archaeology
-8163,Shipping,Shipsanity: Hardwood Display: Prehistoric Rib,SHIPSANITY,Archaeology
-8164,Shipping,Shipsanity: Wooden Display: Prehistoric Scapula,SHIPSANITY,Archaeology
-8165,Shipping,Shipsanity: Hardwood Display: Prehistoric Scapula,SHIPSANITY,Archaeology
-8166,Shipping,Shipsanity: Wooden Display: Prehistoric Skull,SHIPSANITY,Archaeology
-8167,Shipping,Shipsanity: Hardwood Display: Prehistoric Skull,SHIPSANITY,Archaeology
-8168,Shipping,Shipsanity: Wooden Display: Prehistoric Tibia,SHIPSANITY,Archaeology
-8169,Shipping,Shipsanity: Hardwood Display: Prehistoric Tibia,SHIPSANITY,Archaeology
-8170,Shipping,Shipsanity: Wooden Display: Prehistoric Tool,SHIPSANITY,Archaeology
-8171,Shipping,Shipsanity: Hardwood Display: Prehistoric Tool,SHIPSANITY,Archaeology
-8172,Shipping,Shipsanity: Wooden Display: Prehistoric Vertebra,SHIPSANITY,Archaeology
-8173,Shipping,Shipsanity: Hardwood Display: Prehistoric Vertebra,SHIPSANITY,Archaeology
-8174,Shipping,Shipsanity: Wooden Display: Rare Disc,SHIPSANITY,Archaeology
-8175,Shipping,Shipsanity: Hardwood Display: Rare Disc,SHIPSANITY,Archaeology
-8176,Shipping,Shipsanity: Wooden Display: Rusty Cog,SHIPSANITY,Archaeology
-8177,Shipping,Shipsanity: Hardwood Display: Rusty Cog,SHIPSANITY,Archaeology
-8178,Shipping,Shipsanity: Wooden Display: Rusty Spoon,SHIPSANITY,Archaeology
-8179,Shipping,Shipsanity: Hardwood Display: Rusty Spoon,SHIPSANITY,Archaeology
-8180,Shipping,Shipsanity: Wooden Display: Rusty Spur,SHIPSANITY,Archaeology
-8181,Shipping,Shipsanity: Hardwood Display: Rusty Spur,SHIPSANITY,Archaeology
-8182,Shipping,Shipsanity: Wooden Display: Skeletal Hand,SHIPSANITY,Archaeology
-8183,Shipping,Shipsanity: Hardwood Display: Skeletal Hand,SHIPSANITY,Archaeology
-8184,Shipping,Shipsanity: Wooden Display: Skeletal Tail,SHIPSANITY,Archaeology
-8185,Shipping,Shipsanity: Hardwood Display: Skeletal Tail,SHIPSANITY,Archaeology
-8186,Shipping,Shipsanity: Wooden Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8187,Shipping,Shipsanity: Hardwood Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8188,Shipping,Shipsanity: Wooden Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8189,Shipping,Shipsanity: Hardwood Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8190,Shipping,Shipsanity: Wooden Display: Strange Doll (Green),SHIPSANITY,Archaeology
-8191,Shipping,Shipsanity: Hardwood Display: Strange Doll (Green),SHIPSANITY,Archaeology
-8192,Shipping,Shipsanity: Wooden Display: Strange Doll,SHIPSANITY,Archaeology
-8193,Shipping,Shipsanity: Hardwood Display: Strange Doll,SHIPSANITY,Archaeology
-8194,Shipping,Shipsanity: Wooden Display: Trilobite Fossil,SHIPSANITY,Archaeology
-8195,Shipping,Shipsanity: Hardwood Display: Trilobite Fossil,SHIPSANITY,Archaeology
-8196,Shipping,Shipsanity: Bone Path,SHIPSANITY,Archaeology
-8197,Shipping,Shipsanity: Glass Fence,SHIPSANITY,Archaeology
-8198,Shipping,Shipsanity: Glass Path,SHIPSANITY,Archaeology
-8199,Shipping,Shipsanity: Hardwood Display,SHIPSANITY,Archaeology
-8200,Shipping,Shipsanity: Wooden Display,SHIPSANITY,Archaeology
-8201,Shipping,Shipsanity: Dwarf Gadget: Infinite Volcano Simulation,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8202,Shipping,Shipsanity: Water Shifter,"SHIPSANITY,DEPRECATED",Archaeology
-8203,Shipping,Shipsanity: Brown Amanita,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
-8204,Shipping,Shipsanity: Swamp Herb,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
-8205,Shipping,Shipsanity: Void Mint Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8206,Shipping,Shipsanity: Vile Ancient Fruit Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8207,Shipping,Shipsanity: Void Mint Leaves,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
-8208,Shipping,Shipsanity: Vile Ancient Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
-8209,Shipping,Shipsanity: Void Minnow,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
-8210,Shipping,Shipsanity: Swamp Leech,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
-8211,Shipping,Shipsanity: Purple Algae,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8212,Shipping,Shipsanity: Giant Horsehoe Crab,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
-8213,Shipping,Shipsanity: Mushroom Kebab,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8214,Shipping,Shipsanity: Crayfish Soup,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8215,Shipping,Shipsanity: Pemmican,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8216,Shipping,Shipsanity: Void Mint Tea,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
-8217,Shipping,Shipsanity: Ginger Tincture,"SHIPSANITY,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul
-8218,Shipping,Shipsanity: Neanderthal Limb Bones,SHIPSANITY,Boarding House and Bus Stop Extension
-8219,Shipping,Shipsanity: Dinosaur Claw,SHIPSANITY,Boarding House and Bus Stop Extension
-8220,Shipping,Shipsanity: Special Pumpkin Soup,SHIPSANITY,Boarding House and Bus Stop Extension
-8221,Shipping,Shipsanity: Pterodactyl L Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension
-8222,Shipping,Shipsanity: Dinosaur Skull,SHIPSANITY,Boarding House and Bus Stop Extension
-8223,Shipping,Shipsanity: Dinosaur Tooth,SHIPSANITY,Boarding House and Bus Stop Extension
-8224,Shipping,Shipsanity: Pterodactyl Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Boarding House and Bus Stop Extension
-8225,Shipping,Shipsanity: Pterodactyl Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
-8226,Shipping,Shipsanity: Dinosaur Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension
-8227,Shipping,Shipsanity: Neanderthal Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
-8228,Shipping,Shipsanity: Dinosaur Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension
-8229,Shipping,Shipsanity: Dinosaur Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
-8230,Shipping,Shipsanity: Pterodactyl Phalange,SHIPSANITY,Boarding House and Bus Stop Extension
-8231,Shipping,Shipsanity: Pterodactyl Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension
-8232,Shipping,Shipsanity: Neanderthal Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension
-8233,Shipping,Shipsanity: Pterodactyl Skull,SHIPSANITY,Boarding House and Bus Stop Extension
-8234,Shipping,Shipsanity: Dinosaur Femur,SHIPSANITY,Boarding House and Bus Stop Extension
-8235,Shipping,Shipsanity: Pterodactyl Claw,SHIPSANITY,Boarding House and Bus Stop Extension
-8236,Shipping,Shipsanity: Neanderthal Skull,SHIPSANITY,Boarding House and Bus Stop Extension
-8237,Shipping,Shipsanity: Pterodactyl R Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension
-8238,Shipping,Shipsanity: Scrap Rust,SHIPSANITY,Archaeology
-8239,Shipping,Shipsanity: Rusty Path,SHIPSANITY,Archaeology
-8241,Shipping,Shipsanity: Digger's Delight,SHIPSANITY,Archaeology
-8242,Shipping,Shipsanity: Rocky Root Coffee,SHIPSANITY,Archaeology
-8243,Shipping,Shipsanity: Ancient Jello,SHIPSANITY,Archaeology
-8244,Shipping,Shipsanity: Bone Fence,SHIPSANITY,Archaeology
-8245,Shipping,Shipsanity: Grilled Cheese,SHIPSANITY,Binning Skill
-8246,Shipping,Shipsanity: Fish Casserole,SHIPSANITY,Binning Skill
-8247,Shipping,Shipsanity: Snatcher Worm,SHIPSANITY,Stardew Valley Expanded
+4201,Luau,Secret: Poison The Governor,"SECRETSANITY,EASY_SECRET",
+4202,Stardew Valley Fair,Secret: Grange Display Bribe,"SECRETSANITY,EASY_SECRET",
+4203,Stardew Valley Fair,Secret: Purple Lettuce,"SECRETSANITY,EASY_SECRET",
+4204,Marnie's Ranch,Secret: Make Marnie Laugh,"SECRETSANITY,EASY_SECRET",
+4205,Mayor's Manor,Secret: Jumpscare Lewis,"SECRETSANITY,EASY_SECRET",
+4206,Marnie's Ranch,Secret: Confront Marnie,"SECRETSANITY,EASY_SECRET",
+4207,Fishing,Secret: Lucky Purple Bobber,"SECRETSANITY,EASY_SECRET",
+4208,Witch's Hut,Secret: Free The Forsaken Souls,"SECRETSANITY,DIFFICULT_SECRET",
+4209,Feast of the Winter Star,Secret: Something For Santa,"SECRETSANITY,EASY_SECRET",
+4210,Menu,Secret: Thank the Devs,"SECRETSANITY,EASY_SECRET",
+4211,Menu,Secret: Annoy the Moon Man,"SECRETSANITY,DIFFICULT_SECRET",
+4212,Menu,Secret: Acknowledge the Lonely Stone,"SECRETSANITY,EASY_SECRET",
+4213,Menu,Secret: Jungle Junimo,"SECRETSANITY,EASY_SECRET",
+4214,Town,Secret: ??HMTGF??,"SECRETSANITY,EASY_SECRET",
+4215,Saloon,Secret: ??Pinky Lemon??,"SECRETSANITY,EASY_SECRET",
+4216,Sam's House,Secret: ??Foroguemon??,"SECRETSANITY,EASY_SECRET",
+4217,Town,Secret: Galaxies Will Heed Your Cry,"SECRETSANITY,EASY_SECRET",
+4219,Town,Secret: Strange Sighting,"SECRETSANITY,DIFFICULT_SECRET",
+4220,Farm,Fishing Secret: 'Boat',"SECRETSANITY,BEACH_FARM,FISHING_SECRET",
+4221,Town,Fishing Secret: Decorative Trash Can,"SECRETSANITY,FISHING_SECRET",
+4222,Island North,Fishing Secret: Foliage Print,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4223,Gourmand Frog Cave,Fishing Secret: Frog Hat,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4224,Pirate Cove,Fishing Secret: Gourmand Statue,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4225,Forest,Fishing Secret: Iridium Krobus,"SECRETSANITY,FISHING_SECRET",
+4226,Boat Tunnel,Fishing Secret: Lifesaver,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4227,Volcano - Floor 10,Fishing Secret: 'Physics 101',"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4228,Desert,Fishing Secret: Pyramid Decal,"SECRETSANITY,FISHING_SECRET",
+4229,Volcano Secret Beach,Fishing Secret: Squirrel Figurine,"SECRETSANITY,FISHING_SECRET,GINGER_ISLAND",
+4230,Railroad,Fishing Secret: 'Vista',"SECRETSANITY,FISHING_SECRET",
+4231,Secret Woods,Fishing Secret: Wall Basket,"SECRETSANITY,FISHING_SECRET",
+4232,The Mines - Floor 100,Secret: Summon Bone Serpent,"SECRETSANITY,EASY_SECRET",
+4233,Wizard Basement,Secret: Meowmere,"SECRETSANITY,EASY_SECRET",
+4234,Elliott's House,Secret: A Familiar Tune,"SECRETSANITY,EASY_SECRET",
+4235,Beach,Secret: Sea Monster Sighting,"SECRETSANITY,DIFFICULT_SECRET",
+4236,Forest,Secret: ...Bigfoot?,"SECRETSANITY,DIFFICULT_SECRET",
+4237,Farmhouse,Secret: Flubber Experiment,"SECRETSANITY,EASY_SECRET",
+4238,Wizard Basement,Secret: Seems Fishy,"SECRETSANITY,EASY_SECRET",
+4239,Railroad,Secret: 'Me me me me me me me me me me me me me me me me',"SECRETSANITY,DIFFICULT_SECRET",
+4240,Menu,Secret: Nice Try,"SECRETSANITY,EASY_SECRET",
+4241,Menu,Secret: Enjoy your new life here,"SECRETSANITY,EASY_SECRET",
+4242,Menu,Secret: 'What'd you expect?',"SECRETSANITY,EASY_SECRET",
+4243,Farm,Secret: Secret Iridium Stackmaster Trophy,"SECRETSANITY,DIFFICULT_SECRET",
+4244,Willy's Fish Shop,Secret: What kind of monster is this?,"SECRETSANITY,EASY_SECRET",
+4245,Pierre's General Store,Secret: My mouth is watering already,"SECRETSANITY,EASY_SECRET",
+4246,Sewer,Secret: A gift of lovely perfume,"SECRETSANITY,EASY_SECRET",
+4247,Mines Dwarf Shop,Secret: Where exactly does this juice come from?,"SECRETSANITY,EASY_SECRET",
+4261,Secret Notes,Secret Note #1: A Page From Abigail's Diary,"SECRETSANITY,SECRET_NOTE",
+4262,Secret Notes,Secret Note #2: Sam's Holiday Shopping List,"SECRETSANITY,SECRET_NOTE",
+4263,Secret Notes,Secret Note #3: Leah's Perfect Dinner,"SECRETSANITY,SECRET_NOTE",
+4264,Secret Notes,Secret Note #4: Maru's Greatest Invention Yet,"SECRETSANITY,SECRET_NOTE",
+4265,Secret Notes,Secret Note #5: Penny gets everyone something they love,"SECRETSANITY,SECRET_NOTE",
+4266,Secret Notes,Secret Note #6: Stardrop Saloon Special Orders,"SECRETSANITY,SECRET_NOTE",
+4267,Secret Notes,Secret Note #7: Older Bachelors In Town,"SECRETSANITY,SECRET_NOTE",
+4268,Secret Notes,Secret Note #8: To Haley And Emily,"SECRETSANITY,SECRET_NOTE",
+4269,Secret Notes,Secret Note #9: Alex's Strength Training Diet,"SECRETSANITY,SECRET_NOTE",
+4270,Secret Notes,Secret Note #10: Cryptic Note,"SECRETSANITY,SECRET_NOTE,REPLACES_PREVIOUS_LOCATION",
+4271,Secret Notes,Secret Note #11: Marnie's Memory,"SECRETSANITY,SECRET_NOTE",
+4272,Secret Notes,Secret Note #12: Good Things In Garbage Cans,"SECRETSANITY,SECRET_NOTE",
+4273,Secret Notes,Secret Note #13: Junimo Plush,"SECRETSANITY,SECRET_NOTE",
+4274,Secret Notes,Secret Note #14: Stone Junimo,"SECRETSANITY,SECRET_NOTE",
+4275,Secret Notes,Secret Note #15: Mermaid Show,"SECRETSANITY,SECRET_NOTE",
+4276,Secret Notes,Secret Note #16: Treasure Chest,"SECRETSANITY,SECRET_NOTE",
+4277,Secret Notes,Secret Note #17: Green Strange Doll,"SECRETSANITY,SECRET_NOTE",
+4278,Secret Notes,Secret Note #18: Yellow Strange Doll,"SECRETSANITY,SECRET_NOTE",
+4279,Secret Notes,Secret Note #19: Solid Gold Lewis,"SECRETSANITY,SECRET_NOTE",
+4280,Secret Notes,Secret Note #19: In Town For All To See,"SECRETSANITY,SECRET_NOTE",
+4281,Secret Notes,Secret Note #20: Special Charm,"SECRETSANITY,SECRET_NOTE",
+4282,Secret Notes,Secret Note #21: A Date In Nature,"SECRETSANITY,SECRET_NOTE",
+4283,Secret Notes,Secret Note #22: The Mysterious Qi,"SECRETSANITY,SECRET_NOTE,REPLACES_PREVIOUS_LOCATION",
+4284,Secret Notes,Secret Note #23: Strange Note,"SECRETSANITY,SECRET_NOTE,REPLACES_PREVIOUS_LOCATION",
+4285,Secret Notes,Secret Note #24: M. Jasper's Book On Junimos,"SECRETSANITY,SECRET_NOTE",
+4286,Secret Notes,Secret Note #25: Ornate Necklace,"SECRETSANITY,SECRET_NOTE",
+4287,Secret Notes,Secret Note #26: Ancient Farming Secrets,"SECRETSANITY,SECRET_NOTE",
+4288,Secret Notes,Secret Note #27: A Compendium Of My Greatest Discoveries,"SECRETSANITY,SECRET_NOTE",
+4289,Farm,Secret: Obtain my precious fruit whenever you like,"SECRETSANITY,EASY_SECRET,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+4301,Movie Theater,Watch A Movie,"ANY_MOVIE",
+4302,Movie Theater,Watch The Brave Little Sapling,"MOVIE",
+4303,Movie Theater,Watch Journey Of The Prairie King: The Motion Picture,"MOVIE",
+4304,Movie Theater,Watch Mysterium,"MOVIE",
+4305,Movie Theater,Watch The Miracle At Coldstar Ranch,"MOVIE",
+4306,Movie Theater,Watch Natural Wonders: Exploring Our Vibrant World,"MOVIE",
+4307,Movie Theater,Watch Wumbus,"MOVIE",
+4308,Movie Theater,Watch It Howls In The Rain,"MOVIE",
+4309,Movie Theater,Watch The Zuzu City Express,"MOVIE",
+4311,Movie Theater,Share Apple Slices,"MOVIE_SNACK",
+4312,Movie Theater,Share Black Licorice,"MOVIE_SNACK",
+4313,Movie Theater,Share Cappuccino Mousse Cake,"MOVIE_SNACK",
+4314,Movie Theater,Share Chocolate Popcorn,"MOVIE_SNACK",
+4315,Movie Theater,Share Cotton Candy,"MOVIE_SNACK",
+4316,Movie Theater,Share Fries,"MOVIE_SNACK",
+4317,Movie Theater,Share Hummus Snack Pack,"MOVIE_SNACK",
+4318,Movie Theater,Share Ice Cream Sandwich,"MOVIE_SNACK",
+4319,Movie Theater,Share Jasmine Tea,"MOVIE_SNACK",
+4320,Movie Theater,Share Jawbreaker,"MOVIE_SNACK",
+4321,Movie Theater,Share Joja Cola,"MOVIE_SNACK",
+4322,Movie Theater,Share JojaCorn,"MOVIE_SNACK",
+4323,Movie Theater,Share Kale Smoothie,"MOVIE_SNACK",
+4324,Movie Theater,Share Nachos,"MOVIE_SNACK",
+4325,Movie Theater,Share Panzanella Salad,"MOVIE_SNACK",
+4326,Movie Theater,Share Personal Pizza,"MOVIE_SNACK",
+4327,Movie Theater,Share Popcorn,"MOVIE_SNACK",
+4328,Movie Theater,Share Rock Candy,"MOVIE_SNACK",
+4329,Movie Theater,Share Salmon Burger,"MOVIE_SNACK",
+4330,Movie Theater,Share Salted Peanuts,"MOVIE_SNACK",
+4331,Movie Theater,Share Sour Slimes,"MOVIE_SNACK",
+4332,Movie Theater,Share Star Cookie,"MOVIE_SNACK",
+4333,Movie Theater,Share Stardrop Sorbet,"MOVIE_SNACK",
+4334,Movie Theater,Share Truffle Popcorn,"MOVIE_SNACK",
+4401,Community Center,AAAA Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4402,Community Center,Amon's Fall Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4403,Community Center,Anything For Beyonce Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4404,Community Center,Archipela-Go! Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4405,Community Center,Balls Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4406,Community Center,Big Grapes Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4407,Community Center,Bundle Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4408,Community Center,Bun-dle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4409,Community Center,Permit A38 Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4410,Community Center,Burger King Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4411,Community Center,Burger King's Revenge Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4412,Community Center,Caffeinated Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4413,Community Center,Cap Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4414,Community Center,Capitalist's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4415,Community Center,Chaos Emerald Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4416,Community Center,Cipher Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4417,Community Center,Clique Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4418,Community Center,Commitment Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4419,Community Center,Communism Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4420,Community Center,Cookie Clicker Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4421,Community Center,Crab Rave Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4422,Community Center,Death Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4423,Community Center,Doctor Angler Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4424,Community Center,Eg Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4425,Community Center,Exhaustion Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4426,Community Center,'Fruit' Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4427,Community Center,Hats Off To You Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4428,Community Center,Honorable Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4429,Community Center,Hurricane Tortilla Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4430,Community Center,Journalist's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4431,Community Center,Kent C. Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4432,Community Center,Legendairy Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4433,Community Center,Lemonade Stand Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4434,Community Center,Look At These Chickens Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4435,Community Center,Mermaid Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4436,Community Center,Minecraft Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4437,Community Center,Not The Bees Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4438,Community Center,Obelisks Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4439,Community Center,Off Your Back Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4440,Community Center,Potato Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4441,Community Center,Reverse Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4442,Community Center,Rick Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4443,Community Center,Romance Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4444,Community Center,Sappy Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4445,Community Center,Screw You Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4446,Community Center,Sisyphus Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4447,Community Center,SMAPI Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4448,Community Center,Snitch Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4449,Community Center,Speedrunner's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4450,Community Center,Sunmaid Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4451,Community Center,Tick Tock Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4452,Community Center,Tilesanity Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4453,Community Center,Trap Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4454,Community Center,Trout Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4455,Community Center,Vampire Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4456,Community Center,Vocaloid Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4457,Community Center,What The Rock Is Cooking Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4458,Community Center,The Floor Is Lava Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4459,Community Center,Fast Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4460,Community Center,Restraint Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4461,Community Center,Firstborn Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4462,Community Center,NFT Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4463,Community Center,Connection Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4464,Community Center,Flashbang Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4465,Community Center,This Is Fine Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4466,Community Center,IKEA Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4467,Community Center,Schrodinger's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4468,Community Center,ANIMAL WELL Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4469,Community Center,Automation Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4470,Community Center,Celeste Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4471,Community Center,Crap Pot Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4472,Community Center,Emmalution Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4473,Community Center,Joetg Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4474,Community Center,Honeywell Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4475,Community Center,Bad Farmer Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4476,Community Center,Bad Fisherman Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4477,Community Center,Gacha Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4478,Community Center,Hibernation Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4479,Community Center,Crowdfunding Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4480,Community Center,Clickbait Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4481,Community Center,DeathLink Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4482,Community Center,Humble Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4483,Community Center,ASMR Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4484,Community Center,Puzzle Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4485,Community Center,Cooperation Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4486,Community Center,Pomnut Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4487,Community Center,Ministry of Madness Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4488,Community Center,Loser Club Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4489,Community Center,Frazzleduck Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4490,Community Center,ArgonMatrix Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4491,Community Center,Pool Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4492,Community Center,Blossom Garden Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4493,Community Center,Scam Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4494,Community Center,Doctor Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4495,Community Center,Very Sticky Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4496,Community Center,Stanley Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4497,Community Center,Hairy Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4498,Community Center,Square Hole Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4499,Community Center,Hint Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4500,Community Center,Colored Crystals Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4501,Community Center,Catch And Release Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4502,Community Center,Pollution Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4503,Community Center,Sacrifice Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4504,Community Center,Dr Seuss Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4505,Community Center,TheAlGoreRhythm Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4506,Community Center,Distracted Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4507,Community Center,Reconnection Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MEME_BUNDLE",
+4601,Farm,Wear ???,"HATSANITY,HAT_POST_PERFECTION,GINGER_ISLAND",
+4602,Farm,Wear Abigail's Bow,"HATSANITY,HAT_RNG",
+4603,Farm,Wear Arcane Hat,"HATSANITY,HAT_NEAR_PERFECTION",
+4604,Farm,Wear Archer's Cap,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND",
+4605,Farm,Wear Beanie,"HATSANITY,HAT_TAILORING",
+4606,Farm,Wear Blobfish Mask,"HATSANITY,HAT_TAILORING",
+4607,Farm,Wear Blue Bonnet,"HATSANITY,HAT_MEDIUM",
+4608,Farm,Wear Blue Bow,"HATSANITY,HAT_EASY",
+4609,Farm,Wear Blue Cowboy Hat,"HATSANITY,HAT_RNG",
+4610,Farm,Wear Blue Ribbon,"HATSANITY,HAT_MEDIUM",
+4611,Farm,Wear Bluebird Mask,"HATSANITY,HAT_MEDIUM,GINGER_ISLAND",
+4612,Farm,Wear Bowler Hat,"HATSANITY,HAT_DIFFICULT",
+4613,Farm,Wear Bridal Veil,"HATSANITY,HAT_TAILORING",
+4614,Farm,Wear Bucket Hat,"HATSANITY,HAT_MEDIUM",
+4615,Farm,Wear Butterfly Bow,"HATSANITY,HAT_EASY",
+4616,Farm,Wear Cat Ears,"HATSANITY,HAT_MEDIUM",
+4617,Farm,Wear Chef Hat,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND",
+4618,Farm,Wear Chicken Mask,"HATSANITY,HAT_NEAR_PERFECTION",
+4619,Farm,Wear Cone Hat,"HATSANITY,HAT_EASY",
+4620,Farm,Wear Cool Cap,"HATSANITY,HAT_MEDIUM",
+4621,Farm,Wear Copper Pan,"HATSANITY,HAT_EASY",
+4622,Farm,Wear Cowboy Hat,"HATSANITY,HAT_NEAR_PERFECTION",
+4623,Farm,Wear Cowgal Hat,"HATSANITY,HAT_DIFFICULT",
+4624,Farm,Wear Cowpoke Hat,"HATSANITY,HAT_DIFFICULT,GINGER_ISLAND",
+4625,Farm,Wear Daisy,"HATSANITY,HAT_EASY",
+4626,Farm,Wear Dark Ballcap,"HATSANITY,HAT_RNG",
+4627,Farm,Wear Dark Cowboy Hat,"HATSANITY,HAT_RNG",
+4628,Farm,Wear Dark Velvet Bow,"HATSANITY,HAT_EASY",
+4629,Farm,Wear Delicate Bow,"HATSANITY,HAT_EASY",
+4630,Farm,Wear Deluxe Cowboy Hat,"HATSANITY,HAT_MEDIUM,GINGER_ISLAND",
+4631,Farm,Wear Deluxe Pirate Hat,"HATSANITY,HAT_RNG,GINGER_ISLAND",
+4632,Farm,Wear Dinosaur Hat,"HATSANITY,HAT_TAILORING",
+4633,Farm,Wear Earmuffs,"HATSANITY,HAT_MEDIUM",
+4634,Farm,Wear Elegant Turban,"HATSANITY,HAT_POST_PERFECTION,GINGER_ISLAND",
+4635,Farm,Wear Emily's Magic Hat,"HATSANITY,HAT_MEDIUM",
+4636,Farm,Wear Eye Patch,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND",
+4637,Farm,Wear Fashion Hat,"HATSANITY,HAT_TAILORING",
+4638,Farm,Wear Fedora,"HATSANITY,HAT_EASY",
+4639,Farm,Wear Fishing Hat,"HATSANITY,HAT_TAILORING",
+4640,Farm,Wear Flat Topped Hat,"HATSANITY,HAT_TAILORING",
+4641,Farm,Wear Floppy Beanie,"HATSANITY,HAT_TAILORING",
+4642,Farm,Wear Forager's Hat,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4643,Farm,Wear Frog Hat,"HATSANITY,HAT_MEDIUM,GINGER_ISLAND",
+4644,Farm,Wear Garbage Hat,"HATSANITY,HAT_RNG",
+4645,Farm,Wear Gil's Hat,"HATSANITY,HAT_DIFFICULT",
+4646,Farm,Wear Gnome's Cap,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+4647,Farm,Wear Goblin Mask,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND",
+4648,Farm,Wear Goggles,"HATSANITY,HAT_TAILORING",
+4649,Farm,Wear Gold Pan,"HATSANITY,HAT_MEDIUM",
+4650,Farm,Wear Golden Helmet,"HATSANITY,HAT_RNG,GINGER_ISLAND",
+4651,Farm,Wear Golden Mask,"HATSANITY,HAT_TAILORING",
+4652,Farm,Wear Good Ol' Cap,"HATSANITY,HAT_EASY",
+4653,Farm,Wear Governor's Hat,"HATSANITY,HAT_MEDIUM",
+4654,Farm,Wear Green Turban,"HATSANITY,HAT_MEDIUM",
+4655,Farm,Wear Hair Bone,"HATSANITY,HAT_TAILORING",
+4656,Farm,Wear Hard Hat,"HATSANITY,HAT_DIFFICULT",
+4657,Farm,Wear Hunter's Cap,"HATSANITY,HAT_MEDIUM",
+4658,Farm,Wear Infinity Crown,"HATSANITY,HAT_DIFFICULT,GINGER_ISLAND",
+4659,Farm,Wear Iridium Pan,"HATSANITY,HAT_MEDIUM",
+4660,Farm,Wear Jester Hat,"HATSANITY,HAT_EASY",
+4661,Farm,Wear Joja Cap,"HATSANITY,HAT_RNG",
+4662,Farm,Wear Junimo Hat,"HATSANITY,HAT_POST_PERFECTION,GINGER_ISLAND",
+4663,Farm,Wear Knight's Helmet,"HATSANITY,HAT_NEAR_PERFECTION",
+4664,Farm,Wear Laurel Wreath Crown,"HATSANITY,HAT_RNG",
+4665,Farm,Wear Leprechaun Hat,"HATSANITY,HAT_EASY",
+4666,Farm,Wear Living Hat,"HATSANITY,HAT_RNG",
+4667,Farm,Wear Logo Cap,"HATSANITY,HAT_TAILORING",
+4668,Farm,Wear Lucky Bow,"HATSANITY,HAT_MEDIUM",
+4669,Farm,Wear Magic Cowboy Hat,"HATSANITY,HAT_DIFFICULT",
+4670,Farm,Wear Magic Turban,"HATSANITY,HAT_DIFFICULT",
+4671,Farm,Wear Mouse Ears,"HATSANITY,HAT_EASY",
+4672,Farm,Wear Mr. Qi's Hat,"HATSANITY,HAT_MEDIUM,GINGER_ISLAND",
+4673,Farm,Wear Mummy Mask,"HATSANITY,HAT_EASY",
+4674,Farm,Wear Mushroom Cap,"HATSANITY,HAT_RNG",
+4675,Farm,Wear Mystery Hat,"HATSANITY,HAT_RNG",
+4676,Farm,Wear Official Cap,"HATSANITY,HAT_MEDIUM",
+4677,Farm,Wear Pageboy Cap,"HATSANITY,HAT_NEAR_PERFECTION,GINGER_ISLAND",
+4678,Farm,Wear Panda Hat,"HATSANITY,HAT_IMPOSSIBLE,DEPRECATED",
+4679,Farm,Wear Paper Hat,"HATSANITY,HAT_EASY,GINGER_ISLAND",
+4680,Farm,Wear Party Hat (Blue),"HATSANITY,HAT_TAILORING",
+4681,Farm,Wear Party Hat (Green),"HATSANITY,HAT_TAILORING",
+4682,Farm,Wear Party Hat (Red),"HATSANITY,HAT_TAILORING",
+4683,Farm,Wear Pink Bow,"HATSANITY,HAT_EASY,GINGER_ISLAND",
+4684,Farm,Wear Pirate Hat,"HATSANITY,HAT_TAILORING",
+4685,Farm,Wear Plum Chapeau,"HATSANITY,HAT_DIFFICULT",
+4686,Farm,Wear Polka Bow,"HATSANITY,HAT_MEDIUM",
+4687,Farm,Wear Propeller Hat,"HATSANITY,HAT_TAILORING",
+4688,Farm,Wear Pumpkin Mask,"HATSANITY,HAT_TAILORING",
+4689,Farm,Wear Qi Mask,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4690,Farm,Wear Raccoon Hat,"HATSANITY,HAT_MEDIUM",
+4691,Farm,Wear Radioactive Goggles,"HATSANITY,HAT_TAILORING,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+4692,Farm,Wear Red Cowboy Hat,"HATSANITY,HAT_RNG",
+4693,Farm,Wear Red Fez,"HATSANITY,HAT_MEDIUM",
+4694,Farm,Wear Sailor's Cap,"HATSANITY,HAT_EASY",
+4695,Farm,Wear Santa Hat,"HATSANITY,HAT_MEDIUM",
+4696,Farm,Wear Skeleton Mask,"HATSANITY,HAT_MEDIUM",
+4697,Farm,Wear Small Cap,"HATSANITY,HAT_MEDIUM,GINGER_ISLAND",
+4698,Farm,Wear Sombrero,"HATSANITY,HAT_NEAR_PERFECTION",
+4699,Farm,Wear Sou'wester,"HATSANITY,HAT_EASY",
+4700,Farm,Wear Space Helmet,"HATSANITY,HAT_DIFFICULT,GINGER_ISLAND",
+4701,Farm,Wear Sports Cap,"HATSANITY,HAT_MEDIUM",
+4702,Farm,Wear Spotted Headscarf,"HATSANITY,HAT_TAILORING",
+4703,Farm,Wear Squid Hat,"HATSANITY,HAT_MEDIUM",
+4704,Farm,Wear Squire's Helmet,"HATSANITY,HAT_RNG",
+4705,Farm,Wear Star Helmet,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4706,Farm,Wear Steel Pan,"HATSANITY,HAT_MEDIUM",
+4707,Farm,Wear Straw Hat,"HATSANITY,HAT_MEDIUM",
+4708,Farm,Wear Sunglasses,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4709,Farm,Wear Swashbuckler Hat,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4710,Farm,Wear Tiara,"HATSANITY,HAT_EASY",
+4711,Farm,Wear Tiger Hat,"HATSANITY,HAT_RNG,GINGER_ISLAND",
+4712,Farm,Wear Top Hat,"HATSANITY,HAT_EASY",
+4713,Farm,Wear Totem Mask,"HATSANITY,HAT_TAILORING",
+4714,Farm,Wear Tricorn Hat,"HATSANITY,HAT_RNG",
+4715,Farm,Wear Tropiclip,"HATSANITY,HAT_EASY",
+4716,Farm,Wear Trucker Hat,"HATSANITY,HAT_MEDIUM",
+4717,Farm,Wear Warrior Helmet,"HATSANITY,HAT_TAILORING,GINGER_ISLAND",
+4718,Farm,Wear Watermelon Band,"HATSANITY,HAT_DIFFICULT",
+4719,Farm,Wear Wearable Dwarf Helm,"HATSANITY,HAT_TAILORING",
+4720,Farm,Wear White Bow,"HATSANITY,HAT_DIFFICULT",
+4721,Farm,Wear White Turban,"HATSANITY,HAT_TAILORING",
+4722,Farm,Wear Witch Hat,"HATSANITY,HAT_TAILORING",
+4751,Farm,Eat Wild Horseradish,"EATSANITY,EATSANITY_CROP",
+4752,Farm,Eat Daffodil,"EATSANITY,EATSANITY_CROP",
+4753,Farm,Eat Leek,"EATSANITY,EATSANITY_CROP",
+4754,Farm,Eat Dandelion,"EATSANITY,EATSANITY_CROP",
+4755,Farm,Eat Parsnip,"EATSANITY,EATSANITY_CROP",
+4756,Farm,Eat Cave Carrot,"EATSANITY,EATSANITY_CROP",
+4757,Farm,Eat Cactus Fruit,"EATSANITY,EATSANITY_CROP",
+4758,Farm,Eat Green Bean,"EATSANITY,EATSANITY_CROP",
+4759,Farm,Eat Cauliflower,"EATSANITY,EATSANITY_CROP",
+4760,Farm,Eat Potato,"EATSANITY,EATSANITY_CROP",
+4761,Farm,Eat Garlic,"EATSANITY,EATSANITY_CROP",
+4762,Farm,Eat Kale,"EATSANITY,EATSANITY_CROP",
+4763,Farm,Eat Melon,"EATSANITY,EATSANITY_CROP",
+4764,Farm,Eat Tomato,"EATSANITY,EATSANITY_CROP",
+4765,Farm,Eat Morel,"EATSANITY,EATSANITY_CROP",
+4766,Farm,Eat Blueberry,"EATSANITY,EATSANITY_CROP",
+4767,Farm,Eat Fiddlehead Fern,"EATSANITY,EATSANITY_CROP",
+4768,Farm,Eat Hot Pepper,"EATSANITY,EATSANITY_CROP",
+4769,Farm,Eat Radish,"EATSANITY,EATSANITY_CROP",
+4770,Farm,Eat Red Cabbage,"EATSANITY,EATSANITY_CROP",
+4771,Farm,Eat Starfruit,"EATSANITY,EATSANITY_CROP",
+4772,Farm,Eat Corn,"EATSANITY,EATSANITY_CROP",
+4773,Farm,Eat Unmilled Rice,"EATSANITY,EATSANITY_CROP",
+4774,Farm,Eat Eggplant,"EATSANITY,EATSANITY_CROP",
+4775,Farm,Eat Artichoke,"EATSANITY,EATSANITY_CROP",
+4776,Farm,Eat Bok Choy,"EATSANITY,EATSANITY_CROP",
+4777,Farm,Eat Yam,"EATSANITY,EATSANITY_CROP",
+4778,Farm,Eat Chanterelle,"EATSANITY,EATSANITY_CROP",
+4779,Farm,Eat Cranberries,"EATSANITY,EATSANITY_CROP",
+4780,Farm,Eat Beet,"EATSANITY,EATSANITY_CROP",
+4781,Farm,Eat Salmonberry,"EATSANITY,EATSANITY_CROP",
+4782,Farm,Eat Amaranth,"EATSANITY,EATSANITY_CROP",
+4783,Farm,Eat Hops,"EATSANITY,EATSANITY_CROP",
+4784,Farm,Eat Spice Berry,"EATSANITY,EATSANITY_CROP",
+4785,Farm,Eat Grape,"EATSANITY,EATSANITY_CROP",
+4786,Farm,Eat Spring Onion,"EATSANITY,EATSANITY_CROP",
+4787,Farm,Eat Strawberry,"EATSANITY,EATSANITY_CROP",
+4788,Farm,Eat Sweet Pea,"EATSANITY,EATSANITY_CROP",
+4789,Farm,Eat Common Mushroom,"EATSANITY,EATSANITY_CROP",
+4790,Farm,Eat Wild Plum,"EATSANITY,EATSANITY_CROP",
+4791,Farm,Eat Hazelnut,"EATSANITY,EATSANITY_CROP",
+4792,Farm,Eat Blackberry,"EATSANITY,EATSANITY_CROP",
+4793,Farm,Eat Winter Root,"EATSANITY,EATSANITY_CROP",
+4794,Farm,Eat Crystal Fruit,"EATSANITY,EATSANITY_CROP",
+4795,Farm,Eat Snow Yam,"EATSANITY,EATSANITY_CROP",
+4796,Farm,Eat Crocus,"EATSANITY,EATSANITY_CROP",
+4797,Farm,Eat Sunflower,"EATSANITY,EATSANITY_CROP",
+4798,Farm,Eat Purple Mushroom,"EATSANITY,EATSANITY_CROP",
+4799,Farm,Eat Tulip,"EATSANITY,EATSANITY_CROP",
+4800,Farm,Eat Summer Spangle,"EATSANITY,EATSANITY_CROP",
+4801,Farm,Eat Fairy Rose,"EATSANITY,EATSANITY_CROP",
+4802,Farm,Eat Blue Jazz,"EATSANITY,EATSANITY_CROP",
+4803,Farm,Eat Poppy,"EATSANITY,EATSANITY_CROP",
+4804,Farm,Eat Apple,"EATSANITY,EATSANITY_CROP",
+4805,Farm,Eat Apricot,"EATSANITY,EATSANITY_CROP",
+4806,Farm,Eat Orange,"EATSANITY,EATSANITY_CROP",
+4807,Farm,Eat Peach,"EATSANITY,EATSANITY_CROP",
+4808,Farm,Eat Pomegranate,"EATSANITY,EATSANITY_CROP",
+4809,Farm,Eat Cherry,"EATSANITY,EATSANITY_CROP",
+4810,Farm,Eat Banana,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4811,Farm,Eat Ginger,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4812,Farm,Eat Taro Root,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4813,Farm,Eat Pineapple,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4814,Farm,Eat Mango,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4815,Farm,Eat Magma Cap,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND",
+4816,Farm,Eat Qi Fruit,"EATSANITY,EATSANITY_CROP,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+4817,Farm,Eat Carrot,"EATSANITY,EATSANITY_CROP",
+4818,Farm,Eat Summer Squash,"EATSANITY,EATSANITY_CROP",
+4819,Farm,Eat Broccoli,"EATSANITY,EATSANITY_CROP",
+4820,Farm,Eat Powdermelon,"EATSANITY,EATSANITY_CROP",
+4831,Farm,Eat Fried Egg,"EATSANITY,EATSANITY_COOKING",
+4832,Farm,Eat Omelet,"EATSANITY,EATSANITY_COOKING",
+4833,Farm,Eat Salad,"EATSANITY,EATSANITY_COOKING",
+4834,Farm,Eat Cheese Cauliflower,"EATSANITY,EATSANITY_COOKING",
+4835,Farm,Eat Baked Fish,"EATSANITY,EATSANITY_COOKING",
+4836,Farm,Eat Parsnip Soup,"EATSANITY,EATSANITY_COOKING",
+4837,Farm,Eat Vegetable Medley,"EATSANITY,EATSANITY_COOKING",
+4838,Farm,Eat Complete Breakfast,"EATSANITY,EATSANITY_COOKING",
+4839,Farm,Eat Fried Calamari,"EATSANITY,EATSANITY_COOKING",
+4840,Farm,Eat Strange Bun,"EATSANITY,EATSANITY_COOKING",
+4841,Farm,Eat Lucky Lunch,"EATSANITY,EATSANITY_COOKING",
+4842,Farm,Eat Fried Mushroom,"EATSANITY,EATSANITY_COOKING",
+4843,Farm,Eat Pizza,"EATSANITY,EATSANITY_COOKING",
+4844,Farm,Eat Bean Hotpot,"EATSANITY,EATSANITY_COOKING",
+4845,Farm,Eat Glazed Yams,"EATSANITY,EATSANITY_COOKING",
+4846,Farm,Eat Carp Surprise,"EATSANITY,EATSANITY_COOKING",
+4847,Farm,Eat Hashbrowns,"EATSANITY,EATSANITY_COOKING",
+4848,Farm,Eat Pancakes,"EATSANITY,EATSANITY_COOKING",
+4849,Farm,Eat Salmon Dinner,"EATSANITY,EATSANITY_COOKING",
+4850,Farm,Eat Fish Taco,"EATSANITY,EATSANITY_COOKING",
+4851,Farm,Eat Crispy Bass,"EATSANITY,EATSANITY_COOKING",
+4852,Farm,Eat Pepper Poppers,"EATSANITY,EATSANITY_COOKING",
+4853,Farm,Eat Bread,"EATSANITY,EATSANITY_COOKING",
+4854,Farm,Eat Tom Kha Soup,"EATSANITY,EATSANITY_COOKING",
+4855,Farm,Eat Trout Soup,"EATSANITY,EATSANITY_COOKING",
+4856,Farm,Eat Chocolate Cake,"EATSANITY,EATSANITY_COOKING",
+4857,Farm,Eat Pink Cake,"EATSANITY,EATSANITY_COOKING",
+4858,Farm,Eat Rhubarb Pie,"EATSANITY,EATSANITY_COOKING",
+4859,Farm,Eat Cookies,"EATSANITY,EATSANITY_COOKING",
+4860,Farm,Eat Spaghetti,"EATSANITY,EATSANITY_COOKING",
+4861,Farm,Eat Fried Eel,"EATSANITY,EATSANITY_COOKING",
+4862,Farm,Eat Spicy Eel,"EATSANITY,EATSANITY_COOKING",
+4863,Farm,Eat Sashimi,"EATSANITY,EATSANITY_COOKING",
+4864,Farm,Eat Maki Roll,"EATSANITY,EATSANITY_COOKING",
+4865,Farm,Eat Tortilla,"EATSANITY,EATSANITY_COOKING",
+4866,Farm,Eat Red Plate,"EATSANITY,EATSANITY_COOKING",
+4867,Farm,Eat Eggplant Parmesan,"EATSANITY,EATSANITY_COOKING",
+4868,Farm,Eat Rice Pudding,"EATSANITY,EATSANITY_COOKING",
+4869,Farm,Eat Ice Cream,"EATSANITY,EATSANITY_COOKING",
+4870,Farm,Eat Blueberry Tart,"EATSANITY,EATSANITY_COOKING",
+4871,Farm,Eat Autumn's Bounty,"EATSANITY,EATSANITY_COOKING",
+4872,Farm,Eat Pumpkin Soup,"EATSANITY,EATSANITY_COOKING",
+4873,Farm,Eat Super Meal,"EATSANITY,EATSANITY_COOKING",
+4874,Farm,Eat Cranberry Sauce,"EATSANITY,EATSANITY_COOKING",
+4875,Farm,Eat Stuffing,"EATSANITY,EATSANITY_COOKING",
+4876,Farm,Eat Farmer's Lunch,"EATSANITY,EATSANITY_COOKING",
+4877,Farm,Eat Survival Burger,"EATSANITY,EATSANITY_COOKING",
+4878,Farm,Eat Dish O' The Sea,"EATSANITY,EATSANITY_COOKING",
+4879,Farm,Eat Miner's Treat,"EATSANITY,EATSANITY_COOKING",
+4880,Farm,Eat Roots Platter,"EATSANITY,EATSANITY_COOKING",
+4881,Farm,Drink Triple Shot Espresso,"EATSANITY,EATSANITY_COOKING",
+4882,Farm,Eat Field Snack,"EATSANITY,EATSANITY_COOKING",
+4883,Farm,Eat Algae Soup,"EATSANITY,EATSANITY_COOKING",
+4884,Farm,Eat Pale Broth,"EATSANITY,EATSANITY_COOKING",
+4885,Farm,Eat Plum Pudding,"EATSANITY,EATSANITY_COOKING",
+4886,Farm,Eat Artichoke Dip,"EATSANITY,EATSANITY_COOKING",
+4887,Farm,Eat Stir Fry,"EATSANITY,EATSANITY_COOKING",
+4888,Farm,Eat Roasted Hazelnuts,"EATSANITY,EATSANITY_COOKING",
+4889,Farm,Eat Pumpkin Pie,"EATSANITY,EATSANITY_COOKING",
+4890,Farm,Eat Radish Salad,"EATSANITY,EATSANITY_COOKING",
+4891,Farm,Eat Fruit Salad,"EATSANITY,EATSANITY_COOKING",
+4892,Farm,Eat Blackberry Cobbler,"EATSANITY,EATSANITY_COOKING",
+4893,Farm,Drink Cranberry Candy,"EATSANITY,EATSANITY_COOKING",
+4894,Farm,Eat Bruschetta,"EATSANITY,EATSANITY_COOKING",
+4895,Farm,Eat Coleslaw,"EATSANITY,EATSANITY_COOKING",
+4896,Farm,Eat Fiddlehead Risotto,"EATSANITY,EATSANITY_COOKING",
+4897,Farm,Eat Poppyseed Muffin,"EATSANITY,EATSANITY_COOKING",
+4898,Farm,Eat Chowder,"EATSANITY,EATSANITY_COOKING",
+4899,Farm,Eat Lobster Bisque,"EATSANITY,EATSANITY_COOKING",
+4900,Farm,Eat Fish Stew,"EATSANITY,EATSANITY_COOKING",
+4901,Farm,Eat Escargot,"EATSANITY,EATSANITY_COOKING",
+4902,Farm,Eat Maple Bar,"EATSANITY,EATSANITY_COOKING",
+4903,Farm,Eat Crab Cakes,"EATSANITY,EATSANITY_COOKING",
+4904,Farm,Eat Shrimp Cocktail,"EATSANITY,EATSANITY_COOKING",
+4905,Farm,Drink Oil of Garlic,"EATSANITY,EATSANITY_COOKING",
+4906,Farm,Drink Life Elixir,"EATSANITY,EATSANITY_COOKING",
+4907,Farm,Eat Seafoam Pudding,"EATSANITY,EATSANITY_COOKING",
+4908,Farm,Eat Bug Steak,"EATSANITY,EATSANITY_COOKING",
+4909,Farm,Drink Ginger Ale,"EATSANITY,EATSANITY_COOKING,GINGER_ISLAND",
+4910,Farm,Eat Banana Pudding,"EATSANITY,EATSANITY_COOKING,GINGER_ISLAND",
+4911,Farm,Eat Mango Sticky Rice,"EATSANITY,EATSANITY_COOKING,GINGER_ISLAND",
+4912,Farm,Eat Poi,"EATSANITY,EATSANITY_COOKING,GINGER_ISLAND",
+4913,Farm,Eat Tropical Curry,"EATSANITY,EATSANITY_COOKING,GINGER_ISLAND",
+4914,Farm,Eat Squid Ink Ravioli,"EATSANITY,EATSANITY_COOKING",
+4915,Farm,Drink Moss Soup,"EATSANITY,EATSANITY_COOKING",
+4921,Farm,Eat Egg,"EATSANITY,EATSANITY_ARTISAN",
+4922,Farm,Eat Large Egg,"EATSANITY,EATSANITY_ARTISAN",
+4923,Farm,Eat Egg (Brown),"EATSANITY,EATSANITY_ARTISAN",
+4924,Farm,Eat Large Egg (Brown),"EATSANITY,EATSANITY_ARTISAN",
+4925,Farm,Drink Milk,"EATSANITY,EATSANITY_ARTISAN",
+4926,Farm,Drink Large Milk,"EATSANITY,EATSANITY_ARTISAN",
+4927,Farm,Drink Pale Ale,"EATSANITY,EATSANITY_ARTISAN",
+4928,Farm,Drink Mayonnaise,"EATSANITY,EATSANITY_ARTISAN",
+4929,Farm,Drink Duck Mayonnaise,"EATSANITY,EATSANITY_ARTISAN",
+4930,Farm,Drink Beer,"EATSANITY,EATSANITY_ARTISAN",
+4931,Farm,Drink Wine,"EATSANITY,EATSANITY_ARTISAN",
+4932,Farm,Drink Juice,"EATSANITY,EATSANITY_ARTISAN",
+4933,Farm,Drink Coffee,"EATSANITY,EATSANITY_ARTISAN",
+4934,Farm,Eat Cheese,"EATSANITY,EATSANITY_ARTISAN",
+4935,Farm,Eat Goat Cheese,"EATSANITY,EATSANITY_ARTISAN",
+4936,Farm,Eat Truffle,"EATSANITY,EATSANITY_ARTISAN",
+4937,Farm,Drink Truffle Oil,"EATSANITY,EATSANITY_ARTISAN",
+4938,Farm,Drink Goat Milk,"EATSANITY,EATSANITY_ARTISAN",
+4939,Farm,Drink Large Goat Milk,"EATSANITY,EATSANITY_ARTISAN",
+4940,Farm,Eat Duck Egg,"EATSANITY,EATSANITY_ARTISAN",
+4941,Farm,Eat Aged Roe,"EATSANITY,EATSANITY_ARTISAN",
+4942,Farm,Drink Mead,"EATSANITY,EATSANITY_ARTISAN",
+4943,Farm,Drink Green Tea,"EATSANITY,EATSANITY_ARTISAN",
+4944,Farm,Drink Maple Syrup,"EATSANITY,EATSANITY_ARTISAN",
+4945,Farm,Drink Dinosaur Mayonnaise,"EATSANITY,EATSANITY_ARTISAN",
+4946,Farm,Eat Roe,"EATSANITY,EATSANITY_ARTISAN",
+4947,Farm,Eat Caviar,"EATSANITY,EATSANITY_ARTISAN",
+4948,Farm,Eat Ostrich Egg,"EATSANITY,EATSANITY_ARTISAN,GINGER_ISLAND",
+4949,Farm,Eat Golden Egg,"EATSANITY,EATSANITY_ARTISAN",
+4950,Farm,Drink Mystic Syrup,"EATSANITY,EATSANITY_ARTISAN,REQUIRES_MASTERIES",
+4951,Farm,Eat Raisins,"EATSANITY,EATSANITY_ARTISAN",
+4952,Farm,Drink Jelly,"EATSANITY,EATSANITY_ARTISAN",
+4953,Farm,Drink Pickles,"EATSANITY,EATSANITY_ARTISAN",
+4954,Farm,Eat Rice,"EATSANITY,EATSANITY_ARTISAN",
+4955,Farm,Eat Sugar,"EATSANITY,EATSANITY_ARTISAN",
+4956,Farm,Eat Wheat Flour,"EATSANITY,EATSANITY_ARTISAN",
+4957,Farm,Drink Oil,"EATSANITY,EATSANITY_ARTISAN",
+4958,Farm,Drink Vinegar,"EATSANITY,EATSANITY_ARTISAN",
+4959,Farm,Eat Smoked Fish,"EATSANITY,EATSANITY_ARTISAN",
+4960,Farm,Eat Dried Fruit,"EATSANITY,EATSANITY_ARTISAN",
+4961,Farm,Eat Dried Mushrooms,"EATSANITY,EATSANITY_ARTISAN",
+4971,Farm,Eat Anchovy,"EATSANITY,EATSANITY_FISH",
+4972,Farm,Eat Tuna,"EATSANITY,EATSANITY_FISH",
+4973,Farm,Eat Sardine,"EATSANITY,EATSANITY_FISH",
+4974,Farm,Eat Bream,"EATSANITY,EATSANITY_FISH",
+4975,Farm,Eat Largemouth Bass,"EATSANITY,EATSANITY_FISH",
+4976,Farm,Eat Smallmouth Bass,"EATSANITY,EATSANITY_FISH",
+4977,Farm,Eat Rainbow Trout,"EATSANITY,EATSANITY_FISH",
+4978,Farm,Eat Salmon,"EATSANITY,EATSANITY_FISH",
+4979,Farm,Eat Walleye,"EATSANITY,EATSANITY_FISH",
+4980,Farm,Eat Perch,"EATSANITY,EATSANITY_FISH",
+4981,Farm,Eat Carp,"EATSANITY,EATSANITY_FISH",
+4982,Farm,Eat Catfish,"EATSANITY,EATSANITY_FISH",
+4983,Farm,Eat Pike,"EATSANITY,EATSANITY_FISH",
+4984,Farm,Eat Sunfish,"EATSANITY,EATSANITY_FISH",
+4985,Farm,Eat Red Mullet,"EATSANITY,EATSANITY_FISH",
+4986,Farm,Eat Herring,"EATSANITY,EATSANITY_FISH",
+4987,Farm,Eat Eel,"EATSANITY,EATSANITY_FISH",
+4988,Farm,Eat Red Snapper,"EATSANITY,EATSANITY_FISH",
+4989,Farm,Eat Squid,"EATSANITY,EATSANITY_FISH",
+4990,Farm,Eat Seaweed,"EATSANITY,EATSANITY_FISH",
+4991,Farm,Eat Green Algae,"EATSANITY,EATSANITY_FISH",
+4992,Farm,Eat Super Cucumber,"EATSANITY,EATSANITY_FISH",
+4993,Farm,Eat Ghostfish,"EATSANITY,EATSANITY_FISH",
+4994,Farm,Eat White Algae,"EATSANITY,EATSANITY_FISH",
+4995,Farm,Eat Crimsonfish,"EATSANITY,EATSANITY_FISH",
+4996,Farm,Eat Angler,"EATSANITY,EATSANITY_FISH",
+4997,Farm,Eat Ice Pip,"EATSANITY,EATSANITY_FISH",
+4998,Farm,Eat Lava Eel,"EATSANITY,EATSANITY_FISH",
+4999,Farm,Eat Legend,"EATSANITY,EATSANITY_FISH",
+5000,Farm,Eat Sandfish,"EATSANITY,EATSANITY_FISH",
+5001,Farm,Eat Mutant Carp,"EATSANITY,EATSANITY_FISH",
+5002,Farm,Eat Sturgeon,"EATSANITY,EATSANITY_FISH",
+5003,Farm,Eat Tiger Trout,"EATSANITY,EATSANITY_FISH",
+5004,Farm,Eat Bullhead,"EATSANITY,EATSANITY_FISH",
+5005,Farm,Eat Tilapia,"EATSANITY,EATSANITY_FISH",
+5006,Farm,Eat Chub,"EATSANITY,EATSANITY_FISH",
+5007,Farm,Eat Dorado,"EATSANITY,EATSANITY_FISH",
+5008,Farm,Eat Albacore,"EATSANITY,EATSANITY_FISH",
+5009,Farm,Eat Shad,"EATSANITY,EATSANITY_FISH",
+5010,Farm,Eat Lingcod,"EATSANITY,EATSANITY_FISH",
+5011,Farm,Eat Halibut,"EATSANITY,EATSANITY_FISH",
+5012,Farm,Eat Woodskip,"EATSANITY,EATSANITY_FISH",
+5013,Farm,Eat Glacierfish,"EATSANITY,EATSANITY_FISH",
+5014,Farm,Eat Void Salmon,"EATSANITY,EATSANITY_FISH",
+5015,Farm,Eat Slimejack,"EATSANITY,EATSANITY_FISH",
+5016,Farm,Eat Midnight Squid,"EATSANITY,EATSANITY_FISH",
+5017,Farm,Eat Spook Fish,"EATSANITY,EATSANITY_FISH",
+5018,Farm,Eat Blobfish,"EATSANITY,EATSANITY_FISH",
+5019,Farm,Eat Flounder,"EATSANITY,EATSANITY_FISH",
+5020,Farm,Eat Midnight Carp,"EATSANITY,EATSANITY_FISH",
+5021,Farm,Eat Stingray,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND",
+5022,Farm,Eat Lionfish,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND",
+5023,Farm,Eat Blue Discus,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND",
+5024,Farm,Eat Son of Crimsonfish,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5025,Farm,Eat Ms. Angler,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5026,Farm,Eat Legend II,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5027,Farm,Eat Radioactive Carp,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5028,Farm,Eat Glacierfish Jr.,"EATSANITY,EATSANITY_FISH,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5029,Farm,Eat Sea Jelly,"EATSANITY,EATSANITY_FISH",
+5030,Farm,Eat Cave Jelly,"EATSANITY,EATSANITY_FISH",
+5031,Farm,Eat River Jelly,"EATSANITY,EATSANITY_FISH",
+5032,Farm,Drink Joja Cola,"EATSANITY,EATSANITY_FISH",
+5041,Farm,Eat Magic Rock Candy,"EATSANITY,EATSANITY_SHOP",
+5042,Farm,Drink Energy Tonic,"EATSANITY,EATSANITY_SHOP",
+5043,Farm,Drink Muscle Remedy,"EATSANITY,EATSANITY_SHOP",
+5044,Farm,Drink Pina Colada,"EATSANITY,EATSANITY_SHOP,GINGER_ISLAND",
+5045,Farm,Eat Stardrop,"EATSANITY,EATSANITY_SHOP",
+5051,Farm,Eat Sap,"EATSANITY,EATSANITY_CROP,EATSANITY_POISONOUS",
+5052,Farm,Eat Holly,"EATSANITY,EATSANITY_CROP,EATSANITY_POISONOUS",
+5053,Farm,Eat Red Mushroom,"EATSANITY,EATSANITY_CROP,EATSANITY_POISONOUS",
+5054,Farm,Eat Void Egg,"EATSANITY,EATSANITY_ARTISAN,EATSANITY_POISONOUS",
+5055,Farm,Drink Void Mayonnaise,"EATSANITY,EATSANITY_ARTISAN,EATSANITY_POISONOUS",
+5056,Farm,Eat Pufferfish,"EATSANITY,EATSANITY_FISH,EATSANITY_POISONOUS",
+5057,Farm,Eat Sea Cucumber,"EATSANITY,EATSANITY_FISH,EATSANITY_POISONOUS",
+5058,Farm,Eat Goby,"EATSANITY,EATSANITY_FISH,EATSANITY_POISONOUS",
+5059,Farm,Eat Scorpion Carp,"EATSANITY,EATSANITY_FISH,EATSANITY_POISONOUS",
+5060,Farm,Drink Iridium Snake Milk,"EATSANITY,EATSANITY_ARTISAN,EATSANITY_POISONOUS",
+5101,Wizard Blueprints,Earth Obelisk Blueprint,"ENDGAME_LOCATIONS",
+5102,Wizard Blueprints,Water Obelisk Blueprint,"ENDGAME_LOCATIONS",
+5103,Wizard Blueprints,Desert Obelisk Blueprint,"ENDGAME_LOCATIONS",
+5104,Wizard Blueprints,Island Obelisk Blueprint,"ENDGAME_LOCATIONS,GINGER_ISLAND",
+5105,Wizard Blueprints,Junimo Hut Blueprint,"ENDGAME_LOCATIONS",
+5106,Wizard Blueprints,Gold Clock Blueprint,"ENDGAME_LOCATIONS",
+5107,Sewer,Purchase Return Scepter,"ENDGAME_LOCATIONS",
+5108,Carpenter Shop,Pam House Blueprint,"ENDGAME_LOCATIONS",
+5109,Carpenter Shop,Forest To Beach Shortcut Blueprint,"ENDGAME_LOCATIONS",
+5110,Carpenter Shop,Mountain Shortcuts Blueprint,"ENDGAME_LOCATIONS",
+5112,Carpenter Shop,Town To Tide Pools Shortcut Blueprint,"ENDGAME_LOCATIONS",
+5113,Carpenter Shop,Tunnel To Backwoods Shortcut Blueprint,"ENDGAME_LOCATIONS",
+5115,Qi's Walnut Room,Purchase Horse Flute,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5116,Qi's Walnut Room,Purchase Pierre's Missing Stocklist,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5117,Qi's Walnut Room,Purchase Key To The Town,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5118,Qi's Walnut Room,Purchase Mini-Shipping Bin,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5119,Qi's Walnut Room,Purchase Exotic Double Bed,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5120,Qi's Walnut Room,Purchase Golden Egg,"ENDGAME_LOCATIONS,GINGER_ISLAND,REQUIRES_QI_ORDERS",
+5121,Casino,Purchase Statue Of Endless Fortune,"ENDGAME_LOCATIONS",
+5122,Pierre's General Store,Purchase Catalogue,"ENDGAME_LOCATIONS",
+5123,Carpenter Shop,Purchase Furniture Catalogue,"ENDGAME_LOCATIONS",
+5124,JojaMart,Purchase Joja Furniture Catalogue,"ENDGAME_LOCATIONS",
+5125,Traveling Cart,Purchase Junimo Catalogue,"ENDGAME_LOCATIONS",
+5126,Traveling Cart,Purchase Retro Catalogue,"ENDGAME_LOCATIONS",
+5127,Garbage Cans,Find Trash Catalogue,"ENDGAME_LOCATIONS",
+5128,Sewer,Purchase Wizard Catalogue,"ENDGAME_LOCATIONS",
+5129,Traveling Cart,Purchase Spouse Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY",
+5130,Traveling Cart,Purchase Abigail Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5131,Traveling Cart,Purchase Alex Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5132,Traveling Cart,Purchase Elliott Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5133,Traveling Cart,Purchase Emily Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5134,Traveling Cart,Purchase Haley Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5135,Traveling Cart,Purchase Harvey Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5136,Traveling Cart,Purchase Krobus Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5137,Traveling Cart,Purchase Leah Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5138,Traveling Cart,Purchase Maru Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5139,Traveling Cart,Purchase Penny Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5140,Traveling Cart,Purchase Sam Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5141,Traveling Cart,Purchase Sebastian Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5142,Traveling Cart,Purchase Shane Portrait,"ENDGAME_LOCATIONS,REQUIRES_FRIENDSANITY_MARRIAGE",
+5143,Traveling Cart,Purchase Tea Set,"ENDGAME_LOCATIONS",
+55001,Stardew Valley,Level 1 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55002,Stardew Valley,Level 2 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55003,Stardew Valley,Level 3 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55004,Stardew Valley,Level 4 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55005,Stardew Valley,Level 5 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55006,Stardew Valley,Level 6 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55007,Stardew Valley,Level 7 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55008,Stardew Valley,Level 8 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55009,Stardew Valley,Level 9 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55010,Stardew Valley,Level 10 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill
+55011,Stardew Valley,Level 1 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55012,Stardew Valley,Level 2 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55013,Stardew Valley,Level 3 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55014,Stardew Valley,Level 4 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55015,Stardew Valley,Level 5 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55016,Stardew Valley,Level 6 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55017,Stardew Valley,Level 7 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55018,Stardew Valley,Level 8 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55019,Stardew Valley,Level 9 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55020,Stardew Valley,Level 10 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill
+55021,Magic Altar,Level 1 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55022,Magic Altar,Level 2 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55023,Magic Altar,Level 3 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55024,Magic Altar,Level 4 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55025,Magic Altar,Level 5 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55026,Magic Altar,Level 6 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55027,Magic Altar,Level 7 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55028,Magic Altar,Level 8 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55029,Magic Altar,Level 9 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55030,Magic Altar,Level 10 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic
+55031,Town,Level 1 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55032,Town,Level 2 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55033,Town,Level 3 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55034,Town,Level 4 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55035,Town,Level 5 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55036,Town,Level 6 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55037,Town,Level 7 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55038,Town,Level 8 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55039,Town,Level 9 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55040,Town,Level 10 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill
+55041,Stardew Valley,Level 1 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55042,Stardew Valley,Level 2 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55043,Stardew Valley,Level 3 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55044,Stardew Valley,Level 4 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55045,Stardew Valley,Level 5 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55046,Stardew Valley,Level 6 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55047,Stardew Valley,Level 7 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55048,Stardew Valley,Level 8 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55049,Stardew Valley,Level 9 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55050,Stardew Valley,Level 10 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology
+55051,Stardew Valley,Level 1 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55052,Stardew Valley,Level 2 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55053,Stardew Valley,Level 3 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55054,Stardew Valley,Level 4 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55055,Stardew Valley,Level 5 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55056,Stardew Valley,Level 6 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55057,Stardew Valley,Level 7 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55058,Stardew Valley,Level 8 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55059,Stardew Valley,Level 9 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55060,Stardew Valley,Level 10 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill
+55501,Magic Altar,Analyze: Clear Debris,MANDATORY,Magic
+55502,Magic Altar,Analyze: Till,MANDATORY,Magic
+55503,Magic Altar,Analyze: Water,MANDATORY,Magic
+55504,Magic Altar,Analyze All Toil School Locations,MANDATORY,Magic
+55505,Magic Altar,Analyze: Evac,MANDATORY,Magic
+55506,Magic Altar,Analyze: Haste,MANDATORY,Magic
+55507,Magic Altar,Analyze: Heal,MANDATORY,Magic
+55508,Magic Altar,Analyze All Life School Locations,MANDATORY,Magic
+55509,Magic Altar,Analyze: Descend,MANDATORY,Magic
+55510,Magic Altar,Analyze: Fireball,MANDATORY,Magic
+55511,Magic Altar,Analyze: Frostbolt,MANDATORY,Magic
+55512,Magic Altar,Analyze All Elemental School Locations,MANDATORY,Magic
+55513,Magic Altar,Analyze: Lantern,MANDATORY,Magic
+55514,Magic Altar,Analyze: Tendrils,MANDATORY,Magic
+55515,Magic Altar,Analyze: Shockwave,MANDATORY,Magic
+55516,Magic Altar,Analyze All Nature School Locations,MANDATORY,Magic
+55517,Magic Altar,Analyze: Meteor,MANDATORY,Magic
+55518,Magic Altar,Analyze: Lucksteal,MANDATORY,Magic
+55519,Magic Altar,Analyze: Bloodmana,MANDATORY,Magic
+55520,Magic Altar,Analyze All Eldritch School Locations,MANDATORY,Magic
+55521,Magic Altar,Analyze Every Magic School Location,MANDATORY,Magic
+56001,Museum,Friendsanity: Jasper 1 <3,FRIENDSANITY,Professor Jasper Thomas
+56002,Museum,Friendsanity: Jasper 2 <3,FRIENDSANITY,Professor Jasper Thomas
+56003,Museum,Friendsanity: Jasper 3 <3,FRIENDSANITY,Professor Jasper Thomas
+56004,Museum,Friendsanity: Jasper 4 <3,FRIENDSANITY,Professor Jasper Thomas
+56005,Museum,Friendsanity: Jasper 5 <3,FRIENDSANITY,Professor Jasper Thomas
+56006,Museum,Friendsanity: Jasper 6 <3,FRIENDSANITY,Professor Jasper Thomas
+56007,Museum,Friendsanity: Jasper 7 <3,FRIENDSANITY,Professor Jasper Thomas
+56008,Museum,Friendsanity: Jasper 8 <3,FRIENDSANITY,Professor Jasper Thomas
+56009,Museum,Friendsanity: Jasper 9 <3,FRIENDSANITY,Professor Jasper Thomas
+56010,Museum,Friendsanity: Jasper 10 <3,FRIENDSANITY,Professor Jasper Thomas
+56011,Museum,Friendsanity: Jasper 11 <3,FRIENDSANITY,Professor Jasper Thomas
+56012,Museum,Friendsanity: Jasper 12 <3,FRIENDSANITY,Professor Jasper Thomas
+56013,Museum,Friendsanity: Jasper 13 <3,FRIENDSANITY,Professor Jasper Thomas
+56014,Museum,Friendsanity: Jasper 14 <3,FRIENDSANITY,Professor Jasper Thomas
+56015,Yoba's Clearing,Friendsanity: Yoba 1 <3,FRIENDSANITY,Custom NPC - Yoba
+56016,Yoba's Clearing,Friendsanity: Yoba 2 <3,FRIENDSANITY,Custom NPC - Yoba
+56017,Yoba's Clearing,Friendsanity: Yoba 3 <3,FRIENDSANITY,Custom NPC - Yoba
+56018,Yoba's Clearing,Friendsanity: Yoba 4 <3,FRIENDSANITY,Custom NPC - Yoba
+56019,Yoba's Clearing,Friendsanity: Yoba 5 <3,FRIENDSANITY,Custom NPC - Yoba
+56020,Yoba's Clearing,Friendsanity: Yoba 6 <3,FRIENDSANITY,Custom NPC - Yoba
+56021,Yoba's Clearing,Friendsanity: Yoba 7 <3,FRIENDSANITY,Custom NPC - Yoba
+56022,Yoba's Clearing,Friendsanity: Yoba 8 <3,FRIENDSANITY,Custom NPC - Yoba
+56023,Yoba's Clearing,Friendsanity: Yoba 9 <3,FRIENDSANITY,Custom NPC - Yoba
+56024,Yoba's Clearing,Friendsanity: Yoba 10 <3,FRIENDSANITY,Custom NPC - Yoba
+56025,Marnie's Ranch,Friendsanity: Mr. Ginger 1 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56026,Marnie's Ranch,Friendsanity: Mr. Ginger 2 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56027,Marnie's Ranch,Friendsanity: Mr. Ginger 3 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56028,Marnie's Ranch,Friendsanity: Mr. Ginger 4 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56029,Marnie's Ranch,Friendsanity: Mr. Ginger 5 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56030,Marnie's Ranch,Friendsanity: Mr. Ginger 6 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56031,Marnie's Ranch,Friendsanity: Mr. Ginger 7 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56032,Marnie's Ranch,Friendsanity: Mr. Ginger 8 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56033,Marnie's Ranch,Friendsanity: Mr. Ginger 9 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56034,Marnie's Ranch,Friendsanity: Mr. Ginger 10 <3,FRIENDSANITY,Mister Ginger (cat npc)
+56035,Town,Friendsanity: Ayeisha 1 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56036,Town,Friendsanity: Ayeisha 2 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56037,Town,Friendsanity: Ayeisha 3 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56038,Town,Friendsanity: Ayeisha 4 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56039,Town,Friendsanity: Ayeisha 5 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56040,Town,Friendsanity: Ayeisha 6 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56041,Town,Friendsanity: Ayeisha 7 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56042,Town,Friendsanity: Ayeisha 8 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56043,Town,Friendsanity: Ayeisha 9 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56044,Town,Friendsanity: Ayeisha 10 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC)
+56045,Saloon,Friendsanity: Shiko 1 <3,FRIENDSANITY,Shiko - New Custom NPC
+56046,Saloon,Friendsanity: Shiko 2 <3,FRIENDSANITY,Shiko - New Custom NPC
+56047,Saloon,Friendsanity: Shiko 3 <3,FRIENDSANITY,Shiko - New Custom NPC
+56048,Saloon,Friendsanity: Shiko 4 <3,FRIENDSANITY,Shiko - New Custom NPC
+56049,Saloon,Friendsanity: Shiko 5 <3,FRIENDSANITY,Shiko - New Custom NPC
+56050,Saloon,Friendsanity: Shiko 6 <3,FRIENDSANITY,Shiko - New Custom NPC
+56051,Saloon,Friendsanity: Shiko 7 <3,FRIENDSANITY,Shiko - New Custom NPC
+56052,Saloon,Friendsanity: Shiko 8 <3,FRIENDSANITY,Shiko - New Custom NPC
+56053,Saloon,Friendsanity: Shiko 9 <3,FRIENDSANITY,Shiko - New Custom NPC
+56054,Saloon,Friendsanity: Shiko 10 <3,FRIENDSANITY,Shiko - New Custom NPC
+56055,Saloon,Friendsanity: Shiko 11 <3,FRIENDSANITY,Shiko - New Custom NPC
+56056,Saloon,Friendsanity: Shiko 12 <3,FRIENDSANITY,Shiko - New Custom NPC
+56057,Saloon,Friendsanity: Shiko 13 <3,FRIENDSANITY,Shiko - New Custom NPC
+56058,Saloon,Friendsanity: Shiko 14 <3,FRIENDSANITY,Shiko - New Custom NPC
+56059,Wizard Tower,Friendsanity: Wellwick 1 <3,FRIENDSANITY,'Prophet' Wellwick
+56060,Wizard Tower,Friendsanity: Wellwick 2 <3,FRIENDSANITY,'Prophet' Wellwick
+56061,Wizard Tower,Friendsanity: Wellwick 3 <3,FRIENDSANITY,'Prophet' Wellwick
+56062,Wizard Tower,Friendsanity: Wellwick 4 <3,FRIENDSANITY,'Prophet' Wellwick
+56063,Wizard Tower,Friendsanity: Wellwick 5 <3,FRIENDSANITY,'Prophet' Wellwick
+56064,Wizard Tower,Friendsanity: Wellwick 6 <3,FRIENDSANITY,'Prophet' Wellwick
+56065,Wizard Tower,Friendsanity: Wellwick 7 <3,FRIENDSANITY,'Prophet' Wellwick
+56066,Wizard Tower,Friendsanity: Wellwick 8 <3,FRIENDSANITY,'Prophet' Wellwick
+56067,Wizard Tower,Friendsanity: Wellwick 9 <3,FRIENDSANITY,'Prophet' Wellwick
+56068,Wizard Tower,Friendsanity: Wellwick 10 <3,FRIENDSANITY,'Prophet' Wellwick
+56069,Wizard Tower,Friendsanity: Wellwick 11 <3,FRIENDSANITY,'Prophet' Wellwick
+56070,Wizard Tower,Friendsanity: Wellwick 12 <3,FRIENDSANITY,'Prophet' Wellwick
+56071,Wizard Tower,Friendsanity: Wellwick 13 <3,FRIENDSANITY,'Prophet' Wellwick
+56072,Wizard Tower,Friendsanity: Wellwick 14 <3,FRIENDSANITY,'Prophet' Wellwick
+56073,Forest,Friendsanity: Delores 1 <3,FRIENDSANITY,Delores - Custom NPC
+56074,Forest,Friendsanity: Delores 2 <3,FRIENDSANITY,Delores - Custom NPC
+56075,Forest,Friendsanity: Delores 3 <3,FRIENDSANITY,Delores - Custom NPC
+56076,Forest,Friendsanity: Delores 4 <3,FRIENDSANITY,Delores - Custom NPC
+56077,Forest,Friendsanity: Delores 5 <3,FRIENDSANITY,Delores - Custom NPC
+56078,Forest,Friendsanity: Delores 6 <3,FRIENDSANITY,Delores - Custom NPC
+56079,Forest,Friendsanity: Delores 7 <3,FRIENDSANITY,Delores - Custom NPC
+56080,Forest,Friendsanity: Delores 8 <3,FRIENDSANITY,Delores - Custom NPC
+56081,Forest,Friendsanity: Delores 9 <3,FRIENDSANITY,Delores - Custom NPC
+56082,Forest,Friendsanity: Delores 10 <3,FRIENDSANITY,Delores - Custom NPC
+56083,Forest,Friendsanity: Delores 11 <3,FRIENDSANITY,Delores - Custom NPC
+56084,Forest,Friendsanity: Delores 12 <3,FRIENDSANITY,Delores - Custom NPC
+56085,Forest,Friendsanity: Delores 13 <3,FRIENDSANITY,Delores - Custom NPC
+56086,Forest,Friendsanity: Delores 14 <3,FRIENDSANITY,Delores - Custom NPC
+56087,Alec's Pet Shop,Friendsanity: Alec 1 <3,FRIENDSANITY,Alec Revisited
+56088,Alec's Pet Shop,Friendsanity: Alec 2 <3,FRIENDSANITY,Alec Revisited
+56089,Alec's Pet Shop,Friendsanity: Alec 3 <3,FRIENDSANITY,Alec Revisited
+56090,Alec's Pet Shop,Friendsanity: Alec 4 <3,FRIENDSANITY,Alec Revisited
+56091,Alec's Pet Shop,Friendsanity: Alec 5 <3,FRIENDSANITY,Alec Revisited
+56092,Alec's Pet Shop,Friendsanity: Alec 6 <3,FRIENDSANITY,Alec Revisited
+56093,Alec's Pet Shop,Friendsanity: Alec 7 <3,FRIENDSANITY,Alec Revisited
+56094,Alec's Pet Shop,Friendsanity: Alec 8 <3,FRIENDSANITY,Alec Revisited
+56095,Alec's Pet Shop,Friendsanity: Alec 9 <3,FRIENDSANITY,Alec Revisited
+56096,Alec's Pet Shop,Friendsanity: Alec 10 <3,FRIENDSANITY,Alec Revisited
+56097,Alec's Pet Shop,Friendsanity: Alec 11 <3,FRIENDSANITY,Alec Revisited
+56098,Alec's Pet Shop,Friendsanity: Alec 12 <3,FRIENDSANITY,Alec Revisited
+56099,Alec's Pet Shop,Friendsanity: Alec 13 <3,FRIENDSANITY,Alec Revisited
+56100,Alec's Pet Shop,Friendsanity: Alec 14 <3,FRIENDSANITY,Alec Revisited
+56101,Eugene's Garden,Friendsanity: Eugene 1 <3,FRIENDSANITY,Custom NPC Eugene
+56102,Eugene's Garden,Friendsanity: Eugene 2 <3,FRIENDSANITY,Custom NPC Eugene
+56103,Eugene's Garden,Friendsanity: Eugene 3 <3,FRIENDSANITY,Custom NPC Eugene
+56104,Eugene's Garden,Friendsanity: Eugene 4 <3,FRIENDSANITY,Custom NPC Eugene
+56105,Eugene's Garden,Friendsanity: Eugene 5 <3,FRIENDSANITY,Custom NPC Eugene
+56106,Eugene's Garden,Friendsanity: Eugene 6 <3,FRIENDSANITY,Custom NPC Eugene
+56107,Eugene's Garden,Friendsanity: Eugene 7 <3,FRIENDSANITY,Custom NPC Eugene
+56108,Eugene's Garden,Friendsanity: Eugene 8 <3,FRIENDSANITY,Custom NPC Eugene
+56109,Eugene's Garden,Friendsanity: Eugene 9 <3,FRIENDSANITY,Custom NPC Eugene
+56110,Eugene's Garden,Friendsanity: Eugene 10 <3,FRIENDSANITY,Custom NPC Eugene
+56111,Eugene's Garden,Friendsanity: Eugene 11 <3,FRIENDSANITY,Custom NPC Eugene
+56112,Eugene's Garden,Friendsanity: Eugene 12 <3,FRIENDSANITY,Custom NPC Eugene
+56113,Eugene's Garden,Friendsanity: Eugene 13 <3,FRIENDSANITY,Custom NPC Eugene
+56114,Eugene's Garden,Friendsanity: Eugene 14 <3,FRIENDSANITY,Custom NPC Eugene
+56115,Forest,Friendsanity: Juna 1 <3,FRIENDSANITY,Juna - Roommate NPC
+56116,Forest,Friendsanity: Juna 2 <3,FRIENDSANITY,Juna - Roommate NPC
+56117,Forest,Friendsanity: Juna 3 <3,FRIENDSANITY,Juna - Roommate NPC
+56118,Forest,Friendsanity: Juna 4 <3,FRIENDSANITY,Juna - Roommate NPC
+56119,Forest,Friendsanity: Juna 5 <3,FRIENDSANITY,Juna - Roommate NPC
+56120,Forest,Friendsanity: Juna 6 <3,FRIENDSANITY,Juna - Roommate NPC
+56121,Forest,Friendsanity: Juna 7 <3,FRIENDSANITY,Juna - Roommate NPC
+56122,Forest,Friendsanity: Juna 8 <3,FRIENDSANITY,Juna - Roommate NPC
+56123,Forest,Friendsanity: Juna 9 <3,FRIENDSANITY,Juna - Roommate NPC
+56124,Forest,Friendsanity: Juna 10 <3,FRIENDSANITY,Juna - Roommate NPC
+56125,Riley's House,Friendsanity: Riley 1 <3,FRIENDSANITY,Custom NPC - Riley
+56126,Riley's House,Friendsanity: Riley 2 <3,FRIENDSANITY,Custom NPC - Riley
+56127,Riley's House,Friendsanity: Riley 3 <3,FRIENDSANITY,Custom NPC - Riley
+56128,Riley's House,Friendsanity: Riley 4 <3,FRIENDSANITY,Custom NPC - Riley
+56129,Riley's House,Friendsanity: Riley 5 <3,FRIENDSANITY,Custom NPC - Riley
+56130,Riley's House,Friendsanity: Riley 6 <3,FRIENDSANITY,Custom NPC - Riley
+56131,Riley's House,Friendsanity: Riley 7 <3,FRIENDSANITY,Custom NPC - Riley
+56132,Riley's House,Friendsanity: Riley 8 <3,FRIENDSANITY,Custom NPC - Riley
+56133,Riley's House,Friendsanity: Riley 9 <3,FRIENDSANITY,Custom NPC - Riley
+56134,Riley's House,Friendsanity: Riley 10 <3,FRIENDSANITY,Custom NPC - Riley
+56135,Riley's House,Friendsanity: Riley 11 <3,FRIENDSANITY,Custom NPC - Riley
+56136,Riley's House,Friendsanity: Riley 12 <3,FRIENDSANITY,Custom NPC - Riley
+56137,Riley's House,Friendsanity: Riley 13 <3,FRIENDSANITY,Custom NPC - Riley
+56138,Riley's House,Friendsanity: Riley 14 <3,FRIENDSANITY,Custom NPC - Riley
+56139,JojaMart,Friendsanity: Claire 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56140,JojaMart,Friendsanity: Claire 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56141,JojaMart,Friendsanity: Claire 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56142,JojaMart,Friendsanity: Claire 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56143,JojaMart,Friendsanity: Claire 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56144,JojaMart,Friendsanity: Claire 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56145,JojaMart,Friendsanity: Claire 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56146,JojaMart,Friendsanity: Claire 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56147,JojaMart,Friendsanity: Claire 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56148,JojaMart,Friendsanity: Claire 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56149,JojaMart,Friendsanity: Claire 11 <3,FRIENDSANITY,Stardew Valley Expanded
+56150,JojaMart,Friendsanity: Claire 12 <3,FRIENDSANITY,Stardew Valley Expanded
+56151,JojaMart,Friendsanity: Claire 13 <3,FRIENDSANITY,Stardew Valley Expanded
+56152,JojaMart,Friendsanity: Claire 14 <3,FRIENDSANITY,Stardew Valley Expanded
+56153,Galmoran Outpost,Friendsanity: Lance 1 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56154,Galmoran Outpost,Friendsanity: Lance 2 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56155,Galmoran Outpost,Friendsanity: Lance 3 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56156,Galmoran Outpost,Friendsanity: Lance 4 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56157,Galmoran Outpost,Friendsanity: Lance 5 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56158,Galmoran Outpost,Friendsanity: Lance 6 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56159,Galmoran Outpost,Friendsanity: Lance 7 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56160,Galmoran Outpost,Friendsanity: Lance 8 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56161,Galmoran Outpost,Friendsanity: Lance 9 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56162,Galmoran Outpost,Friendsanity: Lance 10 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56163,Galmoran Outpost,Friendsanity: Lance 11 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56164,Galmoran Outpost,Friendsanity: Lance 12 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56165,Galmoran Outpost,Friendsanity: Lance 13 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56166,Galmoran Outpost,Friendsanity: Lance 14 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded
+56167,Jenkins' Residence,Friendsanity: Olivia 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56168,Jenkins' Residence,Friendsanity: Olivia 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56169,Jenkins' Residence,Friendsanity: Olivia 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56170,Jenkins' Residence,Friendsanity: Olivia 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56171,Jenkins' Residence,Friendsanity: Olivia 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56172,Jenkins' Residence,Friendsanity: Olivia 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56173,Jenkins' Residence,Friendsanity: Olivia 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56174,Jenkins' Residence,Friendsanity: Olivia 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56175,Jenkins' Residence,Friendsanity: Olivia 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56176,Jenkins' Residence,Friendsanity: Olivia 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56177,Jenkins' Residence,Friendsanity: Olivia 11 <3,FRIENDSANITY,Stardew Valley Expanded
+56178,Jenkins' Residence,Friendsanity: Olivia 12 <3,FRIENDSANITY,Stardew Valley Expanded
+56179,Jenkins' Residence,Friendsanity: Olivia 13 <3,FRIENDSANITY,Stardew Valley Expanded
+56180,Jenkins' Residence,Friendsanity: Olivia 14 <3,FRIENDSANITY,Stardew Valley Expanded
+56181,Wizard Tower,Friendsanity: Wizard 11 <3,FRIENDSANITY,Stardew Valley Expanded
+56182,Wizard Tower,Friendsanity: Wizard 12 <3,FRIENDSANITY,Stardew Valley Expanded
+56183,Wizard Tower,Friendsanity: Wizard 13 <3,FRIENDSANITY,Stardew Valley Expanded
+56184,Wizard Tower,Friendsanity: Wizard 14 <3,FRIENDSANITY,Stardew Valley Expanded
+56185,Blue Moon Vineyard,Friendsanity: Sophia 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56186,Blue Moon Vineyard,Friendsanity: Sophia 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56187,Blue Moon Vineyard,Friendsanity: Sophia 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56188,Blue Moon Vineyard,Friendsanity: Sophia 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56189,Blue Moon Vineyard,Friendsanity: Sophia 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56190,Blue Moon Vineyard,Friendsanity: Sophia 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56191,Blue Moon Vineyard,Friendsanity: Sophia 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56192,Blue Moon Vineyard,Friendsanity: Sophia 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56193,Blue Moon Vineyard,Friendsanity: Sophia 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56194,Blue Moon Vineyard,Friendsanity: Sophia 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56195,Blue Moon Vineyard,Friendsanity: Sophia 11 <3,FRIENDSANITY,Stardew Valley Expanded
+56196,Blue Moon Vineyard,Friendsanity: Sophia 12 <3,FRIENDSANITY,Stardew Valley Expanded
+56197,Blue Moon Vineyard,Friendsanity: Sophia 13 <3,FRIENDSANITY,Stardew Valley Expanded
+56198,Blue Moon Vineyard,Friendsanity: Sophia 14 <3,FRIENDSANITY,Stardew Valley Expanded
+56199,Jenkins' Residence,Friendsanity: Victor 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56200,Jenkins' Residence,Friendsanity: Victor 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56201,Jenkins' Residence,Friendsanity: Victor 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56202,Jenkins' Residence,Friendsanity: Victor 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56203,Jenkins' Residence,Friendsanity: Victor 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56204,Jenkins' Residence,Friendsanity: Victor 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56205,Jenkins' Residence,Friendsanity: Victor 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56206,Jenkins' Residence,Friendsanity: Victor 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56207,Jenkins' Residence,Friendsanity: Victor 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56208,Jenkins' Residence,Friendsanity: Victor 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56209,Jenkins' Residence,Friendsanity: Victor 11 <3,FRIENDSANITY,Stardew Valley Expanded
+56210,Jenkins' Residence,Friendsanity: Victor 12 <3,FRIENDSANITY,Stardew Valley Expanded
+56211,Jenkins' Residence,Friendsanity: Victor 13 <3,FRIENDSANITY,Stardew Valley Expanded
+56212,Jenkins' Residence,Friendsanity: Victor 14 <3,FRIENDSANITY,Stardew Valley Expanded
+56213,Fairhaven Farm,Friendsanity: Andy 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56214,Fairhaven Farm,Friendsanity: Andy 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56215,Fairhaven Farm,Friendsanity: Andy 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56216,Fairhaven Farm,Friendsanity: Andy 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56217,Fairhaven Farm,Friendsanity: Andy 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56218,Fairhaven Farm,Friendsanity: Andy 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56219,Fairhaven Farm,Friendsanity: Andy 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56220,Fairhaven Farm,Friendsanity: Andy 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56221,Fairhaven Farm,Friendsanity: Andy 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56222,Fairhaven Farm,Friendsanity: Andy 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56223,Aurora Vineyard,Friendsanity: Apples 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56224,Aurora Vineyard,Friendsanity: Apples 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56225,Aurora Vineyard,Friendsanity: Apples 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56226,Aurora Vineyard,Friendsanity: Apples 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56227,Aurora Vineyard,Friendsanity: Apples 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56228,Aurora Vineyard,Friendsanity: Apples 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56229,Aurora Vineyard,Friendsanity: Apples 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56230,Aurora Vineyard,Friendsanity: Apples 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56231,Aurora Vineyard,Friendsanity: Apples 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56232,Aurora Vineyard,Friendsanity: Apples 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56233,Museum,Friendsanity: Gunther 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56234,Museum,Friendsanity: Gunther 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56235,Museum,Friendsanity: Gunther 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56236,Museum,Friendsanity: Gunther 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56237,Museum,Friendsanity: Gunther 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56238,Museum,Friendsanity: Gunther 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56239,Museum,Friendsanity: Gunther 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56240,Museum,Friendsanity: Gunther 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56241,Museum,Friendsanity: Gunther 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56242,Museum,Friendsanity: Gunther 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56243,JojaMart,Friendsanity: Martin 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56244,JojaMart,Friendsanity: Martin 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56245,JojaMart,Friendsanity: Martin 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56246,JojaMart,Friendsanity: Martin 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56247,JojaMart,Friendsanity: Martin 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56248,JojaMart,Friendsanity: Martin 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56249,JojaMart,Friendsanity: Martin 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56250,JojaMart,Friendsanity: Martin 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56251,JojaMart,Friendsanity: Martin 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56252,JojaMart,Friendsanity: Martin 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56253,Adventurer's Guild,Friendsanity: Marlon 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56254,Adventurer's Guild,Friendsanity: Marlon 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56255,Adventurer's Guild,Friendsanity: Marlon 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56256,Adventurer's Guild,Friendsanity: Marlon 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56257,Adventurer's Guild,Friendsanity: Marlon 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56258,Adventurer's Guild,Friendsanity: Marlon 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56259,Adventurer's Guild,Friendsanity: Marlon 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56260,Adventurer's Guild,Friendsanity: Marlon 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56261,Adventurer's Guild,Friendsanity: Marlon 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56262,Adventurer's Guild,Friendsanity: Marlon 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56263,Wizard Tower,Friendsanity: Morgan 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56264,Wizard Tower,Friendsanity: Morgan 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56265,Wizard Tower,Friendsanity: Morgan 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56266,Wizard Tower,Friendsanity: Morgan 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56267,Wizard Tower,Friendsanity: Morgan 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56268,Wizard Tower,Friendsanity: Morgan 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56269,Wizard Tower,Friendsanity: Morgan 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56270,Wizard Tower,Friendsanity: Morgan 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56271,Wizard Tower,Friendsanity: Morgan 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56272,Wizard Tower,Friendsanity: Morgan 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56273,Scarlett's House,Friendsanity: Scarlett 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56274,Scarlett's House,Friendsanity: Scarlett 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56275,Scarlett's House,Friendsanity: Scarlett 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56276,Scarlett's House,Friendsanity: Scarlett 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56277,Scarlett's House,Friendsanity: Scarlett 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56278,Scarlett's House,Friendsanity: Scarlett 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56279,Scarlett's House,Friendsanity: Scarlett 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56280,Scarlett's House,Friendsanity: Scarlett 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56281,Scarlett's House,Friendsanity: Scarlett 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56282,Scarlett's House,Friendsanity: Scarlett 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56283,Susan's House,Friendsanity: Susan 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56284,Susan's House,Friendsanity: Susan 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56285,Susan's House,Friendsanity: Susan 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56286,Susan's House,Friendsanity: Susan 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56287,Susan's House,Friendsanity: Susan 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56288,Susan's House,Friendsanity: Susan 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56289,Susan's House,Friendsanity: Susan 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56290,Susan's House,Friendsanity: Susan 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56291,Susan's House,Friendsanity: Susan 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56292,Susan's House,Friendsanity: Susan 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56293,JojaMart,Friendsanity: Morris 1 <3,FRIENDSANITY,Stardew Valley Expanded
+56294,JojaMart,Friendsanity: Morris 2 <3,FRIENDSANITY,Stardew Valley Expanded
+56295,JojaMart,Friendsanity: Morris 3 <3,FRIENDSANITY,Stardew Valley Expanded
+56296,JojaMart,Friendsanity: Morris 4 <3,FRIENDSANITY,Stardew Valley Expanded
+56297,JojaMart,Friendsanity: Morris 5 <3,FRIENDSANITY,Stardew Valley Expanded
+56298,JojaMart,Friendsanity: Morris 6 <3,FRIENDSANITY,Stardew Valley Expanded
+56299,JojaMart,Friendsanity: Morris 7 <3,FRIENDSANITY,Stardew Valley Expanded
+56300,JojaMart,Friendsanity: Morris 8 <3,FRIENDSANITY,Stardew Valley Expanded
+56301,JojaMart,Friendsanity: Morris 9 <3,FRIENDSANITY,Stardew Valley Expanded
+56302,JojaMart,Friendsanity: Morris 10 <3,FRIENDSANITY,Stardew Valley Expanded
+56303,Witch's Swamp,Friendsanity: Zic 1 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56304,Witch's Swamp,Friendsanity: Zic 2 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56305,Witch's Swamp,Friendsanity: Zic 3 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56306,Witch's Swamp,Friendsanity: Zic 4 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56307,Witch's Swamp,Friendsanity: Zic 5 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56308,Witch's Swamp,Friendsanity: Zic 6 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56309,Witch's Swamp,Friendsanity: Zic 7 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56310,Witch's Swamp,Friendsanity: Zic 8 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56311,Witch's Swamp,Friendsanity: Zic 9 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56312,Witch's Swamp,Friendsanity: Zic 10 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul
+56313,Witch's Attic,Friendsanity: Alecto 1 <3,FRIENDSANITY,Alecto the Witch
+56314,Witch's Attic,Friendsanity: Alecto 2 <3,FRIENDSANITY,Alecto the Witch
+56315,Witch's Attic,Friendsanity: Alecto 3 <3,FRIENDSANITY,Alecto the Witch
+56316,Witch's Attic,Friendsanity: Alecto 4 <3,FRIENDSANITY,Alecto the Witch
+56317,Witch's Attic,Friendsanity: Alecto 5 <3,FRIENDSANITY,Alecto the Witch
+56318,Witch's Attic,Friendsanity: Alecto 6 <3,FRIENDSANITY,Alecto the Witch
+56319,Witch's Attic,Friendsanity: Alecto 7 <3,FRIENDSANITY,Alecto the Witch
+56320,Witch's Attic,Friendsanity: Alecto 8 <3,FRIENDSANITY,Alecto the Witch
+56321,Witch's Attic,Friendsanity: Alecto 9 <3,FRIENDSANITY,Alecto the Witch
+56322,Witch's Attic,Friendsanity: Alecto 10 <3,FRIENDSANITY,Alecto the Witch
+56323,Mouse House,Friendsanity: Lacey 1 <3,FRIENDSANITY,Hat Mouse Lacey
+56324,Mouse House,Friendsanity: Lacey 2 <3,FRIENDSANITY,Hat Mouse Lacey
+56325,Mouse House,Friendsanity: Lacey 3 <3,FRIENDSANITY,Hat Mouse Lacey
+56326,Mouse House,Friendsanity: Lacey 4 <3,FRIENDSANITY,Hat Mouse Lacey
+56327,Mouse House,Friendsanity: Lacey 5 <3,FRIENDSANITY,Hat Mouse Lacey
+56328,Mouse House,Friendsanity: Lacey 6 <3,FRIENDSANITY,Hat Mouse Lacey
+56329,Mouse House,Friendsanity: Lacey 7 <3,FRIENDSANITY,Hat Mouse Lacey
+56330,Mouse House,Friendsanity: Lacey 8 <3,FRIENDSANITY,Hat Mouse Lacey
+56331,Mouse House,Friendsanity: Lacey 9 <3,FRIENDSANITY,Hat Mouse Lacey
+56332,Mouse House,Friendsanity: Lacey 10 <3,FRIENDSANITY,Hat Mouse Lacey
+56333,Mouse House,Friendsanity: Lacey 11 <3,FRIENDSANITY,Hat Mouse Lacey
+56334,Mouse House,Friendsanity: Lacey 12 <3,FRIENDSANITY,Hat Mouse Lacey
+56335,Mouse House,Friendsanity: Lacey 13 <3,FRIENDSANITY,Hat Mouse Lacey
+56336,Mouse House,Friendsanity: Lacey 14 <3,FRIENDSANITY,Hat Mouse Lacey
+56337,Boarding House - First Floor,Friendsanity: Joel 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56338,Boarding House - First Floor,Friendsanity: Joel 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56339,Boarding House - First Floor,Friendsanity: Joel 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56340,Boarding House - First Floor,Friendsanity: Joel 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56341,Boarding House - First Floor,Friendsanity: Joel 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56342,Boarding House - First Floor,Friendsanity: Joel 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56343,Boarding House - First Floor,Friendsanity: Joel 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56344,Boarding House - First Floor,Friendsanity: Joel 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56345,Boarding House - First Floor,Friendsanity: Joel 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56346,Boarding House - First Floor,Friendsanity: Joel 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56347,Boarding House - First Floor,Friendsanity: Sheila 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56348,Boarding House - First Floor,Friendsanity: Sheila 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56349,Boarding House - First Floor,Friendsanity: Sheila 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56350,Boarding House - First Floor,Friendsanity: Sheila 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56351,Boarding House - First Floor,Friendsanity: Sheila 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56352,Boarding House - First Floor,Friendsanity: Sheila 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56353,Boarding House - First Floor,Friendsanity: Sheila 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56354,Boarding House - First Floor,Friendsanity: Sheila 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56355,Boarding House - First Floor,Friendsanity: Sheila 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56356,Boarding House - First Floor,Friendsanity: Sheila 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56357,Boarding House - First Floor,Friendsanity: Sheila 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56358,Boarding House - First Floor,Friendsanity: Sheila 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56359,Boarding House - First Floor,Friendsanity: Sheila 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56360,Boarding House - First Floor,Friendsanity: Sheila 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56361,The Lost Valley,Friendsanity: Gregory 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56362,The Lost Valley,Friendsanity: Gregory 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56363,The Lost Valley,Friendsanity: Gregory 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56364,The Lost Valley,Friendsanity: Gregory 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56365,The Lost Valley,Friendsanity: Gregory 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56366,The Lost Valley,Friendsanity: Gregory 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56367,The Lost Valley,Friendsanity: Gregory 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56368,The Lost Valley,Friendsanity: Gregory 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56369,The Lost Valley,Friendsanity: Gregory 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56370,The Lost Valley,Friendsanity: Gregory 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56371,The Lost Valley,Friendsanity: Gregory 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56372,The Lost Valley,Friendsanity: Gregory 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56373,The Lost Valley,Friendsanity: Gregory 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+56374,The Lost Valley,Friendsanity: Gregory 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension
+57001,Pierre's General Store,Premium Pack,"BACKPACK,BACKPACK_TIER",Bigger Backpack
+57002,Carpenter Shop,Tractor Garage Blueprint,BUILDING_BLUEPRINT,Tractor Mod
+57003,The Deep Woods Depth 100,Pet the Deep Woods Unicorn,MANDATORY,DeepWoods
+57004,The Deep Woods Depth 50,Breaking Up Deep Woods Gingerbread House,MANDATORY,DeepWoods
+57005,The Deep Woods Depth 50,Drinking From Deep Woods Fountain,MANDATORY,DeepWoods
+57006,The Deep Woods Depth 100,Deep Woods Treasure Chest,MANDATORY,DeepWoods
+57007,The Deep Woods Depth 100,Deep Woods Trash Bin,MANDATORY,DeepWoods
+57008,The Deep Woods Depth 50,Chop Down a Deep Woods Iridium Tree,MANDATORY,DeepWoods
+57009,The Deep Woods Depth 10,The Deep Woods: Depth 10,ELEVATOR,DeepWoods
+57010,The Deep Woods Depth 20,The Deep Woods: Depth 20,ELEVATOR,DeepWoods
+57011,The Deep Woods Depth 30,The Deep Woods: Depth 30,ELEVATOR,DeepWoods
+57012,The Deep Woods Depth 40,The Deep Woods: Depth 40,ELEVATOR,DeepWoods
+57013,The Deep Woods Depth 50,The Deep Woods: Depth 50,ELEVATOR,DeepWoods
+57014,The Deep Woods Depth 60,The Deep Woods: Depth 60,ELEVATOR,DeepWoods
+57015,The Deep Woods Depth 70,The Deep Woods: Depth 70,ELEVATOR,DeepWoods
+57016,The Deep Woods Depth 80,The Deep Woods: Depth 80,ELEVATOR,DeepWoods
+57017,The Deep Woods Depth 90,The Deep Woods: Depth 90,ELEVATOR,DeepWoods
+57018,The Deep Woods Depth 100,The Deep Woods: Depth 100,ELEVATOR,DeepWoods
+57019,The Deep Woods Depth 50,Purify an Infested Lichtung,MANDATORY,DeepWoods
+57020,Skull Cavern Floor 25,Skull Cavern: Floor 25,ELEVATOR,Skull Cavern Elevator
+57021,Skull Cavern Floor 50,Skull Cavern: Floor 50,ELEVATOR,Skull Cavern Elevator
+57022,Skull Cavern Floor 75,Skull Cavern: Floor 75,ELEVATOR,Skull Cavern Elevator
+57023,Skull Cavern Floor 100,Skull Cavern: Floor 100,ELEVATOR,Skull Cavern Elevator
+57024,Skull Cavern Floor 125,Skull Cavern: Floor 125,ELEVATOR,Skull Cavern Elevator
+57025,Skull Cavern Floor 150,Skull Cavern: Floor 150,ELEVATOR,Skull Cavern Elevator
+57026,Skull Cavern Floor 175,Skull Cavern: Floor 175,ELEVATOR,Skull Cavern Elevator
+57027,Skull Cavern Floor 200,Skull Cavern: Floor 200,ELEVATOR,Skull Cavern Elevator
+57028,The Deep Woods Depth 100,The Sword in the Stone,MANDATORY,DeepWoods
+57051,Abandoned Mines - 1A,Abandoned Treasure - Floor 1A,MANDATORY,Boarding House and Bus Stop Extension
+57052,Abandoned Mines - 1B,Abandoned Treasure - Floor 1B,MANDATORY,Boarding House and Bus Stop Extension
+57053,Abandoned Mines - 2A,Abandoned Treasure - Floor 2A,MANDATORY,Boarding House and Bus Stop Extension
+57054,Abandoned Mines - 2B,Abandoned Treasure - Floor 2B,MANDATORY,Boarding House and Bus Stop Extension
+57055,Abandoned Mines - 3,Abandoned Treasure - Floor 3,MANDATORY,Boarding House and Bus Stop Extension
+57056,Abandoned Mines - 4,Abandoned Treasure - Floor 4,MANDATORY,Boarding House and Bus Stop Extension
+57057,Abandoned Mines - 5,Abandoned Treasure - Floor 5,MANDATORY,Boarding House and Bus Stop Extension
+57101,Pierre's General Store,Premium Pack 1,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57102,Pierre's General Store,Premium Pack 2,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57103,Pierre's General Store,Premium Pack 3,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57104,Pierre's General Store,Premium Pack 4,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57105,Pierre's General Store,Premium Pack 5,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57106,Pierre's General Store,Premium Pack 6,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57107,Pierre's General Store,Premium Pack 7,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57108,Pierre's General Store,Premium Pack 8,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57109,Pierre's General Store,Premium Pack 9,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57110,Pierre's General Store,Premium Pack 10,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57111,Pierre's General Store,Premium Pack 11,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57112,Pierre's General Store,Premium Pack 12,"BACKPACK,SPLIT_BACKPACK",Bigger Backpack
+57401,Farm,Cook Magic Elixir,COOKSANITY,Magic
+57402,Farm,Craft Travel Core,"CRAFTSANITY,CRAFTSANITY_CRAFT",Magic
+57403,Farm,Craft Haste Elixir,"CRAFTSANITY,CRAFTSANITY_CRAFT",Stardew Valley Expanded
+57404,Farm,Craft Hero Elixir,"CRAFTSANITY,CRAFTSANITY_CRAFT",Stardew Valley Expanded
+57405,Farm,Craft Armor Elixir,"CRAFTSANITY,CRAFTSANITY_CRAFT",Stardew Valley Expanded
+57406,Witch's Swamp,Craft Ginger Tincture,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul
+57407,Farm,Craft Glass Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57408,Farm,Craft Glass Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57409,Farm,Craft Glass Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57410,Farm,Craft Bone Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57411,Farm,Craft Water Sifter,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57412,Farm,Craft Wooden Display,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57413,Farm,Craft Hardwood Display,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57414,Farm,Craft Dwarf Gadget: Infinite Volcano Simulation,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND",Archaeology
+57415,Farm,Craft Grinder,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57416,Farm,Craft Preservation Chamber,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57417,Farm,Craft Hardwood Preservation Chamber,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57418,Farm,Craft Ancient Battery Production Station,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57419,Farm,Craft Neanderthal Skeleton,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57420,Farm,Craft Pterodactyl Skeleton L,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57421,Farm,Craft Pterodactyl Skeleton M,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57422,Farm,Craft Pterodactyl Skeleton R,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57423,Farm,Craft T-Rex Skeleton L,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57424,Farm,Craft T-Rex Skeleton M,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57425,Farm,Craft T-Rex Skeleton R,"CRAFTSANITY,CRAFTSANITY_CRAFT",Boarding House and Bus Stop Extension
+57426,Farm,Craft Restoration Table,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57427,Farm,Craft Rusty Path,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57428,Farm,Craft Rusty Brazier,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57429,Farm,Craft Lucky Ring,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57430,Farm,Craft Bone Fence,"CRAFTSANITY,CRAFTSANITY_CRAFT",Archaeology
+57431,Farm,Craft Bouquet,"CRAFTSANITY,CRAFTSANITY_CRAFT",Socializing Skill
+57432,Farm,Craft Trash Bin,"CRAFTSANITY,CRAFTSANITY_CRAFT",Binning Skill
+57433,Farm,Craft Composter,"CRAFTSANITY,CRAFTSANITY_CRAFT",Binning Skill
+57434,Farm,Craft Recycling Bin,"CRAFTSANITY,CRAFTSANITY_CRAFT",Binning Skill
+57435,Farm,Craft Advanced Recycling Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",Binning Skill
+57440,Farm,Craft Copper Slot Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",Luck Skill
+57441,Farm,Craft Gold Slot Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",Luck Skill
+57442,Farm,Craft Iridium Slot Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT",Luck Skill
+57443,Farm,Craft Radioactive Slot Machine,"CRAFTSANITY,CRAFTSANITY_CRAFT,GINGER_ISLAND,REQUIRES_QI_ORDERS",Luck Skill
+57451,Adventurer's Guild,Magic Elixir Recipe,"CHEFSANITY,CRAFTSANITY_RECIPE,CHEFSANITY_PURCHASE",Magic
+57452,Adventurer's Guild,Travel Core Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Magic
+57453,Alesia Shop,Haste Elixir Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Stardew Valley Expanded
+57454,Isaac Shop,Hero Elixir Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Stardew Valley Expanded
+57455,Alesia Shop,Armor Elixir Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Stardew Valley Expanded
+57501,Mountain,Quest: Missing Envelope,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC)
+57502,Forest,Quest: Ayeisha's Lost Ring,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC)
+57503,Forest,Quest: Mr.Ginger's request,"STORY_QUEST",Mister Ginger (cat npc)
+57504,Forest,Quest: Juna's Drink Request,"STORY_QUEST",Juna - Roommate NPC
+57505,Forest,Quest: Juna's BFF Request,"STORY_QUEST",Juna - Roommate NPC
+57506,Forest,Juna's Monster Mash,SPECIAL_ORDER_BOARD,Juna - Roommate NPC
+57507,Adventurer's Guild,Quest: Marlon's Boat,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
+57508,Railroad,Quest: The Railroad Boulder,"STORY_QUEST",Stardew Valley Expanded
+57509,Grandpa's Shed Interior,Quest: Grandpa's Shed,"STORY_QUEST",Stardew Valley Expanded
+57510,Aurora Vineyard,Quest: Aurora Vineyard,"STORY_QUEST",Stardew Valley Expanded
+57511,Lance's House Main,Quest: Monster Crops,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
+57512,Sewer,Quest: Void Soul Retrieval,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded
+57513,Fairhaven Farm,Andy's Cellar,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
+57514,Adventurer's Guild,A Mysterious Venture,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
+57515,Jenkins' Residence,An Elegant Reception,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
+57516,Sophia's House,Fairy Garden,"SPECIAL_ORDER_BOARD,GINGER_ISLAND",Stardew Valley Expanded
+57517,Susan's House,Homemade Fertilizer,SPECIAL_ORDER_BOARD,Stardew Valley Expanded
+57519,Witch's Swamp,Quest: Corrupted Crops Task,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul
+57520,Witch's Swamp,Quest: A New Pot,STORY_QUEST,Distant Lands - Witch Swamp Overhaul
+57521,Witch's Swamp,Quest: Fancy Blanket Task,STORY_QUEST,Distant Lands - Witch Swamp Overhaul
+57522,Witch's Swamp,Quest: Witch's order,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul
+57523,Boarding House - First Floor,Quest: Pumpkin Soup,STORY_QUEST,Boarding House and Bus Stop Extension
+57524,Museum,Geode Order,SPECIAL_ORDER_BOARD,Professor Jasper Thomas
+57525,Museum,Dwarven Scrolls,SPECIAL_ORDER_BOARD,Professor Jasper Thomas
+57526,Mouse House,Quest: Hats for the Hat Mouse,STORY_QUEST,Hat Mouse Lacey
+57551,Kitchen,Cook Baked Berry Oatmeal,COOKSANITY,Stardew Valley Expanded
+57552,Kitchen,Cook Flower Cookie,COOKSANITY,Stardew Valley Expanded
+57553,Kitchen,Cook Big Bark Burger,COOKSANITY,Stardew Valley Expanded
+57554,Kitchen,Cook Frog Legs,COOKSANITY,Stardew Valley Expanded
+57555,Kitchen,Cook Glazed Butterfish,COOKSANITY,Stardew Valley Expanded
+57556,Kitchen,Cook Mixed Berry Pie,COOKSANITY,Stardew Valley Expanded
+57557,Kitchen,Cook Mushroom Berry Rice,COOKSANITY,Stardew Valley Expanded
+57558,Kitchen,Cook Seaweed Salad,COOKSANITY,Stardew Valley Expanded
+57559,Kitchen,Cook Void Delight,COOKSANITY,Stardew Valley Expanded
+57560,Kitchen,Cook Void Salmon Sushi,COOKSANITY,Stardew Valley Expanded
+57561,Kitchen,Cook Mushroom Kebab,COOKSANITY,Distant Lands - Witch Swamp Overhaul
+57562,Kitchen,Cook Crayfish Soup,COOKSANITY,Distant Lands - Witch Swamp Overhaul
+57563,Kitchen,Cook Pemmican,COOKSANITY,Distant Lands - Witch Swamp Overhaul
+57564,Kitchen,Cook Void Mint Tea,COOKSANITY,Distant Lands - Witch Swamp Overhaul
+57565,Kitchen,Cook Special Pumpkin Soup,COOKSANITY,Boarding House and Bus Stop Extension
+57566,Kitchen,Cook Digger's Delight,COOKSANITY,Archaeology
+57567,Kitchen,Cook Rocky Root Coffee,COOKSANITY,Archaeology
+57568,Kitchen,Cook Ancient Jello,COOKSANITY,Archaeology
+57569,Kitchen,Cook Grilled Cheese,COOKSANITY,Binning Skill
+57570,Kitchen,Cook Fish Casserole,COOKSANITY,Binning Skill
+57601,Bear Shop,Baked Berry Oatmeal Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57602,Bear Shop,Flower Cookie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57603,Saloon,Big Bark Burger Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
+57604,Adventurer's Guild,Frog Legs Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57605,Saloon,Glazed Butterfish Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
+57606,Saloon,Mixed Berry Pie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57607,Adventurer's Guild,Mushroom Berry Rice Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
+57608,Adventurer's Guild,Seaweed Salad Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57609,Sewer,Void Delight Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded
+57610,Sewer,Void Salmon Sushi Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded
+57611,Witch's Swamp,Mushroom Kebab Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
+57613,Witch's Swamp,Pemmican Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
+57614,Witch's Swamp,Void Mint Tea Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul
+57616,Mines Dwarf Shop,Neanderthal Skeleton Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57617,Mines Dwarf Shop,Pterodactyl Skeleton L Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57618,Mines Dwarf Shop,Pterodactyl Skeleton M Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57619,Mines Dwarf Shop,Pterodactyl Skeleton R Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57620,Mines Dwarf Shop,T-Rex Skeleton L Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57621,Mines Dwarf Shop,T-Rex Skeleton M Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57622,Mines Dwarf Shop,T-Rex Skeleton R Recipe,"CRAFTSANITY,CRAFTSANITY_RECIPE",Boarding House and Bus Stop Extension
+57623,Farm,Digger's Delight Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
+57624,Farm,Rocky Root Coffee Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
+57625,Farm,Ancient Jello Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Archaeology
+57627,Farm,Grilled Cheese Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Binning Skill
+57628,Farm,Fish Casserole Recipe,"CHEFSANITY,CHEFSANITY_SKILL",Binning Skill
+57651,Alesia Shop,Tempered Galaxy Dagger,MANDATORY,Stardew Valley Expanded
+57652,Isaac Shop,Tempered Galaxy Sword,MANDATORY,Stardew Valley Expanded
+57653,Isaac Shop,Tempered Galaxy Hammer,MANDATORY,Stardew Valley Expanded
+57701,Island South,Fishsanity: Baby Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57702,Crimson Badlands,Fishsanity: Bonefish,FISHSANITY,Stardew Valley Expanded
+57703,Forest,Fishsanity: Bull Trout,FISHSANITY,Stardew Valley Expanded
+57704,Forest West,Fishsanity: Butterfish,FISHSANITY,Stardew Valley Expanded
+57705,Island South,Fishsanity: Clownfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57706,Highlands Outside,Fishsanity: Daggerfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57707,Mountain,Fishsanity: Frog,FISHSANITY,Stardew Valley Expanded
+57708,Highlands Outside,Fishsanity: Gemfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57709,Sprite Spring,Fishsanity: Goldenfish,FISHSANITY,Stardew Valley Expanded
+57710,Secret Woods,Fishsanity: Grass Carp,FISHSANITY,Stardew Valley Expanded
+57711,Forest West,Fishsanity: King Salmon,FISHSANITY,Stardew Valley Expanded
+57712,Island West,Fishsanity: Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57713,Sprite Spring,Fishsanity: Meteor Carp,FISHSANITY,Stardew Valley Expanded
+57714,Town,Fishsanity: Minnow,FISHSANITY,Stardew Valley Expanded
+57715,Forest West,Fishsanity: Puppyfish,FISHSANITY,Stardew Valley Expanded
+57716,Sewer,Fishsanity: Radioactive Bass,FISHSANITY,Stardew Valley Expanded
+57717,Island West,Fishsanity: Seahorse,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57718,Island West,Fishsanity: Sea Sponge,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57719,Island South,Fishsanity: Shiny Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57720,Mutant Bug Lair,Fishsanity: Snatcher Worm,FISHSANITY,Stardew Valley Expanded
+57721,Beach,Fishsanity: Starfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57722,Fable Reef,Fishsanity: Torpedo Trout,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57723,Witch's Swamp,Fishsanity: Void Eel,FISHSANITY,Stardew Valley Expanded
+57724,Mutant Bug Lair,Fishsanity: Water Grub,FISHSANITY,Stardew Valley Expanded
+57725,Crimson Badlands,Fishsanity: Undeadfish,FISHSANITY,Stardew Valley Expanded
+57726,Shearwater Bridge,Fishsanity: Kittyfish,FISHSANITY,Stardew Valley Expanded
+57728,Witch's Swamp,Fishsanity: Void Minnow,FISHSANITY,Distant Lands - Witch Swamp Overhaul
+57729,Witch's Swamp,Fishsanity: Swamp Leech,FISHSANITY,Distant Lands - Witch Swamp Overhaul
+57730,Witch's Swamp,Fishsanity: Giant Horsehoe Crab,FISHSANITY,Distant Lands - Witch Swamp Overhaul
+57731,Witch's Swamp,Fishsanity: Purple Algae,FISHSANITY,Distant Lands - Witch Swamp Overhaul
+57901,Farm,Harvest Monster Fruit,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57902,Farm,Harvest Salal Berry,CROPSANITY,Stardew Valley Expanded
+57903,Farm,Harvest Slime Berry,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57904,Farm,Harvest Ancient Fiber,CROPSANITY,Stardew Valley Expanded
+57905,Farm,Harvest Monster Mushroom,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57906,Farm,Harvest Void Root,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+57907,Farm,Harvest Void Mint Leaves,CROPSANITY,Distant Lands - Witch Swamp Overhaul
+57908,Farm,Harvest Vile Ancient Fruit,CROPSANITY,Distant Lands - Witch Swamp Overhaul
+58001,Shipping,Shipsanity: Magic Elixir,SHIPSANITY,Magic
+58002,Shipping,Shipsanity: Travel Core,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Magic
+58003,Shipping,Shipsanity: Aegis Elixir,SHIPSANITY,Stardew Valley Expanded
+58004,Shipping,Shipsanity: Aged Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded
+58005,Shipping,Shipsanity: Ancient Fern Seed,SHIPSANITY,Stardew Valley Expanded
+58006,Shipping,Shipsanity: Ancient Fiber,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58007,Shipping,Shipsanity: Armor Elixir,SHIPSANITY,Stardew Valley Expanded
+58008,Shipping,Shipsanity: Baby Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58009,Shipping,Shipsanity: Baked Berry Oatmeal,SHIPSANITY,Stardew Valley Expanded
+58010,Shipping,Shipsanity: Barbarian Elixir,SHIPSANITY,Stardew Valley Expanded
+58011,Shipping,Shipsanity: Bearberry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58012,Shipping,Shipsanity: Big Bark Burger,SHIPSANITY,Stardew Valley Expanded
+58013,Shipping,Shipsanity: Conch,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58014,Shipping,Shipsanity: Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded
+58015,Shipping,Shipsanity: Bonefish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58016,Shipping,Shipsanity: Bull Trout,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58017,Shipping,Shipsanity: Butterfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58018,Shipping,Shipsanity: Clownfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58019,Shipping,Shipsanity: Daggerfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58020,Shipping,Shipsanity: Dewdrop Berry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58021,Shipping,Shipsanity: Sand Dollar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58023,Shipping,Shipsanity: Ferngill Primrose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58024,Shipping,Shipsanity: Flower Cookie,SHIPSANITY,Stardew Valley Expanded
+58025,Shipping,Shipsanity: Frog,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58026,Shipping,Shipsanity: Frog Legs,SHIPSANITY,Stardew Valley Expanded
+58027,Shipping,Shipsanity: Fungus Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58029,Shipping,Shipsanity: Gemfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58030,Shipping,Shipsanity: Glazed Butterfish,"SHIPSANITY",Stardew Valley Expanded
+58031,Shipping,Shipsanity: Golden Ocean Flower,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58032,Shipping,Shipsanity: Goldenfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58033,Shipping,Shipsanity: Goldenrod,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58034,Shipping,Shipsanity: Grampleton Orange Chicken,SHIPSANITY,Stardew Valley Expanded
+58035,Shipping,Shipsanity: Grass Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58036,Shipping,Shipsanity: Gravity Elixir,SHIPSANITY,Stardew Valley Expanded
+58037,Shipping,Shipsanity: Green Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58038,Shipping,Shipsanity: Haste Elixir,SHIPSANITY,Stardew Valley Expanded
+58039,Shipping,Shipsanity: Hero Elixir,SHIPSANITY,Stardew Valley Expanded
+58040,Shipping,Shipsanity: King Salmon,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58050,Shipping,Shipsanity: Kittyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58051,Shipping,Shipsanity: Lightning Elixir,SHIPSANITY,Stardew Valley Expanded
+58052,Shipping,Shipsanity: Four Leaf Clover,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58053,Shipping,Shipsanity: Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58054,Shipping,Shipsanity: Meteor Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58055,Shipping,Shipsanity: Minnow,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58056,Shipping,Shipsanity: Mixed Berry Pie,SHIPSANITY,Stardew Valley Expanded
+58057,Shipping,Shipsanity: Monster Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58058,Shipping,Shipsanity: Monster Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58059,Shipping,Shipsanity: Mushroom Berry Rice,SHIPSANITY,Stardew Valley Expanded
+58060,Shipping,Shipsanity: Mushroom Colony,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58061,Shipping,Shipsanity: Ornate Treasure Chest,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58062,Shipping,Shipsanity: Poison Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58063,Shipping,Shipsanity: Puppyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58064,Shipping,Shipsanity: Radioactive Bass,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58065,Shipping,Shipsanity: Red Baneberry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58066,Shipping,Shipsanity: Rusty Blade,SHIPSANITY,Stardew Valley Expanded
+58067,Shipping,Shipsanity: Salal Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58068,Shipping,Shipsanity: Sea Sponge,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58069,Shipping,Shipsanity: Seahorse,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58070,Shipping,Shipsanity: Seaweed Salad,SHIPSANITY,Stardew Valley Expanded
+58071,Shipping,Shipsanity: Shiny Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58072,Shipping,Shipsanity: Shrub Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58073,Shipping,Shipsanity: Slime Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58074,Shipping,Shipsanity: Slime Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58075,Shipping,Shipsanity: Rafflesia,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58076,Shipping,Shipsanity: Sports Drink,SHIPSANITY,Stardew Valley Expanded
+58077,Shipping,Shipsanity: Stalk Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58078,Shipping,Shipsanity: Stamina Capsule,SHIPSANITY,Stardew Valley Expanded
+58079,Shipping,Shipsanity: Starfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58080,Shipping,Shipsanity: Swirl Stone,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58081,Shipping,Shipsanity: Thistle,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58082,Shipping,Shipsanity: Torpedo Trout,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded
+58083,Shipping,Shipsanity: Undeadfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58084,Shipping,Shipsanity: Void Delight,SHIPSANITY,Stardew Valley Expanded
+58085,Shipping,Shipsanity: Void Eel,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58086,Shipping,Shipsanity: Void Pebble,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58087,Shipping,Shipsanity: Void Root,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded
+58088,Shipping,Shipsanity: Void Salmon Sushi,SHIPSANITY,Stardew Valley Expanded
+58089,Shipping,Shipsanity: Void Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded
+58090,Shipping,Shipsanity: Void Shard,SHIPSANITY,Stardew Valley Expanded
+58091,Shipping,Shipsanity: Void Soul,SHIPSANITY,Stardew Valley Expanded
+58092,Shipping,Shipsanity: Water Grub,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded
+58093,Shipping,Shipsanity: Winter Star Rose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded
+58094,Shipping,Shipsanity: Wooden Display: Amphibian Fossil,SHIPSANITY,Archaeology
+58095,Shipping,Shipsanity: Hardwood Display: Amphibian Fossil,SHIPSANITY,Archaeology
+58096,Shipping,Shipsanity: Wooden Display: Anchor,SHIPSANITY,Archaeology
+58097,Shipping,Shipsanity: Hardwood Display: Anchor,SHIPSANITY,Archaeology
+58098,Shipping,Shipsanity: Wooden Display: Ancient Doll,SHIPSANITY,Archaeology
+58099,Shipping,Shipsanity: Hardwood Display: Ancient Doll,SHIPSANITY,Archaeology
+58100,Shipping,Shipsanity: Wooden Display: Ancient Drum,SHIPSANITY,Archaeology
+58101,Shipping,Shipsanity: Hardwood Display: Ancient Drum,SHIPSANITY,Archaeology
+58102,Shipping,Shipsanity: Wooden Display: Ancient Seed,SHIPSANITY,Archaeology
+58103,Shipping,Shipsanity: Hardwood Display: Ancient Seed,SHIPSANITY,Archaeology
+58104,Shipping,Shipsanity: Wooden Display: Ancient Sword,SHIPSANITY,Archaeology
+58105,Shipping,Shipsanity: Hardwood Display: Ancient Sword,SHIPSANITY,Archaeology
+58106,Shipping,Shipsanity: Wooden Display: Arrowhead,SHIPSANITY,Archaeology
+58107,Shipping,Shipsanity: Hardwood Display: Arrowhead,SHIPSANITY,Archaeology
+58108,Shipping,Shipsanity: Wooden Display: Bone Flute,SHIPSANITY,Archaeology
+58109,Shipping,Shipsanity: Hardwood Display: Bone Flute,SHIPSANITY,Archaeology
+58110,Shipping,Shipsanity: Wooden Display: Chewing Stick,SHIPSANITY,Archaeology
+58111,Shipping,Shipsanity: Hardwood Display: Chewing Stick,SHIPSANITY,Archaeology
+58112,Shipping,Shipsanity: Wooden Display: Chicken Statue,SHIPSANITY,Archaeology
+58113,Shipping,Shipsanity: Hardwood Display: Chicken Statue,SHIPSANITY,Archaeology
+58114,Shipping,Shipsanity: Wooden Display: Chipped Amphora,SHIPSANITY,Archaeology
+58115,Shipping,Shipsanity: Hardwood Display: Chipped Amphora,SHIPSANITY,Archaeology
+58116,Shipping,Shipsanity: Wooden Display: Dinosaur Egg,SHIPSANITY,Archaeology
+58117,Shipping,Shipsanity: Hardwood Display: Dinosaur Egg,SHIPSANITY,Archaeology
+58118,Shipping,Shipsanity: Wooden Display: Dried Starfish,SHIPSANITY,Archaeology
+58119,Shipping,Shipsanity: Hardwood Display: Dried Starfish,SHIPSANITY,Archaeology
+58120,Shipping,Shipsanity: Wooden Display: Dwarf Gadget,SHIPSANITY,Archaeology
+58121,Shipping,Shipsanity: Hardwood Display: Dwarf Gadget,SHIPSANITY,Archaeology
+58122,Shipping,Shipsanity: Wooden Display: Dwarf Scroll I,SHIPSANITY,Archaeology
+58123,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll I,SHIPSANITY,Archaeology
+58124,Shipping,Shipsanity: Wooden Display: Dwarf Scroll II,SHIPSANITY,Archaeology
+58125,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll II,SHIPSANITY,Archaeology
+58126,Shipping,Shipsanity: Wooden Display: Dwarf Scroll III,SHIPSANITY,Archaeology
+58127,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll III,SHIPSANITY,Archaeology
+58128,Shipping,Shipsanity: Wooden Display: Dwarf Scroll IV,SHIPSANITY,Archaeology
+58129,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll IV,SHIPSANITY,Archaeology
+58130,Shipping,Shipsanity: Wooden Display: Dwarvish Helm,SHIPSANITY,Archaeology
+58131,Shipping,Shipsanity: Hardwood Display: Dwarvish Helm,SHIPSANITY,Archaeology
+58132,Shipping,Shipsanity: Wooden Display: Elvish Jewelry,SHIPSANITY,Archaeology
+58133,Shipping,Shipsanity: Hardwood Display: Elvish Jewelry,SHIPSANITY,Archaeology
+58134,Shipping,Shipsanity: Wooden Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58135,Shipping,Shipsanity: Hardwood Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58136,Shipping,Shipsanity: Wooden Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58137,Shipping,Shipsanity: Hardwood Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58138,Shipping,Shipsanity: Wooden Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58139,Shipping,Shipsanity: Hardwood Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58140,Shipping,Shipsanity: Wooden Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58141,Shipping,Shipsanity: Hardwood Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58142,Shipping,Shipsanity: Wooden Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58143,Shipping,Shipsanity: Hardwood Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58144,Shipping,Shipsanity: Wooden Display: Glass Shards,SHIPSANITY,Archaeology
+58145,Shipping,Shipsanity: Hardwood Display: Glass Shards,SHIPSANITY,Archaeology
+58146,Shipping,Shipsanity: Wooden Display: Golden Mask,SHIPSANITY,Archaeology
+58147,Shipping,Shipsanity: Hardwood Display: Golden Mask,SHIPSANITY,Archaeology
+58148,Shipping,Shipsanity: Wooden Display: Golden Relic,SHIPSANITY,Archaeology
+58149,Shipping,Shipsanity: Hardwood Display: Golden Relic,SHIPSANITY,Archaeology
+58150,Shipping,Shipsanity: Wooden Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58151,Shipping,Shipsanity: Hardwood Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58152,Shipping,Shipsanity: Wooden Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58153,Shipping,Shipsanity: Hardwood Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58154,Shipping,Shipsanity: Wooden Display: Nautilus Fossil,SHIPSANITY,Archaeology
+58155,Shipping,Shipsanity: Hardwood Display: Nautilus Fossil,SHIPSANITY,Archaeology
+58156,Shipping,Shipsanity: Wooden Display: Ornamental Fan,SHIPSANITY,Archaeology
+58157,Shipping,Shipsanity: Hardwood Display: Ornamental Fan,SHIPSANITY,Archaeology
+58158,Shipping,Shipsanity: Wooden Display: Palm Fossil,SHIPSANITY,Archaeology
+58159,Shipping,Shipsanity: Hardwood Display: Palm Fossil,SHIPSANITY,Archaeology
+58160,Shipping,Shipsanity: Wooden Display: Prehistoric Handaxe,SHIPSANITY,Archaeology
+58161,Shipping,Shipsanity: Hardwood Display: Prehistoric Handaxe,SHIPSANITY,Archaeology
+58162,Shipping,Shipsanity: Wooden Display: Prehistoric Rib,SHIPSANITY,Archaeology
+58163,Shipping,Shipsanity: Hardwood Display: Prehistoric Rib,SHIPSANITY,Archaeology
+58164,Shipping,Shipsanity: Wooden Display: Prehistoric Scapula,SHIPSANITY,Archaeology
+58165,Shipping,Shipsanity: Hardwood Display: Prehistoric Scapula,SHIPSANITY,Archaeology
+58166,Shipping,Shipsanity: Wooden Display: Prehistoric Skull,SHIPSANITY,Archaeology
+58167,Shipping,Shipsanity: Hardwood Display: Prehistoric Skull,SHIPSANITY,Archaeology
+58168,Shipping,Shipsanity: Wooden Display: Prehistoric Tibia,SHIPSANITY,Archaeology
+58169,Shipping,Shipsanity: Hardwood Display: Prehistoric Tibia,SHIPSANITY,Archaeology
+58170,Shipping,Shipsanity: Wooden Display: Prehistoric Tool,SHIPSANITY,Archaeology
+58171,Shipping,Shipsanity: Hardwood Display: Prehistoric Tool,SHIPSANITY,Archaeology
+58172,Shipping,Shipsanity: Wooden Display: Prehistoric Vertebra,SHIPSANITY,Archaeology
+58173,Shipping,Shipsanity: Hardwood Display: Prehistoric Vertebra,SHIPSANITY,Archaeology
+58174,Shipping,Shipsanity: Wooden Display: Rare Disc,SHIPSANITY,Archaeology
+58175,Shipping,Shipsanity: Hardwood Display: Rare Disc,SHIPSANITY,Archaeology
+58176,Shipping,Shipsanity: Wooden Display: Rusty Cog,SHIPSANITY,Archaeology
+58177,Shipping,Shipsanity: Hardwood Display: Rusty Cog,SHIPSANITY,Archaeology
+58178,Shipping,Shipsanity: Wooden Display: Rusty Spoon,SHIPSANITY,Archaeology
+58179,Shipping,Shipsanity: Hardwood Display: Rusty Spoon,SHIPSANITY,Archaeology
+58180,Shipping,Shipsanity: Wooden Display: Rusty Spur,SHIPSANITY,Archaeology
+58181,Shipping,Shipsanity: Hardwood Display: Rusty Spur,SHIPSANITY,Archaeology
+58182,Shipping,Shipsanity: Wooden Display: Skeletal Hand,SHIPSANITY,Archaeology
+58183,Shipping,Shipsanity: Hardwood Display: Skeletal Hand,SHIPSANITY,Archaeology
+58184,Shipping,Shipsanity: Wooden Display: Skeletal Tail,SHIPSANITY,Archaeology
+58185,Shipping,Shipsanity: Hardwood Display: Skeletal Tail,SHIPSANITY,Archaeology
+58186,Shipping,Shipsanity: Wooden Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58187,Shipping,Shipsanity: Hardwood Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58188,Shipping,Shipsanity: Wooden Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58189,Shipping,Shipsanity: Hardwood Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58190,Shipping,Shipsanity: Wooden Display: Strange Doll (Green),SHIPSANITY,Archaeology
+58191,Shipping,Shipsanity: Hardwood Display: Strange Doll (Green),SHIPSANITY,Archaeology
+58192,Shipping,Shipsanity: Wooden Display: Strange Doll,SHIPSANITY,Archaeology
+58193,Shipping,Shipsanity: Hardwood Display: Strange Doll,SHIPSANITY,Archaeology
+58194,Shipping,Shipsanity: Wooden Display: Trilobite Fossil,SHIPSANITY,Archaeology
+58195,Shipping,Shipsanity: Hardwood Display: Trilobite Fossil,SHIPSANITY,Archaeology
+58196,Shipping,Shipsanity: Bone Path,SHIPSANITY,Archaeology
+58197,Shipping,Shipsanity: Glass Fence,SHIPSANITY,Archaeology
+58198,Shipping,Shipsanity: Glass Path,SHIPSANITY,Archaeology
+58199,Shipping,Shipsanity: Hardwood Display,SHIPSANITY,Archaeology
+58200,Shipping,Shipsanity: Wooden Display,SHIPSANITY,Archaeology
+58201,Shipping,Shipsanity: Dwarf Gadget: Infinite Volcano Simulation,"SHIPSANITY,GINGER_ISLAND",Archaeology
+58202,Shipping,Shipsanity: Water Sifter,"SHIPSANITY,DEPRECATED",Archaeology
+58203,Shipping,Shipsanity: Brown Amanita,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
+58204,Shipping,Shipsanity: Swamp Herb,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
+58205,Shipping,Shipsanity: Void Mint Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58206,Shipping,Shipsanity: Vile Ancient Fruit Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58207,Shipping,Shipsanity: Void Mint Leaves,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
+58208,Shipping,Shipsanity: Vile Ancient Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
+58209,Shipping,Shipsanity: Void Minnow,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
+58210,Shipping,Shipsanity: Swamp Leech,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
+58211,Shipping,Shipsanity: Purple Algae,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58212,Shipping,Shipsanity: Giant Horsehoe Crab,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul
+58213,Shipping,Shipsanity: Mushroom Kebab,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58214,Shipping,Shipsanity: Crayfish Soup,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58215,Shipping,Shipsanity: Pemmican,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58216,Shipping,Shipsanity: Void Mint Tea,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
+58217,Shipping,Shipsanity: Ginger Tincture,"SHIPSANITY,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul
+58218,Shipping,Shipsanity: Neanderthal Limb Bones,SHIPSANITY,Boarding House and Bus Stop Extension
+58219,Shipping,Shipsanity: Dinosaur Claw,SHIPSANITY,Boarding House and Bus Stop Extension
+58220,Shipping,Shipsanity: Special Pumpkin Soup,SHIPSANITY,Boarding House and Bus Stop Extension
+58221,Shipping,Shipsanity: Pterodactyl L Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension
+58222,Shipping,Shipsanity: Dinosaur Skull,SHIPSANITY,Boarding House and Bus Stop Extension
+58223,Shipping,Shipsanity: Dinosaur Tooth,SHIPSANITY,Boarding House and Bus Stop Extension
+58224,Shipping,Shipsanity: Pterodactyl Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Boarding House and Bus Stop Extension
+58225,Shipping,Shipsanity: Pterodactyl Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
+58226,Shipping,Shipsanity: Dinosaur Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension
+58227,Shipping,Shipsanity: Neanderthal Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
+58228,Shipping,Shipsanity: Dinosaur Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension
+58229,Shipping,Shipsanity: Dinosaur Ribs,SHIPSANITY,Boarding House and Bus Stop Extension
+58230,Shipping,Shipsanity: Pterodactyl Phalange,SHIPSANITY,Boarding House and Bus Stop Extension
+58231,Shipping,Shipsanity: Pterodactyl Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension
+58232,Shipping,Shipsanity: Neanderthal Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension
+58233,Shipping,Shipsanity: Pterodactyl Skull,SHIPSANITY,Boarding House and Bus Stop Extension
+58234,Shipping,Shipsanity: Dinosaur Femur,SHIPSANITY,Boarding House and Bus Stop Extension
+58235,Shipping,Shipsanity: Pterodactyl Claw,SHIPSANITY,Boarding House and Bus Stop Extension
+58236,Shipping,Shipsanity: Neanderthal Skull,SHIPSANITY,Boarding House and Bus Stop Extension
+58237,Shipping,Shipsanity: Pterodactyl R Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension
+58238,Shipping,Shipsanity: Scrap Rust,SHIPSANITY,Archaeology
+58239,Shipping,Shipsanity: Rusty Path,SHIPSANITY,Archaeology
+58241,Shipping,Shipsanity: Digger's Delight,SHIPSANITY,Archaeology
+58242,Shipping,Shipsanity: Rocky Root Coffee,SHIPSANITY,Archaeology
+58243,Shipping,Shipsanity: Ancient Jello,SHIPSANITY,Archaeology
+58244,Shipping,Shipsanity: Bone Fence,SHIPSANITY,Archaeology
+58245,Shipping,Shipsanity: Grilled Cheese,SHIPSANITY,Binning Skill
+58246,Shipping,Shipsanity: Fish Casserole,SHIPSANITY,Binning Skill
+58247,Shipping,Shipsanity: Snatcher Worm,SHIPSANITY,Stardew Valley Expanded
+58248,Shipping,Shipsanity: Digging Like Worms,SHIPSANITY,Archaeology
+59000,Farm,Read Digging Like Worms,"BOOKSANITY,BOOKSANITY_SKILL",Archaeology
diff --git a/worlds/stardew_valley/data/monster_data.py b/worlds/stardew_valley/data/monster_data.py
index b423fce4a3..f5fb2aac92 100644
--- a/worlds/stardew_valley/data/monster_data.py
+++ b/worlds/stardew_valley/data/monster_data.py
@@ -1,6 +1,7 @@
 from dataclasses import dataclass
-from typing import List, Tuple, Dict, Set, Callable
+from typing import List, Tuple, Dict, Callable
 
+from .game_item import Source
 from ..mods.mod_data import ModNames
 from ..mods.mod_monster_locations import modded_monsters_locations
 from ..strings.monster_names import Monster, MonsterCategory
@@ -12,7 +13,7 @@ from ..strings.region_names import Region
 class StardewMonster:
     name: str
     category: str
-    locations: Tuple[str]
+    locations: Tuple[str, ...]
     difficulty: str
 
     def __repr__(self):
@@ -20,6 +21,12 @@ class StardewMonster:
                f" Difficulty: {self.difficulty}) |"
 
 
+@dataclass(frozen=True, kw_only=True)
+class MonsterSource(Source):
+    monsters: Tuple[StardewMonster, ...]
+    amount_tier: int = 0
+
+
 slime_hutch = (Region.slime_hutch,)
 mines_floor_20 = (Region.mines_floor_20,)
 mines_floor_60 = (Region.mines_floor_60,)
@@ -97,6 +104,8 @@ armored_bug = create_monster(Monster.armored_bug, MonsterCategory.cave_insects,
 armored_bug_dangerous = create_monster(Monster.armored_bug_dangerous, MonsterCategory.cave_insects, skull_cavern,
                                        Performance.good)  # Requires 'Bug Killer' enchantment
 
+metal_head = create_monster(Monster.metal_head, MonsterCategory.metal_heads, mines_floor_100, Performance.good)
+
 duggy = create_monster(Monster.duggy, MonsterCategory.duggies, mines_floor_20, Performance.basic)
 duggy_dangerous = create_monster(Monster.duggy_dangerous, MonsterCategory.duggies, dangerous_mines_20, Performance.great)
 magma_duggy = create_monster(Monster.magma_duggy, MonsterCategory.duggies, volcano, Performance.galaxy)
@@ -122,6 +131,8 @@ royal_serpent = create_monster(Monster.royal_serpent, MonsterCategory.serpents,
 magma_sprite = create_monster(Monster.magma_sprite, MonsterCategory.magma_sprites, volcano, Performance.galaxy)
 magma_sparker = create_monster(Monster.magma_sparker, MonsterCategory.magma_sprites, volcano_high, Performance.galaxy)
 
+haunted_skull = create_monster(Monster.haunted_skull, MonsterCategory.none, quarry_mine, Performance.great)
+
 register_monster_modification(ModNames.sve, shadow_brute_dangerous, update_monster_locations)
 register_monster_modification(ModNames.sve, shadow_sniper, update_monster_locations)
 register_monster_modification(ModNames.sve, shadow_shaman_dangerous, update_monster_locations)
@@ -145,7 +156,7 @@ register_monster_modification(ModNames.boarding_house, grub, update_monster_loca
 register_monster_modification(ModNames.boarding_house, bug, update_monster_locations)
 
 
-def all_monsters_by_name_given_mods(mods: Set[str]) -> Dict[str, StardewMonster]:
+def all_monsters_by_name_given_content_packs(mods: set[str]) -> dict[str, StardewMonster]:
     monsters_by_name = {}
     for monster in all_monsters:
         current_monster = monster
@@ -158,7 +169,7 @@ def all_monsters_by_name_given_mods(mods: Set[str]) -> Dict[str, StardewMonster]
     return monsters_by_name
 
 
-def all_monsters_by_category_given_mods(mods: Set[str]) -> Dict[str, Tuple[StardewMonster, ...]]:
+def all_monsters_by_category_given_content_packs(mods: set[str]) -> dict[str, Tuple[StardewMonster, ...]]:
     monsters_by_category = {}
     for monster in all_monsters:
         current_monster = monster
diff --git a/worlds/stardew_valley/data/movies.py b/worlds/stardew_valley/data/movies.py
new file mode 100644
index 0000000000..ac60ce17c2
--- /dev/null
+++ b/worlds/stardew_valley/data/movies.py
@@ -0,0 +1,99 @@
+from typing import List
+
+from ..strings.season_names import Season
+from ..strings.villager_names import NPC
+
+movies_by_name = dict()
+snacks_by_name = dict()
+npc_snacks = dict()
+
+
+def movie(movie_name: str, season: str, loving_npcs: List[str]):
+    movie = Movie(movie_name, season, loving_npcs)
+    movies_by_name[movie_name] = movie
+    return movie
+
+
+def snack(snack_name: str, category: str, loving_npcs: List[str]):
+    snack = Snack(snack_name, category, loving_npcs)
+    snacks_by_name[snack_name] = snack
+    for npc in loving_npcs:
+        if npc not in npc_snacks:
+            npc_snacks[npc] = []
+        npc_snacks[npc].append(snack)
+    return snack
+
+
+class Movie:
+    name: str
+    season: str
+    loving_npcs: List[str]
+
+    def __init__(self, name: str, season: str, loving_npcs: List[str]):
+        self.name = name
+        self.season = season
+        self.loving_npcs = loving_npcs
+
+
+class Snack:
+    name: str
+    category: str
+    loving_npcs: List[str]
+
+    def __init__(self, name: str, category: str, loving_npcs: List[str]):
+        self.name = name
+        self.category = category
+        self.loving_npcs = loving_npcs
+
+
+class MovieName:
+    brave_sapling = movie("The Brave Little Sapling", Season.spring, [NPC.caroline, NPC.dwarf, NPC.jas, NPC.penny, NPC.sandy, NPC.vincent])
+    prairie_king = movie("Journey Of The Prairie King: The Motion Picture", Season.summer, [NPC.caroline, NPC.dwarf, NPC.jas, NPC.robin, NPC.sandy, NPC.vincent])
+    mysterium = movie("Mysterium", Season.fall, [NPC.abigail, NPC.dwarf, NPC.elliott, NPC.leah, NPC.sandy, NPC.sebastian, NPC.wizard])
+    miracle_coldstar_ranch = movie("The Miracle At Coldstar Ranch", Season.winter, [NPC.dwarf, NPC.emily, NPC.evelyn, NPC.gus, NPC.harvey, NPC.marnie, NPC.sandy])
+    natural_wonders = movie("Natural Wonders: Exploring Our Vibrant World", Season.spring, [NPC.demetrius, NPC.dwarf, NPC.jas, NPC.leo, NPC.lewis, NPC.maru, NPC.sandy])
+    wumbus = movie("Wumbus", Season.summer, [NPC.alex, NPC.demetrius, NPC.dwarf, NPC.gus, NPC.jas, NPC.maru, NPC.pierre, NPC.sam, NPC.sandy, NPC.shane, NPC.vincent])
+    howls_in_rain = movie("It Howls In The Rain", Season.fall, [NPC.abigail, NPC.alex, NPC.dwarf, NPC.sandy, NPC.sebastian, NPC.shane])
+    zuzu_city_express = movie("The Zuzu City Express", Season.winter, [NPC.dwarf, NPC.evelyn, NPC.george, NPC.harvey, NPC.jodi, NPC.sandy])
+
+
+class SnackCategory:
+    salty = "Movie Salty Snacks"
+    sweet = "Movie Sweet Snacks"
+    drinks = "Movie Drinks"
+    meals = "Movie Meals"
+
+
+class SnackName:
+    apple_slices = snack("Apple Slices", SnackCategory.sweet, [NPC.harvey])
+    black_licorice = snack("Black Licorice", SnackCategory.sweet, [NPC.george, NPC.krobus, NPC.wizard])
+    cappuccino_mousse_cake = snack("Cappuccino Mousse Cake", SnackCategory.sweet, [NPC.elliott, NPC.evelyn, NPC.gus, NPC.haley])
+    chocolate_popcorn = snack("Chocolate Popcorn", SnackCategory.sweet, [NPC.jodi])
+    cotton_candy = snack("Cotton Candy", SnackCategory.sweet, [NPC.penny, NPC.sandy])
+    fries = snack("Fries", SnackCategory.salty, [NPC.clint])
+    hummus_snack_pack = snack("Hummus Snack Pack", SnackCategory.salty, [NPC.shane])
+    ice_cream_sandwich = snack("Ice Cream Sandwich", SnackCategory.sweet, [NPC.marnie])
+    jasmine_tea = snack("Jasmine Tea", SnackCategory.drinks, [NPC.caroline, NPC.harvey, NPC.lewis, NPC.sebastian])
+    jawbreaker = snack("Jawbreaker", SnackCategory.sweet, [NPC.vincent])
+    joja_cola = snack("Joja Cola", SnackCategory.drinks, [NPC.shane])
+    jojacorn = snack("JojaCorn", SnackCategory.salty, [NPC.shane])
+    kale_smoothie = snack("Kale Smoothie", SnackCategory.drinks, [NPC.emily])
+    nachos = snack("Nachos", SnackCategory.meals, [NPC.pam, NPC.shane])
+    panzanella_salad = snack("Panzanella Salad", SnackCategory.meals, [NPC.gus, NPC.leah])
+    personal_pizza = snack("Personal Pizza", SnackCategory.meals, [NPC.pierre, NPC.sam, NPC.shane])
+    popcorn = snack("Popcorn", SnackCategory.salty, [NPC.demetrius, NPC.kent])
+    rock_candy = snack("Rock Candy", SnackCategory.sweet, [NPC.abigail, NPC.dwarf])
+    salmon_burger = snack("Salmon Burger", SnackCategory.meals, [NPC.alex, NPC.linus, NPC.willy])
+    salted_peanuts = snack("Salted Peanuts", SnackCategory.salty, [NPC.robin])
+    sour_slimes = snack("Sour Slimes", SnackCategory.sweet, [NPC.jas])
+    star_cookie = snack("Star Cookie", SnackCategory.sweet, [NPC.evelyn, NPC.maru, NPC.wizard])
+    stardrop_sorbet = snack("Stardrop Sorbet", SnackCategory.sweet, [NPC.alex, NPC.harvey, NPC.sam, NPC.sebastian, NPC.shane, NPC.abigail, NPC.emily, NPC.haley,
+                                                NPC.leah, NPC.maru, NPC.penny, NPC.caroline, NPC.clint, NPC.demetrius, NPC.dwarf, NPC.evelyn,
+                                                NPC.george, NPC.gus, NPC.jas, NPC.jodi, NPC.kent, NPC.lewis, NPC.linus, NPC.marnie, NPC.pam,
+                                                NPC.pierre, NPC.robin, NPC.sandy, NPC.vincent, NPC.willy, NPC.wizard])
+    truffle_popcorn = snack("Truffle Popcorn", SnackCategory.salty, [NPC.caroline, NPC.elliott, NPC.gus])
+
+
+# For some unknown reason, Leo doesn't love ANY snack
+npc_snacks[NPC.leo] = []
+
diff --git a/worlds/stardew_valley/data/museum_data.py b/worlds/stardew_valley/data/museum_data.py
index 0607261ec6..7548d20876 100644
--- a/worlds/stardew_valley/data/museum_data.py
+++ b/worlds/stardew_valley/data/museum_data.py
@@ -15,7 +15,7 @@ from ..strings.region_names import Region
 @dataclass(frozen=True)
 class MuseumItem:
     item_name: str
-    locations: Tuple[str, ...]
+    artifact_spot_locations: Tuple[str, ...]
     geodes: Tuple[str, ...]
     monsters: Tuple[str, ...]
     difficulty: float
@@ -23,11 +23,11 @@ class MuseumItem:
     @staticmethod
     def of(item_name: str,
            difficulty: float,
-           locations: Union[str, Tuple[str, ...]],
+           artifact_spot_locations: Union[str, Tuple[str, ...]],
            geodes: Union[str, Tuple[str, ...]],
            monsters: Union[str, Tuple[str, ...]]) -> MuseumItem:
-        if isinstance(locations, str):
-            locations = (locations,)
+        if isinstance(artifact_spot_locations, str):
+            artifact_spot_locations = (artifact_spot_locations,)
 
         if isinstance(geodes, str):
             geodes = (geodes,)
@@ -35,10 +35,10 @@ class MuseumItem:
         if isinstance(monsters, str):
             monsters = (monsters,)
 
-        return MuseumItem(item_name, locations, geodes, monsters, difficulty)
+        return MuseumItem(item_name, artifact_spot_locations, geodes, monsters, difficulty)
 
     def __repr__(self):
-        return f"{self.item_name} (Locations: {self.locations} |" \
+        return f"{self.item_name} (Artifact Spot Locations: {self.artifact_spot_locations} |" \
                f" Geodes: {self.geodes} |" \
                f" Monsters: {self.monsters}) "
 
@@ -53,17 +53,17 @@ all_museum_items: List[MuseumItem] = []
 
 def create_artifact(name: str,
                     difficulty: float,
-                    locations: Union[str, Tuple[str, ...]] = (),
+                    artifact_spot_locations: Union[str, Tuple[str, ...]] = (),
                     geodes: Union[str, Tuple[str, ...]] = (),
                     monsters: Union[str, Tuple[str, ...]] = ()) -> MuseumItem:
-    artifact_item = MuseumItem.of(name, difficulty, locations, geodes, monsters)
+    artifact_item = MuseumItem.of(name, difficulty, artifact_spot_locations, geodes, monsters)
     all_museum_artifacts.append(artifact_item)
     all_museum_items.append(artifact_item)
     return artifact_item
 
 
 def create_mineral(name: str,
-                   locations: Union[str, Tuple[str, ...]] = (),
+                   artifact_spot_locations: Union[str, Tuple[str, ...]] = (),
                    geodes: Union[str, Tuple[str, ...]] = (),
                    monsters: Union[str, Tuple[str, ...]] = (),
                    difficulty: Optional[float] = None) -> MuseumItem:
@@ -80,7 +80,7 @@ def create_mineral(name: str,
         if "Fishing Chest" in geodes:
             difficulty += 4.3
 
-    mineral_item = MuseumItem.of(name, difficulty, locations, geodes, monsters)
+    mineral_item = MuseumItem.of(name, difficulty, artifact_spot_locations, geodes, monsters)
     all_museum_minerals.append(mineral_item)
     all_museum_items.append(mineral_item)
     return mineral_item
@@ -168,7 +168,7 @@ class Artifact:
                                        geodes=WaterChest.fishing_chest)
     palm_fossil = create_artifact("Palm Fossil", 10.2,
                                   (Region.dig_site, Region.desert, Region.forest, Region.beach))
-    trilobite = create_artifact("Trilobite", 7.4, (Region.dig_site, Region.desert, Region.forest, Region.beach))
+    trilobite = create_artifact(Fossil.trilobite, 7.4, (Region.dig_site, Region.desert, Region.forest, Region.beach))
 
 
 class Mineral:
@@ -267,15 +267,15 @@ class Mineral:
                              geodes=(Geode.geode, Geode.omni))
     basalt = create_mineral("Basalt",
                             geodes=(Geode.magma, Geode.omni))
-    limestone = create_mineral("Limestone",
+    limestone = create_mineral(Mineral.limestone,
                                geodes=(Geode.geode, Geode.omni))
     soapstone = create_mineral("Soapstone",
                                geodes=(Geode.frozen, Geode.omni))
     hematite = create_mineral("Hematite",
                               geodes=(Geode.frozen, Geode.omni))
-    mudstone = create_mineral("Mudstone",
+    mudstone = create_mineral(Mineral.mudstone,
                               geodes=(Geode.geode, Geode.omni))
-    obsidian = create_mineral("Obsidian",
+    obsidian = create_mineral(Mineral.obsidian,
                               geodes=(Geode.magma, Geode.omni))
     slate = create_mineral("Slate", geodes=(Geode.geode, Geode.omni))
     fairy_stone = create_mineral("Fairy Stone", geodes=(Geode.frozen, Geode.omni))
diff --git a/worlds/stardew_valley/data/recipe_data.py b/worlds/stardew_valley/data/recipe_data.py
index 667227cb9e..66afb90dda 100644
--- a/worlds/stardew_valley/data/recipe_data.py
+++ b/worlds/stardew_valley/data/recipe_data.py
@@ -1,6 +1,7 @@
-from typing import Dict, List, Optional
+from typing import List
 
 from .recipe_source import RecipeSource, FriendshipSource, SkillSource, QueenOfSauceSource, ShopSource, StarterSource, ShopTradeSource, ShopFriendshipSource
+from ..content.content_packs import ginger_island_content_pack
 from ..mods.mod_data import ModNames
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.artisan_good_names import ArtisanGood
@@ -23,15 +24,15 @@ from ..strings.villager_names import NPC, ModNPC
 
 class CookingRecipe:
     meal: str
-    ingredients: Dict[str, int]
+    ingredients: dict[str, int]
     source: RecipeSource
-    mod_name: Optional[str] = None
+    content_pack: str | None
 
-    def __init__(self, meal: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None):
+    def __init__(self, meal: str, ingredients: dict[str, int], source: RecipeSource, content_pack: str | None):
         self.meal = meal
         self.ingredients = ingredients
         self.source = source
-        self.mod_name = mod_name
+        self.content_pack = content_pack
 
     def __repr__(self):
         return f"{self.meal} (Source: {self.source} |" \
@@ -41,44 +42,44 @@ class CookingRecipe:
 all_cooking_recipes: List[CookingRecipe] = []
 
 
-def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe:
+def friendship_recipe(name: str, friend: str, hearts: int, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = FriendshipSource(friend, hearts)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def friendship_and_shop_recipe(name: str, friend: str, hearts: int, region: str, price: int, ingredients: Dict[str, int],
-                               mod_name: Optional[str] = None) -> CookingRecipe:
+def friendship_and_shop_recipe(name: str, friend: str, hearts: int, region: str, price: int, ingredients: dict[str, int],
+                               /, *, content_pack: str | None = None) -> CookingRecipe:
     source = ShopFriendshipSource(friend, hearts, region, price)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe:
+def skill_recipe(name: str, skill: str, level: int, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = SkillSource(skill, level)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe:
+def shop_recipe(name: str, region: str, price: int, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = ShopSource(region, price)
-    return create_recipe(name, ingredients, source, mod_name)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: Dict[str, int]) -> CookingRecipe:
+def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = ShopTradeSource(region, currency, price)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def queen_of_sauce_recipe(name: str, year: int, season: str, day: int, ingredients: Dict[str, int]) -> CookingRecipe:
+def queen_of_sauce_recipe(name: str, year: int, season: str, day: int, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = QueenOfSauceSource(year, season, day)
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def starter_recipe(name: str, ingredients: Dict[str, int]) -> CookingRecipe:
+def starter_recipe(name: str, ingredients: dict[str, int], /, *, content_pack: str | None = None) -> CookingRecipe:
     source = StarterSource()
-    return create_recipe(name, ingredients, source)
+    return create_recipe(name, ingredients, source, content_pack)
 
 
-def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None) -> CookingRecipe:
-    recipe = CookingRecipe(name, ingredients, source, mod_name)
+def create_recipe(name: str, ingredients: dict[str, int], source: RecipeSource, content_pack: str | None = None) -> CookingRecipe:
+    recipe = CookingRecipe(name, ingredients, source, content_pack)
     all_cooking_recipes.append(recipe)
     return recipe
 
@@ -88,7 +89,8 @@ artichoke_dip = queen_of_sauce_recipe(Meal.artichoke_dip, 1, Season.fall, 28, {V
 autumn_bounty = friendship_recipe(Meal.autumn_bounty, NPC.demetrius, 7, {Vegetable.yam: 1, Vegetable.pumpkin: 1})
 baked_fish = queen_of_sauce_recipe(Meal.baked_fish, 1, Season.summer, 7, {Fish.sunfish: 1, Fish.bream: 1, Ingredient.wheat_flour: 1})
 banana_pudding = shop_trade_recipe(Meal.banana_pudding, Region.island_trader, Fossil.bone_fragment, 30,
-                                   {Fruit.banana: 1, AnimalProduct.cow_milk: 1, Ingredient.sugar: 1})
+                                   {Fruit.banana: 1, AnimalProduct.cow_milk: 1, Ingredient.sugar: 1},
+                                   content_pack=ginger_island_content_pack.name)
 bean_hotpot = friendship_recipe(Meal.bean_hotpot, NPC.clint, 7, {Vegetable.green_bean: 2})
 blackberry_cobbler_ingredients = {Forageable.blackberry: 2, Ingredient.sugar: 1, Ingredient.wheat_flour: 1}
 blackberry_cobbler_qos = queen_of_sauce_recipe(Meal.blackberry_cobbler, 2, Season.fall, 14, blackberry_cobbler_ingredients)
@@ -122,7 +124,8 @@ fried_eel = friendship_recipe(Meal.fried_eel, NPC.george, 3, {Fish.eel: 1, Ingre
 fried_egg = starter_recipe(Meal.fried_egg, {AnimalProduct.chicken_egg: 1})
 fried_mushroom = friendship_recipe(Meal.fried_mushroom, NPC.demetrius, 3, {Mushroom.common: 1, Mushroom.morel: 1, Ingredient.oil: 1})
 fruit_salad = queen_of_sauce_recipe(Meal.fruit_salad, 2, Season.fall, 7, {Fruit.blueberry: 1, Fruit.melon: 1, Fruit.apricot: 1})
-ginger_ale = shop_recipe(Beverage.ginger_ale, Region.volcano_dwarf_shop, 1000, {Forageable.ginger: 3, Ingredient.sugar: 1})
+ginger_ale = shop_recipe(Beverage.ginger_ale, Region.volcano_dwarf_shop, 1000, {Forageable.ginger: 3, Ingredient.sugar: 1},
+                         content_pack=ginger_island_content_pack.name)
 glazed_yams = queen_of_sauce_recipe(Meal.glazed_yams, 1, Season.fall, 21, {Vegetable.yam: 1, Ingredient.sugar: 1})
 hashbrowns = queen_of_sauce_recipe(Meal.hashbrowns, 2, Season.spring, 14, {Vegetable.potato: 1, Ingredient.oil: 1})
 ice_cream = friendship_recipe(Meal.ice_cream, NPC.jodi, 7, {AnimalProduct.cow_milk: 1, Ingredient.sugar: 1})
@@ -131,7 +134,8 @@ lobster_bisque_friend = friendship_recipe(Meal.lobster_bisque, NPC.willy, 9, lob
 lobster_bisque_qos = queen_of_sauce_recipe(Meal.lobster_bisque, 2, Season.winter, 14, lobster_bisque_ingredients)
 lucky_lunch = queen_of_sauce_recipe(Meal.lucky_lunch, 2, Season.spring, 28, {Fish.sea_cucumber: 1, Meal.tortilla: 1, Flower.blue_jazz: 1})
 maki_roll = queen_of_sauce_recipe(Meal.maki_roll, 1, Season.summer, 21, {Fish.any: 1, WaterItem.seaweed: 1, Ingredient.rice: 1})
-mango_sticky_rice = friendship_recipe(Meal.mango_sticky_rice, NPC.leo, 7, {Fruit.mango: 1, Forageable.coconut: 1, Ingredient.rice: 1})
+mango_sticky_rice = friendship_recipe(Meal.mango_sticky_rice, NPC.leo, 7, {Fruit.mango: 1, Forageable.coconut: 1, Ingredient.rice: 1},
+                                      content_pack=ginger_island_content_pack.name)
 maple_bar = queen_of_sauce_recipe(Meal.maple_bar, 2, Season.summer, 14, {ArtisanGood.maple_syrup: 1, Ingredient.sugar: 1, Ingredient.wheat_flour: 1})
 miners_treat = skill_recipe(Meal.miners_treat, Skill.mining, 3, {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.cow_milk: 1})
 moss_soup = skill_recipe(Meal.moss_soup, Skill.foraging, 3, {Material.moss: 20})
@@ -146,7 +150,7 @@ pizza_ingredients = {Ingredient.wheat_flour: 1, Vegetable.tomato: 1, ArtisanGood
 pizza_qos = queen_of_sauce_recipe(Meal.pizza, 2, Season.spring, 7, pizza_ingredients)
 pizza_saloon = shop_recipe(Meal.pizza, Region.saloon, 150, pizza_ingredients)
 plum_pudding = queen_of_sauce_recipe(Meal.plum_pudding, 1, Season.winter, 7, {Forageable.wild_plum: 2, Ingredient.wheat_flour: 1, Ingredient.sugar: 1})
-poi = friendship_recipe(Meal.poi, NPC.leo, 3, {Vegetable.taro_root: 4})
+poi = friendship_recipe(Meal.poi, NPC.leo, 3, {Vegetable.taro_root: 4}, content_pack=ginger_island_content_pack.name)
 poppyseed_muffin = queen_of_sauce_recipe(Meal.poppyseed_muffin, 2, Season.winter, 7, {Flower.poppy: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1})
 pumpkin_pie_ingredients = {Vegetable.pumpkin: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.cow_milk: 1}
 pumpkin_pie_qos = queen_of_sauce_recipe(Meal.pumpkin_pie, 1, Season.winter, 21, pumpkin_pie_ingredients)
@@ -177,55 +181,59 @@ tortilla_ingredients = {Vegetable.corn: 1}
 tortilla_qos = queen_of_sauce_recipe(Meal.tortilla, 1, Season.fall, 7, tortilla_ingredients)
 tortilla_saloon = shop_recipe(Meal.tortilla, Region.saloon, 100, tortilla_ingredients)
 triple_shot_espresso = shop_recipe(Beverage.triple_shot_espresso, Region.saloon, 5000, {Beverage.coffee: 3})
-tropical_curry = shop_recipe(Meal.tropical_curry, Region.island_resort, 2000, {Forageable.coconut: 1, Fruit.pineapple: 1, Fruit.hot_pepper: 1})
+tropical_curry = shop_recipe(Meal.tropical_curry, Region.island_resort, 2000, {Forageable.coconut: 1, Fruit.pineapple: 1, Fruit.hot_pepper: 1},
+                             content_pack=ginger_island_content_pack.name)
 trout_soup = queen_of_sauce_recipe(Meal.trout_soup, 1, Season.fall, 14, {Fish.rainbow_trout: 1, WaterItem.green_algae: 1})
 vegetable_medley = friendship_recipe(Meal.vegetable_medley, NPC.caroline, 7, {Vegetable.tomato: 1, Vegetable.beet: 1})
 
-magic_elixir = shop_recipe(ModEdible.magic_elixir, Region.adventurer_guild, 3000, {Edible.life_elixir: 1, Mushroom.purple: 1}, ModNames.magic)
+magic_elixir = shop_recipe(ModEdible.magic_elixir, Region.adventurer_guild, 3000, {Edible.life_elixir: 1, Mushroom.purple: 1}, content_pack=ModNames.magic)
 
 baked_berry_oatmeal = shop_recipe(SVEMeal.baked_berry_oatmeal, SVERegion.bear_shop, 0, {Forageable.salmonberry: 15, Forageable.blackberry: 15,
-                                                                                        Ingredient.sugar: 1, Ingredient.wheat_flour: 2}, ModNames.sve)
+                                                                                        Ingredient.sugar: 1, Ingredient.wheat_flour: 2},
+                                  content_pack=ModNames.sve)
 big_bark_burger = friendship_and_shop_recipe(SVEMeal.big_bark_burger, NPC.gus, 5, Region.saloon, 5500,
-                                             {SVEFish.puppyfish: 1, Meal.bread: 1, Ingredient.oil: 1}, ModNames.sve)
+                                             {SVEFish.puppyfish: 1, Meal.bread: 1, Ingredient.oil: 1}, content_pack=ModNames.sve)
 flower_cookie = shop_recipe(SVEMeal.flower_cookie, SVERegion.bear_shop, 0, {SVEForage.ferngill_primrose: 1, SVEForage.goldenrod: 1,
                                                                             SVEForage.winter_star_rose: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1,
-                                                                            AnimalProduct.large_egg: 1}, ModNames.sve)
-frog_legs = shop_recipe(SVEMeal.frog_legs, Region.adventurer_guild, 2000, {SVEFish.frog: 1, Ingredient.oil: 1, Ingredient.wheat_flour: 1}, ModNames.sve)
+                                                                            AnimalProduct.large_egg: 1}, content_pack=ModNames.sve)
+frog_legs = shop_recipe(SVEMeal.frog_legs, Region.adventurer_guild, 2000, {SVEFish.frog: 1, Ingredient.oil: 1, Ingredient.wheat_flour: 1},
+                        content_pack=ModNames.sve)
 glazed_butterfish = friendship_and_shop_recipe(SVEMeal.glazed_butterfish, NPC.gus, 10, Region.saloon, 4000,
-                                               {SVEFish.butterfish: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}, ModNames.sve)
+                                               {SVEFish.butterfish: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}, content_pack=ModNames.sve)
 mixed_berry_pie = shop_recipe(SVEMeal.mixed_berry_pie, Region.saloon, 3500, {Fruit.strawberry: 6, SVEFruit.salal_berry: 6, Forageable.blackberry: 6,
                                                                              SVEForage.bearberry: 6, Ingredient.sugar: 1, Ingredient.wheat_flour: 1},
-                              ModNames.sve)
+                              content_pack=ModNames.sve)
 mushroom_berry_rice = friendship_and_shop_recipe(SVEMeal.mushroom_berry_rice, ModNPC.marlon, 6, Region.adventurer_guild, 1500,
-                                                 {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10, Ingredient.rice: 1, Ingredient.sugar: 2},
-                                                 ModNames.sve)
+                                                 {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10,
+                                                  Ingredient.rice: 1, Ingredient.sugar: 2}, content_pack=ModNames.sve)
 seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEWaterItem.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1},
-                            ModNames.sve)
+                            content_pack=ModNames.sve)
 void_delight = friendship_and_shop_recipe(SVEMeal.void_delight, NPC.krobus, 10, Region.sewer, 5000,
-                                          {SVEFish.void_eel: 1, Loot.void_essence: 50, Loot.solar_essence: 20}, ModNames.sve)
+                                          {SVEFish.void_eel: 1, Loot.void_essence: 50, Loot.solar_essence: 20}, content_pack=ModNames.sve)
 void_salmon_sushi = friendship_and_shop_recipe(SVEMeal.void_salmon_sushi, NPC.krobus, 10, Region.sewer, 5000,
-                                               {Fish.void_salmon: 1, ArtisanGood.void_mayonnaise: 1, WaterItem.seaweed: 3}, ModNames.sve)
+                                               {Fish.void_salmon: 1, ArtisanGood.void_mayonnaise: 1, WaterItem.seaweed: 3}, content_pack=ModNames.sve)
 
 mushroom_kebab = friendship_recipe(DistantLandsMeal.mushroom_kebab, ModNPC.goblin, 2, {Mushroom.chanterelle: 1, Mushroom.common: 1,
-                                                                                       Mushroom.red: 1, Material.wood: 1}, ModNames.distant_lands)
-void_mint_tea = friendship_recipe(DistantLandsMeal.void_mint_tea, ModNPC.goblin, 4, {DistantLandsCrop.void_mint: 1}, ModNames.distant_lands)
+                                                                                       Mushroom.red: 1, Material.wood: 1}, content_pack=ModNames.distant_lands)
+void_mint_tea = friendship_recipe(DistantLandsMeal.void_mint_tea, ModNPC.goblin, 4, {DistantLandsCrop.void_mint: 1}, content_pack=ModNames.distant_lands)
 crayfish_soup = friendship_recipe(DistantLandsMeal.crayfish_soup, ModNPC.goblin, 6, {Forageable.cave_carrot: 1, Fish.crayfish: 1,
                                                                                      DistantLandsFish.purple_algae: 1, WaterItem.white_algae: 1},
-                                  ModNames.distant_lands)
+                                  content_pack=ModNames.distant_lands)
 pemmican = friendship_recipe(DistantLandsMeal.pemmican, ModNPC.goblin, 8, {Loot.bug_meat: 1, Fish.any: 1, Forageable.salmonberry: 3,
-                                                                           Material.stone: 2}, ModNames.distant_lands)
+                                                                           Material.stone: 2}, content_pack=ModNames.distant_lands)
 
 special_pumpkin_soup = friendship_recipe(BoardingHouseMeal.special_pumpkin_soup, ModNPC.joel, 6, {Vegetable.pumpkin: 2, AnimalProduct.large_goat_milk: 1,
-                                                                                                  Vegetable.garlic: 1}, ModNames.boarding_house)
+                                                                                                  Vegetable.garlic: 1}, content_pack=ModNames.boarding_house)
 diggers_delight = skill_recipe(ArchaeologyMeal.diggers_delight, ModSkill.archaeology, 3,
-                               {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.milk: 1}, ModNames.archaeology)
+                               {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.milk: 1}, content_pack=ModNames.archaeology)
 rocky_root = skill_recipe(ArchaeologyMeal.rocky_root, ModSkill.archaeology, 7, {Forageable.cave_carrot: 3, Seed.coffee: 1, Material.stone: 1},
-                          ModNames.archaeology)
+                          content_pack=ModNames.archaeology)
 ancient_jello = skill_recipe(ArchaeologyMeal.ancient_jello, ModSkill.archaeology, 9,
                              {WaterItem.cave_jelly: 6, Ingredient.sugar: 5, AnimalProduct.egg: 1, AnimalProduct.milk: 1, Artifact.chipped_amphora: 1},
-                             ModNames.archaeology)
+                             content_pack=ModNames.archaeology)
 
-grilled_cheese = skill_recipe(TrashyMeal.grilled_cheese, ModSkill.binning, 1, {Meal.bread: 1, ArtisanGood.cheese: 1}, ModNames.binning_skill)
-fish_casserole = skill_recipe(TrashyMeal.fish_casserole, ModSkill.binning, 8, {Fish.any: 1, AnimalProduct.milk: 1, Vegetable.carrot: 1}, ModNames.binning_skill)
+grilled_cheese = skill_recipe(TrashyMeal.grilled_cheese, ModSkill.binning, 1, {Meal.bread: 1, ArtisanGood.cheese: 1}, content_pack=ModNames.binning_skill)
+fish_casserole = skill_recipe(TrashyMeal.fish_casserole, ModSkill.binning, 8, {Fish.any: 1, AnimalProduct.milk: 1, Vegetable.carrot: 1},
+                              content_pack=ModNames.binning_skill)
 
 all_cooking_recipes_by_name = {recipe.meal: recipe for recipe in all_cooking_recipes}
diff --git a/worlds/stardew_valley/data/recipe_source.py b/worlds/stardew_valley/data/recipe_source.py
index bc8c09ee92..617f42c9b6 100644
--- a/worlds/stardew_valley/data/recipe_source.py
+++ b/worlds/stardew_valley/data/recipe_source.py
@@ -121,6 +121,17 @@ class ShopSource(RecipeSource):
         return f"ShopSource at {self.region} costing {self.price}g"
 
 
+class ShopWithKnownRecipeSource(ShopSource):
+    recipe_required: str
+
+    def __init__(self, region: str, price: int, recipe_required: str):
+        super().__init__(region, price)
+        self.recipe_required = recipe_required
+
+    def __repr__(self):
+        return f"ShopSource at {self.region} costing {self.price}g"
+
+
 class ShopFriendshipSource(RecipeSource):
     friend: str
     hearts: int
diff --git a/worlds/stardew_valley/data/requirement.py b/worlds/stardew_valley/data/requirement.py
index d335527a39..326c2f3cce 100644
--- a/worlds/stardew_valley/data/requirement.py
+++ b/worlds/stardew_valley/data/requirement.py
@@ -1,9 +1,15 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from typing import Tuple
 
 from .game_item import Requirement
 from ..strings.tool_names import ToolMaterial
 
 
+@dataclass(frozen=True)
+class HasItemRequirement(Requirement):
+    item: str
+
+
 @dataclass(frozen=True)
 class BookRequirement(Requirement):
     book: str
@@ -47,8 +53,19 @@ class QuestRequirement(Requirement):
 
 
 @dataclass(frozen=True)
-class RelationshipRequirement(Requirement):
+class MeetRequirement(Requirement):
     npc: str
+
+
+@dataclass(frozen=True)
+class SpecificFriendRequirement(Requirement):
+    npc: str
+    hearts: int
+
+
+@dataclass(frozen=True)
+class NumberOfFriendsRequirement(Requirement):
+    friends: int
     hearts: int
 
 
@@ -60,3 +77,125 @@ class FishingRequirement(Requirement):
 @dataclass(frozen=True)
 class WalnutRequirement(Requirement):
     amount: int
+
+
+@dataclass(frozen=True)
+class TotalEarningsRequirement(Requirement):
+    amount: int
+
+
+@dataclass(frozen=True)
+class GrangeDisplayRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class EggHuntRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class FishingCompetitionRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class LuauDelightRequirementRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class MovieRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class ForgeInfinityWeaponRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class CaughtFishRequirement(Requirement):
+    number_fish: int
+    unique: bool = field(kw_only=True)
+
+
+@dataclass(frozen=True)
+class MuseumCompletionRequirement(Requirement):
+    number_donated: int = 95
+
+
+@dataclass(frozen=True)
+class FullShipmentRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class BuildingRequirement(Requirement):
+    building: str
+
+
+@dataclass(frozen=True)
+class CookedRecipesRequirement(Requirement):
+    number_of_recipes: int
+
+
+@dataclass(frozen=True)
+class CraftedItemsRequirement(Requirement):
+    number_of_recipes: int
+
+
+@dataclass(frozen=True)
+class HelpWantedRequirement(Requirement):
+    number_of_quests: int
+
+
+@dataclass(frozen=True)
+class ShipOneCropRequirement(Requirement):
+    number: int
+
+
+@dataclass(frozen=True)
+class ReceivedRaccoonsRequirement(Requirement):
+    number_of_raccoons: int
+
+
+@dataclass(frozen=True)
+class PrizeMachineRequirement(Requirement):
+    number_of_tickets: int
+
+
+@dataclass(frozen=True)
+class AllAchievementsRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class PerfectionPercentRequirement(Requirement):
+    percent: int
+
+
+@dataclass(frozen=True)
+class ReadAllBooksRequirement(Requirement):
+    pass
+
+
+@dataclass(frozen=True)
+class MinesRequirement(Requirement):
+    floor: int
+
+
+@dataclass(frozen=True)
+class DangerousMinesRequirement(Requirement):
+    floor: int
+
+
+@dataclass(frozen=True)
+class MonsterKillRequirement(Requirement):
+    monsters: Tuple[str, ...]
+    amount: int = 1
+
+
+@dataclass(frozen=True)
+class CatalogueRequirement(Requirement):
+    catalogue: str
diff --git a/worlds/stardew_valley/data/secret_note_data.py b/worlds/stardew_valley/data/secret_note_data.py
new file mode 100644
index 0000000000..410dd2579d
--- /dev/null
+++ b/worlds/stardew_valley/data/secret_note_data.py
@@ -0,0 +1,76 @@
+from dataclasses import dataclass
+from typing import Tuple, Dict, List
+
+from ..strings.animal_product_names import AnimalProduct
+from ..strings.artisan_good_names import ArtisanGood
+from ..strings.crop_names import Vegetable, Fruit
+from ..strings.flower_names import Flower
+from ..strings.food_names import Meal, Beverage
+from ..strings.forageable_names import Forageable
+from ..strings.metal_names import Mineral, MetalBar
+from ..strings.villager_names import NPC
+
+
+class SecretNote:
+    note_1 = "Secret Note #1: A Page From Abigail's Diary"
+    note_2 = "Secret Note #2: Sam's Holiday Shopping List"
+    note_3 = "Secret Note #3: Leah's Perfect Dinner"
+    note_4 = "Secret Note #4: Maru's Greatest Invention Yet"
+    note_5 = "Secret Note #5: Penny gets everyone something they love"
+    note_6 = "Secret Note #6: Stardrop Saloon Special Orders"
+    note_7 = "Secret Note #7: Older Bachelors In Town"
+    note_8 = "Secret Note #8: To Haley And Emily"
+    note_9 = "Secret Note #9: Alex's Strength Training Diet"
+    note_10 = "Secret Note #10: Cryptic Note"
+    note_11 = "Secret Note #11: Marnie's Memory"
+    note_12 = "Secret Note #12: Good Things In Garbage Cans"
+    note_13 = "Secret Note #13: Junimo Plush"
+    note_14 = "Secret Note #14: Stone Junimo"
+    note_15 = "Secret Note #15: Mermaid Show"
+    note_16 = "Secret Note #16: Treasure Chest"
+    note_17 = "Secret Note #17: Green Strange Doll"
+    note_18 = "Secret Note #18: Yellow Strange Doll"
+    note_19_part_1 = "Secret Note #19: Solid Gold Lewis"
+    note_19_part_2 = "Secret Note #19: In Town For All To See"
+    note_20 = "Secret Note #20: Special Charm"
+    note_21 = "Secret Note #21: A Date In Nature"
+    note_22 = "Secret Note #22: The Mysterious Qi"
+    note_23 = "Secret Note #23: Strange Note"
+    note_24 = "Secret Note #24: M. Jasper's Book On Junimos"
+    note_25 = "Secret Note #25: Ornate Necklace"
+    note_26 = "Secret Note #26: Ancient Farming Secrets"
+    note_27 = "Secret Note #27: A Compendium Of My Greatest Discoveries"
+
+
+@dataclass(frozen=True)
+class RequiredGifts:
+    npc: str
+    gifts: Tuple[str, ...]
+
+
+gift_requirements: Dict[str, List[RequiredGifts]] = {
+    SecretNote.note_1: [RequiredGifts(NPC.abigail, (Vegetable.pumpkin, Mineral.amethyst, Meal.chocolate_cake, Meal.spicy_eel, Meal.blackberry_cobbler,)), ],
+    SecretNote.note_2: [RequiredGifts(NPC.sebastian, (Mineral.frozen_tear, Meal.sashimi,)),
+                        RequiredGifts(NPC.penny, (Mineral.emerald, Flower.poppy,)),
+                        RequiredGifts(NPC.vincent, (Fruit.grape, Meal.cranberry_candy,)),
+                        RequiredGifts(NPC.jodi, (Meal.crispy_bass, Meal.pancakes,)),
+                        RequiredGifts(NPC.kent, (Meal.fiddlehead_risotto, Meal.roasted_hazelnuts,)),
+                        RequiredGifts(NPC.sam, (Forageable.cactus_fruit, Meal.maple_bar, Meal.pizza,)), ],
+    SecretNote.note_3: [RequiredGifts(NPC.leah, (Meal.salad, ArtisanGood.goat_cheese, AnimalProduct.truffle, ArtisanGood.wine,)), ],
+    SecretNote.note_4: [RequiredGifts(NPC.maru, (MetalBar.gold, MetalBar.iridium, ArtisanGood.battery_pack, Mineral.diamond, Fruit.strawberry,)), ],
+    SecretNote.note_5: [RequiredGifts(NPC.pam, (Vegetable.parsnip, Meal.glazed_yams,)),
+                        RequiredGifts(NPC.jas, (Flower.fairy_rose, Meal.plum_pudding,)),
+                        RequiredGifts(NPC.vincent, (Meal.pink_cake, Fruit.grape,)),
+                        RequiredGifts(NPC.george, (Forageable.leek, Meal.fried_mushroom,)),
+                        RequiredGifts(NPC.evelyn, (Vegetable.beet, Flower.tulip,)), ],
+    SecretNote.note_6: [RequiredGifts(NPC.lewis, (Meal.autumn_bounty,)),
+                        RequiredGifts(NPC.marnie, (Meal.pumpkin_pie,)),
+                        RequiredGifts(NPC.demetrius, (Meal.bean_hotpot,)),
+                        RequiredGifts(NPC.caroline, (Meal.fish_taco,)), ],
+    SecretNote.note_7: [RequiredGifts(NPC.harvey, (Beverage.coffee, ArtisanGood.pickles,)),
+                        RequiredGifts(NPC.elliott, (Meal.crab_cakes, Fruit.pomegranate,)),
+                        RequiredGifts(NPC.shane, (Beverage.beer, Meal.pizza, Meal.pepper_poppers,)), ],
+    SecretNote.note_8: [RequiredGifts(NPC.haley, (Meal.pink_cake, Flower.sunflower,)),
+                        RequiredGifts(NPC.emily, (Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.jade, Mineral.ruby, Mineral.topaz, AnimalProduct.wool,)), ],
+    SecretNote.note_9: [RequiredGifts(NPC.alex, (Meal.complete_breakfast, Meal.salmon_dinner,)), ],
+}
diff --git a/worlds/stardew_valley/data/shirt_data.py b/worlds/stardew_valley/data/shirt_data.py
new file mode 100644
index 0000000000..178ea79456
--- /dev/null
+++ b/worlds/stardew_valley/data/shirt_data.py
@@ -0,0 +1,33 @@
+from typing import List
+
+from worlds.stardew_valley.strings.animal_product_names import AnimalProduct
+from worlds.stardew_valley.strings.forageable_names import Forageable
+
+all_shirts = []
+all_considered_shirts = []
+
+
+class Shirt:
+    name: str
+    required_items: List[str]
+
+    def __init__(self, name: str, items: List[str]):
+        self.name = name
+        self.required_items = items
+
+
+# consider_in_logic exists as a temporary measure because I don't feel like writing out the logic for every single shirt at this stage,
+# and I only need some of them for the meme bundle
+def shirt(name: str, items: str | List[str], consider_in_logic: bool = True) -> Shirt:
+    if isinstance(items, str):
+        items = [items]
+    new_shirt = Shirt(name, items)
+    all_shirts.append(new_shirt)
+    if consider_in_logic:
+        all_considered_shirts.append(new_shirt)
+    return new_shirt
+
+
+class Shirts:
+    vacation = shirt("Vacation Shirt", Forageable.coconut)
+    green_jacket = shirt("Green Jacket Shirt", AnimalProduct.duck_egg)
diff --git a/worlds/stardew_valley/data/shop.py b/worlds/stardew_valley/data/shop.py
index 3700ee8978..8ac5fd9e91 100644
--- a/worlds/stardew_valley/data/shop.py
+++ b/worlds/stardew_valley/data/shop.py
@@ -1,21 +1,23 @@
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Tuple, Optional
 
-from .game_item import Source
+from .game_item import Source, Requirement
+from ..strings.currency_names import Currency
 from ..strings.season_names import Season
 
-ItemPrice = Tuple[int, str]
+ItemPrice = tuple[int, str]
 
 
 @dataclass(frozen=True, kw_only=True)
 class ShopSource(Source):
     shop_region: str
-    money_price: Optional[int] = None
-    items_price: Optional[Tuple[ItemPrice, ...]] = None
-    seasons: Tuple[str, ...] = Season.all
+    price: int | None = None
+    items_price: tuple[ItemPrice, ...] | None = None
+    seasons: tuple[str, ...] = Season.all
+    currency: str = Currency.money
 
     def __post_init__(self):
-        assert self.money_price is not None or self.items_price is not None, "At least money price or items price need to be defined."
+        assert self.price is not None or self.items_price is not None, "At least money price or items price need to be defined."
         assert self.items_price is None or all(isinstance(p, tuple) for p in self.items_price), "Items price should be a tuple."
 
 
@@ -37,3 +39,13 @@ class PrizeMachineSource(Source):
 @dataclass(frozen=True, kw_only=True)
 class FishingTreasureChestSource(Source):
     amount: int
+
+
+@dataclass(frozen=True, kw_only=True)
+class HatMouseSource(Source):
+    price: int | None = None
+    unlock_requirements: tuple[Requirement, ...] | None = None
+
+    @property
+    def all_requirements(self) -> Iterable[Requirement]:
+        return self.other_requirements + (self.unlock_requirements or ())
diff --git a/worlds/stardew_valley/data/villagers_data.py b/worlds/stardew_valley/data/villagers_data.py
index 70fb110ffb..c1468c86ab 100644
--- a/worlds/stardew_valley/data/villagers_data.py
+++ b/worlds/stardew_valley/data/villagers_data.py
@@ -4,7 +4,8 @@ from typing import Tuple, Optional
 from ..mods.mod_data import ModNames
 from ..strings.food_names import Beverage
 from ..strings.generic_names import Generic
-from ..strings.region_names import Region, SVERegion, AlectoRegion, BoardingHouseRegion, LaceyRegion, LogicRegion
+from ..strings.metal_names import Mineral, Fossil
+from ..strings.region_names import Region, SVERegion, AlectoRegion, BoardingHouseRegion, LaceyRegion, LogicRegion, RileyRegion
 from ..strings.season_names import Season
 from ..strings.villager_names import NPC, ModNPC
 
@@ -43,6 +44,16 @@ sewers = (Region.sewer,)
 island = (Region.island_east,)
 secret_woods = (Region.secret_woods,)
 wizard_tower = (Region.wizard_tower,)
+sam_house = (Region.sam_house,)
+pierre_shop = (Region.pierre_store,)
+haley_house = (Region.haley_house,)
+saloon = (Region.saloon,)
+blacksmith = (Region.blacksmith,)
+trailer = (Region.trailer,)
+leah_house = (Region.leah_house,)
+linus_tent = (Region.tent,)
+lewis_house = (Region.mayor_house,)
+fish_shop = (Region.fish_shop,)
 
 # Stardew Valley Expanded Locations
 adventurer = (Region.adventurer_guild,)
@@ -53,6 +64,8 @@ museum = (Region.museum,)
 jojamart = (Region.jojamart,)
 railroad = (Region.railroad,)
 junimo = (SVERegion.junimo_woods,)
+olivia_house = (SVERegion.jenkins_residence,)
+andy_house = (SVERegion.fairhaven_farm,)
 
 # Stray Locations
 witch_swamp = (Region.witch_swamp,)
@@ -60,6 +73,7 @@ witch_attic = (AlectoRegion.witch_attic,)
 hat_house = (LaceyRegion.hat_house,)
 the_lost_valley = (BoardingHouseRegion.the_lost_valley,)
 boarding_house = (BoardingHouseRegion.boarding_house_first,)
+riley_house = (RileyRegion.riley_house,)
 
 golden_pumpkin = ("Golden Pumpkin",)
 # magic_rock_candy = ("Magic Rock Candy",)
@@ -90,7 +104,7 @@ pizza = ("Pizza",)
 tigerseye = ("Tigerseye",)
 sam_loves = cactus_fruit + maple_bar + pizza + tigerseye
 frozen_tear = ("Frozen Tear",)
-obsidian = ("Obsidian",)
+obsidian = (Mineral.obsidian,)
 # pumpkin_soup = ("Pumpkin Soup",)
 # sashimi = ("Sashimi",)
 void_egg = ("Void Egg",)
@@ -252,7 +266,7 @@ energy_tonic = ("Energy Tonic",)
 kale = ("Kale",)
 muscle_remedy = ("Muscle Remedy",)
 vegetable_medley = ("Vegetable Medley",)
-trilobite = ("Trilobite",)
+trilobite = (Fossil.trilobite,)
 golden_mask = ("Golden Mask",)
 rainbow_shell = ("Rainbow Shell",)
 blue_jazz = ("Blue Jazz",)
@@ -361,39 +375,39 @@ def villager(name: str, bachelor: bool, locations: Tuple[str, ...], birthday: st
     return Villager(name, bachelor, locations, birthday, gifts, available, mod_name)
 
 
-josh = villager(NPC.alex, True, town + alex_house, Season.summer, universal_loves + complete_breakfast + salmon_dinner, True)
-elliott = villager(NPC.elliott, True, town + beach + elliott_house, Season.fall, universal_loves + elliott_loves, True)
-harvey = villager(NPC.harvey, True, town + hospital, Season.winter, universal_loves + harvey_loves, True)
-sam = villager(NPC.sam, True, town, Season.summer, universal_loves + sam_loves, True)
+josh = villager(NPC.alex, True, alex_house, Season.summer, universal_loves + complete_breakfast + salmon_dinner, True)
+elliott = villager(NPC.elliott, True, beach + elliott_house, Season.fall, universal_loves + elliott_loves, True)
+harvey = villager(NPC.harvey, True, hospital, Season.winter, universal_loves + harvey_loves, True)
+sam = villager(NPC.sam, True, sam_house, Season.summer, universal_loves + sam_loves, True)
 sebastian = villager(NPC.sebastian, True, carpenter, Season.winter, universal_loves + sebastian_loves, True)
 shane = villager(NPC.shane, True, ranch, Season.spring, universal_loves + shane_loves, True)
-abigail = villager(NPC.abigail, True, town, Season.fall, universal_loves + abigail_loves, True)
-emily = villager(NPC.emily, True, town, Season.spring, universal_loves + emily_loves, True)
-haley = villager(NPC.haley, True, town, Season.spring, universal_loves_no_prismatic_shard + haley_loves, True)
-leah = villager(NPC.leah, True, forest, Season.winter, universal_loves + leah_loves, True)
-maru = villager(NPC.maru, True, carpenter + hospital + town, Season.summer, universal_loves + maru_loves, True)
-penny = villager(NPC.penny, True, town, Season.fall, universal_loves_no_rabbit_foot + penny_loves, True)
-caroline = villager(NPC.caroline, False, town, Season.winter, universal_loves + caroline_loves, True)
-clint = villager(NPC.clint, False, town, Season.winter, universal_loves + clint_loves, True)
+abigail = villager(NPC.abigail, True, pierre_shop, Season.fall, universal_loves + abigail_loves, True)
+emily = villager(NPC.emily, True, haley_house, Season.spring, universal_loves + emily_loves, True)
+haley = villager(NPC.haley, True, haley_house, Season.spring, universal_loves_no_prismatic_shard + haley_loves, True)
+leah = villager(NPC.leah, True, forest + leah_house, Season.winter, universal_loves + leah_loves, True)
+maru = villager(NPC.maru, True, carpenter + hospital, Season.summer, universal_loves + maru_loves, True)
+penny = villager(NPC.penny, True, trailer, Season.fall, universal_loves_no_rabbit_foot + penny_loves, True)
+caroline = villager(NPC.caroline, False, pierre_shop, Season.winter, universal_loves + caroline_loves, True)
+clint = villager(NPC.clint, False, blacksmith, Season.winter, universal_loves + clint_loves, True)
 demetrius = villager(NPC.demetrius, False, carpenter, Season.summer, universal_loves + demetrius_loves, True)
 dwarf = villager(NPC.dwarf, False, mines_dwarf_shop, Season.summer, universal_loves + dwarf_loves, False)
-evelyn = villager(NPC.evelyn, False, town, Season.winter, universal_loves + evelyn_loves, True)
-george = villager(NPC.george, False, town, Season.fall, universal_loves + george_loves, True)
-gus = villager(NPC.gus, False, town, Season.summer, universal_loves + gus_loves, True)
+evelyn = villager(NPC.evelyn, False, alex_house, Season.winter, universal_loves + evelyn_loves, True)
+george = villager(NPC.george, False, alex_house, Season.fall, universal_loves + george_loves, True)
+gus = villager(NPC.gus, False, saloon, Season.summer, universal_loves + gus_loves, True)
 jas = villager(NPC.jas, False, ranch, Season.summer, universal_loves + jas_loves, True)
-jodi = villager(NPC.jodi, False, town, Season.fall, universal_loves + jodi_loves, True)
-kent = villager(NPC.kent, False, town, Season.spring, universal_loves + kent_loves, False)
+jodi = villager(NPC.jodi, False, sam_house, Season.fall, universal_loves + jodi_loves, True)
+kent = villager(NPC.kent, False, sam_house, Season.spring, universal_loves + kent_loves, False)
 krobus = villager(NPC.krobus, False, sewers, Season.winter, universal_loves + krobus_loves, False)
 leo = villager(NPC.leo, False, island, Season.summer, universal_loves + leo_loves, False)
-lewis = villager(NPC.lewis, False, town, Season.spring, universal_loves + lewis_loves, True)
-linus = villager(NPC.linus, False, mountain, Season.winter, universal_loves + linus_loves, True)
+lewis = villager(NPC.lewis, False, lewis_house, Season.spring, universal_loves + lewis_loves, True)
+linus = villager(NPC.linus, False, mountain + linus_tent, Season.winter, universal_loves + linus_loves, True)
 marnie = villager(NPC.marnie, False, ranch, Season.fall, universal_loves + marnie_loves, True)
-pam = villager(NPC.pam, False, town, Season.spring, universal_loves + pam_loves, True)
-pierre = villager(NPC.pierre, False, town, Season.spring, universal_loves + pierre_loves, True)
+pam = villager(NPC.pam, False, trailer, Season.spring, universal_loves + pam_loves, True)
+pierre = villager(NPC.pierre, False, pierre_shop, Season.spring, universal_loves + pierre_loves, True)
 robin = villager(NPC.robin, False, carpenter, Season.fall, universal_loves + robin_loves, True)
 sandy = villager(NPC.sandy, False, oasis, Season.fall, universal_loves + sandy_loves, False)
-vincent = villager(NPC.vincent, False, town, Season.spring, universal_loves + vincent_loves, True)
-willy = villager(NPC.willy, False, beach, Season.summer, universal_loves + willy_loves, True)
+vincent = villager(NPC.vincent, False, sam_house, Season.spring, universal_loves + vincent_loves, True)
+willy = villager(NPC.willy, False, beach + fish_shop, Season.summer, universal_loves + willy_loves, True)
 wizard = villager(NPC.wizard, False, wizard_tower, Season.winter, universal_loves + wizard_loves, True)
 
 # Custom NPCs
@@ -401,13 +415,13 @@ alec = villager(ModNPC.alec, True, forest, Season.winter, universal_loves + tril
 ayeisha = villager(ModNPC.ayeisha, False, town, Season.summer, universal_loves + ayeisha_loves, True, ModNames.ayeisha)
 delores = villager(ModNPC.delores, True, forest, Season.winter, universal_loves + delores_loves, True, ModNames.delores)
 eugene = villager(ModNPC.eugene, True, forest, Season.spring, universal_loves + eugene_loves, True, ModNames.eugene)
-jasper = villager(ModNPC.jasper, True, town, Season.fall, universal_loves + jasper_loves, True, ModNames.jasper)
+jasper = villager(ModNPC.jasper, True, museum, Season.fall, universal_loves + jasper_loves, True, ModNames.jasper)
 juna = villager(ModNPC.juna, False, forest, Season.summer, universal_loves + juna_loves, True, ModNames.juna)
 kitty = villager(ModNPC.mr_ginger, False, forest, Season.summer, universal_loves + mister_ginger_loves, True, ModNames.ginger)
-shiko = villager(ModNPC.shiko, True, town, Season.winter, universal_loves + shiko_loves, True, ModNames.shiko)
-wellwick = villager(ModNPC.wellwick, True, forest, Season.winter, universal_loves + wellwick_loves, True, ModNames.wellwick)
+shiko = villager(ModNPC.shiko, True, saloon, Season.winter, universal_loves + shiko_loves, True, ModNames.shiko)
+wellwick = villager(ModNPC.wellwick, True, wizard_tower, Season.winter, universal_loves + wellwick_loves, True, ModNames.wellwick)
 yoba = villager(ModNPC.yoba, False, secret_woods, Season.spring, universal_loves + yoba_loves, False, ModNames.yoba)
-riley = villager(ModNPC.riley, True, town, Season.spring, universal_loves, True, ModNames.riley)
+riley = villager(ModNPC.riley, True, riley_house, Season.spring, universal_loves, True, ModNames.riley)
 zic = villager(ModNPC.goblin, False, witch_swamp, Season.fall, void_mayonnaise, False, ModNames.distant_lands)
 alecto = villager(ModNPC.alecto, False, witch_attic, Generic.any, universal_loves, False, ModNames.alecto)
 lacey = villager(ModNPC.lacey, True, forest, Season.spring, universal_loves, True, ModNames.lacey)
@@ -420,15 +434,15 @@ joel = villager(ModNPC.joel, False, boarding_house, Season.winter, universal_lov
 # SVE Villagers
 claire = villager(ModNPC.claire, True, town + jojamart, Season.fall, universal_loves + claire_loves, True, ModNames.sve)
 lance = villager(ModNPC.lance, True, adventurer + highlands + island, Season.spring, lance_loves, False, ModNames.sve)
-mommy = villager(ModNPC.olivia, True, town, Season.spring, universal_loves_no_rabbit_foot + olivia_loves, True, ModNames.sve)
+mommy = villager(ModNPC.olivia, True, olivia_house, Season.spring, universal_loves_no_rabbit_foot + olivia_loves, True, ModNames.sve)
 sophia = villager(ModNPC.sophia, True, bluemoon, Season.winter, universal_loves_no_rabbit_foot + sophia_loves, True, ModNames.sve)
-victor = villager(ModNPC.victor, True, town, Season.summer, universal_loves + victor_loves, True, ModNames.sve)
-andy = villager(ModNPC.andy, False, forest, Season.spring, universal_loves + andy_loves, True, ModNames.sve)
+victor = villager(ModNPC.victor, True, olivia_house, Season.summer, universal_loves + victor_loves, True, ModNames.sve)
+andy = villager(ModNPC.andy, False, andy_house, Season.spring, universal_loves + andy_loves, True, ModNames.sve)
 apples = villager(ModNPC.apples, False, aurora + junimo, Generic.any, starfruit, False, ModNames.sve)
 gunther = villager(ModNPC.gunther, False, museum, Season.winter, universal_loves + gunther_loves, True, ModNames.sve)
 martin = villager(ModNPC.martin, False, town + jojamart, Season.summer, universal_loves + martin_loves, True, ModNames.sve)
 marlon = villager(ModNPC.marlon, False, adventurer, Season.winter, universal_loves + marlon_loves, False, ModNames.sve)
-morgan = villager(ModNPC.morgan, False, forest, Season.fall, universal_loves_no_rabbit_foot + morgan_loves, False, ModNames.sve)
+morgan = villager(ModNPC.morgan, False, wizard_tower, Season.fall, universal_loves_no_rabbit_foot + morgan_loves, False, ModNames.sve)
 scarlett = villager(ModNPC.scarlett, False, bluemoon, Season.summer, universal_loves + scarlett_loves, False, ModNames.sve)
 susan = villager(ModNPC.susan, False, railroad, Season.fall, universal_loves + susan_loves, False, ModNames.sve)
 morris = villager(ModNPC.morris, False, jojamart, Season.spring, universal_loves + morris_loves, True, ModNames.sve)
diff --git a/worlds/stardew_valley/docs/en_Stardew Valley.md b/worlds/stardew_valley/docs/en_Stardew Valley.md
index 62755dad79..8c6abe00eb 100644
--- a/worlds/stardew_valley/docs/en_Stardew Valley.md	
+++ b/worlds/stardew_valley/docs/en_Stardew Valley.md	
@@ -36,10 +36,12 @@ The player can choose from a number of goals, using their YAML options.
 - Become a [Craft Master](https://stardewvalleywiki.com/Crafting) by crafting every item
 - Earn the title of [Legend](https://stardewvalleywiki.com/Gold) by earning 10 000 000g
 - Solve the [Mystery of the Stardrops](https://stardewvalleywiki.com/Stardrop) by finding every stardrop
+- Find and wear every [Hat](https://stardewvalleywiki.com/Hats) in the game.
+- Find and eat every item in the game.
 - Finish 100% of your randomizer slot with Allsanity: Complete every check in your slot
 - Achieve [Perfection](https://stardewvalleywiki.com/Perfection) in your save file
 
-The following goals [Community Center, Master Angler, Protector of the Valley, Full Shipment and Gourmet Chef] will adapt
+The following goals [Community Center, Master Angler, Protector of the Valley, Full Shipment, Gourmet Chef and Mad Hatter] will adapt
 to other options in your slots, and are therefore customizable in duration and difficulty. For example, if you set "Fishsanity"
 to "Exclude Legendaries", and pick the Master Angler goal, you will not need to catch the legendaries to complete the goal.
 
@@ -78,6 +80,12 @@ There also are a number of location checks that are optional, and individual pla
 - [Shipsanity](https://stardewvalleywiki.com/Shipping): Shipping individual items
 - [Booksanity](https://stardewvalleywiki.com/Books): Reading individual books
 - [Walnutsanity](https://stardewvalleywiki.com/Golden_Walnut): Collecting Walnuts on Ginger Island
+- [Hatsanity](https://stardewvalleywiki.com/Hats): Wear individual Hats
+- [Secretsanity](https://stardewvalleywiki.com/Secrets): Find secrets and easter eggs
+- [Moviesanity](https://stardewvalleywiki.com/Movie_Theater): Watch movies with villagers and optionally share snacks with them
+- Eatsanity: Eat every item in the game
+
+And more!
 
 ## Which items can be in another player's world?
 
@@ -138,12 +146,11 @@ This means that, for these specific mods, if you decide to include them in your
 with the assumption that you will install and play with these mods. The multiworld will contain related items and locations
 for these mods, the specifics will vary from mod to mod
 
-[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md)
+[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/7.x.x/Documentation/Supported%20Mods.md)
 
 List of supported mods:
 
 - General
-    - [Stardew Valley Expanded](https://www.nexusmods.com/stardewvalley/mods/3753)
     - [Skull Cavern Elevator](https://www.nexusmods.com/stardewvalley/mods/963)
     - [Bigger Backpack](https://www.nexusmods.com/stardewvalley/mods/1845)
     - [Tractor Mod](https://www.nexusmods.com/stardewvalley/mods/1401)
@@ -169,5 +176,5 @@ Some of these mods might need a patch mod to tie the randomizer with the mod. Th
 
 You cannot play an Archipelago Slot in multiplayer at the moment. There are no short-term plans to support that feature.
 
-You can, however, send Stardew Valley objects as gifts from one Stardew Player to another Stardew , or a player in another game that supports gifting, using
+You can, however, send Stardew Valley objects as gifts from one Stardew Player to another Stardew, or a player in another game that supports gifting, using
 in-game Joja Prime delivery, for a fee. This exclusive feature can be turned off if you don't want to send and receive gifts.
diff --git a/worlds/stardew_valley/docs/setup_en.md b/worlds/stardew_valley/docs/setup_en.md
index 801bf345e9..da838db816 100644
--- a/worlds/stardew_valley/docs/setup_en.md
+++ b/worlds/stardew_valley/docs/setup_en.md
@@ -3,35 +3,49 @@
 ## Required Software
 
 - Stardew Valley 1.6 on PC (Recommended: [Steam version](https://store.steampowered.com/app/413150/Stardew_Valley/))
-- SMAPI ([Mod loader for Stardew Valley](https://www.nexusmods.com/stardewvalley/mods/2400?tab=files))
-- [StardewArchipelago Mod Release 6.x.x](https://github.com/agilbert1412/StardewArchipelago/releases)
-    - It is important to use a mod release of version 6.x.x to play seeds that have been generated here. Later releases 
+- SMAPI ([Mod loader for Stardew Valley](https://smapi.io/) ([Nexus](https://www.nexusmods.com/stardewvalley/mods/2400?tab=files) | [Github](https://github.com/Pathoschild/SMAPI/releases))
+- [StardewArchipelago Mod Release 7.x.x](https://github.com/agilbert1412/StardewArchipelago/releases)
+    - It is important to use a mod release of version 7.x.x to play seeds that have been generated here. Later releases 
   can only be used with later releases of the world generator, that are not hosted on archipelago.gg yet.
 
 ## Optional Software
 - Archipelago from the [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases)
-    * (Only for the TextClient)
+    * This provides access to various built-in tools, text client, and local generation and hosting
+- [Universal Tracker](https://github.com/FarisTheAncient/Archipelago/releases?q=Tracker)
+    * If you installed Archipelago, you can use a custom Stardew Tracker that depends on Universal Tracker.
 - Other Stardew Valley Mods [Nexus Mods](https://www.nexusmods.com/stardewvalley)
-    * There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md) 
+    * There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/7.x.x/Documentation/Supported%20Mods.md) 
   that you can add to your yaml to include them with the Archipelago randomization
 
     * It is **not** recommended to further mod Stardew Valley with unsupported mods, although it is possible to do so. 
   Mod interactions can be unpredictable, and no support will be offered for related bugs.
     * The more unsupported mods you have, and the bigger they are, the more likely things are to break.
 
-## Configuring your YAML file
+## Configuring your Multiworld
 
-### What is a YAML file and why do I need one?
+### Customizing my options
+
+You can customize your options by visiting the [Stardew Valley Player Options Page](/games/Stardew%20Valley/player-options)
+
+From there, you can customize all your options, or use a preset. Then, you can either Generate a single player game, or export a yaml file.
+
+### What is a YAML file and do I need one?
+
+A yaml file serves to configure your game in the multiworld. If you play a solo game, you can skip it entirely.
+
+If you intend to play in a multiworld, you will need to provide your yaml file to the person who is hosting the multiworld.
 
 See the guide on setting up a basic YAML at the Archipelago setup
 guide: [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en)
 
-### Where do I get a YAML file?
+### Creating a room
 
-You can customize your options by visiting the [Stardew Valley Player Options Page](/games/Stardew%20Valley/player-options)
+If you hosted your own game, you can now click "Create Room" and your multiworld will be ready for play!
 
 ## Joining a MultiWorld Game
 
+Note that even if you play a solo game, you still connect to a server to play. Hosting on archipelago.gg is free and the easiest option, but you can also host it locally.
+
 ### Installing the mod
 
 - Install [SMAPI](https://www.nexusmods.com/stardewvalley/mods/2400?tab=files) by following the instructions on the mod page
@@ -41,7 +55,7 @@ your Stardew Valley "Mods" folder
 - Otherwise just launch "StardewModdingAPI.exe" in your installation folder directly
 - Stardew Valley should launch itself alongside a console which allows you to read mod information and interact with some of them.
 
-### Connect to the MultiServer
+### Connect to the Multiworld
 
 Launch Stardew Valley with SMAPI. Once you have reached the Stardew Valley title screen, create a new farm.
 
@@ -51,7 +65,7 @@ On the new character creation page, you will see 3 new fields, used to link your
 
 You can customize your farm and character as much as desired.
 
-The Server text box needs to have both the address and the port, and your slotname is the name specified in your yaml
+The Server text box needs to have both the address and the port, and your slotname is the name specified in your options. You can also see the name on the room page.
 
 `archipelago.gg:38281`
 
@@ -62,13 +76,7 @@ The password is optional.
 Your game will connect automatically to Archipelago, and reconnect automatically when loading the save, later.
 
 You will never need to enter this information again for this character, unless your room changes its ip or port.
-If the room's ip or port **does** change, you can follow these instructions to modify the connection information of your save file
-- Launch modded Stardew Valley
-- While **on the main menu** of the game, enter the follow command **in the SMAPI console**:
-- `connect_override ip:port slot password`
-- Example: `connect_override archipelago.gg:38281 StardewPlayer`
-- Load your save game. The new connection information will be used, instead of the saved one
-- Play a full day, sleep, and save the game. This connection information will overwrite the previous one and become permanent.
+If the room's ip or port **does** change, you will be prompted, after the connection fails, to enter new values and try again.
 
 ### Interacting with the MultiWorld from in-game
 
@@ -82,14 +90,14 @@ Lastly, you can also run Archipelago commands `!help` from the in game chat box,
 items, or check missing locations.
 
 It is important to note that the Stardew Valley chat is fairly limited in its capabilities. For example, it doesn't allow 
-scrolling up to see history that has been pushed off screen. The SMAPI console running alonside your game will have the 
+scrolling up to see history that has been pushed off screen. The SMAPI console running alongside your game will have the 
 full history as well and may be better suited to read older messages.
-For a better chat experience, you can also use the official Archipelago Text Client, altough it will not allow you to run 
+For a better chat experience, you can also use the official Archipelago Text Client, although it will not allow you to run 
 Stardew-exclusive commands.
 
 ### Playing with supported mods
 
-See the [Supported mods documentation](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md)
+See the [Supported mods documentation](https://github.com/agilbert1412/StardewArchipelago/blob/7.x.x/Documentation/Supported%20Mods.md)
 
 ### Multiplayer
 
diff --git a/worlds/stardew_valley/docs/setup_fr.md b/worlds/stardew_valley/docs/setup_fr.md
index d7866c0b16..bdaa96719c 100644
--- a/worlds/stardew_valley/docs/setup_fr.md
+++ b/worlds/stardew_valley/docs/setup_fr.md
@@ -4,14 +4,14 @@
 
 - Stardew Valley 1.6 sur PC (Recommandé: [Steam](https://store.steampowered.com/app/413150/Stardew_Valley/))
 - SMAPI ([Mod loader pour Stardew Valley](https://www.nexusmods.com/stardewvalley/mods/2400?tab=files))
-- [StardewArchipelago Version 6.x.x](https://github.com/agilbert1412/StardewArchipelago/releases)
-  - Il est important d'utiliser une release en 6.x.x pour jouer sur des seeds générées ici. Les versions ultérieures peuvent uniquement être utilisées pour des release ultérieures du générateur de mondes, qui ne sont pas encore hébergées sur archipelago.gg
+- [StardewArchipelago Version 7.x.x](https://github.com/agilbert1412/StardewArchipelago/releases)
+  - Il est important d'utiliser une release en 7.x.x pour jouer sur des seeds générées ici. Les versions ultérieures peuvent uniquement être utilisées pour des release ultérieures du générateur de mondes, qui ne sont pas encore hébergées sur archipelago.gg
 
 ## Logiciels optionnels
 
 - Launcher Archipelago à partir de la [page des versions d'Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
   - (Uniquement pour le client textuel)
-- Autres [mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md) que vous pouvez ajouter au yaml pour les inclure dans la randomization d'Archipelago
+- Autres [mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/7.x.x/Documentation/Supported%20Mods.md) que vous pouvez ajouter au yaml pour les inclure dans la randomization d'Archipelago
 
   - Il n'est **pas** recommandé de modder Stardew Valley avec des mods non supportés, même s'il est possible de le faire.
     Les interactions entre mods peuvent être imprévisibles, et aucune aide ne sera fournie pour les bugs qui y sont liés.
@@ -80,7 +80,7 @@ Pour une meilleure expérience avec le chat, vous pouvez aussi utiliser le clien
 
 ### Jouer avec des mods supportés
 
-Voir la [documentation des mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md) (en Anglais).
+Voir la [documentation des mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/7.x.x/Documentation/Supported%20Mods.md) (en Anglais).
 
 ### Multijoueur
 
diff --git a/worlds/stardew_valley/items/__init__.py b/worlds/stardew_valley/items/__init__.py
index ddf5e69f68..bee83ad8a4 100644
--- a/worlds/stardew_valley/items/__init__.py
+++ b/worlds/stardew_valley/items/__init__.py
@@ -1 +1,4 @@
+from .early_items import setup_early_items
+from .fillers import generate_filler_choice_pool
+from .item_creation import create_items
 from .item_data import item_table, ItemData, Group, items_by_group, load_item_csv
diff --git a/worlds/stardew_valley/early_items.py b/worlds/stardew_valley/items/early_items.py
similarity index 71%
rename from worlds/stardew_valley/early_items.py
rename to worlds/stardew_valley/items/early_items.py
index 550a92b445..0a0050cf2b 100644
--- a/worlds/stardew_valley/early_items.py
+++ b/worlds/stardew_valley/items/early_items.py
@@ -1,15 +1,17 @@
 from random import Random
 
-from . import options as stardew_options
-from .content import StardewContent
-from .strings.ap_names.ap_weapon_names import APWeapon
-from .strings.ap_names.transport_names import Transportation
-from .strings.building_names import Building
-from .strings.region_names import Region
-from .strings.season_names import Season
-from .strings.skill_names import Skill
-from .strings.tv_channel_names import Channel
-from .strings.wallet_item_names import Wallet
+from .. import options as stardew_options
+from ..content import StardewContent
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..strings.ap_names.ap_option_names import ChefsanityOptionName, StartWithoutOptionName
+from ..strings.ap_names.ap_weapon_names import APWeapon
+from ..strings.ap_names.transport_names import Transportation
+from ..strings.building_names import Building
+from ..strings.region_names import Region
+from ..strings.season_names import Season
+from ..strings.skill_names import Skill
+from ..strings.tv_channel_names import Channel
+from ..strings.wallet_item_names import Wallet
 
 early_candidate_rate = 4
 always_early_candidates = [Region.greenhouse, Transportation.desert_obelisk, Wallet.rusty_key]
@@ -47,7 +49,7 @@ def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions,
     if options.special_order_locations & stardew_options.SpecialOrderLocations.option_board:
         early_candidates.append("Special Order Board")
 
-    if options.cooksanity != stardew_options.Cooksanity.option_none or options.chefsanity & stardew_options.Chefsanity.option_queen_of_sauce:
+    if options.cooksanity != stardew_options.Cooksanity.option_none or ChefsanityOptionName.queen_of_sauce in options.chefsanity:
         early_candidates.append(Channel.queen_of_sauce)
 
     if options.craftsanity != stardew_options.Craftsanity.option_none:
@@ -58,8 +60,9 @@ def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions,
     else:
         early_candidates.append(APWeapon.sword)
 
-    if options.exclude_ginger_island == stardew_options.ExcludeGingerIsland.option_false:
+    if content.is_enabled(ginger_island_content_pack):
         early_candidates.append(Transportation.island_obelisk)
+        early_candidates.append(Transportation.boat_repair)
 
         if options.walnutsanity.value:
             early_candidates.append("Island North Turtle")
@@ -68,6 +71,14 @@ def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions,
     if options.museumsanity != stardew_options.Museumsanity.option_none or options.shipsanity >= stardew_options.Shipsanity.option_full_shipment:
         early_candidates.append(Wallet.metal_detector)
 
+    if StartWithoutOptionName.landslide in options.start_without:
+        early_candidates.append("Landslide Removed")
+
+    if StartWithoutOptionName.community_center in options.start_without:
+        early_candidates.append("Forest Magic")
+        early_candidates.append("Community Center Key")
+        early_candidates.append("Wizard Invitation")
+
     early_forced.extend(random.sample(early_candidates, len(early_candidates) // early_candidate_rate))
 
     for item_name in early_forced:
diff --git a/worlds/stardew_valley/items/fillers.py b/worlds/stardew_valley/items/fillers.py
new file mode 100644
index 0000000000..76c10e2ad4
--- /dev/null
+++ b/worlds/stardew_valley/items/fillers.py
@@ -0,0 +1,181 @@
+from random import Random
+from typing import List
+
+from BaseClasses import Item, ItemClassification
+from .filters import remove_excluded, remove_limited_amount_resource_packs, remove_already_included
+from .item_data import items_by_group, Group, ItemData, StardewItemFactory, item_table
+from ..content.game_content import StardewContent
+from ..options import StardewValleyOptions, FestivalLocations
+from ..strings.ap_names.ap_option_names import BuffOptionName, AllowedFillerOptionName
+from ..strings.ap_names.buff_names import Buff
+
+AllowedFillerTypesMap = {
+    AllowedFillerOptionName.farming: Group.FILLER_FARMING,
+    AllowedFillerOptionName.fishing: Group.FILLER_FISHING,
+    AllowedFillerOptionName.fruit_trees: Group.FILLER_FRUIT_TREES,
+    AllowedFillerOptionName.food: Group.FILLER_FOOD,
+    AllowedFillerOptionName.buff_food: Group.FILLER_BUFF_FOOD,
+    AllowedFillerOptionName.consumables: Group.FILLER_CONSUMABLE,
+    AllowedFillerOptionName.machines: Group.FILLER_MACHINE,
+    AllowedFillerOptionName.storage: Group.FILLER_STORAGE,
+    AllowedFillerOptionName.quality_of_life: Group.FILLER_QUALITY_OF_LIFE,
+    AllowedFillerOptionName.materials: Group.FILLER_MATERIALS,
+    AllowedFillerOptionName.currencies: Group.FILLER_CURRENCY,
+    AllowedFillerOptionName.money: Group.FILLER_MONEY,
+    AllowedFillerOptionName.hats: Group.FILLER_HAT,
+    AllowedFillerOptionName.decorations: Group.FILLER_DECORATION,
+    AllowedFillerOptionName.rings: Group.FILLER_RING,
+}
+
+
+def generate_filler_choice_pool(options: StardewValleyOptions, content: StardewContent) -> list[str]:
+    available_filler = get_all_filler_items(options)
+    available_filler = remove_excluded(available_filler, content, options)
+    available_filler = remove_limited_amount_resource_packs(available_filler)
+
+    return [item.name for item in available_filler]
+
+
+def get_all_filler_items(options: StardewValleyOptions) -> list[ItemData]:
+    all_filler_items = []
+    allowed_filler_types = sorted(list(options.allowed_filler_items.value))
+    for allowed_filler_type in allowed_filler_types:
+        allowed_filler_group = AllowedFillerTypesMap[allowed_filler_type]
+        all_filler_items.extend([pack for pack in items_by_group[allowed_filler_group]])
+    all_filler_items.extend(items_by_group[Group.TRASH])
+    all_filler_items.extend(get_player_buffs(options))
+    all_filler_items.extend(get_traps(options))
+
+    return all_filler_items
+
+
+def get_filler_weights(options: StardewValleyOptions, all_filler_packs: list[ItemData]) -> list[int]:
+    weights = []
+    for filler in all_filler_packs:
+        if filler.name in options.trap_distribution:
+            num = options.trap_distribution[filler.name]
+        else:
+            num = options.trap_distribution.default_weight
+        weights.append(num)
+    return weights
+
+
+def generate_unique_filler_items(item_factory: StardewItemFactory, content: StardewContent, options: StardewValleyOptions, random: Random,
+                                 available_item_slots: int) -> list[Item]:
+    items = create_filler_festival_rewards(item_factory, content, options)
+
+    if len(items) > available_item_slots:
+        items = random.sample(items, available_item_slots)
+    return items
+
+
+def create_filler_festival_rewards(item_factory: StardewItemFactory, content: StardewContent, options: StardewValleyOptions) -> list[Item]:
+    if options.festival_locations == FestivalLocations.option_disabled:
+        return []
+    filler_rewards = [item for item in items_by_group[Group.FESTIVAL] if item.classification == ItemClassification.filler]
+    filler_rewards = remove_excluded(filler_rewards, content, options)
+    return [item_factory(item) for item in filler_rewards]
+
+
+def generate_resource_packs_and_traps(item_factory: StardewItemFactory,
+                                      options: StardewValleyOptions,
+                                      content: StardewContent,
+                                      random: Random,
+                                      already_added_items: list[Item],
+                                      available_item_slots: int) -> list[Item]:
+    def filler_factory(item: ItemData):
+        # Yes some fillers are progression. We add multiple fruit tree saplings for instance.
+        if ItemClassification.progression in item.classification:
+            return item_factory(item,
+                                classification_pre_fill=ItemClassification.filler,
+                                classification_post_fill=ItemClassification.progression_skip_balancing)
+        return item_factory(item)
+
+    already_added_items_names = {item.name for item in already_added_items}
+
+    priority_fillers = get_priority_fillers(options)
+    priority_fillers = remove_excluded(priority_fillers, content, options)
+    priority_fillers = remove_already_included(priority_fillers, already_added_items_names)
+
+    if available_item_slots < len(priority_fillers):
+        return [filler_factory(priority_filler)
+                for priority_filler in random.sample(priority_fillers, available_item_slots)]
+
+    chosen_fillers = []
+    chosen_fillers.extend([filler_factory(priority_filler) for priority_filler in priority_fillers])
+    available_item_slots -= len(priority_fillers)
+    already_added_items_names |= {priority_item.name for priority_item in priority_fillers}
+
+    all_fillers = get_all_filler_items(options)
+    all_fillers = remove_excluded(all_fillers, content, options)
+    all_fillers = remove_already_included(all_fillers, already_added_items_names)
+
+    filler_weights = get_filler_weights(options, all_fillers)
+
+    while available_item_slots > 0:
+        resource_pack = random.choices(all_fillers, weights=filler_weights, k=1)[0]
+
+        exactly_2 = Group.AT_LEAST_TWO in resource_pack.groups
+        while exactly_2 and available_item_slots == 1:
+            # We roll another filler since there is no place for the second one
+            resource_pack = random.choices(all_fillers, weights=filler_weights, k=1)[0]
+            exactly_2 = Group.AT_LEAST_TWO in resource_pack.groups
+
+        chosen_fillers.append(filler_factory(resource_pack))
+        available_item_slots -= 1
+        if exactly_2:
+            chosen_fillers.append(filler_factory(resource_pack))
+            available_item_slots -= 1
+
+        if resource_pack.has_limited_amount():
+            index = all_fillers.index(resource_pack)
+            all_fillers.pop(index)
+            filler_weights.pop(index)
+
+    return chosen_fillers
+
+
+def get_priority_fillers(options: StardewValleyOptions) -> list[ItemData]:
+    buffs = get_player_buffs(options)
+    traps = get_traps(options)
+
+    return buffs + traps
+
+
+def get_player_buffs(options: StardewValleyOptions) -> List[ItemData]:
+    buff_option = options.enabled_filler_buffs
+    allowed_buffs = []
+    if BuffOptionName.luck in buff_option:
+        allowed_buffs.append(item_table[Buff.luck])
+    if BuffOptionName.damage in buff_option:
+        allowed_buffs.append(item_table[Buff.damage])
+    if BuffOptionName.defense in buff_option:
+        allowed_buffs.append(item_table[Buff.defense])
+    if BuffOptionName.immunity in buff_option:
+        allowed_buffs.append(item_table[Buff.immunity])
+    if BuffOptionName.health in buff_option:
+        allowed_buffs.append(item_table[Buff.health])
+    if BuffOptionName.energy in buff_option:
+        allowed_buffs.append(item_table[Buff.energy])
+    if BuffOptionName.bite in buff_option:
+        allowed_buffs.append(item_table[Buff.bite_rate])
+    if BuffOptionName.fish_trap in buff_option:
+        allowed_buffs.append(item_table[Buff.fish_trap])
+    if BuffOptionName.fishing_bar in buff_option:
+        allowed_buffs.append(item_table[Buff.fishing_bar])
+    if BuffOptionName.quality in buff_option:
+        allowed_buffs.append(item_table[Buff.quality])
+    if BuffOptionName.glow in buff_option:
+        allowed_buffs.append(item_table[Buff.glow])
+    return allowed_buffs
+
+
+def get_traps(options: StardewValleyOptions) -> list[ItemData]:
+    if not options.trap_difficulty.include_traps():
+        return []
+
+    return [
+        trap
+        for trap in items_by_group[Group.TRAP]
+        if trap.name not in options.trap_distribution or options.trap_distribution[trap.name] > 0
+    ]
diff --git a/worlds/stardew_valley/items/filters.py b/worlds/stardew_valley/items/filters.py
new file mode 100644
index 0000000000..cab7f6ff8d
--- /dev/null
+++ b/worlds/stardew_valley/items/filters.py
@@ -0,0 +1,31 @@
+from typing import Iterable
+
+from .item_data import ItemData, Group, FILLER_GROUPS
+from ..content import StardewContent
+from ..options import StardewValleyOptions, Hatsanity
+
+
+def remove_excluded(items: Iterable[ItemData], content: StardewContent, options: StardewValleyOptions) -> list[ItemData]:
+    filtered_items = [
+        item for item in items
+        if Group.DEPRECATED not in item.groups and content.are_all_enabled(item.content_packs)
+    ]
+    if options.hatsanity == Hatsanity.preset_none:
+        return filtered_items
+    return [item for item in filtered_items if Group.FILLER_HAT not in item.groups]
+
+
+def remove_limited_amount_resource_packs(packs: Iterable[ItemData]) -> list[ItemData]:
+    return [
+        resource_pack
+        for resource_pack in packs
+        if not resource_pack.has_limited_amount()
+    ]
+
+
+def remove_already_included(items: Iterable[ItemData], already_added_items: set[str]) -> list[ItemData]:
+    return [
+        item
+        for item in items
+        if item.name not in already_added_items or (item.has_any_group(*FILLER_GROUPS, Group.TRAP) and Group.MAXIMUM_ONE not in item.groups)
+    ]
diff --git a/worlds/stardew_valley/items/item_creation.py b/worlds/stardew_valley/items/item_creation.py
index 6928ca8b66..d7541a608f 100644
--- a/worlds/stardew_valley/items/item_creation.py
+++ b/worlds/stardew_valley/items/item_creation.py
@@ -1,30 +1,34 @@
 import logging
 from random import Random
-from typing import List, Set
+from typing import List
 
 from BaseClasses import Item, ItemClassification
+from .fillers import generate_resource_packs_and_traps, generate_unique_filler_items
+from .filters import remove_excluded
 from .item_data import StardewItemFactory, items_by_group, Group, item_table, ItemData
 from ..content.feature import friendsanity
 from ..content.game_content import StardewContent
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..content.vanilla.qi_board import qi_board_content_pack
 from ..data.game_item import ItemTag
 from ..mods.mod_data import ModNames
-from ..options import StardewValleyOptions, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Museumsanity, \
+from ..options import StardewValleyOptions, FestivalLocations, SpecialOrderLocations, SeasonRandomization, Museumsanity, \
     ElevatorProgression, BackpackProgression, ArcadeMachineLocations, Monstersanity, Goal, \
-    Chefsanity, Craftsanity, BundleRandomization, EntranceRandomization, Shipsanity, Walnutsanity, EnabledFillerBuffs, TrapDifficulty
-from ..strings.ap_names.ap_option_names import BuffOptionName, WalnutsanityOptionName
+    Chefsanity, Craftsanity, BundleRandomization, EntranceRandomization, Shipsanity, Walnutsanity, Moviesanity
+from ..options.options import IncludeEndgameLocations, Friendsanity
+from ..strings.ap_names.ap_option_names import WalnutsanityOptionName, SecretsanityOptionName, EatsanityOptionName, ChefsanityOptionName, StartWithoutOptionName
 from ..strings.ap_names.ap_weapon_names import APWeapon
 from ..strings.ap_names.buff_names import Buff
-from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
+from ..strings.ap_names.community_upgrade_names import CommunityUpgrade, Bookseller
 from ..strings.ap_names.mods.mod_items import SVEQuestItem
+from ..strings.backpack_tiers import Backpack
+from ..strings.building_names import Building
 from ..strings.currency_names import Currency
 from ..strings.tool_names import Tool
 from ..strings.wallet_item_names import Wallet
 
 logger = logging.getLogger(__name__)
 
-def get_too_many_items_error_message(locations_count: int, items_count: int) -> str:
-    return f"There should be at least as many locations [{locations_count}] as there are mandatory items [{items_count}]"
-
 
 def create_items(item_factory: StardewItemFactory, locations_count: int, items_to_exclude: List[Item],
                  options: StardewValleyOptions, content: StardewContent, random: Random) -> List[Item]:
@@ -38,21 +42,25 @@ def create_items(item_factory: StardewItemFactory, locations_count: int, items_t
     items += unique_items
     logger.debug(f"Created {len(unique_items)} unique items")
 
-    unique_filler_items = create_unique_filler_items(item_factory, options, random, locations_count - len(items))
+    unique_filler_items = generate_unique_filler_items(item_factory, content, options, random, locations_count - len(items))
     items += unique_filler_items
     logger.debug(f"Created {len(unique_filler_items)} unique filler items")
 
-    resource_pack_items = fill_with_resource_packs_and_traps(item_factory, options, random, items + items_to_exclude, locations_count - len(items))
+    resource_pack_items = generate_resource_packs_and_traps(item_factory, options, content, random, items + items_to_exclude, locations_count - len(items))
     items += resource_pack_items
     logger.debug(f"Created {len(resource_pack_items)} resource packs")
 
     return items
 
 
-def remove_items(items_to_remove, items):
-    for item in items_to_remove:
-        if item in items:
-            items.remove(item)
+def remove_items(items_to_remove: List[Item], items: List[Item]):
+    for item_to_remove in items_to_remove:
+        for i, item_candidate in enumerate(items):
+            if item_to_remove != item_candidate:
+                continue
+            if item_to_remove.classification == item_candidate.classification and item_to_remove.advancement == item_candidate.advancement:
+                items.pop(i)
+                break
 
 
 def remove_items_if_no_room_for_them(unique_items: List[Item], locations_count: int, random: Random):
@@ -66,7 +74,9 @@ def remove_items_if_no_room_for_them(unique_items: List[Item], locations_count:
         removable_items = [item for item in unique_items if not item.classification & ItemClassification.progression]
     else:
         logger.debug(f"Player has more items than locations, trying to remove {number_of_items_to_remove} random filler items")
-    assert len(removable_items) >= number_of_items_to_remove, get_too_many_items_error_message(locations_count, len(unique_items))
+    count = len(unique_items)
+    assert len(removable_items) >= number_of_items_to_remove, \
+        f"There should be at least as many locations [{locations_count}] as there are mandatory items [{count - len(removable_items)}]"
     items_to_remove = random.sample(removable_items, number_of_items_to_remove)
     remove_items(items_to_remove, unique_items)
 
@@ -79,20 +89,20 @@ def create_unique_items(item_factory: StardewItemFactory, options: StardewValley
     create_raccoons(item_factory, options, items)
     items.append(item_factory(Wallet.metal_detector))  # Always offer at least one metal detector
 
-    create_backpack_items(item_factory, options, items)
-    create_weapons(item_factory, options, items)
+    create_backpack_items(item_factory, options, content, items)
+    create_weapons(item_factory, options, content, items)
     items.append(item_factory("Skull Key"))
-    create_elevators(item_factory, options, items)
+    create_elevators(item_factory, options, content, items)
     create_tools(item_factory, content, items)
     create_skills(item_factory, content, items)
-    create_wizard_buildings(item_factory, options, items)
-    create_carpenter_buildings(item_factory, content, items)
+    create_wizard_buildings(item_factory, options, content, items)
+    create_carpenter_buildings(item_factory, options, content, items)
     items.append(item_factory("Railroad Boulder Removed"))
     items.append(item_factory(CommunityUpgrade.fruit_bats))
     items.append(item_factory(CommunityUpgrade.mushroom_boxes))
     items.append(item_factory("Beach Bridge"))
     create_tv_channels(item_factory, options, items)
-    create_quest_rewards(item_factory, options, items)
+    create_quest_rewards(item_factory, options, content, items)
     create_stardrops(item_factory, options, content, items)
     create_museum_items(item_factory, options, items)
     create_arcade_machine_items(item_factory, options, items)
@@ -104,84 +114,105 @@ def create_unique_items(item_factory: StardewItemFactory, options: StardewValley
     create_friendsanity_items(item_factory, options, content, items, random)
     create_festival_rewards(item_factory, options, items)
     create_special_order_board_rewards(item_factory, options, items)
-    create_special_order_qi_rewards(item_factory, options, items)
-    create_walnuts(item_factory, options, items)
-    create_walnut_purchase_rewards(item_factory, options, items)
-    create_crafting_recipes(item_factory, options, items)
-    create_cooking_recipes(item_factory, options, items)
+    create_special_order_qi_rewards(item_factory, options, content, items)
+    create_walnuts(item_factory, options, content, items)
+    create_walnut_purchase_rewards(item_factory, content, items)
+    create_crafting_recipes(item_factory, options, content, items)
+    create_cooking_recipes(item_factory, options, content, items)
     create_shipsanity_items(item_factory, options, items)
-    create_booksanity_items(item_factory, content, items)
+    create_booksanity_items(item_factory, options, content, items)
+    create_movie_items(item_factory, options, items)
+    create_secrets_items(item_factory, content, options, items)
+    create_eatsanity_enzyme_items(item_factory, options, items)
+    create_endgame_locations_items(item_factory, options, items)
+
     create_goal_items(item_factory, options, items)
     items.append(item_factory("Golden Egg"))
     items.append(item_factory(CommunityUpgrade.mr_qi_plane_ride))
 
-    create_sve_special_items(item_factory, options, items)
-    create_magic_mod_spells(item_factory, options, items)
-    create_deepwoods_pendants(item_factory, options, items)
-    create_archaeology_items(item_factory, options, items)
+    items.append(item_factory(Wallet.mens_locker_key))
+    items.append(item_factory(Wallet.womens_locker_key))
+
+    create_sve_special_items(item_factory, content, items)
+    create_magic_mod_spells(item_factory, content, items)
+    create_deepwoods_pendants(item_factory, content, items)
+    create_archaeology_items(item_factory, content, items)
 
     return items
 
 
 def create_raccoons(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     number_progressive_raccoons = 9
+    if options.bundle_per_room.value < 0:
+        number_progressive_raccoons -= options.bundle_per_room.value
     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)
 
 
-def create_backpack_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if (options.backpack_progression == BackpackProgression.option_progressive or
-            options.backpack_progression == BackpackProgression.option_early_progressive):
-        items.extend(item_factory(item) for item in ["Progressive Backpack"] * 2)
-        if ModNames.big_backpack in options.mods:
-            items.append(item_factory("Progressive Backpack"))
+def create_backpack_items(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    if options.backpack_progression == BackpackProgression.option_vanilla:
+        return
+    num_per_tier = options.backpack_size.count_per_tier()
+    backpack_tier_names = Backpack.get_purchasable_tiers(ModNames.big_backpack in content.registered_packs, StartWithoutOptionName.backpack in options.start_without)
+    num_backpacks = len(backpack_tier_names) * num_per_tier
+
+    items.extend(item_factory(item) for item in ["Progressive Backpack"] * num_backpacks)
 
 
-def create_weapons(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    weapons = weapons_count(options)
+def create_footwear(item_factory: StardewItemFactory, number: int) -> List[Item]:
+    return [item_factory(APWeapon.footwear) for _ in range(number)]
+
+
+def create_weapons(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    weapons = weapons_count(content)
     items.extend(item_factory(item) for item in [APWeapon.slingshot] * 2)
     monstersanity = options.monstersanity
+
+    ring_classification = ItemClassification.progression if options.bundle_randomization == BundleRandomization.option_meme else ItemClassification.useful
+    rings_items = [item for item in items_by_group[Group.FILLER_RING] if item.classification is not ItemClassification.filler]
+
     if monstersanity == Monstersanity.option_none:  # Without monstersanity, might not be enough checks to split the weapons
         items.extend(item_factory(item) for item in [APWeapon.weapon] * weapons)
-        items.extend(item_factory(item) for item in [APWeapon.footwear] * 3)  # 1-2 | 3-4 | 6-7-8
+        items.extend(create_footwear(item_factory, 3))  # 1-2 | 3-4 | 6-7-8
+        rings_items = [item for item in rings_items if item.classification is ItemClassification.progression]
+        items.extend(item_factory(item, classification_pre_fill=ring_classification) for item in rings_items)
         return
 
     items.extend(item_factory(item) for item in [APWeapon.sword] * weapons)
     items.extend(item_factory(item) for item in [APWeapon.club] * weapons)
     items.extend(item_factory(item) for item in [APWeapon.dagger] * weapons)
-    items.extend(item_factory(item) for item in [APWeapon.footwear] * 4)  # 1-2 | 3-4 | 6-7-8 | 11-13
+    items.extend(create_footwear(item_factory, 4))  # 1-2 | 3-4 | 6-7-8 | 11-13
+
+    items.extend(item_factory(item, classification_pre_fill=ring_classification) for item in rings_items)
     if monstersanity == Monstersanity.option_goals or monstersanity == Monstersanity.option_one_per_category or \
             monstersanity == Monstersanity.option_short_goals or monstersanity == Monstersanity.option_very_short_goals:
         return
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-        rings_items = [item for item in items_by_group[Group.RING] if item.classification is not ItemClassification.filler]
-    else:
-        rings_items = [item for item in items_by_group[Group.RING]]
-    items.extend(item_factory(item) for item in rings_items)
 
 
-def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     if options.elevator_progression == ElevatorProgression.option_vanilla:
         return
 
     items.extend([item_factory(item) for item in ["Progressive Mine Elevator"] * 24])
-    if ModNames.deepwoods in options.mods:
+    if ModNames.deepwoods in content.registered_packs:
         items.extend([item_factory(item) for item in ["Progressive Woods Obelisk Sigils"] * 10])
-    if ModNames.skull_cavern_elevator in options.mods:
+    if ModNames.skull_cavern_elevator in content.registered_packs:
         items.extend([item_factory(item) for item in ["Progressive Skull Cavern Elevator"] * 8])
 
 
 def create_tools(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
     tool_progression = content.features.tool_progression
     for tool, count in tool_progression.tool_distribution.items():
-        item = item_table[tool_progression.to_progressive_item(tool)]
+        item = item_table[tool_progression.to_progressive_item_name(tool)]
 
         # Trash can is only used in tool upgrade logic, so the last trash can is not progression because it basically does not unlock anything.
         if tool == Tool.trash_can:
             count -= 1
-            items.append(item_factory(item, ItemClassification.useful))
+            items.append(item_factory(item,
+                                      classification_pre_fill=ItemClassification.useful,
+                                      classification_post_fill=ItemClassification.progression_skip_balancing))
 
         items.extend([item_factory(item) for _ in range(count)])
 
@@ -201,49 +232,53 @@ def create_skills(item_factory: StardewItemFactory, content: StardewContent, ite
         items.append(item_factory(Wallet.mastery_of_the_five_ways))
 
 
-def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    useless_buildings_classification = ItemClassification.progression_skip_balancing if world_is_perfection(options) else ItemClassification.useful
-    items.append(item_factory("Earth Obelisk", useless_buildings_classification))
-    items.append(item_factory("Water Obelisk", useless_buildings_classification))
+def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    useful_buildings_classification = ItemClassification.progression_skip_balancing if goal_is_perfection(options) else ItemClassification.useful
+    items.append(item_factory("Earth Obelisk", classification_pre_fill=useful_buildings_classification))
+    items.append(item_factory("Water Obelisk", classification_pre_fill=useful_buildings_classification))
     items.append(item_factory("Desert Obelisk"))
     items.append(item_factory("Junimo Hut"))
-    items.append(item_factory("Gold Clock", useless_buildings_classification))
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_false:
+    items.append(item_factory("Gold Clock", classification_pre_fill=useful_buildings_classification))
+    if content.is_enabled(ginger_island_content_pack):
         items.append(item_factory("Island Obelisk"))
-    if ModNames.deepwoods in options.mods:
+    if content.is_enabled(ModNames.deepwoods):
         items.append(item_factory("Woods Obelisk"))
 
 
-def create_carpenter_buildings(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+def create_carpenter_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     building_progression = content.features.building_progression
     if not building_progression.is_progressive:
         return
 
     for building in content.farm_buildings.values():
         item_name, _ = building_progression.to_progressive_item(building.name)
-        items.append(item_factory(item_name))
+        if item_name in [Building.stable, Building.well] and options.bundle_randomization != BundleRandomization.option_meme:
+            items.append(item_factory(item_name, classification_pre_fill=ItemClassification.useful))
+        else:
+            items.append(item_factory(item_name))
 
 
-def create_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    create_special_quest_rewards(item_factory, options, items)
+def create_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    create_special_quest_rewards(item_factory, options, content, items)
     create_help_wanted_quest_rewards(item_factory, options, items)
 
-    create_quest_rewards_sve(item_factory, options, items)
+    create_quest_rewards_sve(item_factory, options, content, items)
 
 
-def create_special_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_special_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     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))
     items.append(item_factory(Wallet.magnifying_glass))
-    if ModNames.sve in options.mods:
+    items.append(item_factory(Wallet.magic_ink))
+    items.append(item_factory(Wallet.iridium_snake_milk))
+    if ModNames.sve in content.registered_packs:
         items.append(item_factory(Wallet.bears_knowledge))
     else:
-        items.append(item_factory(Wallet.bears_knowledge, ItemClassification.useful))  # Not necessary outside of SVE
-    items.append(item_factory(Wallet.iridium_snake_milk))
+        items.append(item_factory(Wallet.bears_knowledge, classification_pre_fill=ItemClassification.useful))  # Not necessary outside of SVE
     items.append(item_factory("Dark Talisman"))
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_false:
+    if content.is_enabled(ginger_island_content_pack):
         items.append(item_factory("Fairy Dust Recipe"))
 
 
@@ -259,22 +294,24 @@ def create_help_wanted_quest_rewards(item_factory: StardewItemFactory, options:
 
 def create_stardrops(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     stardrops_classification = get_stardrop_classification(options)
-    items.append(item_factory("Stardrop", stardrops_classification))  # The Mines level 100
-    items.append(item_factory("Stardrop", stardrops_classification))  # Old Master Cannoli
-    items.append(item_factory("Stardrop", stardrops_classification))  # Krobus Stardrop
+    items.append(item_factory("Stardrop", classification_pre_fill=stardrops_classification))  # The Mines level 100
+    items.append(item_factory("Stardrop", classification_pre_fill=stardrops_classification))  # Krobus Stardrop
     if content.features.fishsanity.is_enabled:
-        items.append(item_factory("Stardrop", stardrops_classification))  # Master Angler Stardrop
-    if ModNames.deepwoods in options.mods:
-        items.append(item_factory("Stardrop", stardrops_classification))  # Petting the Unicorn
+        items.append(item_factory("Stardrop", classification_pre_fill=stardrops_classification))  # Master Angler Stardrop
+    if ModNames.deepwoods in content.registered_packs:
+        items.append(item_factory("Stardrop", classification_pre_fill=stardrops_classification))  # Petting the Unicorn
     if content.features.friendsanity.is_enabled:
-        items.append(item_factory("Stardrop", stardrops_classification))  # Spouse Stardrop
+        items.append(item_factory("Stardrop", classification_pre_fill=stardrops_classification))  # Spouse Stardrop
+    if SecretsanityOptionName.easy in options.secretsanity:
+        # Always Progression as a different secret requires a stardrop
+        items.append(item_factory("Stardrop", classification_pre_fill=ItemClassification.progression))  # Old Master Cannoli.
 
 
 def create_museum_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     items.append(item_factory(Wallet.rusty_key))
     items.append(item_factory(Wallet.dwarvish_translation_guide))
     items.append(item_factory("Ancient Seeds Recipe"))
-    items.append(item_factory("Stardrop", get_stardrop_classification(options)))
+    items.append(item_factory("Stardrop", classification_pre_fill=get_stardrop_classification(options)))
     if options.museumsanity == Museumsanity.option_none:
         return
     items.extend(item_factory(item) for item in ["Magic Rock Candy"] * 10)
@@ -292,13 +329,10 @@ def create_friendsanity_items(item_factory: StardewItemFactory, options: Stardew
         item_name = friendsanity.to_item_name(villager.name)
 
         for _ in content.features.friendsanity.get_randomized_hearts(villager):
-            items.append(item_factory(item_name, ItemClassification.progression))
-
-    need_pet = options.goal == Goal.option_grandpa_evaluation
-    pet_item_classification = ItemClassification.progression_skip_balancing if need_pet else ItemClassification.useful
+            items.append(item_factory(item_name))
 
     for _ in content.features.friendsanity.get_pet_randomized_hearts():
-        items.append(item_factory(friendsanity.pet_heart_item_name, pet_item_classification))
+        items.append(item_factory(friendsanity.pet_heart_item_name, classification_pre_fill=ItemClassification.progression_skip_balancing))
 
 
 def create_babies(item_factory: StardewItemFactory, items: List[Item], random: Random):
@@ -359,12 +393,12 @@ def create_festival_rewards(item_factory: StardewItemFactory, options: StardewVa
         return
 
     festival_rewards = [item_factory(item) for item in items_by_group[Group.FESTIVAL] if item.classification != ItemClassification.filler]
-    items.extend([*festival_rewards, item_factory("Stardrop", get_stardrop_classification(options))])
+    items.extend([*festival_rewards, item_factory("Stardrop", classification_pre_fill=get_stardrop_classification(options))])
 
 
-def create_walnuts(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_walnuts(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     walnutsanity = options.walnutsanity
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_true or walnutsanity == Walnutsanity.preset_none:
+    if not content.is_enabled(ginger_island_content_pack) or walnutsanity == Walnutsanity.preset_none:
         return
 
     # Give baseline walnuts just to be nice
@@ -391,8 +425,8 @@ def create_walnuts(item_factory: StardewItemFactory, options: StardewValleyOptio
     items.extend([item_factory(item) for item in ["5 Golden Walnuts"] * num_penta_walnuts])
 
 
-def create_walnut_purchase_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def create_walnut_purchase_rewards(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    if not content.is_enabled(ginger_island_content_pack):
         return
 
     items.extend([item_factory("Boat Repair"),
@@ -420,15 +454,15 @@ def special_order_board_item_classification(item: ItemData, need_all_recipes: bo
     return ItemClassification.useful
 
 
-def create_special_order_qi_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def create_special_order_qi_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    if not content.is_enabled(ginger_island_content_pack):
         return
     qi_gem_rewards = []
     if options.bundle_randomization >= BundleRandomization.option_remixed:
         qi_gem_rewards.append("15 Qi Gems")
         qi_gem_rewards.append("15 Qi Gems")
 
-    if options.special_order_locations & SpecialOrderLocations.value_qi:
+    if content.is_enabled(qi_board_content_pack):
         qi_gem_rewards.extend(["100 Qi Gems", "10 Qi Gems", "40 Qi Gems", "25 Qi Gems", "25 Qi Gems",
                                "40 Qi Gems", "20 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems"])
 
@@ -443,33 +477,33 @@ def create_tv_channels(item_factory: StardewItemFactory, options: StardewValleyO
     items.extend([item_factory(item) for item in channels])
 
 
-def create_crafting_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_crafting_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     has_craftsanity = options.craftsanity == Craftsanity.option_all
     crafting_recipes = []
     crafting_recipes.extend([recipe for recipe in items_by_group[Group.QI_CRAFTING_RECIPE]])
     if has_craftsanity:
         crafting_recipes.extend([recipe for recipe in items_by_group[Group.CRAFTSANITY]])
-    crafting_recipes = remove_excluded_items(crafting_recipes, options)
+    crafting_recipes = remove_excluded(crafting_recipes, content, options)
     items.extend([item_factory(item) for item in crafting_recipes])
 
 
-def create_cooking_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_cooking_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     chefsanity = options.chefsanity
-    if chefsanity == Chefsanity.option_none:
+    if chefsanity == Chefsanity.preset_none:
         return
 
     chefsanity_recipes_by_name = {recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_STARTER]}  # Dictionary to not make duplicates
 
-    if chefsanity & Chefsanity.option_queen_of_sauce:
+    if ChefsanityOptionName.queen_of_sauce in chefsanity:
         chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_QOS]})
-    if chefsanity & Chefsanity.option_purchases:
+    if ChefsanityOptionName.purchases in chefsanity:
         chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_PURCHASE]})
-    if chefsanity & Chefsanity.option_friendship:
+    if ChefsanityOptionName.friendship in chefsanity:
         chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_FRIENDSHIP]})
-    if chefsanity & Chefsanity.option_skills:
+    if ChefsanityOptionName.skills in chefsanity:
         chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_SKILL]})
 
-    filtered_chefsanity_recipes = remove_excluded_items(list(chefsanity_recipes_by_name.values()), options)
+    filtered_chefsanity_recipes = remove_excluded(list(chefsanity_recipes_by_name.values()), content, options)
     items.extend([item_factory(item) for item in filtered_chefsanity_recipes])
 
 
@@ -481,14 +515,95 @@ def create_shipsanity_items(item_factory: StardewItemFactory, options: StardewVa
     items.append(item_factory(Wallet.metal_detector))
 
 
-def create_booksanity_items(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+def create_booksanity_items(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    create_bookseller_items(item_factory, options, content, items)
     booksanity = content.features.booksanity
     if not booksanity.is_enabled:
         return
 
     items.extend(item_factory(item_table[booksanity.to_item_name(book.name)]) for book in content.find_tagged_items(ItemTag.BOOK_POWER))
     progressive_lost_book = item_table[booksanity.progressive_lost_book]
-    items.extend(item_factory(progressive_lost_book) for _ in content.features.booksanity.get_randomized_lost_books())
+    # We do -1 here because the first lost book spawns freely in the museum
+    num_lost_books = len([book for book in content.features.booksanity.get_randomized_lost_books()]) - 1
+    items.extend(item_factory(progressive_lost_book) for _ in range(num_lost_books))
+
+
+def create_bookseller_items(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    needs_books = options.shipsanity == Shipsanity.option_everything or content.features.booksanity.is_enabled or content.features.hatsanity.is_enabled
+    book_items = []
+    book_items.extend(item_factory(item_table[Bookseller.days]) for _ in range(4 if needs_books else 1))
+    if not needs_books:
+        book_items.extend(item_factory(item_table[Bookseller.days], classification_pre_fill=ItemClassification.filler) for _ in range(3))
+    book_items.extend(item_factory(item_table[Bookseller.stock_rare_books]) for _ in range(2 if needs_books else 1))
+    book_items.append(item_factory(item_table[Bookseller.stock_permanent_books]))
+    book_items.append(item_factory(item_table[Bookseller.stock_experience_books]))
+    if needs_books:
+        book_items.extend(item_factory(item_table[Bookseller.stock_experience_books], classification_pre_fill=ItemClassification.filler) for _ in range(2))
+
+    items.extend(book_items)
+
+
+def create_movie_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.moviesanity.value < Moviesanity.option_all_movies:
+        return
+
+    items.extend(item_factory(item) for item in items_by_group[Group.MOVIESANITY])
+
+
+def create_secrets_items(item_factory: StardewItemFactory, content: StardewContent, options: StardewValleyOptions, items: List[Item]):
+    if not options.secretsanity:
+        return
+    secret_items = []
+    if SecretsanityOptionName.easy in options.secretsanity:
+        secret_items.extend(items_by_group[Group.EASY_SECRET])
+    # if SecretsanityOptionName.fishing in options.secretsanity:
+    #     secret_items.extend(items_by_group[Group.FISHING_SECRET]) # There are no longer any of these items, they are now part of FILLER_DECORATION
+    # if SecretsanityOptionName.difficult in options.secretsanity:
+    #     items.extend(item_factory(item) for item in items_by_group[Group.DIFFICULT_SECRET])
+    if SecretsanityOptionName.secret_notes in options.secretsanity:
+        secret_items.extend(items_by_group[Group.SECRET_NOTES_SECRET])
+        if options.quest_locations.has_no_story_quests():
+            secret_items.append(item_table[Wallet.club_card])
+            secret_items.append(item_table[Wallet.iridium_snake_milk])
+    filtered_secret_items = remove_excluded(list(secret_items), content, options)
+    items.extend([item_factory(item) for item in filtered_secret_items])
+
+
+def create_eatsanity_enzyme_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if EatsanityOptionName.lock_effects not in options.eatsanity:
+        return
+
+    # These items unlock progressively stronger ability to digest food items that give the associated buff
+    # Upon receiving the enzyme, you also get a temporary buff of whatever the effect is
+    # Stamina and Health items can go beyond their original max value, but the buffs cannot.
+    items.extend(item_factory(item) for item in ["Stamina Enzyme"]*10)
+    items.extend(item_factory(item) for item in ["Health Enzyme"]*10)
+    items.extend(item_factory(item) for item in ["Speed Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Luck Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Farming Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Foraging Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Fishing Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Mining Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Magnetism Enzyme"]*2)
+    items.extend(item_factory(item) for item in ["Defense Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Attack Enzyme"]*5)
+    items.extend(item_factory(item) for item in ["Max Stamina Enzyme"]*3)
+    items.extend(item_factory(item) for item in ["Squid Ink Enzyme"])
+    items.extend(item_factory(item) for item in ["Monster Musk Enzyme"])
+    items.extend(item_factory(item) for item in ["Oil Of Garlic Enzyme"])
+    items.extend(item_factory(item) for item in ["Tipsy Enzyme"])
+
+
+def create_endgame_locations_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.include_endgame_locations == IncludeEndgameLocations.option_false:
+        return
+
+    items_to_add = []
+    items_to_add.extend(items_by_group[Group.ENDGAME_LOCATION_ITEMS])
+    if options.friendsanity != Friendsanity.option_all_with_marriage:
+        for portrait in items_by_group[Group.REQUIRES_FRIENDSANITY_MARRIAGE]:
+            items_to_add.remove(portrait)
+    items.extend(item_factory(item) for item in items_to_add)
 
 
 def create_goal_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
@@ -499,233 +614,66 @@ def create_goal_items(item_factory: StardewItemFactory, options: StardewValleyOp
     items.append(item_factory(Wallet.metal_detector))
 
 
-def create_archaeology_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    mods = options.mods
-    if ModNames.archaeology not in mods:
+def create_archaeology_items(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    if ModNames.archaeology not in content.registered_packs:
         return
 
     items.append(item_factory(Wallet.metal_detector))
 
 
-def create_filler_festival_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions) -> List[Item]:
-    if options.festival_locations == FestivalLocations.option_disabled:
-        return []
-
-    return [item_factory(item) for item in items_by_group[Group.FESTIVAL] if
-            item.classification == ItemClassification.filler]
-
-
-def create_magic_mod_spells(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if ModNames.magic not in options.mods:
+def create_magic_mod_spells(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    if ModNames.magic not in content.registered_packs:
         return
     items.extend([item_factory(item) for item in items_by_group[Group.MAGIC_SPELL]])
 
 
-def create_deepwoods_pendants(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if ModNames.deepwoods not in options.mods:
+def create_deepwoods_pendants(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    if ModNames.deepwoods not in content.registered_packs:
         return
     items.extend([item_factory(item) for item in ["Pendant of Elders", "Pendant of Community", "Pendant of Depths"]])
 
 
-def create_sve_special_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if ModNames.sve not in options.mods:
+def create_sve_special_items(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    if ModNames.sve not in content.registered_packs:
         return
 
-    items.extend([item_factory(item) for item in items_by_group[Group.MOD_WARP] if item.mod_name == ModNames.sve])
+    items.extend([item_factory(item) for item in items_by_group[Group.MOD_WARP] if ModNames.sve in item.content_packs])
 
 
-def create_quest_rewards_sve(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if ModNames.sve not in options.mods:
+def create_quest_rewards_sve(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
+    if not content.is_enabled(ModNames.sve):
         return
 
-    exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true
+    ginger_island_included = content.is_enabled(ginger_island_content_pack)
     items.extend([item_factory(item) for item in SVEQuestItem.sve_always_quest_items])
-    if not exclude_ginger_island:
+    if ginger_island_included:
         items.extend([item_factory(item) for item in SVEQuestItem.sve_always_quest_items_ginger_island])
 
     if options.quest_locations.has_no_story_quests():
         return
 
     items.extend([item_factory(item) for item in SVEQuestItem.sve_quest_items])
-    if exclude_ginger_island:
+    if not ginger_island_included:
         return
     items.extend([item_factory(item) for item in SVEQuestItem.sve_quest_items_ginger_island])
 
 
-def create_unique_filler_items(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random,
-                               available_item_slots: int) -> List[Item]:
-    items = []
-
-    items.extend(create_filler_festival_rewards(item_factory, options))
-
-    if len(items) > available_item_slots:
-        items = random.sample(items, available_item_slots)
-    return items
-
-
-def weapons_count(options: StardewValleyOptions):
+def weapons_count(content: StardewContent):
     weapon_count = 5
-    if ModNames.sve in options.mods:
+    if ModNames.sve in content.registered_packs:
         weapon_count += 1
     return weapon_count
 
 
-def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random,
-                                       items_already_added: List[Item],
-                                       available_item_slots: int) -> List[Item]:
-    include_traps = options.trap_difficulty != TrapDifficulty.option_no_traps
-    items_already_added_names = [item.name for item in items_already_added]
-    useful_resource_packs = [pack for pack in items_by_group[Group.RESOURCE_PACK_USEFUL]
-                             if pack.name not in items_already_added_names]
-    trap_items = [trap for trap in items_by_group[Group.TRAP]
-                  if trap.name not in items_already_added_names and
-                  Group.DEPRECATED not in trap.groups and
-                  (trap.mod_name is None or trap.mod_name in options.mods) and
-                  options.trap_distribution[trap.name] > 0]
-    player_buffs = get_allowed_player_buffs(options.enabled_filler_buffs)
-
-    priority_filler_items = []
-    priority_filler_items.extend(useful_resource_packs)
-    priority_filler_items.extend(player_buffs)
-
-    if include_traps:
-        priority_filler_items.extend(trap_items)
-
-    exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true
-    all_filler_packs = remove_excluded_items(get_all_filler_items(include_traps, exclude_ginger_island), options)
-    all_filler_packs.extend(player_buffs)
-    priority_filler_items = remove_excluded_items(priority_filler_items, options)
-
-    number_priority_items = len(priority_filler_items)
-    if available_item_slots < number_priority_items:
-        chosen_priority_items = [item_factory(resource_pack) for resource_pack in
-                                 random.sample(priority_filler_items, available_item_slots)]
-        return chosen_priority_items
-
-    items = []
-    chosen_priority_items = [item_factory(resource_pack,
-                                          ItemClassification.trap if resource_pack.classification == ItemClassification.trap else ItemClassification.useful)
-                             for resource_pack in priority_filler_items]
-    items.extend(chosen_priority_items)
-    available_item_slots -= number_priority_items
-    all_filler_packs = [filler_pack for filler_pack in all_filler_packs
-                        if Group.MAXIMUM_ONE not in filler_pack.groups or
-                        (filler_pack.name not in [priority_item.name for priority_item in
-                                                  priority_filler_items] and filler_pack.name not in items_already_added_names)]
-
-    filler_weights = get_filler_weights(options, all_filler_packs)
-
-    while available_item_slots > 0:
-        resource_pack = random.choices(all_filler_packs, weights=filler_weights, k=1)[0]
-        exactly_2 = Group.AT_LEAST_TWO in resource_pack.groups
-        while exactly_2 and available_item_slots == 1:
-            resource_pack = random.choices(all_filler_packs, weights=filler_weights, k=1)[0]
-            exactly_2 = Group.AT_LEAST_TWO in resource_pack.groups
-        classification = ItemClassification.useful if resource_pack.classification == ItemClassification.progression else resource_pack.classification
-        items.append(item_factory(resource_pack, classification))
-        available_item_slots -= 1
-        if exactly_2:
-            items.append(item_factory(resource_pack, classification))
-            available_item_slots -= 1
-        if exactly_2 or Group.MAXIMUM_ONE in resource_pack.groups:
-            index = all_filler_packs.index(resource_pack)
-            all_filler_packs.pop(index)
-            filler_weights.pop(index)
-
-    return items
-
-
-def get_filler_weights(options: StardewValleyOptions, all_filler_packs: List[ItemData]):
-    weights = []
-    for filler in all_filler_packs:
-        if filler.name in options.trap_distribution:
-            num = options.trap_distribution[filler.name]
-        else:
-            num = options.trap_distribution.default_weight
-        weights.append(num)
-    return weights
-
-
-def filter_deprecated_items(items: List[ItemData]) -> List[ItemData]:
-    return [item for item in items if Group.DEPRECATED not in item.groups]
-
-
-def filter_ginger_island_items(exclude_island: bool, items: List[ItemData]) -> List[ItemData]:
-    return [item for item in items if not exclude_island or Group.GINGER_ISLAND not in item.groups]
-
-
-def filter_mod_items(mods: Set[str], items: List[ItemData]) -> List[ItemData]:
-    return [item for item in items if item.mod_name is None or item.mod_name in mods]
-
-
-def remove_excluded_items(items, options: StardewValleyOptions):
-    return remove_excluded_items_island_mods(items, options.exclude_ginger_island == ExcludeGingerIsland.option_true, options.mods.value)
-
-
-def remove_excluded_items_island_mods(items, exclude_ginger_island: bool, mods: Set[str]):
-    deprecated_filter = filter_deprecated_items(items)
-    ginger_island_filter = filter_ginger_island_items(exclude_ginger_island, deprecated_filter)
-    mod_filter = filter_mod_items(mods, ginger_island_filter)
-    return mod_filter
-
-
-def generate_filler_choice_pool(options: StardewValleyOptions) -> list[str]:
-    include_traps = options.trap_difficulty != TrapDifficulty.option_no_traps
-    exclude_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true
-
-    available_filler = get_all_filler_items(include_traps, exclude_island)
-    available_filler = remove_limited_amount_packs(available_filler)
-
-    return [item.name for item in available_filler]
-
-
-def remove_limited_amount_packs(packs):
-    return [pack for pack in packs if Group.MAXIMUM_ONE not in pack.groups and Group.AT_LEAST_TWO not in pack.groups]
-
-
-def get_all_filler_items(include_traps: bool, exclude_ginger_island: bool) -> List[ItemData]:
-    all_filler_items = [pack for pack in items_by_group[Group.RESOURCE_PACK]]
-    all_filler_items.extend(items_by_group[Group.TRASH])
-    if include_traps:
-        all_filler_items.extend(items_by_group[Group.TRAP])
-    all_filler_items = remove_excluded_items_island_mods(all_filler_items, exclude_ginger_island, set())
-    return all_filler_items
-
-
-def get_allowed_player_buffs(buff_option: EnabledFillerBuffs) -> List[ItemData]:
-    allowed_buffs = []
-    if BuffOptionName.luck in buff_option:
-        allowed_buffs.append(item_table[Buff.luck])
-    if BuffOptionName.damage in buff_option:
-        allowed_buffs.append(item_table[Buff.damage])
-    if BuffOptionName.defense in buff_option:
-        allowed_buffs.append(item_table[Buff.defense])
-    if BuffOptionName.immunity in buff_option:
-        allowed_buffs.append(item_table[Buff.immunity])
-    if BuffOptionName.health in buff_option:
-        allowed_buffs.append(item_table[Buff.health])
-    if BuffOptionName.energy in buff_option:
-        allowed_buffs.append(item_table[Buff.energy])
-    if BuffOptionName.bite in buff_option:
-        allowed_buffs.append(item_table[Buff.bite_rate])
-    if BuffOptionName.fish_trap in buff_option:
-        allowed_buffs.append(item_table[Buff.fish_trap])
-    if BuffOptionName.fishing_bar in buff_option:
-        allowed_buffs.append(item_table[Buff.fishing_bar])
-    if BuffOptionName.quality in buff_option:
-        allowed_buffs.append(item_table[Buff.quality])
-    if BuffOptionName.glow in buff_option:
-        allowed_buffs.append(item_table[Buff.glow])
-    return allowed_buffs
-
-
 def get_stardrop_classification(options) -> ItemClassification:
-    return ItemClassification.progression_skip_balancing if world_is_perfection(options) or world_is_stardrops(options) else ItemClassification.useful
+    return ItemClassification.progression_skip_balancing \
+        if goal_is_perfection(options) or goal_is_stardrops(options) or EatsanityOptionName.shop in options.eatsanity \
+        else ItemClassification.useful
 
 
-def world_is_perfection(options) -> bool:
+def goal_is_perfection(options) -> bool:
     return options.goal == Goal.option_perfection
 
 
-def world_is_stardrops(options) -> bool:
+def goal_is_stardrops(options) -> bool:
     return options.goal == Goal.option_mystery_of_the_stardrops
diff --git a/worlds/stardew_valley/items/item_data.py b/worlds/stardew_valley/items/item_data.py
index 6abc96f4e6..6fac08a592 100644
--- a/worlds/stardew_valley/items/item_data.py
+++ b/worlds/stardew_valley/items/item_data.py
@@ -1,145 +1,197 @@
-import csv
-import enum
-from dataclasses import dataclass, field
-from functools import reduce
-from pathlib import Path
-from typing import Dict, List, Protocol, Union, Set, Optional
-
-from BaseClasses import Item, ItemClassification
-from .. import data
-from ..logic.logic_event import all_events
-
-ITEM_CODE_OFFSET = 717000
-
-world_folder = Path(__file__).parent
-
-
-class Group(enum.Enum):
-    RESOURCE_PACK = enum.auto()
-    FRIENDSHIP_PACK = enum.auto()
-    COMMUNITY_REWARD = enum.auto()
-    TRASH = enum.auto()
-    FOOTWEAR = enum.auto()
-    HATS = enum.auto()
-    RING = enum.auto()
-    WEAPON = enum.auto()
-    WEAPON_GENERIC = enum.auto()
-    WEAPON_SWORD = enum.auto()
-    WEAPON_CLUB = enum.auto()
-    WEAPON_DAGGER = enum.auto()
-    WEAPON_SLINGSHOT = enum.auto()
-    PROGRESSIVE_TOOLS = enum.auto()
-    SKILL_LEVEL_UP = enum.auto()
-    SKILL_MASTERY = enum.auto()
-    BUILDING = enum.auto()
-    WIZARD_BUILDING = enum.auto()
-    DESERT_TRANSPORTATION = enum.auto()
-    ISLAND_TRANSPORTATION = enum.auto()
-    ARCADE_MACHINE_BUFFS = enum.auto()
-    BASE_RESOURCE = enum.auto()
-    WARP_TOTEM = enum.auto()
-    GEODE = enum.auto()
-    ORE = enum.auto()
-    FERTILIZER = enum.auto()
-    SEED = enum.auto()
-    CROPSANITY = enum.auto()
-    FISHING_RESOURCE = enum.auto()
-    SEASON = enum.auto()
-    TRAVELING_MERCHANT_DAY = enum.auto()
-    MUSEUM = enum.auto()
-    FRIENDSANITY = enum.auto()
-    FESTIVAL = enum.auto()
-    RARECROW = enum.auto()
-    TRAP = enum.auto()
-    BONUS = enum.auto()
-    MAXIMUM_ONE = enum.auto()
-    AT_LEAST_TWO = enum.auto()
-    DEPRECATED = enum.auto()
-    RESOURCE_PACK_USEFUL = enum.auto()
-    SPECIAL_ORDER_BOARD = enum.auto()
-    SPECIAL_ORDER_QI = enum.auto()
-    BABY = enum.auto()
-    GINGER_ISLAND = enum.auto()
-    WALNUT_PURCHASE = enum.auto()
-    TV_CHANNEL = enum.auto()
-    QI_CRAFTING_RECIPE = enum.auto()
-    CHEFSANITY = enum.auto()
-    CHEFSANITY_STARTER = enum.auto()
-    CHEFSANITY_QOS = enum.auto()
-    CHEFSANITY_PURCHASE = enum.auto()
-    CHEFSANITY_FRIENDSHIP = enum.auto()
-    CHEFSANITY_SKILL = enum.auto()
-    CRAFTSANITY = enum.auto()
-    BOOK_POWER = enum.auto()
-    LOST_BOOK = enum.auto()
-    PLAYER_BUFF = enum.auto()
-    # Mods
-    MAGIC_SPELL = enum.auto()
-    MOD_WARP = enum.auto()
-
-
-@dataclass(frozen=True)
-class ItemData:
-    code_without_offset: Optional[int]
-    name: str
-    classification: ItemClassification
-    mod_name: Optional[str] = None
-    groups: Set[Group] = field(default_factory=frozenset)
-
-    def __post_init__(self):
-        if not isinstance(self.groups, frozenset):
-            super().__setattr__("groups", frozenset(self.groups))
-
-    @property
-    def code(self):
-        return ITEM_CODE_OFFSET + self.code_without_offset if self.code_without_offset is not None else None
-
-    def has_any_group(self, *group: Group) -> bool:
-        groups = set(group)
-        return bool(groups.intersection(self.groups))
-
-
-class StardewItemFactory(Protocol):
-    def __call__(self, name: Union[str, ItemData], override_classification: ItemClassification = None) -> Item:
-        raise NotImplementedError
-
-
-def load_item_csv():
-    from importlib.resources import files
-
-    items = []
-    with files(data).joinpath("items.csv").open() as file:
-        item_reader = csv.DictReader(file)
-        for item in item_reader:
-            id = int(item["id"]) if item["id"] else None
-            classification = reduce((lambda a, b: a | b), {ItemClassification[str_classification] for str_classification in item["classification"].split(",")})
-            groups = {Group[group] for group in item["groups"].split(",") if group}
-            mod_name = str(item["mod_name"]) if item["mod_name"] else None
-            items.append(ItemData(id, item["name"], classification, mod_name, groups))
-    return items
-
-
-events = [
-    ItemData(None, e, ItemClassification.progression)
-    for e in sorted(all_events)
-]
-
-all_items: List[ItemData] = load_item_csv() + events
-item_table: Dict[str, ItemData] = {}
-items_by_group: Dict[Group, List[ItemData]] = {}
-
-
-def initialize_groups():
-    for item in all_items:
-        for group in item.groups:
-            item_group = items_by_group.get(group, list())
-            item_group.append(item)
-            items_by_group[group] = item_group
-
-
-def initialize_item_table():
-    item_table.update({item.name: item for item in all_items})
-
-
-initialize_item_table()
-initialize_groups()
+from __future__ import annotations
+
+import csv
+import enum
+from dataclasses import dataclass, field
+from functools import reduce
+from typing import Protocol
+
+from BaseClasses import ItemClassification, Item
+from .. import data
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..logic.logic_event import all_events
+
+ITEM_CODE_OFFSET = 717000
+
+
+class StardewItemFactory(Protocol):
+    def __call__(self, item: str | ItemData, /, *, classification_pre_fill: ItemClassification = None,
+                 classification_post_fill: ItemClassification = None) -> Item:
+        """
+        :param item: The item to create. Can be the name of the item or the item data.
+        :param classification_pre_fill: The classification to use for the item before the fill. If None, the basic classification of the item is used.
+        :param classification_post_fill: The classification to use for the item after the fill. If None, the pre_fill classification will be used.
+        """
+        raise NotImplementedError
+
+
+class Group(enum.Enum):
+    FRIENDSHIP_PACK = enum.auto()
+    COMMUNITY_REWARD = enum.auto()
+    TRASH_BEAR = enum.auto()
+    TRASH = enum.auto()
+    FOOTWEAR = enum.auto()
+    WEAPON = enum.auto()
+    WEAPON_GENERIC = enum.auto()
+    WEAPON_SWORD = enum.auto()
+    WEAPON_CLUB = enum.auto()
+    WEAPON_DAGGER = enum.auto()
+    WEAPON_SLINGSHOT = enum.auto()
+    PROGRESSIVE_TOOLS = enum.auto()
+    SKILL_LEVEL_UP = enum.auto()
+    SKILL_MASTERY = enum.auto()
+    BUILDING = enum.auto()
+    WIZARD_BUILDING = enum.auto()
+    DESERT_TRANSPORTATION = enum.auto()
+    ISLAND_TRANSPORTATION = enum.auto()
+    ARCADE_MACHINE_BUFFS = enum.auto()
+    BASE_RESOURCE = enum.auto()
+    WARP_TOTEM = enum.auto()
+    GEODE = enum.auto()
+    ORE = enum.auto()
+    FERTILIZER = enum.auto()
+    CROPSANITY = enum.auto()
+    FISHING_RESOURCE = enum.auto()
+    SEASON = enum.auto()
+    TRAVELING_MERCHANT_DAY = enum.auto()
+    MUSEUM = enum.auto()
+    FRIENDSANITY = enum.auto()
+    FESTIVAL = enum.auto()
+    RARECROW = enum.auto()
+    TRAP = enum.auto()
+    BONUS = enum.auto()
+    MAXIMUM_ONE = enum.auto()
+    AT_LEAST_TWO = enum.auto()
+    DEPRECATED = enum.auto()
+    SPECIAL_ORDER_BOARD = enum.auto()
+    SPECIAL_ORDER_QI = enum.auto()
+    BABY = enum.auto()
+    GINGER_ISLAND = enum.auto()
+    WALNUT_PURCHASE = enum.auto()
+    TV_CHANNEL = enum.auto()
+    QI_CRAFTING_RECIPE = enum.auto()
+    CHEFSANITY = enum.auto()
+    CHEFSANITY_STARTER = enum.auto()
+    CHEFSANITY_QOS = enum.auto()
+    CHEFSANITY_PURCHASE = enum.auto()
+    CHEFSANITY_FRIENDSHIP = enum.auto()
+    CHEFSANITY_SKILL = enum.auto()
+    CRAFTSANITY = enum.auto()
+    BOOK_POWER = enum.auto()
+    LOST_BOOK = enum.auto()
+    PLAYER_BUFF = enum.auto()
+    EASY_SECRET = enum.auto()
+    FISHING_SECRET = enum.auto()
+    SECRET_NOTES_SECRET = enum.auto()
+    MOVIESANITY = enum.auto()
+    TRINKET = enum.auto()
+    EATSANITY_ENZYME = enum.auto()
+    ENDGAME_LOCATION_ITEMS = enum.auto()
+    REQUIRES_FRIENDSANITY_MARRIAGE = enum.auto()
+    BOOKSELLER = enum.auto()
+
+    # Types of filler
+    FILLER_FARMING = enum.auto()
+    FILLER_FISHING = enum.auto()
+    FILLER_FRUIT_TREES = enum.auto()
+    FILLER_FOOD = enum.auto()
+    FILLER_BUFF_FOOD = enum.auto()
+    FILLER_CONSUMABLE = enum.auto()
+    FILLER_MACHINE = enum.auto()
+    FILLER_STORAGE = enum.auto()
+    FILLER_QUALITY_OF_LIFE = enum.auto()
+    FILLER_MATERIALS = enum.auto()
+    FILLER_CURRENCY = enum.auto()
+    FILLER_MONEY = enum.auto()
+    FILLER_HAT = enum.auto()
+    FILLER_DECORATION = enum.auto()
+    FILLER_RING = enum.auto()
+
+    # Mods
+    MAGIC_SPELL = enum.auto()
+    MOD_WARP = enum.auto()
+
+
+FILLER_GROUPS = [Group.FILLER_FARMING, Group.FILLER_FISHING, Group.FILLER_FRUIT_TREES, Group.FILLER_FOOD, Group.FILLER_BUFF_FOOD,
+                 Group.FILLER_CONSUMABLE, Group.FILLER_MACHINE, Group.FILLER_STORAGE, Group.FILLER_QUALITY_OF_LIFE, Group.FILLER_MATERIALS,
+                 Group.FILLER_CURRENCY, Group.FILLER_MONEY, Group.FILLER_HAT, Group.FILLER_DECORATION, Group.FILLER_RING, ]
+
+
+@dataclass(frozen=True)
+class ItemData:
+    code_without_offset: int | None
+    name: str
+    classification: ItemClassification
+    content_packs: frozenset[str] = frozenset()
+    """All the content packs required for this item to be available."""
+    groups: set[Group] = field(default_factory=frozenset)
+
+    def __post_init__(self):
+        if not isinstance(self.groups, frozenset):
+            super().__setattr__("groups", frozenset(self.groups))
+
+    @property
+    def code(self) -> int | None:
+        return ITEM_CODE_OFFSET + self.code_without_offset if self.code_without_offset is not None else None
+
+    def has_any_group(self, *group: Group) -> bool:
+        groups = set(group)
+        return bool(groups.intersection(self.groups))
+
+    def has_all_groups(self, *group: Group) -> bool:
+        groups = set(group)
+        return bool(groups.issubset(self.groups))
+
+    def has_limited_amount(self) -> bool:
+        return self.has_any_group(Group.MAXIMUM_ONE, Group.AT_LEAST_TWO)
+
+
+def load_item_csv():
+    from importlib.resources import files
+
+    items = []
+    with files(data).joinpath("items.csv").open() as file:
+        item_reader = csv.DictReader(file)
+        for item in item_reader:
+            item_id = int(item["id"]) if item["id"] else None
+            item_name = item["name"]
+            classification = reduce((lambda a, b: a | b), {ItemClassification[str_classification] for str_classification in item["classification"].split(",")})
+            csv_groups = [Group[group] for group in item["groups"].split(",") if group]
+            groups = set(csv_groups)
+            csv_content_packs = [cp for cp in item["content_packs"].split(",") if cp]
+            content_packs = frozenset(csv_content_packs)
+
+            assert len(csv_groups) == len(groups), f"Item '{item_name}' has duplicate groups: {csv_groups}"
+            assert len(csv_content_packs) == len(content_packs)
+
+            if Group.GINGER_ISLAND in groups:
+                content_packs |= {ginger_island_content_pack.name}
+
+            items.append(ItemData(item_id, item_name, classification, content_packs, groups))
+    return items
+
+
+events = [
+    ItemData(None, e, ItemClassification.progression)
+    for e in sorted(all_events)
+]
+
+all_items: list[ItemData] = load_item_csv() + events
+item_table: dict[str, ItemData] = {}
+items_by_group: dict[Group, list[ItemData]] = {}
+
+
+def initialize_groups():
+    for item in all_items:
+        for group in item.groups:
+            item_group = items_by_group.get(group, list())
+            item_group.append(item)
+            items_by_group[group] = item_group
+
+
+def initialize_item_table():
+    item_table.update({item.name: item for item in all_items})
+
+
+initialize_item_table()
+initialize_groups()
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index fa4d50ce79..613698ac1b 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -1,18 +1,24 @@
 import csv
 import enum
+import logging
 from dataclasses import dataclass
 from random import Random
-from typing import Optional, Dict, Protocol, List, FrozenSet, Iterable
+from typing import Optional, Dict, Protocol, List, Iterable
 
 from . import data
 from .bundles.bundle_room import BundleRoom
 from .content.game_content import StardewContent
+from .content.vanilla.ginger_island import ginger_island_content_pack
+from .content.vanilla.qi_board import qi_board_content_pack
 from .data.game_item import ItemTag
 from .data.museum_data import all_museum_items
 from .mods.mod_data import ModNames
-from .options import ExcludeGingerIsland, ArcadeMachineLocations, SpecialOrderLocations, Museumsanity, \
+from .options import ArcadeMachineLocations, SpecialOrderLocations, Museumsanity, \
     FestivalLocations, ElevatorProgression, BackpackProgression, FarmType
 from .options import StardewValleyOptions, Craftsanity, Chefsanity, Cooksanity, Shipsanity, Monstersanity
+from .options.options import BackpackSize, Moviesanity, Eatsanity, IncludeEndgameLocations, Friendsanity
+from .strings.ap_names.ap_option_names import WalnutsanityOptionName, SecretsanityOptionName, EatsanityOptionName, ChefsanityOptionName, StartWithoutOptionName
+from .strings.backpack_tiers import Backpack
 from .strings.goal_names import Goal
 from .strings.quest_names import ModQuest, Quest
 from .strings.region_names import Region, LogicRegion
@@ -20,10 +26,13 @@ from .strings.villager_names import NPC
 
 LOCATION_CODE_OFFSET = 717000
 
+logger = logging.getLogger(__name__)
+
 
 class LocationTags(enum.Enum):
     MANDATORY = enum.auto()
     BUNDLE = enum.auto()
+    TRASH_BEAR = enum.auto()
     COMMUNITY_CENTER_BUNDLE = enum.auto()
     CRAFTS_ROOM_BUNDLE = enum.auto()
     PANTRY_BUNDLE = enum.auto()
@@ -33,7 +42,10 @@ class LocationTags(enum.Enum):
     VAULT_BUNDLE = enum.auto()
     COMMUNITY_CENTER_ROOM = enum.auto()
     RACCOON_BUNDLES = enum.auto()
+    MEME_BUNDLE = enum.auto()
     BACKPACK = enum.auto()
+    BACKPACK_TIER = enum.auto()
+    SPLIT_BACKPACK = enum.auto()
     TOOL_UPGRADE = enum.auto()
     HOE_UPGRADE = enum.auto()
     PICKAXE_UPGRADE = enum.auto()
@@ -42,6 +54,7 @@ class LocationTags(enum.Enum):
     TRASH_CAN_UPGRADE = enum.auto()
     FISHING_ROD_UPGRADE = enum.auto()
     PAN_UPGRADE = enum.auto()
+    STARTING_TOOLS = enum.auto()
     THE_MINES_TREASURE = enum.auto()
     CROPSANITY = enum.auto()
     ELEVATOR = enum.auto()
@@ -67,6 +80,7 @@ class LocationTags(enum.Enum):
     FESTIVAL = enum.auto()
     FESTIVAL_HARD = enum.auto()
     DESERT_FESTIVAL_CHEF = enum.auto()
+    DESERT_FESTIVAL_CHEF_MEAL = enum.auto()
     SPECIAL_ORDER_BOARD = enum.auto()
     SPECIAL_ORDER_QI = enum.auto()
     REQUIRES_QI_ORDERS = enum.auto()
@@ -97,10 +111,42 @@ class LocationTags(enum.Enum):
     CHEFSANITY_SKILL = enum.auto()
     CHEFSANITY_STARTER = enum.auto()
     CRAFTSANITY = enum.auto()
+    CRAFTSANITY_CRAFT = enum.auto()
+    CRAFTSANITY_RECIPE = enum.auto()
     BOOKSANITY = enum.auto()
     BOOKSANITY_POWER = enum.auto()
     BOOKSANITY_SKILL = enum.auto()
     BOOKSANITY_LOST = enum.auto()
+    SECRETSANITY = enum.auto()
+    EASY_SECRET = enum.auto()
+    FISHING_SECRET = enum.auto()
+    DIFFICULT_SECRET = enum.auto()
+    SECRET_NOTE = enum.auto()
+    REPLACES_PREVIOUS_LOCATION = enum.auto()
+    ANY_MOVIE = enum.auto()
+    MOVIE = enum.auto()
+    MOVIE_SNACK = enum.auto()
+    HATSANITY = enum.auto()
+    HAT_EASY = enum.auto()
+    HAT_TAILORING = enum.auto()
+    HAT_MEDIUM = enum.auto()
+    HAT_DIFFICULT = enum.auto()
+    HAT_RNG = enum.auto()
+    HAT_NEAR_PERFECTION = enum.auto()
+    HAT_POST_PERFECTION = enum.auto()
+    HAT_IMPOSSIBLE = enum.auto()
+    EATSANITY = enum.auto()
+    EATSANITY_CROP = enum.auto()
+    EATSANITY_COOKING = enum.auto()
+    EATSANITY_FISH = enum.auto()
+    EATSANITY_ARTISAN = enum.auto()
+    EATSANITY_SHOP = enum.auto()
+    EATSANITY_POISONOUS = enum.auto()
+    ENDGAME_LOCATIONS = enum.auto()
+    REQUIRES_FRIENDSANITY = enum.auto()
+    REQUIRES_FRIENDSANITY_MARRIAGE = enum.auto()
+
+    BEACH_FARM = enum.auto()
     # Mods
     # Skill Mods
     LUCK_LEVEL = enum.auto()
@@ -115,14 +161,15 @@ class LocationTags(enum.Enum):
 
 @dataclass(frozen=True)
 class LocationData:
-    code_without_offset: Optional[int]
+    code_without_offset: int | None
     region: str
     name: str
-    mod_name: Optional[str] = None
-    tags: FrozenSet[LocationTags] = frozenset()
+    content_packs: frozenset[str] = frozenset()
+    """All the content packs required for this location to be active."""
+    tags: frozenset[LocationTags] = frozenset()
 
     @property
-    def code(self) -> Optional[int]:
+    def code(self) -> int | None:
         return LOCATION_CODE_OFFSET + self.code_without_offset if self.code_without_offset is not None else None
 
 
@@ -134,16 +181,28 @@ class StardewLocationCollector(Protocol):
 def load_location_csv() -> List[LocationData]:
     from importlib.resources import files
 
+    locations = []
     with files(data).joinpath("locations.csv").open() as file:
-        reader = csv.DictReader(file)
-        return [LocationData(int(location["id"]) if location["id"] else None,
-                             location["region"],
-                             location["name"],
-                             str(location["mod_name"]) if location["mod_name"] else None,
-                             frozenset(LocationTags[group]
-                                       for group in location["tags"].split(",")
-                                       if group))
-                for location in reader]
+        location_reader = csv.DictReader(file)
+        for location in location_reader:
+            location_id = int(location["id"]) if location["id"] else None
+            location_name = location["name"]
+            csv_tags = [LocationTags[tag] for tag in location["tags"].split(",") if tag]
+            tags = frozenset(csv_tags)
+            csv_content_packs = [cp for cp in location["content_packs"].split(",") if cp]
+            content_packs = frozenset(csv_content_packs)
+
+            assert len(csv_tags) == len(tags), f"Location '{location_name}' has duplicate tags: {csv_tags}"
+            assert len(csv_content_packs) == len(content_packs)
+
+            if LocationTags.GINGER_ISLAND in tags:
+                content_packs |= {ginger_island_content_pack.name}
+            if LocationTags.SPECIAL_ORDER_QI in tags or LocationTags.REQUIRES_QI_ORDERS in tags:
+                content_packs |= {qi_board_content_pack.name}
+
+            locations.append(LocationData(location_id, location["region"], location_name, content_packs, tags))
+
+    return locations
 
 
 events_locations = [
@@ -161,6 +220,8 @@ events_locations = [
     LocationData(None, Region.farm, Goal.craft_master),
     LocationData(None, LogicRegion.shipping, Goal.legend),
     LocationData(None, Region.farm, Goal.mystery_of_the_stardrops),
+    LocationData(None, Region.farm, Goal.mad_hatter),
+    LocationData(None, Region.farm, Goal.ultimate_foodie),
     LocationData(None, Region.farm, Goal.allsanity),
     LocationData(None, Region.qi_walnut_room, Goal.perfection),
 ]
@@ -296,10 +357,12 @@ def extend_hard_festival_locations(randomized_locations: List[LocationData], opt
 
 
 def extend_desert_festival_chef_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, random: Random):
-    festival_chef_locations = locations_by_tag[LocationTags.DESERT_FESTIVAL_CHEF]
-    number_to_add = 5 if options.festival_locations == FestivalLocations.option_easy else 10
-    locations_to_add = random.sample(festival_chef_locations, number_to_add)
-    randomized_locations.extend(locations_to_add)
+    if options.festival_locations == FestivalLocations.option_easy:
+        randomized_locations.append(location_table["Desert Chef"])
+    elif options.festival_locations == FestivalLocations.option_hard:
+        festival_chef_locations = locations_by_tag[LocationTags.DESERT_FESTIVAL_CHEF_MEAL]
+        location_to_add = random.choice(festival_chef_locations)
+        randomized_locations.append(location_to_add)
 
 
 def extend_special_order_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
@@ -307,16 +370,15 @@ def extend_special_order_locations(randomized_locations: List[LocationData], opt
         board_locations = filter_disabled_locations(options, content, locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD])
         randomized_locations.extend(board_locations)
 
-    include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false
-    if options.special_order_locations & SpecialOrderLocations.value_qi and include_island:
+    if content.is_enabled(qi_board_content_pack):
         include_arcade = options.arcade_machine_locations != ArcadeMachineLocations.option_disabled
         qi_orders = [location for location in locations_by_tag[LocationTags.SPECIAL_ORDER_QI] if
                      include_arcade or LocationTags.JUNIMO_KART not in location.tags]
         randomized_locations.extend(qi_orders)
 
 
-def extend_walnut_purchase_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
-    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def extend_walnut_purchase_locations(randomized_locations: List[LocationData], content: StardewContent):
+    if not content.is_enabled(ginger_island_content_pack):
         return
     randomized_locations.append(location_table["Repair Ticket Machine"])
     randomized_locations.append(location_table["Repair Boat Hull"])
@@ -332,14 +394,14 @@ def extend_mandatory_locations(randomized_locations: List[LocationData], options
     randomized_locations.extend(filtered_mandatory_locations)
 
 
-def extend_situational_quest_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_situational_quest_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.quest_locations.has_no_story_quests():
         return
-    if ModNames.distant_lands in options.mods:
-        if ModNames.alecto in options.mods:
-            randomized_locations.append(location_table[ModQuest.WitchOrder])
+    if ModNames.distant_lands in content.registered_packs:
+        if ModNames.alecto in content.registered_packs:
+            randomized_locations.append(location_table[f"Quest: {ModQuest.WitchOrder}"])
         else:
-            randomized_locations.append(location_table[ModQuest.CorruptedCropsTask])
+            randomized_locations.append(location_table[f"Quest: {ModQuest.CorruptedCropsTask}"])
 
 
 def extend_bundle_locations(randomized_locations: List[LocationData], bundle_rooms: List[BundleRoom]):
@@ -351,19 +413,35 @@ def extend_bundle_locations(randomized_locations: List[LocationData], bundle_roo
             randomized_locations.append(location_table[bundle.name])
 
 
-def extend_backpack_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_trash_bear_locations(randomized_locations: List[LocationData], trash_bear_requests: Dict[str, List[str]]):
+    for request_type in trash_bear_requests:
+        randomized_locations.append(location_table[f"Trash Bear {request_type}"])
+
+
+def extend_backpack_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.backpack_progression == BackpackProgression.option_vanilla:
         return
-    backpack_locations = [location for location in locations_by_tag[LocationTags.BACKPACK]]
-    filtered_backpack_locations = filter_modded_locations(options, backpack_locations)
+
+    no_start_backpack = StartWithoutOptionName.backpack in options.start_without
+    if options.backpack_size == BackpackSize.option_12:
+        backpack_locations = [location for location in locations_by_tag[LocationTags.BACKPACK_TIER] if no_start_backpack or LocationTags.STARTING_TOOLS not in location.tags]
+    else:
+        num_per_tier = options.backpack_size.count_per_tier()
+        backpack_tier_names = Backpack.get_purchasable_tiers(ModNames.big_backpack in content.registered_packs, no_start_backpack)
+        backpack_locations = []
+        for tier in backpack_tier_names:
+            for i in range(1, num_per_tier + 1):
+                backpack_locations.append(location_table[f"{tier} {i}"])
+
+    filtered_backpack_locations = filter_modded_locations(backpack_locations, content)
     randomized_locations.extend(filtered_backpack_locations)
 
 
-def extend_elevator_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_elevator_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.elevator_progression == ElevatorProgression.option_vanilla:
         return
     elevator_locations = [location for location in locations_by_tag[LocationTags.ELEVATOR]]
-    filtered_elevator_locations = filter_modded_locations(options, elevator_locations)
+    filtered_elevator_locations = filter_modded_locations(elevator_locations, content)
     randomized_locations.extend(filtered_elevator_locations)
 
 
@@ -396,14 +474,14 @@ def extend_shipsanity_locations(randomized_locations: List[LocationData], option
         randomized_locations.extend(filtered_ship_locations)
         return
     shipsanity_locations = set()
-    if shipsanity == Shipsanity.option_fish or shipsanity == Shipsanity.option_full_shipment_with_fish:
+    if shipsanity == Shipsanity.option_fish or shipsanity == Shipsanity.option_crops_and_fish or shipsanity == Shipsanity.option_full_shipment_with_fish:
         shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_FISH]})
-    if shipsanity == Shipsanity.option_crops:
+    if shipsanity == Shipsanity.option_crops or shipsanity == Shipsanity.option_crops_and_fish:
         shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_CROP]})
     if shipsanity == Shipsanity.option_full_shipment or shipsanity == Shipsanity.option_full_shipment_with_fish:
         shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_FULL_SHIPMENT]})
 
-    filtered_shipsanity_locations = filter_disabled_locations(options, content, list(shipsanity_locations))
+    filtered_shipsanity_locations = filter_disabled_locations(options, content, sorted(list(shipsanity_locations), key=lambda x: x.name))
     randomized_locations.extend(filtered_shipsanity_locations)
 
 
@@ -422,18 +500,18 @@ def extend_cooksanity_locations(randomized_locations: List[LocationData], option
 
 def extend_chefsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     chefsanity = options.chefsanity
-    if chefsanity == Chefsanity.option_none:
+    if chefsanity == Chefsanity.preset_none:
         return
 
     chefsanity_locations_by_name = {}  # Dictionary to not make duplicates
 
-    if chefsanity & Chefsanity.option_queen_of_sauce:
+    if ChefsanityOptionName.queen_of_sauce in chefsanity:
         chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_QOS]})
-    if chefsanity & Chefsanity.option_purchases:
+    if ChefsanityOptionName.purchases in chefsanity:
         chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_PURCHASE]})
-    if chefsanity & Chefsanity.option_friendship:
+    if ChefsanityOptionName.friendship in chefsanity:
         chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_FRIENDSHIP]})
-    if chefsanity & Chefsanity.option_skills:
+    if ChefsanityOptionName.skills in chefsanity:
         chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_SKILL]})
 
     filtered_chefsanity_locations = filter_disabled_locations(options, content, list(chefsanity_locations_by_name.values()))
@@ -468,18 +546,141 @@ def extend_walnutsanity_locations(randomized_locations: List[LocationData], opti
     if not options.walnutsanity:
         return
 
-    if "Puzzles" in options.walnutsanity:
+    if WalnutsanityOptionName.puzzles in options.walnutsanity:
         randomized_locations.extend(locations_by_tag[LocationTags.WALNUTSANITY_PUZZLE])
-    if "Bushes" in options.walnutsanity:
+    if WalnutsanityOptionName.bushes in options.walnutsanity:
         randomized_locations.extend(locations_by_tag[LocationTags.WALNUTSANITY_BUSH])
-    if "Dig Spots" in options.walnutsanity:
+    if WalnutsanityOptionName.dig_spots in options.walnutsanity:
         randomized_locations.extend(locations_by_tag[LocationTags.WALNUTSANITY_DIG])
-    if "Repeatables" in options.walnutsanity:
+    if WalnutsanityOptionName.repeatables in options.walnutsanity:
         randomized_locations.extend(locations_by_tag[LocationTags.WALNUTSANITY_REPEATABLE])
 
 
+def extend_movies_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
+    if options.moviesanity == Moviesanity.option_none:
+        return
+
+    locations = []
+    if options.moviesanity == Moviesanity.option_one:
+        locations.extend(locations_by_tag[LocationTags.ANY_MOVIE])
+    if options.moviesanity >= Moviesanity.option_all_movies:
+        locations.extend(locations_by_tag[LocationTags.MOVIE])
+    if options.moviesanity >= Moviesanity.option_all_movies_and_all_snacks:
+        locations.extend(locations_by_tag[LocationTags.MOVIE_SNACK])
+    filtered_locations = filter_disabled_locations(options, content, locations)
+    randomized_locations.extend(filtered_locations)
+
+
+def extend_secrets_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
+    if not options.secretsanity:
+        return
+
+    locations = []
+    if SecretsanityOptionName.easy in options.secretsanity:
+        locations.extend(locations_by_tag[LocationTags.EASY_SECRET])
+    if SecretsanityOptionName.fishing in options.secretsanity:
+        locations.extend(locations_by_tag[LocationTags.FISHING_SECRET])
+    if SecretsanityOptionName.difficult in options.secretsanity:
+        locations.extend(locations_by_tag[LocationTags.DIFFICULT_SECRET])
+    if SecretsanityOptionName.secret_notes in options.secretsanity:
+        locations.extend(locations_by_tag[LocationTags.SECRET_NOTE])
+        for location_dupe in locations_by_tag[LocationTags.REPLACES_PREVIOUS_LOCATION]:
+            second_part_of_name = location_dupe.name.split(":")[-1]
+            for location in randomized_locations:
+                second_part_of_dupe_name = location.name.split(":")[-1]
+                if second_part_of_name == second_part_of_dupe_name:
+                    randomized_locations.remove(location)
+    filtered_locations = filter_disabled_locations(options, content, locations)
+    randomized_locations.extend(filtered_locations)
+
+
+def extend_hats_locations(randomized_locations: List[LocationData], content: StardewContent):
+    hatsanity = content.features.hatsanity
+    if not hatsanity.is_enabled:
+        return
+
+    for hat in content.hats.values():
+        if not hatsanity.is_included(hat):
+            continue
+
+        randomized_locations.append(location_table[hatsanity.to_location_name(hat)])
+
+
+def eatsanity_item_is_included(location: LocationData, options: StardewValleyOptions, content: StardewContent) -> bool:
+    eat_prefix = "Eat "
+    drink_prefix = "Drink "
+    if location.name.startswith(eat_prefix):
+        item_name = location.name[len(eat_prefix):]
+    elif location.name.startswith(drink_prefix):
+        item_name = location.name[len(drink_prefix):]
+    else:
+        raise Exception(f"Eatsanity Location does not have a recognized prefix: '{location.name}'")
+
+    # if not item_name in content.game_items:
+    #     return False
+    if EatsanityOptionName.poisonous in options.eatsanity.value:
+        return True
+    if location in locations_by_tag[LocationTags.EATSANITY_POISONOUS]:
+        return False
+    return True
+
+
+def extend_eatsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
+    if options.eatsanity.value == Eatsanity.preset_none:
+        return
+
+    eatsanity_locations = []
+    if EatsanityOptionName.crops in options.eatsanity:
+        eatsanity_locations.extend(locations_by_tag[LocationTags.EATSANITY_CROP])
+    if EatsanityOptionName.cooking in options.eatsanity:
+        eatsanity_locations.extend(locations_by_tag[LocationTags.EATSANITY_COOKING])
+    if EatsanityOptionName.fish in options.eatsanity:
+        eatsanity_locations.extend(locations_by_tag[LocationTags.EATSANITY_FISH])
+    if EatsanityOptionName.artisan in options.eatsanity:
+        eatsanity_locations.extend(locations_by_tag[LocationTags.EATSANITY_ARTISAN])
+    if EatsanityOptionName.shop in options.eatsanity:
+        eatsanity_locations.extend(locations_by_tag[LocationTags.EATSANITY_SHOP])
+
+    eatsanity_locations = [location for location in eatsanity_locations if eatsanity_item_is_included(location, options, content)]
+    eatsanity_locations = filter_disabled_locations(options, content, eatsanity_locations)
+    randomized_locations.extend(eatsanity_locations)
+
+
+def extend_endgame_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
+    if options.include_endgame_locations.value == IncludeEndgameLocations.option_false:
+        return
+
+    has_friendsanity_marriage = options.friendsanity == Friendsanity.option_all_with_marriage
+    has_friendsanity = (not has_friendsanity_marriage) and options.friendsanity != Friendsanity.option_none
+
+    endgame_locations = []
+    endgame_locations.extend(locations_by_tag[LocationTags.ENDGAME_LOCATIONS])
+
+    endgame_locations = [location for location in endgame_locations if
+                         LocationTags.REQUIRES_FRIENDSANITY_MARRIAGE not in location.tags or has_friendsanity_marriage]
+    endgame_locations = [location for location in endgame_locations if LocationTags.REQUIRES_FRIENDSANITY not in location.tags or has_friendsanity]
+    endgame_locations = filter_disabled_locations(options, content, endgame_locations)
+    randomized_locations.extend(endgame_locations)
+
+
+def extend_filler_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
+    days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
+    i = 1
+    while len(randomized_locations) < 90:
+        location_name = f"Traveling Merchant Sunday Item {i}"
+        while any(location.name == location_name for location in randomized_locations):
+            i += 1
+            location_name = f"Traveling Merchant Sunday Item {i}"
+        logger.debug(f"Player too few locations, adding Traveling Merchant Items #{i}")
+        for day in days:
+            location_name = f"Traveling Merchant {day} Item {i}"
+            randomized_locations.append(location_table[location_name])
+
+
+
 def create_locations(location_collector: StardewLocationCollector,
                      bundle_rooms: List[BundleRoom],
+                     trash_bear_requests: Dict[str, List[str]],
                      options: StardewValleyOptions,
                      content: StardewContent,
                      random: Random):
@@ -487,12 +688,13 @@ def create_locations(location_collector: StardewLocationCollector,
 
     extend_mandatory_locations(randomized_locations, options, content)
     extend_bundle_locations(randomized_locations, bundle_rooms)
-    extend_backpack_locations(randomized_locations, options)
+    extend_trash_bear_locations(randomized_locations, trash_bear_requests)
+    extend_backpack_locations(randomized_locations, options, content)
 
     if content.features.tool_progression.is_progressive:
         randomized_locations.extend(locations_by_tag[LocationTags.TOOL_UPGRADE])
 
-    extend_elevator_locations(randomized_locations, options)
+    extend_elevator_locations(randomized_locations, options, content)
 
     skill_progression = content.features.skill_progression
     if skill_progression.is_progressive:
@@ -516,7 +718,7 @@ def create_locations(location_collector: StardewLocationCollector,
 
     extend_festival_locations(randomized_locations, options, random)
     extend_special_order_locations(randomized_locations, options, content)
-    extend_walnut_purchase_locations(randomized_locations, options)
+    extend_walnut_purchase_locations(randomized_locations, content)
 
     extend_monstersanity_locations(randomized_locations, options, content)
     extend_shipsanity_locations(randomized_locations, options, content)
@@ -526,9 +728,16 @@ def create_locations(location_collector: StardewLocationCollector,
     extend_quests_locations(randomized_locations, options, content)
     extend_book_locations(randomized_locations, content)
     extend_walnutsanity_locations(randomized_locations, options)
+    extend_movies_locations(randomized_locations, options, content)
+    extend_secrets_locations(randomized_locations, options, content)
+    extend_hats_locations(randomized_locations, content)
+    extend_eatsanity_locations(randomized_locations, options, content)
+    extend_endgame_locations(randomized_locations, options, content)
 
     # Mods
-    extend_situational_quest_locations(randomized_locations, options)
+    extend_situational_quest_locations(randomized_locations, options, content)
+
+    extend_filler_locations(randomized_locations, options, content)
 
     for location_data in randomized_locations:
         location_collector(location_data.name, location_data.code, location_data.region)
@@ -538,21 +747,34 @@ def filter_deprecated_locations(locations: Iterable[LocationData]) -> Iterable[L
     return [location for location in locations if LocationTags.DEPRECATED not in location.tags]
 
 
-def filter_farm_type(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+def filter_animals_quest(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
     # On Meadowlands, "Feeding Animals" replaces "Raising Animals"
     if options.farm_type == FarmType.option_meadowlands:
-        return (location for location in locations if location.name != Quest.raising_animals)
+        return (location for location in locations if location.name != f"Quest: {Quest.raising_animals}")
     else:
-        return (location for location in locations if location.name != Quest.feeding_animals)
+        return (location for location in locations if location.name != f"Quest: {Quest.feeding_animals}")
 
 
-def filter_ginger_island(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
-    include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false
+def filter_farm_exclusives(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    # Some locations are only on specific farms
+    if options.farm_type != FarmType.option_beach:
+        return (location for location in locations if LocationTags.BEACH_FARM not in location.tags)
+    return locations
+
+
+def filter_farm_type(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    animals_filter = filter_animals_quest(options, locations)
+    exclusives_filter = filter_farm_exclusives(options, animals_filter)
+    return exclusives_filter
+
+
+def filter_ginger_island(content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    include_island = content.is_enabled(ginger_island_content_pack)
     return (location for location in locations if include_island or LocationTags.GINGER_ISLAND not in location.tags)
 
 
-def filter_qi_order_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
-    include_qi_orders = options.special_order_locations & SpecialOrderLocations.value_qi
+def filter_qi_order_locations(content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    include_qi_orders = content.is_enabled(qi_board_content_pack)
     return (location for location in locations if include_qi_orders or LocationTags.REQUIRES_QI_ORDERS not in location.tags)
 
 
@@ -563,15 +785,15 @@ def filter_masteries_locations(content: StardewContent, locations: Iterable[Loca
     return (location for location in locations if LocationTags.REQUIRES_MASTERIES not in location.tags)
 
 
-def filter_modded_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
-    return (location for location in locations if location.mod_name is None or location.mod_name in options.mods)
+def filter_modded_locations(locations: Iterable[LocationData], content: StardewContent) -> Iterable[LocationData]:
+    return (location for location in locations if content.are_all_enabled(location.content_packs))
 
 
 def filter_disabled_locations(options: StardewValleyOptions, content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
     locations_deprecated_filter = filter_deprecated_locations(locations)
     locations_farm_filter = filter_farm_type(options, locations_deprecated_filter)
-    locations_island_filter = filter_ginger_island(options, locations_farm_filter)
-    locations_qi_filter = filter_qi_order_locations(options, locations_island_filter)
+    locations_island_filter = filter_ginger_island(content, locations_farm_filter)
+    locations_qi_filter = filter_qi_order_locations(content, locations_island_filter)
     locations_masteries_filter = filter_masteries_locations(content, locations_qi_filter)
-    locations_mod_filter = filter_modded_locations(options, locations_masteries_filter)
+    locations_mod_filter = filter_modded_locations(locations_masteries_filter, content)
     return locations_mod_filter
diff --git a/worlds/stardew_valley/logic/ability_logic.py b/worlds/stardew_valley/logic/ability_logic.py
index 52dbd5abaf..51c49c144a 100644
--- a/worlds/stardew_valley/logic/ability_logic.py
+++ b/worlds/stardew_valley/logic/ability_logic.py
@@ -1,8 +1,10 @@
 from .base_logic import BaseLogicMixin, BaseLogic
-from ..stardew_rule import StardewRule
+from ..options import FarmType
+from ..stardew_rule import StardewRule, False_, True_
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
 from ..strings.region_names import Region
 from ..strings.skill_names import Skill, ModSkill
-from ..strings.tool_names import ToolMaterial, Tool
+from ..strings.tool_names import ToolMaterial, Tool, FishingRod
 
 
 class AbilityLogicMixin(BaseLogicMixin):
@@ -12,6 +14,13 @@ class AbilityLogicMixin(BaseLogicMixin):
 
 
 class AbilityLogic(BaseLogic):
+
+    def can_mine_stone(self) -> StardewRule:
+        can_reach_any_mining_region = self.logic.region.can_reach_any(Region.mines, Region.skull_cavern, Region.volcano, Region.quarry_mine)
+        if self.options.farm_type in [FarmType.option_hill_top, FarmType.option_four_corners]:
+            can_reach_any_mining_region = can_reach_any_mining_region | self.logic.region.can_reach(Region.farm)
+        return self.logic.tool.has_tool(Tool.pickaxe) & can_reach_any_mining_region
+
     def can_mine_perfectly(self) -> StardewRule:
         return self.logic.mine.can_progress_in_the_mines_from_floor(160)
 
@@ -20,15 +29,17 @@ class AbilityLogic(BaseLogic):
                 self.logic.region.can_reach(Region.skull_cavern))
 
     def can_farm_perfectly(self) -> StardewRule:
-        tool_rule = self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iridium) & self.logic.tool.can_water(4)
+        tool_rule = self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iridium) & self.logic.tool.can_water(5)
         return tool_rule & self.logic.skill.has_farming_level(10)
 
     def can_fish_perfectly(self) -> StardewRule:
         skill_rule = self.logic.skill.has_level(Skill.fishing, 10)
-        return skill_rule & self.logic.tool.has_fishing_rod(4)
+        return skill_rule & self.logic.tool.has_fishing_rod(FishingRod.iridium)
 
     def can_chop_trees(self) -> StardewRule:
-        return self.logic.tool.has_tool(Tool.axe) & self.logic.region.can_reach(Region.forest)
+        can_reach_any_tree_region = self.logic.region.can_reach_any(Region.forest, Region.backwoods, Region.bus_stop, Region.mountain, Region.desert,
+                                                                    Region.island_west, Region.island_north)
+        return self.logic.tool.has_tool(Tool.axe) & can_reach_any_tree_region
 
     def can_chop_perfectly(self) -> StardewRule:
         magic_rule = (self.logic.magic.can_use_clear_debris_instead_of_tool_level(3)) & self.logic.mod.skill.has_mod_level(ModSkill.magic, 10)
@@ -36,3 +47,20 @@ class AbilityLogic(BaseLogic):
         foraging_rule = self.logic.skill.has_level(Skill.foraging, 10)
         region_rule = self.logic.region.can_reach(Region.forest)
         return region_rule & ((tool_rule & foraging_rule) | magic_rule)
+
+    def can_scythe_vines(self) -> StardewRule:
+        can_reach_any_vine_region = self.logic.region.can_reach_any(Region.forest, Region.railroad)
+        return self.logic.tool.has_scythe() & can_reach_any_vine_region & self.logic.season.has_any_not_winter()
+
+    def can_chair_skip(self) -> StardewRule:
+        if CustomLogicOptionName.chair_skips not in self.options.custom_logic:
+            return False_()
+
+        if CustomLogicOptionName.critical_free_samples in self.options.custom_logic:
+            if self.options.farm_type == FarmType.option_standard or \
+                    self.options.farm_type == FarmType.option_riverland or \
+                    self.options.farm_type == FarmType.option_forest or \
+                    self.options.farm_type == FarmType.option_beach:
+                return True_()
+
+        return self.logic.money.can_spend_at(Region.carpenter, 350)
diff --git a/worlds/stardew_valley/logic/action_logic.py b/worlds/stardew_valley/logic/action_logic.py
index 64cb18c001..711ffd2b58 100644
--- a/worlds/stardew_valley/logic/action_logic.py
+++ b/worlds/stardew_valley/logic/action_logic.py
@@ -3,8 +3,10 @@ from .base_logic import BaseLogic, BaseLogicMixin
 from ..stardew_rule import StardewRule, True_
 from ..strings.generic_names import Generic
 from ..strings.geode_names import Geode
+from ..strings.metal_names import Mineral
 from ..strings.region_names import Region
-from ..strings.tool_names import Tool
+from ..strings.season_names import Season
+from ..strings.tv_channel_names import Channel
 
 
 class ActionLogicMixin(BaseLogicMixin):
@@ -19,10 +21,13 @@ class ActionLogic(BaseLogic):
         tv_rule = True_()
         if channel is None:
             return tv_rule
+        if channel == Channel.sinister_signal:
+            sacrifice_rule = self.logic.relationship.has_children(1) & self.logic.region.can_reach(Region.witch_hut) & self.logic.has(Mineral.prismatic_shard)
+            return self.logic.received(channel) & tv_rule & sacrifice_rule & self.logic.season.has(Season.fall)
         return self.logic.received(channel) & tv_rule
 
     def can_pan_at(self, region: str, material: str) -> StardewRule:
-        return self.logic.region.can_reach(region) & self.logic.tool.has_tool(Tool.pan, material)
+        return self.logic.region.can_reach(region) & self.logic.tool.has_pan(material)
 
     @cache_self1
     def can_open_geode(self, geode: str) -> StardewRule:
@@ -31,3 +36,6 @@ class ActionLogic(BaseLogic):
         if geode == Generic.any:
             return blacksmith_access & self.logic.or_(*(self.logic.has(geode_type) for geode_type in geodes))
         return blacksmith_access & self.logic.has(geode)
+
+    def can_speak_junimo(self) -> StardewRule:
+        return self.logic.received("Forest Magic")
diff --git a/worlds/stardew_valley/logic/animal_logic.py b/worlds/stardew_valley/logic/animal_logic.py
index 701cdeb1aa..57b54c26d4 100644
--- a/worlds/stardew_valley/logic/animal_logic.py
+++ b/worlds/stardew_valley/logic/animal_logic.py
@@ -1,5 +1,3 @@
-import typing
-
 from .base_logic import BaseLogicMixin, BaseLogic
 from ..stardew_rule import StardewRule
 from ..strings.building_names import Building
diff --git a/worlds/stardew_valley/logic/artisan_logic.py b/worlds/stardew_valley/logic/artisan_logic.py
index 93c45530af..8748f1a16c 100644
--- a/worlds/stardew_valley/logic/artisan_logic.py
+++ b/worlds/stardew_valley/logic/artisan_logic.py
@@ -2,9 +2,12 @@ from .base_logic import BaseLogic, BaseLogicMixin
 from ..data.artisan import MachineSource
 from ..data.game_item import ItemTag
 from ..stardew_rule import StardewRule
+from ..strings.animal_product_names import AnimalProduct
 from ..strings.artisan_good_names import ArtisanGood
+from ..strings.building_names import Building
 from ..strings.crop_names import Vegetable, Fruit
 from ..strings.fish_names import Fish, all_fish
+from ..strings.flower_names import all_flowers
 from ..strings.forageable_names import Mushroom
 from ..strings.generic_names import Generic
 from ..strings.machine_names import Machine
@@ -21,6 +24,9 @@ class ArtisanLogic(BaseLogic):
         # TODO remove this one too once fish are converted to sources
         self.registry.artisan_good_rules.update({ArtisanGood.specific_smoked_fish(fish): self.can_smoke(fish) for fish in all_fish})
         self.registry.artisan_good_rules.update({ArtisanGood.specific_bait(fish): self.can_bait(fish) for fish in all_fish})
+        self.registry.artisan_good_rules.update({AnimalProduct.specific_roe(fish): self.can_get_roe(fish) for fish in all_fish})
+        self.registry.artisan_good_rules.update({ArtisanGood.specific_aged_roe(fish): self.can_preserves_jar(AnimalProduct.specific_roe(fish)) for fish in all_fish})
+        self.registry.artisan_good_rules.update({ArtisanGood.specific_honey(flower): self.can_get_honey(flower) for flower in all_flowers})
 
     def has_jelly(self) -> StardewRule:
         return self.logic.artisan.can_preserves_jar(Fruit.any)
@@ -73,6 +79,10 @@ class ArtisanLogic(BaseLogic):
         machine_rule = self.logic.has(Machine.fish_smoker)
         return machine_rule & self.logic.has(item)
 
+    def can_get_roe(self, item: str) -> StardewRule:
+        machine_rule = self.logic.building.has_building(Building.fish_pond)
+        return machine_rule & self.logic.has(item)
+
     def can_bait(self, item: str) -> StardewRule:
         machine_rule = self.logic.has(Machine.bait_maker)
         return machine_rule & self.logic.has(item)
@@ -87,3 +97,11 @@ class ArtisanLogic(BaseLogic):
         if item == Mushroom.any_edible:
             return machine_rule & self.logic.has_any(*(mushroom.name for mushroom in self.content.find_tagged_items(ItemTag.EDIBLE_MUSHROOM)))
         return machine_rule & self.logic.has(item)
+
+    def can_get_honey(self, flower: str) -> StardewRule:
+        machine_rule = self.logic.has(Machine.bee_house)
+        flower_rule = self.logic.has(flower)
+        return machine_rule & flower_rule
+
+    def can_replicate_gem(self, gem: str) -> StardewRule:
+        return self.logic.has(Machine.crystalarium) & self.logic.has(gem)
diff --git a/worlds/stardew_valley/logic/base_logic.py b/worlds/stardew_valley/logic/base_logic.py
index dce1c328a7..735893c4c3 100644
--- a/worlds/stardew_valley/logic/base_logic.py
+++ b/worlds/stardew_valley/logic/base_logic.py
@@ -25,6 +25,8 @@ class LogicRegistry:
         self.festival_rules: Dict[str, StardewRule] = {}
         self.quest_rules: Dict[str, StardewRule] = {}
         self.special_order_rules: Dict[str, StardewRule] = {}
+        self.meme_item_rules: Dict[str, StardewRule] = {}
+        self.shirt_rules: Dict[str, StardewRule] = {}
 
         self.sve_location_rules: Dict[str, StardewRule] = {}
 
diff --git a/worlds/stardew_valley/logic/building_logic.py b/worlds/stardew_valley/logic/building_logic.py
index 0d96f216e0..c896ffa046 100644
--- a/worlds/stardew_valley/logic/building_logic.py
+++ b/worlds/stardew_valley/logic/building_logic.py
@@ -2,8 +2,13 @@ from functools import cached_property
 
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
-from ..stardew_rule import StardewRule, true_
-from ..strings.building_names import Building
+from ..stardew_rule import StardewRule, true_, false_
+from ..strings.building_names import Building, WizardBuilding
+from ..strings.crop_names import Fruit
+from ..strings.fish_names import Fish, WaterItem
+from ..strings.forageable_names import Forageable
+from ..strings.material_names import Material
+from ..strings.metal_names import MetalBar, Mineral
 from ..strings.region_names import Region
 
 AUTO_BUILDING_BUILDINGS = {Building.shipping_bin, Building.pet_bowl, Building.farm_house}
@@ -41,12 +46,33 @@ class BuildingLogic(BaseLogic):
 
         # Those buildings are special. The mod auto-builds them when received, no need to go to Robin.
         if building_name in AUTO_BUILDING_BUILDINGS:
-            return self.logic.received(Building.shipping_bin)
+            return self.logic.received(building_name)
 
         carpenter_rule = self.logic.building.can_construct_buildings
         item, count = building_progression.to_progressive_item(building_name)
         return self.logic.received(item, count) & carpenter_rule
 
+    @cache_self1
+    def has_wizard_building(self, building_name: str) -> StardewRule:
+        return self.logic.region.can_reach(Region.wizard_tower) & self.logic.received(building_name)
+
     @cached_property
     def can_construct_buildings(self) -> StardewRule:
         return self.logic.region.can_reach(Region.carpenter)
+
+    def can_purchase_wizard_blueprint(self, building_name: str) -> StardewRule:
+        # This rule is part of the region, so not needed here
+        # rule = self.logic.region.can_reach(Region.wizard_tower) & self.logic.quest.has_magic_ink()
+        if building_name == WizardBuilding.earth_obelisk:
+            return self.logic.money.can_spend(500_000) & self.logic.has_all(MetalBar.iridium, Mineral.earth_crystal)
+        if building_name == WizardBuilding.water_obelisk:
+            return self.logic.money.can_spend(500_000) & self.logic.has_all(MetalBar.iridium, Fish.clam, WaterItem.coral)
+        if building_name == WizardBuilding.desert_obelisk:
+            return self.logic.money.can_spend(1_000_000) & self.logic.has_all(MetalBar.iridium, Forageable.coconut, Forageable.cactus_fruit)
+        if building_name == WizardBuilding.island_obelisk:
+            return self.logic.money.can_spend(1_000_000) & self.logic.has_all(MetalBar.iridium, Forageable.dragon_tooth, Fruit.banana)
+        if building_name == WizardBuilding.junimo_hut:
+            return self.logic.money.can_spend(20_000) & self.logic.has_all(MetalBar.iridium, Material.stone, Fruit.starfruit, Material.fiber)
+        if building_name == WizardBuilding.gold_clock:
+            return self.logic.money.can_spend(10_000_000)
+        return false_
diff --git a/worlds/stardew_valley/logic/bundle_logic.py b/worlds/stardew_valley/logic/bundle_logic.py
index 9af91c731c..856308b73a 100644
--- a/worlds/stardew_valley/logic/bundle_logic.py
+++ b/worlds/stardew_valley/logic/bundle_logic.py
@@ -5,6 +5,8 @@ from .base_logic import BaseLogicMixin, BaseLogic
 from ..bundles.bundle import Bundle
 from ..stardew_rule import StardewRule, True_
 from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
+from ..strings.building_names import Building
+from ..strings.bundle_names import MemeBundleName
 from ..strings.currency_names import Currency
 from ..strings.machine_names import Machine
 from ..strings.quality_names import CropQuality, ForageQuality, FishQuality, ArtisanQuality
@@ -24,19 +26,31 @@ class BundleLogic(BaseLogic):
         item_rules = []
         qualities = []
         time_to_grind = 0
-        can_speak_junimo = self.logic.region.can_reach(Region.wizard_tower)
+        building_rule = self.logic.true_
+        can_speak_junimo = self.logic.action.can_speak_junimo()
+        number_items_required = bundle.number_required
         for bundle_item in bundle.items:
-            if Currency.is_currency(bundle_item.get_item()):
-                return can_speak_junimo & self.logic.money.can_trade(bundle_item.get_item(), bundle_item.amount)
-
-            item_rules.append(bundle_item.get_item())
+            item = bundle_item.get_item()
+            if Currency.is_currency(item):
+                return can_speak_junimo & self.logic.money.can_trade(item, bundle_item.amount)
+            if item == Building.well:
+                building_rule = self.logic.building.has_building(item)
+                number_items_required -= 1
+            else:
+                item_rules.append(item)
             if bundle_item.amount > 50:
                 time_to_grind = bundle_item.amount // 50
             qualities.append(bundle_item.quality)
         quality_rules = self.get_quality_rules(qualities)
-        item_rules = self.logic.has_n(*item_rules, count=bundle.number_required)
+        item_rules = self.logic.has_n(*item_rules, count=number_items_required)
         time_rule = self.logic.time.has_lived_months(time_to_grind)
-        return can_speak_junimo & item_rules & quality_rules & time_rule
+        special_rule = self.get_special_bundle_requirement(bundle)
+        return can_speak_junimo & item_rules & quality_rules & time_rule & building_rule & special_rule
+
+    def get_special_bundle_requirement(self, bundle: Bundle) -> StardewRule:
+        if bundle.name == MemeBundleName.pomnut:
+            return self.logic.building.has_building(Building.stable)
+        return self.logic.true_
 
     def get_quality_rules(self, qualities: List[str]) -> StardewRule:
         crop_quality = CropQuality.get_highest(qualities)
@@ -72,3 +86,8 @@ class BundleLogic(BaseLogic):
         # 1 - Break the tree
         # 2 - Build the house, which summons the bundle racoon. This one is done manually if quests are turned off
         return self.logic.received(CommunityUpgrade.raccoon, 2)
+
+    def can_feed_trash_bear(self, *items: str) -> StardewRule:
+        return (self.logic.received("Trash Bear Arrival") &
+                self.logic.region.can_reach(Region.forest) &
+                self.logic.has_all(*items))
diff --git a/worlds/stardew_valley/logic/combat_logic.py b/worlds/stardew_valley/logic/combat_logic.py
index 14e8978de2..eb964437e3 100644
--- a/worlds/stardew_valley/logic/combat_logic.py
+++ b/worlds/stardew_valley/logic/combat_logic.py
@@ -2,9 +2,13 @@ from functools import cached_property
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
+from ..options import Monstersanity
 from ..stardew_rule import StardewRule, False_
 from ..strings.ap_names.ap_weapon_names import APWeapon
+from ..strings.ap_names.event_names import Event
+from ..strings.boot_names import tier_by_boots
 from ..strings.performance_names import Performance
+from ..strings.region_names import Region
 
 valid_weapons = (APWeapon.weapon, APWeapon.sword, APWeapon.club, APWeapon.dagger)
 
@@ -34,24 +38,31 @@ class CombatLogic(BaseLogic):
 
     @cached_property
     def has_any_weapon(self) -> StardewRule:
-        return self.logic.received_any(*valid_weapons)
+        return self.logic.received(Event.received_progressive_weapon)
 
     @cached_property
     def has_decent_weapon(self) -> StardewRule:
-        return self.logic.or_(*(self.logic.received(weapon, 2) for weapon in valid_weapons))
+        return self.logic.received(Event.received_progressive_weapon, 2)
 
     @cached_property
     def has_good_weapon(self) -> StardewRule:
-        return self.logic.or_(*(self.logic.received(weapon, 3) for weapon in valid_weapons))
+        return self.logic.received(Event.received_progressive_weapon, 3)
 
     @cached_property
     def has_great_weapon(self) -> StardewRule:
-        return self.logic.or_(*(self.logic.received(weapon, 4) for weapon in valid_weapons))
+        return self.logic.received(Event.received_progressive_weapon, 4)
 
     @cached_property
     def has_galaxy_weapon(self) -> StardewRule:
-        return self.logic.or_(*(self.logic.received(weapon, 5) for weapon in valid_weapons))
+        return self.logic.received(Event.received_progressive_weapon, 5)
 
     @cached_property
     def has_slingshot(self) -> StardewRule:
         return self.logic.received(APWeapon.slingshot)
+
+    @cache_self1
+    def has_specific_boots(self, boots: str) -> StardewRule:
+        tier = tier_by_boots[boots]
+        if tier >= 4 and self.options.monstersanity == Monstersanity.option_none:
+            tier = 3  # no tier 4 boots in the pool, instead tier 4 boots can be purchased after tier 3 is received
+        return self.logic.received(APWeapon.footwear, tier) & self.logic.region.can_reach(Region.adventurer_guild)
diff --git a/worlds/stardew_valley/logic/cooking_logic.py b/worlds/stardew_valley/logic/cooking_logic.py
index 0959b90a8f..1d4e6779a8 100644
--- a/worlds/stardew_valley/logic/cooking_logic.py
+++ b/worlds/stardew_valley/logic/cooking_logic.py
@@ -3,13 +3,14 @@ from functools import cached_property
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
 from ..data.recipe_data import RecipeSource, StarterSource, ShopSource, SkillSource, FriendshipSource, \
-    QueenOfSauceSource, CookingRecipe, ShopFriendshipSource
+    QueenOfSauceSource, CookingRecipe, ShopFriendshipSource, all_cooking_recipes
 from ..data.recipe_source import CutsceneSource, ShopTradeSource
 from ..options import Chefsanity
 from ..stardew_rule import StardewRule, True_, False_
+from ..strings.ap_names.ap_option_names import ChefsanityOptionName
 from ..strings.building_names import Building
+from ..strings.craftable_names import Craftable
 from ..strings.region_names import LogicRegion
-from ..strings.skill_names import Skill
 from ..strings.tv_channel_names import Channel
 
 
@@ -22,13 +23,15 @@ class CookingLogicMixin(BaseLogicMixin):
 class CookingLogic(BaseLogic):
     @cached_property
     def can_cook_in_kitchen(self) -> StardewRule:
-        return self.logic.building.has_building(Building.kitchen) | self.logic.skill.has_level(Skill.foraging, 9)
+        return self.logic.building.has_building(Building.kitchen) | self.logic.has(Craftable.cookout_kit)
 
     # Should be cached
-    def can_cook(self, recipe: CookingRecipe = None) -> StardewRule:
+    def can_cook(self, recipe: CookingRecipe | str = None) -> StardewRule:
         cook_rule = self.logic.region.can_reach(LogicRegion.kitchen)
         if recipe is None:
             return cook_rule
+        if isinstance(recipe, str):
+            recipe = next(filter(lambda x: x.meal == recipe, all_cooking_recipes))
 
         recipe_rule = self.logic.cooking.knows_recipe(recipe.source, recipe.meal)
         ingredients_rule = self.logic.has_all(*sorted(recipe.ingredients))
@@ -36,23 +39,23 @@ class CookingLogic(BaseLogic):
 
     # Should be cached
     def knows_recipe(self, source: RecipeSource, meal_name: str) -> StardewRule:
-        if self.options.chefsanity == Chefsanity.option_none:
+        if self.options.chefsanity == Chefsanity.preset_none:
             return self.logic.cooking.can_learn_recipe(source)
         if isinstance(source, StarterSource):
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, ShopTradeSource) and self.options.chefsanity & Chefsanity.option_purchases:
+        if isinstance(source, ShopTradeSource) and ChefsanityOptionName.purchases in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, ShopSource) and self.options.chefsanity & Chefsanity.option_purchases:
+        if isinstance(source, ShopSource) and ChefsanityOptionName.purchases in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, SkillSource) and self.options.chefsanity & Chefsanity.option_skills:
+        if isinstance(source, SkillSource) and ChefsanityOptionName.skills in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, CutsceneSource) and self.options.chefsanity & Chefsanity.option_friendship:
+        if isinstance(source, CutsceneSource) and ChefsanityOptionName.friendship in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, FriendshipSource) and self.options.chefsanity & Chefsanity.option_friendship:
+        if isinstance(source, FriendshipSource) and ChefsanityOptionName.friendship in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, QueenOfSauceSource) and self.options.chefsanity & Chefsanity.option_queen_of_sauce:
+        if isinstance(source, QueenOfSauceSource) and ChefsanityOptionName.queen_of_sauce in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
-        if isinstance(source, ShopFriendshipSource) and self.options.chefsanity & Chefsanity.option_purchases:
+        if isinstance(source, ShopFriendshipSource) and ChefsanityOptionName.purchases in self.options.chefsanity:
             return self.logic.cooking.received_recipe(meal_name)
         return self.logic.cooking.can_learn_recipe(source)
 
@@ -79,3 +82,14 @@ class CookingLogic(BaseLogic):
     @cache_self1
     def received_recipe(self, meal_name: str):
         return self.logic.received(f"{meal_name} Recipe")
+
+    def can_have_cooked_recipes(self, number: int) -> StardewRule:
+        if number <= 0:
+            return self.logic.true_
+        recipe_rules = []
+        for recipe in all_cooking_recipes:
+            if recipe.content_pack and not self.content.is_enabled(recipe.content_pack):
+                continue
+            recipe_rules.append(self.can_cook(recipe))
+        number = min(len(recipe_rules), number)
+        return self.logic.count(number, *recipe_rules)
diff --git a/worlds/stardew_valley/logic/crafting_logic.py b/worlds/stardew_valley/logic/crafting_logic.py
index 01dfc5173c..7b9059b573 100644
--- a/worlds/stardew_valley/logic/crafting_logic.py
+++ b/worlds/stardew_valley/logic/crafting_logic.py
@@ -1,9 +1,9 @@
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
 from .. import options
-from ..data.craftable_data import CraftingRecipe
+from ..data.craftable_data import CraftingRecipe, all_crafting_recipes, all_crafting_recipes_by_name
 from ..data.recipe_source import CutsceneSource, ShopTradeSource, ArchipelagoSource, LogicSource, SpecialOrderSource, \
-    FestivalShopSource, QuestSource, StarterSource, ShopSource, SkillSource, MasterySource, FriendshipSource, SkillCraftsanitySource
+    FestivalShopSource, QuestSource, StarterSource, ShopSource, SkillSource, MasterySource, FriendshipSource, SkillCraftsanitySource, ShopWithKnownRecipeSource
 from ..options import Craftsanity, SpecialOrderLocations
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.region_names import Region
@@ -55,6 +55,8 @@ class CraftingLogic(BaseLogic):
             return self.logic.received_all(*recipe.source.ap_item)
         if isinstance(recipe.source, ShopTradeSource):
             return self.logic.money.can_trade_at(recipe.source.region, recipe.source.currency, recipe.source.price)
+        if isinstance(recipe.source, ShopWithKnownRecipeSource):
+            return self.knows_recipe(all_crafting_recipes_by_name[recipe.source.recipe_required]) & self.logic.money.can_spend_at(recipe.source.region, recipe.source.price)
         if isinstance(recipe.source, ShopSource):
             return self.logic.money.can_spend_at(recipe.source.region, recipe.source.price)
         if isinstance(recipe.source, SkillCraftsanitySource):
@@ -83,3 +85,14 @@ class CraftingLogic(BaseLogic):
     @cache_self1
     def received_recipe(self, item_name: str):
         return self.logic.received(f"{item_name} Recipe")
+
+    def can_have_crafted_recipes(self, number: int) -> StardewRule:
+        if number <= 0:
+            return self.logic.true_
+        recipe_rules = []
+        for recipe in all_crafting_recipes:
+            if recipe.content_pack is not None and not self.content.are_all_enabled(recipe.content_pack):
+                continue
+            recipe_rules.append(self.can_craft(recipe))
+        number = min(len(recipe_rules), number)
+        return self.logic.count(number, *recipe_rules)
diff --git a/worlds/stardew_valley/logic/farming_logic.py b/worlds/stardew_valley/logic/farming_logic.py
index 54c8c8af20..e0f5f34ccd 100644
--- a/worlds/stardew_valley/logic/farming_logic.py
+++ b/worlds/stardew_valley/logic/farming_logic.py
@@ -3,8 +3,10 @@ from typing import Union, Tuple
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
-from .. import options
-from ..stardew_rule import StardewRule, True_, false_
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..stardew_rule import StardewRule
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
+from ..strings.craftable_names import Bomb
 from ..strings.fertilizer_names import Fertilizer
 from ..strings.region_names import Region, LogicRegion
 from ..strings.season_names import Season
@@ -27,17 +29,30 @@ class FarmingLogicMixin(BaseLogicMixin):
 class FarmingLogic(BaseLogic):
 
     @cached_property
-    def has_farming_tools(self) -> StardewRule:
-        return self.logic.tool.has_tool(Tool.hoe) & self.logic.tool.can_water(0)
+    def has_farming_tools_and_water(self) -> StardewRule:
+        if CustomLogicOptionName.rain_watering in self.options.custom_logic:
+            return self.has_hoeing_tool
+        return self.has_hoeing_tool & self.logic.tool.can_water()
+
+    @cached_property
+    def has_farming_and_watering_tools(self) -> StardewRule:
+        return self.has_hoeing_tool & self.logic.tool.can_water()
+
+    @cached_property
+    def has_hoeing_tool(self) -> StardewRule:
+        if CustomLogicOptionName.bomb_hoeing in self.options.custom_logic:
+            return self.logic.tool.has_tool(Tool.hoe) | self.logic.has_any(Bomb.cherry_bomb, Bomb.bomb, Bomb.mega_bomb)
+        return self.logic.tool.has_tool(Tool.hoe)
 
     def has_fertilizer(self, tier: int) -> StardewRule:
-        if tier <= 0:
-            return True_()
+        assert 0 <= tier <= 3
+        if tier == 0:
+            return self.logic.true_
         if tier == 1:
             return self.logic.has(Fertilizer.basic)
         if tier == 2:
             return self.logic.has(Fertilizer.quality)
-        if tier >= 3:
+        if tier == 3:
             return self.logic.has(Fertilizer.deluxe)
 
         return self.logic.false_
@@ -45,7 +60,8 @@ class FarmingLogic(BaseLogic):
     @cache_self1
     def can_plant_and_grow_item(self, seasons: Union[str, Tuple[str]]) -> StardewRule:
         if seasons == ():  # indoor farming
-            return (self.logic.region.can_reach(Region.greenhouse) | self.logic.farming.has_island_farm()) & self.logic.farming.has_farming_tools
+            return (self.logic.region.can_reach(Region.greenhouse) & self.logic.farming.has_farming_and_watering_tools) |\
+                   (self.logic.farming.has_island_farm() & self.logic.farming.has_farming_tools_and_water)
 
         if isinstance(seasons, str):
             seasons = (seasons,)
@@ -53,6 +69,6 @@ class FarmingLogic(BaseLogic):
         return self.logic.or_(*(self.logic.region.can_reach(farming_region_by_season[season]) for season in seasons))
 
     def has_island_farm(self) -> StardewRule:
-        if self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_false:
+        if self.content.is_enabled(ginger_island_content_pack):
             return self.logic.region.can_reach(Region.island_west)
-        return false_
+        return self.logic.false_
diff --git a/worlds/stardew_valley/logic/festival_logic.py b/worlds/stardew_valley/logic/festival_logic.py
index 72efffe83a..5ea0b986ba 100644
--- a/worlds/stardew_valley/logic/festival_logic.py
+++ b/worlds/stardew_valley/logic/festival_logic.py
@@ -3,15 +3,16 @@ from ..options import FestivalLocations
 from ..stardew_rule import StardewRule
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.book_names import Book
-from ..strings.craftable_names import Fishing
 from ..strings.crop_names import Fruit, Vegetable
 from ..strings.festival_check_names import FestivalCheck
 from ..strings.fish_names import Fish
 from ..strings.forageable_names import Forageable
 from ..strings.generic_names import Generic
+from ..strings.gift_names import Gift
 from ..strings.machine_names import Machine
 from ..strings.monster_names import Monster
 from ..strings.region_names import Region
+from ..strings.season_names import Season
 
 
 class FestivalLogicMixin(BaseLogicMixin):
@@ -42,7 +43,7 @@ class FestivalLogic(BaseLogic):
             FestivalCheck.rarecrow_2: self.logic.money.can_spend(5000),
             FestivalCheck.fishing_competition: self.logic.festival.can_win_fishing_competition(),
             FestivalCheck.rarecrow_4: self.logic.money.can_spend(5000),
-            FestivalCheck.mermaid_pearl: self.logic.has(Forageable.secret_note),
+            FestivalCheck.mermaid_show: self.logic.true_,
             FestivalCheck.cone_hat: self.logic.money.can_spend(2500),
             FestivalCheck.iridium_fireplace: self.logic.money.can_spend(15000),
             FestivalCheck.rarecrow_7: self.logic.money.can_spend(5000) & self.logic.museum.can_donate_museum_artifacts(20),
@@ -94,25 +95,24 @@ class FestivalLogic(BaseLogic):
             FestivalCheck.willy_challenge: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.scorpion_carp]),
             FestivalCheck.desert_scholar: self.logic.true_,
             FestivalCheck.squidfest_day_1_copper: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]),
-            FestivalCheck.squidfest_day_1_iron: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.has(Fishing.bait),
-            FestivalCheck.squidfest_day_1_gold: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.has(Fishing.deluxe_bait),
-            FestivalCheck.squidfest_day_1_iridium: self.logic.festival.can_squidfest_day_1_iridium_reward(),
+            FestivalCheck.squidfest_day_1_iron: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.fishing.can_use_any_bait(),
+            FestivalCheck.squidfest_day_1_gold: self.logic.festival.can_squidfest_iridium_reward(),
+            FestivalCheck.squidfest_day_1_iridium: self.logic.festival.can_squidfest_iridium_reward(),
             FestivalCheck.squidfest_day_2_copper: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]),
-            FestivalCheck.squidfest_day_2_iron: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.has(Fishing.bait),
-            FestivalCheck.squidfest_day_2_gold: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.has(Fishing.deluxe_bait),
-            FestivalCheck.squidfest_day_2_iridium: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) &
-                                                   self.logic.fishing.has_specific_bait(self.content.fishes[Fish.squid]),
+            FestivalCheck.squidfest_day_2_iron: self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.fishing.can_use_any_bait(),
+            FestivalCheck.squidfest_day_2_gold: self.logic.festival.can_squidfest_iridium_reward(),
+            FestivalCheck.squidfest_day_2_iridium: self.logic.festival.can_squidfest_iridium_reward(),
         })
         for i in range(1, 11):
             check_name = f"{FestivalCheck.trout_derby_reward_pattern}{i}"
             self.registry.festival_rules[check_name] = self.logic.fishing.can_catch_fish(self.content.fishes[Fish.rainbow_trout])
 
-    def can_squidfest_day_1_iridium_reward(self) -> StardewRule:
-        return self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.fishing.has_specific_bait(self.content.fishes[Fish.squid])
+    def can_squidfest_iridium_reward(self) -> StardewRule:
+        return self.logic.fishing.can_catch_fish(self.content.fishes[Fish.squid]) & self.logic.fishing.can_use_specific_bait(Fish.squid)
 
     def has_squidfest_day_1_iridium_reward(self) -> StardewRule:
         if self.options.festival_locations == FestivalLocations.option_disabled:
-            return self.logic.festival.can_squidfest_day_1_iridium_reward()
+            return self.logic.festival.can_squidfest_iridium_reward()
         else:
             return self.logic.received(f"Book: {Book.the_art_o_crabbing}")
 
@@ -122,6 +122,9 @@ class FestivalLogic(BaseLogic):
     def can_succeed_luau_soup(self) -> StardewRule:
         if self.options.festival_locations != FestivalLocations.option_hard:
             return self.logic.true_
+        return self.can_get_luau_soup_delight()
+
+    def can_get_luau_soup_delight(self) -> StardewRule:
         eligible_fish = (Fish.blobfish, Fish.crimsonfish, Fish.ice_pip, Fish.lava_eel, Fish.legend, Fish.angler, Fish.catfish, Fish.glacierfish,
                          Fish.mutant_carp, Fish.spookfish, Fish.stingray, Fish.sturgeon, Fish.super_cucumber)
         fish_rule = self.logic.has_any(*(f for f in eligible_fish if f in self.content.fishes))  # To filter stingray
@@ -137,7 +140,9 @@ class FestivalLogic(BaseLogic):
     def can_succeed_grange_display(self) -> StardewRule:
         if self.options.festival_locations != FestivalLocations.option_hard:
             return self.logic.true_
+        return self.can_get_grange_display_max_score()
 
+    def can_get_grange_display_max_score(self) -> StardewRule:
         # Other animal products are not counted in the animal product category
         good_animal_products = [
             AnimalProduct.duck_egg, AnimalProduct.duck_feather, AnimalProduct.egg, AnimalProduct.goat_milk, AnimalProduct.golden_egg, AnimalProduct.large_egg,
@@ -157,7 +162,7 @@ class FestivalLogic(BaseLogic):
         fish_rule = self.logic.fishing.can_fish_anywhere(50)
 
         # Hazelnut always available since the grange display is in fall
-        forage_rule = self.logic.region.can_reach_any((Region.forest, Region.backwoods))
+        forage_rule = self.logic.region.can_reach_any(Region.forest, Region.backwoods)
 
         # More than half the minerals are good enough
         mineral_rule = self.logic.action.can_open_geode(Generic.any)
@@ -186,3 +191,8 @@ class FestivalLogic(BaseLogic):
         for rarecrow_number in range(1, 9):
             rules.append(self.logic.received(f"Rarecrow #{rarecrow_number}"))
         return self.logic.and_(*rules)
+
+    def has_golden_pumpkin(self) -> StardewRule:
+        if self.options.festival_locations == FestivalLocations.option_disabled:
+            return self.logic.season.has(Season.fall)
+        return self.logic.received(Gift.golden_pumpkin) & self.logic.season.has(Season.fall)
diff --git a/worlds/stardew_valley/logic/fish_pond_logic.py b/worlds/stardew_valley/logic/fish_pond_logic.py
new file mode 100644
index 0000000000..34aa2b8a7e
--- /dev/null
+++ b/worlds/stardew_valley/logic/fish_pond_logic.py
@@ -0,0 +1,50 @@
+from .base_logic import BaseLogic, BaseLogicMixin
+from ..data.fish_pond_data import fish_pond_quests
+from ..stardew_rule import StardewRule
+from ..strings.building_names import Building
+from ..strings.fish_names import Fish
+
+
+class FishPondLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fish_pond = FishPondLogic(*args, **kwargs)
+
+
+class FishPondLogic(BaseLogic):
+
+    def can_get_fish_pond_reward(self, fish: str, population: int, desired_item: str) -> StardewRule:
+        building_rule = self.logic.building.has_building(Building.fish_pond)
+        if fish == Fish.any:
+            return self.logic.fishing.can_fish_anywhere() & building_rule
+
+        fish_rule = self.logic.has(fish)
+
+        if population <= 1:
+            return building_rule & fish_rule
+
+        assert fish in fish_pond_quests, f"Cannot raise the population of {fish} to {population} in a fish pond to get {desired_item} without knowing the required quest items"
+        # if fish not in fish_pond_quests:
+        #     return building_rule & fish_rule
+
+        item_rules = []
+        fish_quests = fish_pond_quests[fish]
+        for i in range(0, population):
+            if i not in fish_quests:
+                continue
+            quests_for_that_level = fish_quests[i]
+            num_quests = len(quests_for_that_level)
+            if num_quests <= 0:
+                continue
+
+            level_rules = []
+            for quest_item in quests_for_that_level:
+                if quest_item == desired_item:
+                    continue
+                level_rules.append(self.logic.has(quest_item))
+            if num_quests <= 2:
+                item_rules.append(self.logic.count(num_quests, *level_rules))
+            else:
+                item_rules.append(self.logic.count(num_quests - 1, *level_rules))
+
+        return building_rule & fish_rule & self.logic.and_(*item_rules)
diff --git a/worlds/stardew_valley/logic/fishing_logic.py b/worlds/stardew_valley/logic/fishing_logic.py
index 544f322057..7bf42928d2 100644
--- a/worlds/stardew_valley/logic/fishing_logic.py
+++ b/worlds/stardew_valley/logic/fishing_logic.py
@@ -2,10 +2,11 @@ from functools import cached_property
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
+from ..content.vanilla.qi_board import qi_board_content_pack
 from ..data import fish_data
 from ..data.fish_data import FishItem
-from ..options import ExcludeGingerIsland, SpecialOrderLocations
-from ..stardew_rule import StardewRule, True_, False_
+from ..stardew_rule import StardewRule, True_
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
 from ..strings.ap_names.mods.mod_items import SVEQuestItem
 from ..strings.craftable_names import Fishing
 from ..strings.fish_names import SVEFish
@@ -13,8 +14,7 @@ from ..strings.machine_names import Machine
 from ..strings.quality_names import FishQuality
 from ..strings.region_names import Region
 from ..strings.skill_names import Skill
-
-fishing_regions = (Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west)
+from ..strings.tool_names import FishingRod
 
 
 class FishingLogicMixin(BaseLogicMixin):
@@ -24,48 +24,80 @@ class FishingLogicMixin(BaseLogicMixin):
 
 
 class FishingLogic(BaseLogic):
+
+    @cached_property
+    def can_reach_any_fishing_regions(self) -> StardewRule:
+        return self.logic.region.can_reach_any(Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west)
+
     @cache_self1
     def can_fish_anywhere(self, difficulty: int = 0) -> StardewRule:
-        return self.logic.fishing.can_fish(difficulty) & self.logic.region.can_reach_any(fishing_regions)
+        return self.logic.fishing.can_fish(difficulty) & self.logic.fishing.can_reach_any_fishing_regions
 
     def can_fish_in_freshwater(self) -> StardewRule:
-        return self.logic.fishing.can_fish() & self.logic.region.can_reach_any((Region.forest, Region.town, Region.mountain))
+        return self.logic.fishing.can_fish() & self.logic.region.can_reach_any(Region.forest, Region.town, Region.mountain)
 
     @cached_property
     def has_max_fishing(self) -> StardewRule:
-        return self.logic.tool.has_fishing_rod(4) & self.logic.skill.has_level(Skill.fishing, 10)
+        # Advanced Iridium is not necessary for max fishing
+        return self.logic.tool.has_fishing_rod(FishingRod.iridium) & self.logic.skill.has_level(Skill.fishing, 10)
 
     @cached_property
     def can_fish_chests(self) -> StardewRule:
-        return self.logic.tool.has_fishing_rod(4) & self.logic.skill.has_level(Skill.fishing, 6)
+        return self.logic.tool.has_fishing_rod(FishingRod.iridium) & self.logic.skill.has_level(Skill.fishing, 6)
 
     @cache_self1
     def can_fish_at(self, region: str) -> StardewRule:
         return self.logic.fishing.can_fish() & self.logic.region.can_reach(region)
 
-    @cache_self1
-    def can_fish(self, difficulty: int = 0) -> StardewRule:
-        skill_required = min(10, max(0, int((difficulty / 10) - 1)))
+    def can_fish_with_cast_distance(self, region: str, distance: int) -> StardewRule:
+        if distance >= 7:
+            required_levels = 15
+        elif distance >= 6:
+            required_levels = 8
+        elif distance >= 5:
+            required_levels = 4
+        elif distance >= 4:
+            required_levels = 1
+        else:
+            required_levels = 0
+        return self.logic.fishing.can_fish_at(region) & self.logic.skill.has_level(Skill.fishing, required_levels)
+
+    def can_fish(self, difficulty: int = 0, minimum_level: int = 0) -> StardewRule:
+        skill_required = int((difficulty / 10) - 1)
         if difficulty <= 40:
             skill_required = 0
 
+        if CustomLogicOptionName.extreme_fishing in self.options.custom_logic:
+            skill_required -= 4
+        elif CustomLogicOptionName.hard_fishing in self.options.custom_logic:
+            skill_required -= 2
+        elif CustomLogicOptionName.easy_fishing in self.options.custom_logic and difficulty > 20:
+            skill_required += 2
+
+        skill_required = min(10, max(minimum_level, skill_required))
+
         skill_rule = self.logic.skill.has_level(Skill.fishing, skill_required)
         # Training rod only works with fish < 50. Fiberglass does not help you to catch higher difficulty fish, so it's skipped in logic.
-        number_fishing_rod_required = 1 if difficulty < 50 else (2 if difficulty < 80 else 4)
-        return self.logic.tool.has_fishing_rod(number_fishing_rod_required) & skill_rule
+        if difficulty < 50:
+            fishing_rod_required = FishingRod.training
+        elif difficulty < 80:
+            fishing_rod_required = FishingRod.bamboo
+        else:
+            fishing_rod_required = FishingRod.iridium
+        return self.logic.tool.has_fishing_rod(fishing_rod_required) & skill_rule
 
     @cache_self1
     def can_catch_fish(self, fish: FishItem) -> StardewRule:
         quest_rule = True_()
         if fish.extended_family:
             quest_rule = self.logic.fishing.can_start_extended_family_quest()
-        region_rule = self.logic.region.can_reach_any(fish.locations)
+        region_rule = self.logic.region.can_reach_any(*fish.locations)
         season_rule = self.logic.season.has_any(fish.seasons)
 
         if fish.difficulty == -1:
             difficulty_rule = self.logic.fishing.can_crab_pot
         else:
-            difficulty_rule = self.logic.fishing.can_fish(120 if fish.legendary else fish.difficulty)
+            difficulty_rule = self.logic.fishing.can_fish(120 if fish.legendary else fish.difficulty, fish.minimum_level)
 
         if fish.name == SVEFish.kittyfish:
             item_rule = self.logic.received(SVEQuestItem.kittyfish_spell)
@@ -80,18 +112,17 @@ class FishingLogic(BaseLogic):
         return self.logic.fishing.can_catch_fish(fish)
 
     def can_start_extended_family_quest(self) -> StardewRule:
-        if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-            return False_()
-        if not self.options.special_order_locations & SpecialOrderLocations.value_qi:
-            return False_()
-        return (self.logic.region.can_reach(Region.qi_walnut_room) &
-                self.logic.and_(*(self.logic.fishing.can_catch_fish(fish) for fish in fish_data.vanilla_legendary_fish)))
+        if self.content.is_enabled(qi_board_content_pack):
+            return (self.logic.region.can_reach(Region.qi_walnut_room) &
+                    self.logic.and_(*(self.logic.fishing.can_catch_fish(fish) for fish in fish_data.vanilla_legendary_fish)))
+
+        return self.logic.false_
 
     def can_catch_quality_fish(self, fish_quality: str) -> StardewRule:
         if fish_quality == FishQuality.basic:
-            return True_()
+            return self.logic.true_
         if fish_quality == FishQuality.silver:
-            return self.logic.tool.has_fishing_rod(2)
+            return self.logic.tool.has_fishing_rod(FishingRod.bamboo)
         if fish_quality == FishQuality.gold:
             return self.logic.skill.has_level(Skill.fishing, 4) & self.can_use_tackle(Fishing.quality_bobber)
         if fish_quality == FishQuality.iridium:
@@ -100,7 +131,7 @@ class FishingLogic(BaseLogic):
         raise ValueError(f"Quality {fish_quality} is unknown.")
 
     def can_use_tackle(self, tackle: str) -> StardewRule:
-        return self.logic.tool.has_fishing_rod(4) & self.logic.has(tackle)
+        return self.logic.tool.has_fishing_rod(FishingRod.iridium) & self.logic.has(tackle)
 
     def can_catch_every_fish(self) -> StardewRule:
         rules = [self.has_max_fishing]
@@ -112,12 +143,27 @@ class FishingLogic(BaseLogic):
 
         return self.logic.and_(*rules)
 
+    def can_catch_many_fish(self, number: int) -> StardewRule:
+        rules = [
+            self.logic.fishing.can_catch_fish(fish)
+            for fish in self.content.fishes.values()
+        ]
+        if number > len(rules):
+            number = len(rules)
+        return self.logic.count(number, *rules)
+
     def has_specific_bait(self, fish: FishItem) -> StardewRule:
         return self.can_catch_fish(fish) & self.logic.has(Machine.bait_maker)
 
+    def can_use_specific_bait(self, fish_name: str) -> StardewRule:
+        return self.has_specific_bait(self.content.fishes[fish_name]) & self.logic.tool.has_fishing_rod(FishingRod.fiberglass)
+
+    def can_use_any_bait(self) -> StardewRule:
+        return self.logic.has(Fishing.bait) & self.logic.tool.has_fishing_rod(FishingRod.fiberglass)
+
     @cached_property
     def can_crab_pot_anywhere(self) -> StardewRule:
-        return self.logic.fishing.can_crab_pot & self.logic.region.can_reach_any(fishing_regions)
+        return self.logic.fishing.can_crab_pot & self.can_reach_any_fishing_regions
 
     @cache_self1
     def can_crab_pot_at(self, region: str) -> StardewRule:
diff --git a/worlds/stardew_valley/logic/gift_logic.py b/worlds/stardew_valley/logic/gift_logic.py
index 11667783d6..7a460e12f1 100644
--- a/worlds/stardew_valley/logic/gift_logic.py
+++ b/worlds/stardew_valley/logic/gift_logic.py
@@ -1,6 +1,7 @@
 from functools import cached_property
 
 from .base_logic import BaseLogic, BaseLogicMixin
+from ..data.secret_note_data import RequiredGifts
 from ..stardew_rule import StardewRule
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.gift_names import Gift
@@ -17,3 +18,32 @@ class GiftLogic(BaseLogic):
     @cached_property
     def has_any_universal_love(self) -> StardewRule:
         return self.logic.has_any(Gift.golden_pumpkin, Gift.pearl, "Prismatic Shard", AnimalProduct.rabbit_foot)
+
+    def can_gift_to(self, npc: str, item: str) -> StardewRule:
+        return self.logic.relationship.can_meet(npc) & self.logic.has(item)
+
+    def can_gift_any_to(self, npc: str, *items: str) -> StardewRule:
+        return self.logic.relationship.can_meet(npc) & self.logic.has_any(*items)
+
+    def can_fulfill(self, required_gifts: RequiredGifts | list[RequiredGifts]) -> StardewRule:
+        if isinstance(required_gifts, RequiredGifts):
+            return self.can_gift_all_to(required_gifts)
+        return self.can_gift_all_to_all(required_gifts)
+
+    def can_gift_all_to(self, required_gifts: RequiredGifts) -> StardewRule:
+        return self.logic.relationship.can_meet(required_gifts.npc) & self.logic.has_all(*required_gifts.gifts)
+
+    def can_gift_all_to_all(self, required_gifts: list[RequiredGifts]) -> StardewRule:
+        items = [gift for required_gift in required_gifts for gift in required_gift.gifts]
+        return self.logic.relationship.can_meet_all(*[required_gift.npc for required_gift in required_gifts]) & self.logic.has_all(*items)
+
+    def can_give_loved_gifts_to_everyone(self) -> StardewRule:
+        rules = []
+
+        for npc in self.content.villagers:
+            meet_rule = self.logic.relationship.can_meet(npc)
+            rules.append(meet_rule)
+
+        rules.append(self.has_any_universal_love)
+
+        return self.logic.and_(*rules)
diff --git a/worlds/stardew_valley/logic/goal_logic.py b/worlds/stardew_valley/logic/goal_logic.py
index 7995ea2e0d..ecc696408a 100644
--- a/worlds/stardew_valley/logic/goal_logic.py
+++ b/worlds/stardew_valley/logic/goal_logic.py
@@ -5,8 +5,11 @@ from ..locations import LocationTags, locations_by_tag
 from ..mods.mod_data import ModNames
 from ..options import options
 from ..stardew_rule import StardewRule
+from ..strings.ap_names.ap_option_names import SecretsanityOptionName
 from ..strings.building_names import Building
+from ..strings.crop_names import Fruit
 from ..strings.quest_names import Quest
+from ..strings.region_names import Region
 from ..strings.season_names import Season
 from ..strings.wallet_item_names import Wallet
 
@@ -97,11 +100,8 @@ class GoalLogic(BaseLogic):
     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:
+            if not self.content.are_all_enabled(location.content_packs):
                 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]
@@ -110,17 +110,14 @@ class GoalLogic(BaseLogic):
     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:
+            if not self.content.are_all_enabled(location.content_packs):
                 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]
@@ -133,7 +130,6 @@ class GoalLogic(BaseLogic):
         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
 
@@ -154,11 +150,41 @@ class GoalLogic(BaseLogic):
         else:
             other_rules.append(self.logic.relationship.has_hearts_with_any_bachelor(13))
 
-        if ModNames.deepwoods in self.options.mods:  # Petting the Unicorn
+        # Old Master Cannoli
+        if SecretsanityOptionName.easy in self.options.secretsanity:
+            number_of_stardrops_to_receive += 1
+        else:
+            other_rules.append(self.logic.has(Fruit.sweet_gem_berry) & self.logic.region.can_reach(Region.secret_woods))
+
+        if self.content.is_enabled(ModNames.deepwoods):  # 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_mad_hatter(self, all_location_names_in_slot: list[str]) -> StardewRule:
+        if not self.content.features.hatsanity.is_enabled:
+            raise Exception("Cannot play Mad Hatter Goal without Hatsanity")
+
+        rules = []
+
+        for hatsanity_location in locations_by_tag[LocationTags.HATSANITY]:
+            if hatsanity_location.name not in all_location_names_in_slot:
+                continue
+            rules.append(self.logic.region.can_reach_location(hatsanity_location.name))
+        return self.logic.and_(*rules)
+
+    def can_complete_ultimate_foodie(self, all_location_names_in_slot: list[str]) -> StardewRule:
+        if not self.options.eatsanity.value:
+            raise Exception("Cannot play Ultimate Foodie Goal without Eatsanity")
+
+        rules = []
+
+        for eatsanity_location in locations_by_tag[LocationTags.EATSANITY]:
+            if eatsanity_location.name not in all_location_names_in_slot:
+                continue
+            rules.append(self.logic.region.can_reach_location(eatsanity_location.name))
+        return self.logic.and_(*rules)
+
     def can_complete_allsanity(self) -> StardewRule:
         return self.logic.has_progress_percent(100)
 
diff --git a/worlds/stardew_valley/logic/grind_logic.py b/worlds/stardew_valley/logic/grind_logic.py
index e18c13c15a..74fa07c73d 100644
--- a/worlds/stardew_valley/logic/grind_logic.py
+++ b/worlds/stardew_valley/logic/grind_logic.py
@@ -1,12 +1,6 @@
-from typing import Union, TYPE_CHECKING
-
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
-from .book_logic import BookLogicMixin
-from .has_logic import HasLogicMixin
-from .received_logic import ReceivedLogicMixin
-from .region_logic import RegionLogicMixin
-from .time_logic import TimeLogicMixin
+from ..options import ExcludeGingerIsland
 from ..stardew_rule import StardewRule, HasProgressionPercent
 from ..strings.book_names import Book
 from ..strings.craftable_names import Consumable
@@ -17,11 +11,6 @@ from ..strings.material_names import Material
 from ..strings.region_names import Region
 from ..strings.tool_names import Tool
 
-if TYPE_CHECKING:
-    from .tool_logic import ToolLogicMixin
-else:
-    ToolLogicMixin = object
-
 MIN_MEDIUM_ITEMS = 10
 MAX_MEDIUM_ITEMS = 999
 PERCENT_REQUIRED_FOR_MAX_MEDIUM_ITEM = 24
@@ -29,7 +18,7 @@ PERCENT_REQUIRED_FOR_MAX_MEDIUM_ITEM = 24
 EASY_ITEMS = {Material.wood, Material.stone, Material.fiber, Material.sap}
 MIN_EASY_ITEMS = 300
 MAX_EASY_ITEMS = 2997
-PERCENT_REQUIRED_FOR_MAX_EASY_ITEM = 6
+PERCENT_REQUIRED_FOR_MAX_EASY_ITEM = 8
 
 
 class GrindLogicMixin(BaseLogicMixin):
@@ -59,9 +48,8 @@ class GrindLogic(BaseLogic):
 
     def can_grind_prize_tickets(self, quantity: int) -> StardewRule:
         claiming_rule = self.logic.region.can_reach(Region.mayor_house)
-        return self.logic.and_(claiming_rule, self.logic.has(Currency.prize_ticket),
-                               # Assuming two per month if the player does not grind it.
-                               self.logic.time.has_lived_months(quantity // 2))
+        help_wanted_rules = self.logic.quest.can_complete_help_wanteds(quantity * 3)
+        return self.logic.and_(claiming_rule, self.logic.has(Currency.prize_ticket), help_wanted_rules)
 
     def can_grind_fishing_treasure_chests(self, quantity: int) -> StardewRule:
         return self.logic.and_(self.logic.has(WaterChest.fishing_chest),
@@ -73,12 +61,23 @@ class GrindLogic(BaseLogic):
                                # Assuming twelve per month if the player does not grind it.
                                self.logic.time.has_lived_months(quantity // 12))
 
+    def can_grind_weeds(self, quantity: int) -> StardewRule:
+        regions = [Region.farm, Region.town, Region.forest, Region.secret_woods, Region.backwoods, Region.mountain, Region.railroad, Region.mutant_bug_lair]
+        if self.options.exclude_ginger_island == ExcludeGingerIsland.option_false:
+            regions.extend([Region.island_east, Region.island_west])
+        return self.logic.and_(self.logic.tool.has_scythe(),
+                               self.logic.region.can_reach_all(*regions),
+                               # Assuming 1000 per month if the player does not grind it
+                               self.logic.time.has_lived_months(quantity // 1000))
+
     def can_grind_item(self, quantity: int, item: str | None = None) -> StardewRule:
-        if item in EASY_ITEMS:
-            return self.logic.grind.can_grind_easy_item(quantity)
-        else:
+        if item is None:
             return self.logic.grind.can_grind_medium_item(quantity)
 
+        if item in EASY_ITEMS:
+            return self.logic.grind.can_grind_easy_item(quantity) & self.logic.has(item)
+        return self.logic.grind.can_grind_medium_item(quantity) & self.logic.has(item)
+
     @cache_self1
     def can_grind_medium_item(self, quantity: int) -> StardewRule:
         if quantity <= MIN_MEDIUM_ITEMS:
diff --git a/worlds/stardew_valley/logic/harvesting_logic.py b/worlds/stardew_valley/logic/harvesting_logic.py
index 6478e34953..27226f6ec0 100644
--- a/worlds/stardew_valley/logic/harvesting_logic.py
+++ b/worlds/stardew_valley/logic/harvesting_logic.py
@@ -27,8 +27,14 @@ class HarvestingLogic(BaseLogic):
     @cache_self1
     def can_forage_from(self, source: ForagingSource) -> StardewRule:
         seasons_rule = self.logic.season.has_any(source.seasons)
-        regions_rule = self.logic.region.can_reach_any(source.regions)
-        return seasons_rule & regions_rule
+        if source.require_all_regions:
+            regions_rule = self.logic.region.can_reach_all(*source.regions)
+        else:
+            regions_rule = self.logic.region.can_reach_any(*source.regions)
+        if source.grind_months == 0:
+            return seasons_rule & regions_rule
+        else:
+            return seasons_rule & regions_rule & self.logic.time.has_lived_months(source.grind_months)
 
     @cache_self1
     def can_harvest_tree_from(self, source: HarvestFruitTreeSource) -> StardewRule:
diff --git a/worlds/stardew_valley/logic/hats_logic.py b/worlds/stardew_valley/logic/hats_logic.py
new file mode 100644
index 0000000000..be68923cff
--- /dev/null
+++ b/worlds/stardew_valley/logic/hats_logic.py
@@ -0,0 +1,28 @@
+from functools import cached_property
+
+from .base_logic import BaseLogicMixin, BaseLogic
+from ..data.hats_data import HatItem
+from ..stardew_rule import StardewRule
+from ..strings.fish_names import Fish
+from ..strings.region_names import LogicRegion
+
+
+class HatLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.hat = HatLogic(*args, **kwargs)
+
+
+class HatLogic(BaseLogic):
+
+    @cached_property
+    def can_get_unlikely_hat_at_outfit_services(self) -> StardewRule:
+        return self.logic.region.can_reach(LogicRegion.desert_festival) & self.logic.time.has_lived_months(12)
+
+    @cached_property
+    def has_bucket_hat(self) -> StardewRule:
+        trout_derby_rule = self.logic.region.can_reach(LogicRegion.trout_derby) & self.logic.fishing.can_catch_fish(self.content.fishes[Fish.rainbow_trout])
+        return trout_derby_rule
+
+    def can_wear(self, hat: HatItem) -> StardewRule:
+        return self.logic.has(hat.clarified_name)
diff --git a/worlds/stardew_valley/logic/logic.py b/worlds/stardew_valley/logic/logic.py
index 42bfb9cc26..37260d1494 100644
--- a/worlds/stardew_valley/logic/logic.py
+++ b/worlds/stardew_valley/logic/logic.py
@@ -17,16 +17,20 @@ from .cooking_logic import CookingLogicMixin
 from .crafting_logic import CraftingLogicMixin
 from .farming_logic import FarmingLogicMixin
 from .festival_logic import FestivalLogicMixin
+from .fish_pond_logic import FishPondLogicMixin
 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
-from .logic_event import all_logic_events
+from .hats_logic import HatLogicMixin
+from .logic_event import all_item_events
+from .meme_items_logic import MemeItemsLogicMixin
 from .mine_logic import MineLogicMixin
 from .money_logic import MoneyLogicMixin
 from .monster_logic import MonsterLogicMixin
+from .movie_logic import MovieLogicMixin
 from .museum_logic import MuseumLogicMixin
 from .pet_logic import PetLogicMixin
 from .quality_logic import QualityLogicMixin
@@ -37,28 +41,34 @@ from .relationship_logic import RelationshipLogicMixin
 from .requirement_logic import RequirementLogicMixin
 from .season_logic import SeasonLogicMixin
 from .shipping_logic import ShippingLogicMixin
+from .shirts_logic import ShirtLogicMixin
 from .skill_logic import SkillLogicMixin
 from .source_logic import SourceLogicMixin
+from .special_items_logic import SpecialItemsLogicMixin
 from .special_order_logic import SpecialOrderLogicMixin
+from .tailoring_logic import TailoringLogicMixin
 from .time_logic import TimeLogicMixin
 from .tool_logic import ToolLogicMixin
 from .traveling_merchant_logic import TravelingMerchantLogicMixin
 from .wallet_logic import WalletLogicMixin
 from .walnut_logic import WalnutLogicMixin
 from ..content.game_content import StardewContent
+from ..content.vanilla.ginger_island import ginger_island_content_pack
 from ..data.craftable_data import all_crafting_recipes
 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 ..options import ExcludeGingerIsland, StardewValleyOptions
-from ..stardew_rule import False_, True_, StardewRule
+from ..options import StardewValleyOptions, BundleRandomization, IncludeEndgameLocations
+from ..stardew_rule import False_, StardewRule, Or, Reach
 from ..strings.animal_names import Animal
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
 from ..strings.artisan_good_names import ArtisanGood
+from ..strings.boot_names import tier_by_boots
 from ..strings.building_names import Building
-from ..strings.craftable_names import Consumable, Ring, Fishing, Lighting, WildSeeds
+from ..strings.catalogue_names import items_by_catalogue
+from ..strings.craftable_names import Consumable, Ring, Fishing, Lighting, WildSeeds, Furniture
 from ..strings.crop_names import Fruit, Vegetable
 from ..strings.currency_names import Currency
 from ..strings.decoration_names import Decoration
@@ -73,16 +83,16 @@ from ..strings.gift_names import Gift
 from ..strings.ingredient_names import Ingredient
 from ..strings.machine_names import Machine
 from ..strings.material_names import Material
-from ..strings.metal_names import Ore, MetalBar, Mineral, Fossil, Artifact
+from ..strings.metal_names import Ore, MetalBar, Mineral, Fossil
 from ..strings.monster_drop_names import Loot
 from ..strings.monster_names import Monster
 from ..strings.region_names import Region, LogicRegion
 from ..strings.season_names import Season
 from ..strings.seed_names import Seed, TreeSeed
 from ..strings.skill_names import Skill
-from ..strings.tool_names import Tool, ToolMaterial
+from ..strings.special_item_names import SpecialItem
+from ..strings.tool_names import Tool, ToolMaterial, FishingRod
 from ..strings.villager_names import NPC
-from ..strings.wallet_item_names import Wallet
 
 logger = logging.getLogger(__name__)
 
@@ -93,7 +103,8 @@ 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, GoalLogicMixin):
+                   RequirementLogicMixin, BookLogicMixin, GrindLogicMixin, FestivalLogicMixin, WalnutLogicMixin, GoalLogicMixin, SpecialItemsLogicMixin,
+                   MovieLogicMixin, MemeItemsLogicMixin, HatLogicMixin, ShirtLogicMixin, TailoringLogicMixin, FishPondLogicMixin):
     player: int
     options: StardewValleyOptions
     content: StardewContent
@@ -107,15 +118,16 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
         self.registry.museum_rules.update({donation.item_name: self.museum.can_find_museum_item(donation) for donation in all_museum_items})
 
         for recipe in all_cooking_recipes:
-            if recipe.mod_name and recipe.mod_name not in self.options.mods:
+            if recipe.content_pack and not self.content.is_enabled(recipe.content_pack):
                 continue
+
             can_cook_rule = self.cooking.can_cook(recipe)
             if recipe.meal in self.registry.cooking_rules:
                 can_cook_rule = can_cook_rule | self.registry.cooking_rules[recipe.meal]
             self.registry.cooking_rules[recipe.meal] = can_cook_rule
 
         for recipe in all_crafting_recipes:
-            if recipe.mod_name and recipe.mod_name not in self.options.mods:
+            if recipe.content_pack is not None and not self.content.are_all_enabled(recipe.content_pack):
                 continue
             can_craft_rule = self.crafting.can_craft(recipe)
             if recipe.item in self.registry.crafting_rules:
@@ -145,11 +157,14 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             "Junimo Kart Small Buff": self.arcade.has_junimo_kart_power_level(2),
             "Magic Rock Candy": self.region.can_reach(Region.desert) & self.has("Prismatic Shard"),
             "Muscle Remedy": self.money.can_spend_at(Region.hospital, 1000),
+            "Stardrop": self.received("Stardrop"),
+            "Iridium Snake Milk": self.quest.can_drink_snake_milk(),
             # self.has(Ingredient.vinegar)),
             # self.received("Deluxe Fertilizer Recipe") & self.has(MetalBar.iridium) & self.has(SVItem.sap),
             # | (self.ability.can_cook() & self.relationship.has_hearts(NPC.emily, 3) & self.has(Forageable.leek) & self.has(Forageable.dandelion) &
             # | (self.ability.can_cook() & self.relationship.has_hearts(NPC.jodi, 7) & self.has(AnimalProduct.cow_milk) & self.has(Ingredient.sugar)),
             AnimalProduct.any_egg: self.has_any(AnimalProduct.chicken_egg, AnimalProduct.duck_egg),
+            AnimalProduct.any_milk: self.has_any(AnimalProduct.cow_milk, AnimalProduct.goat_milk),
             AnimalProduct.brown_egg: self.animal.has_animal(Animal.chicken),
             AnimalProduct.chicken_egg: self.has_any(AnimalProduct.egg, AnimalProduct.brown_egg, AnimalProduct.large_egg, AnimalProduct.large_brown_egg),
             AnimalProduct.cow_milk: self.has_any(AnimalProduct.milk, AnimalProduct.large_milk),
@@ -164,9 +179,8 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             AnimalProduct.large_milk: self.animal.has_happy_animal(Animal.cow),
             AnimalProduct.milk: self.animal.has_animal(Animal.cow),
             AnimalProduct.rabbit_foot: self.animal.has_happy_animal(Animal.rabbit),
-            AnimalProduct.roe: self.fishing.can_fish_anywhere() & self.building.has_building(Building.fish_pond),
-            AnimalProduct.squid_ink: self.mine.can_mine_in_the_mines_floor_81_120() | (self.building.has_building(Building.fish_pond) & self.has(Fish.squid)),
-            AnimalProduct.sturgeon_roe: self.has(Fish.sturgeon) & self.building.has_building(Building.fish_pond),
+            AnimalProduct.roe: self.fish_pond.can_get_fish_pond_reward(Fish.any, 1, AnimalProduct.roe),
+            AnimalProduct.squid_ink: self.mine.can_mine_in_the_mines_floor_81_120() | self.fish_pond.can_get_fish_pond_reward(Fish.squid, 1, AnimalProduct.squid_ink) | self.fish_pond.can_get_fish_pond_reward(Fish.midnight_squid, 1, AnimalProduct.squid_ink),
             AnimalProduct.truffle: self.animal.has_animal(Animal.pig) & self.season.has_any_not_winter(),
             AnimalProduct.void_egg: self.has(AnimalProduct.void_egg_starter),  # Should also check void chicken if there was an alternative to obtain it without void egg
             AnimalProduct.wool: self.animal.has_animal(Animal.rabbit) | self.animal.has_animal(Animal.sheep),
@@ -174,18 +188,17 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             AnimalProduct.slime_egg_blue: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(3),
             AnimalProduct.slime_egg_red: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(6),
             AnimalProduct.slime_egg_purple: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(9),
-            AnimalProduct.slime_egg_tiger: self.can_fish_pond(Fish.lionfish, *(Forageable.ginger, Fruit.pineapple, Fruit.mango)) & self.time.has_lived_months(12) &
+            AnimalProduct.slime_egg_tiger: self.fish_pond.can_get_fish_pond_reward(Fish.lionfish, 9, AnimalProduct.slime_egg_tiger) & self.time.has_lived_months(12) &
                                             self.building.has_building(Building.slime_hutch) & self.monster.can_kill(Monster.tiger_slime),
             AnimalProduct.duck_egg_starter: self.logic.false_,  # It could be purchased at the Feast of the Winter Star, but it's random every year, so not considering it yet...
             AnimalProduct.dinosaur_egg_starter: self.logic.false_,  # Dinosaur eggs are also part of the museum rules, and I don't want to touch them yet.
             AnimalProduct.egg_starter: self.logic.false_,  # It could be purchased at the Desert Festival, but festival logic is quite a mess, so not considering it yet...
             AnimalProduct.golden_egg_starter: self.received(AnimalProduct.golden_egg) & (self.money.can_spend_at(Region.ranch, 100000) | self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 100)),
-            AnimalProduct.void_egg_starter: self.money.can_spend_at(Region.sewer, 5000) | (self.building.has_building(Building.fish_pond) & self.has(Fish.void_salmon)),
+            AnimalProduct.void_egg_starter: self.money.can_spend_at(Region.sewer, 5000),
             ArtisanGood.aged_roe: self.artisan.can_preserves_jar(AnimalProduct.roe),
             ArtisanGood.battery_pack: (self.has(Machine.lightning_rod) & self.season.has_any_not_winter()) | self.has(Machine.solar_panel),
-            ArtisanGood.caviar: self.artisan.can_preserves_jar(AnimalProduct.sturgeon_roe),
-            ArtisanGood.cheese: (self.has(AnimalProduct.cow_milk) & self.has(Machine.cheese_press)) | (self.region.can_reach(Region.desert) & self.has(Mineral.emerald)),
-            ArtisanGood.cloth: (self.has(AnimalProduct.wool) & self.has(Machine.loom)) | (self.region.can_reach(Region.desert) & self.has(Mineral.aquamarine)),
+            ArtisanGood.cheese: (self.has(AnimalProduct.cow_milk) & self.has(Machine.cheese_press)) | (self.region.can_reach(Region.desert) & self.artisan.can_replicate_gem(Mineral.emerald)),
+            ArtisanGood.cloth: (self.has(AnimalProduct.wool) & self.has(Machine.loom)) | (self.region.can_reach(Region.desert) & self.artisan.can_replicate_gem(Mineral.aquamarine)),
             ArtisanGood.dinosaur_mayonnaise: self.artisan.can_mayonnaise(AnimalProduct.dinosaur_egg),
             ArtisanGood.duck_mayonnaise: self.artisan.can_mayonnaise(AnimalProduct.duck_egg),
             ArtisanGood.goat_cheese: self.has(AnimalProduct.goat_milk) & self.has(Machine.cheese_press),
@@ -203,11 +216,10 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             Beverage.pina_colada: self.money.can_spend_at(Region.island_resort, 600),
             Beverage.triple_shot_espresso: self.has("Hot Java Ring"),
             Consumable.butterfly_powder: self.money.can_spend_at(Region.sewer, 20000),
-            Consumable.far_away_stone: self.region.can_reach(Region.mines_floor_100) & self.has(Artifact.ancient_doll),
             Consumable.fireworks_red: self.region.can_reach(Region.casino),
             Consumable.fireworks_purple: self.region.can_reach(Region.casino),
             Consumable.fireworks_green: self.region.can_reach(Region.casino),
-            Consumable.golden_animal_cracker: self.skill.has_mastery(Skill.farming),
+            Consumable.golden_animal_cracker: self.skill.has_mastery(Skill.farming) & (self.fishing.can_fish_chests | self.region.can_reach(Region.skull_cavern_25)),
             Consumable.mystery_box: self.received(CommunityUpgrade.mr_qi_plane_ride),
             Consumable.gold_mystery_box: self.received(CommunityUpgrade.mr_qi_plane_ride) & self.skill.has_mastery(Skill.foraging),
             Currency.calico_egg: self.region.can_reach(LogicRegion.desert_festival),
@@ -229,30 +241,32 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             Fish.snail: self.fishing.can_crab_pot_at(Region.town),
             Fishing.curiosity_lure: self.monster.can_kill(self.monster.all_monsters_by_name[Monster.mummy]),
             Fishing.lead_bobber: self.skill.has_level(Skill.fishing, 6) & self.money.can_spend_at(Region.fish_shop, 200),
-            Forageable.hay: self.building.has_building(Building.silo) & self.tool.has_tool(Tool.scythe), #
-            Forageable.journal_scrap: self.region.can_reach_all((Region.island_west, Region.island_north, Region.island_south, Region.volcano_floor_10)) & (self.ability.can_chop_trees() | self.mine.can_mine_in_the_mines_floor_1_40()),#
-            Forageable.secret_note: self.quest.has_magnifying_glass() & (self.ability.can_chop_trees() | self.mine.can_mine_in_the_mines_floor_1_40()), #
+            Fishing.golden_bobber: self.region.can_reach(LogicRegion.desert_festival) & self.fishing.can_fish_chests,
+            Forageable.hay: self.building.has_building(Building.silo) & self.tool.has_scythe(), #
+            Forageable.journal_scrap: self.region.can_reach_all(Region.island_west, Region.island_north, Region.island_south, Region.volcano_floor_10) & (self.ability.can_chop_trees() | self.mine.can_mine_in_the_mines_floor_1_40()),#
+            Forageable.secret_note: self.region.can_reach(LogicRegion.secret_notes), #
             Fossil.bone_fragment: (self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.pickaxe)) | self.monster.can_kill(Monster.skeleton),
             Fossil.fossilized_leg: self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.pickaxe),
             Fossil.fossilized_ribs: self.region.can_reach(Region.island_south) & self.tool.has_tool(Tool.hoe) & self.received("Open Professor Snail Cave"),
             Fossil.fossilized_skull: self.action.can_open_geode(Geode.golden_coconut),
             Fossil.fossilized_spine: self.fishing.can_fish_at(Region.dig_site),
-            Fossil.fossilized_tail: self.action.can_pan_at(Region.dig_site, ToolMaterial.copper),
+            Fossil.fossilized_tail: self.action.can_pan_at(Region.dig_site, ToolMaterial.iridium),
             Fossil.mummified_bat: self.region.can_reach(Region.volcano_floor_10),
-            Fossil.mummified_frog: self.region.can_reach(Region.island_east) & self.tool.has_tool(Tool.scythe),
+            Fossil.mummified_frog: self.region.can_reach(Region.island_east) & self.tool.has_scythe(),
             Fossil.snake_skull: self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.hoe),
             Fossil.snake_vertebrae: self.region.can_reach(Region.island_west) & self.tool.has_tool(Tool.hoe),
+            Furniture.exotic_double_bed: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 50),
             Geode.artifact_trove: self.has(Geode.omni) & self.region.can_reach(Region.desert),
             Geode.frozen: self.mine.can_mine_in_the_mines_floor_41_80(),
             Geode.geode: self.mine.can_mine_in_the_mines_floor_1_40(),
             Geode.golden_coconut: self.region.can_reach(Region.island_north),
-            Geode.magma: self.mine.can_mine_in_the_mines_floor_81_120() | (self.has(Fish.lava_eel) & self.building.has_building(Building.fish_pond)),
-            Geode.omni: self.mine.can_mine_in_the_mines_floor_41_80() | self.region.can_reach(Region.desert) | self.tool.has_tool(Tool.pan, ToolMaterial.iron) | self.received(Wallet.rusty_key) | (self.has(Fish.octopus) & self.building.has_building(Building.fish_pond)) | self.region.can_reach(Region.volcano_floor_10),
+            Geode.magma: self.mine.can_mine_in_the_mines_floor_81_120(),  # Could add self.fish_pond.can_get_fish_pond_reward(Fish.lava_eel, 9, Geode.magma) but it makes a logic loop
+            Geode.omni: self.count(2, *(self.mine.can_mine_in_the_mines_floor_81_120(), self.region.can_reach_all((Region.desert, Region.oasis, Region.sewer)), self.tool.has_pan(ToolMaterial.iron), (self.region.can_reach_all((Region.island_west, Region.island_north,)) & self.has(Consumable.treasure_totem)))),  # Could add self.fish_pond.can_get_fish_pond_reward(Fish.octopus, 9, Geode.omni) but it makes a logic loop
             Gift.bouquet: self.relationship.has_hearts_with_any_bachelor(8) & self.money.can_spend_at(Region.pierre_store, 100),
-            Gift.golden_pumpkin: self.season.has(Season.fall) | self.action.can_open_geode(Geode.artifact_trove),
-            Gift.mermaid_pendant: self.region.can_reach(Region.tide_pools) & self.relationship.has_hearts_with_any_bachelor(10) & self.building.has_building(Building.kitchen) & self.has(Consumable.rain_totem),
+            Gift.golden_pumpkin: self.festival.has_golden_pumpkin(),
+            Gift.mermaid_pendant: self.region.can_reach(Region.tide_pools) & self.relationship.has_hearts_with_any_bachelor(10) & self.building.has_building(Building.kitchen) & (self.has(Consumable.rain_totem) | self.season.has_any_not_winter()),
             Gift.movie_ticket: self.money.can_spend_at(Region.movie_ticket_stand, 1000),
-            Gift.pearl: (self.has(Fish.blobfish) & self.building.has_building(Building.fish_pond)) | self.action.can_open_geode(Geode.artifact_trove),
+            Gift.pearl: self.fish_pond.can_get_fish_pond_reward(Fish.blobfish, 9, Gift.pearl) | self.action.can_open_geode(Geode.artifact_trove),
             Gift.tea_set: self.season.has(Season.winter) & self.time.has_lived_max_months,
             Gift.void_ghost_pendant: self.money.can_trade_at(Region.desert, Loot.void_essence, 200) & self.relationship.has_hearts(NPC.krobus, 10),
             Gift.wilted_bouquet: self.has(Machine.furnace) & self.has(Gift.bouquet) & self.has(Material.coal),
@@ -271,15 +285,17 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             Machine.crab_pot: self.skill.has_level(Skill.fishing, 3) & self.money.can_spend_at(Region.fish_shop, 1500),
             Machine.enricher: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 20),
             Machine.pressure_nozzle: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 20),
+            Machine.sewing_machine: (self.region.can_reach(Region.haley_house) & self.has(ArtisanGood.cloth)) | (self.received(Machine.sewing_machine) & self.region.can_reach(Region.secret_woods)),
+            Machine.statue_endless_fortune: self.has_statue_of_endless_fortune(),
             Material.cinder_shard: self.region.can_reach(Region.volcano_floor_5),
-            Material.clay: self.region.can_reach_any((Region.farm, Region.beach, Region.quarry)) & self.tool.has_tool(Tool.hoe),
-            Material.coal: self.mine.can_mine_in_the_mines_floor_41_80() | self.tool.has_tool(Tool.pan),
-            Material.fiber: True_(),
+            Material.clay: self.region.can_reach_any(Region.farm, Region.beach, Region.quarry) & self.tool.has_tool(Tool.hoe),
+            Material.coal: self.mine.can_mine_in_the_mines_floor_41_80() | self.tool.has_pan(),
+            Material.fiber: self.ability.can_scythe_vines(),
             Material.hardwood: self.tool.has_tool(Tool.axe, ToolMaterial.copper) & (self.region.can_reach(Region.secret_woods) | self.region.can_reach(Region.island_west)),
-            Material.moss: self.season.has_any_not_winter() & (self.tool.has_tool(Tool.scythe) | self.combat.has_any_weapon) & self.region.can_reach(Region.forest),
+            Material.moss: self.season.has_any_not_winter() & (self.tool.has_scythe() | self.combat.has_any_weapon) & self.region.can_reach(Region.forest),
             Material.sap: self.ability.can_chop_trees(),
-            Material.stone: self.tool.has_tool(Tool.pickaxe),
-            Material.wood: self.tool.has_tool(Tool.axe),
+            Material.stone: self.ability.can_mine_stone(),
+            Material.wood: self.ability.can_chop_trees(),
             Meal.ice_cream: (self.season.has(Season.summer) & self.money.can_spend_at(Region.town, 250)) | self.money.can_spend_at(Region.oasis, 240),
             Meal.strange_bun: self.relationship.has_hearts(NPC.shane, 7) & self.has(Ingredient.wheat_flour) & self.has(Fish.periwinkle) & self.has(ArtisanGood.void_mayonnaise),
             MetalBar.copper: self.can_smelt(Ore.copper),
@@ -288,13 +304,19 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             MetalBar.iron: self.can_smelt(Ore.iron),
             MetalBar.quartz: self.can_smelt(Mineral.quartz) | self.can_smelt("Fire Quartz") | (self.has(Machine.recycling_machine) & (self.has(Trash.broken_cd) | self.has(Trash.broken_glasses))),
             MetalBar.radioactive: self.can_smelt(Ore.radioactive),
-            Ore.copper: self.mine.can_mine_in_the_mines_floor_1_40() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_tool(Tool.pan, ToolMaterial.copper),
-            Ore.gold: self.mine.can_mine_in_the_mines_floor_81_120() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_tool(Tool.pan, ToolMaterial.gold),
-            Ore.iridium: self.count(2, *(self.mine.can_mine_in_the_skull_cavern(), self.can_fish_pond(Fish.super_cucumber), self.tool.has_tool(Tool.pan, ToolMaterial.iridium))),
-            Ore.iron: self.mine.can_mine_in_the_mines_floor_41_80() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_tool(Tool.pan, ToolMaterial.iron),
-            Ore.radioactive: self.ability.can_mine_perfectly() & self.region.can_reach(Region.qi_walnut_room),
+            Mineral.any_gem: self.museum.has_any_gem(),
+            Ore.copper: self.mine.can_mine_in_the_mines_floor_1_40() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_pan(),
+            Ore.gold: self.mine.can_mine_in_the_mines_floor_81_120() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_pan(ToolMaterial.gold),
+            Ore.iridium: self.ability.can_mine_perfectly_in_the_skull_cavern() | (self.mine.can_mine_in_the_skull_cavern() & self.tool.has_pan(ToolMaterial.gold)),  # Could add self.fish_pond.can_get_fish_pond_reward(Fish.super_cucumber, 9, Ore.iridium) but it makes a logic loop
+            Ore.iron: self.mine.can_mine_in_the_mines_floor_41_80() | self.mine.can_mine_in_the_skull_cavern() | self.tool.has_pan(ToolMaterial.iron),
+            Ore.radioactive: self.special_order.can_get_radioactive_ore(),
             RetainingSoil.basic: self.money.can_spend_at(Region.pierre_store, 100),
             RetainingSoil.quality: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150),
+            SpecialItem.lucky_purple_shorts: self.special_items.has_purple_shorts(),
+            SpecialItem.trimmed_purple_shorts: self.has(SpecialItem.lucky_purple_shorts) & self.has(Machine.sewing_machine),
+            SpecialItem.far_away_stone: self.special_items.has_far_away_stone(),
+            SpecialItem.solid_gold_lewis: self.special_items.has_solid_gold_lewis(),
+            SpecialItem.advanced_tv_remote: self.special_items.has_advanced_tv_remote(),
             SpeedGro.basic: self.money.can_spend_at(Region.pierre_store, 100),
             SpeedGro.deluxe: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150),
             Trash.broken_cd: self.fishing.can_crab_pot_anywhere,
@@ -312,11 +334,11 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             Fish.clam: self.tool.can_forage(Generic.any, Region.beach),
             Fish.cockle: self.tool.can_forage(Generic.any, Region.beach),
             WaterItem.green_algae: self.fishing.can_fish_in_freshwater(),
-            WaterItem.cave_jelly: self.fishing.can_fish_at(Region.mines_floor_100) & self.tool.has_fishing_rod(2),
-            WaterItem.river_jelly: self.fishing.can_fish_at(Region.town) & self.tool.has_fishing_rod(2),
-            WaterItem.sea_jelly: self.fishing.can_fish_at(Region.beach) & self.tool.has_fishing_rod(2),
+            WaterItem.cave_jelly: self.fishing.can_fish_at(Region.mines_floor_100) & self.tool.has_fishing_rod(FishingRod.bamboo),
+            WaterItem.river_jelly: self.fishing.can_fish_at(Region.town) & self.tool.has_fishing_rod(FishingRod.bamboo),
+            WaterItem.sea_jelly: self.fishing.can_fish_at(Region.beach) & self.tool.has_fishing_rod(FishingRod.bamboo),
             WaterItem.seaweed: self.fishing.can_fish_at(Region.tide_pools),
-            WaterItem.white_algae: self.fishing.can_fish_at(Region.mines_floor_20),
+            WaterItem.white_algae: self.fishing.can_fish_at(Region.mines_floor_20) & self.tool.has_fishing_rod(FishingRod.bamboo),
             WildSeeds.grass_starter: self.money.can_spend_at(Region.pierre_store, 100),
         })
         # @formatter:on
@@ -351,6 +373,10 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
             obtention_rule = self.registry.item_rules[recipe] if recipe in self.registry.item_rules else False_()
             self.registry.item_rules[recipe] = obtention_rule | crafting_rule
 
+        if self.options.bundle_randomization == BundleRandomization.option_meme:
+            self.meme.initialize_rules()
+            self.registry.item_rules.update(self.registry.meme_item_rules)
+
         self.quest.initialize_rules()
         self.quest.update_rules(self.mod.quest.get_modded_quest_rules())
 
@@ -359,31 +385,59 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
         self.special_order.initialize_rules()
         self.special_order.update_rules(self.mod.special_order.get_modded_special_orders_rules())
 
+        self.shirt.initialize_rules()
+        self.registry.item_rules.update(self.registry.shirt_rules)
+
+        for catalogue in items_by_catalogue:
+            for item in items_by_catalogue[catalogue]:
+                self.registry.item_rules[item] = self.has(catalogue)
+
+        for boots in tier_by_boots:
+            self.registry.item_rules[boots] = self.combat.has_specific_boots(boots)
+
     def setup_events(self, register_event: Callable[[str, str, StardewRule], None]) -> None:
-        for logic_event in all_logic_events:
-            rule = self.registry.item_rules[logic_event.item]
-            register_event(logic_event.name, logic_event.region, rule)
-            self.registry.item_rules[logic_event.item] = self.received(logic_event.name)
+        for item_event in all_item_events:
+            rule = self.registry.item_rules[item_event.item]
+
+            if isinstance(rule, Or) and bool(reaches := [r for r in rule.current_rules if isinstance(r, Reach) and r.resolution_hint == "Region"]):
+                logger.debug("Sharding rule for %s in multiple logic events, placed in %s.", item_event.item, [r.spot for r in reaches])
+
+                for i, reach in enumerate(reaches):
+                    location_name = f"{item_event.name} sharded_{i}"
+                    new_rule = self.region.can_reach(item_event.region)
+                    register_event(item_event.name, reach.spot, new_rule, location_name=location_name)
+
+                remaining_rules = [r for r in rule.current_rules if not isinstance(r, Reach) or r.resolution_hint != "Region"]
+                if remaining_rules:
+                    register_event(item_event.name, item_event.region, Or(*remaining_rules))
+
+            else:
+                register_event(item_event.name, item_event.region, rule)
+
+            self.registry.item_rules[item_event.item] = self.received(item_event.name)
 
     def can_smelt(self, item: str) -> StardewRule:
         return self.has(Machine.furnace) & self.has(item)
 
     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)
+        if self.content.is_enabled(ginger_island_content_pack):
+            return self.region.can_reach(Region.island_trader)
+        return self.logic.false_
 
     def has_abandoned_jojamart(self) -> StardewRule:
-        return self.received(CommunityUpgrade.movie_theater, 1)
+        return (self.received(CommunityUpgrade.movie_theater, 1) & self.season.has_any_not_winter()) | self.has_movie_theater()
 
     def has_movie_theater(self) -> StardewRule:
         return self.received(CommunityUpgrade.movie_theater, 2)
 
     def can_use_obelisk(self, obelisk: str) -> StardewRule:
-        return self.region.can_reach(Region.farm) & self.received(obelisk)
+        return self.region.can_reach(Region.farm) & self.building.has_wizard_building(obelisk)
 
-    def can_fish_pond(self, fish: str, *items: str) -> StardewRule:
-        rule = self.building.has_building(Building.fish_pond) & self.has(fish)
-        if items:
-            rule = rule & self.has_all(*items)
-        return rule
+    def can_purchase_statue_of_endless_fortune(self) -> StardewRule:
+        return self.money.can_spend_at(Region.casino, 1_000_000)
+
+    def has_statue_of_endless_fortune(self) -> StardewRule:
+        can_purchase_rule = self.can_purchase_statue_of_endless_fortune()
+        if self.options.include_endgame_locations == IncludeEndgameLocations.option_true:
+            return can_purchase_rule & self.received(Machine.statue_endless_fortune)
+        return can_purchase_rule
diff --git a/worlds/stardew_valley/logic/logic_event.py b/worlds/stardew_valley/logic/logic_event.py
index 9af1d62257..2e8e006407 100644
--- a/worlds/stardew_valley/logic/logic_event.py
+++ b/worlds/stardew_valley/logic/logic_event.py
@@ -1,11 +1,14 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 
 from ..strings.ap_names import event_names
+from ..strings.material_names import Material
 from ..strings.metal_names import MetalBar, Ore
 from ..strings.region_names import Region
 
 all_events = event_names.all_events.copy()
-all_logic_events = list()
+all_item_events: list[LogicItemEvent] = list()
 
 
 @dataclass(frozen=True)
@@ -25,9 +28,9 @@ class LogicItemEvent(LogicEvent):
 
 def register_item_event(item: str, region: str = Region.farm):
     event = LogicItemEvent(item, region)
-    all_logic_events.append(event)
+    all_item_events.append(event)
     all_events.add(event.name)
 
 
-for i in (MetalBar.copper, MetalBar.iron, MetalBar.gold, MetalBar.iridium, Ore.copper, Ore.iron, Ore.gold, Ore.iridium):
+for i in (Material.coal, MetalBar.copper, MetalBar.iron, MetalBar.gold, MetalBar.iridium, Ore.copper, Ore.iron, Ore.gold, Ore.iridium):
     register_item_event(i)
diff --git a/worlds/stardew_valley/logic/meme_items_logic.py b/worlds/stardew_valley/logic/meme_items_logic.py
new file mode 100644
index 0000000000..aaf8c2bfea
--- /dev/null
+++ b/worlds/stardew_valley/logic/meme_items_logic.py
@@ -0,0 +1,57 @@
+from .base_logic import BaseLogicMixin, BaseLogic
+from ..data.game_item import ItemTag
+from ..strings.ap_names.ap_weapon_names import APWeapon
+from ..strings.meme_item_names import MemeItem
+from ..strings.ring_names import all_ring_names
+from ..strings.special_item_names import NotReallyAnItem
+
+
+class MemeItemsLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.meme = MemeItemsLogic(*args, **kwargs)
+
+
+class MemeItemsLogic(BaseLogic):
+
+    def initialize_rules(self):
+        self.registry.meme_item_rules.update({
+            MemeItem.trap: self.logic.true_,
+            MemeItem.pot_of_gold: self.can_cheat(),
+            MemeItem.seed_spot: self.can_cheat(),
+            MemeItem.green_rain_weeds_0: self.can_cheat(),
+            MemeItem.lumber: self.can_cheat(),
+            MemeItem.weeds: self.can_cheat(),
+            MemeItem.twig: self.can_cheat(),
+            MemeItem.artifact_spot: self.can_cheat(),
+            MemeItem.warp_totem_qis_arena: self.can_cheat(),
+            MemeItem.supply_crate: self.can_cheat(),
+            MemeItem.slime_crate: self.can_cheat(),
+            MemeItem.decorative_pot: self.can_cheat(),
+            MemeItem.camping_stove: self.can_cheat(),
+            MemeItem.worn_pants: self.has_any_pants(),
+            MemeItem.worn_left_ring: self.has_any_ring(),
+            MemeItem.worn_right_ring: self.has_any_ring(),
+            MemeItem.worn_shirt: self.has_any_shirt(),
+            MemeItem.worn_boots: self.has_any_boots(),
+            MemeItem.worn_hat: self.has_any_hat(),
+            NotReallyAnItem.death: self.logic.true_,
+        })
+
+    def can_cheat(self):
+        return self.logic.true_
+
+    def has_any_pants(self):
+        return self.logic.true_
+
+    def has_any_shirt(self):
+        return self.logic.true_
+
+    def has_any_hat(self):
+        return self.logic.has_any(*[item.name for item in self.content.find_tagged_items(ItemTag.HAT)])
+
+    def has_any_ring(self):
+        return self.logic.received_any(*all_ring_names)
+
+    def has_any_boots(self):
+        return self.logic.received(APWeapon.footwear)
diff --git a/worlds/stardew_valley/logic/mine_logic.py b/worlds/stardew_valley/logic/mine_logic.py
index 2dacf67460..42bd709434 100644
--- a/worlds/stardew_valley/logic/mine_logic.py
+++ b/worlds/stardew_valley/logic/mine_logic.py
@@ -2,6 +2,7 @@ from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
 from .. import options
 from ..stardew_rule import StardewRule, True_
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
 from ..strings.performance_names import Performance
 from ..strings.region_names import Region
 from ..strings.skill_names import Skill
@@ -26,8 +27,7 @@ class MineLogic(BaseLogic):
         return self.logic.region.can_reach(Region.mines_floor_85)
 
     def can_mine_in_the_skull_cavern(self) -> StardewRule:
-        return (self.logic.mine.can_progress_in_the_mines_from_floor(120) &
-                self.logic.region.can_reach(Region.skull_cavern))
+        return self.logic.region.can_reach(Region.skull_cavern_mining)
 
     @cache_self1
     def get_weapon_rule_for_floor_tier(self, tier: int):
@@ -43,23 +43,40 @@ class MineLogic(BaseLogic):
 
     @cache_self1
     def can_progress_in_the_mines_from_floor(self, floor: int) -> StardewRule:
-        tier = floor // 40
+        assert floor >= 0
+        # 0-39, 40-79, 80-119
+        mine_tier = floor // 40
+        combat_tier = mine_tier
         rules = []
 
-        weapon_rule = self.logic.mine.get_weapon_rule_for_floor_tier(tier)
+        if CustomLogicOptionName.extreme_combat in self.options.custom_logic:
+            combat_tier -= 2
+        elif CustomLogicOptionName.hard_combat in self.options.custom_logic:
+            combat_tier -= 1
+        elif CustomLogicOptionName.easy_combat in self.options.custom_logic:
+            combat_tier += 1
+        combat_tier = max(0, combat_tier)
+
+        if CustomLogicOptionName.extreme_mining in self.options.custom_logic:
+            mine_tier -= 2
+        elif CustomLogicOptionName.hard_mining in self.options.custom_logic:
+            mine_tier -= 1
+        elif self.options.tool_progression.is_progressive and CustomLogicOptionName.easy_mining in self.options.custom_logic:
+            mine_tier += 1
+        mine_tier = max(0, mine_tier)
+
+        weapon_rule = self.logic.mine.get_weapon_rule_for_floor_tier(combat_tier)
         rules.append(weapon_rule)
 
-        tool_rule = self.logic.tool.can_mine_using(ToolMaterial.tiers[tier])
+        tool_rule = self.logic.tool.can_mine_using(ToolMaterial.tiers[min(5, mine_tier + 1)])
         rules.append(tool_rule)
 
         # No alternative for vanilla because we assume that you will grind the levels in the mines.
         if self.content.features.skill_progression.is_progressive:
-            skill_level = min(10, max(0, tier * 2))
-            rules.append(self.logic.skill.has_level(Skill.combat, skill_level))
-            rules.append(self.logic.skill.has_level(Skill.mining, skill_level))
-
-        if tier >= 4:
-            rules.append(self.logic.cooking.can_cook())
+            combat_level = min(10, max(0, mine_tier * 2))
+            mining_level = min(10, max(0, mine_tier * 2))
+            rules.append(self.logic.skill.has_level(Skill.combat, combat_level))
+            rules.append(self.logic.skill.has_level(Skill.mining, mining_level))
 
         return self.logic.and_(*rules)
 
@@ -73,19 +90,47 @@ class MineLogic(BaseLogic):
 
     @cache_self1
     def can_progress_in_the_skull_cavern_from_floor(self, floor: int) -> StardewRule:
-        tier = floor // 50
+        assert floor >= 0
+        # 0-49, 50-99, 100-149, 150-199, 200-249
+        mining_tier = floor // 50
+        combat_tier = mining_tier
         rules = []
 
-        weapon_rule = self.logic.combat.has_great_weapon
+        if CustomLogicOptionName.extreme_combat in self.options.custom_logic:
+            weapon_rule = self.logic.combat.has_decent_weapon
+            combat_tier -= 2
+        elif CustomLogicOptionName.hard_combat in self.options.custom_logic:
+            weapon_rule = self.logic.combat.has_good_weapon
+            combat_tier -= 1
+        elif CustomLogicOptionName.easy_combat in self.options.custom_logic:
+            weapon_rule = self.logic.combat.has_galaxy_weapon
+            combat_tier += 1
+        else:
+            weapon_rule = self.logic.combat.has_great_weapon
+        combat_tier = max(0, combat_tier)
+
+        if CustomLogicOptionName.extreme_mining in self.options.custom_logic:
+            mining_tier -= 2
+        elif CustomLogicOptionName.hard_mining in self.options.custom_logic:
+            mining_tier -= 1
+        elif self.options.tool_progression.is_progressive and CustomLogicOptionName.easy_mining in self.options.custom_logic:
+            mining_tier += 1
+        tool_tier = mining_tier + 2
+        tool_tier = min(5, max(1, tool_tier))
+        mining_tier = max(0, mining_tier)
+
         rules.append(weapon_rule)
 
-        tool_rule = self.logic.tool.can_mine_using(ToolMaterial.tiers[min(4, max(0, tier + 2))])
+        tool_rule = self.logic.tool.can_mine_using(ToolMaterial.tiers[tool_tier])
         rules.append(tool_rule)
 
         # No alternative for vanilla because we assume that you will grind the levels in the mines.
         if self.content.features.skill_progression.is_progressive:
-            skill_level = min(10, max(0, tier * 2 + 6))
-            rules.extend((self.logic.skill.has_level(Skill.combat, skill_level),
-                          self.logic.skill.has_level(Skill.mining, skill_level)))
+            combat_level = min(10, max(0, combat_tier * 2 + 6))
+            mining_level = min(10, max(0, mining_tier * 2 + 6))
+            rules.append(self.logic.skill.has_level(Skill.combat, combat_level))
+            rules.append(self.logic.skill.has_level(Skill.mining, mining_level))
+
+        rules.append(self.logic.cooking.can_cook())
 
         return self.logic.and_(*rules)
diff --git a/worlds/stardew_valley/logic/money_logic.py b/worlds/stardew_valley/logic/money_logic.py
index 8f459a172b..77aa3f5e90 100644
--- a/worlds/stardew_valley/logic/money_logic.py
+++ b/worlds/stardew_valley/logic/money_logic.py
@@ -1,10 +1,19 @@
+from Options import DeathLink
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
-from ..data.shop import ShopSource
-from ..options import SpecialOrderLocations
+from ..content.vanilla.qi_board import qi_board_content_pack
+from ..data.shop import ShopSource, HatMouseSource
 from ..stardew_rule import StardewRule, True_, HasProgressionPercent, False_, true_
-from ..strings.currency_names import Currency
+from ..strings.animal_names import Animal
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
+from ..strings.ap_names.event_names import Event
+from ..strings.artisan_good_names import ArtisanGood
+from ..strings.building_names import Building
+from ..strings.crop_names import Vegetable
+from ..strings.currency_names import Currency, MemeCurrency
+from ..strings.food_names import Beverage
 from ..strings.region_names import Region, LogicRegion
+from ..strings.season_names import Season
 
 qi_gem_rewards = ("100 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems", "25 Qi Gems",
                   "20 Qi Gems", "15 Qi Gems", "10 Qi Gems")
@@ -20,52 +29,77 @@ class MoneyLogic(BaseLogic):
 
     @cache_self1
     def can_have_earned_total(self, amount: int) -> StardewRule:
+
+        if CustomLogicOptionName.nightmare_money in self.options.custom_logic:
+            amount /= 20
+        elif CustomLogicOptionName.extreme_money in self.options.custom_logic:
+            amount /= 8
+        elif CustomLogicOptionName.hard_money in self.options.custom_logic:
+            amount /= 2
+        elif CustomLogicOptionName.easy_money in self.options.custom_logic:
+            amount *= 4
+
         if amount <= 1000:
             return self.logic.true_
 
-        pierre_rule = self.logic.region.can_reach_all((Region.pierre_store, Region.forest))
-        willy_rule = self.logic.region.can_reach_all((Region.fish_shop, LogicRegion.fishing))
-        clint_rule = self.logic.region.can_reach_all((Region.blacksmith, Region.mines_floor_5))
-        robin_rule = self.logic.region.can_reach_all((Region.carpenter, Region.secret_woods))
         shipping_rule = self.logic.shipping.can_use_shipping_bin
+        pierre_rule = self.logic.region.can_reach_all(Region.pierre_store, Region.forest)
+        willy_rule = self.logic.region.can_reach_all(Region.fish_shop, LogicRegion.fishing)
+        clint_rule = self.logic.region.can_reach_all(Region.blacksmith, Region.mines_floor_5)
+        robin_rule = self.logic.region.can_reach_all(Region.carpenter, Region.secret_woods)
+        farming_rule = self.logic.farming.can_plant_and_grow_item(Season.not_winter)
 
-        if amount <= 2500:
-            selling_any_rule = pierre_rule | willy_rule | clint_rule | robin_rule | shipping_rule
+        if amount <= 2000:
+            selling_any_rule = shipping_rule | pierre_rule | willy_rule | clint_rule | robin_rule
+            return selling_any_rule
+
+        if amount <= 3000:
+            selling_any_rule = shipping_rule | pierre_rule | willy_rule
             return selling_any_rule
 
         if amount <= 5000:
-            selling_all_rule = (pierre_rule & willy_rule & clint_rule & robin_rule) | shipping_rule
+            selling_all_rule = shipping_rule | (pierre_rule & farming_rule) | (pierre_rule & willy_rule & clint_rule & robin_rule)
             return selling_all_rule
 
         if amount <= 10000:
-            return shipping_rule
+            return shipping_rule & farming_rule
 
         seed_rules = self.logic.region.can_reach(Region.pierre_store)
         if amount <= 40000:
-            return shipping_rule & seed_rules
+            return shipping_rule & seed_rules & farming_rule
 
         percent_progression_items_needed = min(90, amount // 20000)
-        return shipping_rule & seed_rules & HasProgressionPercent(self.player, percent_progression_items_needed)
+        return shipping_rule & seed_rules & farming_rule & HasProgressionPercent(self.player, percent_progression_items_needed)
 
     @cache_self1
     def can_spend(self, amount: int) -> StardewRule:
         if self.options.starting_money == -1:
             return True_()
-        return self.logic.money.can_have_earned_total(amount * 5)
+        spend_earned_multiplier = 5  # We assume that if you earned 5x an amount, you can reasonably spend that amount on things
+        return self.logic.money.can_have_earned_total(amount * spend_earned_multiplier)
 
     # Should be cached
     def can_spend_at(self, region: str, amount: int) -> StardewRule:
         return self.logic.region.can_reach(region) & self.logic.money.can_spend(amount)
 
+    def can_shop_from_hat_mouse(self, source: HatMouseSource) -> StardewRule:
+        money_rule = self.logic.money.can_spend(source.price) if source.price is not None else true_
+        region_rule = self.logic.region.can_reach(LogicRegion.hat_mouse)
+        requirements_rule = self.logic.requirement.meet_all_requirements(source.unlock_requirements) if source.unlock_requirements is not None else true_
+        return money_rule & region_rule & requirements_rule
+
     @cache_self1
     def can_shop_from(self, source: ShopSource) -> StardewRule:
         season_rule = self.logic.season.has_any(source.seasons)
-        money_rule = self.logic.money.can_spend(source.money_price) if source.money_price is not None else true_
+        if source.currency == Currency.money:
+            money_rule = self.logic.money.can_spend(source.price) if source.price is not None else true_
+        else:
+            money_rule = self.logic.money.can_trade_at(source.shop_region, source.currency, source.price) if source.price is not None else true_
 
         item_rules = []
         if source.items_price is not None:
             for price, item in source.items_price:
-                item_rules.append(self.logic.has(item) & self.logic.grind.can_grind_item(price, item))
+                item_rules.append(self.logic.grind.can_grind_item(price, item))
 
         region_rule = self.logic.region.can_reach(source.shop_region)
 
@@ -74,24 +108,71 @@ class MoneyLogic(BaseLogic):
     # Should be cached
     def can_trade(self, currency: str, amount: int) -> StardewRule:
         if amount == 0:
-            return True_()
-        if currency == Currency.money:
+            return self.logic.true_
+
+        if currency == Currency.money or currency == MemeCurrency.bank_money:
             return self.can_spend(amount)
         if currency == Currency.star_token:
             return self.logic.region.can_reach(LogicRegion.fair)
         if currency == Currency.qi_coin:
             return self.logic.region.can_reach(Region.casino) & self.logic.time.has_lived_months(amount // 1000)
         if currency == Currency.qi_gem:
-            if self.options.special_order_locations & SpecialOrderLocations.value_qi:
-                number_rewards = min(len(qi_gem_rewards), max(1, (amount // 10)))
-                return self.logic.received_n(*qi_gem_rewards, count=number_rewards)
-            number_rewards = 2
-            return self.logic.received_n(*qi_gem_rewards, count=number_rewards) & self.logic.region.can_reach(Region.qi_walnut_room) & \
-                self.logic.region.can_reach(Region.saloon) & self.can_have_earned_total(5000)
+            if self.content.is_enabled(qi_board_content_pack):
+                return self.logic.received(Event.received_qi_gems, amount * 3)
+            return self.logic.region.can_reach_all(Region.qi_walnut_room, Region.saloon) & self.can_have_earned_total(5000)
         if currency == Currency.golden_walnut:
             return self.can_spend_walnut(amount)
 
-        return self.logic.has(currency) & self.logic.grind.can_grind_item(amount)
+        if currency == MemeCurrency.code or currency == MemeCurrency.energy or currency == MemeCurrency.blood:
+            return self.logic.true_
+        if currency == MemeCurrency.clic and amount < 100:
+            return self.logic.true_
+        if currency == MemeCurrency.clic or currency == MemeCurrency.time:
+            return self.logic.time.has_lived_months(1)
+
+        if currency == MemeCurrency.steps and amount < 6000:
+            return self.logic.true_
+        if currency == MemeCurrency.steps:
+            return self.logic.time.has_lived_months(amount // 10000)
+
+        if currency == MemeCurrency.cookies:
+            return self.logic.time.has_lived_months(amount // 10000)
+        if currency == MemeCurrency.child:
+            return self.logic.relationship.has_children(1)
+        if currency == MemeCurrency.dead_crops:
+            return self.logic.season.has_all() & self.logic.skill.can_get_farming_xp & self.logic.money.can_spend(amount * 100)
+        if currency == MemeCurrency.dead_pumpkins:
+            return self.logic.season.has(Season.fall) & self.logic.season.has_any([Season.spring, Season.summer, Season.winter]) & \
+                self.logic.has(Vegetable.pumpkin) & self.logic.money.can_spend(amount * 100)
+        if currency == MemeCurrency.missed_fish:
+            return self.logic.fishing.can_catch_many_fish(max(1, amount // 4))
+        if currency == MemeCurrency.honeywell:
+            return self.logic.has(ArtisanGood.honey) & self.logic.building.has_building(Building.well)
+        if currency == MemeCurrency.goat:
+            return self.logic.animal.has_animal(Animal.goat)
+
+        if currency == MemeCurrency.sleep_days:
+            if not self.options.multiple_day_sleep_enabled.value:
+                return self.logic.false_
+            if amount > 200:
+                return self.logic.region.can_reach(Region.farm_house) & self.logic.season.has(Season.winter)
+            return self.logic.region.can_reach(Region.farm_house)
+
+        if currency == MemeCurrency.time_elapsed:
+            if amount <= 1000:
+                return self.logic.true_
+            if amount <= 1400:
+                return self.logic.has(Beverage.coffee)
+            if amount <= 1800:
+                return self.logic.building.has_building(Building.stable)
+            return self.logic.has(Beverage.coffee) & self.logic.building.has_building(Building.stable)
+
+        if currency == MemeCurrency.deathlinks:
+            if self.options.death_link == DeathLink.option_true:
+                return self.logic.time.has_lived_months(amount)
+            return self.logic.false_
+
+        return self.logic.grind.can_grind_item(amount, currency)
 
     # Should be cached
     def can_trade_at(self, region: str, currency: str, amount: int) -> StardewRule:
diff --git a/worlds/stardew_valley/logic/monster_logic.py b/worlds/stardew_valley/logic/monster_logic.py
index 5d2ac3d3f6..19991285ca 100644
--- a/worlds/stardew_valley/logic/monster_logic.py
+++ b/worlds/stardew_valley/logic/monster_logic.py
@@ -3,12 +3,9 @@ from typing import Iterable, Union, Hashable
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
-from .combat_logic import CombatLogicMixin
-from .has_logic import HasLogicMixin
-from .region_logic import RegionLogicMixin
-from .time_logic import TimeLogicMixin, MAX_MONTHS
-from .. import options
+from .time_logic import MAX_MONTHS
 from ..data import monster_data
+from ..data.fish_data import ginger_island_river
 from ..stardew_rule import StardewRule
 from ..strings.generic_names import Generic
 from ..strings.region_names import Region
@@ -24,11 +21,11 @@ class MonsterLogic(BaseLogic):
 
     @cached_property
     def all_monsters_by_name(self):
-        return monster_data.all_monsters_by_name_given_mods(self.options.mods.value)
+        return monster_data.all_monsters_by_name_given_content_packs(self.content.registered_packs)
 
     @cached_property
     def all_monsters_by_category(self):
-        return monster_data.all_monsters_by_category_given_mods(self.options.mods.value)
+        return monster_data.all_monsters_by_category_given_content_packs(self.content.registered_packs)
 
     def can_kill(self, monster: Union[str, monster_data.StardewMonster], amount_tier: int = 0) -> StardewRule:
         if amount_tier <= 0:
@@ -40,30 +37,30 @@ class MonsterLogic(BaseLogic):
                 return self.logic.monster.can_kill_any(self.all_monsters_by_name.values()) & time_rule
 
             monster = self.all_monsters_by_name[monster]
-        region_rule = self.logic.region.can_reach_any(monster.locations)
+        region_rule = self.logic.region.can_reach_any(*monster.locations)
         combat_rule = self.logic.combat.can_fight_at_level(monster.difficulty)
 
         return region_rule & combat_rule & time_rule
 
     @cache_self1
-    def can_kill_many(self, monster: monster_data.StardewMonster) -> StardewRule:
+    def can_kill_many(self, monster: Union[str, monster_data.StardewMonster]) -> StardewRule:
         return self.logic.monster.can_kill(monster, MAX_MONTHS / 3)
 
     @cache_self1
-    def can_kill_max(self, monster: monster_data.StardewMonster) -> StardewRule:
+    def can_kill_max(self, monster: Union[str, monster_data.StardewMonster]) -> StardewRule:
         return self.logic.monster.can_kill(monster, MAX_MONTHS)
 
     # Should be cached
-    def can_kill_any(self, monsters: (Iterable[monster_data.StardewMonster], Hashable), amount_tier: int = 0) -> StardewRule:
+    def can_kill_any(self, monsters: (Iterable[Union[str, monster_data.StardewMonster]], Hashable), amount_tier: int = 0) -> StardewRule:
         return self.logic.or_(*(self.logic.monster.can_kill(monster, amount_tier) for monster in monsters))
 
     # Should be cached
-    def can_kill_all(self, monsters: (Iterable[monster_data.StardewMonster], Hashable), amount_tier: int = 0) -> StardewRule:
+    def can_kill_all(self, monsters: (Iterable[Union[str, monster_data.StardewMonster]], Hashable), amount_tier: int = 0) -> StardewRule:
         return self.logic.and_(*(self.logic.monster.can_kill(monster, amount_tier) for monster in monsters))
 
     def can_complete_all_monster_slaying_goals(self) -> StardewRule:
         rules = [self.logic.time.has_lived_max_months]
-        exclude_island = self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+        exclude_island = not self.content.is_enabled(ginger_island_river)
         island_regions = [Region.volcano_floor_5, Region.volcano_floor_10, Region.island_west, Region.dangerous_skull_cavern]
         for category in self.all_monsters_by_category:
             if exclude_island and all(all(location in island_regions for location in monster.locations)
diff --git a/worlds/stardew_valley/logic/movie_logic.py b/worlds/stardew_valley/logic/movie_logic.py
new file mode 100644
index 0000000000..c546a65005
--- /dev/null
+++ b/worlds/stardew_valley/logic/movie_logic.py
@@ -0,0 +1,58 @@
+from .base_logic import BaseLogicMixin, BaseLogic
+from ..data.movies import movies_by_name, npc_snacks, Snack, Movie, snacks_by_name
+from ..stardew_rule import StardewRule, Or
+from ..strings.villager_names import NPC
+
+
+class MovieLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.movie = MovieLogic(*args, **kwargs)
+
+
+class MovieLogic(BaseLogic):
+
+    def can_watch_movie(self, movie: str | Movie) -> StardewRule:
+        if isinstance(movie, str):
+            movie = movies_by_name[movie]
+        return self.logic.season.has(movie.season)
+
+    def can_watch_movie_with_loving_npc(self, movie: str | Movie) -> StardewRule:
+        if isinstance(movie, str):
+            movie = movies_by_name[movie]
+        return self.can_watch_movie(movie) & self.logic.relationship.can_meet_any(*movie.loving_npcs)
+
+    def can_invite_to_movie(self, npcs: str | list[str]) -> StardewRule:
+        if isinstance(npcs, str):
+            npc = npcs
+            if npc == NPC.leo:
+                return self.logic.relationship.has_hearts(NPC.leo, 6)
+            return self.logic.relationship.can_meet(npc)
+        return self.logic.or_(*[self.can_invite_to_movie(npc) for npc in npcs])
+
+    def can_watch_movie_with_loving_npc_and_snack(self, movie: str | Movie) -> StardewRule:
+        if isinstance(movie, str):
+            movie = movies_by_name[movie]
+        potential_partner_rules = []
+        for npc in movie.loving_npcs:
+            meet_rule = self.can_invite_to_movie(npc)
+            snack_rule = self.can_buy_loved_snack(npc)
+            potential_partner_rules.append(meet_rule & snack_rule)
+        return self.can_watch_movie(movie) & Or(*potential_partner_rules)
+
+    def can_buy_loved_snack(self, npc: str) -> StardewRule:
+        snacks = npc_snacks[npc]
+        if not snacks:
+            return self.logic.false_
+        snacks_rule = Or(*[self.can_buy_snack(snack) for snack in snacks])
+        return snacks_rule
+
+    def can_buy_snack(self, snack: str | Snack) -> StardewRule:
+        if isinstance(snack, str):
+            snack = snacks_by_name[snack]
+        return self.logic.received(snack.category)
+
+    def can_buy_snack_for_someone_who_loves_it(self, snack: str | Snack) -> StardewRule:
+        if isinstance(snack, str):
+            snack = snacks_by_name[snack]
+        return self.logic.received(snack.category) & self.can_invite_to_movie(snack.loving_npcs)
diff --git a/worlds/stardew_valley/logic/museum_logic.py b/worlds/stardew_valley/logic/museum_logic.py
index 21718db27c..230e7a85a1 100644
--- a/worlds/stardew_valley/logic/museum_logic.py
+++ b/worlds/stardew_valley/logic/museum_logic.py
@@ -1,3 +1,5 @@
+import math
+
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
 from .. import options
@@ -5,7 +7,9 @@ from ..data.museum_data import MuseumItem, all_museum_items, all_museum_artifact
 from ..stardew_rule import StardewRule, False_
 from ..strings.metal_names import Mineral
 from ..strings.region_names import Region
-from ..strings.tool_names import Tool, ToolMaterial
+from ..strings.tool_names import ToolMaterial, Tool
+
+gems = (Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz)
 
 
 class MuseumLogicMixin(BaseLogicMixin):
@@ -24,10 +28,12 @@ class MuseumLogic(BaseLogic):
 
     @cache_self1
     def can_find_museum_item(self, item: MuseumItem) -> StardewRule:
-        if item.locations:
-            region_rule = self.logic.region.can_reach_all_except_one(item.locations)
+        if item.artifact_spot_locations:
+            number_locations = len(item.artifact_spot_locations)
+            number_required_locations = math.ceil(number_locations / 2)
+            artifact_spot_rule = self.logic.count(number_required_locations, *[self.logic.tool.can_use_tool_at(Tool.hoe, ToolMaterial.basic, spot) for spot in item.artifact_spot_locations])
         else:
-            region_rule = False_()
+            artifact_spot_rule = False_()
         if item.geodes:
             geodes_rule = self.logic.and_(*(self.logic.action.can_open_geode(geode) for geode in item.geodes))
         else:
@@ -37,8 +43,8 @@ class MuseumLogic(BaseLogic):
         time_rule = self.logic.time.has_lived_months(time_needed_to_grind)
         pan_rule = False_()
         if item.item_name == Mineral.earth_crystal or item.item_name == Mineral.fire_quartz or item.item_name == Mineral.frozen_tear:
-            pan_rule = self.logic.tool.has_tool(Tool.pan, ToolMaterial.iridium)
-        return (pan_rule | region_rule | geodes_rule) & time_rule  # & monster_rule & extra_rule
+            pan_rule = self.logic.tool.has_pan(ToolMaterial.iridium)
+        return (pan_rule | artifact_spot_rule | geodes_rule) & time_rule  # & monster_rule & extra_rule
 
     def can_find_museum_artifacts(self, number: int) -> StardewRule:
         rules = []
@@ -75,3 +81,9 @@ class MuseumLogic(BaseLogic):
 
     def can_donate(self, item: str) -> StardewRule:
         return self.logic.has(item) & self.logic.region.can_reach(Region.museum)
+
+    def has_any_gem(self) -> StardewRule:
+        return self.logic.has_any(*gems)
+
+    def has_all_gems(self) -> StardewRule:
+        return self.logic.has_all(*gems)
diff --git a/worlds/stardew_valley/logic/pet_logic.py b/worlds/stardew_valley/logic/pet_logic.py
index 9d66e8f274..d8226b0d7a 100644
--- a/worlds/stardew_valley/logic/pet_logic.py
+++ b/worlds/stardew_valley/logic/pet_logic.py
@@ -3,6 +3,7 @@ import math
 from .base_logic import BaseLogicMixin, BaseLogic
 from ..content.feature.friendsanity import pet_heart_item_name
 from ..stardew_rule import StardewRule, True_
+from ..strings.building_names import Building
 from ..strings.region_names import Region
 
 
@@ -14,8 +15,7 @@ class PetLogicMixin(BaseLogicMixin):
 
 class PetLogic(BaseLogic):
     def has_pet_hearts(self, hearts: int = 1) -> StardewRule:
-        assert hearts >= 0, "You can't have negative hearts with a pet."
-        if hearts == 0:
+        if hearts <= 0:
             return True_()
 
         if self.content.features.friendsanity.is_pet_randomized:
@@ -28,15 +28,17 @@ class PetLogic(BaseLogic):
                                    math.ceil(hearts / self.content.features.friendsanity.heart_size))
 
     def can_befriend_pet(self, hearts: int) -> StardewRule:
-        assert hearts >= 0, "You can't have negative hearts with a pet."
-        if hearts == 0:
+        if hearts <= 0:
             return True_()
 
+        heart_size = self.content.features.friendsanity.heart_size
+        previous_heart = max(hearts - heart_size, 0)
+        previous_heart_rule = self.has_pet_hearts(previous_heart)
         points = hearts * 200
         points_per_month = 12 * 14
         points_per_water_month = 18 * 14
         farm_rule = self.logic.region.can_reach(Region.farm)
-        time_with_water_rule = self.logic.tool.can_water(0) & self.logic.time.has_lived_months(points // points_per_water_month)
+        time_with_water_rule = self.logic.tool.can_water() & self.logic.time.has_lived_months(points // points_per_water_month)
         time_without_water_rule = self.logic.time.has_lived_months(points // points_per_month)
         time_rule = time_with_water_rule | time_without_water_rule
-        return farm_rule & time_rule
+        return farm_rule & time_rule & self.logic.building.has_building(Building.pet_bowl) & previous_heart_rule
diff --git a/worlds/stardew_valley/logic/quality_logic.py b/worlds/stardew_valley/logic/quality_logic.py
index 7f5da4be53..4af95cf2f3 100644
--- a/worlds/stardew_valley/logic/quality_logic.py
+++ b/worlds/stardew_valley/logic/quality_logic.py
@@ -1,9 +1,5 @@
-from typing import Union
-
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
-from .farming_logic import FarmingLogicMixin
-from .skill_logic import SkillLogicMixin
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.quality_names import CropQuality
 
@@ -21,13 +17,13 @@ class QualityLogic(BaseLogic):
         if quality == CropQuality.basic:
             return True_()
         if quality == CropQuality.silver:
-            return self.logic.skill.has_farming_level(5) | (self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(2)) | (
-                    self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(1)) | self.logic.farming.has_fertilizer(3)
+            return self.logic.skill.has_farming_level(7) | (self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(3)) | (
+                    self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(2)) | self.logic.farming.has_fertilizer(3)
         if quality == CropQuality.gold:
             return self.logic.skill.has_farming_level(10) | (
-                    self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(5)) | (
-                    self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(3)) | (
-                    self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(2))
+                    self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(10)) | (
+                    self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(6)) | (
+                    self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(3))
         if quality == CropQuality.iridium:
-            return self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(4)
+            return self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(10)
         return False_()
diff --git a/worlds/stardew_valley/logic/quest_logic.py b/worlds/stardew_valley/logic/quest_logic.py
index af52d06e30..a1884a17f6 100644
--- a/worlds/stardew_valley/logic/quest_logic.py
+++ b/worlds/stardew_valley/logic/quest_logic.py
@@ -2,6 +2,7 @@ from typing import Dict
 
 from .base_logic import BaseLogicMixin, BaseLogic
 from ..stardew_rule import StardewRule, Has, True_
+from ..strings.ap_names.ap_option_names import SecretsanityOptionName
 from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
 from ..strings.artisan_good_names import ArtisanGood
 from ..strings.building_names import Building
@@ -17,7 +18,8 @@ from ..strings.monster_drop_names import Loot
 from ..strings.quest_names import Quest
 from ..strings.region_names import Region
 from ..strings.season_names import Season
-from ..strings.tool_names import Tool
+from ..strings.special_item_names import SpecialItem
+from ..strings.tool_names import Tool, FishingRod
 from ..strings.villager_names import NPC
 from ..strings.wallet_item_names import Wallet
 
@@ -40,14 +42,14 @@ class QuestLogic(BaseLogic):
             Quest.feeding_animals: self.logic.quest.can_complete_quest(Quest.getting_started) & self.logic.building.has_building(Building.silo),
             Quest.advancement: self.logic.quest.can_complete_quest(Quest.getting_started) & self.logic.has(Craftable.scarecrow),
             Quest.archaeology: self.logic.tool.has_tool(Tool.hoe) | self.logic.mine.can_mine_in_the_mines_floor_1_40() | self.logic.fishing.can_fish_chests,
-            Quest.rat_problem: self.logic.region.can_reach_all((Region.town, Region.community_center)),
-            Quest.meet_the_wizard: self.logic.quest.can_complete_quest(Quest.rat_problem),
+            Quest.rat_problem: self.logic.region.can_reach_all(Region.town, Region.community_center),
+            Quest.meet_the_wizard: self.logic.region.can_reach_all(Region.community_center, Region.wizard_tower) & self.logic.received("Wizard Invitation"),
             Quest.forging_ahead: self.logic.has(Ore.copper) & self.logic.has(Machine.furnace),
             Quest.smelting: self.logic.has(MetalBar.copper),
             Quest.initiation: self.logic.mine.can_mine_in_the_mines_floor_1_40(),
             Quest.robins_lost_axe: self.logic.season.has(Season.spring) & self.logic.relationship.can_meet(NPC.robin),
             Quest.jodis_request: self.logic.season.has(Season.spring) & self.logic.has(Vegetable.cauliflower) & self.logic.relationship.can_meet(NPC.jodi),
-            Quest.mayors_shorts: self.logic.season.has(Season.summer) & self.logic.relationship.has_hearts(NPC.marnie, 2) &
+            Quest.mayors_shorts: self.logic.has(SpecialItem.lucky_purple_shorts) &
                                  self.logic.relationship.can_meet(NPC.lewis),
             Quest.blackberry_basket: self.logic.season.has(Season.fall) & self.logic.relationship.can_meet(NPC.linus) & self.logic.region.can_reach(
                 Region.tunnel_entrance),
@@ -60,12 +62,12 @@ class QuestLogic(BaseLogic):
             Quest.knee_therapy: self.logic.season.has(Season.summer) & self.logic.has(Fruit.hot_pepper) & self.logic.relationship.can_meet(NPC.george),
             Quest.robins_request: self.logic.season.has(Season.winter) & self.logic.has(Material.hardwood) & self.logic.relationship.can_meet(NPC.robin),
             Quest.qis_challenge: True_(),  # The skull cavern floor 25 already has rules
-            Quest.the_mysterious_qi: (self.logic.region.can_reach_all((Region.bus_tunnel, Region.railroad, Region.mayor_house)) &
+            Quest.the_mysterious_qi: (self.logic.region.can_reach_all(Region.bus_tunnel, Region.railroad, Region.mayor_house) &
                                       self.logic.has_all(ArtisanGood.battery_pack, Forageable.rainbow_shell, Vegetable.beet, Loot.solar_essence)),
             Quest.carving_pumpkins: self.logic.season.has(Season.fall) & self.logic.has(Vegetable.pumpkin) & self.logic.relationship.can_meet(NPC.caroline),
             Quest.a_winter_mystery: self.logic.season.has(Season.winter),
             Quest.strange_note: self.logic.has(Forageable.secret_note) & self.logic.has(ArtisanGood.maple_syrup),
-            Quest.cryptic_note: self.logic.has(Forageable.secret_note),
+            Quest.cryptic_note: self.logic.has(Forageable.secret_note) & self.logic.region.can_reach(Region.skull_cavern_100),
             Quest.fresh_fruit: self.logic.season.has(Season.spring) & self.logic.has(Fruit.apricot) & self.logic.relationship.can_meet(NPC.emily),
             Quest.aquatic_research: self.logic.season.has(Season.summer) & self.logic.has(Fish.pufferfish) & self.logic.relationship.can_meet(NPC.demetrius),
             Quest.a_soldiers_star: (self.logic.season.has(Season.summer) & self.logic.time.has_year_two & self.logic.has(Fruit.starfruit) &
@@ -93,7 +95,7 @@ class QuestLogic(BaseLogic):
             Quest.the_pirates_wife: self.logic.relationship.can_meet(NPC.kent) & self.logic.relationship.can_meet(NPC.gus) &
                                     self.logic.relationship.can_meet(NPC.sandy) & self.logic.relationship.can_meet(NPC.george) &
                                     self.logic.relationship.can_meet(NPC.wizard) & self.logic.relationship.can_meet(NPC.willy),
-            Quest.giant_stump: self.logic.has(Material.hardwood)
+            Quest.giant_stump: self.logic.received(CommunityUpgrade.raccoon) & self.logic.has(Material.hardwood)
         })
 
     def update_rules(self, new_rules: Dict[str, StardewRule]):
@@ -103,7 +105,7 @@ class QuestLogic(BaseLogic):
         return Has(quest, self.registry.quest_rules, "quest")
 
     def has_club_card(self) -> StardewRule:
-        if self.options.quest_locations.has_story_quests():
+        if self.options.quest_locations.has_story_quests() or SecretsanityOptionName.secret_notes in self.options.secretsanity:
             return self.logic.received(Wallet.club_card)
         return self.logic.quest.can_complete_quest(Quest.the_mysterious_qi)
 
@@ -117,10 +119,44 @@ class QuestLogic(BaseLogic):
             return self.logic.received(Wallet.dark_talisman)
         return self.logic.quest.can_complete_quest(Quest.dark_talisman)
 
-    def has_raccoon_shop(self) -> StardewRule:
+    def has_magic_ink(self) -> StardewRule:
         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)
+            return self.logic.received(Wallet.magic_ink)
+        return self.logic.quest.can_complete_quest(Quest.magic_ink)
+
+    def has_raccoon_shop(self, tier: int = 1) -> StardewRule:
+        number_raccoons_required = 1 + tier  # 1 for Mr Raccoon, plus 1 for each shop tier at Mrs Raccoon
+        if self.options.quest_locations.has_story_quests():
+            # Add one for repairing the tree. This one is done manually if quests are turned off
+            return self.logic.received(CommunityUpgrade.raccoon, 1 + number_raccoons_required)
+        return self.logic.received(CommunityUpgrade.raccoon, number_raccoons_required) & self.logic.quest.can_complete_quest(Quest.giant_stump)
+
+    def can_complete_help_wanteds(self, number: int) -> StardewRule:
+        number_per_month = 7
+        number_months = number // number_per_month
+        if number <= 7:
+            return self.logic.time.has_lived_months(number_months)
+        return self.logic.time.has_lived_months(number_months) &\
+               self.can_do_item_delivery_quest() & self.can_do_gathering_quest() &\
+               self.can_do_fishing_quest() & self.can_do_slaying_quest()
+
+    def can_do_item_delivery_quest(self) -> StardewRule:
+        return self.logic.region.can_reach(Region.town)
+
+    def can_do_gathering_quest(self) -> StardewRule:
+        return self.logic.region.can_reach_all(*(Region.town, Region.forest)) & \
+               self.logic.region.can_reach_any(*(Region.mines, Region.quarry, Region.skull_cavern_25)) & \
+               self.logic.tool.has_tool(Tool.axe) & \
+               self.logic.tool.has_tool(Tool.pickaxe)
+
+    def can_do_fishing_quest(self) -> StardewRule:
+        return self.logic.region.can_reach_all(*(Region.town, Region.beach)) & \
+               self.logic.tool.has_fishing_rod(FishingRod.bamboo)
+
+    def can_do_slaying_quest(self) -> StardewRule:
+        return self.logic.region.can_reach_all(*(Region.town, Region.mines_floor_10))
+
+    def can_drink_snake_milk(self) -> StardewRule:
+        if self.options.quest_locations.has_story_quests() or SecretsanityOptionName.secret_notes in self.options.secretsanity:
+            return self.logic.received(Wallet.iridium_snake_milk)
+        return self.logic.quest.can_complete_quest(Quest.cryptic_note) & self.logic.region.can_reach(Region.skull_cavern_100)
diff --git a/worlds/stardew_valley/logic/received_logic.py b/worlds/stardew_valley/logic/received_logic.py
index 68d65040c7..4898d723a9 100644
--- a/worlds/stardew_valley/logic/received_logic.py
+++ b/worlds/stardew_valley/logic/received_logic.py
@@ -2,16 +2,18 @@ from typing import Optional
 
 from BaseClasses import ItemClassification
 from .base_logic import BaseLogic, BaseLogicMixin
-from .has_logic import HasLogicMixin
 from .logic_event import all_events
 from ..items import item_table
-from ..stardew_rule import StardewRule, Received, TotalReceived
+from ..stardew_rule import StardewRule, Received, TotalReceived, True_
 
 
 class ReceivedLogicMixin(BaseLogic, BaseLogicMixin):
     def received(self, item: str, count: Optional[int] = 1) -> StardewRule:
         assert count >= 0, "Can't receive a negative amount of item."
 
+        if count == 0:
+            return True_()
+
         if item in all_events:
             return Received(item, self.player, count, event=True)
 
diff --git a/worlds/stardew_valley/logic/region_logic.py b/worlds/stardew_valley/logic/region_logic.py
index 81c79be097..e2a8f4f2b0 100644
--- a/worlds/stardew_valley/logic/region_logic.py
+++ b/worlds/stardew_valley/logic/region_logic.py
@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
 from ..options import EntranceRandomization
@@ -7,13 +5,12 @@ from ..stardew_rule import StardewRule, Reach, false_, true_
 from ..strings.region_names import Region
 
 main_outside_area = {Region.menu, Region.stardew_valley, Region.farm_house, Region.farm, Region.town, Region.beach, Region.mountain, Region.forest,
-                     Region.bus_stop, Region.backwoods, Region.bus_tunnel, Region.tunnel_entrance}
-always_accessible_regions_with_non_progression_er = {*main_outside_area, Region.mines, Region.hospital, Region.carpenter, Region.alex_house,
-                                                     Region.ranch, Region.farm_cave, Region.wizard_tower, Region.tent,
+                     Region.bus_stop, Region.backwoods, Region.tunnel_entrance}
+always_accessible_regions_with_non_progression_er = {*main_outside_area, Region.hospital, Region.carpenter, Region.alex_house,
+                                                     Region.ranch, Region.farm_cave, Region.tent,
                                                      Region.pierre_store, Region.saloon, Region.blacksmith, Region.trailer, Region.museum, Region.mayor_house,
                                                      Region.haley_house, Region.sam_house, Region.jojamart, Region.fish_shop}
-always_accessible_regions_without_er = {*always_accessible_regions_with_non_progression_er, Region.community_center, Region.pantry, Region.crafts_room,
-                                        Region.fish_tank, Region.boiler_room, Region.vault, Region.bulletin_board}
+always_accessible_regions_without_er = {*always_accessible_regions_with_non_progression_er}
 
 always_regions_by_setting = {EntranceRandomization.option_disabled: always_accessible_regions_without_er,
                              EntranceRandomization.option_pelican_town: always_accessible_regions_without_er,
@@ -41,20 +38,16 @@ class RegionLogic(BaseLogic):
 
         return Reach(region_name, "Region", self.player)
 
-    @cache_self1
-    def can_reach_any(self, region_names: Tuple[str, ...]) -> StardewRule:
+    def can_reach_any(self, *region_names: str) -> StardewRule:
         if any(r in always_regions_by_setting[self.options.entrance_randomization] for r in region_names):
             return true_
 
         return self.logic.or_(*(self.logic.region.can_reach(spot) for spot in region_names))
 
-    @cache_self1
-    def can_reach_all(self, region_names: Tuple[str, ...]) -> StardewRule:
+    def can_reach_all(self, *region_names: str) -> StardewRule:
         return self.logic.and_(*(self.logic.region.can_reach(spot) for spot in region_names))
 
-    @cache_self1
-    def can_reach_all_except_one(self, region_names: Tuple[str, ...]) -> StardewRule:
-        region_names = list(region_names)
+    def can_reach_all_except_one(self, *region_names: str) -> StardewRule:
         num_required = len(region_names) - 1
         if num_required <= 0:
             num_required = len(region_names)
diff --git a/worlds/stardew_valley/logic/relationship_logic.py b/worlds/stardew_valley/logic/relationship_logic.py
index e19a6e802b..5fa40bfdd9 100644
--- a/worlds/stardew_valley/logic/relationship_logic.py
+++ b/worlds/stardew_valley/logic/relationship_logic.py
@@ -6,11 +6,12 @@ from .base_logic import BaseLogic, BaseLogicMixin
 from ..content.feature import friendsanity
 from ..data.villagers_data import Villager
 from ..stardew_rule import StardewRule, True_, false_, true_
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
 from ..strings.ap_names.mods.mod_items import SVEQuestItem
 from ..strings.building_names import Building
 from ..strings.generic_names import Generic
 from ..strings.gift_names import Gift
-from ..strings.region_names import Region
+from ..strings.region_names import Region, LogicRegion
 from ..strings.season_names import Season
 from ..strings.villager_names import NPC, ModNPC
 
@@ -49,7 +50,9 @@ class RelationshipLogic(BaseLogic):
         if not self.content.features.friendsanity.is_enabled:
             return self.logic.relationship.can_reproduce(number_children)
 
-        return self.logic.received_n(*possible_kids, count=number_children) & self.logic.building.has_building(Building.kids_room)
+        return self.logic.received_n(*possible_kids, count=number_children) & \
+            self.logic.building.has_building(Building.kids_room) & \
+            self.logic.relationship.can_reproduce(number_children)
 
     def can_reproduce(self, number_children: int = 1) -> StardewRule:
         assert number_children >= 0, "Can't have a negative amount of children."
@@ -121,13 +124,14 @@ class RelationshipLogic(BaseLogic):
         if villager is None:
             return false_
 
-        rules = [self.logic.region.can_reach_any(villager.locations)]
+        rules = [self.logic.region.can_reach_any(*villager.locations)]
 
         if npc == NPC.kent:
             rules.append(self.logic.time.has_year_two)
 
         elif npc == NPC.leo:
             rules.append(self.logic.received("Island North Turtle"))
+            rules.append(self.logic.region.can_reach(Region.leo_hut))
 
         elif npc == ModNPC.lance:
             rules.append(self.logic.region.can_reach(Region.volcano_floor_10))
@@ -146,20 +150,15 @@ class RelationshipLogic(BaseLogic):
             rules.append(self.logic.received(SVEQuestItem.morgan_schooling))
 
         elif npc == ModNPC.goblin:
-            rules.append(self.logic.region.can_reach_all((Region.witch_hut, Region.wizard_tower)))
+            rules.append(self.logic.region.can_reach_all(Region.witch_hut, Region.wizard_tower))
 
         return self.logic.and_(*rules)
 
-    def can_give_loved_gifts_to_everyone(self) -> StardewRule:
-        rules = []
+    def can_meet_all(self, *npcs: str) -> StardewRule:
+        return self.logic.and_(*[self.can_meet(npc) for npc in npcs])
 
-        for npc in self.content.villagers:
-            meet_rule = self.logic.relationship.can_meet(npc)
-            rules.append(meet_rule)
-
-        rules.append(self.logic.gifts.has_any_universal_love)
-
-        return self.logic.and_(*rules)
+    def can_meet_any(self, *npcs: str) -> StardewRule:
+        return self.logic.or_(*(self.can_meet(npc) for npc in npcs))
 
     # Should be cached
     def can_earn_relationship(self, npc: str, hearts: int = 0) -> StardewRule:
@@ -183,11 +182,10 @@ class RelationshipLogic(BaseLogic):
                 previous_heart = max(hearts - heart_size, 0)
                 rules.append(self.logic.relationship.has_hearts(npc, previous_heart))
 
-        if hearts > 2 or hearts > heart_size:
+        if CustomLogicOptionName.ignore_birthdays not in self.options.custom_logic:
             rules.append(self.logic.season.has(villager.birthday))
-
-        if villager.birthday == Generic.any:
-            rules.append(self.logic.season.has_all() | self.logic.time.has_year_three)  # push logic back for any birthday-less villager
+            if villager.birthday == Generic.any:
+                rules.append(self.logic.season.has_all() | self.logic.time.has_year_three)  # push logic back for any birthday-less villager
 
         if villager.bachelor:
             if hearts > 10:
@@ -196,3 +194,9 @@ class RelationshipLogic(BaseLogic):
                 rules.append(self.logic.relationship.can_date(npc))
 
         return self.logic.and_(*rules)
+
+    def can_purchase_portrait(self, npc: str = "") -> StardewRule:
+        spend_rule = self.logic.money.can_spend_at(LogicRegion.traveling_cart, 30_000)
+        if npc == "":
+            return self.logic.relationship.can_get_married() & self.logic.relationship.has_hearts_with_any(14) & spend_rule
+        return self.logic.relationship.can_marry(npc) & self.logic.relationship.has_hearts(npc, 14) & spend_rule
diff --git a/worlds/stardew_valley/logic/requirement_logic.py b/worlds/stardew_valley/logic/requirement_logic.py
index 1a71810003..edcbc88e47 100644
--- a/worlds/stardew_valley/logic/requirement_logic.py
+++ b/worlds/stardew_valley/logic/requirement_logic.py
@@ -1,10 +1,22 @@
 import functools
+import math
 from typing import Iterable
 
 from .base_logic import BaseLogicMixin, BaseLogic
-from ..data.game_item import Requirement
-from ..data.requirement import ToolRequirement, BookRequirement, SkillRequirement, SeasonRequirement, YearRequirement, CombatRequirement, QuestRequirement, \
-    RelationshipRequirement, FishingRequirement, WalnutRequirement, RegionRequirement
+from ..data.game_item import Requirement, ItemTag
+from ..data.requirement import ToolRequirement, BookRequirement, SkillRequirement, SeasonRequirement, YearRequirement, \
+    CombatRequirement, QuestRequirement, \
+    SpecificFriendRequirement, FishingRequirement, WalnutRequirement, RegionRequirement, TotalEarningsRequirement, \
+    GrangeDisplayRequirement, \
+    ForgeInfinityWeaponRequirement, EggHuntRequirement, CaughtFishRequirement, MuseumCompletionRequirement, \
+    BuildingRequirement, FullShipmentRequirement, NumberOfFriendsRequirement, FishingCompetitionRequirement, \
+    LuauDelightRequirementRequirement, MovieRequirement, CookedRecipesRequirement, CraftedItemsRequirement, \
+    HelpWantedRequirement, ShipOneCropRequirement, ReceivedRaccoonsRequirement, PrizeMachineRequirement, \
+    AllAchievementsRequirement, PerfectionPercentRequirement, ReadAllBooksRequirement, MinesRequirement, \
+    DangerousMinesRequirement, HasItemRequirement, MeetRequirement, MonsterKillRequirement, CatalogueRequirement
+from ..options import IncludeEndgameLocations
+from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
+from ..strings.region_names import Region, LogicRegion
 
 
 class RequirementLogicMixin(BaseLogicMixin):
@@ -24,9 +36,13 @@ class RequirementLogic(BaseLogic):
     def meet_requirement(self, requirement: Requirement):
         raise ValueError(f"Requirements of type{type(requirement)} have no rule registered.")
 
+    @meet_requirement.register
+    def _(self, requirement: HasItemRequirement):
+        return self.logic.has(requirement.item)
+
     @meet_requirement.register
     def _(self, requirement: ToolRequirement):
-        return self.logic.tool.has_tool(requirement.tool, requirement.tier)
+        return self.logic.tool.has_tool_generic(requirement.tool, requirement.tier)
 
     @meet_requirement.register
     def _(self, requirement: SkillRequirement):
@@ -61,9 +77,124 @@ class RequirementLogic(BaseLogic):
         return self.logic.quest.can_complete_quest(requirement.quest)
 
     @meet_requirement.register
-    def _(self, requirement: RelationshipRequirement):
+    def _(self, requirement: MeetRequirement):
+        return self.logic.relationship.can_meet(requirement.npc)
+
+    @meet_requirement.register
+    def _(self, requirement: SpecificFriendRequirement):
         return self.logic.relationship.has_hearts(requirement.npc, requirement.hearts)
 
+    @meet_requirement.register
+    def _(self, requirement: NumberOfFriendsRequirement):
+        return self.logic.relationship.has_hearts_with_n(requirement.friends, requirement.hearts)
+
     @meet_requirement.register
     def _(self, requirement: FishingRequirement):
         return self.logic.fishing.can_fish_at(requirement.region)
+
+    @meet_requirement.register
+    def _(self, requirement: TotalEarningsRequirement):
+        return self.logic.money.can_have_earned_total(requirement.amount)
+
+    @meet_requirement.register
+    def _(self, requirement: GrangeDisplayRequirement):
+        return self.logic.region.can_reach(LogicRegion.fair) & self.logic.festival.can_get_grange_display_max_score()
+
+    @meet_requirement.register
+    def _(self, requirement: EggHuntRequirement):
+        return self.logic.region.can_reach(LogicRegion.egg_festival) & self.logic.festival.can_win_egg_hunt()
+
+    @meet_requirement.register
+    def _(self, requirement: FishingCompetitionRequirement):
+        return self.logic.region.can_reach(LogicRegion.festival_of_ice) & self.logic.festival.can_win_fishing_competition()
+
+    @meet_requirement.register
+    def _(self, requirement: LuauDelightRequirementRequirement):
+        return self.logic.region.can_reach(LogicRegion.luau) & self.logic.festival.can_get_luau_soup_delight()
+
+    @meet_requirement.register
+    def _(self, requirement: ForgeInfinityWeaponRequirement):
+        return self.logic.combat.has_galaxy_weapon & self.logic.region.can_reach(Region.volcano_floor_10) & self.logic.has("Galaxy Soul")
+
+    @meet_requirement.register
+    def _(self, requirement: CaughtFishRequirement):
+        if requirement.unique:
+            return self.logic.fishing.can_catch_many_fish(requirement.number_fish)
+        return self.logic.fishing.can_catch_many_fish(math.ceil(requirement.number_fish / 10)) & self.logic.time.has_lived_months(requirement.number_fish // 20)
+
+    @meet_requirement.register
+    def _(self, requirement: MuseumCompletionRequirement):
+        return self.logic.museum.can_donate_museum_items(requirement.number_donated)
+
+    @meet_requirement.register
+    def _(self, requirement: FullShipmentRequirement):
+        return self.logic.shipping.can_ship_everything()
+
+    @meet_requirement.register
+    def _(self, requirement: BuildingRequirement):
+        return self.logic.building.has_building(requirement.building)
+
+    @meet_requirement.register
+    def _(self, requirement: MovieRequirement):
+        return self.logic.region.can_reach(Region.movie_theater)
+
+    @meet_requirement.register
+    def _(self, requirement: CookedRecipesRequirement):
+        return self.logic.cooking.can_have_cooked_recipes(requirement.number_of_recipes)
+
+    @meet_requirement.register
+    def _(self, requirement: CraftedItemsRequirement):
+        return self.logic.crafting.can_have_crafted_recipes(requirement.number_of_recipes)
+
+    @meet_requirement.register
+    def _(self, requirement: HelpWantedRequirement):
+        return self.logic.quest.can_complete_help_wanteds(requirement.number_of_quests)
+
+    @meet_requirement.register
+    def _(self, requirement: ShipOneCropRequirement):
+        crops = self.content.find_tagged_items(ItemTag.CROPSANITY)
+        crop_rules = [self.logic.shipping.can_ship(crop.name) for crop in crops]
+        return self.logic.and_(*crop_rules)
+
+    @meet_requirement.register
+    def _(self, requirement: ReceivedRaccoonsRequirement):
+        amount = min(requirement.number_of_raccoons, 8, 8 + self.options.bundle_per_room)
+        if self.options.quest_locations.has_story_quests():
+            amount += 1
+        return self.logic.received(CommunityUpgrade.raccoon, amount)
+
+    @meet_requirement.register
+    def _(self, requirement: PrizeMachineRequirement):
+        return self.logic.grind.can_grind_prize_tickets(requirement.number_of_tickets)
+
+    @meet_requirement.register
+    def _(self, requirement: AllAchievementsRequirement):
+        return self.logic.goal.can_complete_perfection() & self.logic.has_progress_percent(100)
+
+    @meet_requirement.register
+    def _(self, requirement: PerfectionPercentRequirement):
+        return self.logic.goal.can_complete_perfection()
+
+    @meet_requirement.register
+    def _(self, requirement: ReadAllBooksRequirement):
+        books = self.content.find_tagged_items(ItemTag.BOOK_POWER)
+        book_rules = [self.logic.book.has_book_power(book.name) for book in books]
+        return self.logic.and_(*book_rules)
+
+    @meet_requirement.register
+    def _(self, requirement: MinesRequirement):
+        return self.logic.mine.can_progress_in_the_mines_from_floor(requirement.floor)
+
+    @meet_requirement.register
+    def _(self, requirement: DangerousMinesRequirement):
+        return self.logic.region.can_reach(Region.dangerous_mines_100) & self.logic.mine.has_mine_elevator_to_floor(requirement.floor)
+
+    @meet_requirement.register
+    def _(self, requirement: MonsterKillRequirement):
+        return self.logic.monster.can_kill_any(requirement.monsters, math.log10(requirement.amount) // 1)
+
+    @meet_requirement.register
+    def _(self, requirement: CatalogueRequirement):
+        if self.options.include_endgame_locations == IncludeEndgameLocations.option_true:
+            return self.logic.received(requirement.catalogue)
+        return self.logic.true_
diff --git a/worlds/stardew_valley/logic/season_logic.py b/worlds/stardew_valley/logic/season_logic.py
index eecfd48582..d15d018220 100644
--- a/worlds/stardew_valley/logic/season_logic.py
+++ b/worlds/stardew_valley/logic/season_logic.py
@@ -1,11 +1,8 @@
 from functools import cached_property
-from typing import Iterable, Union
+from typing import Iterable
 
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
-from .has_logic import HasLogicMixin
-from .received_logic import ReceivedLogicMixin
-from .time_logic import TimeLogicMixin
 from ..options import SeasonRandomization
 from ..stardew_rule import StardewRule, True_, true_
 from ..strings.generic_names import Generic
@@ -38,6 +35,8 @@ class SeasonLogic(BaseLogic):
 
     @cache_self1
     def has(self, season: str) -> StardewRule:
+        assert isinstance(season, str), "use has_any() or has_all() to check multiple seasons at once"
+
         if season == Generic.any:
             return True_()
         seasons_order = [Season.spring, Season.summer, Season.fall, Season.winter]
diff --git a/worlds/stardew_valley/logic/shipping_logic.py b/worlds/stardew_valley/logic/shipping_logic.py
index 9f5ff51876..73f102f544 100644
--- a/worlds/stardew_valley/logic/shipping_logic.py
+++ b/worlds/stardew_valley/logic/shipping_logic.py
@@ -1,15 +1,8 @@
 from functools import cached_property
-from typing import Union
 
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
-from .building_logic import BuildingLogicMixin
-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
-from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule
 from ..strings.building_names import Building
 
@@ -33,15 +26,8 @@ class ShippingLogic(BaseLogic):
     def can_ship_everything(self) -> StardewRule:
         shipsanity_prefix = "Shipsanity: "
         all_items_to_ship = []
-        exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
-        exclude_qi = not (self.options.special_order_locations & SpecialOrderLocations.value_qi)
-        mod_list = self.options.mods.value
         for location in locations_by_tag[LocationTags.SHIPSANITY_FULL_SHIPMENT]:
-            if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
-                continue
-            if exclude_qi and LocationTags.REQUIRES_QI_ORDERS in location.tags:
-                continue
-            if location.mod_name and location.mod_name not in mod_list:
+            if not self.content.are_all_enabled(location.content_packs):
                 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)
diff --git a/worlds/stardew_valley/logic/shirts_logic.py b/worlds/stardew_valley/logic/shirts_logic.py
new file mode 100644
index 0000000000..84c13309e0
--- /dev/null
+++ b/worlds/stardew_valley/logic/shirts_logic.py
@@ -0,0 +1,16 @@
+from .base_logic import BaseLogicMixin, BaseLogic
+from ..data.shirt_data import all_considered_shirts
+
+
+class ShirtLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.shirt = ShirtLogic(*args, **kwargs)
+
+
+class ShirtLogic(BaseLogic):
+
+    def initialize_rules(self):
+        self.registry.shirt_rules.update({
+            shirt.name: self.logic.tailoring.can_tailor_shirt(shirt) for shirt in all_considered_shirts
+        })
diff --git a/worlds/stardew_valley/logic/skill_logic.py b/worlds/stardew_valley/logic/skill_logic.py
index b582eb3613..29e830c471 100644
--- a/worlds/stardew_valley/logic/skill_logic.py
+++ b/worlds/stardew_valley/logic/skill_logic.py
@@ -2,18 +2,21 @@ from functools import cached_property
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
+from ..content.vanilla.base import base_game
 from ..data.harvest import HarvestCropSource
-from ..mods.logic.mod_skills_levels import get_mod_skill_levels
 from ..stardew_rule import StardewRule, true_, True_, False_
+from ..strings.ap_names.ap_option_names import EatsanityOptionName
+from ..strings.currency_names import Currency
+from ..strings.food_names import Meal
+from ..strings.ingredient_names import Ingredient
+from ..strings.metal_names import Mineral
 from ..strings.performance_names import Performance
 from ..strings.quality_names import ForageQuality
-from ..strings.region_names import Region
+from ..strings.region_names import Region, LogicRegion
 from ..strings.skill_names import Skill, all_mod_skills, all_vanilla_skills
-from ..strings.tool_names import ToolMaterial, Tool
+from ..strings.tool_names import ToolMaterial, Tool, FishingRod
 from ..strings.wallet_item_names import Wallet
 
-vanilla_skill_items = ("Farming Level", "Mining Level", "Foraging Level", "Fishing Level", "Combat Level")
-
 
 class SkillLogicMixin(BaseLogicMixin):
     def __init__(self, *args, **kwargs):
@@ -25,17 +28,18 @@ class SkillLogic(BaseLogic):
 
     # Should be cached
     def can_earn_level(self, skill: str, level: int) -> StardewRule:
-        if level <= 0:
-            return True_()
+        assert level > 0, "There is no level before level 0."
 
-        tool_level = min(4, (level - 1) // 2)
+        tool_level = min(5, (level + 1) // 2)
         tool_material = ToolMaterial.tiers[tool_level]
 
         previous_level_rule = self.logic.skill.has_previous_level(skill, level)
 
         if skill == Skill.fishing:
             # Not checking crab pot as this is used for not randomized skills logic, for which players need a fishing rod to start gaining xp.
-            xp_rule = self.logic.tool.has_fishing_rod(max(tool_level, 3)) & self.logic.fishing.can_fish_anywhere()
+            # We want to cap the tool level at 4, because the advanced iridium rod is excluded from logic.
+            tool_level = min(4, tool_level)
+            xp_rule = self.logic.tool.has_fishing_rod(FishingRod.tiers[tool_level]) & self.logic.fishing.can_fish_anywhere()
         elif skill == Skill.farming:
             xp_rule = self.can_get_farming_xp & self.logic.tool.has_tool(Tool.hoe, tool_material) & self.logic.tool.can_water(tool_level)
         elif skill == Skill.foraging:
@@ -46,7 +50,8 @@ class SkillLogic(BaseLogic):
                       self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level)
             xp_rule = xp_rule & self.logic.region.can_reach(Region.mines_floor_5)
         elif skill == Skill.combat:
-            combat_tier = Performance.tiers[tool_level]
+            # Tool level starts at 1, so we need to subtract 1 to get the correct performance tier.
+            combat_tier = Performance.tiers[tool_level - 1]
             xp_rule = self.logic.combat.can_fight_at_level(combat_tier)
             xp_rule = xp_rule & self.logic.region.can_reach(Region.mines_floor_5)
         elif skill in all_mod_skills:
@@ -59,17 +64,64 @@ class SkillLogic(BaseLogic):
 
     # Should be cached
     def has_level(self, skill: str, level: int) -> StardewRule:
-        assert level >= 0, f"There is no level before level 0."
+        assert level >= 0, "There is no level before level 0."
         if level == 0:
             return true_
 
         if self.content.features.skill_progression.is_progressive:
+            if level > 10:
+                if skill == Skill.fishing:
+                    return self.logic.received(f"{skill} Level", 10) & self.has_fishing_buffs_available(level - 10)
+                raise f"Cannot reach level {level} {skill}"
             return self.logic.received(f"{skill} Level", level)
 
         return self.logic.skill.can_earn_level(skill, level)
 
+    def has_fishing_buffs_available(self, buff_levels: int) -> StardewRule:
+
+        eat_rule = self.can_eat_fishing_buff(buff_levels)
+        rod_rule = self.logic.tool.has_fishing_rod(FishingRod.advanced_iridium)
+        enchant_rule = self.logic.region.can_reach(Region.volcano_floor_10) & self.logic.has(Mineral.prismatic_shard) & self.logic.has(
+            Currency.cinder_shard) & self.can_eat_fishing_buff(buff_levels - 1)
+        chef_rule = self.logic.region.can_reach(LogicRegion.desert_festival) & self.can_eat_fishing_buff(buff_levels - 3)
+
+        return eat_rule | (rod_rule & enchant_rule) | chef_rule
+
+    def can_eat_fishing_buff(self, buff_levels: int) -> StardewRule:
+        enzyme_rule = self.logic.true_
+        food_rule = self.logic.true_
+
+        if buff_levels <= 0:
+            return self.logic.true_
+        if buff_levels >= 6:
+            return self.logic.false_
+
+        potential_foods = {
+            1: [Meal.maple_bar, Meal.chowder, Meal.trout_soup, Meal.shrimp_cocktail],
+            2: [Meal.escargot, Meal.fish_taco],
+            3: [Meal.dish_o_the_sea, Meal.fish_stew, Meal.lobster_bisque],
+            4: [Meal.seafoam_pudding],
+        }
+
+        foods_correct_level = []
+        foods_only_with_seasoning_level = []
+        for level in potential_foods:
+            if level >= buff_levels:
+                foods_correct_level.extend(potential_foods[level])
+            if level == buff_levels-1:
+                foods_only_with_seasoning_level.extend(potential_foods[level])
+
+        normal_food_rule = self.logic.or_(*[self.logic.has(food) for food in foods_correct_level], allow_empty=True)
+        qi_seasoning_food_rule = self.logic.has(Ingredient.qi_seasoning) &\
+                                 self.logic.or_(*[self.logic.cooking.can_cook(food) for food in foods_only_with_seasoning_level], allow_empty=True)
+        food_rule = normal_food_rule | qi_seasoning_food_rule
+
+        if EatsanityOptionName.lock_effects in self.options.eatsanity:
+            enzyme_rule = self.logic.received("Fishing Enzyme", buff_levels)
+        return food_rule & enzyme_rule
+
     def has_previous_level(self, skill: str, level: int) -> StardewRule:
-        assert level > 0, f"There is no level before level 0."
+        assert level > 0, "There is no level before level 0."
         if level == 1:
             return true_
 
@@ -89,10 +141,12 @@ class SkillLogic(BaseLogic):
             return True_()
 
         if self.content.features.skill_progression.is_progressive:
-            skills_items = vanilla_skill_items
+            skills = base_game.skills
             if allow_modded_skills:
-                skills_items += get_mod_skill_levels(self.options.mods)
-            return self.logic.received_n(*skills_items, count=level)
+                skills = self.content.skills.values()
+            skill_items = [skill.level_name for skill in skills]
+
+            return self.logic.received_n(*skill_items, count=level)
 
         months_with_4_skills = max(1, (level // 4) - 1)
         months_with_5_skills = max(1, (level // 5) - 1)
@@ -123,13 +177,13 @@ class SkillLogic(BaseLogic):
     @cached_property
     def can_get_mining_xp(self) -> StardewRule:
         tool_rule = self.logic.tool.has_tool(Tool.pickaxe)
-        stone_rule = self.logic.region.can_reach_any((Region.mines_floor_5, Region.quarry, Region.skull_cavern_25, Region.volcano_floor_5))
+        stone_rule = self.logic.region.can_reach_any(Region.mines_floor_5, Region.quarry, Region.skull_cavern_25, Region.volcano_floor_5)
         return tool_rule & stone_rule
 
     @cached_property
     def can_get_combat_xp(self) -> StardewRule:
         tool_rule = self.logic.combat.has_any_weapon()
-        enemy_rule = self.logic.region.can_reach_any((Region.mines_floor_5, Region.skull_cavern_25, Region.volcano_floor_5))
+        enemy_rule = self.logic.region.can_reach_any(Region.mines_floor_5, Region.skull_cavern_25, Region.volcano_floor_5)
         return tool_rule & enemy_rule
 
     @cached_property
diff --git a/worlds/stardew_valley/logic/source_logic.py b/worlds/stardew_valley/logic/source_logic.py
index ecdb6f02a3..44c92a334e 100644
--- a/worlds/stardew_valley/logic/source_logic.py
+++ b/worlds/stardew_valley/logic/source_logic.py
@@ -2,12 +2,17 @@ import functools
 from typing import Any, Iterable
 
 from .base_logic import BaseLogicMixin, BaseLogic
+from .tailoring_logic import TailoringSource
 from ..data.animal import IncubatorSource, OstrichIncubatorSource
 from ..data.artisan import MachineSource
-from ..data.game_item import GenericSource, Source, GameItem, CustomRuleSource
+from ..data.fish_data import FishingSource
+from ..data.game_item import GenericSource, Source, GameItem, CustomRuleSource, AllRegionsSource
 from ..data.harvest import ForagingSource, FruitBatsSource, MushroomCaveSource, SeasonalForagingSource, \
     HarvestCropSource, HarvestFruitTreeSource, ArtifactSpotSource
-from ..data.shop import ShopSource, MysteryBoxSource, ArtifactTroveSource, PrizeMachineSource, FishingTreasureChestSource
+from ..data.monster_data import MonsterSource
+from ..data.shop import ShopSource, MysteryBoxSource, ArtifactTroveSource, PrizeMachineSource, FishingTreasureChestSource, HatMouseSource
+from ..strings.ap_names.ap_option_names import CustomLogicOptionName
+from ..strings.skill_names import Skill
 
 
 class SourceLogicMixin(BaseLogicMixin):
@@ -22,7 +27,10 @@ class SourceLogic(BaseLogic):
         rules = []
 
         if self.content.features.cropsanity.is_included(item):
-            rules.append(self.logic.received(item.name))
+            unlock_rule = self.logic.received(item.name)
+            if CustomLogicOptionName.critical_free_samples in self.options.custom_logic:
+                return unlock_rule
+            rules.append(unlock_rule)
 
         rules.append(self.logic.source.has_access_to_any(item.sources))
         return self.logic.and_(*rules)
@@ -37,7 +45,11 @@ class SourceLogic(BaseLogic):
 
     @has_access_to.register
     def _(self, source: GenericSource):
-        return self.logic.region.can_reach_any(source.regions) if source.regions else self.logic.true_
+        return self.logic.region.can_reach_any(*source.regions) if source.regions else self.logic.true_
+
+    @has_access_to.register
+    def _(self, source: AllRegionsSource):
+        return self.logic.region.can_reach_all(*source.regions) if source.regions else self.logic.true_
 
     @has_access_to.register
     def _(self, source: CustomRuleSource):
@@ -64,6 +76,10 @@ class SourceLogic(BaseLogic):
     def _(self, source: ShopSource):
         return self.logic.money.can_shop_from(source)
 
+    @has_access_to.register
+    def _(self, source: HatMouseSource):
+        return self.logic.money.can_shop_from_hat_mouse(source)
+
     @has_access_to.register
     def _(self, source: HarvestFruitTreeSource):
         return self.logic.harvesting.can_harvest_tree_from(source)
@@ -103,3 +119,15 @@ class SourceLogic(BaseLogic):
     @has_access_to.register
     def _(self, source: ArtifactSpotSource):
         return self.logic.grind.can_grind_artifact_spots(source.amount)
+
+    @has_access_to.register
+    def _(self, source: MonsterSource):
+        return self.logic.monster.can_kill_any(source.monsters, source.amount_tier)
+
+    @has_access_to.register
+    def _(self, source: TailoringSource):
+        return self.logic.tailoring.can_tailor(*source.tailoring_items)
+
+    @has_access_to.register
+    def _(self, source: FishingSource):
+        return self.logic.fishing.can_fish_at(source.region) & self.logic.skill.has_level(Skill.fishing, source.fishing_level) & self.logic.tool.has_fishing_rod(source.minimum_rod)
diff --git a/worlds/stardew_valley/logic/special_items_logic.py b/worlds/stardew_valley/logic/special_items_logic.py
new file mode 100644
index 0000000000..90e18b7900
--- /dev/null
+++ b/worlds/stardew_valley/logic/special_items_logic.py
@@ -0,0 +1,45 @@
+from .base_logic import BaseLogic, BaseLogicMixin
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..stardew_rule import StardewRule
+from ..strings.ap_names.ap_option_names import SecretsanityOptionName
+from ..strings.craftable_names import Consumable
+from ..strings.forageable_names import Forageable
+from ..strings.metal_names import Artifact
+from ..strings.quest_names import Quest
+from ..strings.region_names import Region
+from ..strings.season_names import Season
+from ..strings.special_item_names import SpecialItem
+from ..strings.villager_names import NPC
+
+
+class SpecialItemsLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.special_items = SpecialItemsLogic(*args, **kwargs)
+
+
+class SpecialItemsLogic(BaseLogic):
+
+    def has_purple_shorts(self) -> StardewRule:
+        has_first_shorts = self.logic.season.has(Season.summer) &\
+                           self.logic.region.can_reach(Region.ranch) &\
+                           self.logic.relationship.has_hearts(NPC.marnie, 2)
+        has_repeatable_shorts = self.logic.region.can_reach(Region.purple_shorts_maze) & self.logic.has(Consumable.warp_totem_farm)
+        return has_first_shorts & has_repeatable_shorts
+
+    def has_far_away_stone(self) -> StardewRule:
+        sacrifice_rule = self.logic.has(Artifact.ancient_doll) & self.logic.region.can_reach_any(Region.mines_floor_100, Region.volcano_floor_10)
+        if SecretsanityOptionName.easy in self.options.secretsanity:
+            return sacrifice_rule & self.logic.received(SpecialItem.far_away_stone)
+        return sacrifice_rule
+
+    def has_solid_gold_lewis(self) -> StardewRule:
+        if SecretsanityOptionName.secret_notes in self.options.secretsanity:
+            return self.logic.received(SpecialItem.solid_gold_lewis) & self.logic.region.can_reach(Region.town)
+        return self.logic.has(Forageable.secret_note) & self.logic.region.can_reach(Region.town)
+
+    def has_advanced_tv_remote(self) -> StardewRule:
+        george_rule = self.logic.relationship.has_hearts(NPC.george, 10)
+        if ginger_island_content_pack.name in self.content.registered_packs:
+            return george_rule
+        return self.logic.quest.can_complete_quest(Quest.the_pirates_wife) & george_rule
diff --git a/worlds/stardew_valley/logic/special_order_logic.py b/worlds/stardew_valley/logic/special_order_logic.py
index 73276ce97f..10f601afbb 100644
--- a/worlds/stardew_valley/logic/special_order_logic.py
+++ b/worlds/stardew_valley/logic/special_order_logic.py
@@ -3,6 +3,7 @@ from typing import Dict
 from .base_logic import BaseLogicMixin, BaseLogic
 from ..content.vanilla.ginger_island import ginger_island_content_pack
 from ..content.vanilla.qi_board import qi_board_content_pack
+from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule, Has, false_
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.ap_names.transport_names import Transportation
@@ -10,6 +11,7 @@ from ..strings.artisan_good_names import ArtisanGood
 from ..strings.crop_names import Vegetable, Fruit
 from ..strings.fertilizer_names import Fertilizer
 from ..strings.fish_names import Fish
+from ..strings.food_names import Beverage, Meal
 from ..strings.forageable_names import Forageable
 from ..strings.machine_names import Machine
 from ..strings.material_names import Material
@@ -50,8 +52,8 @@ class SpecialOrderLogic(BaseLogic):
             SpecialOrder.robins_resource_rush: self.logic.relationship.can_meet(NPC.robin) & self.logic.ability.can_chop_perfectly() &
                                                self.logic.has(Fertilizer.tree) & self.logic.ability.can_mine_perfectly(),
             SpecialOrder.juicy_bugs_wanted: self.logic.has(Loot.bug_meat),
-            SpecialOrder.a_curious_substance: self.logic.region.can_reach(Region.wizard_tower),
-            SpecialOrder.prismatic_jelly: self.logic.region.can_reach(Region.wizard_tower),
+            SpecialOrder.a_curious_substance: self.logic.region.can_reach_all(*(Region.wizard_tower, Region.mines_floor_55,)),
+            SpecialOrder.prismatic_jelly: self.logic.region.can_reach_all(*(Region.wizard_tower, Region.mines_floor_25,)),
 
         })
 
@@ -80,8 +82,9 @@ class SpecialOrderLogic(BaseLogic):
                                                    self.logic.ability.can_mine_perfectly_in_the_skull_cavern(),
                 SpecialOrder.qis_hungry_challenge: self.logic.ability.can_mine_perfectly_in_the_skull_cavern(),
                 SpecialOrder.qis_cuisine: self.logic.cooking.can_cook() & self.logic.shipping.can_use_shipping_bin &
-                                          (self.logic.money.can_spend_at(Region.saloon, 205000) | self.logic.money.can_spend_at(Region.pierre_store, 170000)),
-                SpecialOrder.qis_kindness: self.logic.relationship.can_give_loved_gifts_to_everyone(),
+                                          (self.logic.money.can_spend_at(Region.saloon, 205000) & self.logic.cooking.can_cook(Beverage.triple_shot_espresso)) &
+                                           (self.logic.money.can_spend_at(Region.pierre_store, 170000) & self.logic.cooking.can_cook(Meal.bread)),
+                SpecialOrder.qis_kindness: self.logic.gifts.can_give_loved_gifts_to_everyone(),
                 SpecialOrder.extended_family: self.logic.ability.can_fish_perfectly() & self.logic.has(Fish.angler) & self.logic.has(Fish.glacierfish) &
                                               self.logic.has(Fish.crimsonfish) & self.logic.has(Fish.mutant_carp) & self.logic.has(Fish.legend),
                 SpecialOrder.danger_in_the_deep: self.logic.ability.can_mine_perfectly() & self.logic.mine.has_mine_elevator_to_floor(120),
@@ -103,3 +106,10 @@ class SpecialOrderLogic(BaseLogic):
 
     def has_island_transport(self) -> StardewRule:
         return self.logic.received(Transportation.island_obelisk) | self.logic.received(Transportation.boat_repair)
+
+    def can_get_radioactive_ore(self) -> StardewRule:
+        if not self.options.special_order_locations & SpecialOrderLocations.value_qi:
+            return self.logic.false_
+
+        return self.logic.ability.can_mine_perfectly() & self.logic.region.can_reach(Region.qi_walnut_room) &\
+               self.logic.region.can_reach_all(*(Region.mines_floor_100, Region.skull_cavern_100))
diff --git a/worlds/stardew_valley/logic/tailoring_logic.py b/worlds/stardew_valley/logic/tailoring_logic.py
new file mode 100644
index 0000000000..00290f9d58
--- /dev/null
+++ b/worlds/stardew_valley/logic/tailoring_logic.py
@@ -0,0 +1,35 @@
+from dataclasses import dataclass
+from typing import Tuple
+
+from .base_logic import BaseLogicMixin, BaseLogic
+from ..data.game_item import Source
+from ..data.shirt_data import Shirt
+from ..stardew_rule import StardewRule
+from ..strings.artisan_good_names import ArtisanGood
+from ..strings.machine_names import Machine
+from ..strings.region_names import Region
+from ..strings.villager_names import NPC
+
+
+@dataclass(frozen=True, kw_only=True)
+class TailoringSource(Source):
+    tailoring_items: Tuple[str, ...]
+
+
+class TailoringLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.tailoring = TailoringLogic(*args, **kwargs)
+
+
+class TailoringLogic(BaseLogic):
+
+    def can_tailor_shirt(self, shirt: Shirt) -> StardewRule:
+        return self.can_tailor(*shirt.required_items)
+
+    def can_tailor(self, *items: str) -> StardewRule:
+        return self.has_tailoring() & self.logic.has(ArtisanGood.cloth) & self.logic.has_any(*items)
+
+    def has_tailoring(self) -> StardewRule:
+        sewing_machine_rule = self.logic.region.can_reach(Region.haley_house) | self.logic.has(Machine.sewing_machine)
+        return sewing_machine_rule & self.logic.relationship.can_meet(NPC.emily)
diff --git a/worlds/stardew_valley/logic/time_logic.py b/worlds/stardew_valley/logic/time_logic.py
index d26723d2a5..c42570b748 100644
--- a/worlds/stardew_valley/logic/time_logic.py
+++ b/worlds/stardew_valley/logic/time_logic.py
@@ -1,14 +1,12 @@
 from functools import cached_property
-from typing import Union
 
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
-from .has_logic import HasLogicMixin
 from ..stardew_rule import StardewRule, HasProgressionPercent
 
 ONE_YEAR = 4
 MAX_MONTHS = 3 * ONE_YEAR
-PERCENT_REQUIRED_FOR_MAX_MONTHS = 48
+PERCENT_REQUIRED_FOR_MAX_MONTHS = 64
 MONTH_COEFFICIENT = PERCENT_REQUIRED_FOR_MAX_MONTHS // MAX_MONTHS
 
 MIN_ITEMS = 10
diff --git a/worlds/stardew_valley/logic/tool_logic.py b/worlds/stardew_valley/logic/tool_logic.py
index dba8bb2980..2ec8965e29 100644
--- a/worlds/stardew_valley/logic/tool_logic.py
+++ b/worlds/stardew_valley/logic/tool_logic.py
@@ -1,23 +1,28 @@
-from typing import Union, Iterable, Tuple
+from typing import Union, Iterable
 
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
-from ..stardew_rule import StardewRule, True_, False_
+from ..stardew_rule import StardewRule, False_
 from ..strings.ap_names.skill_level_names import ModSkillLevel
 from ..strings.region_names import Region, LogicRegion
+from ..strings.skill_names import Skill
 from ..strings.spells import MagicSpell
-from ..strings.tool_names import ToolMaterial, Tool, APTool
+from ..strings.tool_names import ToolMaterial, Tool, FishingRod
 
 fishing_rod_prices = {
-    3: 1800,
-    4: 7500,
+    FishingRod.training: 25,
+    FishingRod.bamboo: 500,
+    FishingRod.fiberglass: 1800,
+    FishingRod.iridium: 7500,
+    FishingRod.advanced_iridium: 25000,
 }
 
 tool_materials = {
-    ToolMaterial.copper: 1,
-    ToolMaterial.iron: 2,
-    ToolMaterial.gold: 3,
-    ToolMaterial.iridium: 4
+    ToolMaterial.basic: 1,
+    ToolMaterial.copper: 2,
+    ToolMaterial.iron: 3,
+    ToolMaterial.gold: 4,
+    ToolMaterial.iridium: 5
 }
 
 tool_upgrade_prices = {
@@ -36,41 +41,36 @@ class ToolLogicMixin(BaseLogicMixin):
 
 class ToolLogic(BaseLogic):
 
-    def has_all_tools(self, tools: Iterable[Tuple[str, str]]):
+    def has_all_tools(self, tools: Iterable[tuple[str, str]]):
         return self.logic.and_(*(self.logic.tool.has_tool(tool, material) for tool, material in tools))
 
+    def has_tool_generic(self, tool: str, material: str) -> StardewRule:
+        """I hope you know what you're doing..."""
+        if tool == Tool.fishing_rod:
+            return self.has_fishing_rod(material)
+        if tool == Tool.scythe:
+            return self.has_scythe(material)
+        if tool == Tool.pan:
+            return self.has_pan(material)
+        return self.has_tool(tool, material)
+
     # Should be cached
     def has_tool(self, tool: str, material: str = ToolMaterial.basic) -> StardewRule:
-        if tool == Tool.fishing_rod:
-            return self.logic.tool.has_fishing_rod(tool_materials[material])
-
-        if tool == Tool.pan and material == ToolMaterial.basic:
-            material = ToolMaterial.copper  # The first Pan is the copper one, so the basic one does not exist
-
-        if material == ToolMaterial.basic or tool == Tool.scythe:
-            return True_()
+        assert tool != Tool.fishing_rod, "Use has_fishing_rod instead of has_tool for fishing rods."
+        assert tool != Tool.scythe, "Use has_scythe instead of has_tool for scythes."
+        assert tool != Tool.pan, "Use has_pan instead of has_tool for pans."
 
         if self.content.features.tool_progression.is_progressive:
-            return self.logic.received(f"Progressive {tool}", tool_materials[material])
+            return self.logic.tool._has_progressive_tool(tool, tool_materials[material])
 
-        can_upgrade_rule = self.logic.tool._can_purchase_upgrade(material)
-        if tool == Tool.pan:
-            has_base_pan = self.logic.received("Glittering Boulder Removed") & self.logic.region.can_reach(Region.mountain)
-            if material == ToolMaterial.copper:
-                return has_base_pan
-            return has_base_pan & can_upgrade_rule
-
-        return can_upgrade_rule
-
-    @cache_self1
-    def can_mine_using(self, material: str) -> StardewRule:
         if material == ToolMaterial.basic:
             return self.logic.true_
 
-        if self.content.features.tool_progression.is_progressive:
-            return self.logic.received(APTool.pickaxe, tool_materials[material])
-        else:
-            return self.logic.tool._can_purchase_upgrade(material)
+        return self.logic.tool._can_purchase_upgrade(material)
+
+    @cache_self1
+    def can_mine_using(self, material: str) -> StardewRule:
+        return self.logic.tool.has_tool(Tool.pickaxe, material)
 
     @cache_self1
     def _can_purchase_upgrade(self, material: str) -> StardewRule:
@@ -80,17 +80,73 @@ class ToolLogic(BaseLogic):
         return self.has_tool(tool, material) & self.logic.region.can_reach(region)
 
     @cache_self1
-    def has_fishing_rod(self, level: int) -> StardewRule:
-        assert 1 <= level <= 4, "Fishing rod 0 isn't real, it can't hurt you. Training is 1, Bamboo is 2, Fiberglass is 3 and Iridium is 4."
+    def has_pan(self, material: str = ToolMaterial.copper) -> StardewRule:
+        assert material != ToolMaterial.basic, "The basic pan does not exist."
 
         if self.content.features.tool_progression.is_progressive:
-            return self.logic.received(APTool.fishing_rod, level)
+            # The is no basic tier for the pan, so copper is level 1 instead of 2
+            level = tool_materials[material] - 1
+            return self.logic.tool._has_progressive_tool(Tool.pan, level)
 
-        if level <= 2:
-            # We assume you always have access to the Bamboo pole, because mod side there is a builtin way to get it back.
-            return self.logic.region.can_reach(Region.beach)
+        pan_cutscene_rule = self.logic.received("Glittering Boulder Removed") & self.logic.region.can_reach(Region.mountain)
+        if material == ToolMaterial.copper:
+            return pan_cutscene_rule
 
-        return self.logic.money.can_spend_at(Region.fish_shop, fishing_rod_prices[level])
+        return pan_cutscene_rule & self.logic.tool._can_purchase_upgrade(material)
+
+    @cache_self1
+    def has_scythe(self, material: str = ToolMaterial.basic) -> StardewRule:
+        if self.content.features.tool_progression.is_progressive:
+            if material == ToolMaterial.basic:
+                return self._has_progressive_tool(Tool.scythe, 1)
+            if material == ToolMaterial.gold:
+                return self._has_progressive_tool(Tool.scythe, 2)
+            if material == ToolMaterial.iridium:
+                return self._has_progressive_tool(Tool.scythe, 3)
+            raise ValueError(f"Scythe material [{material}] is not valid.")
+
+        if material == ToolMaterial.basic:
+            return self.logic.true_
+        if material == ToolMaterial.gold:
+            return self.logic.tool._has_progressive_tool(Tool.scythe, 1)
+        if material == ToolMaterial.iridium:
+            return self.logic.skill.has_mastery(Skill.farming)
+
+        return self.has_tool(Tool.scythe, material)
+
+    @cache_self1
+    def has_fishing_rod(self, material: str = FishingRod.training) -> StardewRule:
+        level = FishingRod.material_to_tier[material]
+        tool_progression = self.content.features.tool_progression
+
+        rebuy_rule = self.logic.money.can_spend_at(Region.fish_shop, fishing_rod_prices[material])
+
+        if tool_progression.is_progressive:
+            return self.logic.tool._has_progressive_tool(Tool.fishing_rod, level) & rebuy_rule
+
+        if material == FishingRod.bamboo:
+            return self.logic.region.can_reach(Region.beach) & rebuy_rule
+        if material == FishingRod.fiberglass:
+            return self.logic.skill.has_level(Skill.fishing, 2) & rebuy_rule
+        if material == FishingRod.iridium:
+            return self.logic.skill.has_level(Skill.fishing, 6) & rebuy_rule
+        if material == FishingRod.advanced_iridium:
+            return self.logic.skill.has_mastery(Skill.fishing) & rebuy_rule
+        return rebuy_rule
+
+    def _has_progressive_tool(self, tool: str, amount: int) -> StardewRule:
+        tool_progression = self.content.features.tool_progression
+        amount -= tool_progression.starting_tools[tool]
+
+        # Meaning you started with the tool
+        if amount <= 0:
+            return self.logic.true_
+
+        return self.logic.received(tool_progression.to_progressive_item_name(tool), amount)
+
+    @cache_self1
+    def _can_purchase_upgrade(self, material: str) -> StardewRule:
+        return self.logic.region.can_reach(LogicRegion.blacksmith_upgrade(material))
 
     # Should be cached
     def can_forage(self, season: Union[str, Iterable[str]], region: str = Region.forest, need_hoe: bool = False) -> StardewRule:
@@ -105,7 +161,7 @@ class ToolLogic(BaseLogic):
         return season_rule & region_rule
 
     @cache_self1
-    def can_water(self, level: int) -> StardewRule:
+    def can_water(self, level: int = 1) -> StardewRule:
         tool_rule = self.logic.tool.has_tool(Tool.watering_can, ToolMaterial.tiers[level])
         spell_rule = self.logic.received(MagicSpell.water) & self.logic.magic.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, level)
         return tool_rule | spell_rule
diff --git a/worlds/stardew_valley/logic/traveling_merchant_logic.py b/worlds/stardew_valley/logic/traveling_merchant_logic.py
index 743ff9949b..6c5566a9a0 100644
--- a/worlds/stardew_valley/logic/traveling_merchant_logic.py
+++ b/worlds/stardew_valley/logic/traveling_merchant_logic.py
@@ -1,7 +1,4 @@
-from typing import Union
-
 from .base_logic import BaseLogic, BaseLogicMixin
-from .received_logic import ReceivedLogicMixin
 from ..stardew_rule import True_
 from ..strings.calendar_names import Weekday
 
diff --git a/worlds/stardew_valley/logic/wallet_logic.py b/worlds/stardew_valley/logic/wallet_logic.py
index eb7afb9af3..e73b99acb2 100644
--- a/worlds/stardew_valley/logic/wallet_logic.py
+++ b/worlds/stardew_valley/logic/wallet_logic.py
@@ -1,5 +1,4 @@
 from .base_logic import BaseLogic, BaseLogicMixin
-from .received_logic import ReceivedLogicMixin
 from ..stardew_rule import StardewRule
 from ..strings.wallet_item_names import Wallet
 
@@ -17,3 +16,10 @@ class WalletLogic(BaseLogic):
 
     def has_rusty_key(self) -> StardewRule:
         return self.logic.received(Wallet.rusty_key)
+
+    # These could be tested against gender if gender ever becomes a yaml option
+    def has_mens_locker_key(self) -> StardewRule:
+        return self.logic.received(Wallet.mens_locker_key)
+
+    def has_womens_locker_key(self) -> StardewRule:
+        return self.logic.received(Wallet.womens_locker_key)
diff --git a/worlds/stardew_valley/logic/walnut_logic.py b/worlds/stardew_valley/logic/walnut_logic.py
index fb83b65907..3b704c197f 100644
--- a/worlds/stardew_valley/logic/walnut_logic.py
+++ b/worlds/stardew_valley/logic/walnut_logic.py
@@ -1,13 +1,14 @@
 from functools import cached_property
 
 from .base_logic import BaseLogic, BaseLogicMixin
-from ..options import ExcludeGingerIsland, Walnutsanity
-from ..stardew_rule import StardewRule, False_, True_
+from ..content.vanilla.ginger_island import ginger_island_content_pack
+from ..options import Walnutsanity
+from ..stardew_rule import StardewRule
 from ..strings.ap_names.ap_option_names import WalnutsanityOptionName
 from ..strings.ap_names.event_names import Event
 from ..strings.craftable_names import Furniture
 from ..strings.crop_names import Fruit
-from ..strings.metal_names import Mineral, Fossil
+from ..strings.metal_names import Fossil
 from ..strings.region_names import Region
 from ..strings.seed_names import Seed
 
@@ -21,10 +22,10 @@ class WalnutLogicMixin(BaseLogicMixin):
 class WalnutLogic(BaseLogic):
 
     def has_walnut(self, number: int) -> StardewRule:
-        if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-            return False_()
+        if not self.content.is_enabled(ginger_island_content_pack):
+            return self.logic.false_
         if number <= 0:
-            return True_()
+            return self.logic.true_
 
         if self.options.walnutsanity == Walnutsanity.preset_none:
             return self.can_get_walnuts(number)
@@ -95,8 +96,8 @@ class WalnutLogic(BaseLogic):
             return self.logic.and_(*reach_walnut_regions)
         if number <= 50:
             return reach_entire_island
-        gems = (Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz)
-        return reach_entire_island & self.logic.has(Fruit.banana) & self.logic.has_all(*gems) & \
+
+        return reach_entire_island & self.logic.has(Fruit.banana) & self.logic.museum.has_all_gems() & \
             self.logic.ability.can_mine_perfectly() & self.logic.ability.can_fish_perfectly() & \
             self.logic.has(Furniture.flute_block) & self.logic.has(Seed.melon) & self.logic.has(Seed.wheat) & \
             self.logic.has(Seed.garlic) & self.can_complete_field_office()
diff --git a/worlds/stardew_valley/mods/logic/deepwoods_logic.py b/worlds/stardew_valley/mods/logic/deepwoods_logic.py
index 17db3c0a6f..6d56f4185d 100644
--- a/worlds/stardew_valley/mods/logic/deepwoods_logic.py
+++ b/worlds/stardew_valley/mods/logic/deepwoods_logic.py
@@ -1,4 +1,3 @@
-from ..mod_data import ModNames
 from ...logic.base_logic import BaseLogicMixin, BaseLogic
 from ...options import ElevatorProgression
 from ...stardew_rule import StardewRule, True_, true_
@@ -55,9 +54,9 @@ class DeepWoodsLogic(BaseLogic):
         rules = [self.logic.received(DeepWoodsItem.pendant_depths) & self.logic.received(DeepWoodsItem.pendant_community) &
                  self.logic.received(DeepWoodsItem.pendant_elder),
                  self.logic.skill.has_total_level(40)]
-        if ModNames.luck_skill in self.options.mods:
+        if ModSkill.luck in self.content.skills:
             rules.append(self.logic.skill.has_level(ModSkill.luck, 7))
         else:
-            rules.append(
-                self.logic.has(Meal.magic_rock_candy))  # You need more luck than this, but it'll push the logic down a ways; you can get the rest there.
+            # You need more luck than this, but it'll push the logic down a ways; you can get the rest there.
+            rules.append(self.logic.has(Meal.magic_rock_candy))
         return self.logic.and_(*rules)
diff --git a/worlds/stardew_valley/mods/logic/elevator_logic.py b/worlds/stardew_valley/mods/logic/elevator_logic.py
index 8e154492e4..9060246caf 100644
--- a/worlds/stardew_valley/mods/logic/elevator_logic.py
+++ b/worlds/stardew_valley/mods/logic/elevator_logic.py
@@ -12,6 +12,6 @@ class ModElevatorLogicMixin(BaseLogicMixin):
 
 class ModElevatorLogic(BaseLogic):
     def has_skull_cavern_elevator_to_floor(self, floor: int) -> StardewRule:
-        if self.options.elevator_progression != ElevatorProgression.option_vanilla and ModNames.skull_cavern_elevator in self.options.mods:
+        if self.options.elevator_progression != ElevatorProgression.option_vanilla and self.content.is_enabled(ModNames.skull_cavern_elevator):
             return self.logic.received("Progressive Skull Cavern Elevator", floor // 25)
         return True_()
diff --git a/worlds/stardew_valley/mods/logic/item_logic.py b/worlds/stardew_valley/mods/logic/item_logic.py
index 7394d82ba1..ec15d8c981 100644
--- a/worlds/stardew_valley/mods/logic/item_logic.py
+++ b/worlds/stardew_valley/mods/logic/item_logic.py
@@ -27,14 +27,14 @@ class ModItemLogic(BaseLogic):
 
     def get_modded_item_rules(self) -> Dict[str, StardewRule]:
         items = dict()
-        if ModNames.boarding_house in self.options.mods:
+        if self.content.is_enabled(ModNames.boarding_house):
             items.update(self.get_boarding_house_item_rules())
         return items
 
     def modify_vanilla_item_rules_with_mod_additions(self, item_rule: Dict[str, StardewRule]):
-        if ModNames.sve in self.options.mods:
+        if self.content.is_enabled(ModNames.sve):
             item_rule.update(self.get_modified_item_rules_for_sve(item_rule))
-        if ModNames.deepwoods in self.options.mods:
+        if self.content.is_enabled(ModNames.deepwoods):
             item_rule.update(self.get_modified_item_rules_for_deep_woods(item_rule))
         return item_rule
 
@@ -69,63 +69,29 @@ class ModItemLogic(BaseLogic):
         return options_to_update
 
     def get_boarding_house_item_rules(self):
+        can_reach_any_boarding_house_region = self.logic.region.can_reach_any(BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
+                                                                              BoardingHouseRegion.lost_valley_house_2)
+        can_fight_at_good_level_in_boarding_house = can_reach_any_boarding_house_region & self.logic.combat.can_fight_at_level(Performance.good)
+        can_fight_at_great_level_in_boarding_house = can_reach_any_boarding_house_region & self.logic.combat.can_fight_at_level(Performance.great)
         return {
             # Mob Drops from lost valley enemies
-            ModArtisanGood.pterodactyl_egg: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                             BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_claw: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                         BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                         BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_vertebra: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                             BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                          BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_phalange: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                             BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_l_wing_bone: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                                BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.pterodactyl_r_wing_bone: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                                BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                       BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_tooth: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                       BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_femur: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                       BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_pelvis: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                        BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                      BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_vertebra: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                          BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.dinosaur_claw: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                      BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.good),
-            ModFossil.neanderthal_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                          BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.great),
-            ModFossil.neanderthal_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                         BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.great),
-            ModFossil.neanderthal_pelvis: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                           BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.great),
-            ModFossil.neanderthal_limb_bones: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1,
-                                                                               BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
-                Performance.great),
+            ModArtisanGood.pterodactyl_egg: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_claw: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_ribs: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_vertebra: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_skull: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_phalange: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_l_wing_bone: can_fight_at_good_level_in_boarding_house,
+            ModFossil.pterodactyl_r_wing_bone: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_skull: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_tooth: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_femur: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_pelvis: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_ribs: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_vertebra: can_fight_at_good_level_in_boarding_house,
+            ModFossil.dinosaur_claw: can_fight_at_good_level_in_boarding_house,
+            ModFossil.neanderthal_skull: can_fight_at_great_level_in_boarding_house,
+            ModFossil.neanderthal_ribs: can_fight_at_great_level_in_boarding_house,
+            ModFossil.neanderthal_pelvis: can_fight_at_great_level_in_boarding_house,
+            ModFossil.neanderthal_limb_bones: can_fight_at_great_level_in_boarding_house,
         }
diff --git a/worlds/stardew_valley/mods/logic/magic_logic.py b/worlds/stardew_valley/mods/logic/magic_logic.py
index 2e3a0e1f97..a8135407f4 100644
--- a/worlds/stardew_valley/mods/logic/magic_logic.py
+++ b/worlds/stardew_valley/mods/logic/magic_logic.py
@@ -1,6 +1,6 @@
 from ...logic.base_logic import BaseLogicMixin, BaseLogic
 from ...mods.mod_data import ModNames
-from ...stardew_rule import StardewRule, False_
+from ...stardew_rule import StardewRule
 from ...strings.ap_names.skill_level_names import ModSkillLevel
 from ...strings.region_names import MagicRegion
 from ...strings.spells import MagicSpell, all_spells
@@ -15,19 +15,21 @@ class MagicLogicMixin(BaseLogicMixin):
 # TODO add logic.mods.magic for altar
 class MagicLogic(BaseLogic):
     def can_use_clear_debris_instead_of_tool_level(self, level: int) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         return self.logic.received(MagicSpell.clear_debris) & self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, level)
 
     def can_use_altar(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
-        spell_rule = False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         return self.logic.region.can_reach(MagicRegion.altar) & self.logic.received_any(*all_spells)
 
     def has_any_spell(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         return self.can_use_altar()
 
     def has_attack_spell_count(self, count: int) -> StardewRule:
@@ -42,37 +44,42 @@ class MagicLogic(BaseLogic):
         return self.logic.count(count, *support_spell_rule)
 
     def has_decent_spells(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 2)
         magic_attack_options_rule = self.has_attack_spell_count(1)
         return magic_resource_rule & magic_attack_options_rule
 
     def has_good_spells(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 4)
         magic_attack_options_rule = self.has_attack_spell_count(2)
         magic_support_options_rule = self.has_support_spell_count(1)
         return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule
 
     def has_great_spells(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 6)
         magic_attack_options_rule = self.has_attack_spell_count(3)
         magic_support_options_rule = self.has_support_spell_count(1)
         return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule
 
     def has_amazing_spells(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 8)
         magic_attack_options_rule = self.has_attack_spell_count(4)
         magic_support_options_rule = self.has_support_spell_count(2)
         return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule
 
     def can_blink(self) -> StardewRule:
-        if ModNames.magic not in self.options.mods:
-            return False_()
+        if not self.content.is_enabled(ModNames.magic):
+            return self.logic.false_
+
         return self.logic.received(MagicSpell.blink) & self.can_use_altar()
diff --git a/worlds/stardew_valley/mods/logic/mod_skills_levels.py b/worlds/stardew_valley/mods/logic/mod_skills_levels.py
deleted file mode 100644
index 32b3368a8c..0000000000
--- a/worlds/stardew_valley/mods/logic/mod_skills_levels.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from typing import Tuple
-
-from ...mods.mod_data import ModNames
-from ...options import Mods
-from ...strings.ap_names.mods.mod_items import SkillLevel
-
-
-def get_mod_skill_levels(mods: Mods) -> Tuple[str]:
-    skills_items = []
-    if ModNames.luck_skill in mods:
-        skills_items.append(SkillLevel.luck)
-    if ModNames.socializing_skill in mods:
-        skills_items.append(SkillLevel.socializing)
-    if ModNames.magic in mods:
-        skills_items.append(SkillLevel.magic)
-    if ModNames.archaeology in mods:
-        skills_items.append(SkillLevel.archaeology)
-    if ModNames.binning_skill in mods:
-        skills_items.append(SkillLevel.binning)
-    if ModNames.cooking_skill in mods:
-        skills_items.append(SkillLevel.cooking)
-    return tuple(skills_items)
diff --git a/worlds/stardew_valley/mods/logic/quests_logic.py b/worlds/stardew_valley/mods/logic/quests_logic.py
index 8b1eca7fc2..9f14d97d71 100644
--- a/worlds/stardew_valley/mods/logic/quests_logic.py
+++ b/worlds/stardew_valley/mods/logic/quests_logic.py
@@ -39,7 +39,7 @@ class ModQuestLogic(BaseLogic):
         return quests
 
     def _get_juna_quest_rules(self):
-        if ModNames.juna not in self.options.mods:
+        if not self.content.is_enabled(ModNames.juna):
             return {}
 
         return {
@@ -48,7 +48,7 @@ class ModQuestLogic(BaseLogic):
         }
 
     def _get_mr_ginger_quest_rules(self):
-        if ModNames.ginger not in self.options.mods:
+        if not self.content.is_enabled(ModNames.ginger):
             return {}
 
         return {
@@ -56,7 +56,7 @@ class ModQuestLogic(BaseLogic):
         }
 
     def _get_ayeisha_quest_rules(self):
-        if ModNames.ayeisha not in self.options.mods:
+        if not self.content.is_enabled(ModNames.ayeisha):
             return {}
 
         return {
@@ -65,7 +65,7 @@ class ModQuestLogic(BaseLogic):
         }
 
     def _get_sve_quest_rules(self):
-        if ModNames.sve not in self.options.mods:
+        if not self.content.is_enabled(ModNames.sve):
             return {}
 
         return {
@@ -89,9 +89,8 @@ class ModQuestLogic(BaseLogic):
             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:
+        if not self.content.is_enabled(ModNames.distant_lands):
             return {}
 
         return {
@@ -110,7 +109,7 @@ class ModQuestLogic(BaseLogic):
         }
 
     def _get_boarding_house_quest_rules(self):
-        if ModNames.boarding_house not in self.options.mods:
+        if not self.content.is_enabled(ModNames.boarding_house):
             return {}
 
         return {
@@ -118,7 +117,7 @@ class ModQuestLogic(BaseLogic):
         }
 
     def _get_hat_mouse_quest_rules(self):
-        if ModNames.lacey not in self.options.mods:
+        if not self.content.is_enabled(ModNames.lacey):
             return {}
 
         return {
diff --git a/worlds/stardew_valley/mods/logic/skills_logic.py b/worlds/stardew_valley/mods/logic/skills_logic.py
index d57e6c5931..24e7c99b73 100644
--- a/worlds/stardew_valley/mods/logic/skills_logic.py
+++ b/worlds/stardew_valley/mods/logic/skills_logic.py
@@ -1,6 +1,5 @@
 from ...logic.base_logic import BaseLogicMixin, BaseLogic
-from ...mods.mod_data import ModNames
-from ...stardew_rule import StardewRule, False_, True_, And
+from ...stardew_rule import StardewRule, True_, And
 from ...strings.building_names import Building
 from ...strings.craftable_names import ModCraftable, ModMachine
 from ...strings.geode_names import Geode
@@ -28,19 +27,23 @@ class ModSkillLogic(BaseLogic):
         return self.can_earn_mod_skill_level(skill, level)
 
     def can_earn_mod_skill_level(self, skill: str, level: int) -> StardewRule:
-        if ModNames.luck_skill in self.options.mods and skill == ModSkill.luck:
+        if not skill in self.content.skills:
+            return self.logic.false_
+
+        if skill == ModSkill.luck:
             return self.can_earn_luck_skill_level(level)
-        if ModNames.magic in self.options.mods and skill == ModSkill.magic:
+        if skill == ModSkill.magic:
             return self.can_earn_magic_skill_level(level)
-        if ModNames.socializing_skill in self.options.mods and skill == ModSkill.socializing:
+        if skill == ModSkill.socializing:
             return self.can_earn_socializing_skill_level(level)
-        if ModNames.archaeology in self.options.mods and skill == ModSkill.archaeology:
+        if skill == ModSkill.archaeology:
             return self.can_earn_archaeology_skill_level(level)
-        if ModNames.cooking_skill in self.options.mods and skill == ModSkill.cooking:
+        if skill == ModSkill.cooking:
             return self.can_earn_cooking_skill_level(level)
-        if ModNames.binning_skill in self.options.mods and skill == ModSkill.binning:
+        if skill == ModSkill.binning:
             return self.can_earn_binning_skill_level(level)
-        return False_()
+
+        return self.logic.false_
 
     def can_earn_luck_skill_level(self, level: int) -> StardewRule:
         if level >= 6:
@@ -71,17 +74,17 @@ class ModSkillLogic(BaseLogic):
         shifter_rule = True_()
         preservation_rule = True_()
         if self.content.features.skill_progression.is_progressive:
-            shifter_rule = self.logic.has(ModCraftable.water_shifter)
+            shifter_rule = self.logic.has(ModCraftable.water_sifter)
             preservation_rule = self.logic.has(ModMachine.hardwood_preservation_chamber)
-        if level >= 8:
-            tool_rule = self.logic.tool.has_tool(Tool.pan, ToolMaterial.iridium) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.gold)
+        if level > 8:
+            tool_rule = self.logic.tool.has_pan(ToolMaterial.iridium) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.gold)
             return tool_rule & shifter_rule & preservation_rule
-        if level >= 5:
-            tool_rule = self.logic.tool.has_tool(Tool.pan, ToolMaterial.gold) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iron)
-            return tool_rule & shifter_rule
+        if level > 6:
+            tool_rule = self.logic.tool.has_pan(ToolMaterial.gold) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iron)
+            return tool_rule & preservation_rule
         if level >= 3:
-            return self.logic.tool.has_tool(Tool.pan, ToolMaterial.iron) | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.copper)
-        return self.logic.tool.has_tool(Tool.pan, ToolMaterial.copper) | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic)
+            return self.logic.tool.has_pan(ToolMaterial.iron) | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.copper)
+        return self.logic.tool.has_pan() | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic)
 
     def can_earn_cooking_skill_level(self, level: int) -> StardewRule:
         if level >= 6:
diff --git a/worlds/stardew_valley/mods/logic/special_orders_logic.py b/worlds/stardew_valley/mods/logic/special_orders_logic.py
index f697661419..ba5d293191 100644
--- a/worlds/stardew_valley/mods/logic/special_orders_logic.py
+++ b/worlds/stardew_valley/mods/logic/special_orders_logic.py
@@ -25,7 +25,7 @@ class ModSpecialOrderLogicMixin(BaseLogicMixin):
 class ModSpecialOrderLogic(BaseLogic):
     def get_modded_special_orders_rules(self):
         special_orders = {}
-        if ModNames.juna in self.options.mods:
+        if self.content.is_enabled(ModNames.juna):
             special_orders.update({
                 ModSpecialOrder.junas_monster_mash: self.logic.relationship.has_hearts(ModNPC.juna, 4) &
                                                     self.registry.special_order_rules[SpecialOrder.a_curious_substance] &
@@ -34,7 +34,7 @@ class ModSpecialOrderLogic(BaseLogic):
                                                     self.logic.has("Energy Tonic") & self.logic.has(Material.sap) & self.logic.has(Loot.bug_meat) &
                                                     self.logic.has(Edible.oil_of_garlic) & self.logic.has(Meal.strange_bun)
             })
-        if ModNames.sve in self.options.mods:
+        if self.content.is_enabled(ModNames.sve):
             special_orders.update({
                 ModSpecialOrder.andys_cellar: self.logic.has(Material.stone) & self.logic.has(Material.wood) & self.logic.has(Material.hardwood) &
                                               self.logic.has(MetalBar.iron) & self.logic.received(CommunityUpgrade.movie_theater, 1) &
@@ -52,12 +52,12 @@ class ModSpecialOrderLogic(BaseLogic):
                                                      self.logic.region.can_reach(SVERegion.susans_house)  # quest requires you make the fertilizer
             })
 
-        if ModNames.jasper in self.options.mods:
+        if self.content.is_enabled(ModNames.jasper):
             special_orders.update({
                 ModSpecialOrder.dwarf_scroll: self.logic.has_all(*(Artifact.dwarf_scroll_i, Artifact.dwarf_scroll_ii, Artifact.dwarf_scroll_iii,
                                                                    Artifact.dwarf_scroll_iv,)),
                 ModSpecialOrder.geode_order: self.logic.has_all(*(Geode.geode, Geode.frozen, Geode.magma, Geode.omni,)) &
-                                             self.logic.relationship.has_hearts(ModNPC.jasper, 8)
+                                             self.logic.relationship.has_hearts(ModNPC.jasper, 8) & self.logic.special_order.can_complete_special_order(SpecialOrder.fragments_of_the_past)
             })
 
         return special_orders
diff --git a/worlds/stardew_valley/mods/logic/sve_logic.py b/worlds/stardew_valley/mods/logic/sve_logic.py
index 03f1737c59..05839941bb 100644
--- a/worlds/stardew_valley/mods/logic/sve_logic.py
+++ b/worlds/stardew_valley/mods/logic/sve_logic.py
@@ -2,7 +2,7 @@ from ...logic.base_logic import BaseLogicMixin, BaseLogic
 from ...strings.ap_names.mods.mod_items import SVELocation, SVERunes, SVEQuestItem
 from ...strings.quest_names import Quest, ModQuest
 from ...strings.region_names import Region, SVERegion
-from ...strings.tool_names import Tool, ToolMaterial
+from ...strings.tool_names import Tool
 from ...strings.wallet_item_names import Wallet
 
 
@@ -45,8 +45,8 @@ class SVELogic(BaseLogic):
         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) &
-                       self.logic.tool.has_tool(Tool.pickaxe, ToolMaterial.basic))
-        forage_rule = self.logic.region.can_reach_any((Region.forest, Region.backwoods, Region.mountain))
+        access_rule = (self.logic.quest.can_complete_quest(Quest.strange_note) & self.logic.tool.has_tool(Tool.axe) &
+                       self.logic.tool.has_tool(Tool.pickaxe))
+        forage_rule = self.logic.region.can_reach_any(Region.forest, Region.backwoods, Region.mountain)
         knowledge_rule = self.has_bear_knowledge()
         return access_rule & forage_rule & knowledge_rule
diff --git a/worlds/stardew_valley/mods/mod_data.py b/worlds/stardew_valley/mods/mod_data.py
index 54408fb2c5..8ed97e033e 100644
--- a/worlds/stardew_valley/mods/mod_data.py
+++ b/worlds/stardew_valley/mods/mod_data.py
@@ -1,3 +1,6 @@
+from typing import Iterable
+
+
 class ModNames:
     vanilla = None
     deepwoods = "DeepWoods"
@@ -26,3 +29,22 @@ class ModNames:
     distant_lands = "Distant Lands - Witch Swamp Overhaul"
     lacey = "Hat Mouse Lacey"
     boarding_house = "Boarding House and Bus Stop Extension"
+
+
+invalid_mod_combinations = [
+    # [ModNames.sve, ModNames.distant_lands] # This is going to become banned after Reptar's SVE update. For now, it's fine.
+]
+
+
+def mod_combination_is_valid(mods: Iterable[str]):
+    for mod_combination in invalid_mod_combinations:
+        if all([mod in mods for mod in mod_combination]):
+            return False
+    return True
+
+
+def get_invalid_mod_combination(mods: Iterable[str]):
+    for mod_combination in invalid_mod_combinations:
+        if all([mod in mods for mod in mod_combination]):
+            return mod_combination
+    return None
diff --git a/worlds/stardew_valley/mods/region_data.py b/worlds/stardew_valley/mods/region_data.py
index 5dc4a3dff2..3ba0785891 100644
--- a/worlds/stardew_valley/mods/region_data.py
+++ b/worlds/stardew_valley/mods/region_data.py
@@ -169,7 +169,7 @@ sve_main_land_regions = [
     RegionData(SVERegion.willy_bedroom),
     RegionData(Region.mountain, (SVEEntrance.mountain_to_guild_summit,)),
     # These entrances are removed from the mountain region when SVE is enabled
-    RegionData(Region.mountain, (Entrance.mountain_to_adventurer_guild, Entrance.mountain_to_the_mines), flag=MergeFlag.REMOVE_EXITS),
+    RegionData(Region.outside_adventure_guild, (Entrance.mountain_to_adventurer_guild, Entrance.mountain_to_the_mines), flag=MergeFlag.REMOVE_EXITS),
     RegionData(SVERegion.guild_summit, (SVEEntrance.guild_to_interior, SVEEntrance.guild_to_mines)),
     RegionData(Region.railroad, (SVEEntrance.to_susan_house, SVEEntrance.enter_summit, SVEEntrance.railroad_to_grampleton_station)),
     RegionData(SVERegion.grampleton_station, (SVEEntrance.grampleton_station_to_grampleton_suburbs,)),
diff --git a/worlds/stardew_valley/options/__init__.py b/worlds/stardew_valley/options/__init__.py
index 12c0d7c647..b4fe27a72c 100644
--- a/worlds/stardew_valley/options/__init__.py
+++ b/worlds/stardew_valley/options/__init__.py
@@ -1,6 +1,13 @@
-from .options import StardewValleyOption, Goal, FarmType, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice, EntranceRandomization, \
-    SeasonRandomization, Cropsanity, BackpackProgression, ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations, \
-    ArcadeMachineLocations, SpecialOrderLocations, QuestLocations, Fishsanity, Museumsanity, Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity, \
-    Friendsanity, FriendsanityHeartSize, Booksanity, Walnutsanity, NumberOfMovementBuffs, EnabledFillerBuffs, ExcludeGingerIsland, TrapDifficulty, \
-    MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier, FriendshipMultiplier, DebrisMultiplier, QuickStart, Gifting, Mods, BundlePlando, \
-    StardewValleyOptions, enabled_mods, disabled_mods, all_mods, TrapDistribution, TrapItems, StardewValleyOptions
+from .options import (StardewValleyOption, Goal, FarmType, StartingMoney, ProfitMargin,
+                      BundleRandomization, BundlePrice, BundlePerRoom, EntranceRandomization, StartWithout,
+                      SeasonRandomization, Cropsanity, BackpackProgression, ToolProgression,
+                      ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations,
+                      ArcadeMachineLocations, SpecialOrderLocations, QuestLocations, Fishsanity,
+                      Museumsanity, Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity,
+                      Friendsanity, FriendsanityHeartSize, Eatsanity, Booksanity, Walnutsanity, Moviesanity,
+                      Secretsanity, Hatsanity, IncludeEndgameLocations, NumberOfMovementBuffs, EnabledFillerBuffs, ExcludeGingerIsland,
+                      TrapDifficulty, MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier,
+                      FriendshipMultiplier, DebrisMultiplier, BackpackSize, QuickStart, Gifting, Mods,
+                      BundlePlando, BundleWhitelist, BundleBlacklist, AllowedFillerItems,
+                      enabled_mods, enabled_mods_except_invalid_combinations, all_mods_except_invalid_combinations, disabled_mods, all_mods,
+                      TrapDistribution, TrapItems, StardewValleyOptions)
diff --git a/worlds/stardew_valley/options/forced_options.py b/worlds/stardew_valley/options/forced_options.py
index 7429f3cbfc..d773cf1ff3 100644
--- a/worlds/stardew_valley/options/forced_options.py
+++ b/worlds/stardew_valley/options/forced_options.py
@@ -2,17 +2,141 @@ import logging
 
 import Options as ap_options
 from . import options
+from .jojapocalypse_options import Jojapocalypse, JojaAreYouSure
+from ..mods.mod_data import mod_combination_is_valid, get_invalid_mod_combination
+from ..options.settings import StardewSettings
+from ..strings.ap_names.ap_option_names import EatsanityOptionName, HatsanityOptionName
 
 logger = logging.getLogger(__name__)
 
 
+def prevent_illegal_mod_combinations(world_options: options.StardewValleyOptions, player: int, player_name: str):
+    if not mod_combination_is_valid(world_options.mods):
+        invalid_mod_combination = get_invalid_mod_combination(world_options.mods)
+        message = f"The combination of mods '{invalid_mod_combination}' cannot be used together. Generation Aborted."
+        logger.error(message)
+        raise ap_options.OptionError(message)
+
+
+def force_change_options_if_banned(world_options: options.StardewValleyOptions, settings: StardewSettings, player: int, player_name: str) -> None:
+    message_template = f"for Player {player} [{player_name}] disallowed from host.yaml."
+    if not settings.allow_allsanity and world_options.goal == options.Goal.option_allsanity:
+        message = f"Allsanity Goal {message_template} Generation Aborted."
+        logger.error(message)
+        raise ap_options.OptionError(message)
+    if not settings.allow_perfection and world_options.goal == options.Goal.option_perfection:
+        message = f"Perfection Goal {message_template} Generation Aborted."
+        logger.error(message)
+        raise ap_options.OptionError(message)
+    if not settings.allow_max_bundles and world_options.bundle_price == options.BundlePrice.option_maximum:
+        world_options.bundle_price.value = options.BundlePrice.option_very_expensive
+        message = f"Max Bundles Price {message_template} Replaced with 'Very Expensive'"
+        logger.warning(message)
+    if not settings.allow_chaos_er and world_options.entrance_randomization == options.EntranceRandomization.option_chaos:
+        world_options.entrance_randomization.value = options.EntranceRandomization.option_buildings
+        message = f"Chaos Entrance Randomization {message_template} Replaced with 'Buildings'"
+        logger.warning(message)
+    if not settings.allow_shipsanity_everything and world_options.shipsanity == options.Shipsanity.option_everything:
+        world_options.shipsanity.value = options.Shipsanity.option_full_shipment_with_fish
+        message = f"Shipsanity Everything {message_template} Replaced with 'Full Shipment With Fish'"
+        logger.warning(message)
+    if not settings.allow_hatsanity_perfection:
+        removed_one = False
+        if HatsanityOptionName.near_perfection in world_options.hatsanity.value:
+            world_options.hatsanity.value.remove(HatsanityOptionName.near_perfection)
+            removed_one = True
+        if HatsanityOptionName.post_perfection in world_options.hatsanity.value:
+            world_options.hatsanity.value.remove(HatsanityOptionName.post_perfection)
+            removed_one = True
+        if removed_one and HatsanityOptionName.difficult not in world_options.hatsanity.value:
+            world_options.hatsanity.value.add(HatsanityOptionName.difficult)
+            message = f"Hatsanity Near or Post Perfection {message_template} Hatsanity setting reduced."
+            logger.warning(message)
+    if not settings.allow_custom_logic:
+        world_options.custom_logic.value = options.CustomLogic.preset_none
+        message = f"Custom Logic {message_template} All flags toggled off."
+        logger.warning(message)
+    if not settings.allow_jojapocalypse and world_options.jojapocalypse >= options.Jojapocalypse.option_allowed:
+        world_options.jojapocalypse.value = options.Jojapocalypse.option_disabled
+        message = f"Jojapocalypse {message_template} Disabled."
+        logger.warning(message)
+    # if not settings.allow_sve and ModNames.sve in options.Mods:
+    #     world_options.mods.value.remove(ModNames.sve)
+    #     message = f"Stardew Valley Expanded {message_template} Removed from Mods."
+    #     logger.warning(message)
+    prevent_illegal_mod_combinations(world_options, player, player_name)
+
+
 def force_change_options_if_incompatible(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    force_no_jojapocalypse_without_being_sure(world_options, player, player_name)
+    force_eatsanity_no_enzymes_if_no_other_eatsanity(world_options, player, player_name)
+    force_hatsanity_when_goal_is_mad_hatter(world_options, player, player_name)
+    force_eatsanity_when_goal_is_ultimate_foodie(world_options, player, player_name)
     force_ginger_island_inclusion_when_goal_is_ginger_island_related(world_options, player, player_name)
     force_walnutsanity_deactivation_when_ginger_island_is_excluded(world_options, player, player_name)
     force_qi_special_orders_deactivation_when_ginger_island_is_excluded(world_options, player, player_name)
     force_accessibility_to_full_when_goal_requires_all_locations(player, player_name, world_options)
 
 
+def force_no_jojapocalypse_without_being_sure(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    has_jojapocalypse = world_options.jojapocalypse.value >= Jojapocalypse.option_allowed
+    is_sure = world_options.joja_are_you_sure == JojaAreYouSure.option_true
+
+    if has_jojapocalypse and not is_sure:
+        world_options.jojapocalypse.value = Jojapocalypse.option_disabled
+        logger.warning(f"Jojapocalypse requires affirmative consent to be enabled. "
+                       f"Jojapocalypse option forced to '{world_options.jojapocalypse}' for player {player} ({player_name})")
+
+    start_price = world_options.joja_start_price.value
+    end_price = world_options.joja_end_price.value
+    if end_price <= start_price:
+        end_price = start_price + 1
+        world_options.joja_end_price.value = end_price
+        logger.warning(f"Jojapocalypse End price must be higher than the start price. "
+                       f"Jojapocalypse End Price forced to '{world_options.joja_end_price}' for player {player} ({player_name})")
+
+
+def force_eatsanity_no_enzymes_if_no_other_eatsanity(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    has_eatsanity_enzymes = EatsanityOptionName.lock_effects in world_options.eatsanity
+    valid_eatsanity_locations_for_enzymes = [EatsanityOptionName.crops, EatsanityOptionName.fish, EatsanityOptionName.cooking]
+    has_enough_eatsanity_locations_for_enzymes = any([option in world_options.eatsanity for option in valid_eatsanity_locations_for_enzymes])
+
+    if has_eatsanity_enzymes and not has_enough_eatsanity_locations_for_enzymes:
+        world_options.eatsanity.value.remove(EatsanityOptionName.lock_effects)
+        logger.warning(f"Eatsanity 'Lock Effects' requires more eatsanity locations to be active. "
+                       f"Eatsanity option forced to '{world_options.eatsanity}' for player {player} ({player_name})")
+
+
+def force_hatsanity_when_goal_is_mad_hatter(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    if world_options.exclude_ginger_island.value and HatsanityOptionName.post_perfection in world_options.hatsanity:
+        world_options.hatsanity.value.remove(HatsanityOptionName.post_perfection)
+        logger.warning(f"Hatsanity '{HatsanityOptionName.post_perfection}' requires ginger island. "
+                       f"'{HatsanityOptionName.post_perfection}' force-removed from Hatsanity")
+
+    goal_is_mad_hatter = world_options.goal == options.Goal.option_mad_hatter
+    hatsanity_is_disabled = world_options.hatsanity == options.Hatsanity.preset_none
+
+    if goal_is_mad_hatter and hatsanity_is_disabled:
+        world_options.hatsanity.value = options.Hatsanity.preset_simple
+        goal_name = world_options.goal.current_option_name
+        logger.warning(f"Goal '{goal_name}' requires Hatsanity. "
+                       f"Hatsanity option forced to 'Easy+Tailoring' for player {player} ({player_name})")
+
+
+def force_eatsanity_when_goal_is_ultimate_foodie(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    goal_is_foodie = world_options.goal == options.Goal.option_ultimate_foodie
+    eatsanity_options_that_dont_add_locations = [EatsanityOptionName.lock_effects, EatsanityOptionName.poisonous]
+    eatsanity_options_that_add_locations = options.Eatsanity.preset_all.difference(eatsanity_options_that_dont_add_locations)
+    eatsanity_relevant_values = world_options.eatsanity.value.difference(eatsanity_options_that_dont_add_locations)
+    eatsanity_is_disabled = len(eatsanity_relevant_values) <= 0
+
+    if goal_is_foodie and eatsanity_is_disabled:
+        world_options.eatsanity.value = world_options.eatsanity.value.union(eatsanity_options_that_add_locations)
+        goal_name = world_options.goal.current_option_name
+        logger.warning(f"Goal '{goal_name}' requires Eatsanity. "
+                       f"Eatsanity option forced to 'All' for player {player} ({player_name})")
+
+
 def force_ginger_island_inclusion_when_goal_is_ginger_island_related(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
     goal_is_walnut_hunter = world_options.goal == options.Goal.option_greatest_walnut_hunter
     goal_is_perfection = world_options.goal == options.Goal.option_perfection
diff --git a/worlds/stardew_valley/options/jojapocalypse_options.py b/worlds/stardew_valley/options/jojapocalypse_options.py
new file mode 100644
index 0000000000..b6ec8edba5
--- /dev/null
+++ b/worlds/stardew_valley/options/jojapocalypse_options.py
@@ -0,0 +1,73 @@
+from Options import Choice, Range, Toggle
+
+
+class Jojapocalypse(Choice):
+    """Joja Co opens a new Archipelago branch, selling you any and all location checks you might want or need, in exchange for money.
+    But are you ready to pay the price...
+    Disabled: Joja does not sell location checks
+    Allowed: Joja sells location checks, that you can buy if you want
+    Forced: The only way to obtain location checks is through Joja
+    """
+    internal_name = "jojapocalypse"
+    display_name = "Jojapocalypse"
+    default = 0
+    option_disabled = 0
+    option_allowed = 1
+    option_forced = 2
+
+
+class JojaStartPrice(Range):
+    """The price of Jojapocalypse items at the very beginning of the game. This price will increase with each Jojapocalypse purchase
+    """
+    internal_name = "joja_start_price"
+    display_name = "Jojapocalypse Start Price"
+    default = 100
+    range_start = 1
+    range_end = 10000
+
+
+class JojaEndPrice(Range):
+    """The price of the very last Jojapocalypse item you will buy. An individual location check will never go above this.
+    Consider your number of checks before choosing a price, as the total amount of money you spend will highly scale with it.
+    """
+    internal_name = "joja_end_price"
+    display_name = "Jojapocalypse End Price"
+    default = 10000
+    range_start = 0
+    range_end = 100_000
+
+
+class JojaPricingPattern(Choice):
+    """Chooses the pricing strategy of Jojapocalypse sold location checks. Prices will always increase, but you can pick the increase pattern.
+    """
+    internal_name = "joja_pricing_pattern"
+    display_name = "Jojapocalypse Pricing Pattern"
+    default = 1
+    option_linear = 0
+    option_exponential = 1
+
+
+class JojaPurchasesForMembership(Range):
+    """After buying this number of location checks for Joja, you will earn your very own Joja Membership!
+    The world will change accordingly.
+    If you are on "Allowed", receiving your first Movie Theater before earning your membership will close down Joja permanently.
+    If you obtain your membership, the movie theater will instead replace the Community Center, and some location checks will become only obtainable through Joja.
+    If you are on "Forced", You will start as a Joja Member.
+    """
+    internal_name = "joja_purchases_for_membership"
+    display_name = "Purchases For Joja Membership"
+    default = 10
+    range_start = 1
+    range_end = 100
+
+
+class JojaAreYouSure(Toggle):
+    """Jojapocalypse will be an extremely unfulfilling experience.
+    The main driving directive behind its Design is to make the player feel bad and guilty about picking Joja.
+    Most of the things you buy will come with heavy, painful consequences, and they are explicitly done with the intent of being unfun and annoying.
+    This game mode is not supposed to be fun. You will have a bad time.
+    Are you really sure you want to do this?
+    """
+    internal_name = "joja_are_you_sure"
+    display_name = "Are you sure?"
+    default = Toggle.option_false
diff --git a/worlds/stardew_valley/options/option_groups.py b/worlds/stardew_valley/options/option_groups.py
index 4ae1fc3c4d..ddb54f7c5d 100644
--- a/worlds/stardew_valley/options/option_groups.py
+++ b/worlds/stardew_valley/options/option_groups.py
@@ -15,6 +15,7 @@ else:
             options.FarmType,
             options.BundleRandomization,
             options.BundlePrice,
+            options.BundlePerRoom,
             options.EntranceRandomization,
             options.ExcludeGingerIsland,
         ]),
@@ -26,6 +27,7 @@ else:
             options.ElevatorProgression,
             options.SkillProgression,
             options.BuildingProgression,
+            options.StartWithout,
         ]),
         OptionGroup("Extra Shuffling", [
             options.FestivalLocations,
@@ -35,23 +37,32 @@ else:
             options.Fishsanity,
             options.Museumsanity,
             options.Friendsanity,
-            options.FriendsanityHeartSize,
             options.Monstersanity,
-            options.Shipsanity,
-            options.Cooksanity,
             options.Chefsanity,
-            options.Craftsanity,
             options.Booksanity,
             options.Walnutsanity,
+            options.Moviesanity,
         ]),
-        OptionGroup("Multipliers and Buffs", [
+        OptionGroup("Extreme Options", [
+            options.Shipsanity,
+            options.Cooksanity,
+            options.Craftsanity,
+            options.Eatsanity,
+            options.Secretsanity,
+            options.Hatsanity,
+            options.IncludeEndgameLocations,
+        ]),
+        OptionGroup("Multipliers, Buffs and extra customization", [
             options.StartingMoney,
             options.ProfitMargin,
             options.ExperienceMultiplier,
             options.FriendshipMultiplier,
+            options.FriendsanityHeartSize,
             options.DebrisMultiplier,
+            options.BackpackSize,
             options.NumberOfMovementBuffs,
             options.EnabledFillerBuffs,
+            options.AllowedFillerItems,
             options.TrapDifficulty,
             options.TrapDistribution,
             options.MultipleDaySleepEnabled,
@@ -62,8 +73,18 @@ else:
             options.Gifting,
             ap_options.DeathLink,
             options.Mods,
-            options.BundlePlando,
+            options.BundleWhitelist,
+            options.BundleBlacklist,
+            options.CustomLogic,
             ap_options.ProgressionBalancing,
             ap_options.Accessibility,
         ]),
+        OptionGroup("Jojapocalypse", [
+            options.Jojapocalypse,
+            options.JojaStartPrice,
+            options.JojaEndPrice,
+            options.JojaPricingPattern,
+            options.JojaPurchasesForMembership,
+            options.JojaAreYouSure,
+        ]),
     ]
diff --git a/worlds/stardew_valley/options/options.py b/worlds/stardew_valley/options/options.py
index f81cdaac81..76d8e4cb95 100644
--- a/worlds/stardew_valley/options/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -3,11 +3,14 @@ import typing
 from dataclasses import dataclass
 from typing import Protocol, ClassVar
 
-from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink, OptionList, Visibility, Removed, OptionCounter
-from ..items import items_by_group, Group
-from ..mods.mod_data import ModNames
-from ..strings.ap_names.ap_option_names import BuffOptionName, WalnutsanityOptionName
-from ..strings.bundle_names import all_cc_bundle_names
+from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink, OptionList, \
+    Visibility, Removed, OptionCounter
+from .jojapocalypse_options import Jojapocalypse, JojaStartPrice, JojaEndPrice, JojaPricingPattern, JojaPurchasesForMembership, JojaAreYouSure
+from ..mods.mod_data import ModNames, invalid_mod_combinations
+from ..strings.ap_names.ap_option_names import BuffOptionName, WalnutsanityOptionName, SecretsanityOptionName, EatsanityOptionName, ChefsanityOptionName, \
+    StartWithoutOptionName, HatsanityOptionName, AllowedFillerOptionName, CustomLogicOptionName
+from ..strings.bundle_names import all_cc_bundle_names, MemeBundleName
+from ..strings.trap_names import all_traps
 
 
 class StardewValleyOption(Protocol):
@@ -30,6 +33,8 @@ class Goal(Choice):
     Craft Master: Craft every item
     Legend: Earn 10 000 000g
     Mystery of the Stardrops: Find every stardrop
+    Mad Hatter: Complete all your hatsanity locations. If hatsanity is disabled, will enable it on "Easy+Tailoring"
+    Ultimate Foodie: Eat all items in the game. Adapts to Eatsanity
     Allsanity: Complete every check in your slot
     Perfection: Attain Perfection
     """
@@ -50,6 +55,8 @@ class Goal(Choice):
     option_craft_master = 11
     option_legend = 12
     option_mystery_of_the_stardrops = 13
+    option_mad_hatter = 20
+    option_ultimate_foodie = 21
     # option_junimo_kart =
     # option_prairie_king =
     # option_fector_challenge =
@@ -122,18 +129,20 @@ class ProfitMargin(NamedRange):
 
 class BundleRandomization(Choice):
     """What items are needed for the community center bundles?
-    Vanilla: Standard bundles from the vanilla game
-    Thematic: Every bundle will require random items compatible with their original theme
-    Remixed: Picks bundles at random from thematic, vanilla remixed and new custom ones
+    Vanilla: Standard bundles from the vanilla game.
+    Thematic: Every bundle will require random items compatible with their original theme.
+    Remixed: Picks bundles at random from thematic, vanilla remixed and new custom ones.
     Remixed Anywhere: Remixed, but bundles are not locked to specific rooms.
-    Shuffled: Every bundle will require random items and follow no particular structure"""
+    Shuffled: Every bundle will require random items and follow no particular structure.
+    Meme: A set of entirely custom bundles are generated purely based on jokes, references, and trolling. Funny but not balanced at all. Not for the faint of heart."""
     internal_name = "bundle_randomization"
     display_name = "Bundle Randomization"
     option_vanilla = 0
     option_thematic = 1
     option_remixed = 3
-    option_remixed_anywhere = 4
+    option_remixed_anywhere = 5
     option_shuffled = 6
+    option_meme = 10
     default = option_remixed
 
 
@@ -158,6 +167,30 @@ class BundlePrice(Choice):
     option_maximum = 8
 
 
+class BundlePerRoom(Choice):
+    """How many bundles are in each room of the community center?
+    Rooms that already have the max cannot increase further
+    2 Fewer: Every room will have 2 fewer bundles
+    1 Fewer: Every room will have 1 fewer bundle
+    Normal: Every room will have its usual number of bundles
+    1 Extra: Every room will have 1 extra bundle
+    2 Extra: Every room will have 2 extra bundles
+    3 Extra: Every room will have 3 extra bundles
+    4 Extra: Every room will have 4 extra bundles"""
+    internal_name = "bundle_per_room"
+    display_name = "Bundle Per Room"
+    default = 0
+    # option_minimum = -8  # I don't think users need this, keeping my options open
+    option_two_fewer = -2
+    option_one_fewer = -1
+    option_normal = 0
+    option_one_extra = 1
+    option_two_extra = 2
+    option_three_extra = 3
+    option_four_extra = 4
+    # option_maximum = 8  # I don't think users need this, keeping my options open
+
+
 class EntranceRandomization(Choice):
     """Should area entrances be randomized?
     Disabled: No entrance randomization is done
@@ -188,6 +221,36 @@ class EntranceRandomization(Choice):
     # option_chaos_one_way = 8
 
 
+class StartWithout(OptionSet):
+    """ Items that, in vanilla, you generally start with (or get very quickly), but in Archipelago, you would rather start without them.
+    If the relevant item is not randomized, this option will do nothing.
+    Tools: Start without an Axe, Pickaxe, Hoe, Watering can and Scythe
+    Backpack: Start with 4 backpack slots, instead of 12, if your backpack size allows it
+    Landslide: Start without the landslide that leads to the mines
+    Community Center: Start without the key to the Community Center, and the Forest Magic to allow reading the bundles
+    Buildings: Start without the Shipping Bin and Pet Bowl
+    """
+    internal_name = "start_without"
+    display_name = "Start Without"
+    valid_keys = frozenset({
+        StartWithoutOptionName.tools, StartWithoutOptionName.backpack,
+        StartWithoutOptionName.landslide, StartWithoutOptionName.community_center,
+        StartWithoutOptionName.buildings,
+    })
+    preset_none = frozenset()
+    preset_easy = frozenset({StartWithoutOptionName.landslide, StartWithoutOptionName.community_center})
+    preset_all = valid_keys
+    default = preset_none
+
+    def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, OptionSet):
+            return set(self.value) == other.value
+        if isinstance(other, OptionList):
+            return set(self.value) == set(other.value)
+        else:
+            return typing.cast(bool, self.value == other)
+
+
 class SeasonRandomization(Choice):
     """Should seasons be randomized?
     Disabled: Start in Spring with all seasons unlocked.
@@ -232,6 +295,26 @@ class BackpackProgression(Choice):
     option_early_progressive = 2
 
 
+class BackpackSize(Choice):
+    """Customize the granularity of the backpack upgrades
+    This works with vanilla and progressive backpack.
+    Default size is 12, which means you start with one backpack (12 slots), and get 2 more upgrades up to 36 slots.
+    If you pick 4, then you start with 3 backpacks (12 slots), and get 6 more upgrades up to 36 slots.
+    If you picked "Start Without Backpack", you will only be provided start upgrades up to 4 slots, instead of up to 12"""
+    internal_name = "backpack_size"
+    option_1 = 1
+    option_2 = 2
+    option_3 = 3
+    option_4 = 4
+    option_6 = 6
+    option_12 = 12
+    default = option_12
+    display_name = "Backpack Size"
+
+    def count_per_tier(self) -> int:
+        return 12 // self.value
+
+
 class ToolProgression(Choice):
     """Shuffle the tool upgrades?
     Vanilla: Clint will upgrade your tools with metal bars.
@@ -241,12 +324,12 @@ class ToolProgression(Choice):
     internal_name = "tool_progression"
     display_name = "Tool Progression"
     default = 1
-    option_vanilla = 0b000  # 0
-    option_progressive = 0b001  # 1
-    option_vanilla_cheap = 0b010  # 2
-    option_vanilla_very_cheap = 0b100  # 4
-    option_progressive_cheap = 0b011  # 3
-    option_progressive_very_cheap = 0b101  # 5
+    option_vanilla = 0b0000  # 0
+    option_progressive = 0b0001  # 1
+    option_vanilla_cheap = 0b0010  # 2
+    option_vanilla_very_cheap = 0b0100  # 4
+    option_progressive_cheap = 0b0011  # 3
+    option_progressive_very_cheap = 0b0101  # 5
 
     @property
     def is_vanilla(self):
@@ -278,7 +361,7 @@ class SkillProgression(Choice):
     With Masteries: Skill levels are unlocked randomly, and earning xp sends checks. Masteries are included"""
     internal_name = "skill_progression"
     display_name = "Skill Progression"
-    default = 2
+    default = 1
     option_vanilla = 0
     option_progressive = 1
     option_progressive_with_masteries = 2
@@ -461,7 +544,7 @@ class Shipsanity(Choice):
     """Locations for shipping items?
     None: There are no checks for shipping items
     Crops: Every crop and forageable being shipped is a check
-    Fish: Every fish being shipped is a check except legendaries
+    Fish: Every fish being shipped is a check
     Full Shipment: Every item in the Collections page is a check
     Full Shipment With Fish: Every item in the Collections page and every fish is a check
     Everything: Every item in the game that can be shipped is a check
@@ -471,15 +554,12 @@ class Shipsanity(Choice):
     default = 0
     option_none = 0
     option_crops = 1
-    # option_quality_crops = 2
     option_fish = 3
-    # option_quality_fish = 4
+    option_crops_and_fish = 4
     option_full_shipment = 5
-    # option_quality_full_shipment = 6
     option_full_shipment_with_fish = 7
-    # option_quality_full_shipment_with_fish = 8
     option_everything = 9
-    # option_quality_everything = 10
+    alias_all = option_everything
 
 
 class Cooksanity(Choice):
@@ -496,38 +576,31 @@ class Cooksanity(Choice):
     option_all = 2
 
 
-class Chefsanity(NamedRange):
-    """Locations for learning cooking recipes?
-    Vanilla: All cooking recipes are learned normally
-    Queen of Sauce: Every Queen of Sauce episode is a check, all Queen of Sauce recipes are items
+class Chefsanity(OptionSet):
+    """Locations for learning cooking recipes? Omitted categories are learned normally
+    Queen of Sauce: Every Queen of Sauce episode is a check
     Purchases: Every purchasable recipe is a check
     Friendship: Recipes obtained from friendship are checks
     Skills: Recipes obtained from skills are checks
-    All: Learning every cooking recipe is a check
     """
     internal_name = "chefsanity"
     display_name = "Chefsanity"
-    default = 0
-    range_start = 0
-    range_end = 15
 
-    option_none = 0b0000  # 0
-    option_queen_of_sauce = 0b0001  # 1
-    option_purchases = 0b0010  # 2
-    option_qos_and_purchases = 0b0011  # 3
-    option_skills = 0b0100  # 4
-    option_friendship = 0b1000  # 8
-    option_all = 0b1111  # 15
+    valid_keys = frozenset({
+        ChefsanityOptionName.queen_of_sauce, ChefsanityOptionName.purchases,
+        ChefsanityOptionName.skills, ChefsanityOptionName.friendship,
+    })
+    preset_none = frozenset()
+    preset_all = valid_keys
+    default = preset_none
 
-    special_range_names = {
-        "none": 0b0000,  # 0
-        "queen_of_sauce": 0b0001,  # 1
-        "purchases": 0b0010,  # 2
-        "qos_and_purchases": 0b0011,  # 3
-        "skills": 0b0100,  # 4
-        "friendship": 0b1000,  # 8
-        "all": 0b1111,  # 15
-    }
+    def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, OptionSet):
+            return set(self.value) == other.value
+        if isinstance(other, OptionList):
+            return set(self.value) == set(other.value)
+        else:
+            return typing.cast(bool, self.value == other)
 
 
 class Craftsanity(Choice):
@@ -573,6 +646,36 @@ class FriendsanityHeartSize(Range):
     # step = 1
 
 
+class Eatsanity(OptionSet):
+    """Locations for eating various items?
+    Cooking: Includes all cooked and crafted edible items
+    Crops: Includes all crops and forageable edible items
+    Fish: Includes all fish and fished edible items
+    Artisan: Includes all edible items produced by machines and animals
+    Shop: Includes all edible items purchased primarily in shops
+    Poisonous: Includes items that cause negative effects when consumed
+    Lock Effects: Whether each positive effect from edible items is unlocked through an archipelago "Enzyme" item. Requires some eatsanity locations to be enabled.
+    """
+    internal_name = "eatsanity"
+    display_name = "Eatsanity"
+    valid_keys = frozenset({
+        EatsanityOptionName.cooking, EatsanityOptionName.crops, EatsanityOptionName.fish,
+        EatsanityOptionName.artisan, EatsanityOptionName.shop,
+        EatsanityOptionName.poisonous, EatsanityOptionName.lock_effects,
+    })
+    preset_none = frozenset()
+    preset_all = valid_keys
+    default = preset_none
+
+    def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, OptionSet):
+            return set(self.value) == other.value
+        if isinstance(other, OptionList):
+            return set(self.value) == set(other.value)
+        else:
+            return typing.cast(bool, self.value == other)
+
+
 class Booksanity(Choice):
     """Shuffle Books?
     None: All books behave like vanilla
@@ -615,6 +718,100 @@ class Walnutsanity(OptionSet):
             return typing.cast(bool, self.value == other)
 
 
+class Moviesanity(Choice):
+    """Add checks for watching movies?
+    None: No movie checks
+    One: There is a check for watching a movie, regardless of which
+    All Movies: Watching all individual movies are checks
+    All Movies Loved: Watching all individual movies are checks, but you have to invite someone who loves it
+    All Movies With Loved Snacks: Watching movies only counts if you invite someone who loves it and buy them a loved snack
+    All Movies And All Snacks: Watch all movies with someone who loves them, and purchase all the snacks once
+    All Movies And All Loved Snacks: Watch all movies with someone who loves them, and purchase all the snacks for someone who loves them
+    """
+    internal_name = "moviesanity"
+    display_name = "Moviesanity"
+    default = 1
+    option_none = 0
+    option_one = 1
+    option_all_movies = 2
+    option_all_movies_loved = 3
+    option_all_movies_with_loved_snack = 4
+    option_all_movies_and_all_snacks = 5
+    option_all_movies_and_all_loved_snacks = 6
+
+
+class Secretsanity(OptionSet):
+    """Add checks for the various secrets and easter eggs present in Stardew Valley. Some of them can be very obscure. If you enable this setting, you should expect to need the wiki a lot.
+    Easy: Secrets that can be obtained quickly and easily, if you know what to do
+    Difficult: Includes secrets that require a lot of grinding or a lot of luck. Not for the faint of heart. Enabling this will also modify some secrets from the other categories to require their harder variation, if there is one.
+    Fishing: Various special items and furniture that can be fished up in specific places
+    Secret Notes: Complete tasks described in the various secret notes, when applicable
+    """
+    internal_name = "secretsanity"
+    display_name = "Secretsanity"
+    valid_keys = frozenset({
+        SecretsanityOptionName.easy, SecretsanityOptionName.difficult, SecretsanityOptionName.fishing, SecretsanityOptionName.secret_notes,
+    })
+    preset_none = frozenset()
+    preset_simple = frozenset({
+        SecretsanityOptionName.easy, SecretsanityOptionName.fishing, SecretsanityOptionName.secret_notes,
+    })
+    preset_all = valid_keys
+    default = preset_none
+
+    def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, OptionSet):
+            return set(self.value) == other.value
+        if isinstance(other, OptionList):
+            return set(self.value) == set(other.value)
+        else:
+            return typing.cast(bool, self.value == other)
+
+
+class Hatsanity(OptionSet):
+    """Add checks for wearing hats?
+    Tailoring: Locations for wearing the hats created through tailoring
+    Easy: Locations for wearing the easily obtainable hats
+    Medium: Locations for wearing the hats that are obtainable through a task that requires a bit of effort
+    Difficult: Locations for wearing hats that are difficult to obtain
+    RNG: Locations for wearing hats that are extremely rng-dependent to obtain. Generally an unpleasant grind.
+    Near Perfection: Locations for wearing hats that are late game and generally obtained by doing the equivalent of a perfection task
+    Post Perfection: Locations for wearing all hats, including the hyper-late game ones that require more work than perfection itself
+    """
+    internal_name = "hatsanity"
+    display_name = "Hatsanity"
+
+    valid_keys = frozenset({
+        HatsanityOptionName.tailoring, HatsanityOptionName.easy, HatsanityOptionName.medium, HatsanityOptionName.difficult,
+        HatsanityOptionName.rng, HatsanityOptionName.near_perfection, HatsanityOptionName.post_perfection
+    })
+    preset_none = frozenset()
+    preset_simple = frozenset({
+        HatsanityOptionName.tailoring, HatsanityOptionName.easy,
+    })
+    preset_difficult = frozenset({
+        HatsanityOptionName.tailoring, HatsanityOptionName.easy, HatsanityOptionName.medium, HatsanityOptionName.difficult,
+    })
+    preset_all = valid_keys
+    default = preset_none
+
+    def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, OptionSet):
+            return set(self.value) == other.value
+        if isinstance(other, OptionList):
+            return set(self.value) == set(other.value)
+        else:
+            return typing.cast(bool, self.value == other)
+
+
+class IncludeEndgameLocations(Toggle):
+    """Whether to include, as locations, several very expensive things that are usually purchased during the end-game in vanilla.
+    Examples: Obelisks, Community Upgrades, Catalogues, etc"""
+    internal_name = "include_endgame_locations"
+    display_name = "Include Endgame Locations"
+    default = Toggle.option_false
+
+
 class NumberOfMovementBuffs(Range):
     """Number of movement speed buffs to the player that exist as items in the pool.
     Each movement speed buff is a +25% multiplier that stacks additively"""
@@ -690,6 +887,9 @@ class TrapDifficulty(Choice):
     option_hell = 4
     option_nightmare = 5
 
+    def include_traps(self) -> bool:
+        return self.value > 0
+
 
 trap_default_weight = 100
 
@@ -707,18 +907,56 @@ class TrapDistribution(OptionCounter):
     visibility = Visibility.all ^ Visibility.simple_ui
     min = 0
     max = 1000
-    valid_keys = frozenset({
-        trap_data.name
-        for trap_data in items_by_group[Group.TRAP]
-        if Group.DEPRECATED not in trap_data.groups
-    })
+    valid_keys = frozenset(all_traps)
     default = {
-        trap_data.name: trap_default_weight
-        for trap_data in items_by_group[Group.TRAP]
-        if Group.DEPRECATED not in trap_data.groups
+        trap: trap_default_weight
+        for trap in all_traps
     }
 
 
+class CustomLogic(OptionSet):
+    """Enable various customizations to the logic of the generator.
+    Some flags are inherently incompatible with each other, the harder flag takes priority.
+    Some of these toggles can, if the player is not careful, force them to reset days.
+    Chair Skips: Chair skips are considered in-logic
+    Easy Fishing: +2 Required fishing levels
+    Hard Fishing: -2 Required fishing levels
+    Extreme Fishing: -4 Required fishing levels
+    Easy Mining: +1 required pickaxes and +2 required mining levels
+    Hard Mining: -1 required pickaxes and -2 required mining levels
+    Extreme Mining: -2 required pickaxes and -4 required mining levels
+    Easy Combat: +1 required weapon and +2 required combat levels
+    Hard Combat: -1 required weapon and -2 required combat levels
+    Extreme Combat: -2 required weapon and -4 required combat levels
+    Deep Mining: x2 Mine depth expectations
+    Very Deep Mining: x4 Mine depth expectations
+    Ignore Birthdays: Villager birthdays are not considered in logic
+    Easy Money: x0.25 to earnings expectations
+    Hard Money: x2 to earnings expectations
+    Extreme Money: x8 to earnings expectations
+    Nightmare Money: x20 to earnings expectations
+    Bomb Hoeing: Hoeing ground is in logic without a hoe
+    Rain Watering: Watering crops is in logic without a watering can
+    Critical Free Samples: Free samples of items are considered in logic without a renewable source
+    """
+    internal_name = "custom_logic"
+    display_name = "Custom Logic"
+    valid_keys = frozenset({
+        CustomLogicOptionName.chair_skips,
+        CustomLogicOptionName.easy_fishing, CustomLogicOptionName.hard_fishing, CustomLogicOptionName.extreme_fishing,
+        CustomLogicOptionName.easy_mining, CustomLogicOptionName.hard_mining, CustomLogicOptionName.extreme_mining,
+        CustomLogicOptionName.easy_combat, CustomLogicOptionName.hard_combat, CustomLogicOptionName.extreme_combat,
+        CustomLogicOptionName.deep_mining, CustomLogicOptionName.very_deep_mining,
+        CustomLogicOptionName.ignore_birthdays,
+        CustomLogicOptionName.easy_money, CustomLogicOptionName.hard_money, CustomLogicOptionName.extreme_money, CustomLogicOptionName.nightmare_money,
+        CustomLogicOptionName.bomb_hoeing, CustomLogicOptionName.rain_watering,
+        CustomLogicOptionName.critical_free_samples,
+    })
+    preset_none = frozenset()
+    preset_all = valid_keys
+    default = frozenset(preset_none)
+
+
 class MultipleDaySleepEnabled(Toggle):
     """Enable the ability to sleep automatically for multiple days straight?"""
     internal_name = "multiple_day_sleep_enabled"
@@ -828,13 +1066,24 @@ all_mods = {ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
 # These mods have been disabled because either they are not updated for the current supported version of Stardew Valley,
 # or we didn't find the time to validate that they work or fix compatibility issues if they do.
 # Once a mod is validated to be functional, it can simply be removed from this list
+# SVE specifically is disabled because their main version is significantly ahead of ours, with breaking changes, and nobody is maintaining our integration.
 disabled_mods = {ModNames.deepwoods, ModNames.magic,
                  ModNames.cooking_skill,
                  ModNames.yoba, ModNames.eugene,
                  ModNames.wellwick, ModNames.shiko, ModNames.delores, ModNames.riley,
-                 ModNames.boarding_house}
+                 ModNames.boarding_house, ModNames.sve}
 
 enabled_mods = all_mods.difference(disabled_mods)
+all_mods_except_invalid_combinations = set(all_mods)
+for mod_combination in invalid_mod_combinations:
+    priority_mod = mod_combination[0]
+    if priority_mod not in all_mods_except_invalid_combinations:
+        continue
+    for mod in mod_combination:
+        if mod == priority_mod:
+            continue
+        all_mods_except_invalid_combinations.remove(mod)
+enabled_mods_except_invalid_combinations = all_mods_except_invalid_combinations.difference(disabled_mods)
 
 
 class Mods(OptionSet):
@@ -849,14 +1098,88 @@ class Mods(OptionSet):
         valid_keys = all_mods
 
 
-class BundlePlando(OptionSet):
-    """If using Remixed bundles, this guarantees some of them will show up in your community center.
-    If more bundles are specified than what fits in their parent room, that room will randomly pick from only the plando ones"""
+class BundlePlando(Removed):
+    """Deprecated setting, replaced by BundleWhitelist and BundleBlacklist
+    """
     internal_name = "bundle_plando"
     display_name = "Bundle Plando"
+    default = ""
+    visibility = Visibility.none
+
+    def __init__(self, value: str):
+        if value:
+            raise Exception("Option bunde_plando was replaced by bundle_whitelist and bundle_blacklist, please update your options file")
+        super().__init__(value)
+
+
+class BundleWhitelist(OptionSet):
+    """If using Remixed or Meme bundles, this guarantees some of them will show up in your community center.
+    If more bundles are specified than what fits in their parent room, that room will randomly pick from only the whitelist ones"""
+    internal_name = "bundle_whitelist"
+    display_name = "Bundle Whitelist"
     visibility = Visibility.template | Visibility.spoiler
     valid_keys = set(all_cc_bundle_names)
 
+    def prioritizes(self, bundle_name):
+        if self.in_plando(bundle_name):
+            return True
+        if bundle_name == MemeBundleName.scam:
+            return self.in_plando("Investment Bundle")
+        return False
+
+    def in_plando(self, bundle_name) -> bool:
+        return bundle_name in self.value
+
+
+class BundleBlacklist(OptionSet):
+    """If using Remixed or Meme bundles, this guarantees some of them will not show up in your community center.
+    If too many bundles are blacklisted for a given room, that room will pick all the non-blacklist bundles, then random blacklisted ones."""
+    internal_name = "bundle_blacklist"
+    display_name = "Bundle Blacklist"
+    visibility = Visibility.template | Visibility.spoiler
+    valid_keys = set(all_cc_bundle_names)
+
+    def allows(self, bundle_name):
+        if self.in_plando(bundle_name):
+            return False
+        if bundle_name == MemeBundleName.scam:
+            return not self.in_plando("Investment Bundle")
+        return True
+
+    def in_plando(self, bundle_name) -> bool:
+        return bundle_name in self.value
+
+
+class AllowedFillerItems(OptionSet):
+    """Types of filler items that can be generated for this slot. All allowed fillers have the same odds, and duplicates can roll
+    Farming Items: Items to help with farming. Fertilizers, sprinklers...
+    Fishing Items: Items to help with fishing. Baits, Bobbers...
+    Fruit Trees: Extra Fruit Trees
+    Food: Food that doesn't give buffs
+    Buff Food: Food that gives buffs
+    Consumables: Other consumables. Warp Totems, Staircases...
+    Machines: Various machines. Enables a lot of OoL
+    Storage: Storage items. Chests, Big Chests...
+    Quality Of Life: Items that are nice to have. Key to the town, Horse Flute...
+    Materials: Construction Materials. Wood, Stone...
+    Money: Packs of money
+    Currencies: Packs of other currencies. Walnuts, Qi Gems, Calico eggs...
+    Rings: Various rings
+    Hats: Various hats.
+    Decorations: Various decorations and furniture
+    """
+    internal_name = "allowed_filler_items"
+    display_name = "Allowed Filler Items"
+    visibility = Visibility.template | Visibility.spoiler
+    valid_keys = frozenset({AllowedFillerOptionName.farming, AllowedFillerOptionName.fishing, AllowedFillerOptionName.fruit_trees,
+                            AllowedFillerOptionName.food, AllowedFillerOptionName.buff_food, AllowedFillerOptionName.consumables,
+                            AllowedFillerOptionName.machines, AllowedFillerOptionName.storage, AllowedFillerOptionName.quality_of_life,
+                            AllowedFillerOptionName.materials, AllowedFillerOptionName.currencies, AllowedFillerOptionName.money,
+                            AllowedFillerOptionName.hats, AllowedFillerOptionName.decorations, AllowedFillerOptionName.rings})
+    preset_none = frozenset()
+    preset_all = valid_keys
+    default = preset_all
+
 
 @dataclass
 class StardewValleyOptions(PerGameCommonOptions):
@@ -864,10 +1187,13 @@ class StardewValleyOptions(PerGameCommonOptions):
     farm_type: FarmType
     bundle_randomization: BundleRandomization
     bundle_price: BundlePrice
+    bundle_per_room: BundlePerRoom
     entrance_randomization: EntranceRandomization
+    start_without: StartWithout
     season_randomization: SeasonRandomization
     cropsanity: Cropsanity
     backpack_progression: BackpackProgression
+    backpack_size: BackpackSize
     tool_progression: ToolProgression
     skill_progression: SkillProgression
     building_progression: BuildingProgression
@@ -885,8 +1211,13 @@ class StardewValleyOptions(PerGameCommonOptions):
     craftsanity: Craftsanity
     friendsanity: Friendsanity
     friendsanity_heart_size: FriendsanityHeartSize
+    eatsanity: Eatsanity
     booksanity: Booksanity
     walnutsanity: Walnutsanity
+    moviesanity: Moviesanity
+    secretsanity: Secretsanity
+    hatsanity: Hatsanity
+    include_endgame_locations: IncludeEndgameLocations
     exclude_ginger_island: ExcludeGingerIsland
     quick_start: QuickStart
     starting_money: StartingMoney
@@ -898,12 +1229,24 @@ class StardewValleyOptions(PerGameCommonOptions):
     enabled_filler_buffs: EnabledFillerBuffs
     trap_difficulty: TrapDifficulty
     trap_distribution: TrapDistribution
+    custom_logic: CustomLogic
     multiple_day_sleep_enabled: MultipleDaySleepEnabled
     multiple_day_sleep_cost: MultipleDaySleepCost
     gifting: Gifting
     mods: Mods
-    bundle_plando: BundlePlando
+    bundle_whitelist: BundleWhitelist
+    bundle_blacklist: BundleBlacklist
+    allowed_filler_items: AllowedFillerItems
     death_link: DeathLink
 
+    # Jojapocalypse
+    jojapocalypse: Jojapocalypse
+    joja_start_price: JojaStartPrice
+    joja_end_price: JojaEndPrice
+    joja_pricing_pattern: JojaPricingPattern
+    joja_purchases_for_membership: JojaPurchasesForMembership
+    joja_are_you_sure: JojaAreYouSure
+
     # removed:
-    trap_items: TrapItems
\ No newline at end of file
+    trap_items: TrapItems
+    bundle_plando: BundlePlando
diff --git a/worlds/stardew_valley/options/presets.py b/worlds/stardew_valley/options/presets.py
index a711fe08ff..31bf2b5a04 100644
--- a/worlds/stardew_valley/options/presets.py
+++ b/worlds/stardew_valley/options/presets.py
@@ -2,359 +2,475 @@ from typing import Any, Dict
 
 import Options as ap_options
 from . import options
-from ..strings.ap_names.ap_option_names import WalnutsanityOptionName
-
 # @formatter:off
+from .jojapocalypse_options import Jojapocalypse, JojaStartPrice, JojaEndPrice, JojaPricingPattern, JojaPurchasesForMembership, JojaAreYouSure
+from ..strings.ap_names.ap_option_names import EatsanityOptionName, ChefsanityOptionName, HatsanityOptionName
+
 all_random_settings = {
-    "progression_balancing":                        "random",
-    "accessibility":                                "random",
-    options.Goal.internal_name:                     "random",
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "random",
-    options.ProfitMargin.internal_name:             "random",
-    options.BundleRandomization.internal_name:      "random",
-    options.BundlePrice.internal_name:              "random",
-    options.EntranceRandomization.internal_name:    "random",
-    options.SeasonRandomization.internal_name:      "random",
-    options.Cropsanity.internal_name:               "random",
-    options.BackpackProgression.internal_name:      "random",
-    options.ToolProgression.internal_name:          "random",
-    options.ElevatorProgression.internal_name:      "random",
-    options.SkillProgression.internal_name:         "random",
-    options.BuildingProgression.internal_name:      "random",
-    options.FestivalLocations.internal_name:        "random",
-    options.ArcadeMachineLocations.internal_name:   "random",
-    options.SpecialOrderLocations.internal_name:    "random",
-    options.QuestLocations.internal_name:           "random",
-    options.Fishsanity.internal_name:               "random",
-    options.Museumsanity.internal_name:             "random",
-    options.Monstersanity.internal_name:            "random",
-    options.Shipsanity.internal_name:               "random",
-    options.Cooksanity.internal_name:               "random",
-    options.Chefsanity.internal_name:               "random",
-    options.Craftsanity.internal_name:              "random",
-    options.Friendsanity.internal_name:             "random",
-    options.FriendsanityHeartSize.internal_name:    "random",
-    options.Booksanity.internal_name:               "random",
-    options.NumberOfMovementBuffs.internal_name:    "random",
-    options.ExcludeGingerIsland.internal_name:      "random",
-    options.TrapDifficulty.internal_name:           "random",
-    options.MultipleDaySleepEnabled.internal_name:  "random",
-    options.MultipleDaySleepCost.internal_name:     "random",
-    options.ExperienceMultiplier.internal_name:     "random",
-    options.FriendshipMultiplier.internal_name:     "random",
-    options.DebrisMultiplier.internal_name:         "random",
-    options.QuickStart.internal_name:               "random",
-    options.Gifting.internal_name:                  "random",
-    "death_link":                                   "random",
+    "progression_balancing":                            "random",
+    "accessibility":                                    "random",
+    options.Goal.internal_name:                         "random",
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "random",
+    options.ProfitMargin.internal_name:                 "random",
+    options.BundleRandomization.internal_name:          "random",
+    options.BundlePrice.internal_name:                  "random",
+    options.BundlePerRoom.internal_name:                "random",
+    options.EntranceRandomization.internal_name:        "random",
+    options.SeasonRandomization.internal_name:          "random",
+    options.Cropsanity.internal_name:                   "random",
+    options.BackpackProgression.internal_name:          "random",
+    options.BackpackSize.internal_name:                 "random",
+    options.ToolProgression.internal_name:              "random",
+    options.ElevatorProgression.internal_name:          "random",
+    options.SkillProgression.internal_name:             "random",
+    options.BuildingProgression.internal_name:          "random",
+    options.FestivalLocations.internal_name:            "random",
+    options.ArcadeMachineLocations.internal_name:       "random",
+    options.SpecialOrderLocations.internal_name:        "random",
+    options.QuestLocations.internal_name:               "random",
+    options.Fishsanity.internal_name:                   "random",
+    options.Museumsanity.internal_name:                 "random",
+    options.Monstersanity.internal_name:                "random",
+    options.Shipsanity.internal_name:                   "random",
+    options.Cooksanity.internal_name:                   "random",
+    options.Craftsanity.internal_name:                  "random",
+    options.Friendsanity.internal_name:                 "random",
+    options.FriendsanityHeartSize.internal_name:        "random",
+    options.Booksanity.internal_name:                   "random",
+    options.Moviesanity.internal_name:                  "random",
+    options.IncludeEndgameLocations.internal_name:      "random",
+    options.NumberOfMovementBuffs.internal_name:        "random",
+    options.ExcludeGingerIsland.internal_name:          "random",
+    options.TrapDifficulty.internal_name:               "random",
+    options.MultipleDaySleepEnabled.internal_name:      "random",
+    options.MultipleDaySleepCost.internal_name:         "random",
+    options.ExperienceMultiplier.internal_name:         "random",
+    options.FriendshipMultiplier.internal_name:         "random",
+    options.DebrisMultiplier.internal_name:             "random",
+    options.QuickStart.internal_name:                   "random",
+    options.Gifting.internal_name:                      "random",
+    "death_link":                                       "random",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 easy_settings = {
-    options.Goal.internal_name:                     options.Goal.option_community_center,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "very rich",
-    options.ProfitMargin.internal_name:             "double",
-    options.BundleRandomization.internal_name:      options.BundleRandomization.option_thematic,
-    options.BundlePrice.internal_name:              options.BundlePrice.option_cheap,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_disabled,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized_not_winter,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_very_cheap,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_very_cheap,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_easy,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
-    options.QuestLocations.internal_name:           "minimum",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_only_easy_fish,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_milestones,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_one_per_category,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
-    options.FriendsanityHeartSize.internal_name:    4,
-    options.Booksanity.internal_name:               options.Booksanity.option_none,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
-    options.NumberOfMovementBuffs.internal_name:    8,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.option_easy,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
-    options.MultipleDaySleepCost.internal_name:     "free",
-    options.ExperienceMultiplier.internal_name:     "triple",
-    options.FriendshipMultiplier.internal_name:     "quadruple",
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_quarter,
-    options.QuickStart.internal_name:               options.QuickStart.option_true,
-    options.Gifting.internal_name:                  options.Gifting.option_true,
-    "death_link":                                   "false",
+    options.Goal.internal_name:                         options.Goal.option_community_center,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "very rich",
+    options.ProfitMargin.internal_name:                 "double",
+    options.BundleRandomization.internal_name:          options.BundleRandomization.option_thematic,
+    options.BundlePrice.internal_name:                  options.BundlePrice.option_cheap,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_one_fewer,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_disabled,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_none,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized_not_winter,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_early_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive_very_cheap,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive_very_cheap,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_easy,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:               "minimum",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_only_easy_fish,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_milestones,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_one_per_category,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:                   options.Chefsanity.preset_none,
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:        4,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_none,
+    options.Booksanity.internal_name:                   options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_none,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_none,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_none,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_none,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_false,
+    options.NumberOfMovementBuffs.internal_name:        8,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_true,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.option_easy,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:         "free",
+    options.ExperienceMultiplier.internal_name:         "triple",
+    options.FriendshipMultiplier.internal_name:         "quadruple",
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.option_quarter,
+    options.QuickStart.internal_name:                   options.QuickStart.option_true,
+    options.Gifting.internal_name:                      options.Gifting.option_true,
+    "death_link":                                       "false",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 medium_settings = {
-    options.Goal.internal_name:                     options.Goal.option_community_center,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "rich",
-    options.ProfitMargin.internal_name:             150,
-    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
-    options.BundlePrice.internal_name:              options.BundlePrice.option_normal,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_non_progression,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_cheap,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_cheap,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_victories_easy,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_short,
-    options.QuestLocations.internal_name:           "normal",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_exclude_legendaries,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_milestones,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_one_per_monster,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_queen_of_sauce,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_starting_npcs,
-    options.FriendsanityHeartSize.internal_name:    4,
-    options.Booksanity.internal_name:               options.Booksanity.option_power_skill,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
-    options.NumberOfMovementBuffs.internal_name:    6,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.option_medium,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
-    options.MultipleDaySleepCost.internal_name:     "free",
-    options.ExperienceMultiplier.internal_name:     "double",
-    options.FriendshipMultiplier.internal_name:     "triple",
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_half,
-    options.QuickStart.internal_name:               options.QuickStart.option_true,
-    options.Gifting.internal_name:                  options.Gifting.option_true,
-    "death_link":                                   "false",
+    options.Goal.internal_name:                         options.Goal.option_community_center,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "rich",
+    options.ProfitMargin.internal_name:                 150,
+    options.BundleRandomization.internal_name:          options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:                  options.BundlePrice.option_normal,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_normal,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_non_progression,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_easy,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_early_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive_cheap,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive_cheap,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_victories_easy,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_board_short,
+    options.QuestLocations.internal_name:               "normal",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_exclude_legendaries,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_milestones,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_one_per_monster,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:                   frozenset([ChefsanityOptionName.queen_of_sauce]),
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_starting_npcs,
+    options.FriendsanityHeartSize.internal_name:        4,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_none,
+    options.Booksanity.internal_name:                   options.Booksanity.option_power_skill,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_none,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_none,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_none,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_none,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_false,
+    options.NumberOfMovementBuffs.internal_name:        6,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_true,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.option_medium,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:         "free",
+    options.ExperienceMultiplier.internal_name:         "double",
+    options.FriendshipMultiplier.internal_name:         "triple",
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.option_half,
+    options.QuickStart.internal_name:                   options.QuickStart.option_true,
+    options.Gifting.internal_name:                      options.Gifting.option_true,
+    "death_link":                                       "false",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 hard_settings = {
-    options.Goal.internal_name:                     options.Goal.option_grandpa_evaluation,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "extra",
-    options.ProfitMargin.internal_name:             "normal",
-    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
-    options.BundlePrice.internal_name:              options.BundlePrice.option_expensive,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings_without_house,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive_from_previous_floor,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi_short,
-    options.QuestLocations.internal_name:           "lots",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_all,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_progressive_goals,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_crops,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_queen_of_sauce,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_qos_and_purchases,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_all,
-    options.FriendsanityHeartSize.internal_name:    4,
-    options.Booksanity.internal_name:               options.Booksanity.option_all,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
-    options.NumberOfMovementBuffs.internal_name:    4,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.default,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.option_hard,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
-    options.MultipleDaySleepCost.internal_name:     "cheap",
-    options.ExperienceMultiplier.internal_name:     "vanilla",
-    options.FriendshipMultiplier.internal_name:     "double",
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_vanilla,
-    options.QuickStart.internal_name:               options.QuickStart.option_true,
-    options.Gifting.internal_name:                  options.Gifting.option_true,
-    "death_link":                                   "true",
+    options.Goal.internal_name:                         options.Goal.option_grandpa_evaluation,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "extra",
+    options.ProfitMargin.internal_name:                 "normal",
+    options.BundleRandomization.internal_name:          options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:                  options.BundlePrice.option_expensive,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_one_extra,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_buildings_without_house,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_easy,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive_from_previous_floor,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_board_qi_short,
+    options.QuestLocations.internal_name:               "lots",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_all,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_progressive_goals,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_crops,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_queen_of_sauce,
+    options.Chefsanity.internal_name:                   frozenset([ChefsanityOptionName.queen_of_sauce, ChefsanityOptionName.purchases]),
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_all,
+    options.FriendsanityHeartSize.internal_name:        4,
+    options.Eatsanity.internal_name:                    frozenset([EatsanityOptionName.crops, EatsanityOptionName.fish, EatsanityOptionName.artisan]),
+    options.Booksanity.internal_name:                   options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_all,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_all_movies,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_simple,
+    options.Hatsanity.internal_name:                    frozenset([HatsanityOptionName.easy]),
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_false,
+    options.NumberOfMovementBuffs.internal_name:        4,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.default,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_false,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.option_hard,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:         "cheap",
+    options.ExperienceMultiplier.internal_name:         "vanilla",
+    options.FriendshipMultiplier.internal_name:         "double",
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.option_vanilla,
+    options.QuickStart.internal_name:                   options.QuickStart.option_true,
+    options.Gifting.internal_name:                      options.Gifting.option_true,
+    "death_link":                                       "true",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 nightmare_settings = {
-    options.Goal.internal_name:                     options.Goal.option_community_center,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "vanilla",
-    options.ProfitMargin.internal_name:             "half",
-    options.BundleRandomization.internal_name:      options.BundleRandomization.option_shuffled,
-    options.BundlePrice.internal_name:              options.BundlePrice.option_very_expensive,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive_from_previous_floor,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi,
-    options.QuestLocations.internal_name:           "maximum",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_special,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_split_goals,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_full_shipment_with_fish,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_queen_of_sauce,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_qos_and_purchases,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_all_with_marriage,
-    options.FriendsanityHeartSize.internal_name:    4,
-    options.Booksanity.internal_name:               options.Booksanity.option_all,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
-    options.NumberOfMovementBuffs.internal_name:    2,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_none,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.option_hell,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
-    options.MultipleDaySleepCost.internal_name:     "expensive",
-    options.ExperienceMultiplier.internal_name:     "half",
-    options.FriendshipMultiplier.internal_name:     "vanilla",
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_vanilla,
-    options.QuickStart.internal_name:               options.QuickStart.option_false,
-    options.Gifting.internal_name:                  options.Gifting.option_true,
-    "death_link":                                   "true",
+    options.Goal.internal_name:                         options.Goal.option_community_center,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "vanilla",
+    options.ProfitMargin.internal_name:                 "half",
+    options.BundleRandomization.internal_name:          options.BundleRandomization.option_shuffled,
+    options.BundlePrice.internal_name:                  options.BundlePrice.option_very_expensive,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_two_extra,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_buildings,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_all,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive_from_previous_floor,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_board_qi,
+    options.QuestLocations.internal_name:               "maximum",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_special,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_split_goals,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_full_shipment_with_fish,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_queen_of_sauce,
+    options.Chefsanity.internal_name:                   frozenset([ChefsanityOptionName.queen_of_sauce, ChefsanityOptionName.purchases]),
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_all_with_marriage,
+    options.FriendsanityHeartSize.internal_name:        4,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_all,
+    options.Booksanity.internal_name:                   options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_all,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_all_movies_and_all_loved_snacks,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_all,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_difficult,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_true,
+    options.NumberOfMovementBuffs.internal_name:        2,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.preset_none,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_false,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.option_hell,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:         "expensive",
+    options.ExperienceMultiplier.internal_name:         "half",
+    options.FriendshipMultiplier.internal_name:         "vanilla",
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.option_vanilla,
+    options.QuickStart.internal_name:                   options.QuickStart.option_false,
+    options.Gifting.internal_name:                      options.Gifting.option_true,
+    "death_link":                                       "true",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 short_settings = {
-    options.Goal.internal_name:                     options.Goal.option_bottom_of_the_mines,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            "filthy rich",
-    options.ProfitMargin.internal_name:             "quadruple",
-    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
-    options.BundlePrice.internal_name:              options.BundlePrice.option_minimum,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_disabled,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized_not_winter,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_disabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_very_cheap,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_very_cheap,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_disabled,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
-    options.QuestLocations.internal_name:           "none",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_none,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_none,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_none,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
-    options.FriendsanityHeartSize.internal_name:    4,
-    options.Booksanity.internal_name:               options.Booksanity.option_none,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
-    options.NumberOfMovementBuffs.internal_name:    10,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.option_easy,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
-    options.MultipleDaySleepCost.internal_name:     "free",
-    options.ExperienceMultiplier.internal_name:     "quadruple",
-    options.FriendshipMultiplier.internal_name:     800,
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_none,
-    options.QuickStart.internal_name:               options.QuickStart.option_true,
-    options.Gifting.internal_name:                  options.Gifting.option_true,
-    "death_link":                                  "false",
+    options.Goal.internal_name:                         options.Goal.option_bottom_of_the_mines,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                "filthy rich",
+    options.ProfitMargin.internal_name:                 "quadruple",
+    options.BundleRandomization.internal_name:          options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:                  options.BundlePrice.option_minimum,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_two_fewer,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_disabled,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_none,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized_not_winter,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_disabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_early_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive_very_cheap,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive_very_cheap,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_disabled,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:               "none",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_none,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_none,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_none,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:                   options.Chefsanity.preset_none,
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:        4,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_none,
+    options.Booksanity.internal_name:                   options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_none,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_none,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_none,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_none,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_false,
+    options.NumberOfMovementBuffs.internal_name:        10,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_true,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.option_easy,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:         "free",
+    options.ExperienceMultiplier.internal_name:         "quadruple",
+    options.FriendshipMultiplier.internal_name:         800,
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.option_none,
+    options.QuickStart.internal_name:                   options.QuickStart.option_true,
+    options.Gifting.internal_name:                      options.Gifting.option_true,
+    "death_link":                                       "false",
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 minsanity_settings = {
-    options.Goal.internal_name:                     options.Goal.default,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            options.StartingMoney.default,
-    options.ProfitMargin.internal_name:             options.ProfitMargin.default,
-    options.BundleRandomization.internal_name:      options.BundleRandomization.default,
-    options.BundlePrice.internal_name:              options.BundlePrice.default,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.default,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_disabled,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_disabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_vanilla,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_vanilla,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_vanilla,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_vanilla,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_vanilla,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_disabled,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
-    options.QuestLocations.internal_name:           "none",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_none,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_none,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_none,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
-    options.FriendsanityHeartSize.internal_name:    options.FriendsanityHeartSize.default,
-    options.Booksanity.internal_name:               options.Booksanity.option_none,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
-    options.NumberOfMovementBuffs.internal_name:    options.NumberOfMovementBuffs.default,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.default,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.default,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.default,
-    options.MultipleDaySleepCost.internal_name:     options.MultipleDaySleepCost.default,
-    options.ExperienceMultiplier.internal_name:     options.ExperienceMultiplier.default,
-    options.FriendshipMultiplier.internal_name:     options.FriendshipMultiplier.default,
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.default,
-    options.QuickStart.internal_name:               options.QuickStart.default,
-    options.Gifting.internal_name:                  options.Gifting.default,
-    "death_link":                                   ap_options.DeathLink.default,
+    options.Goal.internal_name:                         options.Goal.default,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                options.StartingMoney.default,
+    options.ProfitMargin.internal_name:                 options.ProfitMargin.default,
+    options.BundleRandomization.internal_name:          options.BundleRandomization.default,
+    options.BundlePrice.internal_name:                  options.BundlePrice.default,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_two_fewer,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.default,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_none,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_disabled,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_disabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_vanilla,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_12,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_vanilla,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_vanilla,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_vanilla,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_vanilla,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_disabled,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:               "none",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_none,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_none,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_none,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:                   options.Chefsanity.preset_none,
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:        options.FriendsanityHeartSize.default,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_none,
+    options.Booksanity.internal_name:                   options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_none,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_none,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_none,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_none,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_false,
+    options.NumberOfMovementBuffs.internal_name:        options.NumberOfMovementBuffs.default,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.default,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_true,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.default,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.default,
+    options.MultipleDaySleepCost.internal_name:         options.MultipleDaySleepCost.default,
+    options.ExperienceMultiplier.internal_name:         options.ExperienceMultiplier.default,
+    options.FriendshipMultiplier.internal_name:         options.FriendshipMultiplier.default,
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.default,
+    options.QuickStart.internal_name:                   options.QuickStart.default,
+    options.Gifting.internal_name:                      options.Gifting.default,
+    "death_link":                                       ap_options.DeathLink.default,
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 
 allsanity_settings = {
-    options.Goal.internal_name:                     options.Goal.default,
-    options.FarmType.internal_name:                 "random",
-    options.StartingMoney.internal_name:            options.StartingMoney.default,
-    options.ProfitMargin.internal_name:             options.ProfitMargin.default,
-    options.BundleRandomization.internal_name:      options.BundleRandomization.default,
-    options.BundlePrice.internal_name:              options.BundlePrice.default,
-    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings,
-    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
-    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
-    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
-    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
-    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
-    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
-    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
-    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
-    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
-    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi,
-    options.QuestLocations.internal_name:           "maximum",
-    options.Fishsanity.internal_name:               options.Fishsanity.option_all,
-    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
-    options.Monstersanity.internal_name:            options.Monstersanity.option_progressive_goals,
-    options.Shipsanity.internal_name:               options.Shipsanity.option_everything,
-    options.Cooksanity.internal_name:               options.Cooksanity.option_all,
-    options.Chefsanity.internal_name:               options.Chefsanity.option_all,
-    options.Craftsanity.internal_name:              options.Craftsanity.option_all,
-    options.Friendsanity.internal_name:             options.Friendsanity.option_all,
-    options.FriendsanityHeartSize.internal_name:    1,
-    options.Booksanity.internal_name:               options.Booksanity.option_all,
-    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
-    options.NumberOfMovementBuffs.internal_name:    12,
-    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
-    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
-    options.TrapDifficulty.internal_name:           options.TrapDifficulty.default,
-    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.default,
-    options.MultipleDaySleepCost.internal_name:     options.MultipleDaySleepCost.default,
-    options.ExperienceMultiplier.internal_name:     options.ExperienceMultiplier.default,
-    options.FriendshipMultiplier.internal_name:     options.FriendshipMultiplier.default,
-    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.default,
-    options.QuickStart.internal_name:               options.QuickStart.default,
-    options.Gifting.internal_name:                  options.Gifting.default,
-    "death_link":                                   ap_options.DeathLink.default,
+    options.Goal.internal_name:                         options.Goal.default,
+    options.FarmType.internal_name:                     "random",
+    options.StartingMoney.internal_name:                options.StartingMoney.default,
+    options.ProfitMargin.internal_name:                 options.ProfitMargin.default,
+    options.BundleRandomization.internal_name:          options.BundleRandomization.default,
+    options.BundlePrice.internal_name:                  options.BundlePrice.default,
+    options.BundlePerRoom.internal_name:                options.BundlePerRoom.option_two_extra,
+    options.EntranceRandomization.internal_name:        options.EntranceRandomization.option_buildings,
+    options.StartWithout.internal_name:                 options.StartWithout.preset_all,
+    options.SeasonRandomization.internal_name:          options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:                   options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:          options.BackpackProgression.option_early_progressive,
+    options.BackpackSize.internal_name:                 options.BackpackSize.option_1,
+    options.ToolProgression.internal_name:              options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:          options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:             options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:          options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:            options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:       options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:        options.SpecialOrderLocations.option_board_qi,
+    options.QuestLocations.internal_name:               "maximum",
+    options.Fishsanity.internal_name:                   options.Fishsanity.option_all,
+    options.Museumsanity.internal_name:                 options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:                options.Monstersanity.option_progressive_goals,
+    options.Shipsanity.internal_name:                   options.Shipsanity.option_everything,
+    options.Cooksanity.internal_name:                   options.Cooksanity.option_all,
+    options.Chefsanity.internal_name:                   options.Chefsanity.preset_all,
+    options.Craftsanity.internal_name:                  options.Craftsanity.option_all,
+    options.Friendsanity.internal_name:                 options.Friendsanity.option_all,
+    options.FriendsanityHeartSize.internal_name:        1,
+    options.Eatsanity.internal_name:                    options.Eatsanity.preset_all,
+    options.Booksanity.internal_name:                   options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:                 options.Walnutsanity.preset_all,
+    options.Moviesanity.internal_name:                  options.Moviesanity.option_all_movies_and_all_loved_snacks,
+    options.Secretsanity.internal_name:                 options.Secretsanity.preset_all,
+    options.Hatsanity.internal_name:                    options.Hatsanity.preset_all,
+    options.IncludeEndgameLocations.internal_name:      options.IncludeEndgameLocations.option_true,
+    options.NumberOfMovementBuffs.internal_name:        12,
+    options.EnabledFillerBuffs.internal_name:           options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:          options.ExcludeGingerIsland.option_false,
+    options.TrapDifficulty.internal_name:               options.TrapDifficulty.default,
+    options.MultipleDaySleepEnabled.internal_name:      options.MultipleDaySleepEnabled.default,
+    options.MultipleDaySleepCost.internal_name:         options.MultipleDaySleepCost.default,
+    options.ExperienceMultiplier.internal_name:         options.ExperienceMultiplier.default,
+    options.FriendshipMultiplier.internal_name:         options.FriendshipMultiplier.default,
+    options.DebrisMultiplier.internal_name:             options.DebrisMultiplier.default,
+    options.QuickStart.internal_name:                   options.QuickStart.default,
+    options.Gifting.internal_name:                      options.Gifting.default,
+    "death_link":                                       ap_options.DeathLink.default,
+
+    options.Jojapocalypse.internal_name:                Jojapocalypse.option_disabled,
+    options.JojaStartPrice.internal_name:               JojaStartPrice.default,
+    options.JojaEndPrice.internal_name:                 JojaEndPrice.default,
+    options.JojaPricingPattern.internal_name:           JojaPricingPattern.default,
+    options.JojaPurchasesForMembership.internal_name:   JojaPurchasesForMembership.default,
+    options.JojaAreYouSure.internal_name:               JojaAreYouSure.option_false,
 }
 # @formatter:on
 
diff --git a/worlds/stardew_valley/options/settings.py b/worlds/stardew_valley/options/settings.py
new file mode 100644
index 0000000000..6c5d0a6213
--- /dev/null
+++ b/worlds/stardew_valley/options/settings.py
@@ -0,0 +1,43 @@
+from typing import Union
+
+from settings import Group, Bool
+
+
+class StardewSettings(Group):
+
+    class AllowAllsanityGoal(Bool):
+        """Allow players to pick the goal 'Allsanity'. If disallowed, generation will fail."""
+
+    class AllowPerfectionGoal(Bool):
+        """Allow players to pick the goal 'Perfection'. If disallowed, generation will fail."""
+
+    class AllowMaxPriceBundles(Bool):
+        """Allow players to pick the option 'Bundle Price: Maximum'. If disallowed, it will be replaced with 'Very Expensive'"""
+
+    class AllowChaosER(Bool):
+        """Allow players to pick the option 'Entrance Randomization: Chaos'. If disallowed, it will be replaced with 'Buildings'"""
+
+    class AllowShipsanityEverything(Bool):
+        """Allow players to pick the option 'Shipsanity: Everything'. If disallowed, it will be replaced with 'Full Shipment With Fish'"""
+
+    class AllowHatsanityNearOrPostPerfection(Bool):
+        """Allow players to pick the option 'Hatsanity: Near Perfection OR Post Perfection'. If disallowed, it will be replaced with 'Difficult'"""
+
+    class AllowCustomLogic(Bool):
+        """Allow players to toggle on Custom logic flags. If disallowed, it will be disabled"""
+
+    class AllowJojapocalypse(Bool):
+        """Allow players to enable Jojapocalypse. If disallowed, it will be disabled"""
+
+    # class AllowSVE(Bool):
+    #     """Allow players to include the mod 'Stardew Valley Expanded'. If disallowed, it will be removed from the mods"""
+
+    allow_allsanity: Union[AllowAllsanityGoal, bool] = True
+    allow_perfection: Union[AllowPerfectionGoal, bool] = True
+    allow_max_bundles: Union[AllowMaxPriceBundles, bool] = True
+    allow_chaos_er: Union[AllowChaosER, bool] = False
+    allow_shipsanity_everything: Union[AllowShipsanityEverything, bool] = True
+    allow_hatsanity_perfection: Union[AllowHatsanityNearOrPostPerfection, bool] = True
+    allow_custom_logic: Union[AllowCustomLogic, bool] = True
+    allow_jojapocalypse: Union[AllowJojapocalypse, bool] = False
+    # allow_sve: Union[AllowSVE, bool] = True
diff --git a/worlds/stardew_valley/regions/model.py b/worlds/stardew_valley/regions/model.py
index 07c3901558..be0d4096d6 100644
--- a/worlds/stardew_valley/regions/model.py
+++ b/worlds/stardew_valley/regions/model.py
@@ -89,6 +89,6 @@ class ConnectionData:
 
 @dataclass(frozen=True)
 class ModRegionsData:
-    mod_name: str
+    content_pack: str
     regions: list[RegionData]
     connections: list[ConnectionData]
diff --git a/worlds/stardew_valley/regions/vanilla_data.py b/worlds/stardew_valley/regions/vanilla_data.py
index dbb83e1063..5a66cbe8cb 100644
--- a/worlds/stardew_valley/regions/vanilla_data.py
+++ b/worlds/stardew_valley/regions/vanilla_data.py
@@ -15,33 +15,37 @@ vanilla_regions: tuple[RegionData, ...] = (
                (Entrance.farm_to_backwoods, Entrance.farm_to_bus_stop, Entrance.farm_to_forest, Entrance.farm_to_farmcave, Entrance.enter_greenhouse,
                 Entrance.enter_coop, Entrance.enter_barn, Entrance.enter_shed, Entrance.enter_slime_hutch, LogicEntrance.grow_spring_crops,
                 LogicEntrance.grow_summer_crops, LogicEntrance.grow_fall_crops, LogicEntrance.grow_winter_crops, LogicEntrance.shipping,
-                LogicEntrance.fishing,)),
+                LogicEntrance.fishing, LogicEntrance.find_secret_notes,)),
     RegionData(RegionName.backwoods, (Entrance.backwoods_to_mountain,)),
     RegionData(RegionName.bus_stop,
                (Entrance.bus_stop_to_town, Entrance.take_bus_to_desert, Entrance.bus_stop_to_tunnel_entrance)),
     RegionData(RegionName.forest,
-               (Entrance.forest_to_town, Entrance.enter_secret_woods, Entrance.forest_to_wizard_tower, Entrance.forest_to_marnie_ranch,
-                Entrance.forest_to_leah_cottage, Entrance.forest_to_sewer, Entrance.forest_to_mastery_cave, LogicEntrance.buy_from_traveling_merchant,
-                LogicEntrance.complete_raccoon_requests, LogicEntrance.fish_in_waterfall, LogicEntrance.attend_flower_dance, LogicEntrance.attend_trout_derby,
-                LogicEntrance.attend_festival_of_ice)),
+               (Entrance.forest_to_town, Entrance.enter_secret_woods, Entrance.forest_to_wizard_tower,
+                Entrance.forest_to_marnie_ranch, Entrance.forest_to_leah_cottage, Entrance.forest_to_sewer,
+                Entrance.forest_to_mastery_cave, Entrance.forest_beach_shortcut, Entrance.feed_trash_bear,
+                LogicEntrance.buy_from_traveling_merchant, LogicEntrance.has_giant_stump, LogicEntrance.fish_in_waterfall,
+                LogicEntrance.attend_flower_dance, LogicEntrance.attend_trout_derby, LogicEntrance.attend_festival_of_ice, LogicEntrance.buy_from_hat_mouse)),
     RegionData(LogicRegion.forest_waterfall),
+    RegionData(RegionName.trash_bear),
     RegionData(RegionName.farm_cave),
     RegionData(RegionName.greenhouse,
                (LogicEntrance.grow_spring_crops_in_greenhouse, LogicEntrance.grow_summer_crops_in_greenhouse, LogicEntrance.grow_fall_crops_in_greenhouse,
                 LogicEntrance.grow_winter_crops_in_greenhouse, LogicEntrance.grow_indoor_crops_in_greenhouse)),
     RegionData(RegionName.mountain,
                (Entrance.mountain_to_railroad, Entrance.mountain_to_tent, Entrance.mountain_to_carpenter_shop,
-                Entrance.mountain_to_the_mines, Entrance.enter_quarry, Entrance.mountain_to_adventurer_guild,
-                Entrance.mountain_to_town, Entrance.mountain_to_maru_room)),
+                Entrance.mountain_to_town, Entrance.mountain_to_maru_room, Entrance.mountain_to_outside_adventure_guild,
+                Entrance.mountain_lake_to_outside_adventure_guild_shortcut, Entrance.mountain_town_shortcut, Entrance.mountain_jojamart_shortcut)),
+    RegionData(RegionName.outside_adventure_guild, (Entrance.mountain_to_the_mines, Entrance.enter_quarry, Entrance.mountain_to_adventurer_guild,)),
     RegionData(RegionName.maru_room),
-    RegionData(RegionName.tunnel_entrance, (Entrance.tunnel_entrance_to_bus_tunnel,)),
+    RegionData(RegionName.tunnel_entrance, (Entrance.tunnel_entrance_to_bus_tunnel, Entrance.tunnel_backwoods_shortcut,)),
     RegionData(RegionName.bus_tunnel),
     RegionData(RegionName.town,
                (Entrance.town_to_community_center, Entrance.town_to_beach, Entrance.town_to_hospital, Entrance.town_to_pierre_general_store,
                 Entrance.town_to_saloon, Entrance.town_to_alex_house, Entrance.town_to_trailer, Entrance.town_to_mayor_manor, Entrance.town_to_sam_house,
                 Entrance.town_to_haley_house, Entrance.town_to_sewer, Entrance.town_to_clint_blacksmith, Entrance.town_to_museum, Entrance.town_to_jojamart,
-                Entrance.purchase_movie_ticket, LogicEntrance.buy_experience_books, LogicEntrance.attend_egg_festival, LogicEntrance.attend_fair,
-                LogicEntrance.attend_spirit_eve, LogicEntrance.attend_winter_star)),
+                Entrance.town_tidepools_shortcut,
+                Entrance.purchase_movie_ticket, LogicEntrance.buy_books, LogicEntrance.attend_egg_festival, LogicEntrance.attend_fair,
+                LogicEntrance.attend_spirit_eve, LogicEntrance.attend_winter_star, LogicEntrance.search_garbage_cans)),
     RegionData(RegionName.beach,
                (Entrance.beach_to_willy_fish_shop, Entrance.enter_elliott_house, Entrance.enter_tide_pools, LogicEntrance.attend_luau,
                 LogicEntrance.attend_moonlight_jellies, LogicEntrance.attend_night_market, LogicEntrance.attend_squidfest)),
@@ -51,8 +55,9 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(RegionName.mastery_cave),
     RegionData(RegionName.sewer, (Entrance.enter_mutant_bug_lair,)),
     RegionData(RegionName.mutant_bug_lair),
-    RegionData(RegionName.wizard_tower, (Entrance.enter_wizard_basement, Entrance.use_desert_obelisk)),
+    RegionData(RegionName.wizard_tower, (Entrance.enter_wizard_basement, Entrance.use_desert_obelisk, LogicEntrance.purchase_wizard_blueprints)),
     RegionData(RegionName.wizard_basement),
+    RegionData(LogicRegion.wizard_blueprints),
     RegionData(RegionName.tent),
     RegionData(RegionName.carpenter, (Entrance.enter_sebastian_room,)),
     RegionData(RegionName.sebastian_room),
@@ -81,7 +86,9 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(RegionName.junimo_kart_4),
     RegionData(RegionName.alex_house),
     RegionData(RegionName.trailer),
-    RegionData(RegionName.mayor_house),
+    RegionData(RegionName.mayor_house, (Entrance.enter_lewis_bedroom,)),
+    RegionData(RegionName.lewis_bedroom, (Entrance.enter_shorts_maze,)),
+    RegionData(RegionName.purple_shorts_maze),
     RegionData(RegionName.sam_house),
     RegionData(RegionName.haley_house),
     RegionData(RegionName.blacksmith, (LogicEntrance.blacksmith_copper,)),
@@ -93,8 +100,9 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(RegionName.fish_shop),
     RegionData(RegionName.elliott_house),
     RegionData(RegionName.tide_pools),
-    RegionData(RegionName.bathhouse_entrance, (Entrance.enter_locker_room,)),
-    RegionData(RegionName.locker_room, (Entrance.enter_public_bath,)),
+    RegionData(RegionName.bathhouse_entrance, (Entrance.enter_mens_locker_room, Entrance.enter_womens_locker_room)),
+    RegionData(RegionName.mens_locker_room, (Entrance.mens_lockers_to_public_bath,)),
+    RegionData(RegionName.womens_locker_room, (Entrance.womens_lockers_to_public_bath,)),
     RegionData(RegionName.public_bath),
     RegionData(RegionName.witch_warp_cave, (Entrance.enter_witch_swamp,)),
     RegionData(RegionName.witch_swamp, (Entrance.enter_witch_hut,)),
@@ -102,12 +110,13 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(RegionName.quarry, (Entrance.enter_quarry_mine_entrance,)),
     RegionData(RegionName.quarry_mine_entrance, (Entrance.enter_quarry_mine,)),
     RegionData(RegionName.quarry_mine),
-    RegionData(RegionName.secret_woods),
+    RegionData(RegionName.secret_woods, (LogicEntrance.buy_from_lost_items_shop,)),
     RegionData(RegionName.desert, (Entrance.enter_skull_cavern_entrance, Entrance.enter_oasis, LogicEntrance.attend_desert_festival)),
     RegionData(RegionName.oasis, (Entrance.enter_casino,)),
     RegionData(RegionName.casino),
     RegionData(RegionName.skull_cavern_entrance, (Entrance.enter_skull_cavern,)),
-    RegionData(RegionName.skull_cavern, (Entrance.mine_to_skull_cavern_floor_25,)),
+    RegionData(RegionName.skull_cavern, (Entrance.mine_in_skull_cavern, Entrance.mine_to_skull_cavern_floor_25)),
+    RegionData(RegionName.skull_cavern_mining),
     RegionData(RegionName.skull_cavern_25, (Entrance.mine_to_skull_cavern_floor_50,)),
     RegionData(RegionName.skull_cavern_50, (Entrance.mine_to_skull_cavern_floor_75,)),
     RegionData(RegionName.skull_cavern_75, (Entrance.mine_to_skull_cavern_floor_100,)),
@@ -165,6 +174,7 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(LogicRegion.indoor_farming),
 
     RegionData(LogicRegion.shipping),
+    RegionData(LogicRegion.secret_notes),
     RegionData(LogicRegion.traveling_cart, (LogicEntrance.buy_from_traveling_merchant_sunday,
                                             LogicEntrance.buy_from_traveling_merchant_monday,
                                             LogicEntrance.buy_from_traveling_merchant_tuesday,
@@ -179,8 +189,21 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(LogicRegion.traveling_cart_thursday),
     RegionData(LogicRegion.traveling_cart_friday),
     RegionData(LogicRegion.traveling_cart_saturday),
-    RegionData(LogicRegion.raccoon_daddy, (LogicEntrance.buy_from_raccoon,)),
-    RegionData(LogicRegion.raccoon_shop),
+    RegionData(LogicRegion.raccoon_daddy, (LogicEntrance.buy_from_raccoon_1, LogicEntrance.can_complete_raccoon_requests_1)),
+    RegionData(LogicRegion.raccoon_request_1, (LogicEntrance.can_complete_raccoon_requests_2,)),
+    RegionData(LogicRegion.raccoon_request_2, (LogicEntrance.can_complete_raccoon_requests_3,)),
+    RegionData(LogicRegion.raccoon_request_3, (LogicEntrance.can_complete_raccoon_requests_4,)),
+    RegionData(LogicRegion.raccoon_request_4, (LogicEntrance.can_complete_raccoon_requests_5,)),
+    RegionData(LogicRegion.raccoon_request_5, (LogicEntrance.can_complete_raccoon_requests_6,)),
+    RegionData(LogicRegion.raccoon_request_6, (LogicEntrance.can_complete_raccoon_requests_7,)),
+    RegionData(LogicRegion.raccoon_request_7, (LogicEntrance.can_complete_raccoon_requests_8,)),
+    RegionData(LogicRegion.raccoon_request_8),
+    RegionData(LogicRegion.raccoon_shop_1, (LogicEntrance.buy_from_raccoon_2,)),
+    RegionData(LogicRegion.raccoon_shop_2, (LogicEntrance.buy_from_raccoon_3,)),
+    RegionData(LogicRegion.raccoon_shop_3, (LogicEntrance.buy_from_raccoon_4,)),
+    RegionData(LogicRegion.raccoon_shop_4, (LogicEntrance.buy_from_raccoon_5,)),
+    RegionData(LogicRegion.raccoon_shop_5, (LogicEntrance.buy_from_raccoon_6,)),
+    RegionData(LogicRegion.raccoon_shop_6),
 
     RegionData(LogicRegion.egg_festival),
     RegionData(LogicRegion.desert_festival),
@@ -194,17 +217,24 @@ vanilla_regions: tuple[RegionData, ...] = (
     RegionData(LogicRegion.night_market),
     RegionData(LogicRegion.winter_star),
     RegionData(LogicRegion.squidfest),
-    RegionData(LogicRegion.bookseller_1, (LogicEntrance.buy_year1_books,)),
-    RegionData(LogicRegion.bookseller_2, (LogicEntrance.buy_year3_books,)),
-    RegionData(LogicRegion.bookseller_3),
+    RegionData(LogicRegion.bookseller, (LogicEntrance.buy_permanent_books, LogicEntrance.buy_rare_books, LogicEntrance.buy_experience_books,)),
+    RegionData(LogicRegion.bookseller_permanent),
+    RegionData(LogicRegion.bookseller_rare),
+    RegionData(LogicRegion.bookseller_experience),
+    RegionData(LogicRegion.hat_mouse),
+    RegionData(LogicRegion.lost_items_shop),
+    RegionData(LogicRegion.garbage_cans),
 )
 ginger_island_regions = (
     # This overrides the regions from vanilla... When regions are moved to content packs, overriding existing entrances should no longer be necessary.
     RegionData(RegionName.mountain,
                (Entrance.mountain_to_railroad, Entrance.mountain_to_tent, Entrance.mountain_to_carpenter_shop,
-                Entrance.mountain_to_the_mines, Entrance.enter_quarry, Entrance.mountain_to_adventurer_guild,
+                Entrance.mountain_to_outside_adventure_guild,
+                Entrance.mountain_lake_to_outside_adventure_guild_shortcut, Entrance.mountain_town_shortcut, Entrance.mountain_jojamart_shortcut,
                 Entrance.mountain_to_town, Entrance.mountain_to_maru_room, Entrance.mountain_to_leo_treehouse)),
-    RegionData(RegionName.wizard_tower, (Entrance.enter_wizard_basement, Entrance.use_desert_obelisk, Entrance.use_island_obelisk,)),
+    RegionData(RegionName.outside_adventure_guild, (Entrance.mountain_to_the_mines, Entrance.enter_quarry, Entrance.mountain_to_adventurer_guild,)),
+    RegionData(RegionName.wizard_tower,
+               (Entrance.enter_wizard_basement, Entrance.use_desert_obelisk, Entrance.use_island_obelisk, LogicEntrance.purchase_wizard_blueprints,)),
     RegionData(RegionName.fish_shop, (Entrance.fish_shop_to_boat_tunnel,)),
     RegionData(RegionName.mines_floor_120, (Entrance.dig_to_dangerous_mines_20, Entrance.dig_to_dangerous_mines_60, Entrance.dig_to_dangerous_mines_100)),
     RegionData(RegionName.skull_cavern_200, (Entrance.enter_dangerous_skull_cavern,)),
@@ -276,7 +306,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(Entrance.take_bus_to_desert, RegionName.desert),
     ConnectionData(Entrance.forest_to_town, RegionName.town),
     ConnectionData(Entrance.forest_to_wizard_tower, RegionName.wizard_tower,
-                   flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
+                   flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.enter_wizard_basement, RegionName.wizard_basement, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.forest_to_marnie_ranch, RegionName.ranch,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
@@ -286,6 +316,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(Entrance.forest_to_sewer, RegionName.sewer, flag=RandomizationFlag.BUILDINGS),
     # We remove the bit for masteries, because the mastery cave is to be excluded from the randomization if masteries are not shuffled.
     ConnectionData(Entrance.forest_to_mastery_cave, RegionName.mastery_cave, flag=RandomizationFlag.BUILDINGS ^ RandomizationFlag.EXCLUDE_MASTERIES),
+    ConnectionData(Entrance.feed_trash_bear, RegionName.trash_bear),
     ConnectionData(Entrance.town_to_sewer, RegionName.sewer, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.enter_mutant_bug_lair, RegionName.mutant_bug_lair, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.mountain_to_railroad, RegionName.railroad),
@@ -296,6 +327,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(Entrance.mountain_to_maru_room, RegionName.maru_room,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.enter_sebastian_room, RegionName.sebastian_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.mountain_to_outside_adventure_guild, RegionName.outside_adventure_guild),
     ConnectionData(Entrance.mountain_to_adventurer_guild, RegionName.adventurer_guild,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.adventurer_guild_to_bedroom, RegionName.adventurer_guild_bedroom),
@@ -305,7 +337,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(Entrance.enter_quarry_mine, RegionName.quarry_mine),
     ConnectionData(Entrance.mountain_to_town, RegionName.town),
     ConnectionData(Entrance.town_to_community_center, RegionName.community_center,
-                   flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
+                   flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.access_crafts_room, RegionName.crafts_room),
     ConnectionData(Entrance.access_pantry, RegionName.pantry),
     ConnectionData(Entrance.access_fish_tank, RegionName.fish_tank),
@@ -335,6 +367,8 @@ vanilla_connections: tuple[ConnectionData, ...] = (
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.town_to_mayor_manor, RegionName.mayor_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
+    ConnectionData(Entrance.enter_lewis_bedroom, RegionName.lewis_bedroom),
+    ConnectionData(Entrance.enter_shorts_maze, RegionName.purple_shorts_maze, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.town_to_alex_house, RegionName.alex_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.town_to_trailer, RegionName.trailer,
@@ -353,7 +387,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.enter_tide_pools, RegionName.tide_pools),
     ConnectionData(Entrance.mountain_to_the_mines, RegionName.mines,
-                   flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
+                   flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.dig_to_mines_floor_5, RegionName.mines_floor_5),
     ConnectionData(Entrance.dig_to_mines_floor_10, RegionName.mines_floor_10),
     ConnectionData(Entrance.dig_to_mines_floor_15, RegionName.mines_floor_15),
@@ -384,6 +418,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
     ConnectionData(Entrance.enter_casino, RegionName.casino, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.enter_skull_cavern, RegionName.skull_cavern),
+    ConnectionData(Entrance.mine_in_skull_cavern, RegionName.skull_cavern_mining),
     ConnectionData(Entrance.mine_to_skull_cavern_floor_25, RegionName.skull_cavern_25),
     ConnectionData(Entrance.mine_to_skull_cavern_floor_50, RegionName.skull_cavern_50),
     ConnectionData(Entrance.mine_to_skull_cavern_floor_75, RegionName.skull_cavern_75),
@@ -398,8 +433,18 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(Entrance.witch_warp_to_wizard_basement, RegionName.wizard_basement, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(Entrance.enter_bathhouse_entrance, RegionName.bathhouse_entrance,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_locker_room, RegionName.locker_room, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_public_bath, RegionName.public_bath, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_mens_locker_room, RegionName.mens_locker_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_womens_locker_room, RegionName.womens_locker_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.mens_lockers_to_public_bath, RegionName.public_bath, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.womens_lockers_to_public_bath, RegionName.public_bath, flag=RandomizationFlag.BUILDINGS),
+
+    ConnectionData(Entrance.town_tidepools_shortcut, RegionName.tide_pools),
+    ConnectionData(Entrance.forest_beach_shortcut, RegionName.beach),
+    ConnectionData(Entrance.mountain_jojamart_shortcut, RegionName.town),
+    ConnectionData(Entrance.tunnel_backwoods_shortcut, RegionName.backwoods),
+    ConnectionData(Entrance.mountain_town_shortcut, RegionName.town),
+    ConnectionData(Entrance.mountain_lake_to_outside_adventure_guild_shortcut, RegionName.outside_adventure_guild),
+
     ConnectionData(LogicEntrance.talk_to_mines_dwarf, LogicRegion.mines_dwarf_shop),
 
     ConnectionData(LogicEntrance.buy_from_traveling_merchant, LogicRegion.traveling_cart),
@@ -410,9 +455,22 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(LogicEntrance.buy_from_traveling_merchant_thursday, LogicRegion.traveling_cart_thursday),
     ConnectionData(LogicEntrance.buy_from_traveling_merchant_friday, LogicRegion.traveling_cart_friday),
     ConnectionData(LogicEntrance.buy_from_traveling_merchant_saturday, LogicRegion.traveling_cart_saturday),
-    ConnectionData(LogicEntrance.complete_raccoon_requests, LogicRegion.raccoon_daddy),
+    ConnectionData(LogicEntrance.has_giant_stump, LogicRegion.raccoon_daddy),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_1, LogicRegion.raccoon_request_1),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_2, LogicRegion.raccoon_request_2),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_3, LogicRegion.raccoon_request_3),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_4, LogicRegion.raccoon_request_4),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_5, LogicRegion.raccoon_request_5),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_6, LogicRegion.raccoon_request_6),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_7, LogicRegion.raccoon_request_7),
+    ConnectionData(LogicEntrance.can_complete_raccoon_requests_8, LogicRegion.raccoon_request_8),
     ConnectionData(LogicEntrance.fish_in_waterfall, LogicRegion.forest_waterfall),
-    ConnectionData(LogicEntrance.buy_from_raccoon, LogicRegion.raccoon_shop),
+    ConnectionData(LogicEntrance.buy_from_raccoon_1, LogicRegion.raccoon_shop_1),
+    ConnectionData(LogicEntrance.buy_from_raccoon_2, LogicRegion.raccoon_shop_2),
+    ConnectionData(LogicEntrance.buy_from_raccoon_3, LogicRegion.raccoon_shop_3),
+    ConnectionData(LogicEntrance.buy_from_raccoon_4, LogicRegion.raccoon_shop_4),
+    ConnectionData(LogicEntrance.buy_from_raccoon_5, LogicRegion.raccoon_shop_5),
+    ConnectionData(LogicEntrance.buy_from_raccoon_6, LogicRegion.raccoon_shop_6),
     ConnectionData(LogicEntrance.farmhouse_cooking, LogicRegion.kitchen),
     ConnectionData(LogicEntrance.watch_queen_of_sauce, LogicRegion.queen_of_sauce),
 
@@ -429,6 +487,7 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(LogicEntrance.grow_summer_fall_crops_in_fall, LogicRegion.summer_or_fall_farming),
 
     ConnectionData(LogicEntrance.shipping, LogicRegion.shipping),
+    ConnectionData(LogicEntrance.find_secret_notes, LogicRegion.secret_notes),
     ConnectionData(LogicEntrance.blacksmith_copper, LogicRegion.blacksmith_copper),
     ConnectionData(LogicEntrance.blacksmith_iron, LogicRegion.blacksmith_iron),
     ConnectionData(LogicEntrance.blacksmith_gold, LogicRegion.blacksmith_gold),
@@ -443,12 +502,17 @@ vanilla_connections: tuple[ConnectionData, ...] = (
     ConnectionData(LogicEntrance.attend_fair, LogicRegion.fair),
     ConnectionData(LogicEntrance.attend_spirit_eve, LogicRegion.spirit_eve),
     ConnectionData(LogicEntrance.attend_festival_of_ice, LogicRegion.festival_of_ice),
+    ConnectionData(LogicEntrance.buy_from_hat_mouse, LogicRegion.hat_mouse),
+    ConnectionData(LogicEntrance.buy_from_lost_items_shop, LogicRegion.lost_items_shop),
     ConnectionData(LogicEntrance.attend_night_market, LogicRegion.night_market),
     ConnectionData(LogicEntrance.attend_winter_star, LogicRegion.winter_star),
     ConnectionData(LogicEntrance.attend_squidfest, LogicRegion.squidfest),
-    ConnectionData(LogicEntrance.buy_experience_books, LogicRegion.bookseller_1),
-    ConnectionData(LogicEntrance.buy_year1_books, LogicRegion.bookseller_2),
-    ConnectionData(LogicEntrance.buy_year3_books, LogicRegion.bookseller_3),
+    ConnectionData(LogicEntrance.buy_books, LogicRegion.bookseller),
+    ConnectionData(LogicEntrance.buy_permanent_books, LogicRegion.bookseller_permanent),
+    ConnectionData(LogicEntrance.buy_rare_books, LogicRegion.bookseller_rare),
+    ConnectionData(LogicEntrance.buy_experience_books, LogicRegion.bookseller_experience),
+    ConnectionData(LogicEntrance.search_garbage_cans, LogicRegion.garbage_cans),
+    ConnectionData(LogicEntrance.purchase_wizard_blueprints, LogicRegion.wizard_blueprints),
 )
 
 ginger_island_connections = (
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index 7351871a39..3c78d665df 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -1,53 +1,70 @@
 import itertools
 import logging
+from dataclasses import dataclass
 from typing import List, Dict, Set
 
 from BaseClasses import MultiWorld, CollectionState
-from worlds.generic.Rules import set_rule
+from worlds.generic.Rules import set_rule as _set_rule
 from . import locations
 from .bundles.bundle_room import BundleRoom
 from .content import StardewContent
 from .content.feature import friendsanity
+from .content.vanilla.ginger_island import ginger_island_content_pack
+from .content.vanilla.qi_board import qi_board_content_pack
 from .data.craftable_data import all_crafting_recipes_by_name
 from .data.game_item import ItemTag
 from .data.harvest import HarvestCropSource, HarvestFruitTreeSource
-from .data.museum_data import all_museum_items, dwarf_scrolls, skeleton_front, skeleton_middle, skeleton_back, all_museum_items_by_name, all_museum_minerals, \
+from .data.museum_data import all_museum_items, dwarf_scrolls, skeleton_front, skeleton_middle, skeleton_back, \
+    all_museum_items_by_name, all_museum_minerals, \
     all_museum_artifacts, Artifact
 from .data.recipe_data import all_cooking_recipes_by_name
+from .data.secret_note_data import gift_requirements, SecretNote
 from .locations import LocationTags
 from .logic.logic import StardewLogic
 from .logic.time_logic import MAX_MONTHS
 from .logic.tool_logic import tool_upgrade_prices
 from .mods.mod_data import ModNames
-from .options import ExcludeGingerIsland, SpecialOrderLocations, Museumsanity, BackpackProgression, Shipsanity, \
+from .options import SpecialOrderLocations, Museumsanity, BackpackProgression, Shipsanity, \
     Monstersanity, Chefsanity, Craftsanity, ArcadeMachineLocations, Cooksanity, StardewValleyOptions, Walnutsanity
+from .options.options import FarmType, Moviesanity, Eatsanity, Friendsanity, ExcludeGingerIsland, \
+    IncludeEndgameLocations
 from .stardew_rule import And, StardewRule, true_
 from .stardew_rule.indirect_connection import look_for_indirect_connection
 from .stardew_rule.rule_explain import explain
-from .strings.ap_names.ap_option_names import WalnutsanityOptionName
-from .strings.ap_names.community_upgrade_names import CommunityUpgrade
+from .strings.animal_product_names import AnimalProduct
+from .strings.ap_names.ap_option_names import WalnutsanityOptionName, SecretsanityOptionName, StartWithoutOptionName, CustomLogicOptionName
+from .strings.ap_names.community_upgrade_names import CommunityUpgrade, Bookseller
 from .strings.ap_names.mods.mod_items import SVEQuestItem, SVERunes
 from .strings.ap_names.transport_names import Transportation
 from .strings.artisan_good_names import ArtisanGood
-from .strings.building_names import Building
+from .strings.backpack_tiers import Backpack
+from .strings.building_names import Building, WizardBuilding
 from .strings.bundle_names import CCRoom
 from .strings.calendar_names import Weekday
-from .strings.craftable_names import Bomb, Furniture
+from .strings.craftable_names import Bomb, Furniture, Consumable, Craftable
 from .strings.crop_names import Fruit, Vegetable
-from .strings.entrance_names import dig_to_mines_floor, dig_to_skull_floor, Entrance, move_to_woods_depth, DeepWoodsEntrance, AlecEntrance, \
+from .strings.currency_names import Currency
+from .strings.entrance_names import dig_to_mines_floor, dig_to_skull_floor, Entrance, move_to_woods_depth, \
+    DeepWoodsEntrance, AlecEntrance, \
     SVEEntrance, LaceyEntrance, BoardingHouseEntrance, LogicEntrance
+from .strings.fish_names import Fish
+from .strings.food_names import Meal
 from .strings.forageable_names import Forageable
 from .strings.generic_names import Generic
 from .strings.geode_names import Geode
+from .strings.gift_names import Gift
+from .strings.machine_names import Machine
 from .strings.material_names import Material
-from .strings.metal_names import MetalBar, Mineral
+from .strings.metal_names import Artifact as ArtifactName, MetalBar, Mineral
 from .strings.monster_names import Monster
 from .strings.performance_names import Performance
 from .strings.quest_names import Quest
-from .strings.region_names import Region
+from .strings.region_names import Region, LogicRegion
 from .strings.season_names import Season
 from .strings.skill_names import Skill
-from .strings.tool_names import Tool, ToolMaterial
+from .strings.special_item_names import SpecialItem
+from .strings.special_order_names import SpecialOrder
+from .strings.tool_names import Tool, ToolMaterial, FishingRod
 from .strings.tv_channel_names import Channel
 from .strings.villager_names import NPC, ModNPC
 from .strings.wallet_item_names import Wallet
@@ -55,82 +72,125 @@ from .strings.wallet_item_names import Wallet
 logger = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True)
+class StardewRuleCollector:
+    multiworld: MultiWorld
+    player: int
+    content: StardewContent
+
+    def set_entrance_rule(self, entrance_name: str, rule: StardewRule) -> None:
+        try:
+            potentially_required_regions = look_for_indirect_connection(rule)
+            if potentially_required_regions:
+                for region in potentially_required_regions:
+                    logger.debug(f"Registering indirect condition for {region} -> {entrance_name}")
+                    self.multiworld.register_indirect_condition(self.multiworld.get_region(region, self.player),
+                                                                self.multiworld.get_entrance(entrance_name, self.player))
+
+            _set_rule(self.multiworld.get_entrance(entrance_name, self.player), rule)
+        except KeyError as ex:
+            logger.error(f"""Failed to evaluate indirect connection in: {explain(rule, CollectionState(self.multiworld))}""")
+            raise ex
+
+    def set_island_entrance_rule(self, entrance_name: str, rule: StardewRule) -> None:
+        if not self.content.is_enabled(ginger_island_content_pack):
+            return
+        self.set_entrance_rule(entrance_name, rule)
+
+    def set_many_island_entrances_rules(self, entrance_rules: dict[str, StardewRule]) -> None:
+        if not self.content.is_enabled(ginger_island_content_pack):
+            return
+        for entrance, rule in entrance_rules.items():
+            self.set_entrance_rule(entrance, rule)
+
+    def set_location_rule(self, location_name: str, rule: StardewRule) -> None:
+        _set_rule(self.multiworld.get_location(location_name, self.player), rule)
+
+
 def set_rules(world):
-    multiworld = world.multiworld
     world_options = world.options
     world_content = world.content
-    player = world.player
+    rule_collector = StardewRuleCollector(world.multiworld, world.player, world_content)
     logic = world.logic
     bundle_rooms: List[BundleRoom] = world.modified_bundles
+    trash_bear_requests: Dict[str, List[str]] = world.trash_bear_requests
 
-    all_location_names = set(location.name for location in multiworld.get_locations(player))
+    all_location_names = set(location.name for location in world.multiworld.get_locations(world.player))
 
-    set_entrance_rules(logic, multiworld, player, world_options)
-    set_ginger_island_rules(logic, multiworld, player, world_options)
+    set_entrance_rules(logic, rule_collector, bundle_rooms, world_options, world_content)
+    set_ginger_island_rules(logic, rule_collector, world_options, world_content)
 
-    set_tool_rules(logic, multiworld, player, world_content)
-    set_skills_rules(logic, multiworld, player, world_content)
-    set_bundle_rules(bundle_rooms, logic, multiworld, player, world_options)
-    set_building_rules(logic, multiworld, player, world_content)
-    set_cropsanity_rules(logic, multiworld, player, world_content)
-    set_story_quests_rules(all_location_names, logic, multiworld, player, world_options)
-    set_special_order_rules(all_location_names, logic, multiworld, player, world_options)
-    set_help_wanted_quests_rules(logic, multiworld, player, world_options)
-    set_fishsanity_rules(all_location_names, logic, multiworld, player)
-    set_museumsanity_rules(all_location_names, logic, multiworld, player, world_options)
+    set_tool_rules(logic, rule_collector, world_content)
+    set_skills_rules(logic, rule_collector, world_content)
+    set_bundle_rules(bundle_rooms, logic, rule_collector, world_options)
+    set_building_rules(logic, rule_collector, world_content)
+    set_cropsanity_rules(logic, rule_collector, world_content)
+    set_story_quests_rules(all_location_names, logic, rule_collector, world_options)
+    set_special_order_rules(all_location_names, logic, rule_collector, world_options, world_content)
+    set_help_wanted_quests_rules(logic, rule_collector, world_options)
+    set_fishsanity_rules(all_location_names, logic, rule_collector)
+    set_museumsanity_rules(all_location_names, logic, rule_collector, world_options)
 
-    set_friendsanity_rules(logic, multiworld, player, world_content)
-    set_backpack_rules(logic, multiworld, player, world_options)
-    set_festival_rules(all_location_names, logic, multiworld, player)
-    set_monstersanity_rules(all_location_names, logic, multiworld, player, world_options)
-    set_shipsanity_rules(all_location_names, logic, multiworld, player, world_options)
-    set_cooksanity_rules(all_location_names, logic, multiworld, player, world_options)
-    set_chefsanity_rules(all_location_names, logic, multiworld, player, world_options)
-    set_craftsanity_rules(all_location_names, logic, multiworld, player, world_options)
-    set_booksanity_rules(logic, multiworld, player, world_content)
-    set_isolated_locations_rules(logic, multiworld, player)
-    set_traveling_merchant_day_rules(logic, multiworld, player)
-    set_arcade_machine_rules(logic, multiworld, player, world_options)
+    set_friendsanity_rules(logic, rule_collector, world_content)
+    set_backpack_rules(logic, rule_collector, world_options, world_content)
+    set_festival_rules(all_location_names, logic, rule_collector)
+    set_monstersanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_shipsanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_cooksanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_chefsanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_craftsanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_booksanity_rules(logic, rule_collector, world_content)
+    set_isolated_locations_rules(logic, rule_collector, trash_bear_requests)
+    set_arcade_machine_rules(logic, rule_collector, world_options)
+    set_movie_rules(logic, rule_collector, world_options, world_content)
+    set_secrets_rules(logic, rule_collector, world_options, world_content)
+    set_hatsanity_rules(logic, rule_collector, world_content)
+    set_eatsanity_rules(all_location_names, logic, rule_collector, world_options)
+    set_endgame_locations_rules(logic, rule_collector, world_options)
 
-    set_deepwoods_rules(logic, multiworld, player, world_options)
-    set_magic_spell_rules(logic, multiworld, player, world_options)
-    set_sve_rules(logic, multiworld, player, world_options)
+    set_deepwoods_rules(logic, rule_collector, world_content)
+    set_magic_spell_rules(logic, rule_collector, world_content)
+    set_sve_rules(logic, rule_collector, world_content)
 
 
-def set_isolated_locations_rules(logic: StardewLogic, multiworld, player):
-    set_rule(multiworld.get_location("Old Master Cannoli", player),
-             logic.has(Fruit.sweet_gem_berry))
-    set_rule(multiworld.get_location("Galaxy Sword Shrine", player),
-             logic.has("Prismatic Shard"))
-    set_rule(multiworld.get_location("Krobus Stardrop", player),
-             logic.money.can_spend(20000))
-    set_rule(multiworld.get_location("Demetrius's Breakthrough", player),
-             logic.money.can_have_earned_total(25000))
-    set_rule(multiworld.get_location("Pot Of Gold", player),
-             logic.season.has(Season.spring))
+def set_isolated_locations_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, trash_bear_requests: Dict[str, List[str]]):
+    rule_collector.set_location_rule("Beach Bridge Repair", logic.grind.can_grind_item(300, "Wood"))
+    rule_collector.set_location_rule("Grim Reaper Statue", logic.combat.can_fight_at_level(Performance.decent) & logic.tool.has_tool(Tool.pickaxe))
+    rule_collector.set_location_rule("Galaxy Sword Shrine", logic.has("Prismatic Shard"))
+    rule_collector.set_location_rule("Krobus Stardrop", logic.money.can_spend(20000))
+    rule_collector.set_location_rule("Demetrius's Breakthrough", logic.money.can_have_earned_total(25000))
+    for request_type in trash_bear_requests:
+        location = f"Trash Bear {request_type}"
+        items = trash_bear_requests[request_type]
+        rule_collector.set_location_rule(location, logic.bundle.can_feed_trash_bear(*items))
 
 
-def set_tool_rules(logic: StardewLogic, multiworld, player, content: StardewContent):
-    if not content.features.tool_progression.is_progressive:
+def set_tool_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    tool_progression = content.features.tool_progression
+    if not tool_progression.is_progressive:
         return
 
-    set_rule(multiworld.get_location("Purchase Fiberglass Rod", player),
-             (logic.skill.has_level(Skill.fishing, 2) & logic.money.can_spend(1800)))
-    set_rule(multiworld.get_location("Purchase Iridium Rod", player),
-             (logic.skill.has_level(Skill.fishing, 6) & logic.money.can_spend(7500)))
+    rule_collector.set_location_rule("Purchase Fiberglass Rod", (logic.skill.has_level(Skill.fishing, 2) & logic.money.can_spend(1800)))
+    rule_collector.set_location_rule("Purchase Iridium Rod", (logic.skill.has_level(Skill.fishing, 6) & logic.money.can_spend(7500)))
 
-    set_rule(multiworld.get_location("Copper Pan Cutscene", player), logic.received("Glittering Boulder Removed"))
+    rule_collector.set_location_rule("Copper Pan Cutscene", logic.received("Glittering Boulder Removed"))
 
-    materials = [None, "Copper", "Iron", "Gold", "Iridium"]
-    tool = [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.trash_can, Tool.pan]
-    for (previous, material), tool in itertools.product(zip(materials[:4], materials[1:]), tool):
-        if previous is None:
-            continue
-        tool_upgrade_location = multiworld.get_location(f"{material} {tool} Upgrade", player)
-        set_rule(tool_upgrade_location, logic.tool.has_tool(tool, previous))
+    # Pan has no basic tier, so it is removed from materials.
+    pan_materials = ToolMaterial.materials[1:]
+    for previous, material in itertools.product(pan_materials[:-1], pan_materials[1:]):
+        location_name = tool_progression.to_upgrade_location_name(Tool.pan, material)
+        # You need to receive the previous tool to be able to upgrade it.
+        rule_collector.set_location_rule(location_name, logic.tool.has_pan(previous))
+
+    materials = ToolMaterial.materials
+    tool = [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.trash_can]
+    for (previous, material), tool in itertools.product(zip(materials[:-1], materials[1:]), tool):
+        location_name = tool_progression.to_upgrade_location_name(tool, material)
+        # You need to receive the previous tool to be able to upgrade it.
+        rule_collector.set_location_rule(location_name, logic.tool.has_tool(tool, previous))
 
 
-def set_building_rules(logic: StardewLogic, multiworld, player, content: StardewContent):
+def set_building_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
     building_progression = content.features.building_progression
     if not building_progression.is_progressive:
         return
@@ -141,33 +201,27 @@ def set_building_rules(logic: StardewLogic, multiworld, player, content: Stardew
 
         location_name = building_progression.to_location_name(building.name)
 
-        set_rule(multiworld.get_location(location_name, player),
-                 logic.building.can_build(building.name))
+        rule_collector.set_location_rule(location_name, logic.building.can_build(building.name))
 
 
-def set_bundle_rules(bundle_rooms: List[BundleRoom], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_bundle_rules(bundle_rooms: List[BundleRoom], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     for bundle_room in bundle_rooms:
+        if bundle_room.name == CCRoom.raccoon_requests:
+            # The rule for the raccoon bundles are placed on their entrance, not on the location itself.
+            continue
+
         room_rules = []
         for bundle in bundle_room.bundles:
-            location = multiworld.get_location(bundle.name, player)
             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.has_story_quests() else 0
-                extra_raccoons = extra_raccoons + num
-                bundle_rules = logic.received(CommunityUpgrade.raccoon, extra_raccoons) & bundle_rules
-                if num > 1:
-                    previous_bundle_name = f"Raccoon Request {num - 1}"
-                    bundle_rules = bundle_rules & logic.region.can_reach_location(previous_bundle_name)
             room_rules.append(bundle_rules)
-            set_rule(location, bundle_rules)
+            rule_collector.set_location_rule(bundle.name, bundle_rules)
         if bundle_room.name == CCRoom.abandoned_joja_mart or bundle_room.name == CCRoom.raccoon_requests:
             continue
         room_location = f"Complete {bundle_room.name}"
-        set_rule(multiworld.get_location(room_location, player), And(*room_rules))
+        rule_collector.set_location_rule(room_location, And(*room_rules))
 
 
-def set_skills_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, content: StardewContent):
+def set_skills_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
     skill_progression = content.features.skill_progression
     if not skill_progression.is_progressive:
         return
@@ -175,188 +229,252 @@ def set_skills_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, c
     for skill in content.skills.values():
         for level, level_name in skill_progression.get_randomized_level_names_by_level(skill):
             rule = logic.skill.can_earn_level(skill.name, level)
-            location = multiworld.get_location(level_name, player)
-            set_rule(location, rule)
+            rule_collector.set_location_rule(level_name, rule)
 
         if skill_progression.is_mastery_randomized(skill):
             rule = logic.skill.can_earn_mastery(skill.name)
-            location = multiworld.get_location(skill.mastery_name, player)
-            set_rule(location, rule)
+            rule_collector.set_location_rule(skill.mastery_name, rule)
 
 
-def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    set_mines_floor_entrance_rules(logic, multiworld, player)
-    set_skull_cavern_floor_entrance_rules(logic, multiworld, player)
-    set_blacksmith_entrance_rules(logic, multiworld, player)
-    set_skill_entrance_rules(logic, multiworld, player, world_options)
-    set_traveling_merchant_day_rules(logic, multiworld, player)
-    set_dangerous_mine_rules(logic, multiworld, player, world_options)
+def set_entrance_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, bundle_rooms: List[BundleRoom], world_options: StardewValleyOptions,
+                       content: StardewContent):
+    set_mines_floor_entrance_rules(logic, rule_collector, world_options)
+    set_skull_cavern_floor_entrance_rules(logic, rule_collector, world_options)
+    set_blacksmith_entrance_rules(logic, rule_collector)
+    set_skill_entrance_rules(logic, rule_collector, content)
+    set_traveling_merchant_day_entrance_rules(logic, rule_collector)
+    set_dangerous_mine_rules(logic, rule_collector, content)
 
-    set_entrance_rule(multiworld, player, Entrance.enter_tide_pools, logic.received("Beach Bridge") | (logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.enter_quarry, logic.received("Bridge Repair") | (logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.enter_secret_woods, logic.tool.has_tool(Tool.axe, "Iron") | (logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.forest_to_wizard_tower, logic.region.can_reach(Region.community_center))
-    set_entrance_rule(multiworld, player, Entrance.forest_to_sewer, logic.wallet.has_rusty_key())
-    set_entrance_rule(multiworld, player, Entrance.town_to_sewer, logic.wallet.has_rusty_key())
-    set_entrance_rule(multiworld, player, Entrance.enter_abandoned_jojamart, logic.has_abandoned_jojamart())
+    rule_collector.set_entrance_rule(Entrance.enter_tide_pools, logic.received("Beach Bridge") | logic.mod.magic.can_blink())
+    rule_collector.set_entrance_rule(Entrance.mountain_to_outside_adventure_guild, logic.received("Landslide Removed"))
+    rule_collector.set_entrance_rule(Entrance.enter_quarry,
+                                     (logic.received("Bridge Repair") | logic.mod.magic.can_blink()) & logic.tool.has_tool(Tool.pickaxe))
+    rule_collector.set_entrance_rule(Entrance.enter_secret_woods, logic.tool.has_tool(Tool.axe, ToolMaterial.iron) | logic.mod.magic.can_blink() | logic.ability.can_chair_skip())
+    rule_collector.set_entrance_rule(Entrance.town_to_community_center, logic.received("Community Center Key"))
+    rule_collector.set_entrance_rule(Entrance.forest_to_wizard_tower, logic.received("Wizard Invitation"))
+    rule_collector.set_entrance_rule(Entrance.forest_to_sewer, logic.wallet.has_rusty_key())
+    rule_collector.set_entrance_rule(Entrance.town_to_sewer, logic.wallet.has_rusty_key())
+    # The money requirement is just in case Joja got replaced by a theater, you need to buy a ticket.
+    # We do not put directly a ticket requirement, because we don't want to place an indirect theater requirement only
+    # for the safeguard "in case you get a theater"
+    rule_collector.set_entrance_rule(Entrance.town_to_jojamart, logic.money.can_spend(1000))
+    rule_collector.set_entrance_rule(Entrance.enter_abandoned_jojamart, logic.has_abandoned_jojamart())
     movie_theater_rule = logic.has_movie_theater()
-    set_entrance_rule(multiworld, player, Entrance.enter_movie_theater, movie_theater_rule)
-    set_entrance_rule(multiworld, player, Entrance.purchase_movie_ticket, movie_theater_rule)
-    set_entrance_rule(multiworld, player, Entrance.take_bus_to_desert, logic.received("Bus Repair") & logic.money.can_spend(500))
-    set_entrance_rule(multiworld, player, Entrance.enter_skull_cavern, logic.received(Wallet.skull_key))
-    set_entrance_rule(multiworld, player, LogicEntrance.talk_to_mines_dwarf,
-                      logic.wallet.can_speak_dwarf() & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron))
-    set_entrance_rule(multiworld, player, LogicEntrance.buy_from_traveling_merchant, logic.traveling_merchant.has_days() & logic.money.can_spend(1200))
-    set_entrance_rule(multiworld, player, LogicEntrance.buy_from_raccoon, logic.quest.has_raccoon_shop())
-    set_entrance_rule(multiworld, player, LogicEntrance.fish_in_waterfall,
-                      logic.skill.has_level(Skill.fishing, 5) & logic.tool.has_fishing_rod(2))
+    rule_collector.set_entrance_rule(Entrance.purchase_movie_ticket, movie_theater_rule)
+    rule_collector.set_entrance_rule(Entrance.enter_movie_theater, movie_theater_rule & logic.has(Gift.movie_ticket))
+    rule_collector.set_entrance_rule(Entrance.take_bus_to_desert, logic.received(Transportation.bus_repair) & logic.money.can_spend(500))
+    rule_collector.set_entrance_rule(Entrance.enter_skull_cavern, logic.received(Wallet.skull_key))
+    rule_collector.set_entrance_rule(LogicEntrance.talk_to_mines_dwarf,
+                                     logic.wallet.can_speak_dwarf() & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_traveling_merchant, logic.traveling_merchant.has_days() & logic.money.can_spend(1200))
+    set_raccoon_rules(logic, rule_collector, bundle_rooms, world_options)
 
-    set_farm_buildings_entrance_rules(logic, multiworld, player)
+    rule_collector.set_entrance_rule(LogicEntrance.fish_in_waterfall,
+                                     logic.skill.has_level(Skill.fishing, 5) & logic.tool.has_fishing_rod(FishingRod.bamboo))
 
-    set_entrance_rule(multiworld, player, Entrance.mountain_to_railroad, logic.received("Railroad Boulder Removed"))
-    set_entrance_rule(multiworld, player, Entrance.enter_witch_warp_cave, logic.quest.has_dark_talisman() | (logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.enter_witch_hut, (logic.quest.can_complete_quest(Quest.goblin_problem) | logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.enter_mutant_bug_lair,
-                      (logic.wallet.has_rusty_key() & logic.region.can_reach(Region.railroad) & logic.relationship.can_meet(
-                          NPC.krobus)) | logic.mod.magic.can_blink())
-    set_entrance_rule(multiworld, player, Entrance.enter_casino, logic.quest.has_club_card())
+    set_farm_buildings_entrance_rules(logic, rule_collector)
 
-    set_bedroom_entrance_rules(logic, multiworld, player, world_options)
-    set_festival_entrance_rules(logic, multiworld, player)
-    set_island_entrance_rule(multiworld, player, LogicEntrance.island_cooking, logic.cooking.can_cook_in_kitchen, world_options)
-    set_entrance_rule(multiworld, player, LogicEntrance.farmhouse_cooking, logic.cooking.can_cook_in_kitchen)
-    set_entrance_rule(multiworld, player, LogicEntrance.shipping, logic.shipping.can_use_shipping_bin)
-    set_entrance_rule(multiworld, player, LogicEntrance.watch_queen_of_sauce, logic.action.can_watch(Channel.queen_of_sauce))
-    set_entrance_rule(multiworld, player, Entrance.forest_to_mastery_cave, logic.skill.can_enter_mastery_cave)
-    set_entrance_rule(multiworld, player, LogicEntrance.buy_experience_books, logic.time.has_lived_months(2))
-    set_entrance_rule(multiworld, player, LogicEntrance.buy_year1_books, logic.time.has_year_two)
-    set_entrance_rule(multiworld, player, LogicEntrance.buy_year3_books, logic.time.has_year_three)
-    set_entrance_rule(multiworld, player, Entrance.adventurer_guild_to_bedroom, logic.monster.can_kill_max(Generic.any))
+    rule_collector.set_entrance_rule(Entrance.mountain_to_railroad, logic.received("Railroad Boulder Removed"))
+    rule_collector.set_entrance_rule(Entrance.enter_witch_warp_cave, logic.quest.has_dark_talisman() | (logic.mod.magic.can_blink()))
+    rule_collector.set_entrance_rule(Entrance.enter_witch_hut, (logic.quest.can_complete_quest(Quest.goblin_problem) | logic.mod.magic.can_blink()))
+    rule_collector.set_entrance_rule(Entrance.enter_mutant_bug_lair,
+                                     (logic.wallet.has_rusty_key() & logic.region.can_reach(Region.railroad) & logic.relationship.can_meet(NPC.krobus))
+                                     | logic.mod.magic.can_blink())
+    rule_collector.set_entrance_rule(Entrance.enter_casino, logic.quest.has_club_card())
+
+    set_bedroom_entrance_rules(logic, rule_collector, content)
+    set_festival_entrance_rules(logic, rule_collector)
+    
+    # I can't remember why this was here, but clearly we do not need kitchen rules for island cooking....
+    # rule_collector.set_island_entrance_rule(LogicEntrance.island_cooking, logic.cooking.can_cook_in_kitchen)
+    rule_collector.set_entrance_rule(LogicEntrance.farmhouse_cooking, logic.cooking.can_cook_in_kitchen)
+    rule_collector.set_entrance_rule(LogicEntrance.shipping, logic.shipping.can_use_shipping_bin)
+    rule_collector.set_entrance_rule(LogicEntrance.find_secret_notes,
+                                     logic.quest.has_magnifying_glass() & (logic.ability.can_chop_trees() | logic.mine.can_mine_in_the_mines_floor_1_40()))
+    rule_collector.set_entrance_rule(LogicEntrance.watch_queen_of_sauce, logic.action.can_watch(Channel.queen_of_sauce))
+    rule_collector.set_entrance_rule(Entrance.forest_to_mastery_cave, logic.skill.can_enter_mastery_cave)
+    set_bookseller_rules(logic, rule_collector)
+    rule_collector.set_entrance_rule(Entrance.adventurer_guild_to_bedroom, logic.monster.can_kill_max(Generic.any))
+    if world_options.include_endgame_locations == IncludeEndgameLocations.option_true:
+        rule_collector.set_entrance_rule(LogicEntrance.purchase_wizard_blueprints, logic.quest.has_magic_ink())
+    rule_collector.set_entrance_rule(LogicEntrance.search_garbage_cans, logic.time.has_lived_months(MAX_MONTHS / 2))
+
+    rule_collector.set_entrance_rule(Entrance.forest_beach_shortcut, logic.received("Forest To Beach Shortcut"))
+    rule_collector.set_entrance_rule(Entrance.mountain_jojamart_shortcut, logic.received("Mountain Shortcuts"))
+    rule_collector.set_entrance_rule(Entrance.mountain_town_shortcut, logic.received("Mountain Shortcuts"))
+    rule_collector.set_entrance_rule(Entrance.town_tidepools_shortcut, logic.received("Town To Tide Pools Shortcut"))
+    rule_collector.set_entrance_rule(Entrance.tunnel_backwoods_shortcut, logic.received("Tunnel To Backwoods Shortcut"))
+    rule_collector.set_entrance_rule(Entrance.mountain_lake_to_outside_adventure_guild_shortcut, logic.received("Mountain Shortcuts"))
+
+    rule_collector.set_entrance_rule(Entrance.feed_trash_bear, logic.received("Trash Bear Arrival"))
+    rule_collector.set_entrance_rule(Entrance.enter_shorts_maze, logic.has(Craftable.staircase))
+
+    rule_collector.set_entrance_rule(Entrance.enter_mens_locker_room, logic.wallet.has_mens_locker_key())
+    rule_collector.set_entrance_rule(Entrance.enter_womens_locker_room, logic.wallet.has_womens_locker_key())
 
 
-def set_dangerous_mine_rules(logic, multiworld, player, world_options: StardewValleyOptions):
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def set_bookseller_rules(logic, rule_collector):
+    rule_collector.set_entrance_rule(LogicEntrance.buy_books, logic.received(Bookseller.days))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_experience_books, logic.received(Bookseller.stock_experience_books))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_permanent_books, logic.received(Bookseller.stock_permanent_books))
+    rare_books_rule = (logic.received(Bookseller.days, 4) & logic.received(Bookseller.stock_rare_books)) | \
+                      (logic.received(Bookseller.days, 2) & logic.received(Bookseller.stock_rare_books, 2))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_rare_books, rare_books_rule)
+
+
+def set_raccoon_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, bundle_rooms: List[BundleRoom], world_options: StardewValleyOptions):
+    rule_collector.set_entrance_rule(LogicEntrance.has_giant_stump, logic.received(CommunityUpgrade.raccoon))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_1, logic.quest.has_raccoon_shop())
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_2, logic.quest.has_raccoon_shop(2))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_3, logic.quest.has_raccoon_shop(3))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_4, logic.quest.has_raccoon_shop(4))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_5, logic.quest.has_raccoon_shop(5))
+    rule_collector.set_entrance_rule(LogicEntrance.buy_from_raccoon_6, logic.quest.has_raccoon_shop(6))
+
+    raccoon_room = next(iter(room for room in bundle_rooms if room.name == CCRoom.raccoon_requests))
+    extra_raccoons = 1 if world_options.quest_locations.has_story_quests() else 0
+
+    for bundle in raccoon_room.bundles:
+        num = int(bundle.name[-1])
+        bundle_rules = logic.received(CommunityUpgrade.raccoon, num + extra_raccoons) & logic.bundle.can_complete_bundle(bundle)
+        rule_collector.set_entrance_rule("Can Complete " + bundle.name, bundle_rules)
+
+
+def set_dangerous_mine_rules(logic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ginger_island_content_pack):
         return
     dangerous_mine_rule = logic.mine.has_mine_elevator_to_floor(120) & logic.region.can_reach(Region.qi_walnut_room)
-    set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_20, dangerous_mine_rule)
-    set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_60, dangerous_mine_rule)
-    set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_100, dangerous_mine_rule)
-    set_entrance_rule(multiworld, player, Entrance.enter_dangerous_skull_cavern,
-                      (logic.received(Wallet.skull_key) & logic.region.can_reach(Region.qi_walnut_room)))
+    rule_collector.set_entrance_rule(Entrance.dig_to_dangerous_mines_20, dangerous_mine_rule)
+    rule_collector.set_entrance_rule(Entrance.dig_to_dangerous_mines_60, dangerous_mine_rule)
+    rule_collector.set_entrance_rule(Entrance.dig_to_dangerous_mines_100, dangerous_mine_rule)
+    rule_collector.set_entrance_rule(Entrance.enter_dangerous_skull_cavern,
+                                     (logic.received(Wallet.skull_key) & logic.region.can_reach(Region.qi_walnut_room)))
 
 
-def set_farm_buildings_entrance_rules(logic, multiworld, player):
-    set_entrance_rule(multiworld, player, Entrance.downstairs_to_cellar, logic.building.has_building(Building.cellar))
-    set_entrance_rule(multiworld, player, Entrance.use_desert_obelisk, logic.can_use_obelisk(Transportation.desert_obelisk))
-    set_entrance_rule(multiworld, player, Entrance.enter_greenhouse, logic.received("Greenhouse"))
-    set_entrance_rule(multiworld, player, Entrance.enter_coop, logic.building.has_building(Building.coop))
-    set_entrance_rule(multiworld, player, Entrance.enter_barn, logic.building.has_building(Building.barn))
-    set_entrance_rule(multiworld, player, Entrance.enter_shed, logic.building.has_building(Building.shed))
-    set_entrance_rule(multiworld, player, Entrance.enter_slime_hutch, logic.building.has_building(Building.slime_hutch))
+def set_farm_buildings_entrance_rules(logic, rule_collector: StardewRuleCollector):
+    rule_collector.set_entrance_rule(Entrance.downstairs_to_cellar, logic.building.has_building(Building.cellar))
+    rule_collector.set_entrance_rule(Entrance.use_desert_obelisk, logic.can_use_obelisk(Transportation.desert_obelisk))
+    rule_collector.set_entrance_rule(Entrance.enter_greenhouse, logic.received("Greenhouse"))
+    rule_collector.set_entrance_rule(Entrance.enter_coop, logic.building.has_building(Building.coop))
+    rule_collector.set_entrance_rule(Entrance.enter_barn, logic.building.has_building(Building.barn))
+    rule_collector.set_entrance_rule(Entrance.enter_shed, logic.building.has_building(Building.shed))
+    rule_collector.set_entrance_rule(Entrance.enter_slime_hutch, logic.building.has_building(Building.slime_hutch))
 
 
-def set_bedroom_entrance_rules(logic, multiworld, player, world_options: StardewValleyOptions):
-    set_entrance_rule(multiworld, player, Entrance.enter_harvey_room, logic.relationship.has_hearts(NPC.harvey, 2))
-    set_entrance_rule(multiworld, player, Entrance.mountain_to_maru_room, logic.relationship.has_hearts(NPC.maru, 2))
-    set_entrance_rule(multiworld, player, Entrance.enter_sebastian_room, (logic.relationship.has_hearts(NPC.sebastian, 2) | logic.mod.magic.can_blink()))
-    set_entrance_rule(multiworld, player, Entrance.forest_to_leah_cottage, logic.relationship.has_hearts(NPC.leah, 2))
-    set_entrance_rule(multiworld, player, Entrance.enter_elliott_house, logic.relationship.has_hearts(NPC.elliott, 2))
-    set_entrance_rule(multiworld, player, Entrance.enter_sunroom, logic.relationship.has_hearts(NPC.caroline, 2))
-    set_entrance_rule(multiworld, player, Entrance.enter_wizard_basement, logic.relationship.has_hearts(NPC.wizard, 4))
-    if ModNames.alec in world_options.mods:
-        set_entrance_rule(multiworld, player, AlecEntrance.petshop_to_bedroom, (logic.relationship.has_hearts(ModNPC.alec, 2) | logic.mod.magic.can_blink()))
-    if ModNames.lacey in world_options.mods:
-        set_entrance_rule(multiworld, player, LaceyEntrance.forest_to_hat_house, logic.relationship.has_hearts(ModNPC.lacey, 2))
+def set_bedroom_entrance_rules(logic, rule_collector: StardewRuleCollector, content: StardewContent):
+    rule_collector.set_entrance_rule(Entrance.enter_harvey_room, logic.relationship.has_hearts(NPC.harvey, 2))
+    rule_collector.set_entrance_rule(Entrance.mountain_to_maru_room, logic.relationship.has_hearts(NPC.maru, 2))
+    rule_collector.set_entrance_rule(Entrance.enter_sebastian_room, (logic.relationship.has_hearts(NPC.sebastian, 2) | logic.mod.magic.can_blink()))
+    rule_collector.set_entrance_rule(Entrance.forest_to_leah_cottage, logic.relationship.has_hearts(NPC.leah, 2))
+    rule_collector.set_entrance_rule(Entrance.enter_elliott_house, logic.relationship.has_hearts(NPC.elliott, 2))
+    rule_collector.set_entrance_rule(Entrance.enter_sunroom, logic.relationship.has_hearts(NPC.caroline, 2))
+    rule_collector.set_entrance_rule(Entrance.enter_wizard_basement, logic.relationship.has_hearts(NPC.wizard, 4))
+    rule_collector.set_entrance_rule(Entrance.enter_lewis_bedroom, logic.relationship.has_hearts(NPC.lewis, 2))
+    if content.is_enabled(ModNames.alec):
+        rule_collector.set_entrance_rule(AlecEntrance.petshop_to_bedroom, (logic.relationship.has_hearts(ModNPC.alec, 2) | logic.mod.magic.can_blink()))
+    if content.is_enabled(ModNames.lacey):
+        rule_collector.set_entrance_rule(LaceyEntrance.forest_to_hat_house, logic.relationship.has_hearts(ModNPC.lacey, 2))
 
 
-def set_mines_floor_entrance_rules(logic, multiworld, player):
+def set_mines_floor_entrance_rules(logic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     for floor in range(5, 120 + 5, 5):
-        rule = logic.mine.has_mine_elevator_to_floor(floor - 10)
+        elevator_difference = 10
+        if CustomLogicOptionName.very_deep_mining in world_options.custom_logic:
+            elevator_difference = 40
+        elif CustomLogicOptionName.deep_mining in world_options.custom_logic:
+            elevator_difference = 20
+        rule = logic.mine.has_mine_elevator_to_floor(floor - elevator_difference)
         if floor == 5 or floor == 45 or floor == 85:
             rule = rule & logic.mine.can_progress_in_the_mines_from_floor(floor)
-        set_entrance_rule(multiworld, player, dig_to_mines_floor(floor), rule)
+        rule_collector.set_entrance_rule(dig_to_mines_floor(floor), rule)
 
 
-def set_skull_cavern_floor_entrance_rules(logic, multiworld, player):
+def set_skull_cavern_floor_entrance_rules(logic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
+    rule_collector.set_entrance_rule(Entrance.mine_in_skull_cavern, logic.mine.can_progress_in_the_mines_from_floor(120))
+
     for floor in range(25, 200 + 25, 25):
-        rule = logic.mod.elevator.has_skull_cavern_elevator_to_floor(floor - 25)
+        elevator_difference = 25
+        if CustomLogicOptionName.very_deep_mining in world_options.custom_logic:
+            elevator_difference = 50
+        elif CustomLogicOptionName.deep_mining in world_options.custom_logic:
+            elevator_difference = 100
+        rule = logic.mod.elevator.has_skull_cavern_elevator_to_floor(max(0, floor - elevator_difference))
         if floor == 25 or floor == 75 or floor == 125:
             rule = rule & logic.mine.can_progress_in_the_skull_cavern_from_floor(floor)
-        set_entrance_rule(multiworld, player, dig_to_skull_floor(floor), rule)
+        rule_collector.set_entrance_rule(dig_to_skull_floor(floor), rule)
 
 
-def set_skill_entrance_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_spring_crops, logic.farming.has_farming_tools & logic.season.has_spring)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_summer_crops, logic.farming.has_farming_tools & logic.season.has_summer)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_fall_crops, logic.farming.has_farming_tools & logic.season.has_fall)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_spring_crops_in_greenhouse, logic.farming.has_farming_tools)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_summer_crops_in_greenhouse, logic.farming.has_farming_tools)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_fall_crops_in_greenhouse, logic.farming.has_farming_tools)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_indoor_crops_in_greenhouse, logic.farming.has_farming_tools)
-    set_island_entrance_rule(multiworld, player, LogicEntrance.grow_spring_crops_on_island, logic.farming.has_farming_tools, world_options)
-    set_island_entrance_rule(multiworld, player, LogicEntrance.grow_summer_crops_on_island, logic.farming.has_farming_tools, world_options)
-    set_island_entrance_rule(multiworld, player, LogicEntrance.grow_fall_crops_on_island, logic.farming.has_farming_tools, world_options)
-    set_island_entrance_rule(multiworld, player, LogicEntrance.grow_indoor_crops_on_island, logic.farming.has_farming_tools, world_options)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_summer_fall_crops_in_summer, true_)
-    set_entrance_rule(multiworld, player, LogicEntrance.grow_summer_fall_crops_in_fall, true_)
+def set_skill_entrance_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    rule_collector.set_entrance_rule(LogicEntrance.grow_spring_crops, logic.farming.has_farming_tools_and_water & logic.season.has_spring)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_summer_crops, logic.farming.has_farming_tools_and_water & logic.season.has_summer)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_fall_crops, logic.farming.has_farming_tools_and_water & logic.season.has_fall)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_winter_crops, logic.farming.has_farming_tools_and_water & logic.season.has_winter)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_spring_crops_in_greenhouse, logic.farming.has_farming_and_watering_tools)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_summer_crops_in_greenhouse, logic.farming.has_farming_and_watering_tools)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_fall_crops_in_greenhouse, logic.farming.has_farming_and_watering_tools)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_winter_crops_in_greenhouse, logic.farming.has_farming_and_watering_tools)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_indoor_crops_in_greenhouse, logic.farming.has_farming_and_watering_tools)
+    rule_collector.set_island_entrance_rule(LogicEntrance.grow_spring_crops_on_island, logic.farming.has_farming_tools_and_water)
+    rule_collector.set_island_entrance_rule(LogicEntrance.grow_summer_crops_on_island, logic.farming.has_farming_tools_and_water)
+    rule_collector.set_island_entrance_rule(LogicEntrance.grow_fall_crops_on_island, logic.farming.has_farming_tools_and_water)
+    rule_collector.set_island_entrance_rule(LogicEntrance.grow_winter_crops_on_island, logic.farming.has_farming_tools_and_water)
+    rule_collector.set_island_entrance_rule(LogicEntrance.grow_indoor_crops_on_island, logic.farming.has_farming_tools_and_water)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_summer_fall_crops_in_summer, true_)
+    rule_collector.set_entrance_rule(LogicEntrance.grow_summer_fall_crops_in_fall, true_)
 
-    set_entrance_rule(multiworld, player, LogicEntrance.fishing, logic.fishing.can_fish_anywhere())
+    rule_collector.set_entrance_rule(LogicEntrance.fishing, logic.fishing.can_fish_anywhere())
 
 
-def set_blacksmith_entrance_rules(logic, multiworld, player):
-    set_blacksmith_upgrade_rule(logic, multiworld, player, LogicEntrance.blacksmith_copper, MetalBar.copper, ToolMaterial.copper)
-    set_blacksmith_upgrade_rule(logic, multiworld, player, LogicEntrance.blacksmith_iron, MetalBar.iron, ToolMaterial.iron)
-    set_blacksmith_upgrade_rule(logic, multiworld, player, LogicEntrance.blacksmith_gold, MetalBar.gold, ToolMaterial.gold)
-    set_blacksmith_upgrade_rule(logic, multiworld, player, LogicEntrance.blacksmith_iridium, MetalBar.iridium, ToolMaterial.iridium)
+def set_blacksmith_entrance_rules(logic, rule_collector: StardewRuleCollector):
+    set_blacksmith_upgrade_rule(logic, rule_collector, LogicEntrance.blacksmith_copper, MetalBar.copper, ToolMaterial.copper)
+    set_blacksmith_upgrade_rule(logic, rule_collector, LogicEntrance.blacksmith_iron, MetalBar.iron, ToolMaterial.iron)
+    set_blacksmith_upgrade_rule(logic, rule_collector, LogicEntrance.blacksmith_gold, MetalBar.gold, ToolMaterial.gold)
+    set_blacksmith_upgrade_rule(logic, rule_collector, LogicEntrance.blacksmith_iridium, MetalBar.iridium, ToolMaterial.iridium)
 
 
-def set_blacksmith_upgrade_rule(logic, multiworld, player, entrance_name: str, item_name: str, tool_material: str):
+def set_blacksmith_upgrade_rule(logic, rule_collector: StardewRuleCollector, entrance_name: str, item_name: str, tool_material: str):
     upgrade_rule = logic.has(item_name) & logic.money.can_spend(tool_upgrade_prices[tool_material])
-    set_entrance_rule(multiworld, player, entrance_name, upgrade_rule)
+    rule_collector.set_entrance_rule(entrance_name, upgrade_rule)
 
 
-def set_festival_entrance_rules(logic, multiworld, player):
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_egg_festival, logic.season.has(Season.spring))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_desert_festival, logic.season.has(Season.spring) & logic.received("Bus Repair"))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_flower_dance, logic.season.has(Season.spring))
+def set_festival_entrance_rules(logic, rule_collector: StardewRuleCollector):
+    rule_collector.set_entrance_rule(LogicEntrance.attend_egg_festival, logic.season.has(Season.spring))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_desert_festival, logic.season.has(Season.spring) & logic.received(Transportation.bus_repair))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_flower_dance, logic.season.has(Season.spring))
 
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_luau, logic.season.has(Season.summer))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_trout_derby, logic.season.has(Season.summer))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_moonlight_jellies, logic.season.has(Season.summer))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_luau, logic.season.has(Season.summer))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_trout_derby,
+                                     logic.season.has(Season.summer) & logic.fishing.can_use_specific_bait(Fish.rainbow_trout))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_moonlight_jellies, logic.season.has(Season.summer))
 
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_fair, logic.season.has(Season.fall))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_spirit_eve, logic.season.has(Season.fall))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_fair, logic.season.has(Season.fall))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_spirit_eve, logic.season.has(Season.fall))
 
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_festival_of_ice, logic.season.has(Season.winter))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_squidfest, logic.season.has(Season.winter))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_night_market, logic.season.has(Season.winter))
-    set_entrance_rule(multiworld, player, LogicEntrance.attend_winter_star, logic.season.has(Season.winter))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_festival_of_ice, logic.season.has(Season.winter))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_squidfest, logic.season.has(Season.winter) & logic.fishing.can_use_specific_bait(Fish.squid))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_night_market, logic.season.has(Season.winter))
+    rule_collector.set_entrance_rule(LogicEntrance.attend_winter_star, logic.season.has(Season.winter))
 
 
-def set_ginger_island_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    set_island_entrances_rules(logic, multiworld, player, world_options)
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def set_ginger_island_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions, content: StardewContent):
+    set_island_entrances_rules(logic, rule_collector, content)
+    if not content.is_enabled(ginger_island_content_pack):
         return
 
-    set_boat_repair_rules(logic, multiworld, player)
-    set_island_parrot_rules(logic, multiworld, player)
-    set_rule(multiworld.get_location("Open Professor Snail Cave", player),
-             logic.has(Bomb.cherry_bomb))
-    set_rule(multiworld.get_location("Complete Island Field Office", player),
-             logic.walnut.can_complete_field_office())
-    set_walnut_rules(logic, multiworld, player, world_options)
+    set_boat_repair_rules(logic, rule_collector)
+    set_island_parrot_rules(logic, rule_collector)
+    rule_collector.set_location_rule("Open Professor Snail Cave", logic.has(Bomb.cherry_bomb))
+    rule_collector.set_location_rule("Complete Island Field Office", logic.walnut.can_complete_field_office())
+    set_walnut_rules(logic, rule_collector, world_options)
 
 
-def set_boat_repair_rules(logic: StardewLogic, multiworld, player):
-    set_rule(multiworld.get_location("Repair Boat Hull", player),
-             logic.has(Material.hardwood))
-    set_rule(multiworld.get_location("Repair Boat Anchor", player),
-             logic.has(MetalBar.iridium))
-    set_rule(multiworld.get_location("Repair Ticket Machine", player),
-             logic.has(ArtisanGood.battery_pack))
+def set_boat_repair_rules(logic: StardewLogic, rule_collector: StardewRuleCollector):
+    rule_collector.set_location_rule("Repair Boat Hull", logic.has(Material.hardwood))
+    rule_collector.set_location_rule("Repair Boat Anchor", logic.has(MetalBar.iridium))
+    rule_collector.set_location_rule("Repair Ticket Machine", logic.has(ArtisanGood.battery_pack))
 
 
-def set_island_entrances_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_island_entrances_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
     boat_repaired = logic.received(Transportation.boat_repair)
     dig_site_rule = logic.received("Dig Site Bridge")
     entrance_rules = {
@@ -368,17 +486,17 @@ def set_island_entrances_rules(logic: StardewLogic, multiworld, player, world_op
         Entrance.island_south_to_north: logic.received("Island North Turtle"),
         Entrance.island_west_to_islandfarmhouse: logic.received("Island Farmhouse"),
         Entrance.island_west_to_gourmand_cave: logic.received("Island Farmhouse"),
-        Entrance.island_north_to_dig_site: dig_site_rule,
+        Entrance.island_north_to_dig_site: dig_site_rule | logic.ability.can_chair_skip(),
         Entrance.dig_site_to_professor_snail_cave: logic.received("Open Professor Snail Cave"),
         Entrance.talk_to_island_trader: logic.received("Island Trader"),
         Entrance.island_south_to_southeast: logic.received("Island Resort"),
         Entrance.use_island_resort: logic.received("Island Resort"),
         Entrance.island_west_to_qi_walnut_room: logic.received("Qi Walnut Room"),
-        Entrance.island_north_to_volcano: logic.tool.can_water(0) | logic.received("Volcano Bridge") | logic.mod.magic.can_blink(),
-        Entrance.volcano_to_secret_beach: logic.tool.can_water(2),
-        Entrance.climb_to_volcano_5: logic.ability.can_mine_perfectly() & logic.tool.can_water(1),
+        Entrance.island_north_to_volcano: logic.tool.can_water() | logic.received("Volcano Bridge") | logic.mod.magic.can_blink(),
+        Entrance.volcano_to_secret_beach: logic.tool.can_water(3),
+        Entrance.climb_to_volcano_5: logic.ability.can_mine_perfectly() & logic.tool.can_water(2),
         Entrance.talk_to_volcano_dwarf: logic.wallet.can_speak_dwarf(),
-        Entrance.climb_to_volcano_10: logic.ability.can_mine_perfectly() & logic.tool.can_water(1),
+        Entrance.climb_to_volcano_10: logic.ability.can_mine_perfectly() & logic.tool.can_water(2),
         Entrance.mountain_to_leo_treehouse: logic.received("Treehouse"),
     }
     parrots = [Entrance.parrot_express_docks_to_volcano, Entrance.parrot_express_jungle_to_volcano,
@@ -395,85 +513,76 @@ def set_island_entrances_rules(logic: StardewLogic, multiworld, player, world_op
         else:
             entrance_rules[parrot] = parrot_express_rule
 
-    set_many_island_entrances_rules(multiworld, player, entrance_rules, world_options)
+    rule_collector.set_many_island_entrances_rules(entrance_rules)
 
 
-def set_island_parrot_rules(logic: StardewLogic, multiworld, player):
+def set_island_parrot_rules(logic: StardewLogic, rule_collector: StardewRuleCollector):
     # Logic rules require more walnuts than in reality, to allow the player to spend them "wrong"
     has_walnut = logic.walnut.has_walnut(5)
     has_5_walnut = logic.walnut.has_walnut(15)
     has_10_walnut = logic.walnut.has_walnut(40)
     has_20_walnut = logic.walnut.has_walnut(60)
-    set_rule(multiworld.get_location("Leo's Parrot", player),
-             has_walnut)
-    set_rule(multiworld.get_location("Island West Turtle", player),
-             has_10_walnut & logic.received("Island North Turtle"))
-    set_rule(multiworld.get_location("Island Farmhouse", player),
-             has_20_walnut)
-    set_rule(multiworld.get_location("Island Mailbox", player),
-             has_5_walnut & logic.received("Island Farmhouse"))
-    set_rule(multiworld.get_location(Transportation.farm_obelisk, player),
-             has_20_walnut & logic.received("Island Mailbox"))
-    set_rule(multiworld.get_location("Dig Site Bridge", player),
-             has_10_walnut & logic.received("Island West Turtle"))
-    set_rule(multiworld.get_location("Island Trader", player),
-             has_10_walnut & logic.received("Island Farmhouse"))
-    set_rule(multiworld.get_location("Volcano Bridge", player),
-             has_5_walnut & logic.received("Island West Turtle") &
-             logic.region.can_reach(Region.volcano_floor_10))
-    set_rule(multiworld.get_location("Volcano Exit Shortcut", player),
-             has_5_walnut & logic.received("Island West Turtle"))
-    set_rule(multiworld.get_location("Island Resort", player),
-             has_20_walnut & logic.received("Island Farmhouse"))
-    set_rule(multiworld.get_location(Transportation.parrot_express, player),
-             has_10_walnut)
+    rule_collector.set_location_rule("Leo's Parrot", has_walnut)
+    rule_collector.set_location_rule("Island West Turtle", has_10_walnut & logic.received("Island North Turtle"))
+    rule_collector.set_location_rule("Island Farmhouse", has_20_walnut)
+    rule_collector.set_location_rule("Island Mailbox", has_5_walnut & logic.received("Island Farmhouse"))
+    rule_collector.set_location_rule(Transportation.farm_obelisk, has_20_walnut & logic.received("Island Mailbox"))
+    rule_collector.set_location_rule("Dig Site Bridge", has_10_walnut & logic.received("Island West Turtle"))
+    rule_collector.set_location_rule("Island Trader", has_10_walnut & logic.received("Island Farmhouse"))
+    rule_collector.set_location_rule("Volcano Bridge",
+                                     has_5_walnut & logic.received("Island West Turtle") & logic.region.can_reach(Region.volcano_floor_10))
+    rule_collector.set_location_rule("Volcano Exit Shortcut", has_5_walnut & logic.received("Island West Turtle"))
+    rule_collector.set_location_rule("Island Resort", has_20_walnut & logic.received("Island Farmhouse"))
+    rule_collector.set_location_rule(Transportation.parrot_express, has_10_walnut)
 
 
-def set_walnut_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_walnut_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     if world_options.walnutsanity == Walnutsanity.preset_none:
         return
 
-    set_walnut_puzzle_rules(logic, multiworld, player, world_options)
-    set_walnut_bushes_rules(logic, multiworld, player, world_options)
-    set_walnut_dig_spot_rules(logic, multiworld, player, world_options)
-    set_walnut_repeatable_rules(logic, multiworld, player, world_options)
+    set_walnut_puzzle_rules(logic, rule_collector, world_options)
+    set_walnut_bushes_rules(logic, rule_collector, world_options)
+    set_walnut_dig_spot_rules(logic, rule_collector, world_options)
+    set_walnut_repeatable_rules(logic, rule_collector, world_options)
 
 
-def set_walnut_puzzle_rules(logic: StardewLogic, multiworld, player, world_options):
+def set_walnut_puzzle_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options):
     if WalnutsanityOptionName.puzzles not in world_options.walnutsanity:
         return
 
-    set_rule(multiworld.get_location("Walnutsanity: Open Golden Coconut", player), logic.has(Geode.golden_coconut))
-    set_rule(multiworld.get_location("Walnutsanity: Banana Altar", player), logic.has(Fruit.banana))
-    set_rule(multiworld.get_location("Walnutsanity: Leo's Tree", player), logic.tool.has_tool(Tool.axe))
-    set_rule(multiworld.get_location("Walnutsanity: Gem Birds Shrine", player), logic.has(Mineral.amethyst) & logic.has(Mineral.aquamarine) &
-             logic.has(Mineral.emerald) & logic.has(Mineral.ruby) & logic.has(Mineral.topaz) &
-             logic.region.can_reach_all((Region.island_north, Region.island_west, Region.island_east, Region.island_south)))
-    set_rule(multiworld.get_location("Walnutsanity: Gourmand Frog Melon", player), logic.has(Fruit.melon) & logic.region.can_reach(Region.island_west))
-    set_rule(multiworld.get_location("Walnutsanity: Gourmand Frog Wheat", player), logic.has(Vegetable.wheat) &
-             logic.region.can_reach(Region.island_west) & logic.region.can_reach_location("Walnutsanity: Gourmand Frog Melon"))
-    set_rule(multiworld.get_location("Walnutsanity: Gourmand Frog Garlic", player), logic.has(Vegetable.garlic) &
-             logic.region.can_reach(Region.island_west) & logic.region.can_reach_location("Walnutsanity: Gourmand Frog Wheat"))
-    set_rule(multiworld.get_location("Walnutsanity: Whack A Mole", player), logic.tool.has_tool(Tool.watering_can, ToolMaterial.iridium))
-    set_rule(multiworld.get_location("Walnutsanity: Complete Large Animal Collection", player), logic.walnut.can_complete_large_animal_collection())
-    set_rule(multiworld.get_location("Walnutsanity: Complete Snake Collection", player), logic.walnut.can_complete_snake_collection())
-    set_rule(multiworld.get_location("Walnutsanity: Complete Mummified Frog Collection", player), logic.walnut.can_complete_frog_collection())
-    set_rule(multiworld.get_location("Walnutsanity: Complete Mummified Bat Collection", player), logic.walnut.can_complete_bat_collection())
-    set_rule(multiworld.get_location("Walnutsanity: Purple Flowers Island Survey", player), logic.walnut.can_start_field_office)
-    set_rule(multiworld.get_location("Walnutsanity: Purple Starfish Island Survey", player), logic.walnut.can_start_field_office)
-    set_rule(multiworld.get_location("Walnutsanity: Protruding Tree Walnut", player), logic.combat.has_slingshot)
-    set_rule(multiworld.get_location("Walnutsanity: Starfish Tide Pool", player), logic.tool.has_fishing_rod(1))
-    set_rule(multiworld.get_location("Walnutsanity: Mermaid Song", player), logic.has(Furniture.flute_block))
+    rule_collector.set_location_rule("Walnutsanity: Open Golden Coconut", logic.has(Geode.golden_coconut))
+    rule_collector.set_location_rule("Walnutsanity: Banana Altar", logic.has(Fruit.banana))
+    rule_collector.set_location_rule("Walnutsanity: Leo's Tree", logic.tool.has_tool(Tool.axe))
+    rule_collector.set_location_rule("Walnutsanity: Gem Birds Shrine",
+                                     logic.has_all(Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz)
+                                     & logic.region.can_reach_all(Region.island_north, Region.island_west, Region.island_east, Region.island_south))
+    rule_collector.set_location_rule("Walnutsanity: Gourmand Frog Melon", logic.has(Fruit.melon) & logic.region.can_reach(Region.island_west))
+    rule_collector.set_location_rule("Walnutsanity: Gourmand Frog Wheat",
+                                     logic.has(Vegetable.wheat) & logic.region.can_reach(Region.island_west)
+                                     & logic.region.can_reach_location("Walnutsanity: Gourmand Frog Melon"))
+    rule_collector.set_location_rule("Walnutsanity: Gourmand Frog Garlic",
+                                     logic.has(Vegetable.garlic) & logic.region.can_reach(Region.island_west)
+                                     & logic.region.can_reach_location("Walnutsanity: Gourmand Frog Wheat"))
+    rule_collector.set_location_rule("Walnutsanity: Whack A Mole", logic.tool.has_tool(Tool.watering_can, ToolMaterial.iridium))
+    rule_collector.set_location_rule("Walnutsanity: Complete Large Animal Collection", logic.walnut.can_complete_large_animal_collection())
+    rule_collector.set_location_rule("Walnutsanity: Complete Snake Collection", logic.walnut.can_complete_snake_collection())
+    rule_collector.set_location_rule("Walnutsanity: Complete Mummified Frog Collection", logic.walnut.can_complete_frog_collection())
+    rule_collector.set_location_rule("Walnutsanity: Complete Mummified Bat Collection", logic.walnut.can_complete_bat_collection())
+    rule_collector.set_location_rule("Walnutsanity: Purple Flowers Island Survey", logic.walnut.can_start_field_office)
+    rule_collector.set_location_rule("Walnutsanity: Purple Starfish Island Survey", logic.walnut.can_start_field_office)
+    rule_collector.set_location_rule("Walnutsanity: Protruding Tree Walnut", logic.combat.has_slingshot)
+    rule_collector.set_location_rule("Walnutsanity: Starfish Tide Pool", logic.tool.has_fishing_rod())
+    rule_collector.set_location_rule("Walnutsanity: Mermaid Song", logic.has(Furniture.flute_block))
 
 
-def set_walnut_bushes_rules(logic, multiworld, player, world_options):
+def set_walnut_bushes_rules(logic, rule_collector: StardewRuleCollector, world_options):
     if WalnutsanityOptionName.bushes not in world_options.walnutsanity:
         return
     # I don't think any of the bushes require something special, but that might change with ER
     return
 
 
-def set_walnut_dig_spot_rules(logic, multiworld, player, world_options):
+def set_walnut_dig_spot_rules(logic, rule_collector: StardewRuleCollector, world_options):
     if WalnutsanityOptionName.dig_spots not in world_options.walnutsanity:
         return
 
@@ -483,58 +592,58 @@ def set_walnut_dig_spot_rules(logic, multiworld, player, world_options):
             rule = rule & logic.has(Forageable.journal_scrap)
         if "Starfish Diamond" in dig_spot_walnut.name:
             rule = rule & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron)
-        set_rule(multiworld.get_location(dig_spot_walnut.name, player), rule)
+        rule_collector.set_location_rule(dig_spot_walnut.name, rule)
 
 
-def set_walnut_repeatable_rules(logic, multiworld, player, world_options):
+def set_walnut_repeatable_rules(logic, rule_collector: StardewRuleCollector, world_options):
     if WalnutsanityOptionName.repeatables not in world_options.walnutsanity:
         return
     for i in range(1, 6):
-        set_rule(multiworld.get_location(f"Walnutsanity: Fishing Walnut {i}", player), logic.tool.has_fishing_rod(1))
-        set_rule(multiworld.get_location(f"Walnutsanity: Harvesting Walnut {i}", player), logic.skill.can_get_farming_xp)
-        set_rule(multiworld.get_location(f"Walnutsanity: Mussel Node Walnut {i}", player), logic.tool.has_tool(Tool.pickaxe))
-        set_rule(multiworld.get_location(f"Walnutsanity: Volcano Rocks Walnut {i}", player), logic.tool.has_tool(Tool.pickaxe))
-        set_rule(multiworld.get_location(f"Walnutsanity: Volcano Monsters Walnut {i}", player), logic.combat.has_galaxy_weapon)
-        set_rule(multiworld.get_location(f"Walnutsanity: Volcano Crates Walnut {i}", player), logic.combat.has_any_weapon)
-    set_rule(multiworld.get_location(f"Walnutsanity: Tiger Slime Walnut", player), logic.monster.can_kill(Monster.tiger_slime))
+        rule_collector.set_location_rule(f"Walnutsanity: Fishing Walnut {i}", logic.tool.has_fishing_rod())
+        rule_collector.set_location_rule(f"Walnutsanity: Harvesting Walnut {i}", logic.skill.can_get_farming_xp)
+        rule_collector.set_location_rule(f"Walnutsanity: Mussel Node Walnut {i}", logic.tool.has_tool(Tool.pickaxe))
+        rule_collector.set_location_rule(f"Walnutsanity: Volcano Rocks Walnut {i}", logic.tool.has_tool(Tool.pickaxe))
+        rule_collector.set_location_rule(f"Walnutsanity: Volcano Monsters Walnut {i}", logic.combat.has_galaxy_weapon)
+        rule_collector.set_location_rule(f"Walnutsanity: Volcano Crates Walnut {i}", logic.combat.has_any_weapon)
+    rule_collector.set_location_rule(f"Walnutsanity: Tiger Slime Walnut", logic.monster.can_kill(Monster.tiger_slime))
 
 
-def set_cropsanity_rules(logic: StardewLogic, multiworld, player, world_content: StardewContent):
+def set_cropsanity_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_content: StardewContent):
     if not world_content.features.cropsanity.is_enabled:
         return
 
     for item in world_content.find_tagged_items(ItemTag.CROPSANITY):
         location = world_content.features.cropsanity.to_location_name(item.name)
         harvest_sources = (source for source in item.sources if isinstance(source, (HarvestFruitTreeSource, HarvestCropSource)))
-        set_rule(multiworld.get_location(location, player), logic.source.has_access_to_any(harvest_sources))
+        rule_collector.set_location_rule(location, logic.source.has_access_to_any(harvest_sources))
 
 
-def set_story_quests_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_story_quests_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     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):
-            set_rule(multiworld.get_location(quest.name, player),
-                     logic.registry.quest_rules[quest.name])
+    for quest_location in locations.locations_by_tag[LocationTags.STORY_QUEST]:
+        quest_location_name = quest_location.name
+        if quest_location_name in all_location_names:
+            quest_prefix = "Quest: "
+            quest_name = quest_location_name[len(quest_prefix):]
+            rule_collector.set_location_rule(quest_location_name, logic.registry.quest_rules[quest_name])
 
 
-def set_special_order_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player,
-                            world_options: StardewValleyOptions):
+def set_special_order_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector,
+                            world_options: StardewValleyOptions, content: StardewContent):
     if world_options.special_order_locations & SpecialOrderLocations.option_board:
         board_rule = logic.received("Special Order Board") & logic.time.has_lived_months(4)
         for board_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
             if board_order.name in all_location_names:
                 order_rule = board_rule & logic.registry.special_order_rules[board_order.name]
-                set_rule(multiworld.get_location(board_order.name, player), order_rule)
+                rule_collector.set_location_rule(board_order.name, order_rule)
 
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-        return
-    if world_options.special_order_locations & SpecialOrderLocations.value_qi:
+    if content.is_enabled(qi_board_content_pack):
         qi_rule = logic.region.can_reach(Region.qi_walnut_room) & logic.time.has_lived_months(8)
         for qi_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_QI]:
             if qi_order.name in all_location_names:
                 order_rule = qi_rule & logic.registry.special_order_rules[qi_order.name]
-                set_rule(multiworld.get_location(qi_order.name, player), order_rule)
+                rule_collector.set_location_rule(qi_order.name, order_rule)
 
 
 help_wanted_prefix = "Help Wanted:"
@@ -544,7 +653,7 @@ fishing = "Fishing"
 slay_monsters = "Slay Monsters"
 
 
-def set_help_wanted_quests_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_help_wanted_quests_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     if world_options.quest_locations.has_no_story_quests():
         return
     help_wanted_number = world_options.quest_locations.value
@@ -555,55 +664,53 @@ def set_help_wanted_quests_rules(logic: StardewLogic, multiworld, player, world_
         quest_number_in_set = i % 7
         if quest_number_in_set < 4:
             quest_number = set_number * 4 + quest_number_in_set + 1
-            set_help_wanted_delivery_rule(multiworld, player, month_rule, quest_number)
+            set_help_wanted_delivery_rule(logic, rule_collector, month_rule, quest_number)
         elif quest_number_in_set == 4:
-            set_help_wanted_fishing_rule(multiworld, player, month_rule, quest_number)
+            set_help_wanted_fishing_rule(logic, rule_collector, month_rule, quest_number)
         elif quest_number_in_set == 5:
-            set_help_wanted_slay_monsters_rule(multiworld, player, month_rule, quest_number)
+            set_help_wanted_slay_monsters_rule(logic, rule_collector, month_rule, quest_number)
         elif quest_number_in_set == 6:
-            set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number)
+            set_help_wanted_gathering_rule(logic, rule_collector, month_rule, quest_number)
 
 
-def set_help_wanted_delivery_rule(multiworld, player, month_rule, quest_number):
+def set_help_wanted_delivery_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {item_delivery} {quest_number}"
-    set_rule(multiworld.get_location(location_name, player), month_rule)
+    rule_collector.set_location_rule(location_name, logic.quest.can_do_item_delivery_quest() & month_rule)
 
 
-def set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number):
+def set_help_wanted_gathering_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {gathering} {quest_number}"
-    set_rule(multiworld.get_location(location_name, player), month_rule)
+    rule_collector.set_location_rule(location_name, logic.quest.can_do_gathering_quest() & month_rule)
 
 
-def set_help_wanted_fishing_rule(multiworld, player, month_rule, quest_number):
+def set_help_wanted_fishing_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {fishing} {quest_number}"
-    set_rule(multiworld.get_location(location_name, player), month_rule)
+    rule_collector.set_location_rule(location_name, logic.quest.can_do_fishing_quest() & month_rule)
 
 
-def set_help_wanted_slay_monsters_rule(multiworld, player, month_rule, quest_number):
+def set_help_wanted_slay_monsters_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {slay_monsters} {quest_number}"
-    set_rule(multiworld.get_location(location_name, player), month_rule)
+    rule_collector.set_location_rule(location_name, logic.quest.can_do_slaying_quest() & month_rule)
 
 
-def set_fishsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld: MultiWorld, player: int):
+def set_fishsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector):
     fish_prefix = "Fishsanity: "
     for fish_location in locations.locations_by_tag[LocationTags.FISHSANITY]:
         if fish_location.name in all_location_names:
             fish_name = fish_location.name[len(fish_prefix):]
-            set_rule(multiworld.get_location(fish_location.name, player),
-                     logic.has(fish_name))
+            rule_collector.set_location_rule(fish_location.name, logic.has(fish_name))
 
 
-def set_museumsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld: MultiWorld, player: int,
-                           world_options: StardewValleyOptions):
+def set_museumsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     museum_prefix = "Museumsanity: "
     if world_options.museumsanity == Museumsanity.option_milestones:
         for museum_milestone in locations.locations_by_tag[LocationTags.MUSEUM_MILESTONES]:
-            set_museum_milestone_rule(logic, multiworld, museum_milestone, museum_prefix, player)
+            set_museum_milestone_rule(logic, rule_collector, museum_milestone, museum_prefix)
     elif world_options.museumsanity != Museumsanity.option_none:
-        set_museum_individual_donations_rules(all_location_names, logic, multiworld, museum_prefix, player)
+        set_museum_individual_donations_rules(all_location_names, logic, rule_collector, museum_prefix)
 
 
-def set_museum_individual_donations_rules(all_location_names, logic: StardewLogic, multiworld, museum_prefix, player):
+def set_museum_individual_donations_rules(all_location_names, logic: StardewLogic, rule_collector: StardewRuleCollector, museum_prefix: str):
     all_donations = sorted(locations.locations_by_tag[LocationTags.MUSEUM_DONATIONS],
                            key=lambda x: all_museum_items_by_name[x.name[len(museum_prefix):]].difficulty, reverse=True)
     counter = 0
@@ -613,13 +720,11 @@ def set_museum_individual_donations_rules(all_location_names, logic: StardewLogi
             donation_name = museum_location.name[len(museum_prefix):]
             required_detectors = counter * 3 // number_donations
             rule = logic.museum.can_find_museum_item(all_museum_items_by_name[donation_name]) & logic.received(Wallet.metal_detector, required_detectors)
-            set_rule(multiworld.get_location(museum_location.name, player),
-                     rule)
+            rule_collector.set_location_rule(museum_location.name, rule)
         counter += 1
 
 
-def set_museum_milestone_rule(logic: StardewLogic, multiworld: MultiWorld, museum_milestone, museum_prefix: str,
-                              player: int):
+def set_museum_milestone_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, museum_milestone, museum_prefix: str):
     milestone_name = museum_milestone.name[len(museum_prefix):]
     donations_suffix = " Donations"
     minerals_suffix = " Minerals"
@@ -644,7 +749,7 @@ def set_museum_milestone_rule(logic: StardewLogic, multiworld: MultiWorld, museu
         rule = logic.museum.can_find_museum_item(Artifact.ancient_seed) & logic.received(metal_detector, 2)
     if rule is None:
         return
-    set_rule(multiworld.get_location(museum_milestone.name, player), rule)
+    rule_collector.set_location_rule(museum_milestone.name, rule)
 
 
 def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, accepted_items, donation_func):
@@ -655,85 +760,89 @@ def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, acce
     return rule
 
 
-def set_backpack_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if world_options.backpack_progression != BackpackProgression.option_vanilla:
-        set_rule(multiworld.get_location("Large Pack", player),
-                 logic.money.can_spend(2000))
-        set_rule(multiworld.get_location("Deluxe Pack", player),
-                 (logic.money.can_spend(10000) & logic.received("Progressive Backpack")))
-        if ModNames.big_backpack in world_options.mods:
-            set_rule(multiworld.get_location("Premium Pack", player),
-                     (logic.money.can_spend(150000) &
-                      logic.received("Progressive Backpack", 2)))
+def set_backpack_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions, content: StardewContent):
+    if world_options.backpack_progression == BackpackProgression.option_vanilla:
+        return
+
+    num_per_tier = world_options.backpack_size.count_per_tier()
+    start_without_backpack = bool(StartWithoutOptionName.backpack in world_options.start_without)
+    backpack_tier_names = Backpack.get_purchasable_tiers(content.is_enabled(ModNames.big_backpack), start_without_backpack)
+    previous_backpacks = 0
+    for tier in backpack_tier_names:
+        for i in range(1, num_per_tier + 1):
+            loc_name = f"{tier} {i}"
+            if num_per_tier == 1:
+                loc_name = tier
+            price = Backpack.prices_per_tier[tier]
+            rule_collector.set_location_rule(loc_name, logic.money.can_spend(price) & logic.received("Progressive Backpack", previous_backpacks))
+            previous_backpacks += 1
 
 
-def set_festival_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player):
+def set_festival_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector):
     festival_locations = []
     festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL])
     festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL_HARD])
     for festival in festival_locations:
         if festival.name in all_location_names:
-            set_rule(multiworld.get_location(festival.name, player),
-                     logic.registry.festival_rules[festival.name])
+            rule_collector.set_location_rule(festival.name, logic.registry.festival_rules[festival.name])
 
 
 monster_eradication_prefix = "Monster Eradication: "
 
 
-def set_monstersanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_monstersanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     monstersanity_option = world_options.monstersanity
     if monstersanity_option == Monstersanity.option_none:
         return
 
     if monstersanity_option == Monstersanity.option_one_per_monster or monstersanity_option == Monstersanity.option_split_goals:
-        set_monstersanity_monster_rules(all_location_names, logic, multiworld, player, monstersanity_option)
+        set_monstersanity_monster_rules(all_location_names, logic, rule_collector, monstersanity_option)
         return
 
     if monstersanity_option == Monstersanity.option_progressive_goals:
-        set_monstersanity_progressive_category_rules(all_location_names, logic, multiworld, player)
+        set_monstersanity_progressive_category_rules(all_location_names, logic, rule_collector)
         return
 
-    set_monstersanity_category_rules(all_location_names, logic, multiworld, player, monstersanity_option)
+    set_monstersanity_category_rules(all_location_names, logic, rule_collector, monstersanity_option)
 
 
-def set_monstersanity_monster_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monstersanity_option):
+def set_monstersanity_monster_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, monstersanity_option):
     for monster_name in logic.monster.all_monsters_by_name:
         location_name = f"{monster_eradication_prefix}{monster_name}"
         if location_name not in all_location_names:
             continue
-        location = multiworld.get_location(location_name, player)
         if monstersanity_option == Monstersanity.option_split_goals:
             rule = logic.monster.can_kill_many(logic.monster.all_monsters_by_name[monster_name])
         else:
             rule = logic.monster.can_kill(logic.monster.all_monsters_by_name[monster_name])
-        set_rule(location, rule)
+        rule_collector.set_location_rule(location_name, rule)
 
 
-def set_monstersanity_progressive_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player):
+def set_monstersanity_progressive_category_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector):
     for monster_category in logic.monster.all_monsters_by_category:
-        set_monstersanity_progressive_single_category_rules(all_location_names, logic, multiworld, player, monster_category)
+        set_monstersanity_progressive_single_category_rules(all_location_names, logic, rule_collector, monster_category)
 
 
-def set_monstersanity_progressive_single_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monster_category: str):
+def set_monstersanity_progressive_single_category_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector,
+                                                        monster_category: str):
     location_names = [name for name in all_location_names if name.startswith(monster_eradication_prefix) and name.endswith(monster_category)]
     if not location_names:
         return
     location_names = sorted(location_names, key=lambda name: get_monster_eradication_number(name, monster_category))
     for i in range(5):
         location_name = location_names[i]
-        set_monstersanity_progressive_category_rule(all_location_names, logic, multiworld, player, monster_category, location_name, i)
+        set_monstersanity_progressive_category_rule(all_location_names, logic, rule_collector, monster_category, location_name, i)
 
 
-def set_monstersanity_progressive_category_rule(all_location_names: Set[str], logic: StardewLogic, multiworld, player,
+def set_monstersanity_progressive_category_rule(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector,
                                                 monster_category: str, location_name: str, goal_index):
     if location_name not in all_location_names:
         return
-    location = multiworld.get_location(location_name, player)
     if goal_index < 3:
         rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], goal_index + 1)
     else:
         rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], goal_index * 2)
-    set_rule(location, rule)
+    rule_collector.set_location_rule(location_name, rule)
 
 
 def get_monster_eradication_number(location_name, monster_category) -> int:
@@ -744,20 +853,19 @@ def get_monster_eradication_number(location_name, monster_category) -> int:
     return 1000
 
 
-def set_monstersanity_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monstersanity_option):
+def set_monstersanity_category_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, monstersanity_option):
     for monster_category in logic.monster.all_monsters_by_category:
         location_name = f"{monster_eradication_prefix}{monster_category}"
         if location_name not in all_location_names:
             continue
-        location = multiworld.get_location(location_name, player)
         if monstersanity_option == Monstersanity.option_one_per_category:
             rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category])
         else:
             rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], MAX_MONTHS)
-        set_rule(location, rule)
+        rule_collector.set_location_rule(location_name, rule)
 
 
-def set_shipsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_shipsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     shipsanity_option = world_options.shipsanity
     if shipsanity_option == Shipsanity.option_none:
         return
@@ -767,10 +875,10 @@ def set_shipsanity_rules(all_location_names: Set[str], logic: StardewLogic, mult
         if location.name not in all_location_names:
             continue
         item_to_ship = location.name[len(shipsanity_prefix):]
-        set_rule(multiworld.get_location(location.name, player), logic.shipping.can_ship(item_to_ship))
+        rule_collector.set_location_rule(location.name, logic.shipping.can_ship(item_to_ship))
 
 
-def set_cooksanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_cooksanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     cooksanity_option = world_options.cooksanity
     if cooksanity_option == Cooksanity.option_none:
         return
@@ -782,12 +890,12 @@ def set_cooksanity_rules(all_location_names: Set[str], logic: StardewLogic, mult
         recipe_name = location.name[len(cooksanity_prefix):]
         recipe = all_cooking_recipes_by_name[recipe_name]
         cook_rule = logic.cooking.can_cook(recipe)
-        set_rule(multiworld.get_location(location.name, player), cook_rule)
+        rule_collector.set_location_rule(location.name, cook_rule)
 
 
-def set_chefsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_chefsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     chefsanity_option = world_options.chefsanity
-    if chefsanity_option == Chefsanity.option_none:
+    if chefsanity_option == Chefsanity.preset_none:
         return
 
     chefsanity_suffix = " Recipe"
@@ -797,10 +905,10 @@ def set_chefsanity_rules(all_location_names: Set[str], logic: StardewLogic, mult
         recipe_name = location.name[:-len(chefsanity_suffix)]
         recipe = all_cooking_recipes_by_name[recipe_name]
         learn_rule = logic.cooking.can_learn_recipe(recipe.source)
-        set_rule(multiworld.get_location(location.name, player), learn_rule)
+        rule_collector.set_location_rule(location.name, learn_rule)
 
 
-def set_craftsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+def set_craftsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     craftsanity_option = world_options.craftsanity
     if craftsanity_option == Craftsanity.option_none:
         return
@@ -818,213 +926,377 @@ def set_craftsanity_rules(all_location_names: Set[str], logic: StardewLogic, mul
             recipe_name = location.name[len(craft_prefix):]
             recipe = all_crafting_recipes_by_name[recipe_name]
             craft_rule = logic.crafting.can_craft(recipe)
-        set_rule(multiworld.get_location(location.name, player), craft_rule)
+        rule_collector.set_location_rule(location.name, craft_rule)
 
 
-def set_booksanity_rules(logic: StardewLogic, multiworld, player, content: StardewContent):
+def set_booksanity_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
     booksanity = content.features.booksanity
     if not booksanity.is_enabled:
         return
 
     for book in content.find_tagged_items(ItemTag.BOOK):
         if booksanity.is_included(book):
-            set_rule(multiworld.get_location(booksanity.to_location_name(book.name), player), logic.has(book.name))
+            rule_collector.set_location_rule(booksanity.to_location_name(book.name), logic.has(book.name))
 
     for i, book in enumerate(booksanity.get_randomized_lost_books()):
         if i <= 0:
             continue
-        set_rule(multiworld.get_location(booksanity.to_location_name(book), player), logic.received(booksanity.progressive_lost_book, i))
+        rule_collector.set_location_rule(booksanity.to_location_name(book), logic.received(booksanity.progressive_lost_book, i))
 
 
-def set_traveling_merchant_day_rules(logic: StardewLogic, multiworld: MultiWorld, player: int):
+def set_traveling_merchant_day_entrance_rules(logic: StardewLogic, rule_collector: StardewRuleCollector):
     for day in Weekday.all_days:
         item_for_day = f"Traveling Merchant: {day}"
         entrance_name = f"Buy from Traveling Merchant {day}"
-        set_entrance_rule(multiworld, player, entrance_name, logic.received(item_for_day))
+        rule_collector.set_entrance_rule(entrance_name, logic.received(item_for_day))
 
 
-def set_arcade_machine_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
+def set_arcade_machine_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
     play_junimo_kart_rule = logic.received(Wallet.skull_key)
 
     if world_options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
-        set_entrance_rule(multiworld, player, Entrance.play_junimo_kart, play_junimo_kart_rule)
+        rule_collector.set_entrance_rule(Entrance.play_junimo_kart, play_junimo_kart_rule)
         return
 
-    set_entrance_rule(multiworld, player, Entrance.play_junimo_kart, play_junimo_kart_rule & logic.has("Junimo Kart Small Buff"))
-    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_2, logic.has("Junimo Kart Medium Buff"))
-    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_3, logic.has("Junimo Kart Big Buff"))
-    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_4, logic.has("Junimo Kart Max Buff"))
-    set_entrance_rule(multiworld, player, Entrance.play_journey_of_the_prairie_king, logic.has("JotPK Small Buff"))
-    set_entrance_rule(multiworld, player, Entrance.reach_jotpk_world_2, logic.has("JotPK Medium Buff"))
-    set_entrance_rule(multiworld, player, Entrance.reach_jotpk_world_3, logic.has("JotPK Big Buff"))
-    set_rule(multiworld.get_location("Journey of the Prairie King Victory", player),
-             logic.has("JotPK Max Buff"))
+    rule_collector.set_entrance_rule(Entrance.play_junimo_kart, play_junimo_kart_rule & logic.has("Junimo Kart Small Buff"))
+    rule_collector.set_entrance_rule(Entrance.reach_junimo_kart_2, logic.has("Junimo Kart Medium Buff"))
+    rule_collector.set_entrance_rule(Entrance.reach_junimo_kart_3, logic.has("Junimo Kart Big Buff"))
+    rule_collector.set_entrance_rule(Entrance.reach_junimo_kart_4, logic.has("Junimo Kart Max Buff"))
+    rule_collector.set_entrance_rule(Entrance.play_journey_of_the_prairie_king, logic.has("JotPK Small Buff"))
+    rule_collector.set_entrance_rule(Entrance.reach_jotpk_world_2, logic.has("JotPK Medium Buff"))
+    rule_collector.set_entrance_rule(Entrance.reach_jotpk_world_3, logic.has("JotPK Big Buff"))
+    rule_collector.set_location_rule("Journey of the Prairie King Victory", logic.has("JotPK Max Buff"))
 
 
-def set_friendsanity_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, content: StardewContent):
+def set_movie_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions, content: StardewContent):
+    moviesanity = world_options.moviesanity.value
+    if moviesanity <= Moviesanity.option_none:
+        return
+
+    if moviesanity >= Moviesanity.option_all_movies:
+        watch_prefix = "Watch "
+        for movie_location in locations.locations_by_tag[LocationTags.MOVIE]:
+            movie_name = movie_location.name[len(watch_prefix):]
+            if moviesanity == Moviesanity.option_all_movies:
+                rule = logic.movie.can_watch_movie(movie_name)
+            elif moviesanity == Moviesanity.option_all_movies_loved or moviesanity == Moviesanity.option_all_movies_and_all_snacks:
+                rule = logic.movie.can_watch_movie_with_loving_npc(movie_name)
+            else:
+                rule = logic.movie.can_watch_movie_with_loving_npc_and_snack(movie_name)
+            rule_collector.set_location_rule(movie_location.name, rule)
+    if moviesanity >= Moviesanity.option_all_movies_and_all_snacks:
+        snack_prefix = "Share "
+        for snack_location in locations.locations_by_tag[LocationTags.MOVIE_SNACK]:
+            snack_name = snack_location.name[len(snack_prefix):]
+            if moviesanity == Moviesanity.option_all_movies_and_all_loved_snacks:
+                rule = logic.movie.can_buy_snack_for_someone_who_loves_it(snack_name)
+            else:
+                rule = logic.movie.can_buy_snack(snack_name)
+            rule_collector.set_location_rule(snack_location.name, rule)
+
+
+def set_secrets_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions, content: StardewContent):
+    if not world_options.secretsanity:
+        return
+
+    if SecretsanityOptionName.easy in world_options.secretsanity:
+        rule_collector.set_location_rule("Secret: Old Master Cannoli", logic.has(Fruit.sweet_gem_berry))
+        rule_collector.set_location_rule("Secret: Pot Of Gold", logic.season.has(Season.spring))
+        rule_collector.set_location_rule("Secret: Poison The Governor", logic.has(SpecialItem.lucky_purple_shorts))
+        rule_collector.set_location_rule("Secret: Grange Display Bribe", logic.has(SpecialItem.lucky_purple_shorts))
+        rule_collector.set_location_rule("Secret: Purple Lettuce", logic.has(SpecialItem.lucky_purple_shorts))
+        rule_collector.set_location_rule("Secret: Make Marnie Laugh", logic.has(SpecialItem.trimmed_purple_shorts) & logic.relationship.can_meet(NPC.marnie))
+        rule_collector.set_location_rule("Secret: Jumpscare Lewis", logic.has(SpecialItem.trimmed_purple_shorts) & logic.relationship.can_meet(NPC.lewis))
+        rule_collector.set_location_rule("Secret: Confront Marnie", logic.gifts.can_gift_to(NPC.marnie, SpecialItem.lucky_purple_shorts))
+        rule_collector.set_location_rule("Secret: Lucky Purple Bobber", logic.fishing.can_use_tackle(SpecialItem.lucky_purple_shorts))
+        rule_collector.set_location_rule("Secret: Something For Santa", logic.season.has(Season.winter) & logic.has_any(AnimalProduct.any_milk, Meal.cookie))
+        cc_rewards = ["Bridge Repair", "Greenhouse", "Glittering Boulder Removed", "Minecarts Repair", Transportation.bus_repair, "Friendship Bonus (2 <3)"]
+        rule_collector.set_location_rule("Secret: Jungle Junimo", logic.action.can_speak_junimo() & logic.and_(*[logic.received(reward) for reward in cc_rewards]))
+        rule_collector.set_location_rule("Secret: ??HMTGF??", logic.has(Fish.super_cucumber))
+        rule_collector.set_location_rule("Secret: ??Pinky Lemon??", logic.has(ArtisanGood.duck_mayonnaise))
+        rule_collector.set_location_rule("Secret: ??Foroguemon??", logic.has(Meal.strange_bun) & logic.relationship.has_hearts(NPC.vincent, 2))
+        rule_collector.set_location_rule("Secret: Galaxies Will Heed Your Cry", logic.wallet.can_speak_dwarf())
+        rule_collector.set_location_rule("Secret: Summon Bone Serpent", logic.has(ArtifactName.ancient_doll))
+        rule_collector.set_location_rule("Secret: Meowmere", logic.has(SpecialItem.far_away_stone) & logic.region.can_reach(Region.wizard_basement))
+        rule_collector.set_location_rule("Secret: A Familiar Tune", logic.relationship.can_meet(NPC.elliott))
+        rule_collector.set_location_rule("Secret: Flubber Experiment",
+                                         logic.relationship.can_get_married() & logic.building.has_building(Building.slime_hutch)
+                                         & logic.has_all(Machine.slime_incubator, AnimalProduct.slime_egg_green))
+        rule_collector.set_location_rule("Secret: Seems Fishy", logic.money.can_spend_at(Region.wizard_basement, 500))
+        rule_collector.set_location_rule("Secret: What kind of monster is this?", logic.gifts.can_gift_to(NPC.willy, Fish.mutant_carp))
+        rule_collector.set_location_rule("Secret: My mouth is watering already", logic.gifts.can_gift_to(NPC.abigail, Meal.magic_rock_candy))
+        rule_collector.set_location_rule("Secret: A gift of lovely perfume", logic.gifts.can_gift_to(NPC.krobus, Consumable.monster_musk))
+        rule_collector.set_location_rule("Secret: Where exactly does this juice come from?", logic.gifts.can_gift_to(NPC.dwarf, AnimalProduct.cow_milk))
+        rule_collector.set_location_rule("Secret: Thank the Devs", logic.received("Stardrop") & logic.money.can_spend_at(Region.wizard_basement, 500))
+        if content.is_enabled(ginger_island_content_pack) and content.is_enabled(qi_board_content_pack):
+            rule_collector.set_location_rule("Secret: Obtain my precious fruit whenever you like",
+                                             logic.special_order.can_complete_special_order(SpecialOrder.qis_crop) &
+                                             logic.tool.has_tool(Tool.axe))
+
+    if SecretsanityOptionName.fishing in world_options.secretsanity:
+        if world_options.farm_type == FarmType.option_beach:
+            rule_collector.set_location_rule("Fishing Secret: 'Boat'", logic.fishing.can_fish_at(Region.farm))
+        if content.is_enabled(ginger_island_content_pack):
+            rule_collector.set_location_rule("Fishing Secret: Foliage Print", logic.fishing.can_fish_with_cast_distance(Region.island_north, 5))
+            rule_collector.set_location_rule("Fishing Secret: Frog Hat", logic.fishing.can_fish_at(Region.gourmand_frog_cave))
+            rule_collector.set_location_rule("Fishing Secret: Gourmand Statue", logic.fishing.can_fish_at(Region.pirate_cove))
+            rule_collector.set_location_rule("Fishing Secret: 'Physics 101'", logic.fishing.can_fish_at(Region.volcano_floor_10))
+            rule_collector.set_location_rule("Fishing Secret: Lifesaver", logic.fishing.can_fish_at(Region.boat_tunnel))
+            rule_collector.set_location_rule("Fishing Secret: Squirrel Figurine", logic.fishing.can_fish_at(Region.volcano_secret_beach))
+        rule_collector.set_location_rule("Fishing Secret: Decorative Trash Can", logic.fishing.can_fish_at(Region.town))
+        rule_collector.set_location_rule("Fishing Secret: Iridium Krobus", logic.fishing.can_fish_with_cast_distance(Region.forest, 7))
+        rule_collector.set_location_rule("Fishing Secret: Pyramid Decal", logic.fishing.can_fish_with_cast_distance(Region.desert, 4))
+        rule_collector.set_location_rule("Fishing Secret: 'Vista'", logic.fishing.can_fish_at(Region.railroad) & logic.season.has_any_not_winter())
+        rule_collector.set_location_rule("Fishing Secret: Wall Basket", logic.fishing.can_fish_at(Region.secret_woods))
+
+    if SecretsanityOptionName.difficult in world_options.secretsanity:
+        rule_collector.set_location_rule("Secret: Free The Forsaken Souls", logic.action.can_watch(Channel.sinister_signal))
+        rule_collector.set_location_rule("Secret: Annoy the Moon Man", logic.shipping.can_use_shipping_bin & logic.time.has_lived_months(6))
+        rule_collector.set_location_rule("Secret: Strange Sighting", logic.region.can_reach_all(Region.bus_stop, Region.town) & logic.time.has_lived_months(6))
+        rule_collector.set_location_rule("Secret: Sea Monster Sighting", logic.region.can_reach(Region.beach) & logic.time.has_lived_months(2))
+        rule_collector.set_location_rule("Secret: ...Bigfoot?",
+                                         logic.region.can_reach_all(Region.forest, Region.town, Region.secret_woods) & logic.time.has_lived_months(4))
+        rule_collector.set_location_rule("Secret: 'Me me me me me me me me me me me me me me me me'",
+                                         logic.region.can_reach(Region.railroad) & logic.tool.has_scythe())
+        rule_collector.set_location_rule("Secret: Secret Iridium Stackmaster Trophy", logic.grind.can_grind_item(10000, Material.wood))
+
+    if SecretsanityOptionName.secret_notes in world_options.secretsanity:
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_1)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_2)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_3)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_4)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_5)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_6)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_7)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_8)
+        set_secret_note_gift_rule(logic, rule_collector, SecretNote.note_9)
+        rule_collector.set_location_rule(SecretNote.note_10, logic.registry.quest_rules[Quest.cryptic_note])
+        rule_collector.set_location_rule(SecretNote.note_11, logic.relationship.can_meet_all(NPC.marnie, NPC.jas, ))
+        rule_collector.set_location_rule(SecretNote.note_12, logic.region.can_reach(Region.town))
+        rule_collector.set_location_rule(SecretNote.note_13, logic.time.has_lived_months(1) & logic.region.can_reach(Region.town))
+        rule_collector.set_location_rule(SecretNote.note_14, logic.region.can_reach(Region.town) & logic.season.has(Season.spring))
+        rule_collector.set_location_rule(SecretNote.note_15, logic.region.can_reach(LogicRegion.night_market))
+        rule_collector.set_location_rule(SecretNote.note_16, logic.tool.can_use_tool_at(Tool.hoe, ToolMaterial.basic, Region.railroad))
+        rule_collector.set_location_rule(SecretNote.note_17, logic.tool.can_use_tool_at(Tool.hoe, ToolMaterial.basic, Region.town))
+        rule_collector.set_location_rule(SecretNote.note_18, logic.tool.can_use_tool_at(Tool.hoe, ToolMaterial.basic, Region.desert))
+        rule_collector.set_location_rule(SecretNote.note_19_part_1, logic.region.can_reach(Region.town))
+        rule_collector.set_location_rule(SecretNote.note_19_part_2, logic.region.can_reach(Region.town) & logic.has(SpecialItem.solid_gold_lewis))
+        rule_collector.set_location_rule(SecretNote.note_20, logic.region.can_reach(Region.town) & logic.has(AnimalProduct.rabbit_foot))
+        rule_collector.set_location_rule(SecretNote.note_21, logic.region.can_reach(Region.town))
+        rule_collector.set_location_rule(SecretNote.note_22, logic.registry.quest_rules[Quest.the_mysterious_qi])
+        rule_collector.set_location_rule(SecretNote.note_23, logic.registry.quest_rules[Quest.strange_note])
+        rule_collector.set_location_rule(SecretNote.note_24,
+                                         logic.building.has_wizard_building(WizardBuilding.junimo_hut) & logic.has(Mineral.any_gem)
+                                         & logic.season.has_any_not_winter())
+        rule_collector.set_location_rule(SecretNote.note_25, logic.season.has_any_not_winter() & logic.fishing.can_fish_at(Region.railroad)
+                                         & logic.relationship.can_meet_any(NPC.abigail, NPC.caroline, ))
+        rule_collector.set_location_rule(SecretNote.note_26,
+                                         logic.building.has_wizard_building(WizardBuilding.junimo_hut) & logic.has(ArtisanGood.raisins)
+                                         & logic.season.has_any_not_winter())
+        rule_collector.set_location_rule(SecretNote.note_27, logic.region.can_reach(Region.mastery_cave))
+
+
+def set_secret_note_gift_rule(logic: StardewLogic, rule_collector: StardewRuleCollector, secret_note_location: str) -> None:
+    rule_collector.set_location_rule(secret_note_location, logic.gifts.can_fulfill(gift_requirements[secret_note_location]))
+
+
+def set_hatsanity_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    hatsanity = content.features.hatsanity
+
+    for hat in content.hats.values():
+        if not hatsanity.is_included(hat):
+            continue
+
+        rule_collector.set_location_rule(hatsanity.to_location_name(hat), logic.hat.can_wear(hat))
+
+
+def set_eatsanity_rules(all_location_names: Set[str], logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
+    if world_options.eatsanity == Eatsanity.preset_none:
+        return
+    for eat_location in locations.locations_by_tag[LocationTags.EATSANITY]:
+        if eat_location.name not in all_location_names:
+            continue
+        eat_prefix = "Eat "
+        drink_prefix = "Drink "
+        if eat_location.name.startswith(eat_prefix):
+            item_name = eat_location.name[len(eat_prefix):]
+        elif eat_location.name.startswith(drink_prefix):
+            item_name = eat_location.name[len(drink_prefix):]
+        else:
+            raise Exception(f"Eatsanity Location does not have a recognized prefix: '{eat_location.name}'")
+        rule_collector.set_location_rule(eat_location.name, logic.has(item_name))
+
+
+def set_endgame_locations_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, world_options: StardewValleyOptions):
+    if not world_options.include_endgame_locations:
+        return
+
+    rule_collector.set_location_rule("Earth Obelisk Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.earth_obelisk))
+    rule_collector.set_location_rule("Water Obelisk Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.water_obelisk))
+    rule_collector.set_location_rule("Desert Obelisk Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.desert_obelisk))
+    rule_collector.set_location_rule("Junimo Hut Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.junimo_hut))
+    rule_collector.set_location_rule("Gold Clock Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.gold_clock))
+    rule_collector.set_location_rule("Purchase Return Scepter", logic.money.can_spend_at(Region.sewer, 2_000_000))
+    rule_collector.set_location_rule("Pam House Blueprint",
+                                     logic.money.can_spend_at(Region.carpenter, 500_000) & logic.grind.can_grind_item(950, Material.wood))
+    rule_collector.set_location_rule("Forest To Beach Shortcut Blueprint", logic.money.can_spend_at(Region.carpenter, 75_000))
+    rule_collector.set_location_rule("Mountain Shortcuts Blueprint", logic.money.can_spend_at(Region.carpenter, 75_000))
+    rule_collector.set_location_rule("Town To Tide Pools Shortcut Blueprint", logic.money.can_spend_at(Region.carpenter, 75_000))
+    rule_collector.set_location_rule("Tunnel To Backwoods Shortcut Blueprint", logic.money.can_spend_at(Region.carpenter, 75_000))
+    rule_collector.set_location_rule("Purchase Statue Of Endless Fortune", logic.can_purchase_statue_of_endless_fortune())
+    rule_collector.set_location_rule("Purchase Catalogue", logic.money.can_spend_at(Region.pierre_store, 30_000))
+    rule_collector.set_location_rule("Purchase Furniture Catalogue", logic.money.can_spend_at(Region.carpenter, 200_000))
+    rule_collector.set_location_rule("Purchase Joja Furniture Catalogue",
+                                     logic.action.can_speak_junimo() & logic.money.can_spend_at(Region.movie_theater, 25_000))
+    rule_collector.set_location_rule("Purchase Junimo Catalogue",
+                                     logic.action.can_speak_junimo() & logic.money.can_spend_at(LogicRegion.traveling_cart, 70_000))
+    rule_collector.set_location_rule("Purchase Retro Catalogue", logic.money.can_spend_at(LogicRegion.traveling_cart, 110_000))
+    # rule_collector.set_location_rule( "Find Trash Catalogue", logic) # No need, the region is enough
+    rule_collector.set_location_rule("Purchase Wizard Catalogue", logic.money.can_spend_at(Region.sewer, 150_000))
+    rule_collector.set_location_rule("Purchase Tea Set", logic.money.can_spend_at(LogicRegion.traveling_cart, 1_000_000) & logic.time.has_lived_max_months)
+    if world_options.friendsanity == Friendsanity.option_all_with_marriage:
+        rule_collector.set_location_rule("Purchase Abigail Portrait", logic.relationship.can_purchase_portrait(NPC.abigail))
+        rule_collector.set_location_rule("Purchase Alex Portrait", logic.relationship.can_purchase_portrait(NPC.alex))
+        rule_collector.set_location_rule("Purchase Elliott Portrait", logic.relationship.can_purchase_portrait(NPC.elliott))
+        rule_collector.set_location_rule("Purchase Emily Portrait", logic.relationship.can_purchase_portrait(NPC.emily))
+        rule_collector.set_location_rule("Purchase Haley Portrait", logic.relationship.can_purchase_portrait(NPC.haley))
+        rule_collector.set_location_rule("Purchase Harvey Portrait", logic.relationship.can_purchase_portrait(NPC.harvey))
+        rule_collector.set_location_rule("Purchase Krobus Portrait", logic.relationship.can_purchase_portrait(NPC.krobus))
+        rule_collector.set_location_rule("Purchase Leah Portrait", logic.relationship.can_purchase_portrait(NPC.leah))
+        rule_collector.set_location_rule("Purchase Maru Portrait", logic.relationship.can_purchase_portrait(NPC.maru))
+        rule_collector.set_location_rule("Purchase Penny Portrait", logic.relationship.can_purchase_portrait(NPC.penny))
+        rule_collector.set_location_rule("Purchase Sam Portrait", logic.relationship.can_purchase_portrait(NPC.sam))
+        rule_collector.set_location_rule("Purchase Sebastian Portrait", logic.relationship.can_purchase_portrait(NPC.sebastian))
+        rule_collector.set_location_rule("Purchase Shane Portrait", logic.relationship.can_purchase_portrait(NPC.shane))
+    elif world_options.friendsanity != Friendsanity.option_none:
+        rule_collector.set_location_rule("Purchase Spouse Portrait", logic.relationship.can_purchase_portrait())
+    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_false:
+        rule_collector.set_location_rule("Island Obelisk Blueprint", logic.building.can_purchase_wizard_blueprint(WizardBuilding.island_obelisk))
+        if world_options.special_order_locations & SpecialOrderLocations.value_qi:
+            rule_collector.set_location_rule("Purchase Horse Flute", logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 50))
+            rule_collector.set_location_rule("Purchase Pierre's Missing Stocklist", logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 50))
+            rule_collector.set_location_rule("Purchase Key To The Town", logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 20))
+            rule_collector.set_location_rule("Purchase Mini-Shipping Bin", logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 60))
+            rule_collector.set_location_rule("Purchase Exotic Double Bed", logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 50))
+            rule_collector.set_location_rule("Purchase Golden Egg", logic.received(AnimalProduct.golden_egg) & logic.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 100))
+
+
+def set_friendsanity_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
     if not content.features.friendsanity.is_enabled:
         return
-    set_rule(multiworld.get_location("Spouse Stardrop", player),
-             logic.relationship.has_hearts_with_any_bachelor(13) & logic.relationship.can_get_married())
-    set_rule(multiworld.get_location("Have a Baby", player),
-             logic.relationship.can_reproduce(1))
-    set_rule(multiworld.get_location("Have Another Baby", player),
-             logic.relationship.can_reproduce(2))
+    rule_collector.set_location_rule("Spouse Stardrop", logic.relationship.has_hearts_with_any_bachelor(13))
+    rule_collector.set_location_rule("Have a Baby", logic.relationship.can_reproduce(1))
+    rule_collector.set_location_rule("Have Another Baby", logic.relationship.can_reproduce(2))
 
     for villager in content.villagers.values():
         for heart in content.features.friendsanity.get_randomized_hearts(villager):
             rule = logic.relationship.can_earn_relationship(villager.name, heart)
             location_name = friendsanity.to_location_name(villager.name, heart)
-            set_rule(multiworld.get_location(location_name, player), rule)
+            rule_collector.set_location_rule(location_name, rule)
 
     for heart in content.features.friendsanity.get_pet_randomized_hearts():
         rule = logic.pet.can_befriend_pet(heart)
         location_name = friendsanity.to_location_name(NPC.pet, heart)
-        set_rule(multiworld.get_location(location_name, player), rule)
+        rule_collector.set_location_rule(location_name, rule)
 
 
-def set_deepwoods_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if ModNames.deepwoods in world_options.mods:
-        set_rule(multiworld.get_location("Breaking Up Deep Woods Gingerbread House", player),
-                 logic.tool.has_tool(Tool.axe, "Gold"))
-        set_rule(multiworld.get_location("Chop Down a Deep Woods Iridium Tree", player),
-                 logic.tool.has_tool(Tool.axe, "Iridium"))
-        set_entrance_rule(multiworld, player, DeepWoodsEntrance.use_woods_obelisk, logic.received("Woods Obelisk"))
-        for depth in range(10, 100 + 10, 10):
-            set_entrance_rule(multiworld, player, move_to_woods_depth(depth), logic.mod.deepwoods.can_chop_to_depth(depth))
-        set_rule(multiworld.get_location("The Sword in the Stone", player),
-                 logic.mod.deepwoods.can_pull_sword() & logic.mod.deepwoods.can_chop_to_depth(100))
-
-
-def set_magic_spell_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if ModNames.magic not in world_options.mods:
+def set_deepwoods_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ModNames.deepwoods):
         return
 
-    set_rule(multiworld.get_location("Analyze: Clear Debris", player),
-             (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic")))
-    set_rule(multiworld.get_location("Analyze: Till", player),
-             logic.tool.has_tool("Hoe", "Basic"))
-    set_rule(multiworld.get_location("Analyze: Water", player),
-             logic.tool.has_tool("Watering Can", "Basic"))
-    set_rule(multiworld.get_location("Analyze All Toil School Locations", player),
-             (logic.tool.has_tool("Watering Can", "Basic") & logic.tool.has_tool("Hoe", "Basic")
-              & (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic"))))
+    rule_collector.set_location_rule("Breaking Up Deep Woods Gingerbread House", logic.tool.has_tool(Tool.axe, ToolMaterial.gold))
+    rule_collector.set_location_rule("Chop Down a Deep Woods Iridium Tree", logic.tool.has_tool(Tool.axe, ToolMaterial.iridium))
+    rule_collector.set_entrance_rule(DeepWoodsEntrance.use_woods_obelisk, logic.received("Woods Obelisk"))
+    for depth in range(10, 100 + 10, 10):
+        rule_collector.set_entrance_rule(move_to_woods_depth(depth), logic.mod.deepwoods.can_chop_to_depth(depth))
+    rule_collector.set_location_rule("The Sword in the Stone", logic.mod.deepwoods.can_pull_sword() & logic.mod.deepwoods.can_chop_to_depth(100))
+
+
+def set_magic_spell_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ModNames.magic):
+        return
+
+    rule_collector.set_location_rule("Analyze: Clear Debris", logic.tool.has_tool(Tool.axe) | logic.tool.has_tool(Tool.pickaxe))
+    rule_collector.set_location_rule("Analyze: Till", logic.tool.has_tool(Tool.hoe))
+    rule_collector.set_location_rule("Analyze: Water", logic.tool.has_tool(Tool.watering_can))
+    rule_collector.set_location_rule("Analyze All Toil School Locations",
+                                     logic.tool.has_tool(Tool.watering_can)
+                                     & logic.tool.has_tool(Tool.hoe)
+                                     & (logic.tool.has_tool(Tool.axe) | logic.tool.has_tool(Tool.pickaxe)))
     # Do I *want* to add boots into logic when you get them even in vanilla without effort?  idk
-    set_rule(multiworld.get_location("Analyze: Evac", player),
-             logic.ability.can_mine_perfectly())
-    set_rule(multiworld.get_location("Analyze: Haste", player),
-             logic.has("Coffee"))
-    set_rule(multiworld.get_location("Analyze: Heal", player),
-             logic.has("Life Elixir"))
-    set_rule(multiworld.get_location("Analyze All Life School Locations", player),
-             (logic.has("Coffee") & logic.has("Life Elixir")
-              & logic.ability.can_mine_perfectly()))
-    set_rule(multiworld.get_location("Analyze: Descend", player),
-             logic.region.can_reach(Region.mines))
-    set_rule(multiworld.get_location("Analyze: Fireball", player),
-             logic.has("Fire Quartz"))
-    set_rule(multiworld.get_location("Analyze: Frostbolt", player),
-             logic.region.can_reach(Region.mines_floor_60) & logic.fishing.can_fish(85))
-    set_rule(multiworld.get_location("Analyze All Elemental School Locations", player),
-             logic.has("Fire Quartz") & logic.region.can_reach(Region.mines_floor_60) & logic.fishing.can_fish(85))
-    # set_rule(multiworld.get_location("Analyze: Lantern", player),)
-    set_rule(multiworld.get_location("Analyze: Tendrils", player),
-             logic.region.can_reach(Region.farm))
-    set_rule(multiworld.get_location("Analyze: Shockwave", player),
-             logic.has("Earth Crystal"))
-    set_rule(multiworld.get_location("Analyze All Nature School Locations", player),
-             (logic.has("Earth Crystal") & logic.region.can_reach("Farm"))),
-    set_rule(multiworld.get_location("Analyze: Meteor", player),
-             (logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12))),
-    set_rule(multiworld.get_location("Analyze: Lucksteal", player),
-             logic.region.can_reach(Region.witch_hut))
-    set_rule(multiworld.get_location("Analyze: Bloodmana", player),
-             logic.region.can_reach(Region.mines_floor_100))
-    set_rule(multiworld.get_location("Analyze All Eldritch School Locations", player),
-             (logic.region.can_reach(Region.witch_hut) &
-              logic.region.can_reach(Region.mines_floor_100) &
-              logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12)))
-    set_rule(multiworld.get_location("Analyze Every Magic School Location", player),
-             (logic.tool.has_tool("Watering Can", "Basic") & logic.tool.has_tool("Hoe", "Basic")
-              & (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic")) &
-              logic.has("Coffee") & logic.has("Life Elixir")
-              & logic.ability.can_mine_perfectly() & logic.has("Earth Crystal") &
-              logic.has("Fire Quartz") & logic.fishing.can_fish(85) &
-              logic.region.can_reach(Region.witch_hut) &
-              logic.region.can_reach(Region.mines_floor_100) &
-              logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12)))
+    rule_collector.set_location_rule("Analyze: Evac", logic.ability.can_mine_perfectly())
+    rule_collector.set_location_rule("Analyze: Haste", logic.has("Coffee"))
+    rule_collector.set_location_rule("Analyze: Heal", logic.has("Life Elixir"))
+    rule_collector.set_location_rule("Analyze All Life School Locations",
+                                     logic.has_all("Coffee", "Life Elixir") & logic.ability.can_mine_perfectly())
+    rule_collector.set_location_rule("Analyze: Descend", logic.region.can_reach(Region.mines))
+    rule_collector.set_location_rule("Analyze: Fireball", logic.has("Fire Quartz"))
+    rule_collector.set_location_rule("Analyze: Frostbolt", logic.region.can_reach(Region.mines_floor_60) & logic.fishing.can_fish(85))
+    rule_collector.set_location_rule("Analyze All Elemental School Locations",
+                                     logic.has("Fire Quartz") & logic.region.can_reach(Region.mines_floor_60) & logic.fishing.can_fish(85))
+    # rule_collector.set_location_rule( "Analyze: Lantern", player),)
+    rule_collector.set_location_rule("Analyze: Tendrils", logic.region.can_reach(Region.farm))
+    rule_collector.set_location_rule("Analyze: Shockwave", logic.has("Earth Crystal"))
+    rule_collector.set_location_rule("Analyze All Nature School Locations", logic.has("Earth Crystal") & logic.region.can_reach("Farm")),
+    rule_collector.set_location_rule("Analyze: Meteor", logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12)),
+    rule_collector.set_location_rule("Analyze: Lucksteal", logic.region.can_reach(Region.witch_hut))
+    rule_collector.set_location_rule("Analyze: Bloodmana", logic.region.can_reach(Region.mines_floor_100))
+    rule_collector.set_location_rule("Analyze All Eldritch School Locations",
+                                     logic.region.can_reach_all(Region.witch_hut, Region.mines_floor_100, Region.farm) & logic.time.has_lived_months(12))
+    rule_collector.set_location_rule("Analyze Every Magic School Location",
+                                     logic.tool.has_tool(Tool.watering_can)
+                                     & logic.tool.has_tool(Tool.hoe)
+                                     & (logic.tool.has_tool(Tool.axe) | logic.tool.has_tool(Tool.pickaxe))
+                                     & logic.has_all("Coffee", "Life Elixir", "Earth Crystal", "Fire Quartz")
+                                     & logic.ability.can_mine_perfectly()
+                                     & logic.fishing.can_fish(85)
+                                     & logic.region.can_reach_all(Region.witch_hut, Region.mines_floor_100, Region.farm)
+                                     & logic.time.has_lived_months(12))
 
 
-def set_sve_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if ModNames.sve not in world_options.mods:
+def set_sve_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ModNames.sve):
         return
-    set_entrance_rule(multiworld, player, SVEEntrance.forest_to_lost_woods, logic.bundle.can_complete_community_center)
-    set_entrance_rule(multiworld, player, SVEEntrance.enter_summit, logic.mod.sve.has_iridium_bomb())
-    set_entrance_rule(multiworld, player, SVEEntrance.backwoods_to_grove, logic.mod.sve.has_any_rune())
-    set_entrance_rule(multiworld, player, SVEEntrance.badlands_to_cave, logic.has("Aegis Elixir") | logic.combat.can_fight_at_level(Performance.maximum))
-    set_entrance_rule(multiworld, player, SVEEntrance.forest_west_to_spring, logic.quest.can_complete_quest(Quest.magic_ink))
-    set_entrance_rule(multiworld, player, SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer))
-    set_entrance_rule(multiworld, player, SVEEntrance.secret_woods_to_west, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
-    set_entrance_rule(multiworld, player, SVEEntrance.grandpa_shed_to_interior, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
-    set_entrance_rule(multiworld, player, SVEEntrance.aurora_warp_to_aurora, logic.received(SVERunes.nexus_aurora))
-    set_entrance_rule(multiworld, player, SVEEntrance.farm_warp_to_farm, logic.received(SVERunes.nexus_farm))
-    set_entrance_rule(multiworld, player, SVEEntrance.guild_warp_to_guild, logic.received(SVERunes.nexus_guild))
-    set_entrance_rule(multiworld, player, SVEEntrance.junimo_warp_to_junimo, logic.received(SVERunes.nexus_junimo))
-    set_entrance_rule(multiworld, player, SVEEntrance.spring_warp_to_spring, logic.received(SVERunes.nexus_spring))
-    set_entrance_rule(multiworld, player, SVEEntrance.outpost_warp_to_outpost, logic.received(SVERunes.nexus_outpost))
-    set_entrance_rule(multiworld, player, SVEEntrance.wizard_warp_to_wizard, logic.received(SVERunes.nexus_wizard))
-    set_entrance_rule(multiworld, player, SVEEntrance.use_purple_junimo, logic.relationship.has_hearts(ModNPC.apples, 10))
-    set_entrance_rule(multiworld, player, SVEEntrance.grandpa_interior_to_upstairs, logic.mod.sve.has_grandpa_shed_repaired())
-    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())
+
+    rule_collector.set_entrance_rule(SVEEntrance.forest_to_lost_woods, logic.bundle.can_complete_community_center)
+    rule_collector.set_entrance_rule(SVEEntrance.enter_summit, logic.mod.sve.has_iridium_bomb())
+    rule_collector.set_entrance_rule(SVEEntrance.backwoods_to_grove, logic.mod.sve.has_any_rune())
+    rule_collector.set_entrance_rule(SVEEntrance.badlands_to_cave, logic.has("Aegis Elixir") | logic.combat.can_fight_at_level(Performance.maximum))
+    rule_collector.set_entrance_rule(SVEEntrance.forest_west_to_spring, logic.quest.can_complete_quest(Quest.magic_ink))
+    rule_collector.set_entrance_rule(SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer))
+    rule_collector.set_entrance_rule(SVEEntrance.secret_woods_to_west, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
+    rule_collector.set_entrance_rule(SVEEntrance.grandpa_shed_to_interior, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
+    rule_collector.set_entrance_rule(SVEEntrance.aurora_warp_to_aurora, logic.received(SVERunes.nexus_aurora))
+    rule_collector.set_entrance_rule(SVEEntrance.farm_warp_to_farm, logic.received(SVERunes.nexus_farm))
+    rule_collector.set_entrance_rule(SVEEntrance.guild_warp_to_guild, logic.received(SVERunes.nexus_guild))
+    rule_collector.set_entrance_rule(SVEEntrance.junimo_warp_to_junimo, logic.received(SVERunes.nexus_junimo))
+    rule_collector.set_entrance_rule(SVEEntrance.spring_warp_to_spring, logic.received(SVERunes.nexus_spring))
+    rule_collector.set_entrance_rule(SVEEntrance.outpost_warp_to_outpost, logic.received(SVERunes.nexus_outpost))
+    rule_collector.set_entrance_rule(SVEEntrance.wizard_warp_to_wizard, logic.received(SVERunes.nexus_wizard))
+    rule_collector.set_entrance_rule(SVEEntrance.use_purple_junimo, logic.relationship.has_hearts(ModNPC.apples, 10))
+    rule_collector.set_entrance_rule(SVEEntrance.grandpa_interior_to_upstairs, logic.mod.sve.has_grandpa_shed_repaired())
+    rule_collector.set_entrance_rule(SVEEntrance.use_bear_shop, (logic.mod.sve.can_buy_bear_recipe()))
+    rule_collector.set_entrance_rule(SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer))
+    rule_collector.set_entrance_rule(SVEEntrance.museum_to_gunther_bedroom, logic.relationship.has_hearts(ModNPC.gunther, 2))
+    rule_collector.set_entrance_rule(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:
-        set_rule(multiworld.get_location(location, player),
-                 logic.registry.sve_location_rules[location])
-    set_sve_ginger_island_rules(logic, multiworld, player, world_options)
-    set_boarding_house_rules(logic, multiworld, player, world_options)
+        rule_collector.set_location_rule(location, logic.registry.sve_location_rules[location])
+    set_sve_ginger_island_rules(logic, rule_collector, content)
+    set_boarding_house_rules(logic, rule_collector, content)
 
 
-def set_sve_ginger_island_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+def set_sve_ginger_island_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ginger_island_content_pack):
         return
-    set_entrance_rule(multiworld, player, SVEEntrance.summit_to_highlands, logic.mod.sve.has_marlon_boat())
-    set_entrance_rule(multiworld, player, SVEEntrance.wizard_to_fable_reef, logic.received(SVEQuestItem.fable_reef_portal))
-    set_entrance_rule(multiworld, player, SVEEntrance.highlands_to_cave,
-                      logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron) & logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
-    set_entrance_rule(multiworld, player, SVEEntrance.highlands_to_pond, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
+    rule_collector.set_entrance_rule(SVEEntrance.summit_to_highlands, logic.mod.sve.has_marlon_boat())
+    rule_collector.set_entrance_rule(SVEEntrance.wizard_to_fable_reef, logic.received(SVEQuestItem.fable_reef_portal))
+    rule_collector.set_entrance_rule(SVEEntrance.highlands_to_cave,
+                                     logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron) & logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
+    rule_collector.set_entrance_rule(SVEEntrance.highlands_to_pond, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
 
 
-def set_boarding_house_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    if ModNames.boarding_house not in world_options.mods:
+def set_boarding_house_rules(logic: StardewLogic, rule_collector: StardewRuleCollector, content: StardewContent):
+    if not content.is_enabled(ModNames.boarding_house):
         return
-    set_entrance_rule(multiworld, player, BoardingHouseEntrance.the_lost_valley_to_lost_valley_ruins, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
-
-
-def set_entrance_rule(multiworld, player, entrance: str, rule: StardewRule):
-    try:
-        potentially_required_regions = look_for_indirect_connection(rule)
-        if potentially_required_regions:
-            for region in potentially_required_regions:
-                logger.debug(f"Registering indirect condition for {region} -> {entrance}")
-                multiworld.register_indirect_condition(multiworld.get_region(region, player), multiworld.get_entrance(entrance, player))
-
-        set_rule(multiworld.get_entrance(entrance, player), rule)
-    except KeyError as ex:
-        logger.error(f"""Failed to evaluate indirect connection in: {explain(rule, CollectionState(multiworld))}""")
-        raise ex
-
-
-def set_island_entrance_rule(multiworld, player, entrance: str, rule: StardewRule, world_options: StardewValleyOptions):
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-        return
-    set_entrance_rule(multiworld, player, entrance, rule)
-
-
-def set_many_island_entrances_rules(multiworld, player, entrance_rules: Dict[str, StardewRule], world_options: StardewValleyOptions):
-    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
-        return
-    for entrance, rule in entrance_rules.items():
-        set_entrance_rule(multiworld, player, entrance, rule)
+    rule_collector.set_entrance_rule(BoardingHouseEntrance.the_lost_valley_to_lost_valley_ruins, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
diff --git a/worlds/stardew_valley/scripts/export_locations.py b/worlds/stardew_valley/scripts/export_locations.py
index c181faec7b..ce38274d8a 100644
--- a/worlds/stardew_valley/scripts/export_locations.py
+++ b/worlds/stardew_valley/scripts/export_locations.py
@@ -17,14 +17,16 @@ if __name__ == "__main__":
     with open("output/stardew_valley_location_table.json", "w+") as f:
         locations = {
             "Cheat Console":
-                {"code": -1, "region": "Archipelago"},
+                {"code": -1, "region": "Archipelago", "tags": [], "content_packs": []},
             "Server":
-                {"code": -2, "region": "Archipelago"}
+                {"code": -2, "region": "Archipelago", "tags": [], "content_packs": []}
         }
         locations.update({
             location.name: {
                 "code": location.code,
                 "region": location.region,
+                "tags": sorted([tag.name for tag in location.tags]),
+                "content_packs": sorted([pack for pack in location.content_packs]),
             }
             for location in location_table.values()
             if location.code is not None
diff --git a/worlds/stardew_valley/scripts/update_data.py b/worlds/stardew_valley/scripts/update_data.py
deleted file mode 100644
index 5c2e6a57a4..0000000000
--- a/worlds/stardew_valley/scripts/update_data.py
+++ /dev/null
@@ -1,89 +0,0 @@
-"""Update data script
-This script can be used to assign new ids for the items and locations in the CSV file. It also regenerates the items
-based on the resource packs.
-
-To run the script, use `python -m worlds.stardew_valley.scripts.update_data` from the repository root.
-"""
-
-import csv
-import itertools
-from pathlib import Path
-from typing import List
-
-from worlds.stardew_valley import LocationData
-from worlds.stardew_valley.items import load_item_csv, Group, ItemData
-from worlds.stardew_valley.locations import load_location_csv
-
-RESOURCE_PACK_CODE_OFFSET = 5000
-script_folder = Path(__file__)
-
-
-def write_item_csv(items: List[ItemData]):
-    with open((script_folder.parent.parent / "data/items.csv").resolve(), "w", newline="") as file:
-        writer = csv.DictWriter(file, ["id", "name", "classification", "groups"])
-        writer.writeheader()
-        for item in items:
-            item_dict = {
-                "id": item.code_without_offset,
-                "name": item.name,
-                "classification": item.classification.name,
-                "groups": ",".join(sorted(group.name for group in item.groups))
-            }
-            writer.writerow(item_dict)
-
-
-def write_location_csv(locations: List[LocationData]):
-    with open((script_folder.parent.parent / "data/locations.csv").resolve(), "w", newline="") as file:
-        write = csv.DictWriter(file, ["id", "region", "name", "tags", "mod_name"])
-        write.writeheader()
-        for location in locations:
-            location_dict = {
-                "id": location.code_without_offset,
-                "name": location.name,
-                "region": location.region,
-                "tags": ",".join(sorted(group.name for group in location.tags)),
-                "mod_name": location.mod_name
-            }
-            write.writerow(location_dict)
-
-
-if __name__ == "__main__":
-    loaded_items = load_item_csv()
-
-    item_counter = itertools.count(max(item.code_without_offset
-                                       for item in loaded_items
-                                       if Group.RESOURCE_PACK not in item.groups
-                                       and item.code_without_offset is not None) + 1)
-
-    resource_pack_counter = itertools.count(max(item.code_without_offset
-                                                for item in loaded_items
-                                                if Group.RESOURCE_PACK in item.groups
-                                                and item.code_without_offset is not None) + 1)
-    items_to_write = []
-    for item in loaded_items:
-        if item.code_without_offset is None:
-            if Group.RESOURCE_PACK in item.groups:
-                new_code = next(resource_pack_counter)
-            else:
-                new_code = next(item_counter)
-            items_to_write.append(ItemData(new_code, item.name, item.classification, item.groups))
-            continue
-
-        items_to_write.append(item)
-
-    write_item_csv(items_to_write)
-
-    loaded_locations = load_location_csv()
-    location_counter = itertools.count(max(location.code_without_offset
-                                           for location in loaded_locations
-                                           if location.code_without_offset is not None) + 1)
-    locations_to_write = []
-    for location in loaded_locations:
-        if location.code_without_offset is None:
-            locations_to_write.append(
-                LocationData(next(location_counter), location.region, location.name, location.mod_name, location.tags))
-            continue
-
-        locations_to_write.append(location)
-
-    write_location_csv(locations_to_write)
diff --git a/worlds/stardew_valley/stardew.ico b/worlds/stardew_valley/stardew.ico
new file mode 100644
index 0000000000..2a6c6a3beb
Binary files /dev/null and b/worlds/stardew_valley/stardew.ico differ
diff --git a/worlds/stardew_valley/stardew.png b/worlds/stardew_valley/stardew.png
new file mode 100644
index 0000000000..8ec396836f
Binary files /dev/null and b/worlds/stardew_valley/stardew.png differ
diff --git a/worlds/stardew_valley/stardew_rule/base.py b/worlds/stardew_valley/stardew_rule/base.py
index ff1fbba376..beb946a05c 100644
--- a/worlds/stardew_valley/stardew_rule/base.py
+++ b/worlds/stardew_valley/stardew_rule/base.py
@@ -251,10 +251,13 @@ class AggregatingStardewRule(BaseStardewRule, ABC):
 
             # If the queue is None, it means we have not start simplifying. Otherwise, we will continue simplification where we left.
             if local_state.rules_to_simplify is None:
-                rules_to_simplify = frozenset(local_state.original_simplifiable_rules)
-                if self.complement in rules_to_simplify:
-                    return self.short_circuit_simplification()
-                local_state.rules_to_simplify = deque(rules_to_simplify)
+                try:
+                    rules_to_simplify = frozenset(local_state.original_simplifiable_rules)
+                    if self.complement in rules_to_simplify:
+                        return self.short_circuit_simplification()
+                    local_state.rules_to_simplify = deque(rules_to_simplify)
+                except Exception as err:
+                    assert False, err
 
             # Start simplification where we left.
             while local_state.rules_to_simplify:
@@ -432,8 +435,17 @@ class Count(BaseStardewRule):
     def rules_count(self):
         return len(self.rules)
 
+    def __str__(self):
+        if all(value == 1 for value in self.counter.values()):
+            return f"Has {self.count} of [{', '.join(str(rule) for rule in self.counter.keys())}]"
+
+        return f"Has {self.count} of [{', '.join(f'{value}x {str(rule)}' for rule, value in self.counter.items())}]"
+
     def __repr__(self):
-        return f"Received {self.count} [{', '.join(f'{value}x {repr(rule)}' for rule, value in self.counter.items())}]"
+        if all(value == 1 for value in self.counter.values()):
+            return f"Has {self.count} of [{', '.join(repr(rule) for rule in self.counter.keys())}]"
+
+        return f"Has {self.count} of [{', '.join(f'{value}x {repr(rule)}' for rule, value in self.counter.items())}]"
 
 
 @dataclass(frozen=True)
diff --git a/worlds/stardew_valley/stardew_rule/indirect_connection.py b/worlds/stardew_valley/stardew_rule/indirect_connection.py
index 17433f7df4..03dcb1f9a9 100644
--- a/worlds/stardew_valley/stardew_rule/indirect_connection.py
+++ b/worlds/stardew_valley/stardew_rule/indirect_connection.py
@@ -3,6 +3,8 @@ from typing import Set
 
 from . import StardewRule, Reach, Count, AggregatingStardewRule, Has
 
+MAX_DEPTH = 100
+
 
 def look_for_indirect_connection(rule: StardewRule) -> Set[str]:
     required_regions = set()
@@ -17,27 +19,27 @@ def _find(rule: StardewRule, regions: Set[str], depth: int):
 
 @_find.register
 def _(rule: AggregatingStardewRule, regions: Set[str], depth: int):
-    assert depth < 50, "Recursion depth exceeded"
+    assert depth < MAX_DEPTH, "Recursion depth exceeded"
     for r in rule.original_rules:
         _find(r, regions, depth + 1)
 
 
 @_find.register
 def _(rule: Count, regions: Set[str], depth: int):
-    assert depth < 50, "Recursion depth exceeded"
+    assert depth < MAX_DEPTH, "Recursion depth exceeded"
     for r in rule.rules:
         _find(r, regions, depth + 1)
 
 
 @_find.register
 def _(rule: Has, regions: Set[str], depth: int):
-    assert depth < 50, f"Recursion depth exceeded on {rule.item}"
+    assert depth < MAX_DEPTH, f"Recursion depth exceeded on {rule.item}"
     r = rule.other_rules[rule.item]
     _find(r, regions, depth + 1)
 
 
 @_find.register
 def _(rule: Reach, regions: Set[str], depth: int):
-    assert depth < 50, "Recursion depth exceeded"
+    assert depth < MAX_DEPTH, "Recursion depth exceeded"
     if rule.resolution_hint == "Region":
         regions.add(rule.spot)
diff --git a/worlds/stardew_valley/stardew_rule/rule_explain.py b/worlds/stardew_valley/stardew_rule/rule_explain.py
index 2e2b9c959d..8361c3c114 100644
--- a/worlds/stardew_valley/stardew_rule/rule_explain.py
+++ b/worlds/stardew_valley/stardew_rule/rule_explain.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import enum
 from dataclasses import dataclass, field
 from functools import cached_property, singledispatch
 from typing import Iterable, Set, Tuple, List, Optional
@@ -9,12 +10,46 @@ from worlds.generic.Rules import CollectionRule
 from . import StardewRule, AggregatingStardewRule, Count, Has, TotalReceived, Received, Reach, true_
 
 
+class ExplainMode(enum.Enum):
+    VERBOSE = enum.auto()
+    CLIENT = enum.auto()
+
+
+@dataclass
+class MoreExplanation:
+    rule: StardewRule
+    state: CollectionState
+    more_index: int
+    mode: ExplainMode
+
+    @cached_property
+    def result(self) -> bool:
+        try:
+            return self.rule(self.state)
+        except KeyError:
+            return False
+
+    def summary(self, depth=0) -> str:
+        if self.mode is ExplainMode.CLIENT:
+            depth *= 2
+
+        line = "  " * depth + f"{str(self.rule)} -> {self.result}"
+        line += f" [use `/more {self.more_index}` to explain]"
+
+        return line
+
+    def __str__(self, depth=0):
+        return self.summary(depth)
+
+
 @dataclass
 class RuleExplanation:
     rule: StardewRule
     state: CollectionState = field(repr=False, hash=False)
-    expected: bool
+    expected: bool | None
+    mode: ExplainMode
     sub_rules: Iterable[StardewRule] = field(default_factory=list)
+    more_explanations: List[StardewRule] = field(default_factory=list, repr=False, hash=False)
     explored_rules_key: Set[Tuple[str, str]] = field(default_factory=set, repr=False, hash=False)
     current_rule_explored: bool = False
 
@@ -25,19 +60,25 @@ class RuleExplanation:
             self.sub_rules = []
 
     def summary(self, depth=0) -> str:
-        summary = "  " * depth + f"{str(self.rule)} -> {self.result}"
+        if self.mode is ExplainMode.CLIENT:
+            depth *= 2
+
+        line = "  " * depth + f"{str(self.rule)} -> {self.result}"
         if self.current_rule_explored:
-            summary += " [Already explained]"
-        return summary
+            line += " [Already explained]"
+
+        return line
 
     def __str__(self, depth=0):
         if not self.sub_rules:
             return self.summary(depth)
 
-        return self.summary(depth) + "\n" + "\n".join(i.__str__(depth + 1)
-                                                      if i.result is not self.expected else i.summary(depth + 1)
+        return self.summary(depth) + "\n" + "\n".join(i.__str__(depth + 1) if self.expected is None or i.result is not self.expected else i.summary(depth + 1)
                                                       for i in sorted(self.explained_sub_rules, key=lambda x: x.result))
 
+    def more(self, more_index: int) -> RuleExplanation:
+        return explain(self.more_explanations[more_index], self.state, self.expected, self.mode)
+
     @cached_property
     def result(self) -> bool:
         try:
@@ -51,7 +92,21 @@ class RuleExplanation:
         if rule_key is not None:
             self.explored_rules_key.add(rule_key)
 
-        return [_explain(i, self.state, self.expected, self.explored_rules_key) for i in self.sub_rules]
+        if self.mode == ExplainMode.CLIENT:
+            sub_explanations = []
+            for sub_rule in self.sub_rules:
+                if isinstance(sub_rule, Reach) and sub_rule.resolution_hint == 'Entrance':
+                    sub_explanations.append(MoreExplanation(sub_rule, self.state, len(self.more_explanations), self.mode))
+                    self.more_explanations.append(sub_rule)
+                elif isinstance(sub_rule, Reach) and sub_rule.resolution_hint == 'Location':
+                    sub_explanations.append(MoreExplanation(sub_rule, self.state, len(self.more_explanations), self.mode))
+                    self.more_explanations.append(sub_rule)
+                else:
+                    sub_explanations.append(_explain(sub_rule, self.state, self.expected, self.mode, self.more_explanations, self.explored_rules_key))
+
+            return sub_explanations
+
+        return [_explain(sub_rule, self.state, self.expected, self.mode, self.more_explanations, self.explored_rules_key) for sub_rule in self.sub_rules]
 
 
 @dataclass
@@ -60,9 +115,13 @@ class CountSubRuleExplanation(RuleExplanation):
 
     @staticmethod
     def from_explanation(expl: RuleExplanation, count: int) -> CountSubRuleExplanation:
-        return CountSubRuleExplanation(expl.rule, expl.state, expl.expected, expl.sub_rules, expl.explored_rules_key, expl.current_rule_explored, count)
+        return CountSubRuleExplanation(expl.rule, expl.state, expl.expected, expl.mode, expl.sub_rules, more_explanations=expl.more_explanations,
+                                       explored_rules_key=expl.explored_rules_key, current_rule_explored=expl.current_rule_explored, count=count)
 
     def summary(self, depth=0) -> str:
+        if self.mode is ExplainMode.CLIENT:
+            depth *= 2
+
         summary = "  " * depth + f"{self.count}x {str(self.rule)} -> {self.result}"
         if self.current_rule_explored:
             summary += " [Already explained]"
@@ -75,49 +134,61 @@ class CountExplanation(RuleExplanation):
 
     @cached_property
     def explained_sub_rules(self) -> List[RuleExplanation]:
+        if all(value == 1 for value in self.rule.counter.values()):
+            return super().explained_sub_rules
+
         return [
-            CountSubRuleExplanation.from_explanation(_explain(rule, self.state, self.expected, self.explored_rules_key), count)
+            CountSubRuleExplanation.from_explanation(_explain(rule, self.state, self.expected, self.mode, self.more_explanations, self.explored_rules_key),
+                                                     count)
             for rule, count in self.rule.counter.items()
         ]
 
 
-def explain(rule: CollectionRule, state: CollectionState, expected: bool = True) -> RuleExplanation:
+def explain(rule: CollectionRule, state: CollectionState, expected: bool | None = True, mode: ExplainMode = ExplainMode.VERBOSE) -> RuleExplanation:
     if isinstance(rule, StardewRule):
-        return _explain(rule, state, expected, explored_spots=set())
+        return _explain(rule, state, expected, mode, more_explanations=list(), explored_spots=set())
     else:
         return f"Value of rule {str(rule)} was not {str(expected)} in {str(state)}"  # noqa
 
 
 @singledispatch
-def _explain(rule: StardewRule, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
-    return RuleExplanation(rule, state, expected, explored_rules_key=explored_spots)
+def _explain(rule: StardewRule, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+             explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+    return RuleExplanation(rule, state, expected, mode, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: AggregatingStardewRule, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
-    return RuleExplanation(rule, state, expected, rule.original_rules, explored_rules_key=explored_spots)
+def _(rule: AggregatingStardewRule, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+    return RuleExplanation(rule, state, expected, mode, rule.original_rules, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: Count, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
-    return CountExplanation(rule, state, expected, rule.rules, explored_rules_key=explored_spots)
+def _(rule: Count, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+    return CountExplanation(rule, state, expected, mode, rule.rules, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: Has, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+def _(rule: Has, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
     try:
-        return RuleExplanation(rule, state, expected, [rule.other_rules[rule.item]], explored_rules_key=explored_spots)
+        return RuleExplanation(rule, state, expected, mode, [rule.other_rules[rule.item]], more_explanations=more_explanations,
+                               explored_rules_key=explored_spots)
     except KeyError:
-        return RuleExplanation(rule, state, expected, explored_rules_key=explored_spots)
+        return RuleExplanation(rule, state, expected, mode, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: TotalReceived, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
-    return RuleExplanation(rule, state, expected, [Received(i, rule.player, 1) for i in rule.items], explored_rules_key=explored_spots)
+def _(rule: TotalReceived, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+    return RuleExplanation(rule, state, expected, mode, [Received(i, rule.player, 1) for i in rule.items], more_explanations=more_explanations,
+                           explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: Reach, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+def _(rule: Reach, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
     access_rules = None
     if rule.resolution_hint == 'Location':
         spot = state.multiworld.get_location(rule.spot, rule.player)
@@ -135,6 +206,10 @@ def _(rule: Reach, state: CollectionState, expected: bool, explored_spots: Set[T
     elif rule.resolution_hint == 'Entrance':
         spot = state.multiworld.get_entrance(rule.spot, rule.player)
 
+        if isinstance(spot.access_rule, StardewRule):
+            if spot.access_rule is not true_:
+                access_rules = [spot.access_rule]
+
         if isinstance(spot.access_rule, StardewRule):
             if spot.access_rule is true_:
                 access_rules = [Reach(spot.parent_region.name, "Region", rule.player)]
@@ -149,13 +224,14 @@ def _(rule: Reach, state: CollectionState, expected: bool, explored_spots: Set[T
         access_rules = [*(Reach(e.name, "Entrance", rule.player) for e in spot.entrances)]
 
     if not access_rules:
-        return RuleExplanation(rule, state, expected, explored_rules_key=explored_spots)
+        return RuleExplanation(rule, state, expected, mode, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
-    return RuleExplanation(rule, state, expected, access_rules, explored_rules_key=explored_spots)
+    return RuleExplanation(rule, state, expected, mode, access_rules, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @_explain.register
-def _(rule: Received, state: CollectionState, expected: bool, explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
+def _(rule: Received, state: CollectionState, expected: bool | None, mode: ExplainMode, more_explanations: list[StardewRule],
+      explored_spots: Set[Tuple[str, str]]) -> RuleExplanation:
     access_rules = None
     if rule.event:
         try:
@@ -168,9 +244,9 @@ def _(rule: Received, state: CollectionState, expected: bool, explored_spots: Se
             pass
 
     if not access_rules:
-        return RuleExplanation(rule, state, expected, explored_rules_key=explored_spots)
+        return RuleExplanation(rule, state, expected, mode, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
-    return RuleExplanation(rule, state, expected, access_rules, explored_rules_key=explored_spots)
+    return RuleExplanation(rule, state, expected, mode, access_rules, more_explanations=more_explanations, explored_rules_key=explored_spots)
 
 
 @singledispatch
diff --git a/worlds/stardew_valley/stardew_rule/state.py b/worlds/stardew_valley/stardew_rule/state.py
index d60f08ac4c..3fe294a3ba 100644
--- a/worlds/stardew_valley/stardew_rule/state.py
+++ b/worlds/stardew_valley/stardew_rule/state.py
@@ -1,14 +1,11 @@
 from dataclasses import dataclass
-from typing import Iterable, Union, List, Tuple, Hashable, TYPE_CHECKING
+from typing import Iterable, Union, List, Tuple, Hashable
 
 from BaseClasses import CollectionState
 from .base import BaseStardewRule, CombinableStardewRule
 from .protocol import StardewRule
 from ..strings.ap_names.event_names import Event
 
-if TYPE_CHECKING:
-    from .. import StardewValleyWorld
-
 
 class TotalReceived(BaseStardewRule):
     count: int
@@ -18,10 +15,10 @@ class TotalReceived(BaseStardewRule):
     def __init__(self, count: int, items: Union[str, Iterable[str]], player: int):
         items_list: List[str]
 
-        if isinstance(items, Iterable):
-            items_list = [*items]
-        else:
+        if isinstance(items, str):
             items_list = [items]
+        else:
+            items_list = [*items]
 
         self.player = player
         self.items = items_list
diff --git a/worlds/stardew_valley/strings/animal_product_names.py b/worlds/stardew_valley/strings/animal_product_names.py
index 1b7490a607..d0928f75b5 100644
--- a/worlds/stardew_valley/strings/animal_product_names.py
+++ b/worlds/stardew_valley/strings/animal_product_names.py
@@ -1,5 +1,6 @@
 class AnimalProduct:
     any_egg = "Any Egg"
+    any_milk = "Any Milk"
     brown_egg = "Egg (Brown)"
     chicken_egg = "Chicken Egg"
     cow_milk = "Cow Milk"
@@ -38,10 +39,13 @@ class AnimalProduct:
     slime_egg_red = "Red Slime Egg"
     slime_egg_tiger = "Tiger Slime Egg"
     squid_ink = "Squid Ink"
-    sturgeon_roe = "Sturgeon Roe"
     truffle = "Truffle"
     void_egg_starter = "Void Egg (Starter)"
     """This item does not really exist and should never end up being displayed.
     It's there to patch the loop in logic because of the Chicken-and-egg problem."""
     void_egg = "Void Egg"
     wool = "Wool"
+
+    @classmethod
+    def specific_roe(cls, fish: str) -> str:
+        return f"{cls.roe} [{fish}]"
diff --git a/worlds/stardew_valley/strings/ap_names/ap_option_names.py b/worlds/stardew_valley/strings/ap_names/ap_option_names.py
index 7ff2cc783d..f4d9cc3944 100644
--- a/worlds/stardew_valley/strings/ap_names/ap_option_names.py
+++ b/worlds/stardew_valley/strings/ap_names/ap_option_names.py
@@ -17,3 +17,86 @@ class BuffOptionName:
     fishing_bar = "Fishing Bar Size"
     quality = "Quality"
     glow = "Glow"
+
+
+class SecretsanityOptionName:
+    easy = "Easy"
+    difficult = "Difficult"
+    fishing = "Fishing"
+    secret_notes = "Secret Notes"
+
+
+class EatsanityOptionName:
+    cooking = "Cooking"
+    crops = "Crops"
+    fish = "Fish"
+    artisan = "Artisan"
+    shop = "Shop"
+    poisonous = "Poisonous"
+    lock_effects = "Lock Effects"
+
+
+class ChefsanityOptionName:
+    queen_of_sauce = "Queen of Sauce"
+    purchases = "Purchases"
+    skills = "Skills"
+    friendship = "Friendship"
+
+
+class StartWithoutOptionName:
+    tools = "Tools"
+    backpack = "Backpack"
+    landslide = "Landslide"
+    community_center = "Community Center"
+    buildings = "Buildings"
+
+
+class HatsanityOptionName:
+    tailoring = "Tailoring"
+    easy = "Easy"
+    medium = "Medium"
+    difficult = "Difficult"
+    rng = "RNG"
+    near_perfection = "Near Perfection"
+    post_perfection = "Post Perfection"
+
+
+class AllowedFillerOptionName:
+    farming = "Farming Items"
+    fishing = "Fishing Items"
+    fruit_trees = "Fruit Trees"
+    food = "Food"
+    buff_food = "Buff Food"
+    consumables = "Consumables"
+    machines = "Machines"
+    storage = "Storage"
+    quality_of_life = "Quality Of Life"
+    materials = "Materials"
+    currencies = "Currencies"
+    money = "Money"
+    hats = "Hats"
+    decorations = "Decorations"
+    rings = "Rings"
+
+
+class CustomLogicOptionName:
+    chair_skips = "Chair Skips"
+    easy_fishing = "Easy Fishing"
+    hard_fishing = "Hard Fishing"
+    extreme_fishing = "Extreme Fishing"
+    easy_mining = "Easy Mining"
+    hard_mining = "Hard Mining"
+    extreme_mining = "Extreme Mining"
+    easy_combat = "Easy Combat"
+    hard_combat = "Hard Combat"
+    extreme_combat = "Extreme Combat"
+    deep_mining = "Deep Mining"
+    very_deep_mining = "Very Deep Mining"
+    ignore_birthdays = "Ignore Birthdays"
+    easy_money = "Easy Money"
+    hard_money = "Hard Money"
+    extreme_money = "Extreme Money"
+    nightmare_money = "Nightmare Money"
+    bomb_hoeing = "Bomb Hoeing"
+    rain_watering = "Rain Watering"
+    critical_free_samples = "Critical Free Samples"
diff --git a/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py b/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py
index 7fcd687376..3c7a079e2f 100644
--- a/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py
+++ b/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py
@@ -5,3 +5,5 @@ class APWeapon:
     dagger = "Progressive Dagger"
     slingshot = "Progressive Slingshot"
     footwear = "Progressive Footwear"
+
+    all_weapons = (weapon, sword, club, dagger)
diff --git a/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py b/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py
index 6826b9234a..04ca9a6c5d 100644
--- a/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py
+++ b/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py
@@ -4,3 +4,10 @@ class CommunityUpgrade:
     mushroom_boxes = "Mushroom Boxes"
     movie_theater = "Progressive Movie Theater"
     mr_qi_plane_ride = "Mr Qi's Plane Ride"
+
+
+class Bookseller:
+    days = "Progressive Bookseller Days"
+    stock_experience_books = "Bookseller Stock: Progressive Experience Books"
+    stock_rare_books = "Bookseller Stock: Progressive Rare Books"
+    stock_permanent_books = "Bookseller Stock: Permanent Books"
diff --git a/worlds/stardew_valley/strings/ap_names/event_names.py b/worlds/stardew_valley/strings/ap_names/event_names.py
index 68f000bdc3..43c0984924 100644
--- a/worlds/stardew_valley/strings/ap_names/event_names.py
+++ b/worlds/stardew_valley/strings/ap_names/event_names.py
@@ -10,5 +10,7 @@ class Event:
     victory = event("Victory")
 
     received_walnuts = event("Received Walnuts")
+    received_qi_gems = event("Received Qi Gems")
+    received_progressive_weapon = event("Received Progressive Weapon")
     received_progression_item = event("Received Progression Item")
     received_progression_percent = event("Received Progression Percent")
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 d87a81f5e5..7327737292 100644
--- a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
+++ b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
@@ -59,3 +59,6 @@ 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]
+
+class ModBooks:
+    digging_like_worms = "Digging Like Worms"
\ No newline at end of file
diff --git a/worlds/stardew_valley/strings/ap_names/transport_names.py b/worlds/stardew_valley/strings/ap_names/transport_names.py
index 7617a23874..c44978760f 100644
--- a/worlds/stardew_valley/strings/ap_names/transport_names.py
+++ b/worlds/stardew_valley/strings/ap_names/transport_names.py
@@ -1,4 +1,5 @@
 class Transportation:
+    bus_repair = "Bus Repair"
     boat_repair = "Boat Repair"
     island_obelisk = "Island Obelisk"
     desert_obelisk = "Desert Obelisk"
diff --git a/worlds/stardew_valley/strings/artisan_good_names.py b/worlds/stardew_valley/strings/artisan_good_names.py
index 366189568c..fbe2fa70ad 100644
--- a/worlds/stardew_valley/strings/artisan_good_names.py
+++ b/worlds/stardew_valley/strings/artisan_good_names.py
@@ -1,3 +1,6 @@
+from worlds.stardew_valley.strings.fish_names import Fish
+
+
 class ArtisanGood:
     honey = "Honey"
     oak_resin = "Oak Resin"
@@ -61,6 +64,16 @@ class ArtisanGood:
     def specific_bait(cls, fish: str) -> str:
         return f"{cls.targeted_bait} [{fish}]"
 
+    @classmethod
+    def specific_aged_roe(cls, fish: str) -> str:
+        if fish == Fish.sturgeon:
+            return ArtisanGood.caviar
+        return f"{cls.aged_roe} [{fish}]"
+
+    @classmethod
+    def specific_honey(cls, flower: str) -> str:
+        return f"{cls.honey} [{flower}]"
+
 
 class ModArtisanGood:
     pterodactyl_egg = "Pterodactyl Egg"
diff --git a/worlds/stardew_valley/strings/backpack_tiers.py b/worlds/stardew_valley/strings/backpack_tiers.py
new file mode 100644
index 0000000000..f64935ed2f
--- /dev/null
+++ b/worlds/stardew_valley/strings/backpack_tiers.py
@@ -0,0 +1,15 @@
+class Backpack:
+    small = "Small Pack"
+    large = "Large Pack"
+    deluxe = "Deluxe Pack"
+    premium = "Premium Pack"
+    prices_per_tier = {small: 400, large: 2000, deluxe: 10000, premium: 50000}
+
+    @staticmethod
+    def get_purchasable_tiers(bigger_backpack: bool, start_without_backpack: bool = False) -> list[str]:
+        tiers = [Backpack.large, Backpack.deluxe]
+        if bigger_backpack:
+            tiers.append(Backpack.premium)
+        if start_without_backpack:
+            tiers.insert(0, Backpack.small)
+        return tiers
diff --git a/worlds/stardew_valley/strings/book_names.py b/worlds/stardew_valley/strings/book_names.py
index 6c271f42ae..1f5cb671f0 100644
--- a/worlds/stardew_valley/strings/book_names.py
+++ b/worlds/stardew_valley/strings/book_names.py
@@ -41,7 +41,7 @@ class LostBook:
     tips_on_farming = lost_book("Tips on Farming")
     this_is_a_book_by_marnie = lost_book("This is a book by Marnie")
     on_foraging = lost_book("On Foraging")
-    the_fisherman_act_1 = lost_book("The Fisherman, Act 1")
+    the_fisherman_act_1 = lost_book("The Fisherman, Act I")
     how_deep_do_the_mines_go = lost_book("How Deep do the mines go?")
     an_old_farmers_journal = lost_book("An Old Farmer's Journal")
     scarecrows = lost_book("Scarecrows")
diff --git a/worlds/stardew_valley/strings/boot_names.py b/worlds/stardew_valley/strings/boot_names.py
new file mode 100644
index 0000000000..f7b0fb9f2e
--- /dev/null
+++ b/worlds/stardew_valley/strings/boot_names.py
@@ -0,0 +1,20 @@
+from typing import Dict, List
+
+boots_by_tier: Dict[int, List[str]] = dict()
+tier_by_boots: Dict[str, int] = dict()
+
+
+def create_boots(tier: int, name: str) -> str:
+    if tier not in boots_by_tier:
+        boots_by_tier[tier] = []
+    boots_by_tier[tier].append(name)
+    tier_by_boots[name] = tier
+    return name
+
+
+def tier_4_boots(name: str) -> str:
+    return create_boots(4, name)
+
+
+class Boots:
+    mermaid_boots = tier_4_boots("Mermaid Boots")
diff --git a/worlds/stardew_valley/strings/building_names.py b/worlds/stardew_valley/strings/building_names.py
index 50c84b67ca..a1c3f77a4f 100644
--- a/worlds/stardew_valley/strings/building_names.py
+++ b/worlds/stardew_valley/strings/building_names.py
@@ -21,5 +21,14 @@ class Building:
     pet_bowl = "Pet Bowl"
 
 
+class WizardBuilding:
+    earth_obelisk = "Earth Obelisk"
+    water_obelisk = "Water Obelisk"
+    desert_obelisk = "Desert Obelisk"
+    island_obelisk = "Island Obelisk"
+    junimo_hut = "Junimo Hut"
+    gold_clock = "Gold Clock"
+
+
 class ModBuilding:
     tractor_garage = "Tractor Garage"
diff --git a/worlds/stardew_valley/strings/bundle_names.py b/worlds/stardew_valley/strings/bundle_names.py
index 5f560a5454..842e0f3f5d 100644
--- a/worlds/stardew_valley/strings/bundle_names.py
+++ b/worlds/stardew_valley/strings/bundle_names.py
@@ -10,99 +10,228 @@ class CCRoom:
 
 
 all_cc_bundle_names = []
+all_meme_bundle_names = []
 
 
-def cc_bundle(name: str) -> str:
-    all_cc_bundle_names.append(name)
-    return name
+def name_bundle(name: str) -> str:
+    return f"{name} Bundle"
+
+
+def register_bundle(bundle_name: str, is_meme: bool = False) -> str:
+    all_cc_bundle_names.append(bundle_name)
+    if is_meme:
+        all_meme_bundle_names.append(bundle_name)
+    return bundle_name
+
+
+def cc_bundle(name: str, is_meme: bool = False) -> str:
+    full_name = name_bundle(name)
+    register_bundle(full_name, is_meme)
+    # print(full_name)
+    return full_name
+
+
+def meme_bundle(name: str) -> str:
+    return cc_bundle(name, True)
 
 
 class BundleName:
-    spring_foraging = cc_bundle("Spring Foraging Bundle")
-    summer_foraging = cc_bundle("Summer Foraging Bundle")
-    fall_foraging = cc_bundle("Fall Foraging Bundle")
-    winter_foraging = cc_bundle("Winter Foraging Bundle")
-    construction = cc_bundle("Construction Bundle")
-    exotic_foraging = cc_bundle("Exotic Foraging Bundle")
-    beach_foraging = cc_bundle("Beach Foraging Bundle")
-    mines_foraging = cc_bundle("Mines Foraging Bundle")
-    desert_foraging = cc_bundle("Desert Foraging Bundle")
-    island_foraging = cc_bundle("Island Foraging Bundle")
-    sticky = cc_bundle("Sticky Bundle")
-    forest = cc_bundle("Forest Bundle")
-    green_rain = cc_bundle("Green Rain Bundle")
-    wild_medicine = cc_bundle("Wild Medicine Bundle")
-    quality_foraging = cc_bundle("Quality Foraging Bundle")
-    spring_crops = cc_bundle("Spring Crops Bundle")
-    summer_crops = cc_bundle("Summer Crops Bundle")
-    fall_crops = cc_bundle("Fall Crops Bundle")
-    quality_crops = cc_bundle("Quality Crops Bundle")
-    animal = cc_bundle("Animal Bundle")
-    artisan = cc_bundle("Artisan Bundle")
-    rare_crops = cc_bundle("Rare Crops Bundle")
-    fish_farmer = cc_bundle("Fish Farmer's Bundle")
-    garden = cc_bundle("Garden Bundle")
-    brewer = cc_bundle("Brewer's Bundle")
-    orchard = cc_bundle("Orchard Bundle")
-    island_crops = cc_bundle("Island Crops Bundle")
-    agronomist = cc_bundle("Agronomist's Bundle")
-    slime_farmer = cc_bundle("Slime Farmer Bundle")
-    sommelier = cc_bundle("Sommelier Bundle")
-    dry = cc_bundle("Dry Bundle")
-    river_fish = cc_bundle("River Fish Bundle")
-    lake_fish = cc_bundle("Lake Fish Bundle")
-    ocean_fish = cc_bundle("Ocean Fish Bundle")
-    night_fish = cc_bundle("Night Fishing Bundle")
-    crab_pot = cc_bundle("Crab Pot Bundle")
-    trash = cc_bundle("Trash Bundle")
-    recycling = cc_bundle("Recycling Bundle")
-    specialty_fish = cc_bundle("Specialty Fish Bundle")
-    spring_fish = cc_bundle("Spring Fishing Bundle")
-    summer_fish = cc_bundle("Summer Fishing Bundle")
-    fall_fish = cc_bundle("Fall Fishing Bundle")
-    winter_fish = cc_bundle("Winter Fishing Bundle")
-    rain_fish = cc_bundle("Rain Fishing Bundle")
-    quality_fish = cc_bundle("Quality Fish Bundle")
-    master_fisher = cc_bundle("Master Fisher's Bundle")
-    legendary_fish = cc_bundle("Legendary Fish Bundle")
-    island_fish = cc_bundle("Island Fish Bundle")
-    deep_fishing = cc_bundle("Deep Fishing Bundle")
-    tackle = cc_bundle("Tackle Bundle")
-    bait = cc_bundle("Master Baiter Bundle")
-    specific_bait = cc_bundle("Specific Fishing Bundle")
-    fish_smoker = cc_bundle("Fish Smoker Bundle")
-    blacksmith = cc_bundle("Blacksmith's Bundle")
-    geologist = cc_bundle("Geologist's Bundle")
-    adventurer = cc_bundle("Adventurer's Bundle")
-    treasure_hunter = cc_bundle("Treasure Hunter's Bundle")
-    engineer = cc_bundle("Engineer's Bundle")
-    demolition = cc_bundle("Demolition Bundle")
-    paleontologist = cc_bundle("Paleontologist's Bundle")
-    archaeologist = cc_bundle("Archaeologist's Bundle")
-    chef = cc_bundle("Chef's Bundle")
-    dye = cc_bundle("Dye Bundle")
-    field_research = cc_bundle("Field Research Bundle")
-    fodder = cc_bundle("Fodder Bundle")
-    enchanter = cc_bundle("Enchanter's Bundle")
-    children = cc_bundle("Children's Bundle")
-    forager = cc_bundle("Forager's Bundle")
-    home_cook = cc_bundle("Home Cook's Bundle")
-    helper = cc_bundle("Helper's Bundle")
-    spirit_eve = cc_bundle("Spirit's Eve Bundle")
-    winter_star = cc_bundle("Winter Star Bundle")
-    bartender = cc_bundle("Bartender's Bundle")
-    calico = cc_bundle("Calico Bundle")
-    raccoon = cc_bundle("Raccoon Bundle")
-    money_2500 = cc_bundle("2,500g Bundle")
-    money_5000 = cc_bundle("5,000g Bundle")
-    money_10000 = cc_bundle("10,000g Bundle")
-    money_25000 = cc_bundle("25,000g Bundle")
-    gambler = cc_bundle("Gambler's Bundle")
-    carnival = cc_bundle("Carnival Bundle")
-    walnut_hunter = cc_bundle("Walnut Hunter Bundle")
-    qi_helper = cc_bundle("Qi's Helper Bundle")
+    spring_foraging = cc_bundle("Spring Foraging")
+    summer_foraging = cc_bundle("Summer Foraging")
+    fall_foraging = cc_bundle("Fall Foraging")
+    winter_foraging = cc_bundle("Winter Foraging")
+    construction = cc_bundle("Construction")
+    exotic_foraging = cc_bundle("Exotic Foraging")
+    beach_foraging = cc_bundle("Beach Foraging")
+    mines_foraging = cc_bundle("Mines Foraging")
+    desert_foraging = cc_bundle("Desert Foraging")
+    island_foraging = cc_bundle("Island Foraging")
+    sticky = cc_bundle("Sticky")
+    forest = cc_bundle("Forest")
+    green_rain = cc_bundle("Green Rain")
+    totems = cc_bundle("Totems")
+    wild_medicine = cc_bundle("Wild Medicine")
+    quality_foraging = cc_bundle("Quality Foraging")
+    spring_crops = cc_bundle("Spring Crops")
+    summer_crops = cc_bundle("Summer Crops")
+    fall_crops = cc_bundle("Fall Crops")
+    quality_crops = cc_bundle("Quality Crops")
+    animal = cc_bundle("Animal")
+    artisan = cc_bundle("Artisan")
+    rare_crops = cc_bundle("Rare Crops")
+    fish_farmer = cc_bundle("Fish Farmer's")
+    garden = cc_bundle("Garden")
+    brewer = cc_bundle("Brewer's")
+    orchard = cc_bundle("Orchard")
+    island_crops = cc_bundle("Island Crops")
+    agronomist = cc_bundle("Agronomist's")
+    slime_farmer = cc_bundle("Slime Farmer")
+    sommelier = cc_bundle("Sommelier")
+    dry = cc_bundle("Dry")
+    river_fish = cc_bundle("River Fish")
+    lake_fish = cc_bundle("Lake Fish")
+    ocean_fish = cc_bundle("Ocean Fish")
+    night_fish = cc_bundle("Night Fishing")
+    crab_pot = cc_bundle("Crab Pot")
+    trash = cc_bundle("Trash")
+    recycling = cc_bundle("Recycling")
+    specialty_fish = cc_bundle("Specialty Fish")
+    spring_fish = cc_bundle("Spring Fishing")
+    summer_fish = cc_bundle("Summer Fishing")
+    fall_fish = cc_bundle("Fall Fishing")
+    winter_fish = cc_bundle("Winter Fishing")
+    rain_fish = cc_bundle("Rain Fishing")
+    quality_fish = cc_bundle("Quality Fish")
+    master_fisher = cc_bundle("Master Fisher's")
+    legendary_fish = cc_bundle("Legendary Fish")
+    island_fish = cc_bundle("Island Fish")
+    deep_fishing = cc_bundle("Deep Fishing")
+    tackle = cc_bundle("Tackle")
+    bait = cc_bundle("Master Baiter")
+    specific_bait = cc_bundle("Specific Fishing")
+    fish_smoker = cc_bundle("Fish Smoker")
+    blacksmith = cc_bundle("Blacksmith's")
+    geologist = cc_bundle("Geologist's")
+    adventurer = cc_bundle("Adventurer's")
+    treasure_hunter = cc_bundle("Treasure Hunter's")
+    engineer = cc_bundle("Engineer's")
+    demolition = cc_bundle("Demolition")
+    paleontologist = cc_bundle("Paleontologist's")
+    archaeologist = cc_bundle("Archaeologist's")
+    chef = cc_bundle("Chef's")
+    dye = cc_bundle("Dye")
+    field_research = cc_bundle("Field Research")
+    fodder = cc_bundle("Fodder")
+    enchanter = cc_bundle("Enchanter's")
+    children = cc_bundle("Children's")
+    forager = cc_bundle("Forager's")
+    home_cook = cc_bundle("Home Cook's")
+    helper = cc_bundle("Helper's")
+    spirit_eve = cc_bundle("Spirit's Eve")
+    winter_star = cc_bundle("Winter Star")
+    bartender = cc_bundle("Bartender's")
+    calico = cc_bundle("Calico")
+    raccoon = cc_bundle("Raccoon")
+    money_2500 = cc_bundle("2,500g")
+    money_5000 = cc_bundle("5,000g")
+    money_10000 = cc_bundle("10,000g")
+    money_25000 = cc_bundle("25,000g")
+    gambler = cc_bundle("Gambler's")
+    carnival = cc_bundle("Carnival")
+    walnut_hunter = cc_bundle("Walnut Hunter")
+    qi_helper = cc_bundle("Qi's Helper")
     missing_bundle = "The Missing Bundle"
     raccoon_fish = "Raccoon Fish"
     raccoon_artisan = "Raccoon Artisan"
     raccoon_food = "Raccoon Food"
     raccoon_foraging = "Raccoon Foraging"
+
+
+class MemeBundleName:
+    reconnection = meme_bundle("Reconnection")
+    hint = meme_bundle("Hint")
+    # colored_crystals = meme_bundle("Colored Crystals")
+    catch_and_release = meme_bundle("Catch And Release")
+    pollution = meme_bundle("Pollution")
+    sacrifice = meme_bundle("Sacrifice")
+    dr_seuss = meme_bundle("Dr Seuss")
+    algorerhythm = meme_bundle("TheAlGoreRhythm")
+    distracted = meme_bundle("Distracted")
+    square_hole = meme_bundle("Square Hole")
+    hairy = meme_bundle("Hairy")
+    stanley = meme_bundle("Stanley")
+    very_sticky = meme_bundle("Very Sticky")
+    investment = meme_bundle("Investment")
+    doctor = meme_bundle("Doctor")
+    scam = meme_bundle("Scam")
+    blossom_garden = meme_bundle("Blossom Garden")
+    deathlink = meme_bundle("DeathLink")
+    humble = meme_bundle("Humble")
+    asmr = meme_bundle("ASMR")
+    puzzle = meme_bundle("Puzzle")
+    cooperation = meme_bundle("Cooperation")
+    pomnut = meme_bundle("Pomnut")
+    ministry_of_madness = meme_bundle("Ministry of Madness")
+    loser_club = meme_bundle("Loser Club")
+    frazzleduck = meme_bundle("Frazzleduck")
+    argonmatrix = meme_bundle("ArgonMatrix")
+    pool = meme_bundle("Pool")
+    AAAA = meme_bundle("AAAA")
+    amons_fall = meme_bundle("Amon's Fall")
+    animal_well = meme_bundle("ANIMAL WELL")
+    anything_for_beyonce = meme_bundle("Anything For Beyonce")
+    archipela_go = meme_bundle("Archipela-Go!")
+    automation = meme_bundle("Automation")
+    bad_farmer = meme_bundle("Bad Farmer")
+    bad_fisherman = meme_bundle("Bad Fisherman")
+    balls = meme_bundle("Balls")
+    big_grapes = meme_bundle("Big Grapes")
+    bun_dle = register_bundle("Bun-dle", True)
+    bundle = meme_bundle("Bundle")
+    burger_king = meme_bundle("Burger King")
+    burger_king_revenge = meme_bundle("Burger King's Revenge")
+    caffeinated = meme_bundle("Caffeinated")
+    cap = meme_bundle("Cap")
+    capitalist = meme_bundle("Capitalist's")
+    celeste = meme_bundle("Celeste")
+    chaos_emerald = meme_bundle("Chaos Emerald")
+    clickbait = meme_bundle("Clickbait")
+    clique = meme_bundle("Clique")
+    hibernation = meme_bundle("Hibernation")
+    commitment = meme_bundle("Commitment")
+    communism = meme_bundle("Communism")
+    connection = meme_bundle("Connection")
+    cookie_clicker = meme_bundle("Cookie Clicker")
+    crab_rave = meme_bundle("Crab Rave")
+    crap_pot = meme_bundle("Crap Pot")
+    crowdfunding = meme_bundle("Crowdfunding")
+    death = meme_bundle("Death")
+    doctor_angler = meme_bundle("Doctor Angler")
+    eg = meme_bundle("Eg")
+    emmalution = meme_bundle("Emmalution")
+    exhaustion = meme_bundle("Exhaustion")
+    fast = meme_bundle("Fast")
+    firstborn = meme_bundle("Firstborn")
+    flashbang = meme_bundle("Flashbang")
+    floor_is_lava = meme_bundle("The Floor Is Lava")
+    fruit = meme_bundle("'Fruit'")
+    gacha = meme_bundle("Gacha")
+    hats_off_to_you = meme_bundle("Hats Off To You")
+    honeywell = meme_bundle("Honeywell")
+    honorable = meme_bundle("Honorable")
+    hurricane_tortilla = meme_bundle("Hurricane Tortilla")
+    ikea = meme_bundle("IKEA")
+    joetg = meme_bundle("Joetg")
+    journalist = meme_bundle("Journalist's")
+    kent_c = meme_bundle("Kent C.")
+    legendairy = meme_bundle("Legendairy")
+    lemonade_stand = meme_bundle("Lemonade Stand")
+    look_at_chickens = meme_bundle("Look At These Chickens")
+    mermaid = meme_bundle("Mermaid")
+    minecraft = meme_bundle("Minecraft")
+    nft = meme_bundle("NFT")
+    not_the_bees = meme_bundle("Not The Bees")
+    obelisks = meme_bundle("Obelisks")
+    off_your_back = meme_bundle("Off Your Back")
+    permit_a38 = meme_bundle("Permit A38")
+    potato = meme_bundle("Potato")
+    restraint = meme_bundle("Restraint")
+    reverse = meme_bundle("Reverse")
+    rick = meme_bundle("Rick")
+    romance = meme_bundle("Romance")
+    sappy = meme_bundle("Sappy")
+    schrodinger = meme_bundle("Schrodinger's")
+    screw_you = meme_bundle("Screw You")
+    sisyphus = meme_bundle("Sisyphus")
+    smapi = meme_bundle("SMAPI")
+    snitch = meme_bundle("Snitch")
+    speedrunners = meme_bundle("Speedrunner's")
+    sunmaid = meme_bundle("Sunmaid")
+    this_is_fine = meme_bundle("This Is Fine")
+    tick_tock = meme_bundle("Tick Tock")
+    tilesanity = meme_bundle("Tilesanity")
+    trap = meme_bundle("Trap")
+    trout = meme_bundle("Trout")
+    vampire = meme_bundle("Vampire")
+    vocaloid = meme_bundle("Vocaloid")
+    what_the_rock_is_cooking = meme_bundle("What The Rock Is Cooking")
diff --git a/worlds/stardew_valley/strings/catalogue_names.py b/worlds/stardew_valley/strings/catalogue_names.py
new file mode 100644
index 0000000000..62373ec923
--- /dev/null
+++ b/worlds/stardew_valley/strings/catalogue_names.py
@@ -0,0 +1,97 @@
+from typing import Dict, List
+
+
+class Catalogue:
+    wizard = "Wizard Catalogue"
+    furniture = "Furniture Catalogue"
+
+
+items_by_catalogue: Dict[str, List[str]] = dict()
+
+
+def catalogue_item(item: str, catalogue: str) -> str:
+    if catalogue not in items_by_catalogue:
+        items_by_catalogue[catalogue] = []
+    items_by_catalogue[catalogue].append(item)
+    return item
+
+
+def wizard_catalogue_item(item: str) -> str:
+    return catalogue_item(item, Catalogue.wizard)
+
+
+def furniture_catalogue_item(item: str) -> str:
+    return catalogue_item(item, Catalogue.furniture)
+
+
+class CatalogueItem:
+    wizard_bed = wizard_catalogue_item("Wizard Bed")
+    wizard_dresser = wizard_catalogue_item("Wizard Dresser")
+    wizard_chair = wizard_catalogue_item("Wizard Chair")
+    wizard_stool = wizard_catalogue_item("Wizard Stool")
+    wizard_table = wizard_catalogue_item("Wizard Table")
+    wizard_tea_table = wizard_catalogue_item("Wizard Tea Table")
+    wizard_end_table = wizard_catalogue_item("Wizard End Table")
+    wizard_bookcase = wizard_catalogue_item("Wizard Bookcase")
+    large_wizard_bookcase = wizard_catalogue_item("Large Wizard Bookcase")
+    short_wizard_bookcase = wizard_catalogue_item("Short Wizard Bookcase")
+    small_wizard_bookcase = wizard_catalogue_item("Small Wizard Bookcase")
+    wizard_study = wizard_catalogue_item("Wizard Study")
+    wizard_bookshelf = wizard_catalogue_item("Wizard Bookshelf")
+    elixir_shelf = wizard_catalogue_item("Elixir Shelf")
+    small_elixir_shelf = wizard_catalogue_item("Small Elixir Shelf")
+    stacked_elixir_shelf = wizard_catalogue_item("Stacked Elixir Shelf")
+    small_stacked_elixir_shelf = wizard_catalogue_item("Small Stacked Elixir Shelf")
+    elixir_table = wizard_catalogue_item("Elixir Table")
+    long_elixir_table = wizard_catalogue_item("Long Elixir Table")
+    two_elixirs = wizard_catalogue_item("Two Elixirs")
+    elixir_bundle = wizard_catalogue_item("Elixir Bundle")
+    cauldron = wizard_catalogue_item("Cauldron")
+    wizard_fireplace = wizard_catalogue_item("Wizard Fireplace")
+    crystal_ball = wizard_catalogue_item("Crystal Ball")
+    amethyst_crystal_ball = wizard_catalogue_item("Amethyst Crystal Ball")
+    aquamarine_crystal_ball = wizard_catalogue_item("Aquamarine Crystal Ball")
+    emerald_crystal_ball = wizard_catalogue_item("Emerald Crystal Ball")
+    ruby_crystal_ball = wizard_catalogue_item("Ruby Crystal Ball")
+    topaz_crystal_ball = wizard_catalogue_item("Topaz Crystal Ball")
+    blue_book = wizard_catalogue_item("Blue Book")
+    fallen_blue_book = wizard_catalogue_item("Fallen Blue Book")
+    brown_book = wizard_catalogue_item("Brown Book")
+    fallen_brown_book = wizard_catalogue_item("Fallen Brown Book")
+    green_book = wizard_catalogue_item("Green Book")
+    fallen_green_book = wizard_catalogue_item("Fallen Green Book")
+    purple_book = wizard_catalogue_item("Purple Book")
+    fallen_purple_book = wizard_catalogue_item("Fallen Purple Book")
+    red_book = wizard_catalogue_item("Red Book")
+    fallen_red_book = wizard_catalogue_item("Fallen Red Book")
+    yellow_book = wizard_catalogue_item("Yellow Book")
+    fallen_yellow_book = wizard_catalogue_item("Fallen Yellow Book")
+    book_pile = wizard_catalogue_item("Book Pile")
+    large_book_pile = wizard_catalogue_item("Large Book Pile")
+    small_book_pile = wizard_catalogue_item("Small Book Pile")
+    book_stack = wizard_catalogue_item("Book Stack")
+    large_book_stack = wizard_catalogue_item("Large Book Stack")
+    small_book_stack = wizard_catalogue_item("Small Book Stack")
+    decorative_wizard_door = wizard_catalogue_item("Decorative Wizard Door")
+    glyph = wizard_catalogue_item("Glyph")
+    runes = wizard_catalogue_item("'Runes'")
+    void_swirlds = wizard_catalogue_item("'Void Swirlds'")
+    wizards_tower = wizard_catalogue_item("'Wizard's Tower'")
+    witchs_broom = wizard_catalogue_item("Witch's Broom")
+    rune_rug = wizard_catalogue_item("Rune Rug")
+    starry_moon_rug = wizard_catalogue_item("Starry Moon Rug")
+    swirld_rug = wizard_catalogue_item("Swirld Rug")
+    wizard_cushion = wizard_catalogue_item("Wizard Cushion")
+    dark_wizard_cushion = wizard_catalogue_item("Dark Wizard Cushion")
+    wizard_lamp = wizard_catalogue_item("Wizard Lamp")
+    potted_red_mushroom = wizard_catalogue_item("Potted Red Mushroom")
+    curly_tree = wizard_catalogue_item("Curly Tree")
+    swamp_plant = wizard_catalogue_item("Swamp Plant")
+    stone_flooring = wizard_catalogue_item("Stone Flooring")
+
+    stone_flooring = furniture_catalogue_item("Country Lamp")
+    box_lamp = furniture_catalogue_item("Box Lamp")
+    modern_lamp = furniture_catalogue_item("Modern Lamp")
+    classic_lamp = furniture_catalogue_item("Classic Lamp")
+    candle_lamp = furniture_catalogue_item("Candle Lamp")
+    ornate_lamp = furniture_catalogue_item("Ornate Lamp")
diff --git a/worlds/stardew_valley/strings/craftable_names.py b/worlds/stardew_valley/strings/craftable_names.py
index 891330c3ae..e687f64287 100644
--- a/worlds/stardew_valley/strings/craftable_names.py
+++ b/worlds/stardew_valley/strings/craftable_names.py
@@ -63,6 +63,7 @@ class Fishing:
     curiosity_lure = "Curiosity Lure"
     deluxe_bait = "Deluxe Bait"
     challenge_bait = "Challenge Bait"
+    golden_bobber = "Golden Bobber"
 
 
 class Ring:
@@ -121,10 +122,16 @@ class Lighting:
 
 
 class Furniture:
+    modern_lamp = "Modern Lamp"
+    candle_lamp = "Candle Lamp"
     tub_o_flowers = "Tub o' Flowers"
     wicked_statue = "Wicked Statue"
     flute_block = "Flute Block"
     drum_block = "Drum Block"
+    single_bed = "Single Bed"
+    cursed_mannequin = "Cursed Mannequin"
+    crane_game_house_plant = "House Plant 13 (Crane Game)"
+    exotic_double_bed = "Exotic Double Bed"
 
 
 class Storage:
@@ -176,7 +183,7 @@ class ModEdible:
 class ModCraftable:
     travel_core = "Travel Core"
     glass_brazier = "Glass Brazier"
-    water_shifter = "Water Shifter"
+    water_sifter = "Water Sifter"
     rusty_brazier = "Rusty Brazier"
     glass_fence = "Glass Fence"
     bone_fence = "Bone Fence"
diff --git a/worlds/stardew_valley/strings/currency_names.py b/worlds/stardew_valley/strings/currency_names.py
index 21ccb5b55c..1ffcdbf7a7 100644
--- a/worlds/stardew_valley/strings/currency_names.py
+++ b/worlds/stardew_valley/strings/currency_names.py
@@ -11,6 +11,28 @@ class Currency:
 
     @staticmethod
     def is_currency(item: str) -> bool:
-        return item in [Currency.qi_coin, Currency.golden_walnut, Currency.qi_gem, Currency.star_token, Currency.money]
+        return item in [Currency.qi_coin, Currency.golden_walnut, Currency.qi_gem, Currency.star_token, Currency.money,
+                        MemeCurrency.code, MemeCurrency.clic, MemeCurrency.steps, MemeCurrency.time, MemeCurrency.energy, MemeCurrency.blood,
+                        MemeCurrency.cookies, MemeCurrency.child, MemeCurrency.dead_crops, MemeCurrency.dead_pumpkins, MemeCurrency.missed_fish,
+                        MemeCurrency.time_elapsed, MemeCurrency.honeywell, MemeCurrency.sleep_days, MemeCurrency.bank_money, MemeCurrency.deathlinks,
+                        MemeCurrency.goat]
 
 
+class MemeCurrency:
+    goat = "Goat"
+    deathlinks = "DeathLinks"
+    bank_money = "Bank Money"
+    sleep_days = "Sleep Days"
+    blood = "Blood"
+    child = "Child"
+    clic = "Clic"
+    code = "Code"
+    cookies = "CookieClics"
+    dead_crops = "Dead Crop"
+    dead_pumpkins = "Dead Pumpkin"
+    energy = "Energy"
+    steps = "Steps"
+    time = "Time"
+    time_elapsed = "Time Elapsed"
+    honeywell = "Honeywell"
+    missed_fish = "Missed Fish"
diff --git a/worlds/stardew_valley/strings/entrance_names.py b/worlds/stardew_valley/strings/entrance_names.py
index bad46c4294..7b0d1834e5 100644
--- a/worlds/stardew_valley/strings/entrance_names.py
+++ b/worlds/stardew_valley/strings/entrance_names.py
@@ -66,6 +66,8 @@ class Entrance:
     town_to_alex_house = "Town to Alex's House"
     town_to_trailer = "Town to Trailer"
     town_to_mayor_manor = "Town to Mayor's Manor"
+    enter_lewis_bedroom = "Enter Lewis's Bedroom"
+    enter_shorts_maze = "Mayor's Manor to Purple Shorts Maze"
     town_to_sam_house = "Town to Sam's House"
     town_to_haley_house = "Town to Haley's House"
     town_to_sewer = "Town to Sewer"
@@ -95,8 +97,10 @@ class Entrance:
     reach_junimo_kart_2 = "Reach Junimo Kart 2"
     reach_junimo_kart_3 = "Reach Junimo Kart 3"
     reach_junimo_kart_4 = "Reach Junimo Kart 4"
-    enter_locker_room = "Bathhouse Entrance to Locker Room"
-    enter_public_bath = "Locker Room to Public Bath"
+    enter_mens_locker_room = "Bathhouse Entrance to Men's Locker Room"
+    enter_womens_locker_room = "Bathhouse Entrance to Women's Locker Room"
+    mens_lockers_to_public_bath = "Men's Locker Room to Public Bath"
+    womens_lockers_to_public_bath = "Women's Locker Room to Public Bath"
     enter_witch_swamp = "Witch Warp Cave to Witch's Swamp"
     enter_witch_hut = "Witch's Swamp to Witch's Hut"
     witch_warp_to_wizard_basement = "Witch's Hut to Wizard Basement"
@@ -106,6 +110,7 @@ class Entrance:
     enter_casino = "Oasis to Casino"
     enter_skull_cavern_entrance = "Desert to Skull Cavern Entrance"
     enter_skull_cavern = "Skull Cavern Entrance to Skull Cavern"
+    mine_in_skull_cavern = "Can Mine in Skull Cavern"
     mine_to_skull_cavern_floor_25 = dig_to_skull_floor(25)
     mine_to_skull_cavern_floor_50 = dig_to_skull_floor(50)
     mine_to_skull_cavern_floor_75 = dig_to_skull_floor(75)
@@ -177,6 +182,16 @@ class Entrance:
     parrot_express_jungle_to_docks = "Parrot Express Jungle to Docks"
     parrot_express_dig_site_to_docks = "Parrot Express Dig Site to Docks"
     parrot_express_volcano_to_docks = "Parrot Express Volcano to Docks"
+    mountain_to_outside_adventure_guild = "Mountain to Outside Adventure Guild"
+
+    forest_beach_shortcut = "Forest to Beach Shortcut"
+    mountain_jojamart_shortcut = "Mountain to Jojamart Shortcut"
+    mountain_town_shortcut = "Mountain to Town Shortcut"
+    town_tidepools_shortcut = "Town to Tide Pools Shortcut"
+    tunnel_backwoods_shortcut = "Tunnel to Backwoods Shortcut"
+    mountain_lake_to_outside_adventure_guild_shortcut = "Mountain Lake to Outside Adventure Guild"
+
+    feed_trash_bear = "Feed Trash Bear"
 
 
 class LogicEntrance:
@@ -231,15 +246,34 @@ class LogicEntrance:
     attend_fair = "Attend Stardew Valley Fair"
     attend_spirit_eve = "Attend Spirit's Eve"
     attend_festival_of_ice = "Attend Festival of Ice"
+    buy_from_hat_mouse = "Buy From Hat Mouse"
+    buy_from_lost_items_shop = "Buy From Lost Items Shop"
     attend_night_market = "Attend Night Market"
     attend_winter_star = "Attend Feast of the Winter Star"
     attend_squidfest = "Attend SquidFest"
-    buy_experience_books = "Buy Experience Books from the bookseller"
-    buy_year1_books = "Buy Year 1 Books from the Bookseller"
-    buy_year3_books = "Buy Year 3 Books from the Bookseller"
-    complete_raccoon_requests = "Complete Raccoon Requests"
-    buy_from_raccoon = "Buy From Raccoon"
+    buy_books = "Buy from the bookseller"
+    buy_permanent_books = "Buy Permanent Books"
+    buy_rare_books = "Buy Rare Books"
+    buy_experience_books = "Buy Experience Books"
+    has_giant_stump = "Has Giant Stump"
+    can_complete_raccoon_requests_1 = "Can Complete Raccoon Request 1"
+    can_complete_raccoon_requests_2 = "Can Complete Raccoon Request 2"
+    can_complete_raccoon_requests_3 = "Can Complete Raccoon Request 3"
+    can_complete_raccoon_requests_4 = "Can Complete Raccoon Request 4"
+    can_complete_raccoon_requests_5 = "Can Complete Raccoon Request 5"
+    can_complete_raccoon_requests_6 = "Can Complete Raccoon Request 6"
+    can_complete_raccoon_requests_7 = "Can Complete Raccoon Request 7"
+    can_complete_raccoon_requests_8 = "Can Complete Raccoon Request 8"
+    buy_from_raccoon_1 = "Buy From Raccoon After 1 Request"
+    buy_from_raccoon_2 = "Buy From Raccoon After 2 Requests"
+    buy_from_raccoon_3 = "Buy From Raccoon After 3 Requests"
+    buy_from_raccoon_4 = "Buy From Raccoon After 4 Requests"
+    buy_from_raccoon_5 = "Buy From Raccoon After 5 Requests"
+    buy_from_raccoon_6 = "Buy From Raccoon After 6 Requests"
     fish_in_waterfall = "Fish In Waterfall"
+    find_secret_notes = "Find Secret Notes"
+    search_garbage_cans = "Search Garbage Cans"
+    purchase_wizard_blueprints = "Purchase Wizard Blueprints"
 
 
 # Skull Cavern Elevator
diff --git a/worlds/stardew_valley/strings/festival_check_names.py b/worlds/stardew_valley/strings/festival_check_names.py
index b59b3cd03f..e6755a0aa6 100644
--- a/worlds/stardew_valley/strings/festival_check_names.py
+++ b/worlds/stardew_valley/strings/festival_check_names.py
@@ -16,7 +16,7 @@ class FestivalCheck:
     lupini_the_serpent = "Lupini: The Serpent"
     lupini_three_trees = "Lupini: Three Trees"
     lupini_tropical_fish = "Lupini: 'Tropical Fish #173'"
-    mermaid_pearl = "Mermaid Pearl"
+    mermaid_show = "Mermaid Show"
     moonlight_jellies = "Dance of the Moonlight Jellies"
     rarecrow_1 = "Rarecrow #1 (Turnip Head)"
     rarecrow_2 = "Rarecrow #2 (Witch)"
diff --git a/worlds/stardew_valley/strings/flower_names.py b/worlds/stardew_valley/strings/flower_names.py
index 7e708fc3c0..e07f82b06b 100644
--- a/worlds/stardew_valley/strings/flower_names.py
+++ b/worlds/stardew_valley/strings/flower_names.py
@@ -1,7 +1,15 @@
+all_flowers = []
+
+
+def flower(flower_name: str) -> str:
+    all_flowers.append(flower_name)
+    return flower_name
+
+
 class Flower:
-    blue_jazz = "Blue Jazz"
-    fairy_rose = "Fairy Rose"
-    poppy = "Poppy"
-    summer_spangle = "Summer Spangle"
-    sunflower = "Sunflower"
-    tulip = "Tulip"
+    blue_jazz = flower("Blue Jazz")
+    fairy_rose = flower("Fairy Rose")
+    poppy = flower("Poppy")
+    summer_spangle = flower("Summer Spangle")
+    sunflower = flower("Sunflower")
+    tulip = flower("Tulip")
diff --git a/worlds/stardew_valley/strings/goal_names.py b/worlds/stardew_valley/strings/goal_names.py
index 601b005104..2eeea03ccb 100644
--- a/worlds/stardew_valley/strings/goal_names.py
+++ b/worlds/stardew_valley/strings/goal_names.py
@@ -13,5 +13,7 @@ class Goal:
     craft_master = "Craft Master"
     legend = "Legend"
     mystery_of_the_stardrops = "Mystery of the Stardrops"
+    mad_hatter = "Mad Hatter"
+    ultimate_foodie = "Ultimate Foodie"
     allsanity = "Allsanity"
     perfection = "Perfection"
diff --git a/worlds/stardew_valley/strings/machine_names.py b/worlds/stardew_valley/strings/machine_names.py
index d9e249a335..382593278a 100644
--- a/worlds/stardew_valley/strings/machine_names.py
+++ b/worlds/stardew_valley/strings/machine_names.py
@@ -34,4 +34,6 @@ class Machine:
     anvil = "Anvil"
     mini_forge = "Mini-Forge"
     bait_maker = "Bait Maker"
+    sewing_machine = "Sewing Machine"
+    statue_endless_fortune = "Statue Of Endless Fortune"
 
diff --git a/worlds/stardew_valley/strings/meme_item_names.py b/worlds/stardew_valley/strings/meme_item_names.py
new file mode 100644
index 0000000000..8689f8e6dd
--- /dev/null
+++ b/worlds/stardew_valley/strings/meme_item_names.py
@@ -0,0 +1,20 @@
+class MemeItem:
+    pot_of_gold = "PotOfGold"
+    seed_spot = "Seed Spot"
+    green_rain_weeds_0 = "GreenRainWeeds0"
+    lumber = "Lumber"
+    weeds = "Weeds"
+    twig = "Twig"
+    artifact_spot = "Artifact Spot"
+    warp_totem_qis_arena = "Warp Totem: Qi's Arena"
+    supply_crate = "SupplyCrate"
+    slime_crate = "Slime Crate"
+    decorative_pot = "Decorative Pot"
+    camping_stove = "Camping Stove"
+    worn_pants = "Worn Pants"
+    worn_left_ring = "Worn Left Ring"
+    worn_right_ring = "Worn Right Ring"
+    worn_shirt = "Worn Shirt"
+    worn_boots = "Worn Boots"
+    worn_hat = "Worn Hat"
+    trap = "Fun Trap"
diff --git a/worlds/stardew_valley/strings/metal_names.py b/worlds/stardew_valley/strings/metal_names.py
index 7efdc7ed33..fa0d018437 100644
--- a/worlds/stardew_valley/strings/metal_names.py
+++ b/worlds/stardew_valley/strings/metal_names.py
@@ -17,7 +17,7 @@ class Ore:
     iron = "Iron Ore"
     gold = "Gold Ore"
     iridium = "Iridium Ore"
-    radioactive = "Radioactive Bar"
+    radioactive = "Radioactive Ore"
 
 
 class MetalBar:
@@ -26,58 +26,67 @@ class MetalBar:
     iron = "Iron Bar"
     gold = "Gold Bar"
     iridium = "Iridium Bar"
-    radioactive = "Radioactive Ore"
+    radioactive = "Radioactive Bar"
 
 
 class Mineral:
-    petrified_slime = "Petrified Slime"
-    quartz = "Quartz"
-    earth_crystal = "Earth Crystal"
-    fire_quartz = "Fire Quartz"
-    marble = "Marble"
-    prismatic_shard = "Prismatic Shard"
-    diamond = "Diamond"
-    frozen_tear = "Frozen Tear"
-    aquamarine = "Aquamarine"
-    topaz = "Topaz"
-    jade = "Jade"
-    ruby = "Ruby"
-    emerald = "Emerald"
     amethyst = "Amethyst"
+    any_gem = "Any Gem"
+    aquamarine = "Aquamarine"
+    diamond = "Diamond"
+    earth_crystal = "Earth Crystal"
+    emerald = "Emerald"
+    fire_quartz = "Fire Quartz"
+    frozen_tear = "Frozen Tear"
+    ghost_crystal = "Ghost Crystal"
+    jade = "Jade"
+    jamborite = "Jamborite"
+    kyanite = "Kyanite"
+    lemon_stone = "Lemon Stone"
+    limestone = "Limestone"
+    marble = "Marble"
+    mudstone = "Mudstone"
+    obsidian = "Obsidian"
+    opal = "Opal"
+    petrified_slime = "Petrified Slime"
+    prismatic_shard = "Prismatic Shard"
+    quartz = "Quartz"
+    ruby = "Ruby"
+    thunder_egg = "Thunder Egg"
     tigerseye = "Tigerseye"
+    topaz = "Topaz"
 
 
 class Artifact:
-    prehistoric_handaxe = "Prehistoric Handaxe"
-    dwarf_gadget = artifact("Dwarf Gadget")
-    ancient_seed = artifact("Ancient Seed")
-    glass_shards = artifact("Glass Shards")
-    rusty_cog = artifact("Rusty Cog")
-    rare_disc = artifact("Rare Disc")
+    anchor = artifact("Anchor")
     ancient_doll = artifact("Ancient Doll")
     ancient_drum = artifact("Ancient Drum")
+    ancient_seed = artifact("Ancient Seed")
     ancient_sword = artifact("Ancient Sword")
     arrowhead = artifact("Arrowhead")
     bone_flute = artifact("Bone Flute")
     chewing_stick = artifact("Chewing Stick")
     chicken_statue = artifact("Chicken Statue")
-    anchor = artifact("Anchor")
     chipped_amphora = artifact("Chipped Amphora")
+    dwarf_gadget = artifact("Dwarf Gadget")
     dwarf_scroll_i = artifact("Dwarf Scroll I")
     dwarf_scroll_ii = artifact("Dwarf Scroll II")
     dwarf_scroll_iii = artifact("Dwarf Scroll III")
     dwarf_scroll_iv = artifact("Dwarf Scroll IV")
     dwarvish_helm = artifact("Dwarvish Helm")
     elvish_jewelry = artifact("Elvish Jewelry")
+    glass_shards = artifact("Glass Shards")
     golden_mask = artifact("Golden Mask")
     golden_relic = artifact("Golden Relic")
     ornamental_fan = artifact("Ornamental Fan")
-    prehistoric_hammer = artifact("Prehistoric Handaxe")
+    prehistoric_handaxe = artifact("Prehistoric Handaxe")
     prehistoric_tool = artifact("Prehistoric Tool")
+    rare_disc = artifact("Rare Disc")
+    rusty_cog = artifact("Rusty Cog")
     rusty_spoon = artifact("Rusty Spoon")
     rusty_spur = artifact("Rusty Spur")
-    strange_doll_green = artifact("Strange Doll (Green)")
     strange_doll = artifact("Strange Doll")
+    strange_doll_green = artifact("Strange Doll (Green)")
 
 
 class Fossil:
@@ -94,13 +103,12 @@ class Fossil:
     mummified_frog = fossil("Mummified Frog")
     nautilus_fossil = fossil("Nautilus Fossil")
     palm_fossil = fossil("Palm Fossil")
-    prehistoric_hand = fossil("Skeletal Hand")
     prehistoric_rib = fossil("Prehistoric Rib")
     prehistoric_scapula = fossil("Prehistoric Scapula")
     prehistoric_skull = fossil("Prehistoric Skull")
     prehistoric_tibia = fossil("Prehistoric Tibia")
     prehistoric_vertebra = fossil("Prehistoric Vertebra")
-    skeletal_hand = "Skeletal Hand"
+    skeletal_hand = fossil("Skeletal Hand")
     skeletal_tail = fossil("Skeletal Tail")
     snake_skull = fossil("Snake Skull")
     snake_vertebrae = fossil("Snake Vertebrae")
@@ -108,37 +116,37 @@ class Fossil:
 
 
 class ModArtifact:
-    ancient_hilt = "Ancient Hilt"
     ancient_blade = "Ancient Blade"
+    ancient_doll_body = "Ancient Doll Body"
+    ancient_doll_legs = "Ancient Doll Legs"
+    ancient_hilt = "Ancient Hilt"
+    chipped_amphora_piece_1 = "Chipped Amphora Piece 1"
+    chipped_amphora_piece_2 = "Chipped Amphora Piece 2"
     mask_piece_1 = "Mask Piece 1"
     mask_piece_2 = "Mask Piece 2"
     mask_piece_3 = "Mask Piece 3"
-    ancient_doll_body = "Ancient Doll Body"
-    ancient_doll_legs = "Ancient Doll Legs"
     prismatic_shard_piece_1 = "Prismatic Shard Piece 1"
     prismatic_shard_piece_2 = "Prismatic Shard Piece 2"
     prismatic_shard_piece_3 = "Prismatic Shard Piece 3"
     prismatic_shard_piece_4 = "Prismatic Shard Piece 4"
-    chipped_amphora_piece_1 = "Chipped Amphora Piece 1"
-    chipped_amphora_piece_2 = "Chipped Amphora Piece 2"
 
 
 class ModFossil:
-    neanderthal_limb_bones = "Neanderthal Limb Bones"
-    neanderthal_ribs = "Neanderthal Ribs"
-    neanderthal_skull = "Neanderthal Skull"
-    neanderthal_pelvis = "Neanderthal Pelvis"
-    dinosaur_tooth = "Dinosaur Tooth"
-    dinosaur_skull = "Dinosaur Skull"
     dinosaur_claw = "Dinosaur Claw"
     dinosaur_femur = "Dinosaur Femur"
-    dinosaur_ribs = "Dinosaur Ribs"
     dinosaur_pelvis = "Dinosaur Pelvis"
+    dinosaur_ribs = "Dinosaur Ribs"
+    dinosaur_skull = "Dinosaur Skull"
+    dinosaur_tooth = "Dinosaur Tooth"
     dinosaur_vertebra = "Dinosaur Vertebra"
-    pterodactyl_ribs = "Pterodactyl Ribs"
-    pterodactyl_skull = "Pterodactyl Skull"
-    pterodactyl_r_wing_bone = "Pterodactyl R Wing Bone"
+    neanderthal_limb_bones = "Neanderthal Limb Bones"
+    neanderthal_pelvis = "Neanderthal Pelvis"
+    neanderthal_ribs = "Neanderthal Ribs"
+    neanderthal_skull = "Neanderthal Skull"
+    pterodactyl_claw = "Pterodactyl Claw"
     pterodactyl_l_wing_bone = "Pterodactyl L Wing Bone"
     pterodactyl_phalange = "Pterodactyl Phalange"
+    pterodactyl_r_wing_bone = "Pterodactyl R Wing Bone"
+    pterodactyl_ribs = "Pterodactyl Ribs"
+    pterodactyl_skull = "Pterodactyl Skull"
     pterodactyl_vertebra = "Pterodactyl Vertebra"
-    pterodactyl_claw = "Pterodactyl Claw"
diff --git a/worlds/stardew_valley/strings/monster_names.py b/worlds/stardew_valley/strings/monster_names.py
index e995d563f0..59c0ddd607 100644
--- a/worlds/stardew_valley/strings/monster_names.py
+++ b/worlds/stardew_valley/strings/monster_names.py
@@ -49,6 +49,8 @@ class Monster:
     royal_serpent = "Royal Serpent"
     magma_sprite = "Magma Sprite"
     magma_sparker = "Magma Sparker"
+    metal_head = "Metal Head"
+    haunted_skull = "Haunted Skull"
 
 
 class MonsterCategory:
@@ -64,4 +66,7 @@ class MonsterCategory:
     pepper_rex = "Pepper Rex"
     serpents = "Serpents"
     magma_sprites = "Magma Sprites"
+    metal_heads = "Metal Heads"
+    none = "None"
+
 
diff --git a/worlds/stardew_valley/strings/quality_names.py b/worlds/stardew_valley/strings/quality_names.py
index 740bb5a3ef..2ddd86fee2 100644
--- a/worlds/stardew_valley/strings/quality_names.py
+++ b/worlds/stardew_valley/strings/quality_names.py
@@ -57,7 +57,22 @@ class ArtisanQuality:
         return ArtisanQuality.basic
 
 
+class AnimalProductQuality:
+    basic = "Basic AnimalProduct"
+    silver = "Silver AnimalProduct"
+    gold = "Gold AnimalProduct"
+    iridium = "Iridium AnimalProduct"
+
+    @staticmethod
+    def get_highest(qualities: List[str]) -> str:
+        for quality in animal_product_qualities_in_desc_order:
+            if quality in qualities:
+                return quality
+        return AnimalProductQuality.basic
+
+
 crop_qualities_in_desc_order = [CropQuality.iridium, CropQuality.gold, CropQuality.silver, CropQuality.basic]
 fish_qualities_in_desc_order = [FishQuality.iridium, FishQuality.gold, FishQuality.silver, FishQuality.basic]
 forage_qualities_in_desc_order = [ForageQuality.iridium, ForageQuality.gold, ForageQuality.silver, ForageQuality.basic]
 artisan_qualities_in_desc_order = [ArtisanQuality.iridium, ArtisanQuality.gold, ArtisanQuality.silver, ArtisanQuality.basic]
+animal_product_qualities_in_desc_order = [AnimalProductQuality.iridium, AnimalProductQuality.gold, AnimalProductQuality.silver, AnimalProductQuality.basic]
diff --git a/worlds/stardew_valley/strings/region_names.py b/worlds/stardew_valley/strings/region_names.py
index 567f131581..d9fe1a43e3 100644
--- a/worlds/stardew_valley/strings/region_names.py
+++ b/worlds/stardew_valley/strings/region_names.py
@@ -1,3 +1,6 @@
+from .tool_names import ToolMaterial
+
+
 class Region:
     menu = "Menu"
     stardew_valley = "Stardew Valley"
@@ -31,6 +34,7 @@ class Region:
     mines = "The Mines"
     skull_cavern_entrance = "Skull Cavern Entrance"
     skull_cavern = "Skull Cavern"
+    skull_cavern_mining = "Skull Cavern Mining"
     sewer = "Sewer"
     mutant_bug_lair = "Mutant Bug Lair"
     witch_swamp = "Witch's Swamp"
@@ -106,8 +110,11 @@ class Region:
     boat_tunnel = "Boat Tunnel"
     tide_pools = "Tide Pools"
     bathhouse_entrance = "Bathhouse Entrance"
-    locker_room = "Locker Room"
+    mens_locker_room = "Men's Locker Room"
+    womens_locker_room = "Women's Locker Room"
     public_bath = "Public Bath"
+    lewis_bedroom = "Lewis's Bedroom"
+    purple_shorts_maze = "Purple Shorts Maze"
     jotpk_world_1 = "JotPK World 1"
     jotpk_world_2 = "JotPK World 2"
     jotpk_world_3 = "JotPK World 3"
@@ -142,6 +149,8 @@ class Region:
     dangerous_mines_20 = "Dangerous Mines - Floor 20"
     dangerous_mines_60 = "Dangerous Mines - Floor 60"
     dangerous_mines_100 = "Dangerous Mines - Floor 100"
+    outside_adventure_guild = "Outside Adventure Guild"
+    trash_bear = "Trash Bear"
 
 
 class LogicRegion:
@@ -164,10 +173,10 @@ class LogicRegion:
     def blacksmith_upgrade(material: str) -> str:
         return f"Blacksmith {material} Upgrades"
 
-    blacksmith_copper = blacksmith_upgrade("Copper")
-    blacksmith_iron = blacksmith_upgrade("Iron")
-    blacksmith_gold = blacksmith_upgrade("Gold")
-    blacksmith_iridium = blacksmith_upgrade("Iridium")
+    blacksmith_copper = blacksmith_upgrade(ToolMaterial.copper)
+    blacksmith_iron = blacksmith_upgrade(ToolMaterial.iron)
+    blacksmith_gold = blacksmith_upgrade(ToolMaterial.gold)
+    blacksmith_iridium = blacksmith_upgrade(ToolMaterial.iridium)
 
     spring_farming = "Spring Farming"
     summer_farming = "Summer Farming"
@@ -190,11 +199,30 @@ class LogicRegion:
     winter_star = "Feast of the Winter Star"
     squidfest = "SquidFest"
     raccoon_daddy = "Raccoon Bundles"
-    raccoon_shop = "Raccoon Shop"
-    bookseller_1 = "Bookseller Experience Books"
-    bookseller_2 = "Bookseller Year 1 Books"
-    bookseller_3 = "Bookseller Year 3 Books"
+    raccoon_request_1 = "Raccoon Request 1"
+    raccoon_request_2 = "Raccoon Request 2"
+    raccoon_request_3 = "Raccoon Request 3"
+    raccoon_request_4 = "Raccoon Request 4"
+    raccoon_request_5 = "Raccoon Request 5"
+    raccoon_request_6 = "Raccoon Request 6"
+    raccoon_request_7 = "Raccoon Request 7"
+    raccoon_request_8 = "Raccoon Request 8"
+    raccoon_shop_1 = "Raccoon Shop After 1 Request"
+    raccoon_shop_2 = "Raccoon Shop After 2 Requests"
+    raccoon_shop_3 = "Raccoon Shop After 3 Requests"
+    raccoon_shop_4 = "Raccoon Shop After 4 Requests"
+    raccoon_shop_5 = "Raccoon Shop After 5 Requests"
+    raccoon_shop_6 = "Raccoon Shop After 6 Requests"
+    bookseller = "Bookseller"
+    bookseller_permanent = "Bookseller Permanent Books"
+    bookseller_rare = "Bookseller Rare Books"
+    bookseller_experience = "Bookseller Experience Books"
     forest_waterfall = "Waterfall"
+    secret_notes = "Secret Notes"
+    hat_mouse = "Hat Mouse"
+    lost_items_shop = "Lost Items Shop"
+    garbage_cans = "Garbage Cans"
+    wizard_blueprints = "Wizard Blueprints"
 
 
 class DeepWoodsRegion:
diff --git a/worlds/stardew_valley/strings/ring_names.py b/worlds/stardew_valley/strings/ring_names.py
new file mode 100644
index 0000000000..ab7f29425d
--- /dev/null
+++ b/worlds/stardew_valley/strings/ring_names.py
@@ -0,0 +1,16 @@
+all_ring_names = []
+
+
+def ring(name: str) -> str:
+    all_ring_names.append(name)
+    return name
+
+
+class Ring:
+    slime_charmer = ring("Slime Charmer Ring")
+    ring_of_yoba = ring("Ring of Yoba")
+    sturdy = ring("Sturdy Ring")
+    burglar = ring("Burglar's Ring")
+    iridium_band = ring("Iridium Band")
+    napalm = ring("Napalm Ring")
+    hot_java = ring("Hot Java Ring")
\ No newline at end of file
diff --git a/worlds/stardew_valley/strings/special_item_names.py b/worlds/stardew_valley/strings/special_item_names.py
new file mode 100644
index 0000000000..b20f2eb094
--- /dev/null
+++ b/worlds/stardew_valley/strings/special_item_names.py
@@ -0,0 +1,10 @@
+class SpecialItem:
+    lucky_purple_shorts = "Lucky Purple Shorts"
+    trimmed_purple_shorts = "Trimmed Lucky Purple Shorts"
+    far_away_stone = "Far Away Stone"
+    solid_gold_lewis = "Solid Gold Lewis"
+    advanced_tv_remote = "Advanced TV Remote"
+
+
+class NotReallyAnItem:
+    death = "Death"
diff --git a/worlds/stardew_valley/strings/tool_names.py b/worlds/stardew_valley/strings/tool_names.py
index 761f50e0a9..4a83357c91 100644
--- a/worlds/stardew_valley/strings/tool_names.py
+++ b/worlds/stardew_valley/strings/tool_names.py
@@ -7,7 +7,6 @@ class Tool:
     pan = "Pan"
     fishing_rod = "Fishing Rod"
     scythe = "Scythe"
-    golden_scythe = "Golden Scythe"
 
 
 class ToolMaterial:
@@ -16,11 +15,36 @@ class ToolMaterial:
     iron = "Iron"
     gold = "Gold"
     iridium = "Iridium"
-    tiers = {0: basic,
-             1: copper,
-             2: iron,
-             3: gold,
-             4: iridium}
+    materials = [basic, copper, iron, gold, iridium]
+    tiers = {
+        1: basic,
+        2: copper,
+        3: iron,
+        4: gold,
+        5: iridium
+    }
+
+
+class FishingRod:
+    training = "Training"
+    bamboo = "Bamboo"
+    fiberglass = "Fiberglass"
+    iridium = "Iridium"
+    advanced_iridium = "Advanced Iridium"
+    tiers = {
+        1: training,
+        2: bamboo,
+        3: fiberglass,
+        4: iridium,
+        5: advanced_iridium
+    }
+    material_to_tier = {
+        training: 1,
+        bamboo: 2,
+        fiberglass: 3,
+        iridium: 4,
+        advanced_iridium: 5
+    }
 
 
 class APTool:
@@ -29,4 +53,4 @@ class APTool:
     hoe = f"Progressive {Tool.hoe}"
     watering_can = f"Progressive {Tool.watering_can}"
     trash_can = f"Progressive {Tool.trash_can}"
-    fishing_rod = f"Progressive {Tool.fishing_rod}"
\ No newline at end of file
+    fishing_rod = f"Progressive {Tool.fishing_rod}"
diff --git a/worlds/stardew_valley/strings/trap_names.py b/worlds/stardew_valley/strings/trap_names.py
new file mode 100644
index 0000000000..12185143e7
--- /dev/null
+++ b/worlds/stardew_valley/strings/trap_names.py
@@ -0,0 +1,32 @@
+all_traps = []
+
+
+def trap(name: str) -> str:
+    all_traps.append(name)
+    return name
+
+
+class Trap:
+    trap("Burnt Trap")
+    trap("Darkness Trap")
+    trap("Frozen Trap")
+    trap("Jinxed Trap")
+    trap("Nauseated Trap")
+    trap("Slimed Trap")
+    trap("Weakness Trap")
+    trap("Taxes Trap")
+    trap("Random Teleport Trap")
+    trap("The Crows Trap")
+    trap("Monsters Trap")
+    trap("Debris Trap")
+    trap("Shuffle Trap")
+    trap("Pariah Trap")
+    trap("Drought Trap")
+    trap("Time Flies Trap")
+    trap("Babies Trap")
+    trap("Meow Trap")
+    trap("Bark Trap")
+    trap("Benjamin Budton Trap")
+    trap("Inflation Trap")
+    trap("Bomb Trap")
+    trap("Nudge Trap")
diff --git a/worlds/stardew_valley/strings/tv_channel_names.py b/worlds/stardew_valley/strings/tv_channel_names.py
index e01bd55e2c..cf98aa2e14 100644
--- a/worlds/stardew_valley/strings/tv_channel_names.py
+++ b/worlds/stardew_valley/strings/tv_channel_names.py
@@ -1,2 +1,3 @@
 class Channel:
     queen_of_sauce = "The Queen of Sauce"
+    sinister_signal = "Sinister Signal"
diff --git a/worlds/stardew_valley/strings/wallet_item_names.py b/worlds/stardew_valley/strings/wallet_item_names.py
index 743d1f0c01..c029f0d563 100644
--- a/worlds/stardew_valley/strings/wallet_item_names.py
+++ b/worlds/stardew_valley/strings/wallet_item_names.py
@@ -10,3 +10,6 @@ class Wallet:
     club_card = "Club Card"
     mastery_of_the_five_ways = "Mastery Of The Five Ways"
     key_to_the_town = "Key To The Town"
+    magic_ink = "Magic Ink"
+    mens_locker_key = "Men's Locker Key"
+    womens_locker_key = "Women's Locker Key"
diff --git a/worlds/stardew_valley/test/TestBackpack.py b/worlds/stardew_valley/test/TestBackpack.py
index bccafd15e5..feda16791a 100644
--- a/worlds/stardew_valley/test/TestBackpack.py
+++ b/worlds/stardew_valley/test/TestBackpack.py
@@ -1,33 +1,45 @@
 from .bases import SVTestBase
-from .. import options
+from .. import options, StartWithoutOptionName
 
 
-class TestBackpackVanilla(SVTestBase):
+class TestBackpackBase(SVTestBase):
+    expected_starting_backpacks: int = 0
+    expected_total_backpacks: int = 2
+
+    def test_has_correct_number_of_backpacks(self):
+        backpack_item_name = "Progressive Backpack"
+        item_names = [item.name for item in self.multiworld.get_items()]
+        precollected_items = [item.name for item in self.multiworld.precollected_items[self.player]]
+        if self.expected_total_backpacks <= 0:
+            self.assertNotIn(backpack_item_name, item_names)
+        else:
+            self.assertEqual(item_names.count(backpack_item_name), self.expected_total_backpacks - self.expected_starting_backpacks)
+        if self.expected_starting_backpacks <= 0:
+            self.assertNotIn(backpack_item_name, precollected_items)
+        else:
+            self.assertEqual(precollected_items.count(backpack_item_name), self.expected_starting_backpacks)
+
+
+class TestBackpackVanilla(TestBackpackBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla}
+    expected_total_backpacks = 0
 
-    def test_no_backpack(self):
-        with self.subTest("no items"):
-            item_names = {item.name for item in self.multiworld.get_items()}
-            self.assertNotIn("Progressive Backpack", item_names)
-
-        with self.subTest("no locations"):
-            location_names = {location.name for location in self.multiworld.get_locations()}
-            self.assertNotIn("Large Pack", location_names)
-            self.assertNotIn("Deluxe Pack", location_names)
+    def test_no_backpacks(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
 
 
-class TestBackpackProgressive(SVTestBase):
+class TestBackpackProgressive(TestBackpackBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive}
+    expected_total_backpacks = 2
 
-    def test_backpack(self):
-        with self.subTest(check="has items"):
-            item_names = [item.name for item in self.multiworld.get_items()]
-            self.assertEqual(item_names.count("Progressive Backpack"), 2)
-
-        with self.subTest(check="has locations"):
-            location_names = {location.name for location in self.multiworld.get_locations()}
-            self.assertIn("Large Pack", location_names)
-            self.assertIn("Deluxe Pack", location_names)
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertIn("Large Pack", location_names)
+        self.assertIn("Deluxe Pack", location_names)
 
 
 class TestBackpackEarlyProgressive(TestBackpackProgressive):
@@ -38,8 +50,164 @@ class TestBackpackEarlyProgressive(TestBackpackProgressive):
         # EarlyProgressive is default
         return False
 
-    def test_backpack(self):
-        super().test_backpack()
+    def test_has_correct_backpack_locations(self):
+        super().test_has_correct_backpack_locations()
 
         with self.subTest(check="is early"):
             self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
+
+
+class TestBackpackSplit1(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_1}
+    expected_total_backpacks = 24
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestBackpackSplit2(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_2}
+    expected_total_backpacks = 12
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 7):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+        for i in range(7, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestBackpackSplit4(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_4}
+    expected_total_backpacks = 6
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 4):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+        for i in range(4, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestBackpackSplit6(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_6}
+    expected_total_backpacks = 4
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 3):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+        for i in range(3, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestStartWithoutBackpackSize1(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_1,
+               options.StartWithout.internal_name: frozenset({StartWithoutOptionName.backpack})}
+    expected_starting_backpacks = 6
+    expected_total_backpacks = 36
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 13):
+            self.assertIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestStartWithoutBackpackSize3(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_3,
+               options.StartWithout.internal_name: frozenset({StartWithoutOptionName.backpack})}
+    expected_starting_backpacks = 2
+    expected_total_backpacks = 12
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 5):
+            self.assertIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+        for i in range(5, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestStartWithoutBackpackSize4(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_4,
+               options.StartWithout.internal_name: frozenset({StartWithoutOptionName.backpack})}
+    expected_starting_backpacks = 2
+    expected_total_backpacks = 9
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn("Small Pack", location_names)
+        self.assertNotIn("Large Pack", location_names)
+        self.assertNotIn("Deluxe Pack", location_names)
+        for i in range(1, 4):
+            self.assertIn(f"Small Pack {i}", location_names)
+            self.assertIn(f"Large Pack {i}", location_names)
+            self.assertIn(f"Deluxe Pack {i}", location_names)
+        for i in range(4, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
+
+
+class TestStartWithoutBackpackSize12(TestBackpackBase):
+    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+               options.BackpackSize.internal_name: options.BackpackSize.option_12,
+               options.StartWithout.internal_name: frozenset({StartWithoutOptionName.backpack})}
+    expected_starting_backpacks = 1
+    expected_total_backpacks = 3
+
+    def test_has_correct_backpack_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertIn("Small Pack", location_names)
+        self.assertIn("Large Pack", location_names)
+        self.assertIn("Deluxe Pack", location_names)
+        for i in range(1, 13):
+            self.assertNotIn(f"Small Pack {i}", location_names)
+            self.assertNotIn(f"Large Pack {i}", location_names)
+            self.assertNotIn(f"Deluxe Pack {i}", location_names)
diff --git a/worlds/stardew_valley/test/TestBeta7Logic.py b/worlds/stardew_valley/test/TestBeta7Logic.py
new file mode 100644
index 0000000000..1fa8b2aed9
--- /dev/null
+++ b/worlds/stardew_valley/test/TestBeta7Logic.py
@@ -0,0 +1,293 @@
+from worlds.stardew_valley import BackpackProgression, ToolProgression, SeasonRandomization
+from worlds.stardew_valley.mods.mod_data import ModNames
+from worlds.stardew_valley.options import BackpackSize, Mods, QuestLocations, SkillProgression, Secretsanity, Museumsanity, Booksanity, Hatsanity, Cropsanity, \
+    StartWithout
+from worlds.stardew_valley.strings.ap_names.ap_option_names import SecretsanityOptionName, StartWithoutOptionName
+from worlds.stardew_valley.test.bases import SVTestBase
+
+
+class TestAvailableBackpacksSize1(SVTestBase):
+    options = {
+        SeasonRandomization: SeasonRandomization.option_disabled,
+        Cropsanity: Cropsanity.option_disabled,
+        BackpackProgression: BackpackProgression.option_progressive,
+        BackpackSize: 1,
+        StartWithout: frozenset({StartWithoutOptionName.backpack}),
+        Mods: frozenset({ModNames.big_backpack}),
+    }
+
+    def test_can_purchase_correct_number_of_backpacks(self):
+        backpack_names = ["Small Pack", "Large Pack", "Deluxe Pack", "Premium Pack"]
+        backpack_location_names = []
+        for backpack_name in backpack_names:
+            for i in range(1, 13):
+                backpack_location_names.append(f"{backpack_name} {i}")
+
+        items_required = ["Shipping Bin", "Progressive Hoe", "Progressive Watering Can"]
+        for item in items_required:
+            self.collect(item)
+        self.collect_lots_of_money(0.15)
+        number_owned_backpacks = self.multiworld.state.prog_items[self.player]["Progressive Backpack"]
+        while number_owned_backpacks < 48:
+            number_available = number_owned_backpacks + 1
+            with self.subTest(f"Can Purchase {number_available} backpacks when you own {number_owned_backpacks} backpacks"):
+                for i in range(0, len(backpack_location_names)):
+                    if i < number_available:
+                        self.assert_can_reach_location(backpack_location_names[i])
+                    else:
+                        self.assert_cannot_reach_location(backpack_location_names[i])
+            self.collect("Progressive Backpack")
+            number_owned_backpacks = self.multiworld.state.prog_items[self.player]["Progressive Backpack"]
+
+
+class TestAvailableBackpacksSize4(SVTestBase):
+    options = {
+        SeasonRandomization: SeasonRandomization.option_disabled,
+        Cropsanity: Cropsanity.option_disabled,
+        BackpackProgression: BackpackProgression.option_progressive,
+        BackpackSize: 4,
+        StartWithout: frozenset({StartWithoutOptionName.backpack}),
+        Mods: frozenset({ModNames.big_backpack}),
+    }
+
+    def test_can_purchase_correct_number_of_backpacks(self):
+        backpack_names = ["Small Pack", "Large Pack", "Deluxe Pack", "Premium Pack"]
+        backpack_location_names = []
+        for backpack_name in backpack_names:
+            for i in range(1, 4):
+                backpack_location_names.append(f"{backpack_name} {i}")
+
+        items_required = ["Shipping Bin", "Progressive Hoe", "Progressive Watering Can"]
+        for item in items_required:
+            self.collect(item)
+        self.collect_lots_of_money(0.15)
+
+        number_owned_backpacks = self.multiworld.state.prog_items[self.player]["Progressive Backpack"]
+        while number_owned_backpacks * 4 < 48:
+            number_available = number_owned_backpacks + 1
+            with self.subTest(f"Can Purchase {number_available} backpacks when you own {number_owned_backpacks} backpacks"):
+                for i in range(0, len(backpack_location_names)):
+                    if i < number_available:
+                        self.assert_can_reach_location(backpack_location_names[i])
+                    else:
+                        self.assert_cannot_reach_location(backpack_location_names[i])
+            self.collect("Progressive Backpack")
+            number_owned_backpacks = self.multiworld.state.prog_items[self.player]["Progressive Backpack"]
+
+
+class TestBeachBridgeWithStartingToolsRequiresNothing(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: StartWithout.preset_none,
+    }
+
+    def test_beach_bridge_requires_axe(self):
+        beach_bridge_location = "Beach Bridge Repair"
+        self.assert_can_reach_location(beach_bridge_location)
+
+
+class TestBeachBridgeWithoutStartingToolsRequiresAxe(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools}),
+    }
+
+    def test_beach_bridge_requires_axe(self):
+        beach_bridge_location = "Beach Bridge Repair"
+        self.assert_cannot_reach_location(beach_bridge_location)
+        self.collect("Progressive Axe")
+        self.assert_can_reach_location(beach_bridge_location)
+
+
+class TestGrimReaperWithStartingToolsRequiresQuarryAndWeapon(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: StartWithout.preset_none,
+    }
+
+    def test_grim_reaper_requires_two_weapons(self):
+        grim_reaper_location = "Grim Reaper Statue"
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Landslide Removed")
+        self.collect("Bridge Repair")
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Progressive Weapon")
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Progressive Weapon")
+        self.assert_can_reach_location(grim_reaper_location)
+
+
+class TestGrimRepairWithoutStartingToolsRequiresQuarryAndPickaxeAndWeapon(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools}),
+    }
+
+    def test_grim_reaper_requires_weapon_and_pickaxe(self):
+        grim_reaper_location = "Grim Reaper Statue"
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Mountain Shortcuts")
+        self.collect("Bridge Repair")
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Progressive Weapon")
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Progressive Weapon")
+        self.assert_cannot_reach_location(grim_reaper_location)
+        self.collect("Progressive Pickaxe")
+        self.assert_can_reach_location(grim_reaper_location)
+
+
+class TestGatheringQuestsWithStartingToolsRequiresMinesAccess(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.landslide}),
+        QuestLocations: 7,
+    }
+
+    def test_gathering_quest_requires_landslide(self):
+        gathering_location = "Help Wanted: Gathering 1"
+        self.assert_cannot_reach_location(gathering_location)
+        self.collect("Landslide Removed")
+        self.assert_can_reach_location(gathering_location)
+
+
+class TestGatheringQuestsWithoutStartingToolsRequiresMinesAndAxeAndPickaxe(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools, StartWithoutOptionName.landslide}),
+        QuestLocations: 7,
+    }
+
+    def test_gathering_quest_requires_landslide_axe_and_pickaxe(self):
+        gathering_location = "Help Wanted: Gathering 1"
+        axe = self.create_item("Progressive Axe")
+        self.assert_cannot_reach_location(gathering_location)
+        self.collect("Landslide Removed")
+        self.assert_cannot_reach_location(gathering_location)
+        self.collect(axe)
+        self.assert_cannot_reach_location(gathering_location)
+        self.collect("Progressive Pickaxe")
+        self.assert_can_reach_location(gathering_location)
+        self.remove(axe)
+        self.assert_cannot_reach_location(gathering_location)
+
+
+class TestPrizeTicketAndHelpWanted(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools, StartWithoutOptionName.landslide}),
+        QuestLocations: 7,
+        Booksanity: Booksanity.option_all,
+        Hatsanity: Hatsanity.preset_all,
+    }
+
+    def test_prize_tickets_requires_all_help_wanteds_help_wanted(self):
+        locations = ["Wear Sports Cap", "Wear Chicken Mask", "Wear Polka Bow"]  # , "Read Friendship 101"] # Friendship 101's bookseller source messes this up
+        items_required = ["Shipping Bin", "Progressive Fishing Rod", "Spring", "Progressive Mine Elevator", "Progressive Hoe", "Progressive Watering Can"]
+        for item in items_required:
+            self.collect(item)
+        self.collect_lots_of_money(0.75)
+        items_to_test = [self.create_item(item) for item in ["Progressive Fishing Rod", "Landslide Removed", "Progressive Axe",
+                                                             "Progressive Pickaxe", "Progressive Weapon"]]
+        self.collect(items_to_test)
+        for location in locations:
+            with self.subTest(f"{location} can be accessed with all help wanted items"):
+                self.assert_can_reach_location(location)
+            for item in items_to_test:
+                self.remove(item)
+                with self.subTest(f"{location} Requires {item.name}"):
+                    self.assert_cannot_reach_location(location)
+                self.collect(item)
+                self.assert_can_reach_location(location)
+
+
+class TestSecretFishingRequiresFishingLevelsForDistance(SVTestBase):
+    options = {
+        SkillProgression: SkillProgression.option_progressive_with_masteries,
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools}),
+        Secretsanity: frozenset([SecretsanityOptionName.fishing]),
+    }
+
+    def test_pyramid_decal_requires_level_1(self):
+        pyramid_decal_location = "Fishing Secret: Pyramid Decal"
+        items_required = ["Progressive Fishing Rod", "Shipping Bin"] * 5
+        for item in items_required:
+            self.collect(item)
+        items_to_test = [self.create_item(item) for item in ["Bus Repair", "Fishing Level"]]
+        self.collect(items_to_test)
+        self.assert_can_reach_location(pyramid_decal_location)
+        for item in items_to_test:
+            with self.subTest(f"{pyramid_decal_location} Requires {item.name}"):
+                self.remove(item)
+                self.assert_cannot_reach_location(pyramid_decal_location)
+                self.collect(item)
+                self.assert_can_reach_location(pyramid_decal_location)
+
+    def test_foliage_print_requires_level_4(self):
+        foliage_print_location = "Fishing Secret: Foliage Print"
+        items_required = ["Progressive Fishing Rod", "Shipping Bin"] * 5
+        items_required.extend(["Fishing Level"] * 3)
+        for item in items_required:
+            self.collect(item)
+        items_to_test = [self.create_item(item) for item in ["Boat Repair", "Island North Turtle", "Fishing Level"]]
+        self.collect(items_to_test)
+        self.assert_can_reach_location(foliage_print_location)
+        for item in items_to_test:
+            with self.subTest(f"I{foliage_print_location} Requires {item.name}"):
+                self.remove(item)
+                self.assert_cannot_reach_location(foliage_print_location)
+                self.collect(item)
+                self.assert_can_reach_location(foliage_print_location)
+
+    def test_iridium_krobus_requires_level_15(self):
+        iridium_krobus_location = "Fishing Secret: Iridium Krobus"
+        items_required = ["Progressive Sword", "Progressive Pickaxe", "Progressive Footwear", "Combat Level", "Progressive House", "Landslide Removed", "Progressive Mine Elevator",
+                          "Mining Level", "Progressive Watering Can", "Progressive Hoe", "Progressive Fishing Rod", "50 Qi Gems", "Shipping Bin"] * 10
+        self.remove_one_by_name("Spring")
+        items_required.extend(["Summer", "Fall", "Winter"])
+        items_required.extend(["Fishing Level"] * 9)
+        for item in items_required:
+            self.collect(item)
+        self.collect_lots_of_money(0.6)
+        groups_of_items_to_test = {"Quality Seafoam Pudding": [self.create_item(item) for item in
+                                                               ["Fish Pond", "Qi Walnut Room", "Boat Repair", "Island West Turtle", "Fishing Level"]],
+                                   "Enchanted Rod and Seafoam Pudding": [self.create_item(item) for item in
+                                                                         ["Bus Repair", "Fish Pond", "Boat Repair", "Island North Turtle", "Fishing Level",
+                                                                          "Skull Key"]],
+                                   "Desert Chef and Escargot": [self.create_item(item) for item in
+                                                                ["Bus Repair", "Fishing Level", "Garlic Seeds", "Spring"]],
+                                   }
+        for item_group_to_test in groups_of_items_to_test:
+            items_to_test = groups_of_items_to_test[item_group_to_test]
+            with self.subTest(f"{iridium_krobus_location} Requires {item_group_to_test}"):
+                self.collect(items_to_test)
+                self.assert_can_reach_location(iridium_krobus_location)
+            for item in items_to_test:
+                with self.subTest(f"{iridium_krobus_location} Requires {item_group_to_test} [{item.name}]"):
+                    self.remove(item)
+                    self.assert_cannot_reach_location(iridium_krobus_location)
+                    self.collect(item)
+                    self.assert_can_reach_location(iridium_krobus_location)
+            self.remove(items_to_test)
+
+
+class TestArtifactSpotDonationsRequireHoe(SVTestBase):
+    options = {
+        ToolProgression: ToolProgression.option_progressive,
+        StartWithout: frozenset({StartWithoutOptionName.tools}),
+        Museumsanity: Museumsanity.option_all,
+    }
+
+    def test_artifact_spot_requires_hoe(self):
+        artifact_spot_artifacts = ["Chipped Amphora", "Ancient Doll", "Rusty Spoon", "Chicken Statue", "Prehistoric Tool"]
+        self.collect_lots_of_money(0.5)
+        self.collect("Traveling Merchant Metal Detector", 2)
+        hoe = self.create_item("Progressive Hoe")
+        for artifact in artifact_spot_artifacts:
+            with self.subTest(f"Artifact: {artifact}"):
+                artifact_location = f"Museumsanity: {artifact}"
+                self.assert_cannot_reach_location(artifact_location)
+                self.collect(hoe)
+                self.assert_can_reach_location(artifact_location)
+                self.remove(hoe)
diff --git a/worlds/stardew_valley/test/TestBundles.py b/worlds/stardew_valley/test/TestBundles.py
index 5b70158f5f..ccdafcc99b 100644
--- a/worlds/stardew_valley/test/TestBundles.py
+++ b/worlds/stardew_valley/test/TestBundles.py
@@ -1,10 +1,15 @@
 import unittest
+from typing import Dict, Optional
 
-from .bases import SVTestBase
-from .. import BundleRandomization
-from ..data.bundle_data import all_bundle_items_except_money, quality_crops_items_thematic, quality_foraging_items, quality_fish_items
-from ..options import BundlePlando
-from ..strings.bundle_names import BundleName
+from .bases import SVTestBase, SVTestCase
+from .. import BundleRandomization, location_table
+from ..bundles.bundle import Bundle
+from ..data.bundles_data.bundle_data import all_bundle_items_except_money, quality_crops_items_thematic, \
+    quality_foraging_items, quality_fish_items
+from ..data.bundles_data.meme_bundles import all_cc_meme_bundles
+from ..locations import LocationTags
+from ..options import BundleWhitelist, BundleBlacklist, BundlePrice
+from ..strings.bundle_names import BundleName, MemeBundleName, all_meme_bundle_names
 from ..strings.crop_names import Fruit
 from ..strings.quality_names import CropQuality, ForageQuality, FishQuality
 
@@ -53,23 +58,24 @@ class TestBundles(unittest.TestCase):
 
 
 class TestRemixedPlandoBundles(SVTestBase):
-    plando_bundles = {BundleName.money_2500, BundleName.money_5000, BundleName.money_10000, BundleName.gambler, BundleName.ocean_fish,
-                      BundleName.lake_fish, BundleName.deep_fishing, BundleName.spring_fish, BundleName.legendary_fish, BundleName.bait}
+    whitelist_bundles = {BundleName.money_2500, BundleName.money_5000, BundleName.money_10000, BundleName.gambler, BundleName.ocean_fish,
+                         BundleName.lake_fish, BundleName.deep_fishing, BundleName.spring_fish, BundleName.legendary_fish, BundleName.bait}
+    blacklist_bundles = {BundleName.spring_foraging, BundleName.quality_crops, BundleName.night_fish, BundleName.carnival, BundleName.dye,
+                         BundleName.enchanter}
     options = {
         BundleRandomization: BundleRandomization.option_remixed,
-        BundlePlando: frozenset(plando_bundles)
+        BundleWhitelist: frozenset(whitelist_bundles),
+        BundleBlacklist: frozenset(blacklist_bundles),
     }
 
     def test_all_plando_bundles_are_there(self):
         location_names = {location.name for location in self.multiworld.get_locations()}
-        for bundle_name in self.plando_bundles:
+        for bundle_name in self.whitelist_bundles:
             with self.subTest(f"{bundle_name}"):
                 self.assertIn(bundle_name, location_names)
-        self.assertNotIn(BundleName.money_25000, location_names)
-        self.assertNotIn(BundleName.carnival, location_names)
-        self.assertNotIn(BundleName.night_fish, location_names)
-        self.assertNotIn(BundleName.specialty_fish, location_names)
-        self.assertNotIn(BundleName.specific_bait, location_names)
+        for bundle_name in self.blacklist_bundles:
+            with self.subTest(f"{bundle_name}"):
+                self.assertNotIn(bundle_name, location_names)
 
 
 class TestRemixedAnywhereBundles(SVTestBase):
@@ -77,9 +83,12 @@ class TestRemixedAnywhereBundles(SVTestBase):
                          BundleName.lake_fish, BundleName.river_fish, BundleName.night_fish, BundleName.legendary_fish, BundleName.specialty_fish,
                          BundleName.bait, BundleName.specific_bait, BundleName.crab_pot, BundleName.tackle, BundleName.quality_fish,
                          BundleName.rain_fish, BundleName.master_fisher}
+    blacklist_bundles = {BundleName.spring_foraging, BundleName.quality_crops, BundleName.summer_foraging, BundleName.carnival, BundleName.dye,
+                         BundleName.enchanter, BundleName.fall_crops, BundleName.artisan}
     options = {
         BundleRandomization: BundleRandomization.option_remixed_anywhere,
-        BundlePlando: frozenset(fish_bundle_names)
+        BundleWhitelist: frozenset(fish_bundle_names),
+        BundleBlacklist: frozenset(blacklist_bundles),
     }
 
     def test_all_plando_bundles_are_there(self):
@@ -87,3 +96,119 @@ class TestRemixedAnywhereBundles(SVTestBase):
         for bundle_name in self.fish_bundle_names:
             with self.subTest(f"{bundle_name}"):
                 self.assertIn(bundle_name, location_names)
+        for bundle_name in self.blacklist_bundles:
+            with self.subTest(f"{bundle_name}"):
+                self.assertNotIn(bundle_name, location_names)
+
+
+class TestMemeBundles(SVTestBase):
+    options = {
+        BundleRandomization.internal_name: BundleRandomization.option_meme,
+        BundlePrice.internal_name: BundlePrice.option_maximum,
+    }
+
+    def test_can_complete_all_bundles_with_all_state(self):
+        self.collect_everything()
+        for location_name in self.get_real_location_names():
+            if location_name not in location_table or LocationTags.MEME_BUNDLE not in location_table[location_name].tags:
+                continue
+            with self.subTest(f"{location_name}"):
+                self.assert_can_reach_location(location_name)
+
+    def test_specific_bundles_are_not_affected_by_price(self):
+        all_bundles = [bundle for bundle_room in self.world.modified_bundles for bundle in bundle_room.bundles]
+        bundles_by_name = {bundle.name: bundle for bundle in all_bundles}
+        self.check_price(bundles_by_name, MemeBundleName.death, 1, 1, 1)
+        self.check_price(bundles_by_name, MemeBundleName.communism, 1, 1, 1)
+        self.check_price(bundles_by_name, MemeBundleName.amons_fall, 7, 7, 1)
+        self.check_price(bundles_by_name, MemeBundleName.rick, 1, 1, 1)
+        self.check_price(bundles_by_name, MemeBundleName.obelisks, 8, 8)
+        self.check_price(bundles_by_name, MemeBundleName.eg, 8, 2, 57)
+        self.check_price(bundles_by_name, MemeBundleName.chaos_emerald, 7, 7, 1)
+        self.check_price(bundles_by_name, MemeBundleName.honorable, 2, 1)
+        self.check_price(bundles_by_name, MemeBundleName.snitch, 1, 1, 1)
+        self.check_price(bundles_by_name, MemeBundleName.commitment, 4, 4)
+        self.check_price(bundles_by_name, MemeBundleName.journalist, 1, 1, 1)
+        self.check_price(bundles_by_name, MemeBundleName.off_your_back, 6, 6, 1)
+        self.check_price(bundles_by_name, MemeBundleName.sisyphus, 12, 12, 1)
+
+    def check_price(self, bundles: Dict[str, Bundle], bundle_name: str, expected_items: int, expected_required_items: int, stack_amount: Optional[int] = None):
+        if bundle_name not in bundles:
+            return
+        with self.subTest(bundle_name):
+            bundle = bundles[bundle_name]
+            self.assertEqual(len(bundle.items), expected_items)
+            self.assertEqual(bundle.number_required, expected_required_items)
+            if stack_amount is not None:
+                for item in bundle.items:
+                    self.assertEqual(item.amount, stack_amount)
+
+
+class TestMemeBundleContent(SVTestCase):
+    def test_all_meme_bundles_are_included(self):
+        all_meme_bundles_in_cc = {bundle.name for bundle in all_cc_meme_bundles}
+        for meme_bundle_name in all_meme_bundle_names:
+            if meme_bundle_name == MemeBundleName.investment:
+                continue
+            with self.subTest(meme_bundle_name):
+                self.assertIn(meme_bundle_name, all_meme_bundles_in_cc)
+
+
+class TestScamBundleWhitelist(SVTestBase):
+    options = {
+        BundleRandomization: BundleRandomization.option_meme,
+        BundleWhitelist: frozenset({MemeBundleName.scam})
+    }
+
+    def test_scam_bundle_is_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertIn(MemeBundleName.scam, location_names)
+
+    def test_investment_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.investment, location_names)
+
+
+class TestInvestmentBundleWhitelist(SVTestBase):
+    options = {
+        BundleRandomization: BundleRandomization.option_meme,
+        BundleWhitelist: frozenset({MemeBundleName.investment})
+    }
+
+    def test_scam_bundle_is_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertIn(MemeBundleName.scam, location_names)
+
+    def test_investment_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.investment, location_names)
+
+
+class TestScamBundleBlacklist(SVTestBase):
+    options = {
+        BundleRandomization: BundleRandomization.option_meme,
+        BundleBlacklist: frozenset({MemeBundleName.scam})
+    }
+
+    def test_scam_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.scam, location_names)
+
+    def test_investment_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.investment, location_names)
+
+
+class TestInvestmentBundleBlacklist(SVTestBase):
+    options = {
+        BundleRandomization: BundleRandomization.option_meme,
+        BundleBlacklist: frozenset({MemeBundleName.investment})
+    }
+
+    def test_scam_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.scam, location_names)
+
+    def test_investment_bundle_is_not_there(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        self.assertNotIn(MemeBundleName.investment, location_names)
diff --git a/worlds/stardew_valley/test/TestCrops.py b/worlds/stardew_valley/test/TestCrops.py
index bf8f4f719e..b72e917edd 100644
--- a/worlds/stardew_valley/test/TestCrops.py
+++ b/worlds/stardew_valley/test/TestCrops.py
@@ -17,7 +17,7 @@ class TestCropsanityRules(SVTestBase):
 
         self.multiworld.state.collect(self.create_item(Seed.cactus))
         self.multiworld.state.collect(self.create_item(Building.shipping_bin))
-        self.multiworld.state.collect(self.create_item(Transportation.desert_obelisk))
+        self.multiworld.state.collect(self.create_item(Transportation.bus_repair))
         self.assert_cannot_reach_location(harvest_cactus_fruit)
 
         self.multiworld.state.collect(self.create_item(Region.greenhouse))
diff --git a/worlds/stardew_valley/test/TestData.py b/worlds/stardew_valley/test/TestData.py
index 86550705b9..fe1420bc18 100644
--- a/worlds/stardew_valley/test/TestData.py
+++ b/worlds/stardew_valley/test/TestData.py
@@ -1,8 +1,27 @@
 import unittest
+from collections import Counter
+from typing import List
 
+from .. import Group
+from ..content.content_packs import all_content_pack_names
 from ..items import load_item_csv
-from ..locations import load_location_csv
-from ..options import Mods
+from ..locations import load_location_csv, LocationTags
+from ..strings.trap_names import all_traps
+
+
+def print_lists_difference(list1: List[str], list2: List[str], list1_name: str = "List 1", list2_name: str = "List 2"):
+    for item in list1:
+        if item not in list2:
+            print(f"{item} is in {list1_name} but not in {list2_name}")
+    for item in list2:
+        if item not in list1:
+            print(f"{item} is in {list2_name} but not in {list1_name}")
+
+
+def print_duplicates(items: List[str]):
+    for item in items:
+        if items.count(item) > 1:
+            print(f"{item} is in the list {items.count(item)} times")
 
 
 class TestCsvIntegrity(unittest.TestCase):
@@ -16,18 +35,22 @@ class TestCsvIntegrity(unittest.TestCase):
         with self.subTest("Test all ids are unique"):
             all_ids = [item.code_without_offset for item in items]
             unique_ids = set(all_ids)
-            self.assertEqual(len(all_ids), len(unique_ids))
+            self.assertEqual(len(all_ids), len(unique_ids), f"Some ids are duplicated: {[item for item, count in Counter(all_ids).items() if count > 1]}")
 
         with self.subTest("Test all names are unique"):
             all_names = [item.name for item in items]
             unique_names = set(all_names)
             self.assertEqual(len(all_names), len(unique_names))
 
-        with self.subTest("Test all mod names are valid"):
-            mod_names = {item.mod_name for item in items}
-            for mod_name in mod_names:
-                if mod_name:
-                    self.assertIn(mod_name, Mods.valid_keys)
+        with self.subTest("Test all content packs are valid"):
+            content_packs = {content_pack for item in items for content_pack in item.content_packs}
+            for content_pack in content_packs:
+                self.assertIn(content_pack, all_content_pack_names)
+
+        with self.subTest("Test all traps are in string"):
+            traps = [item.name for item in items if Group.TRAP in item.groups and Group.DEPRECATED not in item.groups]
+            for trap in traps:
+                self.assertIn(trap, all_traps)
 
     def test_locations_integrity(self):
         locations = load_location_csv()
@@ -47,7 +70,12 @@ class TestCsvIntegrity(unittest.TestCase):
             self.assertEqual(len(all_names), len(unique_names))
 
         with self.subTest("Test all mod names are valid"):
-            mod_names = {location.mod_name for location in locations}
-            for mod_name in mod_names:
-                if mod_name:
-                    self.assertIn(mod_name, Mods.valid_keys)
+            content_packs = {content_pack for location in locations for content_pack in location.content_packs}
+            for content_pack in content_packs:
+                self.assertIn(content_pack, all_content_pack_names)
+
+        with self.subTest("Test all craftsanity locations are either craft or recipe"):
+            for location in locations:
+                if LocationTags.CRAFTSANITY not in location.tags:
+                    continue
+                self.assertTrue(LocationTags.CRAFTSANITY_CRAFT in location.tags or LocationTags.CRAFTSANITY_RECIPE in location.tags)
diff --git a/worlds/stardew_valley/test/TestDynamicGoals.py b/worlds/stardew_valley/test/TestDynamicGoals.py
index 23f453e9f0..11330a4a68 100644
--- a/worlds/stardew_valley/test/TestDynamicGoals.py
+++ b/worlds/stardew_valley/test/TestDynamicGoals.py
@@ -22,11 +22,14 @@ def collect_fishing_abilities(tester: SVTestBase):
         tester.multiworld.state.collect(tester.world.create_item("Mining Level"), prevent_sweep=False)
     for i in range(17):
         tester.multiworld.state.collect(tester.world.create_item("Progressive Mine Elevator"), prevent_sweep=False)
+    tester.multiworld.state.collect(tester.world.create_item("Shipping Bin"), prevent_sweep=False)
+    tester.multiworld.state.collect(tester.world.create_item("Fishing Mastery"), prevent_sweep=False)
+    tester.multiworld.state.collect(tester.world.create_item("Landslide Removed"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Spring"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Summer"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Fall"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Winter"), prevent_sweep=False)
-    tester.multiworld.state.collect(tester.world.create_item(Transportation.desert_obelisk), prevent_sweep=False)
+    tester.multiworld.state.collect(tester.world.create_item(Transportation.bus_repair), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Beach Bridge"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Railroad Boulder Removed"), prevent_sweep=False)
     tester.multiworld.state.collect(tester.world.create_item("Island North Turtle"), prevent_sweep=False)
@@ -43,7 +46,7 @@ def create_and_collect_fishing_access_items(tester: SVTestBase) -> List[Tuple[St
     items = [(create_and_collect(tester, Wallet.dark_talisman), Fish.void_salmon),
              (create_and_collect(tester, Wallet.rusty_key), Fish.slimejack),
              (create_and_collect(tester, "Progressive Mine Elevator"), Fish.lava_eel),
-             (create_and_collect(tester, Transportation.island_obelisk), Fish.lionfish),
+             (create_and_collect(tester, Transportation.boat_repair), Fish.lionfish),
              (create_and_collect(tester, "Island Resort"), Fish.stingray)]
     return items
 
diff --git a/worlds/stardew_valley/test/TestEatsanity.py b/worlds/stardew_valley/test/TestEatsanity.py
new file mode 100644
index 0000000000..23ebe396ad
--- /dev/null
+++ b/worlds/stardew_valley/test/TestEatsanity.py
@@ -0,0 +1,395 @@
+import unittest
+
+from .bases import SVTestBase
+from .. import SeasonRandomization
+from ..options import ExcludeGingerIsland, Eatsanity, Chefsanity, QuestLocations, Secretsanity
+from ..strings.ap_names.ap_option_names import EatsanityOptionName, SecretsanityOptionName
+
+
+class SVEatsanityTestBase(SVTestBase):
+    expected_eating_locations: set[str] = set()
+    unexpected_eating_locations: set[str] = set()
+    expected_eating_items: set[str] = set()
+    unexpected_eating_items: set[str] = set()
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        if cls is SVEatsanityTestBase:
+            raise unittest.SkipTest("Base tests disabled")
+
+        super().setUpClass()
+
+    def test_eatsanity_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for location in self.expected_eating_locations:
+            self.assertIn(location, location_names, f"{location} should be in the location names")
+        for location in self.unexpected_eating_locations:
+            self.assertNotIn(location, location_names, f"{location} should not be in the location names")
+
+    def test_eatsanity_items(self):
+        item_names = {item.name for item in self.multiworld.get_items()}
+        for item in self.expected_eating_items:
+            self.assertIn(item, item_names, f"{item} should be in the item names")
+        for item in self.unexpected_eating_items:
+            self.assertNotIn(item, item_names, f"{item} should not be in the item names")
+
+
+class TestEatsanityNone(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: Eatsanity.preset_none,
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Vinegar",
+        "Eat Carp",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+
+class TestEatsanityCrops(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.crops}),
+    }
+    expected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+    }
+    unexpected_eating_locations = {
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Vinegar",
+        "Eat Carp",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+    def test_need_crop_to_eat_it(self):
+        crops = {"Apple": "Apple Sapling", "Yam": "Yam Seeds", "Parsnip": "Parsnip Seeds"}
+        self.collect("Fall")
+        self.collect("Spring")
+        self.collect("Shipping Bin")
+        self.collect_months(2)
+        for crop in crops:
+            with self.subTest(f"Need {crops[crop]} to eat {crop}"):
+                location = self.world.get_location(f"Eat {crop}")
+                self.assert_cannot_reach_location(location)
+                self.collect(crops[crop])
+                self.assert_can_reach_location(location)
+
+
+class TestEatsanityCooking(SVEatsanityTestBase):
+    options = {
+        SeasonRandomization: SeasonRandomization.option_randomized,
+        Chefsanity: Chefsanity.preset_all,
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.cooking}),
+        "start_inventory": {"Winter": 1}
+    }
+    expected_eating_locations = {
+        "Eat Vegetable Medley",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Vinegar",
+        "Eat Carp",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+    def test_need_recipe_and_ingredients_to_cook(self):
+        location = self.world.get_location(f"Eat Vegetable Medley")
+        required_items = ["Vegetable Medley Recipe", "Progressive House", "Tomato Seeds", "Summer", "Beet Seeds", "Fall", "Bus Repair"]
+        unique_items = list(set(required_items))
+        required_items = [self.create_item(item) for item in required_items]
+        self.collect(required_items)
+        self.assert_can_reach_location(location)
+        for item_name in unique_items:
+            with self.subTest(f"Requires {item_name} to {location.name}"):
+                item_to_remove = next(item for item in required_items if item.name == item_name)
+                self.assert_can_reach_location(location)
+                self.remove(item_to_remove)
+                self.assert_cannot_reach_location(location)
+                self.collect(item_to_remove)
+
+
+class TestEatsanityFish(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.fish}),
+    }
+    expected_eating_locations = {
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Vinegar",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+
+class TestEatsanityArtisan(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.artisan}),
+    }
+    expected_eating_locations = {
+        "Drink Vinegar",
+        "Drink Wine",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+
+class TestEatsanityShop(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.shop}),
+    }
+    expected_eating_locations = {
+        "Drink Pina Colada",
+        "Eat Stardrop",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Drink Vinegar",
+        "Drink Wine",
+        "Eat Vinegar",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+    def test_need_stardrop_to_eat_it(self):
+        location = self.world.get_location(f"Eat Stardrop")
+        self.assert_cannot_reach_location(location)
+        self.collect("Stardrop")
+        self.assert_can_reach_location(location)
+
+
+class TestEatsanityPoisonousFish(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.poisonous, EatsanityOptionName.fish}),
+    }
+    expected_eating_locations = {
+        "Eat Pufferfish",
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Drink Vinegar",
+        "Drink Wine",
+        "Eat Vinegar",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+        "Drink Pina Colada",
+        "Eat Stardrop",
+        "Eat Red Mushroom"
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+
+class TestEatsanityPoisonousArtisan(SVEatsanityTestBase):
+    options = {
+        SeasonRandomization: SeasonRandomization.option_disabled,
+        QuestLocations: -1,
+        Secretsanity: frozenset([]),
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.artisan, EatsanityOptionName.poisonous}),
+    }
+    expected_eating_locations = {
+        "Drink Vinegar",
+        "Drink Wine",
+        "Drink Iridium Snake Milk",
+        "Eat Void Egg",
+    }
+    unexpected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Drink Parsnip",
+        "Eat Vinegar",
+        "Drink Pina Colada",
+        "Eat Pufferfish",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
+
+    def test_need_lots_of_things_for_iridium_snake_milk(self):
+        location = self.world.get_location(f"Drink Iridium Snake Milk")
+        required_items = ["Desert Obelisk", "Skull Key", "Progressive House", *["Progressive Pickaxe"]*2,
+                          *["Progressive Weapon"]*4, *["Mining Level"]*8, *["Combat Level"]*8]
+        unique_items = list(set(required_items))
+        required_items = [self.create_item(item) for item in required_items]
+        self.collect(required_items)
+        self.assert_can_reach_location(location)
+        for item_name in unique_items:
+            with self.subTest(f"Requires {item_name} to {location.name}"):
+                item_to_remove = next(item for item in required_items if item.name == item_name)
+                self.assert_can_reach_location(location)
+                self.remove(item_to_remove)
+                self.assert_cannot_reach_location(location)
+                self.collect(item_to_remove)
+
+
+class TestEatsanityPoisonousWithQuests(SVEatsanityTestBase):
+    options = {
+        QuestLocations: 0,
+        Secretsanity: frozenset([SecretsanityOptionName.secret_notes]),
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.artisan, EatsanityOptionName.poisonous}),
+    }
+
+    def test_need_only_iridium_snake_milk_to_drink_it(self):
+        location = self.world.get_location(f"Drink Iridium Snake Milk")
+        self.assert_cannot_reach_location(location)
+        self.collect("Iridium Snake Milk")
+        self.assert_can_reach_location(location)
+
+
+class TestEatsanityEnzymeEffects(SVEatsanityTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Eatsanity: frozenset({EatsanityOptionName.crops, EatsanityOptionName.fish, EatsanityOptionName.lock_effects}),
+    }
+    expected_eating_locations = {
+        "Eat Parsnip",
+        "Eat Yam",
+        "Eat Summer Spangle",
+        "Eat Apple",
+        "Eat Sweet Pea",
+        "Eat Carp",
+        "Eat Bullhead",
+    }
+    unexpected_eating_locations = {
+        "Drink Parsnip",
+        "Drink Vinegar",
+        "Drink Wine",
+        "Eat Vinegar",
+        "Eat Tortilla",
+        "Eat Pepper Poppers",
+        "Drink Pina Colada",
+        "Eat Stardrop",
+        "Eat Red Mushroom"
+        "Eat Pufferfish",
+    }
+    expected_eating_items = {
+        "Stamina Enzyme",
+        "Health Enzyme",
+        "Mining Enzyme",
+        "Luck Enzyme",
+        "Attack Enzyme",
+    }
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/TestFill.py b/worlds/stardew_valley/test/TestFill.py
index 2205c49cdf..63afd98d52 100644
--- a/worlds/stardew_valley/test/TestFill.py
+++ b/worlds/stardew_valley/test/TestFill.py
@@ -8,6 +8,7 @@ from ..mods.mod_data import ModNames
 class TestMinLocationsMaxItems(WorldAssertMixin, SVTestBase):
     options = minimal_locations_maximal_items()
 
+    @property
     def run_default_tests(self) -> bool:
         return True
 
@@ -24,6 +25,7 @@ class TestSpecificSeedForTroubleshooting(WorldAssertMixin, SVTestBase):
     }
     seed = 65453499742665118161
 
+    @property
     def run_default_tests(self) -> bool:
         return True
 
diff --git a/worlds/stardew_valley/test/TestFishsanity.py b/worlds/stardew_valley/test/TestFishsanity.py
index 953255c4d0..b6f7cce153 100644
--- a/worlds/stardew_valley/test/TestFishsanity.py
+++ b/worlds/stardew_valley/test/TestFishsanity.py
@@ -398,6 +398,7 @@ class TestFishsanityMasterAnglerSVEWithoutQuests(WorldAssertMixin, SVTestBase):
         Mods: (ModNames.sve,),
     }
 
+    @property
     def run_default_tests(self) -> bool:
         return True
 
diff --git a/worlds/stardew_valley/test/TestGeneration.py b/worlds/stardew_valley/test/TestGeneration.py
index 7b1535676d..8848f19d85 100644
--- a/worlds/stardew_valley/test/TestGeneration.py
+++ b/worlds/stardew_valley/test/TestGeneration.py
@@ -2,11 +2,14 @@ from typing import List
 
 from BaseClasses import ItemClassification, Item
 from .bases import SVTestBase
-from .. import location_table, options, items
+from .. import location_table, options, items, StartWithoutOptionName
+from ..content.content_packs import vanilla_content_pack_names
 from ..items import Group, ItemData, item_data
 from ..locations import LocationTags
 from ..options import Friendsanity, SpecialOrderLocations, Shipsanity, Chefsanity, SeasonRandomization, Craftsanity, ExcludeGingerIsland, SkillProgression, \
-    Booksanity, Walnutsanity
+    Booksanity, Walnutsanity, Secretsanity, Moviesanity
+from ..options.options import IncludeEndgameLocations, Eatsanity
+from ..strings.ap_names.transport_names import Transportation
 from ..strings.region_names import Region
 
 
@@ -17,7 +20,7 @@ def get_all_permanent_progression_items() -> List[ItemData]:
         item
         for item in item_data.all_items
         if ItemClassification.progression in item.classification
-        if item.mod_name is None
+        if item.content_packs.issubset(vanilla_content_pack_names)
         if item.name not in {event.name for event in item_data.events}
         if item.name not in {deprecated.name for deprecated in items.items_by_group[Group.DEPRECATED]}
         if item.name not in {season.name for season in items.items_by_group[Group.SEASON]}
@@ -35,10 +38,14 @@ class TestBaseItemGeneration(SVTestBase):
         SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
         Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
         Shipsanity.internal_name: Shipsanity.option_everything,
-        Chefsanity.internal_name: Chefsanity.option_all,
+        Chefsanity.internal_name: Chefsanity.preset_all,
         Craftsanity.internal_name: Craftsanity.option_all,
         Booksanity.internal_name: Booksanity.option_all,
         Walnutsanity.internal_name: Walnutsanity.preset_all,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_and_all_loved_snacks,
+        Eatsanity.internal_name: Eatsanity.preset_all,
+        Secretsanity.internal_name: Secretsanity.preset_all,
+        IncludeEndgameLocations.internal_name: IncludeEndgameLocations.option_true,
     }
 
     def test_all_progression_items_are_added_to_the_pool(self):
@@ -78,10 +85,14 @@ class TestNoGingerIslandItemGeneration(SVTestBase):
         SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
         Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
         Shipsanity.internal_name: Shipsanity.option_everything,
-        Chefsanity.internal_name: Chefsanity.option_all,
+        Chefsanity.internal_name: Chefsanity.preset_all,
         Craftsanity.internal_name: Craftsanity.option_all,
         ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
         Booksanity.internal_name: Booksanity.option_all,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_and_all_loved_snacks,
+        Eatsanity.internal_name: Eatsanity.preset_all,
+        Secretsanity.internal_name: Secretsanity.preset_all,
+        IncludeEndgameLocations.internal_name: IncludeEndgameLocations.option_true,
     }
 
     def test_all_progression_items_except_island_are_added_to_the_pool(self):
@@ -122,6 +133,7 @@ class TestNoGingerIslandItemGeneration(SVTestBase):
 
 class TestProgressiveElevator(SVTestBase):
     options = {
+        options.StartWithout: frozenset({StartWithoutOptionName.landslide}),
         options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive,
         options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
         options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
@@ -140,12 +152,13 @@ class TestProgressiveElevator(SVTestBase):
         self.assert_can_reach_region(Region.mines_floor_120)
 
     def generate_items_for_mine_115(self) -> List[Item]:
+        landslide = self.get_item_by_name("Landslide Removed")
         pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 2
         elevators = [self.get_item_by_name("Progressive Mine Elevator")] * 21
         swords = [self.get_item_by_name("Progressive Sword")] * 3
         combat_levels = [self.get_item_by_name("Combat Level")] * 4
         mining_levels = [self.get_item_by_name("Mining Level")] * 4
-        return [*combat_levels, *mining_levels, *elevators, *pickaxes, *swords]
+        return [landslide, *combat_levels, *mining_levels, *elevators, *pickaxes, *swords]
 
     def generate_items_for_extra_mine_levels(self, weapon_name: str) -> List[Item]:
         last_pickaxe = self.get_item_by_name("Progressive Pickaxe")
@@ -159,9 +172,11 @@ class TestProgressiveElevator(SVTestBase):
 
 class TestSkullCavernLogic(SVTestBase):
     options = {
+        options.StartWithout: frozenset({StartWithoutOptionName.landslide}),
         options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla,
         options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
         options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
     }
 
     def test_given_access_to_floor_115_when_find_more_tools_then_has_access_to_skull_cavern_25(self):
@@ -189,31 +204,36 @@ class TestSkullCavernLogic(SVTestBase):
         self.assert_can_reach_region(Region.skull_cavern_75)
 
     def generate_items_for_mine_115(self) -> List[Item]:
+        landslide = self.get_item_by_name("Landslide Removed")
         pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 2
         swords = [self.get_item_by_name("Progressive Sword")] * 3
         combat_levels = [self.get_item_by_name("Combat Level")] * 4
         mining_levels = [self.get_item_by_name("Mining Level")] * 4
-        bus = self.get_item_by_name("Bus Repair")
+        bus = self.get_item_by_name(Transportation.bus_repair)
         skull_key = self.get_item_by_name("Skull Key")
-        return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key]
+        return [landslide, *combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key]
 
     def generate_items_for_skull_50(self) -> List[Item]:
+        landslide = self.get_item_by_name("Landslide Removed")
         pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 3
         swords = [self.get_item_by_name("Progressive Sword")] * 4
         combat_levels = [self.get_item_by_name("Combat Level")] * 6
         mining_levels = [self.get_item_by_name("Mining Level")] * 6
-        bus = self.get_item_by_name("Bus Repair")
+        bus = self.get_item_by_name(Transportation.bus_repair)
         skull_key = self.get_item_by_name("Skull Key")
-        return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key]
+        farm_house = self.get_item_by_name("Progressive House")
+        return [landslide, *combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key, farm_house]
 
     def generate_items_for_skull_100(self) -> List[Item]:
+        landslide = self.get_item_by_name("Landslide Removed")
         pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 4
         swords = [self.get_item_by_name("Progressive Sword")] * 5
         combat_levels = [self.get_item_by_name("Combat Level")] * 8
         mining_levels = [self.get_item_by_name("Mining Level")] * 8
-        bus = self.get_item_by_name("Bus Repair")
+        bus = self.get_item_by_name(Transportation.bus_repair)
         skull_key = self.get_item_by_name("Skull Key")
-        return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key]
+        farm_house = self.get_item_by_name("Progressive House")
+        return [landslide, *combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key, farm_house]
 
 
 class TestShipsanityNone(SVTestBase):
@@ -221,10 +241,6 @@ class TestShipsanityNone(SVTestBase):
         Shipsanity.internal_name: Shipsanity.option_none
     }
 
-    def run_default_tests(self) -> bool:
-        # None is default
-        return False
-
     def test_no_shipsanity_locations(self):
         for location in self.get_real_locations():
             with self.subTest(location.name):
@@ -327,6 +343,34 @@ class TestShipsanityFish(SVTestBase):
         self.assertIn("Shipsanity: Son of Crimsonfish", location_names)
 
 
+class TestShipsanityCropsAndFish(SVTestBase):
+    options = {
+        Shipsanity.internal_name: Shipsanity.option_crops_and_fish,
+        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi
+    }
+
+    def test_only_crops_and_fish_shipsanity_locations(self):
+        for location in self.get_real_locations():
+            if LocationTags.SHIPSANITY in location_table[location.name].tags:
+                with self.subTest(location.name):
+                    is_fish = LocationTags.SHIPSANITY_FISH in location_table[location.name].tags
+                    is_crop = LocationTags.SHIPSANITY_CROP in location_table[location.name].tags
+                    self.assertTrue(is_fish or is_crop)
+
+    def test_include_specific_shipsanity_locations(self):
+        location_names = [location.name for location in self.multiworld.get_locations(self.player)]
+        self.assertIn("Shipsanity: Blue Discus", location_names)
+        self.assertIn("Shipsanity: Glacierfish Jr.", location_names)
+        self.assertIn("Shipsanity: Perch", location_names)
+        self.assertIn("Shipsanity: Powdermelon", location_names)
+        self.assertIn("Shipsanity: Starfruit", location_names)
+        self.assertIn("Shipsanity: Taro Root", location_names)
+        self.assertNotIn("Shipsanity: Iron Bar", location_names)
+        self.assertNotIn("Shipsanity: Wine", location_names)
+        self.assertNotIn("Shipsanity: Tea Set", location_names)
+
+
 class TestShipsanityFishExcludeIsland(SVTestBase):
     options = {
         Shipsanity.internal_name: Shipsanity.option_fish,
diff --git a/worlds/stardew_valley/test/TestItemLink.py b/worlds/stardew_valley/test/TestItemLink.py
index c3029b6070..7bdff07fc1 100644
--- a/worlds/stardew_valley/test/TestItemLink.py
+++ b/worlds/stardew_valley/test/TestItemLink.py
@@ -1,15 +1,18 @@
 from .bases import SVTestBase
 from .. import options, item_table, Group
 
-max_iterations = 2000
+max_iterations = 4000
 
 
+# Success Rate: (1 - ((1 - (1 / 199)) ^ 4000)) ^ 199 -> 0.99999964737880935363435882766624 -> 99.999965%
 class TestItemLinksEverythingIncluded(SVTestBase):
     options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
-               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium}
+               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium,
+               options.AllowedFillerItems.internal_name: options.AllowedFillerItems.preset_all,
+               }
 
     def test_filler_of_all_types_generated(self):
-        max_number_filler = 114
+        max_number_filler = 199
         filler_generated = []
         at_least_one_trap = False
         at_least_one_island = False
@@ -33,10 +36,12 @@ class TestItemLinksEverythingIncluded(SVTestBase):
 
 class TestItemLinksNoIsland(SVTestBase):
     options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium}
+               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium,
+               options.AllowedFillerItems.internal_name: options.AllowedFillerItems.preset_all,
+               }
 
     def test_filler_has_no_island_but_has_traps(self):
-        max_number_filler = 109
+        max_number_filler = 192
         filler_generated = []
         at_least_one_trap = False
         for i in range(0, max_iterations):
@@ -57,10 +62,12 @@ class TestItemLinksNoIsland(SVTestBase):
 
 class TestItemLinksNoTraps(SVTestBase):
     options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
-               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps}
+               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps,
+               options.AllowedFillerItems.internal_name: options.AllowedFillerItems.preset_all,
+               }
 
     def test_filler_has_no_traps_but_has_island(self):
-        max_number_filler = 99
+        max_number_filler = 176
         filler_generated = []
         at_least_one_island = False
         for i in range(0, max_iterations):
@@ -81,10 +88,12 @@ class TestItemLinksNoTraps(SVTestBase):
 
 class TestItemLinksNoTrapsAndIsland(SVTestBase):
     options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps}
+               options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps,
+               options.AllowedFillerItems.internal_name: options.AllowedFillerItems.preset_all,
+               }
 
     def test_filler_generated_without_island_or_traps(self):
-        max_number_filler = 94
+        max_number_filler = 169
         filler_generated = []
         for i in range(0, max_iterations):
             filler = self.multiworld.worlds[1].get_filler_item_name()
diff --git a/worlds/stardew_valley/test/TestItems.py b/worlds/stardew_valley/test/TestItems.py
index d4fa9e832a..03e1ef7478 100644
--- a/worlds/stardew_valley/test/TestItems.py
+++ b/worlds/stardew_valley/test/TestItems.py
@@ -1,6 +1,6 @@
 from BaseClasses import MultiWorld, get_seed, ItemClassification
 from .bases import SVTestCase, solo_multiworld, setup_solo_multiworld
-from .options.presets import allsanity_no_mods_6_x_x, get_minsanity_options
+from .options.presets import get_minsanity_options, allsanity_no_mods_7_x_x
 from .. import StardewValleyWorld
 from ..items import Group, item_table
 from ..options import Friendsanity, SeasonRandomization, Museumsanity, Shipsanity, Goal
@@ -44,15 +44,15 @@ class TestItems(SVTestCase):
         self.assertEqual(len(baby_permutations), 4)
 
     def test_correct_number_of_stardrops(self):
-        allsanity_options = allsanity_no_mods_6_x_x()
+        allsanity_options = allsanity_no_mods_7_x_x()
         with solo_multiworld(allsanity_options) as (multiworld, _):
             stardrop_items = [item for item in multiworld.get_items() if item.name == "Stardrop"]
             self.assertEqual(len(stardrop_items), 7)
 
     def test_no_duplicate_rings(self):
-        allsanity_options = allsanity_no_mods_6_x_x()
+        allsanity_options = allsanity_no_mods_7_x_x()
         with solo_multiworld(allsanity_options) as (multiworld, _):
-            ring_items = [item.name for item in multiworld.get_items() if Group.RING in item_table[item.name].groups]
+            ring_items = [item.name for item in multiworld.get_items() if Group.FILLER_RING in item_table[item.name].groups]
             self.assertEqual(len(ring_items), len(set(ring_items)))
 
     def test_can_start_in_any_season(self):
@@ -75,7 +75,7 @@ class TestItems(SVTestCase):
 class TestStartInventoryFillersAreProperlyExcluded(SVTestCase):
     def test_given_maximum_one_resource_pack_in_start_inventory_when_create_items_then_item_is_properly_excluded(self):
         assert item_table[Wallet.key_to_the_town].classification == ItemClassification.useful \
-               and {Group.MAXIMUM_ONE, Group.RESOURCE_PACK_USEFUL}.issubset(item_table[Wallet.key_to_the_town].groups), \
+               and {Group.MAXIMUM_ONE, Group.FILLER_QUALITY_OF_LIFE}.issubset(item_table[Wallet.key_to_the_town].groups), \
             "'Key to the Town' is no longer suitable to test this usecase."
 
         options = {
diff --git a/worlds/stardew_valley/test/TestLogic.py b/worlds/stardew_valley/test/TestLogic.py
index 047e0226c6..10d048cd55 100644
--- a/worlds/stardew_valley/test/TestLogic.py
+++ b/worlds/stardew_valley/test/TestLogic.py
@@ -4,13 +4,16 @@ from unittest import TestCase, SkipTest
 
 from BaseClasses import MultiWorld
 from .assertion import RuleAssertMixin
-from .bases import setup_solo_multiworld
-from .options.presets import allsanity_mods_6_x_x, minimal_locations_maximal_items
+from .bases import setup_solo_multiworld, skip_long_tests
+from .options.presets import minimal_locations_maximal_items, allsanity_mods_7_x_x
 from .. import StardewValleyWorld
-from ..data.bundle_data import all_bundle_items_except_money
+from ..data.bundles_data.bundle_data import all_bundle_items_except_money
 from ..logic.logic import StardewLogic
 from ..options import BundleRandomization
 
+if skip_long_tests():
+    raise unittest.SkipTest("Long tests disabled")
+
 
 def collect_all(mw):
     for item in mw.get_items():
@@ -98,7 +101,7 @@ class LogicTestBase(RuleAssertMixin, TestCase):
 
 
 class TestAllSanityLogic(LogicTestBase):
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_7_x_x()
 
 
 @unittest.skip("This test does not pass because some content is still not in content packs.")
diff --git a/worlds/stardew_valley/test/TestMovies.py b/worlds/stardew_valley/test/TestMovies.py
new file mode 100644
index 0000000000..3ad092bd5a
--- /dev/null
+++ b/worlds/stardew_valley/test/TestMovies.py
@@ -0,0 +1,85 @@
+from .bases import SVTestBase
+from .. import SeasonRandomization
+from ..data.movies import movies_by_name
+from ..options import Moviesanity
+
+
+class MovieTestBase(SVTestBase):
+
+    def test_all_movies_require_theater_and_season(self):
+        if Moviesanity.internal_name not in self.options or self.options[Moviesanity.internal_name] == Moviesanity.option_none:
+            return
+        self.collect_lots_of_money(0.5)
+        [self.collect(snack) for snack in ["Movie Drinks", "Movie Sweet Snacks", "Movie Salty Snacks"]]
+        theater_items = [self.create_item("Progressive Movie Theater"), self.create_item("Progressive Movie Theater")]
+        [self.remove_one_by_name(season) for season in ["Spring", "Summer", "Fall", "Winter"]]
+        for movie_name in movies_by_name:
+            movie = movies_by_name[movie_name]
+            movie_location = f"Watch {movie_name}"
+            self.collect(movie.season)
+            with self.subTest(f"{movie_location} requires two movie theaters"):
+                self.assert_cannot_reach_location(movie_location)
+                self.collect(theater_items[0])
+                self.assert_cannot_reach_location(movie_location)
+                self.collect(theater_items[1])
+                self.assert_can_reach_location(movie_location)
+            self.remove_one_by_name(movie.season)
+            with self.subTest(f"{movie_location} requires {movie.season}"):
+                self.assert_cannot_reach_location(movie_location)
+                self.collect(movie.season)
+                self.assert_can_reach_location(movie_location)
+            self.remove(theater_items)
+            self.remove_one_by_name(movie.season)
+
+
+class TestOneMovie(SVTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_one
+    }
+
+    def test_all_movies_require_theater_and_season(self):
+        self.collect_lots_of_money(0.5)
+        theater_items = [self.create_item("Progressive Movie Theater"), self.create_item("Progressive Movie Theater")]
+        movie_location = f"Watch A Movie"
+        with self.subTest(f"{movie_location} requires two movie theaters"):
+            self.assert_cannot_reach_location(movie_location)
+            self.collect(theater_items[0])
+            self.assert_cannot_reach_location(movie_location)
+            self.collect(theater_items[1])
+            self.assert_can_reach_location(movie_location)
+
+
+class TestAllMovies(MovieTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_all_movies
+    }
+
+
+class TestAllMoviesLoved(MovieTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_loved
+    }
+
+
+class TestAllMoviesAndAllSnacks(MovieTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_and_all_snacks
+    }
+
+
+class TestAllMoviesWithLovedSnack(MovieTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_with_loved_snack
+    }
+
+
+class TestAllMoviesAndAllLovedSnacks(MovieTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Moviesanity.internal_name: Moviesanity.option_all_movies_and_all_loved_snacks
+    }
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/TestNumberLocations.py b/worlds/stardew_valley/test/TestNumberLocations.py
index dd57a5e39b..b21488733b 100644
--- a/worlds/stardew_valley/test/TestNumberLocations.py
+++ b/worlds/stardew_valley/test/TestNumberLocations.py
@@ -1,8 +1,10 @@
+from BaseClasses import ItemClassification
 from .bases import SVTestBase
-from .options.presets import default_6_x_x, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x_exclude_disabled, get_minsanity_options, \
-    minimal_locations_maximal_items, minimal_locations_maximal_items_with_island
+from .options.presets import default_7_x_x, allsanity_no_mods_7_x_x, get_minsanity_options, \
+    minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, allsanity_mods_7_x_x_exclude_disabled
 from .. import location_table
 from ..items import Group, item_table
+from ..items.item_data import FILLER_GROUPS
 
 
 class TestLocationGeneration(SVTestBase):
@@ -19,7 +21,7 @@ class TestMinLocationAndMaxItem(SVTestBase):
         valid_locations = self.get_real_locations()
         number_locations = len(valid_locations)
         number_items = len([item for item in self.multiworld.itempool
-                            if Group.RESOURCE_PACK not in item_table[item.name].groups and Group.TRAP not in item_table[item.name].groups])
+                            if all(filler_group not in item_table[item.name].groups for filler_group in FILLER_GROUPS) and Group.TRAP not in item_table[item.name].groups])
         print(f"Stardew Valley - Minimum Locations: {number_locations}, Maximum Items: {number_items} [ISLAND EXCLUDED]")
         self.assertGreaterEqual(number_locations, number_items)
 
@@ -31,7 +33,7 @@ class TestMinLocationAndMaxItemWithIsland(SVTestBase):
         valid_locations = self.get_real_locations()
         number_locations = len(valid_locations)
         number_items = len([item for item in self.multiworld.itempool
-                            if Group.RESOURCE_PACK not in item_table[item.name].groups and Group.TRAP not in item_table[item.name].groups])
+                            if all(filler_group not in item_table[item.name].groups for filler_group in FILLER_GROUPS) and Group.TRAP not in item_table[item.name].groups and (item.classification & ItemClassification.progression)])
         print(f"Stardew Valley - Minimum Locations: {number_locations}, Maximum Items: {number_items} [ISLAND INCLUDED]")
         self.assertGreaterEqual(number_locations, number_items)
 
@@ -39,24 +41,24 @@ class TestMinLocationAndMaxItemWithIsland(SVTestBase):
 class TestMinSanityHasAllExpectedLocations(SVTestBase):
     options = get_minsanity_options()
 
-    def test_minsanity_has_fewer_than_locations(self):
-        expected_locations = 85
+    def test_minsanity_has_few_locations(self):
+        fewest_allowed_locations = 90
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Minsanity Locations: {number_locations}")
-        self.assertLessEqual(number_locations, expected_locations)
-        if number_locations != expected_locations:
-            print(f"\tDisappeared Locations Detected!"
+        self.assertGreaterEqual(number_locations, fewest_allowed_locations)
+        if number_locations < fewest_allowed_locations:
+            print(f"\tMinsanity too many locations detected"
                   f"\n\tPlease update test_minsanity_has_fewer_than_locations"
-                  f"\n\t\tExpected: {expected_locations}"
+                  f"\n\t\tMinimum: {fewest_allowed_locations}"
                   f"\n\t\tActual: {number_locations}")
 
 
 class TestDefaultSettingsHasAllExpectedLocations(SVTestBase):
-    options = default_6_x_x()
+    options = default_7_x_x()
 
     def test_default_settings_has_exactly_locations(self):
-        expected_locations = 491
+        expected_locations = 475
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Default options locations: {number_locations}")
@@ -68,10 +70,10 @@ class TestDefaultSettingsHasAllExpectedLocations(SVTestBase):
 
 
 class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase):
-    options = allsanity_no_mods_6_x_x()
+    options = allsanity_no_mods_7_x_x()
 
     def test_allsanity_without_mods_has_at_least_locations(self):
-        expected_locations = 2256
+        expected_locations = 2812
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations without mods: {number_locations}")
@@ -84,10 +86,10 @@ class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase):
 
 
 class TestAllSanityWithModsSettingsHasAllExpectedLocations(SVTestBase):
-    options = allsanity_mods_6_x_x_exclude_disabled()
+    options = allsanity_mods_7_x_x_exclude_disabled()
 
     def test_allsanity_with_mods_has_at_least_locations(self):
-        expected_locations = 2908
+        expected_locations = 3180  # It was 3473 before disabling SVE
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations with all mods: {number_locations}")
diff --git a/worlds/stardew_valley/test/TestOptions.py b/worlds/stardew_valley/test/TestOptions.py
deleted file mode 100644
index 738753fe83..0000000000
--- a/worlds/stardew_valley/test/TestOptions.py
+++ /dev/null
@@ -1,201 +0,0 @@
-import itertools
-from typing import ClassVar
-
-from BaseClasses import ItemClassification
-from test.param import classvar_matrix
-from .assertion import WorldAssertMixin
-from .bases import SVTestCase, SVTestBase, solo_multiworld
-from .options.option_names import all_option_choices
-from .options.presets import allsanity_no_mods_6_x_x, allsanity_mods_6_x_x
-from .. import items_by_group, Group
-from ..locations import locations_by_tag, LocationTags, location_table
-from ..options import ExcludeGingerIsland, ToolProgression, Goal, SeasonRandomization, TrapDifficulty, SpecialOrderLocations, ArcadeMachineLocations
-from ..strings.goal_names import Goal as GoalName
-from ..strings.season_names import Season
-from ..strings.special_order_names import SpecialOrder
-from ..strings.tool_names import ToolMaterial, Tool, APTool
-
-SEASONS = {Season.spring, Season.summer, Season.fall, Season.winter}
-TOOLS = {"Hoe", "Pickaxe", "Axe", "Watering Can", "Trash Can", "Fishing Rod"}
-
-
-@classvar_matrix(option_and_choice=all_option_choices)
-class TestGenerateDynamicOptions(WorldAssertMixin, SVTestCase):
-    option_and_choice: ClassVar[tuple[str, str]]
-
-    def test_given_option_and_choice_when_generate_then_basic_checks(self):
-        option, choice = self.option_and_choice
-        world_options = {option: choice}
-        with solo_multiworld(world_options) as (multiworld, stardew_world):
-            self.assert_basic_checks(multiworld)
-
-
-@classvar_matrix(goal_and_location=[
-    ("community_center", GoalName.community_center),
-    ("grandpa_evaluation", GoalName.grandpa_evaluation),
-    ("bottom_of_the_mines", GoalName.bottom_of_the_mines),
-    ("cryptic_note", GoalName.cryptic_note),
-    ("master_angler", GoalName.master_angler),
-    ("complete_collection", GoalName.complete_museum),
-    ("full_house", GoalName.full_house),
-    ("perfection", GoalName.perfection),
-])
-class TestGoal(SVTestCase):
-    goal_and_location: ClassVar[tuple[str, str]]
-
-    def test_given_goal_when_generate_then_victory_is_in_correct_location(self):
-        goal, location = self.goal_and_location
-        world_options = {Goal.internal_name: goal}
-        with solo_multiworld(world_options) as (multi_world, _):
-            victory = multi_world.find_item("Victory", 1)
-            self.assertEqual(victory.name, location)
-
-
-class TestSeasonRandomization(SVTestCase):
-    def test_given_disabled_when_generate_then_all_seasons_are_precollected(self):
-        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_disabled}
-        with solo_multiworld(world_options) as (multi_world, _):
-            precollected_items = {item.name for item in multi_world.precollected_items[1]}
-            self.assertTrue(all([season in precollected_items for season in SEASONS]))
-
-    def test_given_randomized_when_generate_then_all_seasons_are_in_the_pool_or_precollected(self):
-        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_randomized}
-        with solo_multiworld(world_options) as (multi_world, _):
-            precollected_items = {item.name for item in multi_world.precollected_items[1]}
-            items = {item.name for item in multi_world.get_items()} | precollected_items
-            self.assertTrue(all([season in items for season in SEASONS]))
-            self.assertEqual(len(SEASONS.intersection(precollected_items)), 1)
-
-    def test_given_progressive_when_generate_then_3_progressive_seasons_are_in_the_pool(self):
-        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_progressive}
-        with solo_multiworld(world_options) as (multi_world, _):
-            items = [item.name for item in multi_world.get_items()]
-            self.assertEqual(items.count(Season.progressive), 3)
-
-
-class TestToolProgression(SVTestBase):
-    options = {
-        ToolProgression.internal_name: ToolProgression.option_progressive,
-    }
-
-    def test_given_progressive_when_generate_then_tool_upgrades_are_locations(self):
-        locations = set(self.get_real_location_names())
-        for material, tool in itertools.product(ToolMaterial.tiers.values(),
-                                                [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.trash_can]):
-            if material == ToolMaterial.basic:
-                continue
-            self.assertIn(f"{material} {tool} Upgrade", locations)
-        self.assertIn("Purchase Training Rod", locations)
-        self.assertIn("Bamboo Pole Cutscene", locations)
-        self.assertIn("Purchase Fiberglass Rod", locations)
-        self.assertIn("Purchase Iridium Rod", locations)
-
-    def test_given_progressive_when_generate_then_only_3_trash_can_are_progressive(self):
-        trash_cans = self.get_items_by_name(APTool.trash_can)
-        progressive_count = sum([1 for item in trash_cans if item.classification == ItemClassification.progression])
-        useful_count = sum([1 for item in trash_cans if item.classification == ItemClassification.useful])
-
-        self.assertEqual(progressive_count, 3)
-        self.assertEqual(useful_count, 1)
-
-
-@classvar_matrix(option_and_choice=all_option_choices)
-class TestGenerateAllOptionsWithExcludeGingerIsland(WorldAssertMixin, SVTestCase):
-    option_and_choice: ClassVar[tuple[str, str]]
-
-    def test_given_choice_when_generate_exclude_ginger_island_then_ginger_island_is_properly_excluded(self):
-        option, option_choice = self.option_and_choice
-
-        if option == ExcludeGingerIsland.internal_name:
-            self.skipTest("ExcludeGingerIsland is forced to true")
-
-        world_options = {
-            ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
-            option: option_choice
-        }
-
-        with solo_multiworld(world_options) as (multiworld, stardew_world):
-
-            if stardew_world.options.exclude_ginger_island != ExcludeGingerIsland.option_true:
-                self.skipTest("Some options, like goals, will force Ginger island back in the game. We want to skip testing those.")
-
-            self.assert_basic_checks(multiworld)
-            self.assert_no_ginger_island_content(multiworld)
-
-
-class TestTraps(SVTestCase):
-    def test_given_no_traps_when_generate_then_no_trap_in_pool(self):
-        world_options = allsanity_no_mods_6_x_x().copy()
-        world_options[TrapDifficulty.internal_name] = TrapDifficulty.option_no_traps
-        with solo_multiworld(world_options) as (multi_world, _):
-            trap_items = [item_data.name for item_data in items_by_group[Group.TRAP]]
-            multiworld_items = [item.name for item in multi_world.get_items()]
-
-            for item in trap_items:
-                with self.subTest(f"{item}"):
-                    self.assertNotIn(item, multiworld_items)
-
-    def test_given_traps_when_generate_then_all_traps_in_pool(self):
-        trap_option = TrapDifficulty
-        for value in trap_option.options:
-            if value == "no_traps":
-                continue
-            world_options = allsanity_mods_6_x_x()
-            world_options.update({TrapDifficulty.internal_name: trap_option.options[value]})
-            with solo_multiworld(world_options) as (multi_world, _):
-                trap_items = [item_data.name for item_data in items_by_group[Group.TRAP] if
-                              Group.DEPRECATED not in item_data.groups and item_data.mod_name is None]
-                multiworld_items = [item.name for item in multi_world.get_items()]
-                for item in trap_items:
-                    with self.subTest(f"Option: {value}, Item: {item}"):
-                        self.assertIn(item, multiworld_items)
-
-
-class TestSpecialOrders(SVTestCase):
-    def test_given_disabled_then_no_order_in_pool(self):
-        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_vanilla}
-        with solo_multiworld(world_options) as (multi_world, _):
-            locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
-            for location_name in locations_in_pool:
-                location = location_table[location_name]
-                self.assertNotIn(LocationTags.SPECIAL_ORDER_BOARD, location.tags)
-                self.assertNotIn(LocationTags.SPECIAL_ORDER_QI, location.tags)
-
-    def test_given_board_only_then_no_qi_order_in_pool(self):
-        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board}
-        with solo_multiworld(world_options) as (multi_world, _):
-
-            locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
-            for location_name in locations_in_pool:
-                location = location_table[location_name]
-                self.assertNotIn(LocationTags.SPECIAL_ORDER_QI, location.tags)
-
-            for board_location in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
-                if board_location.mod_name:
-                    continue
-                self.assertIn(board_location.name, locations_in_pool)
-
-    def test_given_board_and_qi_then_all_orders_in_pool(self):
-        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
-                         ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_victories,
-                         ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false}
-        with solo_multiworld(world_options) as (multi_world, _):
-
-            locations_in_pool = {location.name for location in multi_world.get_locations()}
-            for qi_location in locations_by_tag[LocationTags.SPECIAL_ORDER_QI]:
-                if qi_location.mod_name:
-                    continue
-                self.assertIn(qi_location.name, locations_in_pool)
-
-            for board_location in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
-                if board_location.mod_name:
-                    continue
-                self.assertIn(board_location.name, locations_in_pool)
-
-    def test_given_board_and_qi_without_arcade_machines_then_lets_play_a_game_not_in_pool(self):
-        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
-                         ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled,
-                         ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false}
-        with solo_multiworld(world_options) as (multi_world, _):
-            locations_in_pool = {location.name for location in multi_world.get_locations()}
-            self.assertNotIn(SpecialOrder.lets_play_a_game, locations_in_pool)
diff --git a/worlds/stardew_valley/test/TestStartInventory.py b/worlds/stardew_valley/test/TestStartInventory.py
index 43ee0e1329..8bb3450416 100644
--- a/worlds/stardew_valley/test/TestStartInventory.py
+++ b/worlds/stardew_valley/test/TestStartInventory.py
@@ -24,7 +24,7 @@ class TestStartInventoryAllsanity(WorldAssertMixin, SVTestBase):
         options.Monstersanity.internal_name: options.Monstersanity.option_one_per_category,
         options.Shipsanity.internal_name: options.Shipsanity.option_crops,
         options.Cooksanity.internal_name: options.Cooksanity.option_queen_of_sauce,
-        options.Chefsanity.internal_name: 0b1001,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
         options.Friendsanity.internal_name: options.Friendsanity.option_bachelors,
         options.FriendsanityHeartSize.internal_name: 3,
diff --git a/worlds/stardew_valley/test/TestTraps.py b/worlds/stardew_valley/test/TestTraps.py
index 130674a35d..f3c2c0bde5 100644
--- a/worlds/stardew_valley/test/TestTraps.py
+++ b/worlds/stardew_valley/test/TestTraps.py
@@ -4,6 +4,7 @@ from .assertion import WorldAssertMixin
 from .bases import SVTestBase
 from .. import options, items_by_group, Group
 from ..options import TrapDistribution
+from ..strings.ap_names.ap_option_names import EatsanityOptionName
 
 default_distribution = {trap.name: TrapDistribution.default_weight for trap in items_by_group[Group.TRAP] if Group.DEPRECATED not in trap.groups}
 threshold_difference = 2
@@ -19,7 +20,7 @@ class TestTrapDifficultyCanRemoveAllTraps(WorldAssertMixin, SVTestBase):
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
         options.Cooksanity.internal_name: options.Cooksanity.option_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys),
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps,
     }
 
@@ -41,7 +42,7 @@ class TestDefaultDistributionHasAllTraps(WorldAssertMixin, SVTestBase):
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
         options.Cooksanity.internal_name: options.Cooksanity.option_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys),
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium,
     }
 
@@ -56,16 +57,25 @@ class TestDefaultDistributionHasAllTraps(WorldAssertMixin, SVTestBase):
 
 class TestDistributionIsRespectedAllTraps(WorldAssertMixin, SVTestBase):
     options = {
+        options.BundlePerRoom.internal_name: options.BundlePerRoom.option_four_extra,
         options.QuestLocations.internal_name: 56,
+        options.FestivalLocations.internal_name: options.FestivalLocations.option_hard,
         options.Fishsanity.internal_name: options.Fishsanity.option_all,
         options.Museumsanity.internal_name: options.Museumsanity.option_all,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
+        options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals,
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
         options.Cooksanity.internal_name: options.Cooksanity.option_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys),
+        options.Eatsanity.internal_name: frozenset([EatsanityOptionName.shop, EatsanityOptionName.fish, EatsanityOptionName.artisan, EatsanityOptionName.crops, EatsanityOptionName.cooking, EatsanityOptionName.poisonous]),
+        options.Booksanity.internal_name: options.Booksanity.option_all,
+        options.Moviesanity.internal_name: options.Moviesanity.option_all_movies_and_all_loved_snacks,
+        options.Secretsanity.internal_name: frozenset(options.Secretsanity.valid_keys),
+        options.Hatsanity.internal_name: options.Hatsanity.preset_all,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_true,
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_medium,
-        options.TrapDistribution.internal_name: default_distribution | {"Nudge Trap": 100, "Bark Trap": 1, "Meow Trap": 1000, "Shuffle Trap": 0}
+        options.TrapDistribution.internal_name: {"Nudge Trap": 100, "Bark Trap": 1, "Meow Trap": 1000, "Shuffle Trap": 0}
     }
 
     @classmethod
diff --git a/worlds/stardew_valley/test/TestWalnutsanity.py b/worlds/stardew_valley/test/TestWalnutsanity.py
index 7111174d26..64e141b27a 100644
--- a/worlds/stardew_valley/test/TestWalnutsanity.py
+++ b/worlds/stardew_valley/test/TestWalnutsanity.py
@@ -45,6 +45,7 @@ class TestWalnutsanityNone(SVWalnutsanityTestBase):
 
     def test_logic_received_walnuts(self):
         # You need to receive 0, and collect 40
+        self.collect("Wizard Invitation")
         self.collect("Island Obelisk")
         self.collect("Island West Turtle")
         self.collect("Progressive House")
@@ -96,13 +97,14 @@ class TestWalnutsanityPuzzles(SVWalnutsanityTestBase):
         location_names = ["Walnutsanity: Complete Large Animal Collection", "Walnutsanity: Complete Snake Collection",
                           "Walnutsanity: Complete Mummified Frog Collection", "Walnutsanity: Complete Mummified Bat Collection",
                           "Walnutsanity: Purple Flowers Island Survey", "Walnutsanity: Purple Starfish Island Survey", ]
+        self.collect("Wizard Invitation")
         self.collect("Island Obelisk")
         self.collect("Island North Turtle")
         self.collect("Island West Turtle")
         self.collect("Island Resort")
         self.collect("Dig Site Bridge")
         self.collect("Progressive House")
-        self.collect("Progressive Pan")
+        self.collect("Progressive Pan", 4)
         self.collect("Progressive Fishing Rod")
         self.collect("Progressive Watering Can")
         self.collect("Progressive Pickaxe", 4)
@@ -155,6 +157,7 @@ class TestWalnutsanityPuzzlesAndBushes(SVWalnutsanityTestBase):
 
     def test_logic_received_walnuts(self):
         # You need to receive 25, and collect 15
+        self.collect("Wizard Invitation")
         self.collect("Island Obelisk")
         self.collect("Island West Turtle")
         self.collect("5 Golden Walnuts", 5)
@@ -220,6 +223,7 @@ class TestWalnutsanityAll(SVWalnutsanityTestBase):
 
     def test_logic_received_walnuts(self):
         # You need to receive 40, and collect 4
+        self.collect("Wizard Invitation")
         self.collect("Island Obelisk")
         self.collect("Island West Turtle")
         self.assert_cannot_reach_location(Transportation.parrot_express)
diff --git a/worlds/stardew_valley/test/assertion/mod_assert.py b/worlds/stardew_valley/test/assertion/mod_assert.py
index baba9bbaf8..9dcc3ee02a 100644
--- a/worlds/stardew_valley/test/assertion/mod_assert.py
+++ b/worlds/stardew_valley/test/assertion/mod_assert.py
@@ -1,28 +1,30 @@
-from typing import Union, Iterable
+from typing import Iterable
 from unittest import TestCase
 
 from BaseClasses import MultiWorld
 from ... import item_table, location_table
+from ...content.content_packs import vanilla_content_pack_names
 from ...mods.mod_data import ModNames
 
 
 class ModAssertMixin(TestCase):
-    def assert_stray_mod_items(self, chosen_mods: Union[Iterable[str], str], multiworld: MultiWorld):
-        if isinstance(chosen_mods, str):
-            chosen_mods = [chosen_mods]
+    def assert_stray_mod_items(self, chosen_content_packs: Iterable[str] | str, multiworld: MultiWorld):
+        if isinstance(chosen_content_packs, str):
+            chosen_content_packs = vanilla_content_pack_names | {chosen_content_packs}
         else:
-            chosen_mods = list(chosen_mods)
+            chosen_content_packs = vanilla_content_pack_names | set(chosen_content_packs)
 
-        if ModNames.jasper in chosen_mods:
+        if ModNames.jasper in chosen_content_packs:
             # Jasper is a weird case because it shares NPC w/ SVE...
-            chosen_mods.append(ModNames.sve)
+            chosen_content_packs |= {ModNames.sve}
 
         for multiworld_item in multiworld.get_items():
             item = item_table[multiworld_item.name]
-            self.assertTrue(item.mod_name is None or item.mod_name in chosen_mods,
-                            f"Item {item.name} has is from mod {item.mod_name}. Allowed mods are {chosen_mods}.")
+            self.assertTrue(item.content_packs.issubset(chosen_content_packs),
+                            f"Item {item.name} requires content packs {item.content_packs}. Allowed mods are {chosen_content_packs}.")
         for multiworld_location in multiworld.get_locations():
             if multiworld_location.address is None:
                 continue
             location = location_table[multiworld_location.name]
-            self.assertTrue(location.mod_name is None or location.mod_name in chosen_mods)
+            self.assertTrue(location.content_packs.issubset(chosen_content_packs),
+                            f"Location {location.name} requires content packs {location.content_packs}. Allowed mods are {chosen_content_packs}.")
diff --git a/worlds/stardew_valley/test/bases.py b/worlds/stardew_valley/test/bases.py
index 4370c05d7b..485a42c7d3 100644
--- a/worlds/stardew_valley/test/bases.py
+++ b/worlds/stardew_valley/test/bases.py
@@ -1,13 +1,16 @@
 import itertools
 import logging
+import math
 import os
 import threading
 import typing
 import unittest
 from collections.abc import Iterable
 from contextlib import contextmanager
+from copy import deepcopy
+from typing import Optional, Dict, Union, Any, List, Iterable
 
-from BaseClasses import get_seed, MultiWorld, Location, Item, Region, CollectionState, Entrance
+from BaseClasses import get_seed, MultiWorld, Location, Item, Region, Entrance, CollectionState
 from test.bases import WorldTestBase
 from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
 from worlds.AutoWorld import call_all
@@ -77,7 +80,7 @@ class SVTestBase(RuleAssertMixin, WorldTestBase, SVTestCase):
         world = self.multiworld.worlds[self.player]
 
         self.original_state = self.multiworld.state.copy()
-        self.original_itempool = self.multiworld.itempool.copy()
+        self.original_itempool = deepcopy(self.multiworld.itempool)
         self.unfilled_locations = self.multiworld.get_unfilled_locations(1)
         if self.constructed:
             self.world = world  # noqa
@@ -99,7 +102,8 @@ class SVTestBase(RuleAssertMixin, WorldTestBase, SVTestCase):
     def collect_months(self, months: int) -> None:
         real_total_prog_items = self.world.total_progression_items
         percent = months * MONTH_COEFFICIENT
-        self.collect("Stardrop", real_total_prog_items * 100 // percent)
+        number_stardrops = math.ceil(real_total_prog_items * (percent / 100))
+        self.collect("Stardrop", number_stardrops)
         self.world.total_progression_items = real_total_prog_items
 
     def collect_lots_of_money(self, percent: float = 0.25):
@@ -112,12 +116,12 @@ class SVTestBase(RuleAssertMixin, WorldTestBase, SVTestCase):
         self.collect_lots_of_money(0.95)
 
     def collect_everything(self):
-        non_event_items = [item for item in self.multiworld.get_items() if item.code]
+        non_event_items = [i for i in self.multiworld.get_items() if i.advancement and i.code]
         for item in non_event_items:
             self.multiworld.state.collect(item)
 
     def collect_all_except(self, item_to_not_collect: str):
-        non_event_items = [item for item in self.multiworld.get_items() if item.code]
+        non_event_items = [i for i in self.multiworld.get_items() if i.advancement and i.code]
         for item in non_event_items:
             if item.name != item_to_not_collect:
                 self.multiworld.state.collect(item)
@@ -189,6 +193,16 @@ class SVTestBase(RuleAssertMixin, WorldTestBase, SVTestCase):
             state = self.multiworld.state
         return super().assert_cannot_reach_region(region, state)
 
+    def assert_can_reach_region(self, region: Region | str, state: CollectionState | None = None) -> None:
+        if state is None:
+            state = self.multiworld.state
+        super().assert_can_reach_region(region, state)
+
+    def assert_cannot_reach_region(self, region: Region | str, state: CollectionState | None = None) -> None:
+        if state is None:
+            state = self.multiworld.state
+        super().assert_cannot_reach_region(region, state)
+
     def assert_can_reach_entrance(self, entrance: Entrance | str, state: CollectionState | None = None) -> None:
         if state is None:
             state = self.multiworld.state
@@ -211,7 +225,7 @@ def solo_multiworld(world_options: dict[str | type[StardewValleyOption], typing.
         try:
             multiworld.lock.acquire()
             original_state = multiworld.state.copy()
-            original_itempool = multiworld.itempool.copy()
+            original_itempool = deepcopy(multiworld.itempool)
             unfilled_locations = multiworld.get_unfilled_locations(1)
 
             yield multiworld, typing.cast(StardewValleyWorld, multiworld.worlds[1])
diff --git a/worlds/stardew_valley/test/content/__init__.py b/worlds/stardew_valley/test/content/__init__.py
index 626277ca72..a672723c9a 100644
--- a/worlds/stardew_valley/test/content/__init__.py
+++ b/worlds/stardew_valley/test/content/__init__.py
@@ -10,8 +10,10 @@ default_features = StardewFeatures(
     feature.cropsanity.CropsanityDisabled(),
     feature.fishsanity.FishsanityNone(),
     feature.friendsanity.FriendsanityNone(),
+    feature.hatsanity.HatsanityNone(),
+    feature.museumsanity.MuseumsanityNone(),
     feature.skill_progression.SkillProgressionVanilla(),
-    feature.tool_progression.ToolProgressionVanilla()
+    feature.tool_progression.ToolProgressionVanilla(),
 )
 
 
diff --git a/worlds/stardew_valley/test/content/feature/TestToolProgression.py b/worlds/stardew_valley/test/content/feature/TestToolProgression.py
index 618c78dd7a..f815c434e6 100644
--- a/worlds/stardew_valley/test/content/feature/TestToolProgression.py
+++ b/worlds/stardew_valley/test/content/feature/TestToolProgression.py
@@ -1,7 +1,7 @@
 import unittest
 
 from ....content import choose_tool_progression
-from ....options import ToolProgression, SkillProgression
+from ....options import ToolProgression, SkillProgression, StartWithout
 from ....strings.tool_names import Tool
 
 
@@ -10,8 +10,9 @@ class TestToolDistribution(unittest.TestCase):
     def test_given_vanilla_tool_progression_when_create_feature_then_only_one_scythe_is_randomized(self):
         tool_progression = ToolProgression(ToolProgression.option_vanilla)
         skill_progression = SkillProgression.from_text("random")
+        start_without = StartWithout(StartWithout.preset_none)
 
-        feature = choose_tool_progression(tool_progression, skill_progression)
+        feature = choose_tool_progression(tool_progression, skill_progression, start_without)
 
         self.assertEqual(feature.tool_distribution, {
             Tool.scythe: 1,
@@ -20,8 +21,9 @@ class TestToolDistribution(unittest.TestCase):
     def test_given_progressive_tool_when_create_feature_then_all_tool_upgrades_are_randomized(self):
         tool_progression = ToolProgression(ToolProgression.option_progressive)
         skill_progression = SkillProgression(SkillProgression.option_progressive)
+        start_without = StartWithout(StartWithout.preset_none)
 
-        feature = choose_tool_progression(tool_progression, skill_progression)
+        feature = choose_tool_progression(tool_progression, skill_progression, start_without)
 
         self.assertEqual(feature.tool_distribution, {
             Tool.scythe: 1,
@@ -37,8 +39,9 @@ class TestToolDistribution(unittest.TestCase):
     def test_given_progressive_tool_and_skill_masteries_when_create_feature_then_additional_scythe_and_fishing_rod_are_randomized(self):
         tool_progression = ToolProgression(ToolProgression.option_progressive)
         skill_progression = SkillProgression(SkillProgression.option_progressive_with_masteries)
+        start_without = StartWithout(StartWithout.preset_none)
 
-        feature = choose_tool_progression(tool_progression, skill_progression)
+        feature = choose_tool_progression(tool_progression, skill_progression, start_without)
 
         self.assertEqual(feature.tool_distribution, {
             Tool.scythe: 2,
diff --git a/worlds/stardew_valley/test/long/TestModsLong.py b/worlds/stardew_valley/test/long/TestModsLong.py
index d14af8bc55..c03df3fb1c 100644
--- a/worlds/stardew_valley/test/long/TestModsLong.py
+++ b/worlds/stardew_valley/test/long/TestModsLong.py
@@ -8,7 +8,7 @@ from ..assertion import WorldAssertMixin, ModAssertMixin
 from ..bases import skip_long_tests, SVTestCase, solo_multiworld
 from ..options.option_names import all_option_choices
 from ... import options
-from ...mods.mod_data import ModNames
+from ...mods.mod_data import ModNames, mod_combination_is_valid
 from ...options.options import all_mods
 
 
@@ -36,8 +36,11 @@ class TestGenerateModsPairs(WorldAssertMixin, ModAssertMixin, SVTestCase):
     mod_pair: ClassVar[tuple[str, str]]
 
     def test_given_mod_pairs_when_generate_then_basic_checks(self):
+        mods = frozenset(self.mod_pair)
+        if not mod_combination_is_valid(mods):
+            return
         world_options = {
-            options.Mods.internal_name: frozenset(self.mod_pair)
+            options.Mods.internal_name: mods
         }
 
         with solo_multiworld(world_options, world_caching=False) as (multiworld, _):
@@ -77,7 +80,7 @@ class TestGenerateAllGoalAndAllOptionWithAllModsWithoutQuest(WorldAssertMixin, M
             options.Goal.internal_name: self.goal,
             option: choice,
             options.QuestLocations.internal_name: -1,
-            options.Mods.internal_name: frozenset(options.Mods.valid_keys),
+            options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
         }
 
         with solo_multiworld(world_options, world_caching=False) as (multiworld, _):
diff --git a/worlds/stardew_valley/test/long/TestOptionsLong.py b/worlds/stardew_valley/test/long/TestOptionsLong.py
index 3c9690e2e6..d04e80a03b 100644
--- a/worlds/stardew_valley/test/long/TestOptionsLong.py
+++ b/worlds/stardew_valley/test/long/TestOptionsLong.py
@@ -15,8 +15,8 @@ class TestDynamicOptionDebug(WorldAssertMixin, SVTestCase):
 
     def test_option_pair_debug(self):
         option_dict = {
-            options.Goal.internal_name: options.Goal.option_cryptic_note,
-            options.EntranceRandomization.internal_name: options.EntranceRandomization.option_buildings,
+            options.BundlePerRoom.internal_name: options.BundlePerRoom.option_two_fewer,
+            options.Hatsanity.internal_name: options.Hatsanity.option_post_perfection,
         }
         for i in range(1):
             seed = get_seed(76312028554502615508)
diff --git a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
index 8ec2e539b7..b057fe0567 100644
--- a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
+++ b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
@@ -1,11 +1,12 @@
 from ..bases import SVTestBase
 from ...mods.mod_data import ModNames
-from ...options import Mods, BackpackProgression
+from ...options import Mods, BackpackProgression, BackpackSize
 
 
 class TestBiggerBackpackVanilla(SVTestBase):
     options = {
         BackpackProgression.internal_name: BackpackProgression.option_vanilla,
+        BackpackSize.internal_name: BackpackSize.option_12,
         Mods.internal_name: ModNames.big_backpack
     }
 
@@ -24,7 +25,8 @@ class TestBiggerBackpackVanilla(SVTestBase):
 class TestBiggerBackpackProgressive(SVTestBase):
     options = {
         BackpackProgression.internal_name: BackpackProgression.option_progressive,
-        Mods.internal_name: ModNames.big_backpack
+        BackpackSize.internal_name: BackpackSize.option_12,
+        Mods.internal_name: ModNames.big_backpack,
     }
 
     def test_backpack(self):
@@ -42,6 +44,7 @@ class TestBiggerBackpackProgressive(SVTestBase):
 class TestBiggerBackpackEarlyProgressive(TestBiggerBackpackProgressive):
     options = {
         BackpackProgression.internal_name: BackpackProgression.option_early_progressive,
+        BackpackSize.internal_name: BackpackSize.option_12,
         Mods.internal_name: ModNames.big_backpack
     }
 
@@ -50,3 +53,99 @@ class TestBiggerBackpackEarlyProgressive(TestBiggerBackpackProgressive):
 
         with self.subTest(check="is early"):
             self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
+
+
+class TestBiggerBackpackSplit1(SVTestBase):
+    options = {BackpackProgression.internal_name: BackpackProgression.option_progressive,
+               BackpackSize.internal_name: BackpackSize.option_1,
+               Mods.internal_name: ModNames.big_backpack}
+
+    def test_backpack(self):
+        with self.subTest(check="has items"):
+            item_names = [item.name for item in self.multiworld.get_items()]
+            self.assertEqual(item_names.count("Progressive Backpack"), 36)
+
+        with self.subTest(check="has locations"):
+            location_names = {location.name for location in self.multiworld.get_locations()}
+            self.assertNotIn("Large Pack", location_names)
+            self.assertNotIn("Deluxe Pack", location_names)
+            self.assertNotIn("Premium Pack", location_names)
+            for i in range(1, 13):
+                self.assertIn(f"Large Pack {i}", location_names)
+                self.assertIn(f"Deluxe Pack {i}", location_names)
+                self.assertIn(f"Premium Pack {i}", location_names)
+
+
+class TestBackpackSplit2(SVTestBase):
+    options = {BackpackProgression.internal_name: BackpackProgression.option_progressive,
+               BackpackSize.internal_name: BackpackSize.option_2,
+               Mods.internal_name: ModNames.big_backpack}
+
+    def test_backpack(self):
+        with self.subTest(check="has items"):
+            item_names = [item.name for item in self.multiworld.get_items()]
+            self.assertEqual(item_names.count("Progressive Backpack"), 18)
+
+        with self.subTest(check="has locations"):
+            location_names = {location.name for location in self.multiworld.get_locations()}
+            self.assertNotIn("Large Pack", location_names)
+            self.assertNotIn("Deluxe Pack", location_names)
+            self.assertNotIn("Premium Pack", location_names)
+            for i in range(1, 7):
+                self.assertIn(f"Large Pack {i}", location_names)
+                self.assertIn(f"Deluxe Pack {i}", location_names)
+                self.assertIn(f"Premium Pack {i}", location_names)
+            for i in range(7, 13):
+                self.assertNotIn(f"Large Pack {i}", location_names)
+                self.assertNotIn(f"Deluxe Pack {i}", location_names)
+                self.assertNotIn(f"Premium Pack {i}", location_names)
+
+
+class TestBackpackSplit4(SVTestBase):
+    options = {BackpackProgression.internal_name: BackpackProgression.option_progressive,
+               BackpackSize.internal_name: BackpackSize.option_4,
+               Mods.internal_name: ModNames.big_backpack}
+
+    def test_backpack(self):
+        with self.subTest(check="has items"):
+            item_names = [item.name for item in self.multiworld.get_items()]
+            self.assertEqual(item_names.count("Progressive Backpack"), 9)
+
+        with self.subTest(check="has locations"):
+            location_names = {location.name for location in self.multiworld.get_locations()}
+            self.assertNotIn("Large Pack", location_names)
+            self.assertNotIn("Deluxe Pack", location_names)
+            self.assertNotIn("Premium Pack", location_names)
+            for i in range(1, 4):
+                self.assertIn(f"Large Pack {i}", location_names)
+                self.assertIn(f"Deluxe Pack {i}", location_names)
+                self.assertIn(f"Premium Pack {i}", location_names)
+            for i in range(4, 13):
+                self.assertNotIn(f"Large Pack {i}", location_names)
+                self.assertNotIn(f"Deluxe Pack {i}", location_names)
+                self.assertNotIn(f"Premium Pack {i}", location_names)
+
+
+class TestBackpackSplit6(SVTestBase):
+    options = {BackpackProgression.internal_name: BackpackProgression.option_progressive,
+               BackpackSize.internal_name: BackpackSize.option_6,
+               Mods.internal_name: ModNames.big_backpack}
+
+    def test_backpack(self):
+        with self.subTest(check="has items"):
+            item_names = [item.name for item in self.multiworld.get_items()]
+            self.assertEqual(item_names.count("Progressive Backpack"), 6)
+
+        with self.subTest(check="has locations"):
+            location_names = {location.name for location in self.multiworld.get_locations()}
+            self.assertNotIn("Large Pack", location_names)
+            self.assertNotIn("Deluxe Pack", location_names)
+            self.assertNotIn("Premium Pack", location_names)
+            for i in range(1, 3):
+                self.assertIn(f"Large Pack {i}", location_names)
+                self.assertIn(f"Deluxe Pack {i}", location_names)
+                self.assertIn(f"Premium Pack {i}", location_names)
+            for i in range(3, 13):
+                self.assertNotIn(f"Large Pack {i}", location_names)
+                self.assertNotIn(f"Deluxe Pack {i}", location_names)
+                self.assertNotIn(f"Premium Pack {i}", location_names)
diff --git a/worlds/stardew_valley/test/mods/TestModdedBooksanity.py b/worlds/stardew_valley/test/mods/TestModdedBooksanity.py
new file mode 100644
index 0000000000..2da2c4d63f
--- /dev/null
+++ b/worlds/stardew_valley/test/mods/TestModdedBooksanity.py
@@ -0,0 +1,185 @@
+from ..bases import SVTestBase
+from ...options import ExcludeGingerIsland, Booksanity, Shipsanity, Mods, all_mods_except_invalid_combinations
+from ...strings.ap_names.mods.mod_items import ModBooks
+
+ModSkillBooks = [ModBooks.digging_like_worms]
+ModPowerBooks = []
+
+
+class TestModBooksanityNone(SVTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Shipsanity: Shipsanity.option_everything,
+        Booksanity: Booksanity.option_none,
+        Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+    }
+
+    def test_no_mod_power_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertNotIn(f"Read {book}", location_names)
+
+    def test_no_mod_skill_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModSkillBooks:
+            with self.subTest(book):
+                self.assertNotIn(f"Read {book}", location_names)
+
+    def test_no_power_items(self):
+        item_names = {location.name for location in self.multiworld.get_items()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertNotIn(f"Power: {book}", item_names)
+
+    def test_can_ship_all_mod_books(self):
+        self.collect_everything()
+        shipsanity_prefix = "Shipsanity: "
+        for location in self.multiworld.get_locations():
+            if not location.name.startswith(shipsanity_prefix):
+                continue
+
+            item_to_ship = location.name[len(shipsanity_prefix):]
+            if item_to_ship not in ModPowerBooks and item_to_ship not in ModSkillBooks:
+                continue
+
+            with self.subTest(location.name):
+                self.assert_can_reach_location(location)
+
+
+class TestModBooksanityPowers(SVTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Shipsanity: Shipsanity.option_everything,
+        Booksanity: Booksanity.option_power,
+        Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+    }
+
+    def test_all_modp_ower_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Read {book}", location_names)
+
+    def test_no_mod_skill_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModSkillBooks:
+            with self.subTest(book):
+                self.assertNotIn(f"Read {book}", location_names)
+
+    def test_all_power_items(self):
+        item_names = {location.name for location in self.multiworld.get_items()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Power: {book}", item_names)
+
+    def test_can_ship_all_books(self):
+        self.collect_everything()
+        shipsanity_prefix = "Shipsanity: "
+        for location in self.multiworld.get_locations():
+            if not location.name.startswith(shipsanity_prefix):
+                continue
+
+            item_to_ship = location.name[len(shipsanity_prefix):]
+            if item_to_ship not in ModPowerBooks and item_to_ship not in ModSkillBooks:
+                continue
+
+            with self.subTest(location.name):
+                self.assert_can_reach_location(location)
+
+
+class TestBooksanityPowersAndSkills(SVTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Shipsanity: Shipsanity.option_everything,
+        Booksanity: Booksanity.option_power_skill,
+        Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+    }
+
+    def test_all_mod_power_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Read {book}", location_names)
+
+    def test_all_mod_skill_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModSkillBooks:
+            with self.subTest(book):
+                self.assertIn(f"Read {book}", location_names)
+
+    def test_all_power_items(self):
+        item_names = {location.name for location in self.multiworld.get_items()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Power: {book}", item_names)
+
+    def test_can_ship_all_books(self):
+        self.collect_everything()
+        shipsanity_prefix = "Shipsanity: "
+        for location in self.multiworld.get_locations():
+            if not location.name.startswith(shipsanity_prefix):
+                continue
+
+            item_to_ship = location.name[len(shipsanity_prefix):]
+            if item_to_ship not in ModPowerBooks and item_to_ship not in ModSkillBooks:
+                continue
+
+            with self.subTest(location.name):
+                self.assert_can_reach_location(location)
+
+
+class TestBooksanityAll(SVTestBase):
+    options = {
+        ExcludeGingerIsland: ExcludeGingerIsland.option_false,
+        Shipsanity: Shipsanity.option_everything,
+        Booksanity: Booksanity.option_all,
+        Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+    }
+
+    def test_digging_like_worms_require_2_levels(self):
+        read_location = self.world.get_location("Read Digging Like Worms")
+        ship_location = self.world.get_location("Shipsanity: Digging Like Worms")
+        self.collect("Shipping Bin")
+        self.collect_months(2)
+
+        self.assert_cannot_reach_location(read_location)
+        self.assert_cannot_reach_location(ship_location)
+
+        self.collect("Archaeology Level")
+        self.collect("Archaeology Level")
+
+        self.assert_can_reach_location(read_location)
+        self.assert_can_reach_location(ship_location)
+
+    def test_all_mod_power_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Read {book}", location_names)
+
+    def test_all_mod_skill_books_locations(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for book in ModSkillBooks:
+            with self.subTest(book):
+                self.assertIn(f"Read {book}", location_names)
+
+    def test_all_power_items(self):
+        item_names = {location.name for location in self.multiworld.get_items()}
+        for book in ModPowerBooks:
+            with self.subTest(book):
+                self.assertIn(f"Power: {book}", item_names)
+
+    def test_can_ship_all_books(self):
+        self.collect_everything()
+        shipsanity_prefix = "Shipsanity: "
+        for location in self.multiworld.get_locations():
+            if not location.name.startswith(shipsanity_prefix):
+                continue
+
+            item_to_ship = location.name[len(shipsanity_prefix):]
+            if item_to_ship not in ModPowerBooks and item_to_ship not in ModSkillBooks:
+                continue
+
+            with self.subTest(location.name):
+                self.assert_can_reach_location(location)
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 8cff10b4fc..a447f06774 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -1,66 +1,47 @@
-from typing import ClassVar
-
-from test.param import classvar_matrix
 from ..TestGeneration import get_all_permanent_progression_items
 from ..assertion import ModAssertMixin, WorldAssertMixin
 from ..bases import SVTestCase, SVTestBase, solo_multiworld
-from ..options.presets import allsanity_mods_6_x_x
-from ... import options, Group
-from ...mods.mod_data import ModNames
+from ..options.presets import allsanity_mods_7_x_x
+from ... import options
+from ...items import Group
+from ...mods.mod_data import invalid_mod_combinations
 from ...options.options import all_mods
 
 
 class TestCanGenerateAllsanityWithMods(WorldAssertMixin, ModAssertMixin, SVTestCase):
 
     def test_allsanity_all_mods_when_generate_then_basic_checks(self):
-        with solo_multiworld(allsanity_mods_6_x_x()) as (multi_world, _):
+        with solo_multiworld(allsanity_mods_7_x_x()) as (multi_world, _):
             self.assert_basic_checks(multi_world)
 
     def test_allsanity_all_mods_exclude_island_when_generate_then_basic_checks(self):
-        world_options = allsanity_mods_6_x_x()
+        world_options = allsanity_mods_7_x_x()
         world_options.update({options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true})
         with solo_multiworld(world_options) as (multi_world, _):
             self.assert_basic_checks(multi_world)
 
 
-@classvar_matrix(mod=all_mods)
 class TestCanGenerateWithEachMod(WorldAssertMixin, ModAssertMixin, SVTestCase):
-    mod: ClassVar[str]
+    mods = all_mods
 
     def test_given_single_mods_when_generate_then_basic_checks(self):
-        world_options = {
-            options.Mods: self.mod,
-            options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
-        }
-        with solo_multiworld(world_options) as (multi_world, _):
-            self.assert_basic_checks(multi_world)
-            self.assert_stray_mod_items(self.mod, multi_world)
-
-
-@classvar_matrix(mod=all_mods.difference([
-    ModNames.ginger, ModNames.distant_lands, ModNames.skull_cavern_elevator, ModNames.wellwick, ModNames.magic, ModNames.binning_skill, ModNames.big_backpack,
-    ModNames.luck_skill, ModNames.tractor, ModNames.shiko, ModNames.archaeology, ModNames.delores, ModNames.socializing_skill, ModNames.cooking_skill
-]))
-class TestCanGenerateEachModWithEntranceRandomizationBuildings(WorldAssertMixin, SVTestCase):
-    """The following tests validate that ER still generates winnable and logically-sane games with given mods.
-    Mods that do not interact with entrances are skipped
-    Not all ER settings are tested, because 'buildings' is, essentially, a superset of all others
-    """
-    mod: ClassVar[str]
-
-    def test_given_mod_when_generate_then_basic_checks(self) -> None:
-        world_options = {
-            options.EntranceRandomization: options.EntranceRandomization.option_buildings,
-            options.Mods: self.mod,
-            options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
-        }
-        with solo_multiworld(world_options, world_caching=False) as (multi_world, _):
-            self.assert_basic_checks(multi_world)
+        for invalid_combination in invalid_mod_combinations:
+            for mod in invalid_combination:
+                mods = set(self.mods).difference(invalid_combination)
+                mods.add(mod)
+                with self.subTest(f"Can generate with mods: {mods}"):
+                    world_options = {
+                        options.Mods: frozenset(mods),
+                        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
+                    }
+                    with solo_multiworld(world_options) as (multi_world, _):
+                        self.assert_basic_checks(multi_world)
+                        self.assert_stray_mod_items(mods, multi_world)
 
 
 class TestBaseLocationDependencies(SVTestBase):
     options = {
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys),
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
         options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
         options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized
     }
@@ -74,11 +55,15 @@ class TestBaseItemGeneration(SVTestBase):
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
         options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
-        options.Chefsanity.internal_name: options.Chefsanity.option_all,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
         options.Booksanity.internal_name: options.Booksanity.option_all,
         options.Walnutsanity.internal_name: options.Walnutsanity.preset_all,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+        options.Moviesanity.internal_name: options.Moviesanity.option_all_movies_and_all_loved_snacks,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_all,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_all,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_true,
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
     }
 
     def test_all_progression_items_are_added_to_the_pool(self):
@@ -95,11 +80,15 @@ class TestNoGingerIslandModItemGeneration(SVTestBase):
         options.SkillProgression.internal_name: options.SkillProgression.option_progressive_with_masteries,
         options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
-        options.Chefsanity.internal_name: options.Chefsanity.option_all,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
         options.Booksanity.internal_name: options.Booksanity.option_all,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_all,
+        options.Moviesanity.internal_name: options.Moviesanity.option_all_movies_and_all_loved_snacks,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_all,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_true,
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
     }
 
     def test_all_progression_items_except_island_are_added_to_the_pool(self):
@@ -117,7 +106,7 @@ class TestVanillaLogicAlternativeWhenQuestsAreNotRandomized(WorldAssertMixin, SV
     """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 = allsanity_mods_7_x_x() | {
         options.QuestLocations.internal_name: options.QuestLocations.special_range_names["none"],
         options.Goal.internal_name: options.Goal.option_perfection,
     }
diff --git a/worlds/stardew_valley/test/mods/TestModsFill.py b/worlds/stardew_valley/test/mods/TestModsFill.py
index 334a4ff9e4..821007aee4 100644
--- a/worlds/stardew_valley/test/mods/TestModsFill.py
+++ b/worlds/stardew_valley/test/mods/TestModsFill.py
@@ -7,22 +7,14 @@ class TestNoGingerIslandCraftingRecipesAreRequired(SVTestBase):
         options.Goal.internal_name: options.Goal.option_craft_master,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
     }
 
-    @property
-    def run_default_tests(self) -> bool:
-        return True
-
 
 class TestNoGingerIslandCookingRecipesAreRequired(SVTestBase):
     options = {
         options.Goal.internal_name: options.Goal.option_gourmet_chef,
         options.Cooksanity.internal_name: options.Cooksanity.option_all,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+        options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations),
     }
-
-    @property
-    def run_default_tests(self) -> bool:
-        return True
diff --git a/worlds/stardew_valley/test/mods/TestSVE.py b/worlds/stardew_valley/test/mods/TestSVE.py
index a6b6f6a3dc..a3ff2474a5 100644
--- a/worlds/stardew_valley/test/mods/TestSVE.py
+++ b/worlds/stardew_valley/test/mods/TestSVE.py
@@ -2,6 +2,7 @@ from ..bases import SVTestBase
 from ... import options
 from ...mods.mod_data import ModNames
 from ...strings.ap_names.mods.mod_items import SVEQuestItem
+from ...strings.ap_names.transport_names import Transportation
 from ...strings.quest_names import ModQuest
 from ...strings.region_names import SVERegion
 
@@ -9,15 +10,15 @@ 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})
+        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(Transportation.bus_repair)
         self.collect("Shipping Bin")
         self.collect("Summer")
-        location_name = ModQuest.AuroraVineyard
+        location_name = f"Quest: {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)
diff --git a/worlds/stardew_valley/test/options/option_names.py b/worlds/stardew_valley/test/options/option_names.py
index 07fa42b508..45ad633c70 100644
--- a/worlds/stardew_valley/test/options/option_names.py
+++ b/worlds/stardew_valley/test/options/option_names.py
@@ -1,13 +1,24 @@
 import random
+from typing import Iterable
 
 from Options import NamedRange, Option, Range
 from ... import StardewValleyWorld
 from ...options import StardewValleyOption
 
-options_to_exclude = {"profit_margin", "starting_money", "multiple_day_sleep_enabled", "multiple_day_sleep_cost",
+options_to_exclude = {"profit_margin", "starting_money",
+                      "multiple_day_sleep_enabled", "multiple_day_sleep_cost",
                       "experience_multiplier", "friendship_multiplier", "debris_multiplier",
-                      "quick_start", "gifting", "gift_tax",
-                      "progression_balancing", "accessibility", "start_inventory", "start_hints", "death_link"}
+                      "quick_start", "gifting",
+                      "movement_buff_number", "enabled_filler_buffs", "trap_difficulty", "trap_distribution",
+                      "bundle_plando", "trap_items",
+                      "progression_balancing", "accessibility",
+                      "start_inventory", "local_items", "non_local_items", "exclude_locations", "priority_locations",
+                      "start_hints", "start_location_hints", "item_links", "plando_items",
+                      "death_link",
+                      "jojapocalypse", "joja_start_price", "joja_end_price", "joja_pricing_pattern", "joja_purchases_for_membership", "joja_are_you_sure"}
+
+for option in options_to_exclude:
+    assert option in StardewValleyWorld.options_dataclass.type_hints.keys(), f"Excluding an option that doesn't exist: {option}"
 
 options_to_include: list[type[StardewValleyOption | Option]] = [
     option
@@ -20,7 +31,10 @@ def get_option_choices(option: type[Option]) -> dict[str, int]:
     if issubclass(option, NamedRange):
         return option.special_range_names
     if issubclass(option, Range):
-        return {f"{val}": val for val in range(option.range_start, option.range_end + 1)}
+        range_size = option.range_end - option.range_start
+        max_steps = 10
+        step = max(1, range_size // max_steps)
+        return {f"{val}": val for val in range(option.range_start, option.range_end + 1, step)}
     elif option.options:
         return option.options
     return {}
@@ -40,12 +54,18 @@ def generate_random_world_options(seed: int) -> dict[str, int]:
     return world_options
 
 
-all_option_choices = [
-    (option.internal_name, value)
-    for option in options_to_include
-    if option.options
-    for value in get_option_choices(option)
-    if option.default != get_option_choices(option)[value]
-]
+all_option_choices = []
+for option in options_to_include:
+    if option.options:
+        option_choices = get_option_choices(option)
+        for choice_name, choice_value in option_choices.items():
+            if option.default != choice_value:
+                all_option_choices.append((option.internal_name, choice_name))
 
 assert all_option_choices
+
+
+def get_all_option_choices(extra_ignored: Iterable[str] = None):
+    if extra_ignored is None:
+        return all_option_choices
+    return [option_choice for option_choice in all_option_choices if option_choice[0] not in extra_ignored]
diff --git a/worlds/stardew_valley/test/options/presets.py b/worlds/stardew_valley/test/options/presets.py
index 86b21c693e..92aab191de 100644
--- a/worlds/stardew_valley/test/options/presets.py
+++ b/worlds/stardew_valley/test/options/presets.py
@@ -1,10 +1,12 @@
 from ... import options
+from ...strings.ap_names.ap_option_names import EatsanityOptionName
 
 
 def default_6_x_x():
     return {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.default,
         options.BackpackProgression.internal_name: options.BackpackProgression.default,
+        options.BackpackSize.internal_name: options.BackpackSize.option_12,
         options.Booksanity.internal_name: options.Booksanity.default,
         options.BuildingProgression.internal_name: options.BuildingProgression.default,
         options.BundlePrice.internal_name: options.BundlePrice.default,
@@ -13,7 +15,9 @@ def default_6_x_x():
         options.Cooksanity.internal_name: options.Cooksanity.default,
         options.Craftsanity.internal_name: options.Craftsanity.default,
         options.Cropsanity.internal_name: options.Cropsanity.default,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_none,
         options.ElevatorProgression.internal_name: options.ElevatorProgression.default,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.default,
         options.EntranceRandomization.internal_name: options.EntranceRandomization.default,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.default,
         options.FarmType.internal_name: options.FarmType.default,
@@ -22,19 +26,22 @@ def default_6_x_x():
         options.Friendsanity.internal_name: options.Friendsanity.default,
         options.FriendsanityHeartSize.internal_name: options.FriendsanityHeartSize.default,
         options.Goal.internal_name: options.Goal.default,
+        options.Hatsanity.internal_name: options.Hatsanity.preset_none,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_false,
         options.Mods.internal_name: options.Mods.default,
         options.Monstersanity.internal_name: options.Monstersanity.default,
+        options.Moviesanity.internal_name: options.Moviesanity.option_none,
         options.Museumsanity.internal_name: options.Museumsanity.default,
         options.NumberOfMovementBuffs.internal_name: options.NumberOfMovementBuffs.default,
-        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.default,
         options.QuestLocations.internal_name: options.QuestLocations.default,
         options.SeasonRandomization.internal_name: options.SeasonRandomization.default,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_none,
         options.Shipsanity.internal_name: options.Shipsanity.default,
         options.SkillProgression.internal_name: options.SkillProgression.default,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.default,
         options.ToolProgression.internal_name: options.ToolProgression.default,
-        options.TrapItems.internal_name: options.TrapItems.default,
-        options.Walnutsanity.internal_name: options.Walnutsanity.default
+        options.TrapDifficulty.internal_name: options.TrapDifficulty.default,
+        options.Walnutsanity.internal_name: options.Walnutsanity.default,
     }
 
 
@@ -42,15 +49,18 @@ def allsanity_no_mods_6_x_x():
     return {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_full_shuffling,
         options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+        options.BackpackSize.internal_name: options.BackpackSize.option_12,
         options.Booksanity.internal_name: options.Booksanity.option_all,
         options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
         options.BundlePrice.internal_name: options.BundlePrice.option_expensive,
         options.BundleRandomization.internal_name: options.BundleRandomization.option_thematic,
-        options.Chefsanity.internal_name: options.Chefsanity.option_all,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_all,
         options.Cooksanity.internal_name: options.Cooksanity.option_all,
         options.Craftsanity.internal_name: options.Craftsanity.option_all,
         options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_none,
         options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_all,
         options.EntranceRandomization.internal_name: options.EntranceRandomization.option_disabled,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
         options.FarmType.internal_name: options.FarmType.option_standard,
@@ -59,31 +69,134 @@ def allsanity_no_mods_6_x_x():
         options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
         options.FriendsanityHeartSize.internal_name: 1,
         options.Goal.internal_name: options.Goal.option_perfection,
+        options.Hatsanity.internal_name: options.Hatsanity.preset_none,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_false,
         options.Mods.internal_name: frozenset(),
         options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals,
+        options.Moviesanity.internal_name: options.Moviesanity.option_none,
         options.Museumsanity.internal_name: options.Museumsanity.option_all,
-        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_all,
         options.NumberOfMovementBuffs.internal_name: 12,
         options.QuestLocations.internal_name: 56,
         options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_none,
         options.Shipsanity.internal_name: options.Shipsanity.option_everything,
         options.SkillProgression.internal_name: options.SkillProgression.option_progressive_with_masteries,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
         options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_nightmare,
-        options.Walnutsanity.internal_name: options.Walnutsanity.preset_all
+        options.Walnutsanity.internal_name: options.Walnutsanity.preset_all,
     }
 
 
 def allsanity_mods_6_x_x_exclude_disabled():
     allsanity = allsanity_no_mods_6_x_x()
-    allsanity.update({options.Mods.internal_name: frozenset(options.enabled_mods)})
+    allsanity.update({options.Mods.internal_name: frozenset(options.enabled_mods_except_invalid_combinations)})
     return allsanity
 
 
 def allsanity_mods_6_x_x():
     allsanity = allsanity_no_mods_6_x_x()
-    allsanity.update({options.Mods.internal_name: frozenset(options.all_mods)})
+    allsanity.update({options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations)})
+    return allsanity
+
+
+def default_7_x_x():
+    return {
+        options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.default,
+        options.BackpackProgression.internal_name: options.BackpackProgression.default,
+        options.BackpackSize.internal_name: options.BackpackSize.default,
+        options.Booksanity.internal_name: options.Booksanity.default,
+        options.BuildingProgression.internal_name: options.BuildingProgression.default,
+        options.BundlePerRoom.internal_name: options.BundlePerRoom.default,
+        options.BundlePrice.internal_name: options.BundlePrice.default,
+        options.BundleRandomization.internal_name: options.BundleRandomization.default,
+        options.Chefsanity.internal_name: options.Chefsanity.default,
+        options.Cooksanity.internal_name: options.Cooksanity.default,
+        options.Craftsanity.internal_name: options.Craftsanity.default,
+        options.Cropsanity.internal_name: options.Cropsanity.default,
+        options.Eatsanity.internal_name: options.Eatsanity.default,
+        options.ElevatorProgression.internal_name: options.ElevatorProgression.default,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.default,
+        options.EntranceRandomization.internal_name: options.EntranceRandomization.default,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.default,
+        options.FestivalLocations.internal_name: options.FestivalLocations.default,
+        options.Fishsanity.internal_name: options.Fishsanity.default,
+        options.Friendsanity.internal_name: options.Friendsanity.default,
+        options.FriendsanityHeartSize.internal_name: options.FriendsanityHeartSize.default,
+        options.Goal.internal_name: options.Goal.default,
+        options.Hatsanity.internal_name: options.Hatsanity.default,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.default,
+        options.Mods.internal_name: options.Mods.default,
+        options.Monstersanity.internal_name: options.Monstersanity.default,
+        options.Moviesanity.internal_name: options.Moviesanity.option_none,
+        options.Museumsanity.internal_name: options.Museumsanity.default,
+        options.NumberOfMovementBuffs.internal_name: options.NumberOfMovementBuffs.default,
+        options.QuestLocations.internal_name: options.QuestLocations.default,
+        options.SeasonRandomization.internal_name: options.SeasonRandomization.default,
+        options.Secretsanity.internal_name: options.Secretsanity.default,
+        options.Shipsanity.internal_name: options.Shipsanity.default,
+        options.SkillProgression.internal_name: options.SkillProgression.default,
+        options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.default,
+        options.ToolProgression.internal_name: options.ToolProgression.default,
+        options.TrapDifficulty.internal_name: options.TrapDifficulty.default,
+        options.Walnutsanity.internal_name: options.Walnutsanity.default,
+    }
+
+
+def allsanity_no_mods_7_x_x():
+    return {
+        options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_full_shuffling,
+        options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
+        options.BackpackSize.internal_name: options.BackpackSize.option_1,
+        options.Booksanity.internal_name: options.Booksanity.option_all,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
+        options.BundlePerRoom.internal_name: options.BundlePerRoom.option_two_extra,
+        options.BundlePrice.internal_name: options.BundlePrice.option_expensive,
+        options.BundleRandomization.internal_name: options.BundleRandomization.option_thematic,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_all,
+        options.Cooksanity.internal_name: options.Cooksanity.option_all,
+        options.Craftsanity.internal_name: options.Craftsanity.option_all,
+        options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_all,
+        options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_all,
+        options.EntranceRandomization.internal_name: options.EntranceRandomization.option_disabled,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
+        options.FarmType.internal_name: options.FarmType.option_beach,  # There is one extra fishing secret on the beach farm
+        options.FestivalLocations.internal_name: options.FestivalLocations.option_hard,
+        options.Fishsanity.internal_name: options.Fishsanity.option_all,
+        options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
+        options.FriendsanityHeartSize.internal_name: 1,
+        options.Goal.internal_name: options.Goal.option_perfection,
+        options.Hatsanity.internal_name: options.Hatsanity.preset_all,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_true,
+        options.Mods.internal_name: frozenset(),
+        options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals,
+        options.Moviesanity.internal_name: options.Moviesanity.option_all_movies_and_all_loved_snacks,
+        options.Museumsanity.internal_name: options.Museumsanity.option_all,
+        options.NumberOfMovementBuffs.internal_name: 12,
+        options.QuestLocations.internal_name: 56,
+        options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_all,
+        options.Shipsanity.internal_name: options.Shipsanity.option_everything,
+        options.SkillProgression.internal_name: options.SkillProgression.option_progressive_with_masteries,
+        options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
+        options.StartWithout.internal_name: options.StartWithout.preset_all,
+        options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
+        options.TrapDifficulty.internal_name: options.TrapDifficulty.option_nightmare,
+        options.Walnutsanity.internal_name: options.Walnutsanity.preset_all,
+    }
+
+
+def allsanity_mods_7_x_x():
+    allsanity = allsanity_no_mods_7_x_x()
+    allsanity.update({options.Mods.internal_name: frozenset(options.all_mods_except_invalid_combinations)})
+    return allsanity
+
+
+def allsanity_mods_7_x_x_exclude_disabled():
+    allsanity = allsanity_no_mods_7_x_x()
+    allsanity.update({options.Mods.internal_name: frozenset(options.enabled_mods_except_invalid_combinations)})
     return allsanity
 
 
@@ -91,15 +204,19 @@ def get_minsanity_options():
     return {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled,
         options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla,
+        options.BackpackSize.internal_name: options.BackpackSize.option_12,
         options.Booksanity.internal_name: options.Booksanity.option_none,
         options.BuildingProgression.internal_name: options.BuildingProgression.option_vanilla,
+        options.BundlePerRoom.internal_name: options.BundlePerRoom.option_two_fewer,
         options.BundlePrice.internal_name: options.BundlePrice.option_very_cheap,
         options.BundleRandomization.internal_name: options.BundleRandomization.option_vanilla,
-        options.Chefsanity.internal_name: options.Chefsanity.option_none,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_none,
         options.Cooksanity.internal_name: options.Cooksanity.option_none,
         options.Craftsanity.internal_name: options.Craftsanity.option_none,
         options.Cropsanity.internal_name: options.Cropsanity.option_disabled,
+        options.Eatsanity.internal_name: options.Eatsanity.preset_none,
         options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_none,
         options.EntranceRandomization.internal_name: options.EntranceRandomization.option_disabled,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
         options.FarmType.internal_name: options.FarmType.option_meadowlands,
@@ -108,19 +225,21 @@ def get_minsanity_options():
         options.Friendsanity.internal_name: options.Friendsanity.option_none,
         options.FriendsanityHeartSize.internal_name: 8,
         options.Goal.internal_name: options.Goal.option_bottom_of_the_mines,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_false,
         options.Mods.internal_name: frozenset(),
         options.Monstersanity.internal_name: options.Monstersanity.option_none,
+        options.Moviesanity.internal_name: options.Moviesanity.option_none,
         options.Museumsanity.internal_name: options.Museumsanity.option_none,
-        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_none,
         options.NumberOfMovementBuffs.internal_name: 0,
         options.QuestLocations.internal_name: -1,
         options.SeasonRandomization.internal_name: options.SeasonRandomization.option_disabled,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_none,
         options.Shipsanity.internal_name: options.Shipsanity.option_none,
         options.SkillProgression.internal_name: options.SkillProgression.option_vanilla,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_vanilla,
         options.ToolProgression.internal_name: options.ToolProgression.option_vanilla,
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_no_traps,
-        options.Walnutsanity.internal_name: options.Walnutsanity.preset_none
+        options.Walnutsanity.internal_name: options.Walnutsanity.preset_none,
     }
 
 
@@ -128,15 +247,19 @@ def minimal_locations_maximal_items():
     min_max_options = {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled,
         options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla,
+        options.BackpackSize.internal_name: options.BackpackSize.option_12,
         options.Booksanity.internal_name: options.Booksanity.option_none,
         options.BuildingProgression.internal_name: options.BuildingProgression.option_vanilla,
+        options.BundlePerRoom.internal_name: options.BundlePerRoom.option_two_fewer,
         options.BundlePrice.internal_name: options.BundlePrice.option_expensive,
         options.BundleRandomization.internal_name: options.BundleRandomization.option_shuffled,
-        options.Chefsanity.internal_name: options.Chefsanity.option_none,
+        options.Chefsanity.internal_name: options.Chefsanity.preset_none,
         options.Cooksanity.internal_name: options.Cooksanity.option_none,
         options.Craftsanity.internal_name: options.Craftsanity.option_none,
         options.Cropsanity.internal_name: options.Cropsanity.option_disabled,
+        options.Eatsanity.internal_name: frozenset([EatsanityOptionName.lock_effects]),
         options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla,
+        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_all,
         options.EntranceRandomization.internal_name: options.EntranceRandomization.option_disabled,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
         options.FarmType.internal_name: options.FarmType.option_meadowlands,
@@ -145,19 +268,22 @@ def minimal_locations_maximal_items():
         options.Friendsanity.internal_name: options.Friendsanity.option_none,
         options.FriendsanityHeartSize.internal_name: 8,
         options.Goal.internal_name: options.Goal.option_craft_master,
+        options.IncludeEndgameLocations.internal_name: options.IncludeEndgameLocations.option_false,
         options.Mods.internal_name: frozenset(),
         options.Monstersanity.internal_name: options.Monstersanity.option_none,
+        options.Moviesanity.internal_name: options.Moviesanity.option_none,
         options.Museumsanity.internal_name: options.Museumsanity.option_none,
-        options.EnabledFillerBuffs.internal_name: options.EnabledFillerBuffs.preset_all,
         options.NumberOfMovementBuffs.internal_name: 12,
         options.QuestLocations.internal_name: -1,
         options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized,
+        options.Secretsanity.internal_name: options.Secretsanity.preset_none,
         options.Shipsanity.internal_name: options.Shipsanity.option_none,
         options.SkillProgression.internal_name: options.SkillProgression.option_vanilla,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_vanilla,
+        options.StartWithout.internal_name: options.StartWithout.preset_all,
         options.ToolProgression.internal_name: options.ToolProgression.option_vanilla,
         options.TrapDifficulty.internal_name: options.TrapDifficulty.option_nightmare,
-        options.Walnutsanity.internal_name: options.Walnutsanity.preset_none
+        options.Walnutsanity.internal_name: options.Walnutsanity.preset_none,
     }
     return min_max_options
 
diff --git a/worlds/stardew_valley/test/performance/TestPerformance.py b/worlds/stardew_valley/test/performance/TestPerformance.py
index 2951e6d00a..e52ed8f743 100644
--- a/worlds/stardew_valley/test/performance/TestPerformance.py
+++ b/worlds/stardew_valley/test/performance/TestPerformance.py
@@ -9,10 +9,8 @@ from BaseClasses import get_seed
 from Fill import distribute_items_restrictive, balance_multiworld_progression
 from worlds import AutoWorld
 from ..bases import SVTestCase, setup_multiworld
-from ..options.presets import default_6_x_x, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, minimal_locations_maximal_items
-
-assert default_6_x_x
-assert allsanity_no_mods_6_x_x
+from ..options.presets import default_6_x_x, allsanity_no_mods_6_x_x, minimal_locations_maximal_items, allsanity_mods_7_x_x, allsanity_no_mods_7_x_x, \
+    default_7_x_x
 
 default_number_generations = 25
 acceptable_deviation = 4
@@ -99,7 +97,7 @@ class SVPerformanceTestCase(SVTestCase):
         acceptable_average_time = self.acceptable_time_per_player * amount_of_players
         total_time = 0
         all_times = []
-        seeds = [get_seed() for _ in range(self.number_generations)] if not self.fixed_seed else [85635032403287291967] * self.number_generations
+        seeds = [get_seed() for _ in range(self.number_generations)] if not self.fixed_seed else [74898321050311118687] * self.number_generations
 
         for i, seed in enumerate(seeds):
             with self.subTest(f"Seed: {seed}"):
@@ -134,11 +132,39 @@ def size_name(number_players):
     return f"{number_players}-player"
 
 
-class TestDefaultOptions(SVPerformanceTestCase):
+class TestDefaultOptions6xx(SVPerformanceTestCase):
     acceptable_time_per_player = 2
     options = default_6_x_x()
     results = []
 
+    def test_solo(self):
+        number_players = 1
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    def test_duo(self):
+        number_players = 2
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    @unittest.skip
+    def test_5_player(self):
+        number_players = 5
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    @unittest.skip
+    def test_10_player(self):
+        number_players = 10
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+
+class TestDefaultOptions7xx(SVPerformanceTestCase):
+    acceptable_time_per_player = 2
+    options = default_7_x_x()
+    results = []
+
     def test_solo(self):
         number_players = 1
         multiworld_options = [self.options] * number_players
@@ -187,11 +213,40 @@ class TestMinLocationMaxItems(SVPerformanceTestCase):
         self.performance_test_multiworld(multiworld_options)
 
 
-class TestAllsanityWithoutMods(SVPerformanceTestCase):
+class TestAllsanityWithoutMods6xx(SVPerformanceTestCase):
     acceptable_time_per_player = 10
     options = allsanity_no_mods_6_x_x()
     results = []
 
+    def test_solo(self):
+        number_players = 1
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    @unittest.skip
+    def test_duo(self):
+        number_players = 2
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    @unittest.skip
+    def test_5_player(self):
+        number_players = 5
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+    @unittest.skip
+    def test_10_player(self):
+        number_players = 10
+        multiworld_options = [self.options] * number_players
+        self.performance_test_multiworld(multiworld_options)
+
+
+class TestAllsanityWithoutMods7xx(SVPerformanceTestCase):
+    acceptable_time_per_player = 10
+    options = allsanity_no_mods_7_x_x()
+    results = []
+
     def test_solo(self):
         number_players = 1
         multiworld_options = [self.options] * number_players
@@ -215,9 +270,9 @@ class TestAllsanityWithoutMods(SVPerformanceTestCase):
         self.performance_test_multiworld(multiworld_options)
 
 
-class TestAllsanityWithMods(SVPerformanceTestCase):
+class TestAllsanityWithMods7xx(SVPerformanceTestCase):
     acceptable_time_per_player = 25
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_7_x_x()
     results = []
 
     @unittest.skip
diff --git a/worlds/stardew_valley/test/regions/TestEntranceClassifications.py b/worlds/stardew_valley/test/regions/TestEntranceClassifications.py
index 4bc13cb51c..426523bac5 100644
--- a/worlds/stardew_valley/test/regions/TestEntranceClassifications.py
+++ b/worlds/stardew_valley/test/regions/TestEntranceClassifications.py
@@ -7,6 +7,9 @@ from ...regions.regions import create_all_connections
 class EntranceRandomizationAssertMixin:
 
     def assert_non_progression_are_all_accessible_with_empty_inventory(self: SVTestBase):
+        # You need a tiny bit of money, for Jojamart specifically, because of a safeguard in case you get an early theater
+        self.collect("Shipping Bin")
+        self.collect_months(1)
         all_connections = create_all_connections(self.world.content.registered_packs)
         non_progression_connections = [connection for connection in all_connections.values() if RandomizationFlag.BIT_NON_PROGRESSION in connection.flag]
 
@@ -29,7 +32,7 @@ class TestVanillaEntranceClassifications(EntranceRandomizationAssertMixin, SVTes
 class TestModdedEntranceClassifications(EntranceRandomizationAssertMixin, SVTestBase):
     options = {
         options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false,
-        options.Mods: frozenset(options.Mods.valid_keys)
+        options.Mods: frozenset(options.all_mods_except_invalid_combinations),
     }
 
     def test_non_progression_are_all_accessible_with_empty_inventory(self):
diff --git a/worlds/stardew_valley/test/regions/TestEntranceRandomization.py b/worlds/stardew_valley/test/regions/TestEntranceRandomization.py
index 15c46637ab..c9b07cbc05 100644
--- a/worlds/stardew_valley/test/regions/TestEntranceRandomization.py
+++ b/worlds/stardew_valley/test/regions/TestEntranceRandomization.py
@@ -4,7 +4,7 @@ from unittest.mock import patch, Mock
 
 from BaseClasses import get_seed, MultiWorld, Entrance
 from ..assertion import WorldAssertMixin
-from ..bases import SVTestCase, solo_multiworld
+from ..bases import SVTestCase, solo_multiworld, setup_solo_multiworld
 from ... import options
 from ...mods.mod_data import ModNames
 from ...options import EntranceRandomization, ExcludeGingerIsland, SkillProgression
@@ -59,67 +59,24 @@ class TestEntranceRando(SVTestCase):
         self.assertEqual({"A to B": "A to C", "C to A": "B to A", "C to D": "C to A", "A to C": "D to C"}, swapped_connections)
 
 
-class TestEntranceRandoCreatesValidWorlds(WorldAssertMixin, SVTestCase):
+class TestCanGenerateEachModWithEntranceRandomizationBuildings(WorldAssertMixin, SVTestCase):
+    """The following tests validate that ER still generates winnable and logically-sane games with given mods.
+    Mods that do not interact with entrances are skipped
+    Not all ER settings are tested, because 'buildings' is, essentially, a superset of all others
+    """
+    mods = all_mods.difference([
+        ModNames.ginger, ModNames.distant_lands, ModNames.skull_cavern_elevator, ModNames.wellwick, ModNames.magic,
+        ModNames.binning_skill, ModNames.big_backpack, ModNames.luck_skill, ModNames.tractor, ModNames.shiko, ModNames.archaeology,
+        ModNames.delores, ModNames.socializing_skill, ModNames.cooking_skill
+    ])
 
-    # The following tests validate that ER still generates winnable and logically-sane games with given mods.
-    # Mods that do not interact with entrances are skipped
-    # Not all ER settings are tested, because 'buildings' is, essentially, a superset of all others
-    def test_ginger_island_excluded_buildings(self):
+    def test_given_mod_when_generate_then_basic_checks(self) -> None:
         world_options = {
             options.EntranceRandomization: options.EntranceRandomization.option_buildings,
-            options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true
-        }
-        with solo_multiworld(world_options) as (multi_world, _):
-            self.assert_basic_checks(multi_world)
-
-    def test_deepwoods_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.deepwoods, options.EntranceRandomization.option_buildings)
-
-    def test_juna_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.juna, options.EntranceRandomization.option_buildings)
-
-    def test_jasper_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.jasper, options.EntranceRandomization.option_buildings)
-
-    def test_alec_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.alec, options.EntranceRandomization.option_buildings)
-
-    def test_yoba_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.yoba, options.EntranceRandomization.option_buildings)
-
-    def test_eugene_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.eugene, options.EntranceRandomization.option_buildings)
-
-    def test_ayeisha_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.ayeisha, options.EntranceRandomization.option_buildings)
-
-    def test_riley_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.riley, options.EntranceRandomization.option_buildings)
-
-    def test_sve_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.sve, options.EntranceRandomization.option_buildings)
-
-    def test_alecto_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.alecto, options.EntranceRandomization.option_buildings)
-
-    def test_lacey_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.lacey, options.EntranceRandomization.option_buildings)
-
-    def test_boarding_house_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(ModNames.boarding_house, options.EntranceRandomization.option_buildings)
-
-    def test_all_mods_entrance_randomization_buildings(self):
-        self.perform_basic_checks_on_mod_with_er(all_mods, options.EntranceRandomization.option_buildings)
-
-    def perform_basic_checks_on_mod_with_er(self, mods: str | set[str], er_option: int) -> None:
-        if isinstance(mods, str):
-            mods = {mods}
-        world_options = {
-            options.EntranceRandomization: er_option,
-            options.Mods: frozenset(mods),
+            options.Mods: frozenset(self.mods),
             options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
         }
-        with solo_multiworld(world_options) as (multi_world, _):
+        with solo_multiworld(world_options, world_caching=False) as (multi_world, _):
             self.assert_basic_checks(multi_world)
 
 
@@ -165,3 +122,28 @@ def explore_regions_up_to_blockers(blocked_entrances: Collection[str], multiworl
             regions_to_explore.append(exit_.connected_region)
 
     return explored_regions
+
+
+class TestEntranceRandoSpecificCases(SVTestCase):
+    def test_pierre_can_be_randomized_in_the_desert(self):
+        world_options = {
+            options.EntranceRandomization: EntranceRandomization.option_buildings,
+            options.ExcludeGingerIsland: ExcludeGingerIsland.option_true,
+        }
+
+        multiworld = setup_solo_multiworld(world_options, _steps=["generate_early", "create_regions", "create_items", "set_rules"])
+        world = multiworld.worlds[1]
+        world.random = Mock()
+
+        def sort_entrances_to_place_pierre_and_oasis_first(entrances: list[Entrance]) -> None:
+            # This completely on the fact that
+            #  1. GER calls `shuffle` on the list of entrances and exits;
+            #  2. Both Pierre's and Oasis are not dead end so they are randomized in the first batch of entrances.
+            # Might break if the implementation changes :)
+            entrances.sort(key=lambda x: 0 if "Desert to Oasis" in x.name or "Pierre's General Store to Town" in x.name else 1)
+
+        world.random.shuffle = sort_entrances_to_place_pierre_and_oasis_first
+
+        world.connect_entrances()
+
+        self.assertEqual("Desert", multiworld.get_region("Pierre's General Store", 1).entrances[0].parent_region.name)
diff --git a/worlds/stardew_valley/test/regions/TestRandomizationFlag.py b/worlds/stardew_valley/test/regions/TestRandomizationFlag.py
index 6a01ef07e9..52f4d91f94 100644
--- a/worlds/stardew_valley/test/regions/TestRandomizationFlag.py
+++ b/worlds/stardew_valley/test/regions/TestRandomizationFlag.py
@@ -2,6 +2,7 @@ import unittest
 
 from ..options.utils import fill_dataclass_with_default
 from ... import create_content, options
+from ...options import SkillProgression
 from ...regions.entrance_rando import create_player_randomization_flag
 from ...regions.model import RandomizationFlag, ConnectionData
 
@@ -68,7 +69,8 @@ class TestRandomizationFlag(unittest.TestCase):
                 (options.EntranceRandomization.option_buildings, RandomizationFlag.BIT_BUILDINGS),
                 (options.EntranceRandomization.option_chaos, RandomizationFlag.BIT_BUILDINGS),
         ):
-            player_options = fill_dataclass_with_default({options.EntranceRandomization: entrance_randomization_choice})
+            player_options = fill_dataclass_with_default({options.EntranceRandomization: entrance_randomization_choice,
+                                                          options.SkillProgression: SkillProgression.option_progressive_with_masteries})
             content = create_content(player_options)
 
             flag = create_player_randomization_flag(player_options.entrance_randomization, content)
diff --git a/worlds/stardew_valley/test/regions/TestRegionConnections.py b/worlds/stardew_valley/test/regions/TestRegionConnections.py
index f20ef7943c..0b45e7d5bd 100644
--- a/worlds/stardew_valley/test/regions/TestRegionConnections.py
+++ b/worlds/stardew_valley/test/regions/TestRegionConnections.py
@@ -42,7 +42,7 @@ class TestVanillaRegionsConnectionsWithoutGingerIsland(unittest.TestCase):
 class TestModsConnections(unittest.TestCase):
     options = {
         options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false,
-        options.Mods: frozenset(options.Mods.valid_keys)
+        options.Mods: frozenset(options.all_mods_except_invalid_combinations),
     }
     content = create_content(fill_dataclass_with_default(options))
     all_regions_by_name = create_all_regions(content.registered_packs)
@@ -54,13 +54,13 @@ class TestModsConnections(unittest.TestCase):
                 if MergeFlag.REMOVE_EXITS in region.flag:
                     continue
 
-                with self.subTest(mod=mod_region_data.mod_name, region=region.name):
+                with self.subTest(mod=mod_region_data.content_pack, region=region.name):
                     for exit_ in region.exits:
                         self.assertIn(exit_, self.all_connections_by_name, f"{region.name} is leading to {exit_} but it does not exist.")
 
     def test_connection_lead_somewhere(self):
         for mod_region_data in region_data_by_content_pack.values():
             for connection in mod_region_data.connections:
-                with self.subTest(mod=mod_region_data.mod_name, connection=connection.name):
+                with self.subTest(mod=mod_region_data.content_pack, connection=connection.name):
                     self.assertIn(connection.destination, self.all_regions_by_name,
                                   f"{connection.name} is leading to {connection.destination} but it does not exist.")
diff --git a/worlds/stardew_valley/test/rules/TestBooks.py b/worlds/stardew_valley/test/rules/TestBooks.py
index eb26b27444..1575a18511 100644
--- a/worlds/stardew_valley/test/rules/TestBooks.py
+++ b/worlds/stardew_valley/test/rules/TestBooks.py
@@ -8,9 +8,13 @@ class TestBooksLogic(SVTestBase):
     }
 
     def test_can_get_mapping_cave_systems_with_weapon_and_time(self):
-        self.collect_months(12)
+        self.collect_lots_of_money(0.95)
+        self.collect("Progressive Bookseller Days", 2)
+        self.collect("Bookseller Stock: Progressive Rare Books", 2)
         self.assert_cannot_reach_location("Read Mapping Cave Systems")
 
+        self.collect("Landslide Removed")
+        self.collect("Progressive Pickaxe")
         self.collect("Progressive Mine Elevator")
         self.collect("Progressive Mine Elevator")
         self.collect("Progressive Mine Elevator")
diff --git a/worlds/stardew_valley/test/rules/TestBuildings.py b/worlds/stardew_valley/test/rules/TestBuildings.py
index 0b1f41d2c5..f2cd918ae7 100644
--- a/worlds/stardew_valley/test/rules/TestBuildings.py
+++ b/worlds/stardew_valley/test/rules/TestBuildings.py
@@ -1,45 +1,57 @@
 from ..bases import SVTestBase
-from ...options import BuildingProgression, FarmType
+from ... import SeasonRandomization, StartWithoutOptionName
+from ...options import BuildingProgression, FarmType, ToolProgression, StartWithout
 
 
 class TestBuildingLogic(SVTestBase):
     options = {
+        StartWithout.internal_name: frozenset({StartWithoutOptionName.landslide}),
+        SeasonRandomization.internal_name: SeasonRandomization.option_disabled,
         FarmType.internal_name: FarmType.option_standard,
         BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        ToolProgression.internal_name: ToolProgression.option_progressive,
     }
 
     def test_coop_blueprint(self):
-        self.assert_cannot_reach_location("Coop Blueprint")
+        location = "Coop Blueprint"
+        self.assert_cannot_reach_location(location)
 
+        self.collect("Landslide Removed")
         self.collect_lots_of_money()
-        self.assert_can_reach_location("Coop Blueprint")
+        self.assert_can_reach_location(location)
 
     def test_big_coop_blueprint(self):
-        self.assert_cannot_reach_location("Big Coop Blueprint")
+        location = "Big Coop Blueprint"
+        self.assert_cannot_reach_location(location)
 
+        self.collect("Landslide Removed")
         self.collect_lots_of_money()
-        self.assert_cannot_reach_location("Big Coop Blueprint")
+        self.assert_cannot_reach_location(location)
 
         self.multiworld.state.collect(self.create_item("Progressive Coop"))
-        self.assert_can_reach_location("Big Coop Blueprint")
+        self.assert_can_reach_location(location)
 
     def test_deluxe_coop_blueprint(self):
-        self.assert_cannot_reach_location("Deluxe Coop Blueprint")
+        location = "Deluxe Coop Blueprint"
+        self.assert_cannot_reach_location(location)
 
+        self.collect("Landslide Removed")
         self.collect_lots_of_money()
-        self.assert_cannot_reach_location("Deluxe Coop Blueprint")
+        self.assert_cannot_reach_location(location)
 
         self.multiworld.state.collect(self.create_item("Progressive Coop"))
-        self.assert_cannot_reach_location("Deluxe Coop Blueprint")
+        self.assert_cannot_reach_location(location)
 
         self.multiworld.state.collect(self.create_item("Progressive Coop"))
-        self.assert_can_reach_location("Deluxe Coop Blueprint")
+        self.assert_can_reach_location(location)
 
     def test_big_shed_blueprint(self):
-        self.assert_cannot_reach_location("Big Shed Blueprint")
+        location = "Big Shed Blueprint"
+        self.assert_cannot_reach_location(location)
 
+        self.collect("Landslide Removed")
         self.collect_lots_of_money()
-        self.assert_cannot_reach_location("Big Shed Blueprint")
+        self.assert_cannot_reach_location(location)
 
         self.multiworld.state.collect(self.create_item("Progressive Shed"))
-        self.assert_can_reach_location("Big Shed Blueprint")
+        self.assert_can_reach_location(location)
diff --git a/worlds/stardew_valley/test/rules/TestBundles.py b/worlds/stardew_valley/test/rules/TestBundles.py
index 357269a25b..837cace32c 100644
--- a/worlds/stardew_valley/test/rules/TestBundles.py
+++ b/worlds/stardew_valley/test/rules/TestBundles.py
@@ -1,11 +1,13 @@
 from ..bases import SVTestBase
-from ... import options
-from ...options import BundleRandomization
+from ... import options, SeasonRandomization, StartWithoutOptionName
+from ...options import BundleRandomization, StartWithout
 from ...strings.bundle_names import BundleName
 
 
 class TestBundlesLogic(SVTestBase):
     options = {
+        StartWithout.internal_name: frozenset({StartWithoutOptionName.community_center, StartWithoutOptionName.buildings}),
+        options.SeasonRandomization: SeasonRandomization.option_disabled,
         options.BundleRandomization: BundleRandomization.option_vanilla,
         options.BundlePrice: options.BundlePrice.default,
     }
@@ -13,52 +15,64 @@ class TestBundlesLogic(SVTestBase):
     def test_vault_2500g_bundle(self):
         self.assert_cannot_reach_location("2,500g Bundle")
 
+        self.collect("Community Center Key")
+        self.collect("Forest Magic")
+        self.assert_cannot_reach_location("2,500g Bundle")
         self.collect_lots_of_money()
         self.assert_can_reach_location("2,500g Bundle")
 
 
 class TestRemixedBundlesLogic(SVTestBase):
     options = {
+        StartWithout.internal_name: frozenset({StartWithoutOptionName.community_center}),
+        options.SeasonRandomization: SeasonRandomization.option_disabled,
         options.BundleRandomization: BundleRandomization.option_remixed,
         options.BundlePrice: options.BundlePrice.default,
-        options.BundlePlando: frozenset({BundleName.sticky})
+        options.BundleWhitelist: frozenset({BundleName.sticky})
     }
 
     def test_sticky_bundle_has_grind_rules(self):
         self.assert_cannot_reach_location("Sticky Bundle")
 
+        self.collect("Community Center Key")
+        self.collect("Forest Magic")
+        self.assert_cannot_reach_location("Sticky Bundle")
         self.collect_all_the_money()
         self.assert_can_reach_location("Sticky Bundle")
 
 
-class TestRaccoonBundlesLogic(SVTestBase):
-    options = {
-        options.BundleRandomization: BundleRandomization.option_vanilla,
-        options.BundlePrice: options.BundlePrice.option_normal,
-        options.Craftsanity: options.Craftsanity.option_all,
-    }
-    seed = 2  # Magic seed that does what I want. Might need to get changed if we change the randomness behavior of raccoon bundles
+# The Randomness changed
 
-    def test_raccoon_bundles_rely_on_previous_ones(self):
-        self.collect("Progressive Raccoon", 6)
-        self.collect("Progressive Mine Elevator", 24)
-        self.collect("Mining Level", 12)
-        self.collect("Combat Level", 12)
-        self.collect("Progressive Axe", 4)
-        self.collect("Progressive Pickaxe", 4)
-        self.collect("Progressive Weapon", 4)
-        self.collect("Dehydrator Recipe")
-        self.collect("Mushroom Boxes")
-        self.collect("Progressive Fishing Rod", 4)
-        self.collect("Fishing Level", 10)
-        self.collect("Furnace Recipe")
-
-        # The first raccoon bundle is a fishing one
-        self.assert_cannot_reach_location("Raccoon Request 1")
-        # The third raccoon bundle is a foraging one
-        self.assert_cannot_reach_location("Raccoon Request 3")
-
-        self.collect("Fish Smoker Recipe")
-
-        self.assert_can_reach_location("Raccoon Request 1")
-        self.assert_can_reach_location("Raccoon Request 3")
+# class TestRaccoonBundlesLogic(SVTestBase):
+#     options = {
+#         options.BundleRandomization: BundleRandomization.option_vanilla,
+#         options.BundlePrice: options.BundlePrice.option_normal,
+#         options.Craftsanity: options.Craftsanity.option_all,
+#     }
+#     seed = 2  # Magic seed that does what I want. Might need to get changed if we change the randomness behavior of raccoon bundles
+#
+#     def test_raccoon_bundles_rely_on_previous_ones(self):
+#         self.collect("Forest Magic")
+#         self.collect("Landslide Removed")
+#         self.collect("Progressive Raccoon", 6)
+#         self.collect("Progressive Mine Elevator", 24)
+#         self.collect("Mining Level", 12)
+#         self.collect("Combat Level", 12)
+#         self.collect("Progressive Axe", 4)
+#         self.collect("Progressive Pickaxe", 4)
+#         self.collect("Progressive Weapon", 4)
+#         self.collect("Dehydrator Recipe")
+#         self.collect("Mushroom Boxes")
+#         self.collect("Progressive Fishing Rod", 4)
+#         self.collect("Fishing Level", 10)
+#         self.collect("Furnace Recipe")
+#
+#         # The first raccoon bundle is a fishing one
+#         self.assert_cannot_reach_location("Raccoon Request 1")
+#         # The third raccoon bundle is a foraging one
+#         self.assert_cannot_reach_location("Raccoon Request 3")
+#
+#         self.collect("Fish Smoker Recipe")
+#
+#         self.assert_can_reach_location("Raccoon Request 1")
+#         self.assert_can_reach_location("Raccoon Request 3")
diff --git a/worlds/stardew_valley/test/rules/TestCatalogues.py b/worlds/stardew_valley/test/rules/TestCatalogues.py
new file mode 100644
index 0000000000..5b51a6d974
--- /dev/null
+++ b/worlds/stardew_valley/test/rules/TestCatalogues.py
@@ -0,0 +1,36 @@
+from ..bases import SVTestBase
+from ... import options
+
+
+class TestWizardCatalogueWithoutEndgameLocations(SVTestBase):
+    options = {
+        options.SeasonRandomization: options.SeasonRandomization.option_disabled,
+        options.Cropsanity: options.Cropsanity.option_enabled,
+        options.EntranceRandomization: options.EntranceRandomization.option_disabled,
+        options.IncludeEndgameLocations: options.IncludeEndgameLocations.option_false,
+    }
+
+    def test_doesnt_need_catalogue_to_buy_catalogue(self):
+        item = "Ruby Crystal Ball"
+        self.collect("Rusty Key")
+        self.collect_all_the_money()
+
+        self.assert_rule_true(self.world.logic.has(item))
+
+
+class TestWizardCatalogueWithEndgameLocations(SVTestBase):
+    options = {
+        options.SeasonRandomization: options.SeasonRandomization.option_disabled,
+        options.Cropsanity: options.Cropsanity.option_enabled,
+        options.EntranceRandomization: options.EntranceRandomization.option_disabled,
+        options.IncludeEndgameLocations: options.IncludeEndgameLocations.option_true,
+    }
+
+    def test_need_catalogue_to_buy_catalogue(self):
+        item = "Ruby Crystal Ball"
+        self.collect("Rusty Key")
+        self.collect_all_the_money()
+
+        self.assert_rule_false(self.world.logic.has(item))
+        self.collect("Wizard Catalogue")
+        self.assert_rule_true(self.world.logic.has(item))
diff --git a/worlds/stardew_valley/test/rules/TestCookingRecipes.py b/worlds/stardew_valley/test/rules/TestCookingRecipes.py
index b468a72d41..f7e36199a9 100644
--- a/worlds/stardew_valley/test/rules/TestCookingRecipes.py
+++ b/worlds/stardew_valley/test/rules/TestCookingRecipes.py
@@ -1,15 +1,38 @@
 from ..bases import SVTestBase
 from ... import options
-from ...options import BuildingProgression, ExcludeGingerIsland, Chefsanity
+from ...content.content_packs import ginger_island_content_pack
+from ...data.recipe_data import all_cooking_recipes
+
+
+class TestRecipeContainingGingerIslandIngredientsAreTaggedWithGingerIslandContentPack(SVTestBase):
+    options = {
+        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
+        options.Mods: frozenset(options.all_mods_except_invalid_combinations),
+    }
+
+    def test_recipe_without_content_pack_contains_only_pure_vanilla_ingredients(self):
+        for item in self.multiworld.get_items():
+            self.multiworld.state.collect(item, prevent_sweep=True)
+
+        logic = self.world.logic
+
+        for recipe in all_cooking_recipes:
+            if recipe.content_pack is ginger_island_content_pack.name or recipe.content_pack not in self.world.options.mods:
+                continue
+
+            with self.subTest(recipe.meal):
+                for item in recipe.ingredients:
+                    rule = logic.has(item)
+                    self.assert_rule_true(rule, self.multiworld.state)
 
 
 class TestRecipeLearnLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
-        options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
-        options.Cooksanity.internal_name: options.Cooksanity.option_all,
-        Chefsanity.internal_name: Chefsanity.option_none,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.BuildingProgression: options.BuildingProgression.option_progressive,
+        options.Cropsanity: options.Cropsanity.option_enabled,
+        options.Cooksanity: options.Cooksanity.option_all,
+        options.Chefsanity: options.Chefsanity.preset_none,
+        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_learn_qos_recipe(self):
@@ -29,11 +52,12 @@ class TestRecipeLearnLogic(SVTestBase):
 
 class TestRecipeReceiveLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
-        options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
-        options.Cooksanity.internal_name: options.Cooksanity.option_all,
-        Chefsanity.internal_name: Chefsanity.option_all,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.StartWithout: options.StartWithout.preset_none,
+        options.BuildingProgression: options.BuildingProgression.option_progressive,
+        options.Cropsanity: options.Cropsanity.option_enabled,
+        options.Cooksanity: options.Cooksanity.option_all,
+        options.Chefsanity: options.Chefsanity.preset_all,
+        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_learn_qos_recipe(self):
diff --git a/worlds/stardew_valley/test/rules/TestCraftingRecipes.py b/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
index f875dc539d..0ea1b29092 100644
--- a/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
+++ b/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
@@ -1,36 +1,43 @@
 from ..bases import SVTestBase
-from ... import options
+from ... import options, StartWithoutOptionName
 from ...data.craftable_data import all_crafting_recipes_by_name
-from ...options import BuildingProgression, ExcludeGingerIsland, Craftsanity, SeasonRandomization
+from ...options import StartWithout
 
 
 class TestCraftsanityLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        StartWithout.internal_name: frozenset({StartWithoutOptionName.buildings}),
+        options.SeasonRandomization.internal_name: options.SeasonRandomization.option_disabled,
+        options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
         options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
-        Craftsanity.internal_name: Craftsanity.option_all,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.Craftsanity.internal_name: options.Craftsanity.option_all,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_craft_recipe(self):
+        location = "Craft Marble Brazier"
+        self.collect(self.create_item("Landslide Removed"))
         self.collect([self.create_item("Progressive Pickaxe")] * 4)
         self.collect([self.create_item("Progressive Fishing Rod")] * 4)
         self.collect([self.create_item("Progressive Sword")] * 4)
         self.collect([self.create_item("Progressive Mine Elevator")] * 24)
+        self.collect([self.create_item("Progressive Pan")] * 4)
         self.collect([self.create_item("Mining Level")] * 10)
         self.collect([self.create_item("Combat Level")] * 10)
         self.collect([self.create_item("Fishing Level")] * 10)
         self.collect_all_the_money()
-        self.assert_cannot_reach_location("Craft Marble Brazier")
+        self.assert_cannot_reach_location(location)
 
         self.multiworld.state.collect(self.create_item("Marble Brazier Recipe"))
-        self.assert_can_reach_location("Craft Marble Brazier")
+        self.assert_can_reach_location(location)
 
     def test_can_learn_crafting_recipe(self):
-        self.assert_cannot_reach_location("Marble Brazier Recipe")
+        location = "Marble Brazier Recipe"
+        self.assert_cannot_reach_location(location)
 
         self.collect_lots_of_money()
-        self.assert_can_reach_location("Marble Brazier Recipe")
+        self.assert_can_reach_location(location)
 
     def test_can_craft_festival_recipe(self):
         recipe = all_crafting_recipes_by_name["Jack-O-Lantern"]
@@ -47,8 +54,9 @@ class TestCraftsanityLogic(SVTestBase):
         self.assert_rule_true(rule)
 
     def test_require_furnace_recipe_for_smelting_checks(self):
-        locations = ["Craft Furnace", "Smelting", "Copper Pickaxe Upgrade", "Gold Trash Can Upgrade"]
+        locations = ["Craft Furnace", "Quest: Smelting", "Copper Pickaxe Upgrade", "Gold Trash Can Upgrade"]
         rules = [self.world.logic.region.can_reach_location(location) for location in locations]
+        self.collect(self.create_item("Landslide Removed"))
         self.collect([self.create_item("Progressive Pickaxe")] * 4)
         self.collect([self.create_item("Progressive Fishing Rod")] * 4)
         self.collect([self.create_item("Progressive Sword")] * 4)
@@ -66,11 +74,11 @@ class TestCraftsanityLogic(SVTestBase):
 
 class TestCraftsanityWithFestivalsLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
         options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
         options.FestivalLocations.internal_name: options.FestivalLocations.option_easy,
-        Craftsanity.internal_name: Craftsanity.option_all,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.Craftsanity.internal_name: options.Craftsanity.option_all,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_craft_festival_recipe(self):
@@ -90,12 +98,13 @@ class TestCraftsanityWithFestivalsLogic(SVTestBase):
 
 class TestNoCraftsanityLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
-        SeasonRandomization.internal_name: SeasonRandomization.option_progressive,
+        options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
+        options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive,
         options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
         options.FestivalLocations.internal_name: options.FestivalLocations.option_disabled,
-        Craftsanity.internal_name: Craftsanity.option_none,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.Craftsanity.internal_name: options.Craftsanity.option_none,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_craft_recipe(self):
@@ -115,8 +124,9 @@ class TestNoCraftsanityLogic(SVTestBase):
         self.assert_rule_true(rule)
 
     def test_requires_mining_levels_for_smelting_checks(self):
-        locations = ["Smelting", "Copper Pickaxe Upgrade", "Gold Trash Can Upgrade"]
+        locations = ["Quest: Smelting", "Copper Pickaxe Upgrade", "Gold Trash Can Upgrade"]
         rules = [self.world.logic.region.can_reach_location(location) for location in locations]
+        self.collect(self.create_item("Landslide Removed"))
         self.collect([self.create_item("Progressive Pickaxe")] * 4)
         self.collect([self.create_item("Progressive Fishing Rod")] * 4)
         self.collect([self.create_item("Progressive Sword")] * 4)
@@ -134,11 +144,11 @@ class TestNoCraftsanityLogic(SVTestBase):
 
 class TestNoCraftsanityWithFestivalsLogic(SVTestBase):
     options = {
-        BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
         options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
         options.FestivalLocations.internal_name: options.FestivalLocations.option_easy,
-        Craftsanity.internal_name: Craftsanity.option_none,
-        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        options.Craftsanity.internal_name: options.Craftsanity.option_none,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
     }
 
     def test_can_craft_festival_recipe(self):
diff --git a/worlds/stardew_valley/test/rules/TestFishing.py b/worlds/stardew_valley/test/rules/TestFishing.py
index 22e6321a7a..647d3c7616 100644
--- a/worlds/stardew_valley/test/rules/TestFishing.py
+++ b/worlds/stardew_valley/test/rules/TestFishing.py
@@ -1,10 +1,14 @@
 from ..bases import SVTestBase
-from ...options import SeasonRandomization, Fishsanity, ExcludeGingerIsland, SkillProgression, ToolProgression, ElevatorProgression, SpecialOrderLocations
+from ... import StartWithoutOptionName
+from ...options import SeasonRandomization, Fishsanity, ExcludeGingerIsland, SkillProgression, ToolProgression, ElevatorProgression, SpecialOrderLocations, \
+    StartWithout
+from ...strings.ap_names.transport_names import Transportation
 from ...strings.fish_names import Fish
 
 
 class TestNeedRegionToCatchFish(SVTestBase):
     options = {
+        StartWithout: frozenset({StartWithoutOptionName.landslide, StartWithoutOptionName.community_center}),
         SeasonRandomization.internal_name: SeasonRandomization.option_disabled,
         ElevatorProgression.internal_name: ElevatorProgression.option_vanilla,
         SkillProgression.internal_name: SkillProgression.option_vanilla,
@@ -18,43 +22,42 @@ class TestNeedRegionToCatchFish(SVTestBase):
         fish_and_items = {
             Fish.crimsonfish: ["Beach Bridge"],
             Fish.void_salmon: ["Railroad Boulder Removed", "Dark Talisman"],
-            Fish.woodskip: ["Progressive Axe", "Progressive Axe", "Progressive Weapon"],  # For the ores to get the axe upgrades
+            Fish.woodskip: ["Progressive Axe", "Progressive Axe"],
             Fish.mutant_carp: ["Rusty Key"],
             Fish.slimejack: ["Railroad Boulder Removed", "Rusty Key"],
-            Fish.lionfish: ["Boat Repair"],
-            Fish.blue_discus: ["Island Obelisk", "Island West Turtle"],
-            Fish.stingray: ["Boat Repair", "Island Resort"],
-            Fish.ghostfish: ["Progressive Weapon"],
-            Fish.stonefish: ["Progressive Weapon"],
-            Fish.ice_pip: ["Progressive Weapon", "Progressive Weapon", "Progressive Pickaxe", "Progressive Pickaxe"],
-            Fish.lava_eel: ["Progressive Weapon", "Progressive Weapon", "Progressive Weapon", "Progressive Pickaxe", "Progressive Pickaxe", "Progressive Pickaxe"],
-            Fish.sandfish: ["Bus Repair"],
-            Fish.scorpion_carp: ["Desert Obelisk"],
+            Fish.lionfish: [Transportation.boat_repair],
+            Fish.blue_discus: ["Wizard Invitation", "Island Obelisk", "Island West Turtle"],
+            Fish.stingray: [Transportation.boat_repair, "Island Resort"],
+            Fish.ghostfish: ["Landslide Removed", "Progressive Weapon"],
+            Fish.stonefish: ["Landslide Removed", "Progressive Weapon"],
+            Fish.ice_pip: ["Landslide Removed", "Progressive Weapon", "Progressive Weapon", "Progressive Pickaxe"],
+            Fish.lava_eel: ["Landslide Removed", "Progressive Weapon", "Progressive Weapon", "Progressive Weapon", "Progressive Pickaxe", "Progressive Pickaxe"],
+            Fish.sandfish: [Transportation.bus_repair],
+            Fish.scorpion_carp: ["Wizard Invitation", "Desert Obelisk"],
             # Starting the extended family quest requires having caught all the legendaries before, so they all have the rules of every other legendary
-            Fish.son_of_crimsonfish: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
-            Fish.radioactive_carp: ["Beach Bridge", "Rusty Key", "Boat Repair", "Island West Turtle", "Qi Walnut Room"],
-            Fish.glacierfish_jr: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
-            Fish.legend_ii: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
-            Fish.ms_angler: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
+            Fish.son_of_crimsonfish: ["Beach Bridge", Transportation.boat_repair, "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
+            Fish.radioactive_carp: ["Beach Bridge", "Rusty Key", Transportation.boat_repair, "Island West Turtle", "Qi Walnut Room"],
+            Fish.glacierfish_jr: ["Beach Bridge", Transportation.boat_repair, "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
+            Fish.legend_ii: ["Beach Bridge", "Wizard Invitation", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
+            Fish.ms_angler: ["Beach Bridge", "Wizard Invitation", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"],
         }
         self.collect("Progressive Fishing Rod", 4)
-        self.original_state = self.multiworld.state.copy()
+        self.collect_all_the_money()
         for fish in fish_and_items:
             with self.subTest(f"Region rules for {fish}"):
-                self.collect_all_the_money()
                 item_names = fish_and_items[fish]
-                self.assert_cannot_reach_location(f"Fishsanity: {fish}")
-                items = []
-                for item_name in item_names:
-                    items.append(self.collect(item_name))
+                location = f"Fishsanity: {fish}"
+                self.assert_cannot_reach_location(location)
+                items = [self.create_item(item_name) for item_name in item_names]
+                for item in items:
+                    self.collect(item)
                 with self.subTest(f"{fish} can be reached with {item_names}"):
-                    self.assert_can_reach_location(f"Fishsanity: {fish}")
+                    self.assert_can_reach_location(location)
                 for item_required in items:
-                    self.multiworld.state = self.original_state.copy()
                     with self.subTest(f"{fish} requires {item_required.name}"):
-                        for item_to_collect in items:
-                            if item_to_collect.name != item_required.name:
-                                self.collect(item_to_collect)
-                        self.assert_cannot_reach_location(f"Fishsanity: {fish}")
-
-            self.multiworld.state = self.original_state.copy()
+                        self.remove(item_required)
+                        self.assert_cannot_reach_location(location)
+                        self.collect(item_required)
+                        self.assert_can_reach_location(location)
+                for item in items:
+                    self.remove(item)
diff --git a/worlds/stardew_valley/test/rules/TestFriendship.py b/worlds/stardew_valley/test/rules/TestFriendship.py
index dc5935580a..ab80ae51b4 100644
--- a/worlds/stardew_valley/test/rules/TestFriendship.py
+++ b/worlds/stardew_valley/test/rules/TestFriendship.py
@@ -11,6 +11,7 @@ class TestFriendsanityDatingRules(SVTestBase):
 
     def test_earning_dating_heart_requires_dating(self):
         self.collect_all_the_money()
+        self.collect(self.create_item("Landslide Removed"))
         self.multiworld.state.collect(self.create_item("Fall"))
         self.multiworld.state.collect(self.create_item("Beach Bridge"))
         self.multiworld.state.collect(self.create_item("Progressive House"))
@@ -47,8 +48,10 @@ class TestFriendsanityDatingRules(SVTestBase):
         for i in range(1, max_reachable + 1):
             if i % step != 0 and i != 14:
                 continue
-            self.assert_can_reach_location(f"{prefix}{npc} {i}{suffix}")
+            location = f"{prefix}{npc} {i}{suffix}"
+            self.assert_can_reach_location(location)
         for i in range(max_reachable + 1, 14 + 1):
             if i % step != 0 and i != 14:
                 continue
-            self.assert_cannot_reach_location(f"{prefix}{npc} {i}{suffix}")
+            location = f"{prefix}{npc} {i}{suffix}"
+            self.assert_cannot_reach_location(location)
diff --git a/worlds/stardew_valley/test/rules/TestHats.py b/worlds/stardew_valley/test/rules/TestHats.py
new file mode 100644
index 0000000000..2179e3b0b7
--- /dev/null
+++ b/worlds/stardew_valley/test/rules/TestHats.py
@@ -0,0 +1,105 @@
+from ..bases import SVTestBase
+from ..options.presets import allsanity_mods_7_x_x
+from ... import locations_by_tag
+from ...content.feature.hatsanity import to_location_name
+from ...data.hats_data import Hats
+from ...locations import LocationTags
+from ...options import Hatsanity, SeasonRandomization, FestivalLocations, Shipsanity, Eatsanity, Cooksanity, Fishsanity, Craftsanity
+from ...options.options import AllowedFillerItems
+from ...strings.ap_names.ap_option_names import HatsanityOptionName, AllowedFillerOptionName
+
+
+class TestHatsLogic(SVTestBase):
+    options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        FestivalLocations.internal_name: FestivalLocations.option_hard,
+        Shipsanity.internal_name: Shipsanity.option_everything,
+        Hatsanity.internal_name: Hatsanity.preset_all,
+        "start_inventory": {"Fall": 1}
+    }
+
+    def test_need_spring_to_grab_leprechaun_hat(self):
+        hat_location = to_location_name(Hats.leprechaun_hat)
+        self.assert_cannot_reach_location(hat_location)
+        self.collect("Spring")
+        self.assert_can_reach_location(hat_location)
+
+    def test_need_pans_to_wear_pan_hats(self):
+        pan_hats = [Hats.copper_pan_hat, Hats.steel_pan_hat, Hats.gold_pan_hat, Hats.iridium_pan_hat]
+        locations = [to_location_name(hat) for hat in pan_hats]
+        for location in locations:
+            self.assert_cannot_reach_location(location)
+            self.collect("Progressive Pan")
+            self.assert_can_reach_location(location)
+
+    def test_reach_frog_hat(self):
+        required_item_names = ["Progressive Fishing Rod", "Island Obelisk", "Island West Turtle", "Island Farmhouse"]
+        required_items = [self.create_item(item_name) for item_name in required_item_names]
+        location = to_location_name(Hats.frog_hat)
+        for required_item in required_items:
+            self.collect(required_item)
+        self.assert_can_reach_location(location)
+        for required_item in required_items:
+            with self.subTest(f"Requires {required_item.name} to {location}"):
+                self.remove(required_item)
+                self.assert_cannot_reach_location(location)
+                self.collect(required_item)
+
+    def test_no_hats_in_item_pool(self):
+        item_pool = self.multiworld.itempool
+        for item in item_pool:
+            self.assertTrue("Hat" not in item.name)
+            self.assertTrue("Mask" not in item.name)
+
+
+class TestNoHatsLogic(SVTestBase):
+    options = {
+        AllowedFillerItems.internal_name: frozenset({AllowedFillerOptionName.hats}),
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        FestivalLocations.internal_name: FestivalLocations.option_hard,
+        Fishsanity.internal_name: Fishsanity.option_all,
+        Shipsanity.internal_name: Shipsanity.option_everything,
+        Cooksanity.internal_name: Cooksanity.option_all,
+        Craftsanity.internal_name: Craftsanity.option_all,
+        Eatsanity.internal_name: Eatsanity.preset_all,
+        Hatsanity.internal_name: Hatsanity.preset_none,
+        "start_inventory": {"Fall": 1}
+    }
+
+    def test_there_are_hats_in_item_pool(self):
+        item_pool = [item.name for item in self.multiworld.itempool]
+        self.assertTrue("Leprechaun Hat" in item_pool)
+        self.assertTrue("Straw Hat" in item_pool)
+        self.assertTrue("Cone Hat" in item_pool)
+        self.assertTrue("Mummy Mask" in item_pool)
+
+
+class TestHatLocations(SVTestBase):
+    options = allsanity_mods_7_x_x()
+
+    def test_all_hat_locations_are_added(self):
+        location_names = [location.name for location in self.multiworld.get_locations()]
+        for hat_location in locations_by_tag[LocationTags.HATSANITY]:
+            with self.subTest(hat_location.name):
+                if hat_location.name == "Wear Panda Hat":
+                    self.assertNotIn(hat_location.name, location_names, "The Panda Hat cannot be obtained on the standard edition of the game")
+                else:
+                    self.assertIn(hat_location.name, location_names)
+
+
+class TestHatsOptionSetIndependence(SVTestBase):
+    options = {
+        Hatsanity.internal_name: frozenset({HatsanityOptionName.difficult}),
+    }
+
+    def test_only_difficult_hats_are_added(self):
+        difficult_hats = [Hats.magic_cowboy_hat, Hats.plum_chapeau, Hats.watermelon_band]
+        not_difficult_hats = [Hats.steel_pan_hat, Hats.party_hat_blue, Hats.frog_hat, Hats.cowboy, Hats.elegant_turban]
+        location_names = [location.name for location in self.multiworld.get_locations()]
+        for hat in difficult_hats:
+            with self.subTest(hat.name):
+                self.assertIn(to_location_name(hat), location_names)
+        for hat in not_difficult_hats:
+            with self.subTest(hat.name):
+                self.assertNotIn(to_location_name(hat), location_names)
+
diff --git a/worlds/stardew_valley/test/rules/TestMuseum.py b/worlds/stardew_valley/test/rules/TestMuseum.py
index 1a22e8800c..ef5bad12ee 100644
--- a/worlds/stardew_valley/test/rules/TestMuseum.py
+++ b/worlds/stardew_valley/test/rules/TestMuseum.py
@@ -1,4 +1,5 @@
 from collections import Counter
+from random import Random
 from unittest.mock import patch
 
 from ..bases import SVTestBase
@@ -35,7 +36,7 @@ class DisabledMuseumRule(LiteralStardewRule):
 
 class TestMuseumsanityDisabledExcludesMuseumDonationsFromOtherLocations(SVTestBase):
     options = {
-        **presets.allsanity_mods_6_x_x(),
+        **presets.allsanity_mods_7_x_x(),
         options.Museumsanity.internal_name: options.Museumsanity.option_none
     }
 
@@ -51,12 +52,20 @@ class TestMuseumsanityDisabledExcludesMuseumDonationsFromOtherLocations(SVTestBa
             museum_logic.can_donate.return_value = DisabledMuseumRule()
             # Allowing calls to museum rules since a lot of other logic depends on it, for minerals for instance.
             museum_logic.can_find_museum_item.return_value = true_
+            museum_logic.has_any_gem.return_value = true_
+            museum_logic.has_all_gems.return_value = true_
 
             regions = {region.name for region in self.multiworld.regions}
             self.world.logic = StardewLogic(self.player, self.world.options, self.world.content, regions)
             self.world.set_rules()
 
             self.collect_everything()
-            for location in self.get_real_locations():
+            # Fixed seed for consistency
+            seed = 2184959
+            random = Random(seed)
+            all_locations = self.get_real_locations()
+            # We test 1% of all locations, to be fast
+            locations_to_test = random.sample(all_locations, k=len(all_locations)//100)
+            for location in locations_to_test:
                 with self.subTest(location.name):
                     self.assert_can_reach_location(location)
diff --git a/worlds/stardew_valley/test/rules/TestQuests.py b/worlds/stardew_valley/test/rules/TestQuests.py
new file mode 100644
index 0000000000..45ebe3db9d
--- /dev/null
+++ b/worlds/stardew_valley/test/rules/TestQuests.py
@@ -0,0 +1,60 @@
+from ..bases import SVTestBase
+from ... import FarmType
+from ...options import ToolProgression, QuestLocations, Secretsanity
+from ...strings.ap_names.ap_option_names import SecretsanityOptionName
+
+
+class TestQuestsLogic(SVTestBase):
+    options = {
+        QuestLocations.internal_name: 0,
+        ToolProgression.internal_name: ToolProgression.option_progressive,
+    }
+
+    def test_giant_stump_requires_one_raccoon(self):
+        quest_name = "Quest: The Giant Stump"
+        quest_location = self.world.get_location(quest_name)
+
+        self.assert_cannot_reach_location(quest_location)
+
+        self.collect("Progressive Axe", 2)
+        self.assert_cannot_reach_location(quest_location)
+
+        self.collect("Progressive Raccoon")
+        self.assert_can_reach_location(quest_location)
+
+
+class TestQuestsOverrideBySecretNotesLogic(SVTestBase):
+    options = {
+        QuestLocations.internal_name: 0,
+        Secretsanity.internal_name: frozenset([SecretsanityOptionName.secret_notes]),
+    }
+
+    def test_giant_stump_requires_one_raccoon(self):
+        location_names = [location.name for location in self.multiworld.get_locations()]
+        self.assertNotIn("Quest: Strange Note", location_names)
+        self.assertIn("Secret Note #23: Strange Note", location_names)
+        self.assertEqual(1, len([name for name in location_names if "Strange Note" in name]))
+
+
+class TestRaisingAnimalsQuest(SVTestBase):
+    options = {
+        FarmType.internal_name: FarmType.option_standard,
+        QuestLocations.internal_name: 0,
+    }
+
+    def test_only_raising_animals_on_standard(self):
+        location_names = [location.name for location in self.multiworld.get_locations()]
+        self.assertIn("Quest: Raising Animals", location_names)
+        self.assertNotIn("Quest: Feeding Animals", location_names)
+
+
+class TestFeedingAnimalsQuest(SVTestBase):
+    options = {
+        FarmType.internal_name: FarmType.option_meadowlands,
+        QuestLocations.internal_name: 0,
+    }
+
+    def test_only_feeding_animals_on_meadowlands(self):
+        location_names = [location.name for location in self.multiworld.get_locations()]
+        self.assertNotIn("Quest: Raising Animals", location_names)
+        self.assertIn("Quest: Feeding Animals", location_names)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/rules/TestShipping.py b/worlds/stardew_valley/test/rules/TestShipping.py
index c1f29d9342..863817c63b 100644
--- a/worlds/stardew_valley/test/rules/TestShipping.py
+++ b/worlds/stardew_valley/test/rules/TestShipping.py
@@ -1,6 +1,7 @@
 from ..bases import SVTestBase
+from ... import StartWithoutOptionName
 from ...locations import LocationTags, location_table
-from ...options import BuildingProgression, Shipsanity
+from ...options import BuildingProgression, Shipsanity, StartWithout
 
 
 class TestShipsanityNone(SVTestBase):
@@ -62,6 +63,7 @@ class TestShipsanityFullShipmentWithFish(SVTestBase):
 
 class TestShipsanityEverything(SVTestBase):
     options = {
+        StartWithout.internal_name: frozenset({StartWithoutOptionName.buildings}),
         Shipsanity.internal_name: Shipsanity.option_everything,
         BuildingProgression.internal_name: BuildingProgression.option_progressive
     }
@@ -80,4 +82,4 @@ class TestShipsanityEverything(SVTestBase):
 
                 self.collect(bin_item)
                 self.assert_can_reach_location(location.name)
-                self.remove(bin_item)
+            self.remove(bin_item)
diff --git a/worlds/stardew_valley/test/rules/TestSkills.py b/worlds/stardew_valley/test/rules/TestSkills.py
index fd513a1bec..848bc7ada7 100644
--- a/worlds/stardew_valley/test/rules/TestSkills.py
+++ b/worlds/stardew_valley/test/rules/TestSkills.py
@@ -1,6 +1,6 @@
 from ..bases import SVTestBase
 from ... import HasProgressionPercent, StardewLogic
-from ...options import ToolProgression, SkillProgression, Mods
+from ...options import ToolProgression, SkillProgression, Mods, all_mods_except_invalid_combinations
 from ...strings.skill_names import all_skills, all_vanilla_skills, Skill
 
 
@@ -25,7 +25,7 @@ class TestSkillProgressionVanilla(SVTestBase):
 class TestSkillProgressionProgressive(SVTestBase):
     options = {
         SkillProgression.internal_name: SkillProgression.option_progressive,
-        Mods.internal_name: frozenset(Mods.valid_keys),
+        Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
     }
 
     def test_all_skill_levels_require_previous_level(self):
@@ -34,14 +34,14 @@ class TestSkillProgressionProgressive(SVTestBase):
             self.remove_by_name(f"{skill} Level")
 
             for level in range(1, 11):
-                location_name = f"Level {level} {skill}"
+                location = f"Level {level} {skill}"
 
-                with self.subTest(location_name):
+                with self.subTest(location):
                     if level > 1:
-                        self.assert_cannot_reach_location(location_name)
+                        self.assert_cannot_reach_location(location)
                         self.collect(f"{skill} Level")
 
-                    self.assert_can_reach_location(location_name)
+                    self.assert_can_reach_location(location)
 
             self.reset_collection_state()
 
diff --git a/worlds/stardew_valley/test/rules/TestStateRules.py b/worlds/stardew_valley/test/rules/TestStateRules.py
index 57573c7f8b..acc70b06f3 100644
--- a/worlds/stardew_valley/test/rules/TestStateRules.py
+++ b/worlds/stardew_valley/test/rules/TestStateRules.py
@@ -1,10 +1,11 @@
 from ..bases import SVTestBase
-from ..options.presets import allsanity_mods_6_x_x
+from ..options.presets import allsanity_mods_7_x_x
 from ...stardew_rule import HasProgressionPercent
 
 
 class TestHasProgressionPercentWithVictory(SVTestBase):
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_7_x_x()
+    skip_default_tests = True
 
     def test_has_100_progression_percent_is_false_while_items_are_missing(self):
         has_100_progression_percent = HasProgressionPercent(1, 100)
diff --git a/worlds/stardew_valley/test/rules/TestTools.py b/worlds/stardew_valley/test/rules/TestTools.py
index 54b9ec8f2f..76dea03fd6 100644
--- a/worlds/stardew_valley/test/rules/TestTools.py
+++ b/worlds/stardew_valley/test/rules/TestTools.py
@@ -2,16 +2,17 @@ from collections import Counter
 
 from ..bases import SVTestBase
 from ... import options
-from ...options import ToolProgression, SeasonRandomization
+from ...options import ToolProgression, SeasonRandomization, Secretsanity
 from ...strings.entrance_names import Entrance
 from ...strings.region_names import Region
-from ...strings.tool_names import Tool, ToolMaterial
+from ...strings.tool_names import Tool, ToolMaterial, FishingRod
 
 
 class TestProgressiveToolsLogic(SVTestBase):
     options = {
         ToolProgression.internal_name: ToolProgression.option_progressive,
         SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Secretsanity.internal_name: Secretsanity.preset_simple,
     }
 
     def test_sturgeon(self):
@@ -53,39 +54,40 @@ class TestProgressiveToolsLogic(SVTestBase):
     def test_old_master_cannoli(self):
         self.multiworld.state.prog_items = {1: Counter()}
 
-        self.multiworld.state.collect(self.create_item("Progressive Axe"))
-        self.multiworld.state.collect(self.create_item("Progressive Axe"))
-        self.multiworld.state.collect(self.create_item("Summer"))
+        self.collect("Progressive Axe")
+        self.collect("Progressive Axe")
+        self.collect("Summer")
         self.collect_lots_of_money()
 
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        location = "Secret: Old Master Cannoli"
+        self.assert_cannot_reach_location(location)
 
         fall = self.create_item("Fall")
         self.multiworld.state.collect(fall)
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        self.assert_cannot_reach_location(location)
 
         tuesday = self.create_item("Traveling Merchant: Tuesday")
         self.multiworld.state.collect(tuesday)
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        self.assert_cannot_reach_location(location)
 
         rare_seed = self.create_item("Rare Seed")
         self.multiworld.state.collect(rare_seed)
-        self.assert_can_reach_location("Old Master Cannoli")
+        self.assert_can_reach_location(location)
 
         self.remove(fall)
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        self.assert_cannot_reach_location(location)
         self.remove(tuesday)
 
         green_house = self.create_item("Greenhouse")
         self.multiworld.state.collect(green_house)
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        self.assert_cannot_reach_location(location)
 
         friday = self.create_item("Traveling Merchant: Friday")
         self.multiworld.state.collect(friday)
-        self.assert_can_reach_location("Old Master Cannoli")
+        self.assert_can_reach_location(location)
 
         self.remove(green_house)
-        self.assert_cannot_reach_location("Old Master Cannoli")
+        self.assert_cannot_reach_location(location)
         self.remove(friday)
 
 
@@ -107,7 +109,7 @@ class TestToolVanillaRequiresBlacksmith(SVTestBase):
             for material in [ToolMaterial.copper, ToolMaterial.iron, ToolMaterial.gold, ToolMaterial.iridium]:
                 self.assert_rule_false(self.world.logic.tool.has_tool(tool, material))
 
-        self.multiworld.state.collect(self.create_item(railroad_item))
+        self.collect(railroad_item)
 
         for tool in [Tool.pickaxe, Tool.axe, Tool.hoe, Tool.trash_can, Tool.watering_can]:
             for material in [ToolMaterial.copper, ToolMaterial.iron, ToolMaterial.gold, ToolMaterial.iridium]:
@@ -117,14 +119,16 @@ class TestToolVanillaRequiresBlacksmith(SVTestBase):
         railroad_item = "Railroad Boulder Removed"
         place_region_at_entrance(self.multiworld, self.player, Region.fish_shop, Entrance.enter_bathhouse_entrance)
         self.collect_all_except(railroad_item)
+        self.collect("Fishing Level", 10)
+        self.collect("Fishing Mastery")
 
-        for fishing_rod_level in [3, 4]:
-            self.assert_rule_false(self.world.logic.tool.has_fishing_rod(fishing_rod_level))
+        for fishing_rod in [FishingRod.training, FishingRod.bamboo, FishingRod.fiberglass, FishingRod.iridium, FishingRod.advanced_iridium]:
+            self.assert_rule_false(self.world.logic.tool.has_fishing_rod(fishing_rod))
 
-        self.multiworld.state.collect(self.create_item(railroad_item))
+        self.collect(railroad_item)
 
-        for fishing_rod_level in [3, 4]:
-            self.assert_rule_true(self.world.logic.tool.has_fishing_rod(fishing_rod_level))
+        for fishing_rod in [FishingRod.training, FishingRod.bamboo, FishingRod.fiberglass, FishingRod.iridium, FishingRod.advanced_iridium]:
+            self.assert_rule_true(self.world.logic.tool.has_fishing_rod(fishing_rod))
 
 
 def place_region_at_entrance(multiworld, player, region, entrance):
@@ -135,3 +139,51 @@ def place_region_at_entrance(multiworld, player, region, entrance):
     region_to_switch = entrance_to_place_region.connected_region
     entrance_to_switch.connect(region_to_switch)
     entrance_to_place_region.connect(region_to_place)
+
+
+class TestVanillaFishingRodsRequiresLevelsAndMasteries(SVTestBase):
+    options = {
+        options.SeasonRandomization: options.SeasonRandomization.option_disabled,
+        options.Cropsanity: options.Cropsanity.option_disabled,
+        options.SkillProgression: options.SkillProgression.option_progressive_with_masteries,
+        options.ToolProgression: options.ToolProgression.option_vanilla,
+    }
+
+    def test_cannot_get_fishing_rods_without_their_unlock_conditions(self):
+        self.collect_lots_of_money()
+
+        rods = [FishingRod.training, FishingRod.bamboo, FishingRod.fiberglass, FishingRod.iridium, FishingRod.advanced_iridium]
+        reachable = 2
+        for i in range(len(rods)):
+            if i < reachable:
+                self.assert_rule_true(self.world.logic.tool.has_fishing_rod(rods[i]))
+            else:
+                self.assert_rule_false(self.world.logic.tool.has_fishing_rod(rods[i]))
+
+        self.collect("Fishing Level", 2)
+        reachable = 3
+        for i in range(len(rods)):
+            if i < reachable:
+                self.assert_rule_true(self.world.logic.tool.has_fishing_rod(rods[i]))
+            else:
+                self.assert_rule_false(self.world.logic.tool.has_fishing_rod(rods[i]))
+
+        self.collect("Fishing Level", 4)
+        reachable = 4
+        for i in range(len(rods)):
+            if i < reachable:
+                self.assert_rule_true(self.world.logic.tool.has_fishing_rod(rods[i]))
+            else:
+                self.assert_rule_false(self.world.logic.tool.has_fishing_rod(rods[i]))
+
+        self.collect("Fishing Level", 4)
+        reachable = 4
+        for i in range(len(rods)):
+            if i < reachable:
+                self.assert_rule_true(self.world.logic.tool.has_fishing_rod(rods[i]))
+            else:
+                self.assert_rule_false(self.world.logic.tool.has_fishing_rod(rods[i]))
+
+        self.collect("Fishing Mastery")
+        for rod in rods:
+            self.assert_rule_true(self.world.logic.tool.has_fishing_rod(rod))
diff --git a/worlds/stardew_valley/test/rules/TestTravelingMerchant.py b/worlds/stardew_valley/test/rules/TestTravelingMerchant.py
index aa7f46d07b..0f81f68a57 100644
--- a/worlds/stardew_valley/test/rules/TestTravelingMerchant.py
+++ b/worlds/stardew_valley/test/rules/TestTravelingMerchant.py
@@ -1,10 +1,12 @@
 from ..bases import SVTestBase
-from ... import SeasonRandomization, EntranceRandomization
+from ... import StartWithoutOptionName, SeasonRandomization, EntranceRandomization
 from ...locations import location_table, LocationTags
+from ...options import StartWithout
 
 
 class TestTravelingMerchant(SVTestBase):
     options = {
+        StartWithout: frozenset({StartWithoutOptionName.buildings}),
         SeasonRandomization: SeasonRandomization.option_randomized_not_winter,
         EntranceRandomization: EntranceRandomization.option_disabled,
     }
diff --git a/worlds/stardew_valley/test/rules/TestWeapons.py b/worlds/stardew_valley/test/rules/TestWeapons.py
index e95e706ded..6fec5b09a2 100644
--- a/worlds/stardew_valley/test/rules/TestWeapons.py
+++ b/worlds/stardew_valley/test/rules/TestWeapons.py
@@ -1,6 +1,7 @@
 from ..bases import SVTestBase
 from ... import options
 from ...options import ToolProgression
+from ...strings.ap_names.transport_names import Transportation
 
 
 class TestWeaponsLogic(SVTestBase):
@@ -10,6 +11,7 @@ class TestWeaponsLogic(SVTestBase):
     }
 
     def test_mine(self):
+        self.collect(self.create_item("Landslide Removed"))
         self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
         self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
         self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
@@ -18,7 +20,7 @@ class TestWeaponsLogic(SVTestBase):
         self.collect([self.create_item("Combat Level")] * 10)
         self.collect([self.create_item("Mining Level")] * 10)
         self.collect([self.create_item("Progressive Mine Elevator")] * 24)
-        self.multiworld.state.collect(self.create_item("Bus Repair"))
+        self.multiworld.state.collect(self.create_item(Transportation.bus_repair))
         self.multiworld.state.collect(self.create_item("Skull Key"))
 
         self.give_item_and_check_reachable_mine("Progressive Sword", 1)
diff --git a/worlds/stardew_valley/test/script/benchmark_generation.py b/worlds/stardew_valley/test/script/benchmark_generation.py
new file mode 100644
index 0000000000..8a78875bf0
--- /dev/null
+++ b/worlds/stardew_valley/test/script/benchmark_generation.py
@@ -0,0 +1,251 @@
+"""
+Generate a game while monitoring the location access rules calls and their performance.
+
+Run with `python -m worlds.stardew_valley.test.script.generate_monitor_rules --options minimal_locations_maximal_items`
+"""
+
+import argparse
+import gc
+import time
+from collections import defaultdict
+from dataclasses import dataclass, field
+from functools import wraps
+
+from BaseClasses import CollectionState, get_seed
+from Fill import distribute_items_restrictive, FillError
+from test.general import gen_steps
+from worlds import AutoWorld
+from ..bases import setup_solo_multiworld
+from ..options import presets
+from ... import StardewValleyWorld
+from ...rules import StardewRuleCollector
+from ...stardew_rule import StardewRule
+
+
+@dataclass(frozen=True)
+class RuleCall:
+    start_ns: int
+    end_ns: int
+    result: bool
+
+    @property
+    def duration_ns(self) -> int:
+        return self.end_ns - self.start_ns
+
+
+@dataclass(frozen=True)
+class PerformanceMonitoringStardewRule(StardewRule):
+    location: str
+    delegate: StardewRule
+    calls: list[RuleCall] = field(default_factory=list)
+
+    def __call__(self, state: CollectionState) -> bool:
+        start = time.perf_counter_ns()
+        result = self.delegate(state)
+        end = time.perf_counter_ns()
+        self.calls.append(RuleCall(start, end, result))
+        return result
+
+    def __and__(self, other: StardewRule):
+        raise NotImplementedError()
+
+    def __or__(self, other: StardewRule):
+        raise NotImplementedError()
+
+    def evaluate_while_simplifying(self, state: CollectionState) -> tuple[StardewRule, bool]:
+        raise NotImplementedError()
+
+
+def write_results(monitored_rules: list[PerformanceMonitoringStardewRule], output_file: str) -> None:
+    with open(output_file, 'w+') as results_file:
+
+        results_file.write("name,start_ns,end_ns,duration,result\n")
+        for rule in monitored_rules:
+            for call in rule.calls:
+                results_file.write(f"\"{rule.location}\",{call.start_ns},{call.end_ns},{call.end_ns - call.start_ns},{call.result}\n")
+
+
+def generate_monitor_rules():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--options', help="Define the option set to use, from the preset in test/__init__.py .", type=str, required=True)
+    parser.add_argument('--seed', help="Define the seed to use.", type=int)
+    script_args = parser.parse_args()
+    options_set = script_args.options
+    options = getattr(presets, options_set)()
+    fixed_seed = script_args.seed
+
+    original_set_location_rule = StardewRuleCollector.set_location_rule
+    original_set_entrance_rule = StardewRuleCollector.set_entrance_rule
+    original_collect = StardewValleyWorld.collect
+    original_remove = StardewValleyWorld.remove
+    original_call_single = AutoWorld.call_single
+    original_sweep_for_advancements = CollectionState.sweep_for_advancements
+    original_update_reachable_regions = CollectionState.update_reachable_regions
+
+    class Run:
+        def __init__(self, index: int, seed: int):
+            self.index = index
+            self.seed = seed
+            self.monitored_rules = []
+            self.collects = []
+            self.removes = []
+            self.gen_steps = {}
+            self.sweep_for_advancements = []
+            self.update_reachable_regions = []
+
+        def apply_patches(self):
+            @wraps(original_set_location_rule)
+            def patched_set_location_rule(self_, location_name: str, rule: StardewRule) -> None:
+                wrapped = PerformanceMonitoringStardewRule("[location] " + location_name, rule)
+                self.monitored_rules.append(wrapped)
+                original_set_location_rule(self_, location_name, wrapped)
+
+            StardewRuleCollector.set_location_rule = patched_set_location_rule
+
+            @wraps(original_set_entrance_rule)
+            def patched_set_entrance_rule(self_, entrance_name: str, rule: StardewRule) -> None:
+                wrapped = PerformanceMonitoringStardewRule("[entrance] " + entrance_name, rule)
+                self.monitored_rules.append(wrapped)
+                original_set_entrance_rule(self_, entrance_name, wrapped)
+
+            StardewRuleCollector.set_entrance_rule = patched_set_entrance_rule
+
+            @wraps(original_collect)
+            def patched_collect(*args, **kwargs):
+                start = time.perf_counter_ns()
+                result = original_collect(*args, **kwargs)
+                end = time.perf_counter_ns()
+                self.collects.append(end - start)
+                return result
+
+            StardewValleyWorld.collect = patched_collect
+
+            @wraps(original_remove)
+            def patched_remove(*args, **kwargs):
+                start = time.perf_counter_ns()
+                result = original_remove(*args, **kwargs)
+                end = time.perf_counter_ns()
+                self.removes.append(end - start)
+                return result
+
+            StardewValleyWorld.remove = patched_remove
+
+            @wraps(AutoWorld.call_single)
+            def patched_call_single(self_, method_name: str, *args, **kwargs):
+                start = time.perf_counter_ns()
+                result = original_call_single(self_, method_name, *args, **kwargs)
+                end = time.perf_counter_ns()
+                self.gen_steps[method_name] = end - start
+                return result
+
+            AutoWorld.call_single = patched_call_single
+
+            @wraps(CollectionState.sweep_for_advancements)
+            def patched_sweep_for_advancements(self_, *args, **kwargs):
+                start = time.perf_counter_ns()
+                original_sweep_for_advancements(self_, *args, **kwargs)
+                end = time.perf_counter_ns()
+                self.sweep_for_advancements.append(end - start)
+
+            CollectionState.sweep_for_advancements = patched_sweep_for_advancements
+
+            @wraps(CollectionState.update_reachable_regions)
+            def patched_update_reachable_regions(self_, *args, **kwargs):
+                start = time.perf_counter_ns()
+                original_update_reachable_regions(self_, *args, **kwargs)
+                end = time.perf_counter_ns()
+                self.update_reachable_regions.append(end - start)
+
+            CollectionState.update_reachable_regions = patched_update_reachable_regions
+
+        def run_one_generation(self) -> None:
+            multiworld = setup_solo_multiworld(options, self.seed, _cache={})
+
+            fill_start = time.perf_counter_ns()
+            distribute_items_restrictive(multiworld)
+            fill_end = time.perf_counter_ns()
+            self.gen_steps['fill'] = fill_end - fill_start
+
+            # print(explain(multiworld.get_location('Raccoon Request 5', 1).access_rule.delegate, multiworld.state, mode=ExplainMode.CLIENT))
+
+        def print_results(self) -> None:
+            sorted_by_duration = sorted(self.monitored_rules, key=lambda r: sum(call.duration_ns for call in r.calls), reverse=True)
+            print(f"Top 10 slowest rules for run {self.index + 1} | seed [{self.seed}]:")
+            for rule in sorted_by_duration[:10]:
+                total_duration = sum(call.duration_ns for call in rule.calls)
+                print(f"{rule.location}: {total_duration / 1_000_000:.2f} ms over {len(rule.calls)} calls")
+            print(f"Total generation steps took {sum(step for step in self.gen_steps.values()) / 1_000_000_000:.2f} s.\n")
+
+    run_count = 1
+    runs = []
+
+    def run_multiple_generations():
+        nonlocal run_count
+        for i in range(run_count):
+            seed = get_seed(fixed_seed)
+            print(f"Running generation {i + 1} with seed {seed}")
+            run = Run(i, seed)
+            run.apply_patches()
+            gc.collect()
+            try:
+                run.run_one_generation()
+            except FillError as e:
+                print(e)
+                run_count -= 1
+                continue
+            run.print_results()
+            runs.append(run)
+
+    def print_cumulative_results():
+        grouped: dict[str, list[RuleCall]] = defaultdict(list)
+        for run in runs:
+            for rule in run.monitored_rules:
+                for call in rule.calls:
+                    grouped[rule.location].append(call)
+
+        sorted_by_duration = sorted(grouped.items(), key=lambda item: sum(rule_call.duration_ns for rule_call in item[1]), reverse=True)
+        print(f"\nCumulative results across all {run_count} runs:")
+        for location, calls in sorted_by_duration[:10]:
+            total_duration = sum(call.duration_ns for call in calls)
+            avg_duration = total_duration / len(calls)
+            print(f"{location}: {total_duration / 1_000_000:.2f} ms over {len(calls)} calls ({avg_duration / 1_000_000:.2f} ms on average)")
+
+        sorted_by_avg_duration = sorted(
+            grouped.items(),
+            key=lambda item: sum(rule_call.duration_ns for rule_call in item[1]) / len(item[1]),
+            reverse=True
+        )
+        print("\nTop 10 average durations across all runs:")
+        for location, calls in sorted_by_avg_duration[:10]:
+            total_duration = sum(call.duration_ns for call in calls)
+            avg_duration = total_duration / len(calls)
+            print(f"{location}: average {avg_duration / 1_000_000:.2f} ms over {len(calls)} calls ({total_duration / 1_000_000:.2f} ms total)")
+
+        print("\nStats for collection state:")
+        total_rules = sum(call.duration_ns for run in runs for rule in run.monitored_rules for call in rule.calls)
+        print(f"Total evaluating rules: {total_rules / 1_000_000:.2f} ms across all runs")
+        total_collects = sum(sum(run.collects) for run in runs)
+        avg_collects = total_collects / sum(len(run.collects) for run in runs)
+        print(f"Total collects: {total_collects / 1_000_000:.2f} ms, average per collect: {avg_collects / 1_000_000:.4f} ms")
+        total_removes = sum(sum(run.removes) for run in runs)
+        avg_removes = total_removes / sum(len(run.removes) for run in runs) if total_removes else 0
+        print(f"Total removes: {total_removes / 1_000_000:.2f} ms, average per remove: {avg_removes / 1_000_000:.4f} ms")
+        total_sweep = sum(sum(run.sweep_for_advancements) for run in runs)
+        avg_sweep = total_sweep / sum(len(run.sweep_for_advancements) for run in runs) if total_sweep else 0
+        print(f"Total sweep for advancements: {total_sweep / 1_000_000:.2f} ms, average per sweep: {avg_sweep / 1_000_000:.4f} ms")
+        total_update_reachable = sum(sum(run.update_reachable_regions) for run in runs)
+        avg_update_reachable = total_update_reachable / sum(len(run.update_reachable_regions) for run in runs) if total_update_reachable else 0
+        print(f"Total update reachable regions: {total_update_reachable / 1_000_000:.2f} ms, average per update: {avg_update_reachable / 1_000_000:.4f} ms")
+
+        print("\nGeneration steps:")
+        for step in gen_steps + ('fill',):
+            total_time = sum(run.gen_steps.get(step, 0) for run in runs)
+            avg_time = total_time / run_count
+            print(f"{step}: {total_time / 1_000_000:.2f} ms total, {avg_time / 1_000_000:.4f} ms average")
+
+    run_multiple_generations()
+    print_cumulative_results()
+
+
+if __name__ == "__main__":
+    generate_monitor_rules()
diff --git a/worlds/stardew_valley/test/script/benchmark_locations.py b/worlds/stardew_valley/test/script/benchmark_locations.py
index 3dcfc4dbeb..7029a3c739 100644
--- a/worlds/stardew_valley/test/script/benchmark_locations.py
+++ b/worlds/stardew_valley/test/script/benchmark_locations.py
@@ -8,8 +8,6 @@ import argparse
 import collections
 import gc
 import logging
-import os
-import sys
 import time
 import typing
 
@@ -119,22 +117,8 @@ class TimeIt:
     def __exit__(self, exc_type, exc_val, exc_tb):
         if not self.end_timer:
             self.end_timer = time.perf_counter()
-        if self.logger:
-            self.logger.info(f"{self.dif:.4f} seconds in {self.name}.")
-
-
-def change_home():
-    """Allow scripts to run from "this" folder."""
-    old_home = os.path.dirname(__file__)
-    sys.path.remove(old_home)
-    new_home = os.path.normpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
-    os.chdir(new_home)
-    sys.path.append(new_home)
-    # fallback to local import
-    sys.path.append(old_home)
-
-    from Utils import local_path
-    local_path.cached_path = new_home
+        # if self.logger:
+        #     self.logger.info(f"{self.dif:.4f} seconds in {self.name}.")
 
 
 if __name__ == "__main__":
diff --git a/worlds/stardew_valley/test/stability/StabilityOutputScript.py b/worlds/stardew_valley/test/stability/StabilityOutputScript.py
index 29fd903095..71d1cc34b6 100644
--- a/worlds/stardew_valley/test/stability/StabilityOutputScript.py
+++ b/worlds/stardew_valley/test/stability/StabilityOutputScript.py
@@ -1,8 +1,8 @@
 import argparse
 import json
 
+from worlds.stardew_valley.test.options.presets import allsanity_mods_7_x_x_exclude_disabled
 from ..bases import setup_solo_multiworld
-from ..options.presets import allsanity_mods_6_x_x_exclude_disabled
 from ...options import FarmType, EntranceRandomization
 
 if __name__ == "__main__":
@@ -12,7 +12,7 @@ if __name__ == "__main__":
     args = parser.parse_args()
     seed = args.seed
 
-    options = allsanity_mods_6_x_x_exclude_disabled()
+    options = allsanity_mods_7_x_x_exclude_disabled()
     options[FarmType.internal_name] = FarmType.option_standard
     options[EntranceRandomization.internal_name] = EntranceRandomization.option_buildings
     multi_world = setup_solo_multiworld(options, seed=seed)
diff --git a/worlds/stardew_valley/test/stability/TestUniversalTracker.py b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
index 301abfff22..aae4406eb9 100644
--- a/worlds/stardew_valley/test/stability/TestUniversalTracker.py
+++ b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
@@ -2,7 +2,7 @@ import unittest
 from unittest.mock import Mock
 
 from ..bases import skip_long_tests, SVTestBase
-from ..options.presets import allsanity_mods_6_x_x
+from ..options.presets import allsanity_mods_7_x_x
 from ..options.utils import fill_namespace_with_default
 from ... import STARDEW_VALLEY
 from ...options import FarmType, BundleRandomization, EntranceRandomization
@@ -10,7 +10,7 @@ from ...options import FarmType, BundleRandomization, EntranceRandomization
 
 @unittest.skipIf(skip_long_tests(), "Long tests disabled")
 class TestUniversalTrackerGenerationIsStable(SVTestBase):
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_7_x_x()
     options.update({
         EntranceRandomization.internal_name: EntranceRandomization.option_buildings,
         BundleRandomization.internal_name: BundleRandomization.option_shuffled,
diff --git a/worlds/stardew_valley/test/test_options/TestDynamicGingerIslandOptions.py b/worlds/stardew_valley/test/test_options/TestDynamicGingerIslandOptions.py
new file mode 100644
index 0000000000..8d8d5c4f11
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestDynamicGingerIslandOptions.py
@@ -0,0 +1,41 @@
+import unittest
+from typing import ClassVar
+
+from test.param import classvar_matrix
+from ..options.option_names import get_all_option_choices
+from ...options import ExcludeGingerIsland, ArcadeMachineLocations, BackpackProgression, BackpackSize, \
+    BundlePerRoom, BundlePrice, ElevatorProgression, FarmType, SeasonRandomization, FestivalLocations, Moviesanity, Museumsanity, ToolProgression
+from ...test.assertion import WorldAssertMixin
+from ...test.bases import SVTestCase, solo_multiworld, skip_long_tests
+
+if skip_long_tests():
+    raise unittest.SkipTest("Long tests disabled")
+
+# These options affect logic, but are unrelated to any ginger island content, so pointless for this specific test class
+extra_options_to_ignore = [ArcadeMachineLocations.internal_name, BackpackProgression.internal_name, BackpackSize.internal_name, BundlePerRoom.internal_name,
+                           BundlePrice.internal_name, ElevatorProgression.internal_name, FarmType.internal_name, SeasonRandomization.internal_name,
+                           FestivalLocations.internal_name, Moviesanity.internal_name, Museumsanity.internal_name, ToolProgression.internal_name]
+
+
+@classvar_matrix(option_and_choice=get_all_option_choices(extra_options_to_ignore))
+class TestGenerateAllOptionsWithExcludeGingerIsland(WorldAssertMixin, SVTestCase):
+    option_and_choice: ClassVar[tuple[str, str]]
+
+    def test_given_choice_when_generate_exclude_ginger_island_then_ginger_island_is_properly_excluded(self):
+        option, option_choice = self.option_and_choice
+
+        if option == ExcludeGingerIsland.internal_name:
+            self.skipTest("ExcludeGingerIsland is forced to true")
+
+        world_options = {
+            ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+            option: option_choice
+        }
+
+        with solo_multiworld(world_options) as (multiworld, stardew_world):
+
+            if stardew_world.options.exclude_ginger_island != ExcludeGingerIsland.option_true:
+                self.skipTest("Some options, like goals, will force Ginger island back in the game. We want to skip testing those.")
+
+            self.assert_basic_checks(multiworld)
+            self.assert_no_ginger_island_content(multiworld)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/test_options/TestDynamicOptions.py b/worlds/stardew_valley/test/test_options/TestDynamicOptions.py
new file mode 100644
index 0000000000..7770b4b384
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestDynamicOptions.py
@@ -0,0 +1,25 @@
+import unittest
+from typing import ClassVar
+
+from test.param import classvar_matrix
+from ..options.option_names import get_all_option_choices
+from ...options import BackpackProgression, BackpackSize, BundlePerRoom, BundlePrice, FarmType
+from ...test.assertion import WorldAssertMixin
+from ...test.bases import SVTestCase, solo_multiworld, skip_long_tests
+
+if skip_long_tests():
+    raise unittest.SkipTest("Long tests disabled")
+
+extra_options_to_ignore = [BackpackProgression.internal_name, BackpackSize.internal_name, BundlePerRoom.internal_name,
+                           BundlePrice.internal_name, FarmType.internal_name]
+
+
+@classvar_matrix(option_and_choice=get_all_option_choices(extra_options_to_ignore))
+class TestGenerateDynamicOptions(WorldAssertMixin, SVTestCase):
+    option_and_choice: ClassVar[tuple[str, str]]
+
+    def test_given_option_and_choice_when_generate_then_basic_checks(self):
+        option, choice = self.option_and_choice
+        world_options = {option: choice}
+        with solo_multiworld(world_options) as (multiworld, stardew_world):
+            self.assert_basic_checks(multiworld)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/options/TestForcedOptions.py b/worlds/stardew_valley/test/test_options/TestForcedOptions.py
similarity index 98%
rename from worlds/stardew_valley/test/options/TestForcedOptions.py
rename to worlds/stardew_valley/test/test_options/TestForcedOptions.py
index c32def6c6c..357da631bc 100644
--- a/worlds/stardew_valley/test/options/TestForcedOptions.py
+++ b/worlds/stardew_valley/test/test_options/TestForcedOptions.py
@@ -2,9 +2,9 @@ import itertools
 import unittest
 
 import Options as ap_options
-from .utils import fill_dataclass_with_default
-from ... import options
+from ...options import options
 from ...options.forced_options import force_change_options_if_incompatible
+from ...test.options.utils import fill_dataclass_with_default
 
 
 class TestGoalsRequiringAllLocationsOverrideAccessibility(unittest.TestCase):
diff --git a/worlds/stardew_valley/test/test_options/TestGoal.py b/worlds/stardew_valley/test/test_options/TestGoal.py
new file mode 100644
index 0000000000..2f0b3e7b8a
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestGoal.py
@@ -0,0 +1,27 @@
+from typing import ClassVar
+
+from test.param import classvar_matrix
+from ...options import Goal
+from ...strings.goal_names import Goal as GoalName
+from ...test.bases import SVTestCase, solo_multiworld
+
+
+@classvar_matrix(goal_and_location=[
+    ("community_center", GoalName.community_center),
+    ("grandpa_evaluation", GoalName.grandpa_evaluation),
+    ("bottom_of_the_mines", GoalName.bottom_of_the_mines),
+    ("cryptic_note", GoalName.cryptic_note),
+    ("master_angler", GoalName.master_angler),
+    ("complete_collection", GoalName.complete_museum),
+    ("full_house", GoalName.full_house),
+    ("perfection", GoalName.perfection),
+])
+class TestGoal(SVTestCase):
+    goal_and_location: ClassVar[tuple[str, str]]
+
+    def test_given_goal_when_generate_then_victory_is_in_correct_location(self):
+        goal, location = self.goal_and_location
+        world_options = {Goal.internal_name: goal}
+        with solo_multiworld(world_options) as (multi_world, _):
+            victory = multi_world.find_item("Victory", 1)
+            self.assertEqual(victory.name, location)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/TestOptionFlags.py b/worlds/stardew_valley/test/test_options/TestOptionFlags.py
similarity index 95%
rename from worlds/stardew_valley/test/TestOptionFlags.py
rename to worlds/stardew_valley/test/test_options/TestOptionFlags.py
index d930157564..9a5f4f5456 100644
--- a/worlds/stardew_valley/test/TestOptionFlags.py
+++ b/worlds/stardew_valley/test/test_options/TestOptionFlags.py
@@ -1,6 +1,5 @@
-from .bases import SVTestBase
-from .. import BuildingProgression
-from ..options import ToolProgression
+from ...options import ToolProgression, BuildingProgression
+from ...test.bases import SVTestBase
 
 
 class TestBitFlagsVanilla(SVTestBase):
diff --git a/worlds/stardew_valley/test/TestOptionsPairs.py b/worlds/stardew_valley/test/test_options/TestOptionsPairs.py
similarity index 93%
rename from worlds/stardew_valley/test/TestOptionsPairs.py
rename to worlds/stardew_valley/test/test_options/TestOptionsPairs.py
index addd748c42..e8310b92c7 100644
--- a/worlds/stardew_valley/test/TestOptionsPairs.py
+++ b/worlds/stardew_valley/test/test_options/TestOptionsPairs.py
@@ -1,6 +1,6 @@
-from .assertion import WorldAssertMixin
-from .bases import SVTestBase
-from .. import options
+from worlds.stardew_valley import options
+from ...test.assertion import WorldAssertMixin
+from ...test.bases import SVTestBase
 
 
 class TestCrypticNoteNoQuests(WorldAssertMixin, SVTestBase):
diff --git a/worlds/stardew_valley/test/options/TestPresets.py b/worlds/stardew_valley/test/test_options/TestPresets.py
similarity index 83%
rename from worlds/stardew_valley/test/options/TestPresets.py
rename to worlds/stardew_valley/test/test_options/TestPresets.py
index 5c1cee4a58..b49f7985e5 100644
--- a/worlds/stardew_valley/test/options/TestPresets.py
+++ b/worlds/stardew_valley/test/test_options/TestPresets.py
@@ -1,13 +1,13 @@
 from Options import PerGameCommonOptions, OptionSet, OptionDict
-from ..bases import SVTestCase
-from ...options import StardewValleyOptions, TrapItems
+from ...options import StardewValleyOptions, TrapItems, BundlePlando
 from ...options.presets import sv_options_presets
+from ...test.bases import SVTestCase
 
 
 class TestPresets(SVTestCase):
     def test_all_presets_explicitly_set_all_options(self):
         all_option_names = {option_key for option_key in StardewValleyOptions.type_hints}
-        omitted_option_names = {option_key for option_key in PerGameCommonOptions.type_hints} | {TrapItems.internal_name}
+        omitted_option_names = {option_key for option_key in PerGameCommonOptions.type_hints} | {TrapItems.internal_name, BundlePlando.internal_name}
         mandatory_option_names = {option_key for option_key in all_option_names
                                   if option_key not in omitted_option_names and
                                   not issubclass(StardewValleyOptions.type_hints[option_key], OptionSet | OptionDict)}
diff --git a/worlds/stardew_valley/test/test_options/TestSeasonOptions.py b/worlds/stardew_valley/test/test_options/TestSeasonOptions.py
new file mode 100644
index 0000000000..ce26e216af
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestSeasonOptions.py
@@ -0,0 +1,28 @@
+from ...options import SeasonRandomization
+from ...strings.season_names import Season
+from ...test.bases import SVTestCase, solo_multiworld
+
+
+SEASONS = {Season.spring, Season.summer, Season.fall, Season.winter}
+
+
+class TestSeasonOptions(SVTestCase):
+    def test_given_disabled_when_generate_then_all_seasons_are_precollected(self):
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_disabled}
+        with solo_multiworld(world_options) as (multi_world, _):
+            precollected_items = {item.name for item in multi_world.precollected_items[1]}
+            self.assertTrue(all([season in precollected_items for season in SEASONS]))
+
+    def test_given_randomized_when_generate_then_all_seasons_are_in_the_pool_or_precollected(self):
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_randomized}
+        with solo_multiworld(world_options) as (multi_world, _):
+            precollected_items = {item.name for item in multi_world.precollected_items[1]}
+            items = {item.name for item in multi_world.get_items()} | precollected_items
+            self.assertTrue(all([season in items for season in SEASONS]))
+            self.assertEqual(len(SEASONS.intersection(precollected_items)), 1)
+
+    def test_given_progressive_when_generate_then_3_progressive_seasons_are_in_the_pool(self):
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_progressive}
+        with solo_multiworld(world_options) as (multi_world, _):
+            items = [item.name for item in multi_world.get_items()]
+            self.assertEqual(items.count(Season.progressive), 3)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/test_options/TestSpecialOrderOptions.py b/worlds/stardew_valley/test/test_options/TestSpecialOrderOptions.py
new file mode 100644
index 0000000000..a7b2396d3a
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestSpecialOrderOptions.py
@@ -0,0 +1,56 @@
+from ...locations import locations_by_tag, LocationTags, location_table
+from ...options import ExcludeGingerIsland, SpecialOrderLocations, ArcadeMachineLocations, Mods, all_mods_except_invalid_combinations
+from ...strings.special_order_names import SpecialOrder
+from ...test.bases import SVTestCase, solo_multiworld
+
+
+class TestSpecialOrders(SVTestCase):
+    def test_given_disabled_then_no_order_in_pool(self):
+        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_vanilla}
+        with solo_multiworld(world_options) as (multi_world, _):
+            locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
+            for location_name in locations_in_pool:
+                location = location_table[location_name]
+                self.assertNotIn(LocationTags.SPECIAL_ORDER_BOARD, location.tags)
+                self.assertNotIn(LocationTags.SPECIAL_ORDER_QI, location.tags)
+
+    def test_given_board_only_then_no_qi_order_in_pool(self):
+        world_options = {
+            SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board,
+            Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+        }
+        with solo_multiworld(world_options) as (multi_world, _):
+
+            locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
+            for location_name in locations_in_pool:
+                location = location_table[location_name]
+                self.assertNotIn(LocationTags.SPECIAL_ORDER_QI, location.tags)
+
+            for board_location in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
+                self.assertIn(board_location.name, locations_in_pool)
+
+    def test_given_board_and_qi_then_all_orders_in_pool(self):
+        world_options = {
+            SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+            ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_victories,
+            ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+            Mods.internal_name: frozenset(all_mods_except_invalid_combinations),
+        }
+        with solo_multiworld(world_options) as (multi_world, _):
+
+            locations_in_pool = {location.name for location in multi_world.get_locations()}
+            for qi_location in locations_by_tag[LocationTags.SPECIAL_ORDER_QI]:
+                self.assertIn(qi_location.name, locations_in_pool)
+
+            for board_location in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
+                self.assertIn(board_location.name, locations_in_pool)
+
+    def test_given_board_and_qi_without_arcade_machines_then_lets_play_a_game_not_in_pool(self):
+        world_options = {
+            SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+            ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled,
+            ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+        }
+        with solo_multiworld(world_options) as (multi_world, _):
+            locations_in_pool = {location.name for location in multi_world.get_locations()}
+            self.assertNotIn(SpecialOrder.lets_play_a_game, locations_in_pool)
diff --git a/worlds/stardew_valley/test/test_options/TestToolOptions.py b/worlds/stardew_valley/test/test_options/TestToolOptions.py
new file mode 100644
index 0000000000..3e5272288b
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestToolOptions.py
@@ -0,0 +1,45 @@
+import itertools
+from collections import Counter
+
+from BaseClasses import ItemClassification
+from ...options import ToolProgression, StartWithout
+from ...strings.tool_names import ToolMaterial, Tool, APTool
+from ...test.bases import SVTestBase
+
+TOOLS = {"Hoe", "Pickaxe", "Axe", "Watering Can", "Trash Can", "Fishing Rod"}
+
+
+class TestToolProgression(SVTestBase):
+    options = {
+        ToolProgression.internal_name: ToolProgression.option_progressive,
+        StartWithout.internal_name: StartWithout.preset_none,
+    }
+
+    def test_given_progressive_when_generate_then_tool_upgrades_are_locations(self):
+        locations = set(self.get_real_location_names())
+        for material, tool in itertools.product(ToolMaterial.tiers.values(),
+                                                [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.trash_can]):
+            if material == ToolMaterial.basic:
+                continue
+            self.assertIn(f"{material} {tool} Upgrade", locations)
+        self.assertIn("Purchase Training Rod", locations)
+        self.assertIn("Bamboo Pole Cutscene", locations)
+        self.assertIn("Purchase Fiberglass Rod", locations)
+        self.assertIn("Purchase Iridium Rod", locations)
+
+    def test_given_progressive_when_generate_then_last_trash_can_is_classified_differently(self):
+        trash_cans = self.get_items_by_name(APTool.trash_can)
+        progressive_count = sum([1 for item in trash_cans if item.classification == ItemClassification.progression])
+        special_count = sum([1 for item in trash_cans if item.classification == ItemClassification.useful])
+
+        self.assertEqual(3, progressive_count)
+        self.assertEqual(1, special_count)
+
+    def test_given_progressive_when_generate_then_last_trash_can_changes_classification_post_fill(self):
+        trash_can, post_fill_classification = next((classification_to_update
+                                                    for classification_to_update in self.world.classifications_to_override_post_fill
+                                                    if classification_to_update[0].name == APTool.trash_can),
+                                                   (None, None))
+
+        self.assertEqual(post_fill_classification, ItemClassification.progression_skip_balancing)
+        self.assertEqual(Counter(), trash_can.events_to_collect)
diff --git a/worlds/stardew_valley/test/test_options/TestTrapOptions.py b/worlds/stardew_valley/test/test_options/TestTrapOptions.py
new file mode 100644
index 0000000000..1548b49437
--- /dev/null
+++ b/worlds/stardew_valley/test/test_options/TestTrapOptions.py
@@ -0,0 +1,28 @@
+from ...items import items_by_group, Group
+from ...options import TrapDifficulty
+from ...test.bases import SVTestCase, solo_multiworld
+from ...test.options.presets import allsanity_mods_7_x_x, allsanity_no_mods_7_x_x
+
+
+class TestTraps(SVTestCase):
+    def test_given_no_traps_when_generate_then_no_trap_in_pool(self):
+        world_options = allsanity_no_mods_7_x_x().copy()
+        world_options[TrapDifficulty.internal_name] = TrapDifficulty.option_no_traps
+        with solo_multiworld(world_options) as (multi_world, _):
+            trap_items = [item_data.name for item_data in items_by_group[Group.TRAP]]
+            multiworld_items = [item.name for item in multi_world.get_items()]
+
+            for item in trap_items:
+                with self.subTest(f"{item}"):
+                    self.assertNotIn(item, multiworld_items)
+
+    def test_given_traps_when_generate_then_all_traps_in_pool(self):
+        trap_option = TrapDifficulty
+        world_options = allsanity_mods_7_x_x()
+        world_options.update({TrapDifficulty.internal_name: trap_option.option_easy})
+        with solo_multiworld(world_options) as (multi_world, _):
+            trap_items = [item_data.name for item_data in items_by_group[Group.TRAP] if Group.DEPRECATED not in item_data.groups]
+            multiworld_items = [item.name for item in multi_world.get_items()]
+            for item in trap_items:
+                with self.subTest(f"Item: {item}"):
+                    self.assertIn(item, multiworld_items)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/test_options/__init__.py b/worlds/stardew_valley/test/test_options/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/stardew_valley/utility/__init__.py b/worlds/stardew_valley/utility/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/stardew_valley/utility/logging_random.py b/worlds/stardew_valley/utility/logging_random.py
new file mode 100644
index 0000000000..2cbe352a7c
--- /dev/null
+++ b/worlds/stardew_valley/utility/logging_random.py
@@ -0,0 +1,35 @@
+from random import Random
+
+
+class LoggingRandom:
+    internal_random: Random
+    total_calls: int
+
+    def __init__(self, seed):
+        # logger.warning(f"Initializing LoggingRandom with seed: {seed}")
+        self.internal_random = Random(seed)
+        self.total_calls = 0
+
+    def sample(self, population, k, *, counts=None):
+        self.total_calls += 1
+        return self.internal_random.sample(population=population, k=k, counts=counts)
+
+    def choice(self, seq):
+        self.total_calls += 1
+        return self.internal_random.choice(seq)
+
+    def choices(self, population, weights=None, *, cum_weights=None, k=1):
+        self.total_calls += 1
+        return self.internal_random.choices(population=population, weights=weights, cum_weights=cum_weights)
+
+    def randint(self, a, b):
+        self.total_calls += 1
+        return self.internal_random.randint(a, b)
+
+    def shuffle(self, x):
+        self.total_calls += 1
+        return self.internal_random.shuffle(x)
+
+    def randrange(self, start, stop=None, step=1):
+        self.total_calls += 1
+        return self.internal_random.randrange(start=start, stop=stop, step=step)
\ No newline at end of file
diff --git a/worlds/timespinner/Locations.py b/worlds/timespinner/Locations.py
index ffd2f60eb9..63a19e6afd 100644
--- a/worlds/timespinner/Locations.py
+++ b/worlds/timespinner/Locations.py
@@ -567,7 +567,7 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
             LocationData('Royal towers (upper)', 'Royal Towers: Left Royal Guard Lantern 2', 1337604, logic.can_break_lanterns),
             LocationData('Royal towers', 'Royal Towers: Pre-Climb Lantern 1', 1337609, logic.can_break_lanterns),
             LocationData('Royal towers', 'Royal Towers: Pre-Climb Lantern 2', 1337610, logic.can_break_lanterns),
-            LocationData('Royal towers', 'Royal Towers: Bottom Struggle Lantern', 1337611, logic.can_break_lanterns),
+            LocationData('Royal towers', 'Royal Towers: Bottom Struggle Lantern', 1337611, lambda state: logic.can_break_lanterns(state) and logic.has_doublejump_of_npc(state)),
             LocationData('Royal towers (upper)', 'Royal Towers: Final Climb Lantern 1', 1337612, logic.can_break_lanterns),
             LocationData('Royal towers (upper)', 'Royal Towers: Final Climb Lantern 2', 1337613, logic.can_break_lanterns),
             LocationData('Royal towers (upper)', 'Royal Towers: Right Tower Base Lantern 1', 1337614, logic.can_break_lanterns),
@@ -656,12 +656,12 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
             LocationData('Left Side forest Caves', 'Lake Serene (Upper): Fork Dry Lantern', 1337631, logic.can_break_lanterns),
             LocationData('Left Side forest Caves', 'Lake Serene (Upper): Fork Wet Lantern 1', 1337632, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
             LocationData('Left Side forest Caves', 'Lake Serene (Upper): Fork Wet Lantern 2', 1337633, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Above The Eels Lantern 1', 1337638, logic.can_break_lanterns),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Above The Eels Lantern 2', 1337639, logic.can_break_lanterns),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 1', 1337640, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 2', 1337641, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 3', 1337642, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
-            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 4', 1337649, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Above The Eels Lantern 1', 1337649, logic.can_break_lanterns),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Above The Eels Lantern 2', 1337640, logic.can_break_lanterns),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 1', 1337638, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 2', 1337639, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 3', 1337641, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
+            LocationData('Left Side forest Caves', 'Lake Serene (Lower): Under The Eels Lantern 4', 1337642, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
             LocationData('Left Side forest Caves', 'Lake Serene (Lower): Past the Eels Lantern', 1337630, lambda state: logic.can_break_lanterns(state) and state.has('Water Mask', player)),
             LocationData('Lower Lake Serene', 'Lake Serene (Lower): Underwater Secret Lantern 1', 1337618, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state)),
             LocationData('Lower Lake Serene', 'Lake Serene (Lower): Underwater Secret Lantern 2', 1337619, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state)),
@@ -712,12 +712,12 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
             LocationData('Main Lab', 'Lab: Exp. 13 Terminal Lantern 2', 1337296, logic.can_break_lanterns),
             LocationData('Main Lab', 'Lab: Left Terminal Lantern 1', 1337308, logic.can_break_lanterns),
             LocationData('Main Lab', 'Lab: Left Terminal Lantern 2', 1337309, logic.can_break_lanterns),
-            LocationData('Main Lab', 'Lab: Trash Jump Lantern 1', 1337282, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))),
-            LocationData('Main Lab', 'Lab: Trash Jump Lantern 2', 1337283, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))),
-            LocationData('Lab Research', 'Lab: Spider Hell Entrance Lantern 1', 1337290, logic.can_break_lanterns),
-            LocationData('Lab Research', 'Lab: Spider Hell Entrance Lantern 2', 1337291, logic.can_break_lanterns),
-            LocationData('Main Lab', 'Lab: Lower Trash Lantern 1', 1337292, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))),
-            LocationData('Main Lab', 'Lab: Lower Trash Lantern 2', 1337293, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))),
+            LocationData('Main Lab', 'Lab: Trash Jump Lantern 1', 1337282, lambda state: logic.can_break_lanterns(state) and logic.has_doublejump(state)),
+            LocationData('Main Lab', 'Lab: Trash Jump Lantern 2', 1337283, lambda state: logic.can_break_lanterns(state) and logic.has_doublejump_of_npc(state)),
+            LocationData('Lab Research', 'Lab: Spider Hell Entrance Lantern 1', 1337290, lambda state: logic.has_keycard_A(state) and logic.can_break_lanterns(state)),
+            LocationData('Lab Research', 'Lab: Spider Hell Entrance Lantern 2', 1337291, lambda state: logic.has_keycard_A(state) and logic.can_break_lanterns(state)),
+            LocationData('Main Lab', 'Lab: Lower Trash Lantern 1', 1337292, logic.can_break_lanterns),
+            LocationData('Main Lab', 'Lab: Lower Trash Lantern 2', 1337293, logic.can_break_lanterns),
             LocationData('The lab (upper)', 'Lab: File Cabinet Lantern 1', 1337310, logic.can_break_lanterns),
             LocationData('The lab (upper)', 'Lab: File Cabinet Lantern 2', 1337311, logic.can_break_lanterns),
             LocationData('The lab (upper)', 'Lab: File Cabinet Staircase Lantern 1', 1337286, logic.can_break_lanterns),
@@ -794,20 +794,20 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Upper-Left Stairway Lantern 1', 1337381, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Upper-Left Stairway Lantern 2', 1337382, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Upper-Left Stairway Lantern 3', 1337383, logic.can_break_lanterns),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Shaft Lantern 1', 1337402, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Shaft Lantern 2', 1337403, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 1', 1337389, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 2', 1337390, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 3', 1337391, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 4', 1337392, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Shaft Lantern 1', 1337402, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Shaft Lantern 2', 1337403, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 1', 1337389, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 2', 1337390, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 3', 1337391, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 4', 1337392, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Left Hallway Lantern 1', 1337395, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Left Hallway Lantern 2', 1337396, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Left Hallway Lantern 3', 1337397, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Left Hallway Lantern 4', 1337398, logic.can_break_lanterns),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret Lantern 1', 1337404, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret Lantern 2', 1337405, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret\'s Secret Lantern 1', 1337406, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret\'s Secret Lantern 2', 1337407, lambda state: logic.can_break_lanterns(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret Lantern 1', 1337404, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret Lantern 2', 1337405, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret\'s Secret Lantern 1', 1337406, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+            LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit Secret\'s Secret Lantern 2', 1337407, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Outside Inner Warp Lantern 1', 1337408, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Outside Inner Warp Lantern 2', 1337409, logic.can_break_lanterns),
             LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Nightmare Stairway Entrance Lantern', 1337410, logic.can_break_lanterns),
diff --git a/worlds/timespinner/archipelago.json b/worlds/timespinner/archipelago.json
new file mode 100644
index 0000000000..97b7cd32b6
--- /dev/null
+++ b/worlds/timespinner/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Timespinner",
+    "authors": ["Jarno"],
+    "minimum_ap_version": "0.6.3",
+    "world_version": "1.38.0"
+}
diff --git a/worlds/timespinner/docs/setup_de.md b/worlds/timespinner/docs/setup_de.md
index e864747446..62c6345165 100644
--- a/worlds/timespinner/docs/setup_de.md
+++ b/worlds/timespinner/docs/setup_de.md
@@ -42,7 +42,7 @@ Weitere Informationen zum Randomizer findest du hier: [ReadMe](https://github.co
 
 ## Woher bekomme ich eine Konfigurationsdatei?
 
-Die [Player Options](https://archipelago.gg/games/Timespinner/player-options) Seite auf der Website erlaubt dir,
+Die [Player Options](/games/Timespinner/player-options) Seite auf der Website erlaubt dir,
 persönliche Einstellungen zu definieren und diese in eine Konfigurationsdatei zu exportieren
 
 * Die Timespinner Randomizer Option "StinkyMaw" ist in Archipelago Seeds aktuell immer an
diff --git a/worlds/tloz/Rules.py b/worlds/tloz/Rules.py
index de627a533b..6d9e474532 100644
--- a/worlds/tloz/Rules.py
+++ b/worlds/tloz/Rules.py
@@ -12,6 +12,15 @@ def set_rules(tloz_world: "TLoZWorld"):
     player = tloz_world.player
     options = tloz_world.options
 
+    tloz_world.multiworld.completion_condition[player] = lambda state: state.has("Rescued Zelda!", player)
+    ganon = tloz_world.multiworld.get_location("Ganon", player)
+    ganon.place_locked_item(tloz_world.create_event("Triforce of Power"))
+    add_rule(ganon, lambda state: state.has("Silver Arrow", player) and state.has("Bow", player))
+
+    tloz_world.multiworld.get_location("Zelda", player).place_locked_item(tloz_world.create_event("Rescued Zelda!"))
+    add_rule(tloz_world.multiworld.get_location("Zelda", player),
+             lambda state: state.has("Triforce of Power", player))
+
     # Boss events for a nicer spoiler log play through
     for level in range(1, 9):
         boss = tloz_world.get_location(f"Level {level} Boss")
diff --git a/worlds/tloz/__init__.py b/worlds/tloz/__init__.py
index c8c76bd85a..da347c752a 100644
--- a/worlds/tloz/__init__.py
+++ b/worlds/tloz/__init__.py
@@ -188,14 +188,8 @@ class TLoZWorld(World):
     set_rules = set_rules
 
     def generate_basic(self):
-        ganon = self.multiworld.get_location("Ganon", self.player)
-        ganon.place_locked_item(self.create_event("Triforce of Power"))
-        add_rule(ganon, lambda state: state.has("Silver Arrow", self.player) and state.has("Bow", self.player))
+        pass
 
-        self.multiworld.get_location("Zelda", self.player).place_locked_item(self.create_event("Rescued Zelda!"))
-        add_rule(self.multiworld.get_location("Zelda", self.player),
-                 lambda state: state.has("Triforce of Power", self.player))
-        self.multiworld.completion_condition[self.player] = lambda state: state.has("Rescued Zelda!", self.player)
 
     def apply_base_patch(self, rom):
         # The base patch source is on a different repo, so here's the summary of changes:
diff --git a/worlds/tloz/archipelago.json b/worlds/tloz/archipelago.json
new file mode 100644
index 0000000000..3b7e07bf07
--- /dev/null
+++ b/worlds/tloz/archipelago.json
@@ -0,0 +1,5 @@
+{
+  "game": "The Legend of Zelda",
+  "world_version": "1.0.0",
+  "authors": ["Rosalie"]
+}
diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 1d59eeaeca..2d7a632453 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -348,6 +348,15 @@ class TunicWorld(World):
                                              if name == "Shield" and self.options.ladder_storage
                                              and not self.options.ladder_storage_without_items else None)
                                          or item_data.classification)
+        # if there's 6 or less in the pool, then I could see them landing on priority locations being desireable
+        if name == "Gold Questagon" and self.options.hexagon_goal > 6:
+            itemclass = itemclass | ItemClassification.deprioritized
+        # remove deprioritized from Fairies and Coins if Laurels are there
+        if name == "Fairy" and self.options.laurels_location == LaurelsLocation.option_10_fairies:
+            itemclass = ItemClassification.progression
+        if (name == "Golden Coin" and self.options.laurels_location in
+                (LaurelsLocation.option_10_coins, LaurelsLocation.option_6_coins)):
+            itemclass = ItemClassification.progression
         return TunicItem(name, itemclass, self.item_name_to_id[name], self.player)
 
     def create_items(self) -> None:
@@ -663,25 +672,29 @@ class TunicWorld(World):
                 # Remove parentheses for better readability
                 spoiler_handle.write(f'{ability[ability.find("(")+1:ability.find(")")]}: {self.ability_unlocks[ability]} Gold Questagons\n')
 
-    def extend_hint_information(self, hint_data: dict[int, dict[int, str]]) -> None:
-        if self.options.entrance_rando:
-            hint_data.update({self.player: {}})
-            # all state seems to have efficient paths
-            all_state = self.multiworld.get_all_state(True)
-            all_state.update_reachable_regions(self.player)
-            paths = all_state.path
-            portal_names = {portal.name for portal in portal_mapping}.union({f"Shop Portal {i + 1}" for i in range(500)})
-            for location in self.multiworld.get_locations(self.player):
-                # skipping event locations
-                if not location.address:
+    @classmethod
+    def stage_extend_hint_information(cls, multiworld: MultiWorld, hint_data: dict[int, dict[int, str]]) -> None:
+        tunic_er_worlds: list[TunicWorld] = [world for world in multiworld.get_game_worlds("TUNIC")
+                                             if world.options.entrance_rando]
+        if not tunic_er_worlds:
+            return
+
+        hint_data.update({world.player: {} for world in tunic_er_worlds})
+        all_state = multiworld.get_all_state()
+        paths = all_state.path
+        portal_names = {portal.name for portal in portal_mapping}.union({f"Shop Portal {i + 1}" for i in range(500)})
+        for world in tunic_er_worlds:
+            all_state.update_reachable_regions(world.player)
+            for region in world.get_regions():
+                if region.name == "Menu":
                     continue
-                path_to_loc = []
+                path_to_region = []
                 previous_name = "placeholder"
                 try:
-                    name, connection = paths[location.parent_region]
+                    name, connection = paths[region]
                 except KeyError:
                     # logic bug, proceed with warning since it takes a long time to update AP
-                    warning(f"{location.name} is not logically accessible for {self.player_name}. "
+                    warning(f"{region.name} is not logically accessible for {world.player_name}. "
                             "Creating entrance hint Inaccessible. Please report this to the TUNIC rando devs. "
                             "If you are using Plando Items (excluding early locations), then this is likely the cause.")
                     hint_text = "Inaccessible"
@@ -694,11 +707,14 @@ class TunicWorld(World):
                         # was getting some cases like Library Grave -> Library Grave -> other place
                         if name in portal_names and name != previous_name:
                             previous_name = name
-                            path_to_loc.append(name)
-                    hint_text = " -> ".join(reversed(path_to_loc))
+                            path_to_region.append(name)
+                    hint_text = " -> ".join(reversed(path_to_region))
 
                 if hint_text:
-                    hint_data[self.player][location.address] = hint_text
+                    for location in region.get_locations():
+                        if location.address is None:
+                            continue
+                        hint_data[world.player][location.address] = hint_text
 
     def get_real_location(self, location: Location) -> tuple[str, int]:
         # if it's not in a group, it's not in an item link
diff --git a/worlds/tunic/archipelago.json b/worlds/tunic/archipelago.json
index 4c4d8dd931..7a1929a00d 100644
--- a/worlds/tunic/archipelago.json
+++ b/worlds/tunic/archipelago.json
@@ -1,6 +1,6 @@
 {
   "game": "TUNIC",
-  "authors": ["SilentSR", "ScipioWright"],
+  "authors": ["silent-destroyer", "ScipioWright"],
   "minimum_ap_version": "0.6.4",
-  "world_version": "4.1.0"
+  "world_version": "4.2.7"
 }
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index ad26e10c9e..ecee659272 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1047,7 +1047,7 @@ def set_er_region_rules(world: "TunicWorld", regions: dict[str, Region], portal_
         connecting_region=regions["Rooted Ziggurat Portal Room"])
     regions["Rooted Ziggurat Portal Room"].connect(
         connecting_region=regions["Rooted Ziggurat Portal"],
-        rule=lambda state: has_fuses("Activate Ziggurat Fuse", state, world) and has_ability(prayer, state, world))
+        rule=lambda state: has_ability(prayer, state, world))
 
     regions["Rooted Ziggurat Portal Room"].connect(
         connecting_region=regions["Rooted Ziggurat Portal Room Exit"],
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index a1b8b2fefd..60de72906d 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -29,6 +29,8 @@ def create_er_regions(world: "TunicWorld") -> dict[Portal, Portal]:
     world.used_shop_numbers = set()
 
     for region_name, region_data in world.er_regions.items():
+        if region_name == "Zig Skip Exit":
+            continue
         if world.options.entrance_rando and region_name == "Zig Skip Exit":
             # need to check if there's a seed group for this first
             if world.options.entrance_rando.value not in EntranceRando.options.values():
@@ -773,11 +775,17 @@ def pair_portals(world: "TunicWorld", regions: dict[str, Region]) -> dict[Portal
 # loop through our list of paired portals and make two-way connections
 def create_randomized_entrances(world: "TunicWorld", portal_pairs: dict[Portal, Portal], regions: dict[str, Region]) -> None:
     for portal1, portal2 in portal_pairs.items():
+        # this portal is completely inaccessible, so let's not make this connection
+        if portal1.region == "Zig Skip Exit":
+            continue
         # connect to the outlet region if there is one, if not connect to the actual region
         regions[portal1.region].connect(
             connecting_region=regions[get_portal_outlet_region(portal2, world)],
             name=portal1.name)
         if not world.options.decoupled or not world.options.entrance_rando:
+            # this portal is completely inaccessible, so let's not make this connection
+            if portal2.region == "Zig Skip Exit":
+                continue
             regions[portal2.region].connect(
                 connecting_region=regions[get_portal_outlet_region(portal1, world)],
                 name=portal2.name)
diff --git a/worlds/tunic/grass.py b/worlds/tunic/grass.py
index f2aea40f7c..fe7a1102bf 100644
--- a/worlds/tunic/grass.py
+++ b/worlds/tunic/grass.py
@@ -3642,13 +3642,13 @@ grass_location_table: dict[str, TunicLocationData] = {
     "West Garden - West Garden Grass (179) (-334.0, 4.0, 103.0)": TunicLocationData("none", "West Garden after Terry"),
     "West Garden - West Garden Grass (176) (-335.0, 4.0, 103.0)": TunicLocationData("none", "West Garden after Terry"),
     "West Garden - West Garden Grass (178) (-334.0, 4.0, 102.0)": TunicLocationData("none", "West Garden after Terry"),
-    "West Garden - West Garden Portal Grass (243) (-202.5, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (244) (-203.4, 8.0, -20.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (242) (-203.6, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (233) (-197.4, 8.0, -20.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (232) (-198.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (234) (-197.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
-    "West Garden - West Garden Portal Grass (231) (-196.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (243) (-202.5, 8.0, -19.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (244) (-203.4, 8.0, -20.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (242) (-203.6, 8.0, -19.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (233) (-197.4, 8.0, -20.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (232) (-198.4, 8.0, -19.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (234) (-197.4, 8.0, -19.9)": TunicLocationData("none", "West Garden by Portal"),
+    "West Garden - West Garden Portal Grass (231) (-196.4, 8.0, -19.9)": TunicLocationData("none", "West Garden by Portal"),
     "West Garden - West Garden Laurels Exit Grass (261) (-182.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
     "West Garden - West Garden Laurels Exit Grass (259) (-183.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
     "West Garden - West Garden Laurels Exit Grass (258) (-184.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py
index e8f201b926..1e24b3c0d7 100644
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -30,14 +30,14 @@ item_table: dict[str, TunicItemData] = {
     "Lure x2": TunicItemData(IC.filler, 1, 11, "Consumables"),
     "Pepper x2": TunicItemData(IC.filler, 4, 12, "Consumables"),
     "Ivy x3": TunicItemData(IC.filler, 2, 13, "Consumables"),
-    "Effigy": TunicItemData(IC.useful, 12, 14, "Money", combat_ic=IC.progression),
+    "Effigy": TunicItemData(IC.useful, 12, 14, "Money", combat_ic=IC.progression | IC.deprioritized),
     "HP Berry": TunicItemData(IC.filler, 2, 15, "Consumables"),
     "HP Berry x2": TunicItemData(IC.filler, 4, 16, "Consumables"),
     "HP Berry x3": TunicItemData(IC.filler, 2, 17, "Consumables"),
     "MP Berry": TunicItemData(IC.filler, 4, 18, "Consumables"),
     "MP Berry x2": TunicItemData(IC.filler, 2, 19, "Consumables"),
     "MP Berry x3": TunicItemData(IC.filler, 7, 20, "Consumables"),
-    "Fairy": TunicItemData(IC.progression, 20, 21),
+    "Fairy": TunicItemData(IC.progression | IC.deprioritized, 20, 21),
     "Stick": TunicItemData(IC.progression | IC.useful, 1, 22, "Weapons"),
     "Sword": TunicItemData(IC.progression | IC.useful, 3, 23, "Weapons"),
     "Sword Upgrade": TunicItemData(IC.progression | IC.useful, 4, 24, "Weapons"),
@@ -52,22 +52,22 @@ item_table: dict[str, TunicItemData] = {
     "Torch": TunicItemData(IC.useful, 0, 156),
     "Hourglass": TunicItemData(IC.useful, 1, 33),
     "Old House Key": TunicItemData(IC.progression, 1, 34, "Keys"),
-    "Key": TunicItemData(IC.progression, 2, 35, "Keys"),
+    "Key": TunicItemData(IC.progression | IC.deprioritized, 2, 35, "Keys"),
     "Fortress Vault Key": TunicItemData(IC.progression, 1, 36, "Keys"),
-    "Flask Shard": TunicItemData(IC.useful, 12, 37, combat_ic=IC.progression),
+    "Flask Shard": TunicItemData(IC.useful, 12, 37, combat_ic=IC.progression | IC.deprioritized),
     "Potion Flask": TunicItemData(IC.useful, 5, 38, "Flask", combat_ic=IC.progression),
-    "Golden Coin": TunicItemData(IC.progression, 17, 39),
+    "Golden Coin": TunicItemData(IC.progression | IC.deprioritized, 17, 39),
     "Card Slot": TunicItemData(IC.useful, 4, 40),
     "Red Questagon": TunicItemData(IC.progression_skip_balancing, 1, 41, "Hexagons"),
     "Green Questagon": TunicItemData(IC.progression_skip_balancing, 1, 42, "Hexagons"),
     "Blue Questagon": TunicItemData(IC.progression_skip_balancing, 1, 43, "Hexagons"),
     "Gold Questagon": TunicItemData(IC.progression_skip_balancing, 0, 44, "Hexagons"),
     "ATT Offering": TunicItemData(IC.useful, 4, 45, "Offerings", combat_ic=IC.progression),
-    "DEF Offering": TunicItemData(IC.useful, 4, 46, "Offerings", combat_ic=IC.progression),
-    "Potion Offering": TunicItemData(IC.useful, 3, 47, "Offerings", combat_ic=IC.progression),
-    "HP Offering": TunicItemData(IC.useful, 6, 48, "Offerings", combat_ic=IC.progression),
-    "MP Offering": TunicItemData(IC.useful, 3, 49, "Offerings", combat_ic=IC.progression),
-    "SP Offering": TunicItemData(IC.useful, 2, 50, "Offerings", combat_ic=IC.progression),
+    "DEF Offering": TunicItemData(IC.useful, 4, 46, "Offerings", combat_ic=IC.progression | IC.deprioritized),
+    "Potion Offering": TunicItemData(IC.useful, 3, 47, "Offerings", combat_ic=IC.progression | IC.deprioritized),
+    "HP Offering": TunicItemData(IC.useful, 6, 48, "Offerings", combat_ic=IC.progression | IC.deprioritized),
+    "MP Offering": TunicItemData(IC.useful, 3, 49, "Offerings", combat_ic=IC.progression | IC.deprioritized),
+    "SP Offering": TunicItemData(IC.useful, 2, 50, "Offerings", combat_ic=IC.progression | IC.deprioritized),
     "Hero Relic - ATT": TunicItemData(IC.progression_skip_balancing, 1, 51, "Hero Relics", combat_ic=IC.progression),
     "Hero Relic - DEF": TunicItemData(IC.progression_skip_balancing, 1, 52, "Hero Relics", combat_ic=IC.progression),
     "Hero Relic - HP": TunicItemData(IC.progression_skip_balancing, 1, 53, "Hero Relics", combat_ic=IC.progression),
@@ -91,17 +91,17 @@ item_table: dict[str, TunicItemData] = {
     "Aura's Gem": TunicItemData(IC.useful, 1, 71, "Cards"),
     "Bone Card": TunicItemData(IC.useful, 1, 72, "Cards"),
     "Mr Mayor": TunicItemData(IC.useful, 1, 73, "Golden Treasures", combat_ic=IC.progression),
-    "Secret Legend": TunicItemData(IC.useful, 1, 74, "Golden Treasures", combat_ic=IC.progression),
-    "Sacred Geometry": TunicItemData(IC.useful, 1, 75, "Golden Treasures", combat_ic=IC.progression),
-    "Vintage": TunicItemData(IC.useful, 1, 76, "Golden Treasures", combat_ic=IC.progression),
-    "Just Some Pals": TunicItemData(IC.useful, 1, 77, "Golden Treasures", combat_ic=IC.progression),
-    "Regal Weasel": TunicItemData(IC.useful, 1, 78, "Golden Treasures", combat_ic=IC.progression),
-    "Spring Falls": TunicItemData(IC.useful, 1, 79, "Golden Treasures", combat_ic=IC.progression),
-    "Power Up": TunicItemData(IC.useful, 1, 80, "Golden Treasures", combat_ic=IC.progression),
-    "Back To Work": TunicItemData(IC.useful, 1, 81, "Golden Treasures", combat_ic=IC.progression),
-    "Phonomath": TunicItemData(IC.useful, 1, 82, "Golden Treasures", combat_ic=IC.progression),
-    "Dusty": TunicItemData(IC.useful, 1, 83, "Golden Treasures", combat_ic=IC.progression),
-    "Forever Friend": TunicItemData(IC.useful, 1, 84, "Golden Treasures", combat_ic=IC.progression),
+    "Secret Legend": TunicItemData(IC.useful, 1, 74, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Sacred Geometry": TunicItemData(IC.useful, 1, 75, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Vintage": TunicItemData(IC.useful, 1, 76, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Just Some Pals": TunicItemData(IC.useful, 1, 77, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Regal Weasel": TunicItemData(IC.useful, 1, 78, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Spring Falls": TunicItemData(IC.useful, 1, 79, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Power Up": TunicItemData(IC.useful, 1, 80, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Back To Work": TunicItemData(IC.useful, 1, 81, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Phonomath": TunicItemData(IC.useful, 1, 82, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Dusty": TunicItemData(IC.useful, 1, 83, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
+    "Forever Friend": TunicItemData(IC.useful, 1, 84, "Golden Treasures", combat_ic=IC.progression | IC.deprioritized),
     "Fool Trap": TunicItemData(IC.trap, 0, 85),
     "Money x1": TunicItemData(IC.filler, 3, 86, "Money"),
     "Money x2": TunicItemData(IC.filler, 0, 152, "Money"),
@@ -120,9 +120,9 @@ item_table: dict[str, TunicItemData] = {
     "Money x50": TunicItemData(IC.filler, 7, 96, "Money"),
     "Money x64": TunicItemData(IC.filler, 1, 97, "Money"),
     "Money x100": TunicItemData(IC.filler, 5, 98, "Money"),
-    "Money x128": TunicItemData(IC.useful, 3, 99, "Money", combat_ic=IC.progression),
-    "Money x200": TunicItemData(IC.useful, 1, 100, "Money", combat_ic=IC.progression),
-    "Money x255": TunicItemData(IC.useful, 1, 101, "Money", combat_ic=IC.progression),
+    "Money x128": TunicItemData(IC.useful, 3, 99, "Money", combat_ic=IC.progression | IC.deprioritized),
+    "Money x200": TunicItemData(IC.useful, 1, 100, "Money", combat_ic=IC.progression | IC.deprioritized),
+    "Money x255": TunicItemData(IC.useful, 1, 101, "Money", combat_ic=IC.progression | IC.deprioritized),
     "Pages 0-1": TunicItemData(IC.useful, 1, 102, "Pages"),
     "Pages 2-3": TunicItemData(IC.useful, 1, 103, "Pages"),
     "Pages 4-5": TunicItemData(IC.useful, 1, 104, "Pages"),
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index f705979a44..e873e23057 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -50,8 +50,8 @@ class AbilityShuffling(DefaultOnToggle):
 
 class Lanternless(Toggle):
     """
-    Choose whether you require the Lantern for dark areas.
-    When enabled, the Lantern is marked as Useful instead of Progression.
+    When enabled, you may be required to navigate dark areas without the Lantern.
+    The Lantern is marked as Useful instead of Progression.
     """
     internal_name = "lanternless"
     display_name = "Lanternless"
@@ -59,8 +59,8 @@ class Lanternless(Toggle):
 
 class Maskless(Toggle):
     """
-    Choose whether you require the Scavenger's Mask for Lower Quarry.
-    When enabled, the Scavenger's Mask is marked as Useful instead of Progression.
+    When enabled, you may be required to traverse Lower Quarry without the Scavenger's Mask.
+    The Scavenger's Mask is marked as Useful instead of Progression.
     """
     internal_name = "maskless"
     display_name = "Maskless"
@@ -200,8 +200,8 @@ class ShuffleLadders(Toggle):
 
 class ShuffleFuses(Toggle):
     """
-    Praying at a fuse will reward a check instead of turning on the power. The power from each fuse gets turned into an
-    item that must be found in order to restore power for that part of the path.
+    Praying at a fuse will reward a check instead of turning on the power.
+    The power from each fuse gets turned into an item that must be found in order to restore power for that part of the path.
     """
     internal_name = "shuffle_fuses"
     display_name = "Shuffle Fuses"
diff --git a/worlds/tunic/ut_stuff.py b/worlds/tunic/ut_stuff.py
index 9096f037d8..45caf4da9a 100644
--- a/worlds/tunic/ut_stuff.py
+++ b/worlds/tunic/ut_stuff.py
@@ -23,6 +23,7 @@ def setup_options_from_slot_data(world: "TunicWorld") -> None:
             world.options.maskless.value = world.passthrough["maskless"]
             world.options.hexagon_quest.value = world.passthrough["hexagon_quest"]
             world.options.hexagon_quest_ability_type.value = world.passthrough.get("hexagon_quest_ability_type", 0)
+            world.options.hexagon_goal.value = world.passthrough["Hexagon Quest Goal"]
             world.options.entrance_rando.value = world.passthrough["entrance_rando"]
             world.options.shuffle_ladders.value = world.passthrough["shuffle_ladders"]
             world.options.shuffle_fuses.value = world.passthrough.get("shuffle_fuses", 0)
diff --git a/worlds/tww/TWWClient.py b/worlds/tww/TWWClient.py
index 84173659f5..b71f43d569 100644
--- a/worlds/tww/TWWClient.py
+++ b/worlds/tww/TWWClient.py
@@ -146,8 +146,8 @@ class TWWContext(CommonContext):
         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
+        # Keep track of when the player received their first progressive magic meter.
+        self.received_magic_idx: int = -1
 
         # A dictionary that maps salvage locations to their sunken treasure bit.
         self.salvage_locations_map: dict[str, int] = {}
@@ -349,10 +349,10 @@ def _give_item(ctx: TWWContext, item_name: str) -> bool:
         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:
+                if ctx.received_magic_idx == -1:
+                    ctx.received_magic_idx = idx
+                elif idx > ctx.received_magic_idx:
                     item_id = 0xB2
-                else:
-                    ctx.received_magic = True
             dolphin_memory_engine.write_byte(GIVE_ITEM_ARRAY_ADDR + idx, item_id)
             return True
 
@@ -696,12 +696,11 @@ async def dolphin_sync_task(ctx: TWWContext) -> None:
             continue
 
 
-def main(connect: Optional[str] = None, password: Optional[str] = None) -> None:
+def main(*args: str) -> None:
     """
     Run the main async loop for the Wind Waker client.
 
-    :param connect: Address of the Archipelago server.
-    :param password: Password for server authentication.
+    :param *args: Command line arguments passed to the client.
     """
     Utils.init_logging("The Wind Waker Client")
 
@@ -726,14 +725,11 @@ def main(connect: Optional[str] = None, password: Optional[str] = None) -> None:
         if ctx.dolphin_sync_task:
             await ctx.dolphin_sync_task
 
+    parser = get_base_parser()
+    parsed_args = parser.parse_args(args)
+
     import colorama
 
     colorama.init()
-    asyncio.run(_main(connect, password))
+    asyncio.run(_main(parsed_args.connect, parsed_args.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
index 58e752b5c9..f4418c698b 100644
--- a/worlds/tww/__init__.py
+++ b/worlds/tww/__init__.py
@@ -13,7 +13,7 @@ from Options import Toggle
 from worlds.AutoWorld import WebWorld, World
 from worlds.Files import APPlayerContainer
 from worlds.generic.Rules import add_item_rule
-from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, icon_paths, launch_subprocess
+from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, icon_paths, launch
 
 from .Items import ISLAND_NUMBER_TO_CHART_NAME, ITEM_TABLE, TWWItem, item_name_groups
 from .Locations import LOCATION_TABLE, TWWFlag, TWWLocation
@@ -29,14 +29,16 @@ from .Rules import set_rules
 VERSION: tuple[int, int, int] = (3, 0, 0)
 
 
-def run_client() -> None:
+def run_client(*args: str) -> None:
     """
     Launch the The Wind Waker client.
+
+    :param *args: Variable length argument list passed to the client.
     """
     print("Running The Wind Waker Client")
     from .TWWClient import main
 
-    launch_subprocess(main, name="TheWindWakerClient")
+    launch(main, name="TheWindWakerClient", args=args)
 
 
 components.append(
diff --git a/worlds/wargroove/Client.py b/worlds/wargroove/Client.py
index 0627c7e9f2..ac80e85005 100644
--- a/worlds/wargroove/Client.py
+++ b/worlds/wargroove/Client.py
@@ -178,7 +178,7 @@ class WargrooveContext(CommonContext):
         self.remove_communication_files()
         atexit.register(self.remove_communication_files)
         if not os.path.isdir(appdata_wargroove):
-            print_error_and_close("WargrooveClient couldn't find Wargoove in appdata!"
+            print_error_and_close("WargrooveClient couldn't find Wargoove in appdata! "
                                   "Boot Wargroove and then close it to attempt to fix this error")
         mods_directory = os.path.join(appdata_wargroove, "mods", "ArchipelagoMod")
         save_directory = os.path.join(appdata_wargroove, "save")
diff --git a/worlds/wargroove/archipelago.json b/worlds/wargroove/archipelago.json
new file mode 100644
index 0000000000..d6e1582192
--- /dev/null
+++ b/worlds/wargroove/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Wargroove",
+    "world_version": "1.0.0",
+    "minimum_ap_version": "0.6.3",
+    "authors": ["Fly Hyping", "Magnemania"]
+}
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index 6aaf2fdc0a..3d80fd2458 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -81,7 +81,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, 6, 0)
+    required_client_version = (0, 6, 4)
 
     player_logic: WitnessPlayerLogic
     player_locations: WitnessPlayerLocations
diff --git a/worlds/witness/archipelago.json b/worlds/witness/archipelago.json
new file mode 100644
index 0000000000..c623452d24
--- /dev/null
+++ b/worlds/witness/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "The Witness",
+    "minimum_ap_version": "0.6.4",
+    "world_version": "8.0.0",
+    "authors": ["NewSoupVi", "blastron"]
+}
diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index ac5572257f..f04c1f6d37 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -705,6 +705,8 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) ->
 
     Area Hint: 1st Arg is the amount of area progression and hunt panels. 2nd Arg is the name of the area.
     Location Hint: 1st Arg is the location's address, second arg is the player number the location belongs to.
+                   In case of a local vague hint, the second arg is a string with the containing location group.
+                   In case of a nonlocal vague hint, the second arg is the *negative* player number.
     Junk Hint: 1st Arg is -1, second arg is this slot's player number.
     """
 
@@ -724,10 +726,13 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) ->
 
     # Is location hint
     if location and location.address is not None:
-        if hint.vague_location_hint and location.player == local_player_number:
-            assert hint.area is not None  # A local vague location hint should have an area argument
-            return location.address, "containing_area:" + hint.area
-        return location.address, location.player  # Scouting does not matter for other players (currently)
+        if hint.vague_location_hint:
+            if location.player == local_player_number:
+                assert hint.area is not None  # A local vague location hint should have an area argument
+                return location.address, "containing_area:" + hint.area
+            return location.address, - location.player  # Encode non-local vague hint as negative player number
+
+        return location.address, location.player
 
     # Is junk / undefined hint
     return -1, local_player_number
diff --git a/worlds/yachtdice/archipelago.json b/worlds/yachtdice/archipelago.json
new file mode 100644
index 0000000000..a651c6b6c3
--- /dev/null
+++ b/worlds/yachtdice/archipelago.json
@@ -0,0 +1,6 @@
+{
+    "game": "Yacht Dice",
+    "authors": ["Spineraks"],
+    "minimum_ap_version": "0.6.1",
+    "world_version": "2.1.4"
+}
diff --git a/worlds/yoshisisland/Rules.py b/worlds/yoshisisland/Rules.py
index 68d4f29a73..57805fd7df 100644
--- a/worlds/yoshisisland/Rules.py
+++ b/worlds/yoshisisland/Rules.py
@@ -34,7 +34,7 @@ def set_easy_rules(world: "YoshisIslandWorld") -> None:
     set_rule(world.multiworld.get_location("Shy-Guys On Stilts: Level Clear", player), lambda state: state.has_all({"Large Spring Ball", "Beanstalk"}, player))
 
     set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Red Coins", player), lambda state: state.has_all({"Flashing Eggs", "Spring Ball", "Chomp Rock", "Beanstalk"}, player))
-    set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Stars", player), lambda state: logic.has_midring(state) or (logic.cansee_clouds and state.has_all({"Spring Ball", "Chomp Rock", "Beanstalk"}, player)))
+    set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Stars", player), lambda state: logic.has_midring(state) or (logic.cansee_clouds(state) and state.has_all({"Spring Ball", "Chomp Rock", "Beanstalk"}, player)))
 
     set_rule(world.multiworld.get_location("Salvo The Slime's Castle: Red Coins", player), lambda state: state.has("Platform Ghost", player))
     set_rule(world.multiworld.get_location("Salvo The Slime's Castle: Flowers", player), lambda state: state.has("Platform Ghost", player))
@@ -127,7 +127,7 @@ def set_easy_rules(world: "YoshisIslandWorld") -> None:
     set_rule(world.multiworld.get_location("Marching Milde's Fort: Flowers", player), lambda state: state.has_all({"Dashed Stairs", "Vanishing Arrow Wheel", "Arrow Wheel", "Bucket"}, player) and (state.has("Egg Capacity Upgrade", player, 1) or logic.combat_item(state)))
     set_rule(world.multiworld.get_location("Marching Milde's Fort: Stars", player), lambda state: state.has("Dashed Stairs", player) and (logic.has_midring(state) or state.has("Vanishing Arrow Wheel", player) or logic.cansee_clouds(state)))
 
-    set_rule(world.multiworld.get_location("Chomp Rock Zone: Red Coins", player), lambda state: state.has_all({"Large Spring Ball", "Chomp Rock"}, player))
+    set_rule(world.multiworld.get_location("Chomp Rock Zone: Red Coins", player), lambda state: state.has_all({"Large Spring Ball", "Chomp Rock", "Dashed Platform", "! Switch"}, player))
     set_rule(world.multiworld.get_location("Chomp Rock Zone: Flowers", player), lambda state: state.has_all({"Chomp Rock", "! Switch", "Spring Ball", "Dashed Platform"}, player))
     set_rule(world.multiworld.get_location("Chomp Rock Zone: Stars", player), lambda state: state.has_all({"Chomp Rock", "! Switch", "Spring Ball", "Dashed Platform"}, player))
 
@@ -262,7 +262,7 @@ def set_normal_rules(world: "YoshisIslandWorld") -> None:
     set_rule(world.multiworld.get_location("Shy-Guys On Stilts: Level Clear", player), lambda state: state.has_all({"Large Spring Ball", "Beanstalk"}, player))
 
     set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Red Coins", player), lambda state: state.has_all({"Flashing Eggs", "Spring Ball", "Chomp Rock", "Beanstalk"}, player))
-    set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Stars", player), lambda state: logic.has_midring(state) or (logic.cansee_clouds and state.has_all({"Spring Ball", "Chomp Rock", "Beanstalk"}, player)))
+    set_rule(world.multiworld.get_location("Touch Fuzzy Get Dizzy: Stars", player), lambda state: logic.has_midring(state) or (logic.cansee_clouds(state) and state.has_all({"Spring Ball", "Chomp Rock", "Beanstalk"}, player)))
 
     set_rule(world.multiworld.get_location("Salvo The Slime's Castle: Red Coins", player), lambda state: state.has("Platform Ghost", player))
     set_rule(world.multiworld.get_location("Salvo The Slime's Castle: Flowers", player), lambda state: state.has("Platform Ghost", player))
@@ -610,3 +610,5 @@ def set_hard_extra_rules(world: "YoshisIslandWorld") -> None:
     set_rule(world.multiworld.get_location("Castles - Masterpiece Set: Flowers", player), lambda state: state.has(("Large Spring Ball"), player))
     set_rule(world.multiworld.get_location("Castles - Masterpiece Set: Stars", player), lambda state: True)
     set_rule(world.multiworld.get_location("Castles - Masterpiece Set: Level Clear", player), lambda state: state.has(("Large Spring Ball"), player))
+
+
diff --git a/worlds/yoshisisland/archipelago.json b/worlds/yoshisisland/archipelago.json
new file mode 100644
index 0000000000..8b5a465e36
--- /dev/null
+++ b/worlds/yoshisisland/archipelago.json
@@ -0,0 +1,5 @@
+{"game": "Yoshi's Island",
+"authors": ["Pink Switch"],
+"minimum_ap_version": "0.6.3",
+
+"world_version": "1.0.0"}
diff --git a/worlds/yugioh06/rom.py b/worlds/yugioh06/rom.py
index 3ac10f9ea4..a61c3a6f42 100644
--- a/worlds/yugioh06/rom.py
+++ b/worlds/yugioh06/rom.py
@@ -145,7 +145,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
         md5hash = basemd5.hexdigest()
         if MD5Europe != md5hash and MD5America != md5hash:
             raise Exception(
-                "Supplied Base Rom does not match known MD5 for"
+                "Supplied Base Rom does not match known MD5 for "
                 "Yu-Gi-Oh! World Championship 2006 America or Europe "
                 "Get the correct game and version, then dump it"
             )